Parameters for ASR test day
This commit is contained in:
		@ -10,14 +10,14 @@ extern "C" {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include "util.h"
 | 
					#include "util.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CountedEnum(ParamType, size_t, PF_BBAL, PF_TC1, PF_TC2, PF_TORQUEMAP, PF_TEST1,
 | 
					CountedEnum(ParamType, size_t, PF_BBAL, PF_SLIPREF, PF_ASRP, PF_ASRON, PF_TEST1,
 | 
				
			||||||
            PF_TEST2, PF_TEST3, PF_TEST4);
 | 
					            PF_TEST2, PF_TEST3, PF_TEST4);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
typedef struct {
 | 
					typedef struct {
 | 
				
			||||||
  float bbal;
 | 
					  float bbal;
 | 
				
			||||||
  unsigned tc1;
 | 
					  float slipref;
 | 
				
			||||||
  unsigned tc2;
 | 
					  unsigned asrp;
 | 
				
			||||||
  unsigned torque_map;
 | 
					  unsigned asron;
 | 
				
			||||||
  unsigned test[4];
 | 
					  unsigned test[4];
 | 
				
			||||||
} Params;
 | 
					} Params;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -14,14 +14,14 @@ void params_inc(ParamType param) {
 | 
				
			|||||||
      params.bbal = 100.0f;
 | 
					      params.bbal = 100.0f;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    break;
 | 
					    break;
 | 
				
			||||||
  case PF_TC1:
 | 
					  case PF_SLIPREF:
 | 
				
			||||||
    params.tc1++;
 | 
					    params.slipref += 0.01f;
 | 
				
			||||||
    break;
 | 
					    break;
 | 
				
			||||||
  case PF_TC2:
 | 
					  case PF_ASRP:
 | 
				
			||||||
    params.tc2++;
 | 
					    params.asrp++;
 | 
				
			||||||
    break;
 | 
					    break;
 | 
				
			||||||
  case PF_TORQUEMAP:
 | 
					  case PF_ASRON:
 | 
				
			||||||
    params.torque_map++;
 | 
					    params.asron = 1;
 | 
				
			||||||
    break;
 | 
					    break;
 | 
				
			||||||
  case PF_TEST1:
 | 
					  case PF_TEST1:
 | 
				
			||||||
    params.test[0]++;
 | 
					    params.test[0]++;
 | 
				
			||||||
@ -46,20 +46,18 @@ void params_dec(ParamType param) {
 | 
				
			|||||||
      params.bbal = 0.0f;
 | 
					      params.bbal = 0.0f;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    break;
 | 
					    break;
 | 
				
			||||||
  case PF_TC1:
 | 
					  case PF_SLIPREF:
 | 
				
			||||||
    if (params.tc1 > 0) {
 | 
					    if (params.slipref > 0) {
 | 
				
			||||||
      params.tc1--;
 | 
					      params.slipref -= 0.01f;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    break;
 | 
					    break;
 | 
				
			||||||
  case PF_TC2:
 | 
					  case PF_ASRP:
 | 
				
			||||||
    if (params.tc2 > 0) {
 | 
					    if (params.asrp > 0) {
 | 
				
			||||||
      params.tc2--;
 | 
					      params.asrp--;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    break;
 | 
					    break;
 | 
				
			||||||
  case PF_TORQUEMAP:
 | 
					  case PF_ASRON:
 | 
				
			||||||
    if (params.torque_map > 0) {
 | 
					    params.asron = 0;
 | 
				
			||||||
      params.torque_map--;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
    break;
 | 
					    break;
 | 
				
			||||||
  case PF_TEST1:
 | 
					  case PF_TEST1:
 | 
				
			||||||
    if (params.test[0] > 0) {
 | 
					    if (params.test[0] > 0) {
 | 
				
			||||||
@ -90,14 +88,14 @@ void params_broadcast(ParamType param) {
 | 
				
			|||||||
  case PF_BBAL:
 | 
					  case PF_BBAL:
 | 
				
			||||||
    value = params.bbal * 10;
 | 
					    value = params.bbal * 10;
 | 
				
			||||||
    break;
 | 
					    break;
 | 
				
			||||||
  case PF_TC1:
 | 
					  case PF_SLIPREF:
 | 
				
			||||||
    value = params.tc1;
 | 
					    value = params.slipref * 100;
 | 
				
			||||||
    break;
 | 
					    break;
 | 
				
			||||||
  case PF_TC2:
 | 
					  case PF_ASRP:
 | 
				
			||||||
    value = params.tc2;
 | 
					    value = params.asrp;
 | 
				
			||||||
    break;
 | 
					    break;
 | 
				
			||||||
  case PF_TORQUEMAP:
 | 
					  case PF_ASRON:
 | 
				
			||||||
    value = params.torque_map;
 | 
					    value = params.asron;
 | 
				
			||||||
    break;
 | 
					    break;
 | 
				
			||||||
  case PF_TEST1:
 | 
					  case PF_TEST1:
 | 
				
			||||||
    value = params.test[0];
 | 
					    value = params.test[0];
 | 
				
			||||||
 | 
				
			|||||||
@ -174,7 +174,7 @@
 | 
				
			|||||||
  </Texts>
 | 
					  </Texts>
 | 
				
			||||||
  <Typographies>
 | 
					  <Typographies>
 | 
				
			||||||
    <Typography Id="Default" Font="verdana.ttf" Size="20" Bpp="4" Direction="LTR" FallbackCharacter="?" WildcardCharacters="! "" WildcardCharacterRanges="#-~" />
 | 
					    <Typography Id="Default" Font="verdana.ttf" Size="20" Bpp="4" Direction="LTR" FallbackCharacter="?" WildcardCharacters="! "" WildcardCharacterRanges="#-~" />
 | 
				
			||||||
    <Typography Id="Chinat_Large" Font="CHINN___.ttf" Size="30" Bpp="4" Direction="LTR" FallbackCharacter="?" WildcardCharacters="8 9" WildcardCharacterRanges="a-z,A-Z,0-7" />
 | 
					    <Typography Id="Chinat_Large" Font="CHINN___.ttf" Size="30" Bpp="4" Direction="LTR" FallbackCharacter="?" WildcardCharacters="8 9-" WildcardCharacterRanges="a-z,A-Z,0-7" />
 | 
				
			||||||
    <Typography Id="Chinat_Small" Font="CHINN___.ttf" Size="20" Bpp="4" Direction="LTR" FallbackCharacter="?" WildcardCharacters="_ ." WildcardCharacterRanges="0-9,a-z,A-Z" />
 | 
					    <Typography Id="Chinat_Small" Font="CHINN___.ttf" Size="20" Bpp="4" Direction="LTR" FallbackCharacter="?" WildcardCharacters="_ ." WildcardCharacterRanges="0-9,a-z,A-Z" />
 | 
				
			||||||
    <Typography Id="Chinat_Huge" Font="CHINN___.ttf" Size="40" Bpp="4" Direction="LTR" FallbackCharacter="?" />
 | 
					    <Typography Id="Chinat_Huge" Font="CHINN___.ttf" Size="40" Bpp="4" Direction="LTR" FallbackCharacter="?" />
 | 
				
			||||||
    <Typography Id="Numbers" Font="lucon.TTF" Size="50" Bpp="4" Direction="LTR" FallbackCharacter="?" WildcardCharacters=". ," WildcardCharacterRanges="0-9" />
 | 
					    <Typography Id="Numbers" Font="lucon.TTF" Size="50" Bpp="4" Direction="LTR" FallbackCharacter="?" WildcardCharacters=". ," WildcardCharacterRanges="0-9" />
 | 
				
			||||||
 | 
				
			|||||||
@ -1,4 +1,5 @@
 | 
				
			|||||||
32
 | 
					32
 | 
				
			||||||
 | 
					45
 | 
				
			||||||
48
 | 
					48
 | 
				
			||||||
49
 | 
					49
 | 
				
			||||||
50
 | 
					50
 | 
				
			||||||
 | 
				
			|||||||
@ -1,5 +1,6 @@
 | 
				
			|||||||
AH:0 BA:1 FC:63 EC:0 FF:0 CF:0
 | 
					AH:0 BA:1 FC:63 EC:0 FF:0 CF:0
 | 
				
			||||||
32
 | 
					32
 | 
				
			||||||
 | 
					45
 | 
				
			||||||
48
 | 
					48
 | 
				
			||||||
49
 | 
					49
 | 
				
			||||||
50
 | 
					50
 | 
				
			||||||
 | 
				
			|||||||
@ -4,6 +4,10 @@ FONT_GLYPH_LOCATION_FLASH_PRAGMA
 | 
				
			|||||||
KEEP extern const uint8_t unicodes_CHINN____30_4bpp_0[] FONT_GLYPH_LOCATION_FLASH_ATTRIBUTE = {
 | 
					KEEP extern const uint8_t unicodes_CHINN____30_4bpp_0[] FONT_GLYPH_LOCATION_FLASH_ATTRIBUTE = {
 | 
				
			||||||
    // Unicode: [0x0020, space]
 | 
					    // Unicode: [0x0020, space]
 | 
				
			||||||
    // (Has no glyph data)
 | 
					    // (Has no glyph data)
 | 
				
			||||||
 | 
					    // Unicode: [0x002D, hyphen]
 | 
				
			||||||
 | 
					    0xF3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x08, 0xF3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x08, 0xF3, 0xFF,
 | 
				
			||||||
 | 
					    0xFF, 0xFF, 0xFF, 0xFF, 0x08, 0xF3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x08, 0xF3, 0xFF, 0xFF, 0xFF,
 | 
				
			||||||
 | 
					    0xFF, 0xFF, 0x08,
 | 
				
			||||||
    // Unicode: [0x0030, zero]
 | 
					    // Unicode: [0x0030, zero]
 | 
				
			||||||
    0x00, 0x00, 0xA5, 0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0x29, 0x00, 0x00, 0x00,
 | 
					    0x00, 0x00, 0xA5, 0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0x29, 0x00, 0x00, 0x00,
 | 
				
			||||||
    0xC2, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x07, 0x00, 0x10, 0xFD,
 | 
					    0xC2, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x07, 0x00, 0x10, 0xFD,
 | 
				
			||||||
 | 
				
			|||||||
@ -5,70 +5,71 @@
 | 
				
			|||||||
FONT_TABLE_LOCATION_FLASH_PRAGMA
 | 
					FONT_TABLE_LOCATION_FLASH_PRAGMA
 | 
				
			||||||
KEEP extern const touchgfx::GlyphNode glyphs_CHINN____30_4bpp[] FONT_TABLE_LOCATION_FLASH_ATTRIBUTE = {
 | 
					KEEP extern const touchgfx::GlyphNode glyphs_CHINN____30_4bpp[] FONT_TABLE_LOCATION_FLASH_ATTRIBUTE = {
 | 
				
			||||||
    {     0, 0x0020,   0,   0,   0,   0,   8,   0,   0, 0x00 }, // space
 | 
					    {     0, 0x0020,   0,   0,   0,   0,   8,   0,   0, 0x00 }, // space
 | 
				
			||||||
    {     0, 0x0030,  29,  20,  20,   0,  30,   0,   0, 0x00 }, // zero
 | 
					    {     0, 0x002D,  13,   5,  12,   0,  13,   0,   0, 0x00 }, // hyphen
 | 
				
			||||||
    {   300, 0x0031,  14,  20,  20,   5,  30,   0,   0, 0x00 }, // one
 | 
					    {    35, 0x0030,  29,  20,  20,   0,  30,   0,   0, 0x00 }, // zero
 | 
				
			||||||
    {   440, 0x0032,  29,  20,  20,   0,  30,   0,   0, 0x00 }, // two
 | 
					    {   335, 0x0031,  14,  20,  20,   5,  30,   0,   0, 0x00 }, // one
 | 
				
			||||||
    {   740, 0x0033,  29,  20,  20,   0,  30,   0,   0, 0x00 }, // three
 | 
					    {   475, 0x0032,  29,  20,  20,   0,  30,   0,   0, 0x00 }, // two
 | 
				
			||||||
    {  1040, 0x0034,  29,  20,  20,   0,  30,   0,   0, 0x00 }, // four
 | 
					    {   775, 0x0033,  29,  20,  20,   0,  30,   0,   0, 0x00 }, // three
 | 
				
			||||||
    {  1340, 0x0035,  29,  20,  20,   0,  30,   0,   0, 0x00 }, // five
 | 
					    {  1075, 0x0034,  29,  20,  20,   0,  30,   0,   0, 0x00 }, // four
 | 
				
			||||||
    {  1640, 0x0036,  29,  20,  20,   0,  30,   0,   0, 0x00 }, // six
 | 
					    {  1375, 0x0035,  29,  20,  20,   0,  30,   0,   0, 0x00 }, // five
 | 
				
			||||||
    {  1940, 0x0037,  29,  20,  20,   0,  30,   0,   0, 0x00 }, // seven
 | 
					    {  1675, 0x0036,  29,  20,  20,   0,  30,   0,   0, 0x00 }, // six
 | 
				
			||||||
    {  2240, 0x0038,  29,  20,  20,   0,  30,   0,   0, 0x00 }, // eight
 | 
					    {  1975, 0x0037,  29,  20,  20,   0,  30,   0,   0, 0x00 }, // seven
 | 
				
			||||||
    {  2540, 0x0039,  29,  20,  20,   0,  30,   0,   0, 0x00 }, // nine
 | 
					    {  2275, 0x0038,  29,  20,  20,   0,  30,   0,   0, 0x00 }, // eight
 | 
				
			||||||
    {  2840, 0x003A,   7,  14,  14,   1,   8,   0,   0, 0x00 }, // colon
 | 
					    {  2575, 0x0039,  29,  20,  20,   0,  30,   0,   0, 0x00 }, // nine
 | 
				
			||||||
    {  2896, 0x003F,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // question
 | 
					    {  2875, 0x003A,   7,  14,  14,   1,   8,   0,   0, 0x00 }, // colon
 | 
				
			||||||
    {  3196, 0x0041,  29,  20,  20,  -1,  27,   0,   0, 0x00 }, // A
 | 
					    {  2931, 0x003F,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // question
 | 
				
			||||||
    {  3496, 0x0042,  30,  20,  20,   0,  31,   0,   0, 0x00 }, // B
 | 
					    {  3231, 0x0041,  29,  20,  20,  -1,  27,   0,   0, 0x00 }, // A
 | 
				
			||||||
    {  3796, 0x0043,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // C
 | 
					    {  3531, 0x0042,  30,  20,  20,   0,  31,   0,   0, 0x00 }, // B
 | 
				
			||||||
    {  4096, 0x0044,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // D
 | 
					    {  3831, 0x0043,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // C
 | 
				
			||||||
    {  4396, 0x0045,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // E
 | 
					    {  4131, 0x0044,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // D
 | 
				
			||||||
    {  4696, 0x0046,  29,  20,  20,   0,  29,   0,   0, 0x00 }, // F
 | 
					    {  4431, 0x0045,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // E
 | 
				
			||||||
    {  4996, 0x0047,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // G
 | 
					    {  4731, 0x0046,  29,  20,  20,   0,  29,   0,   0, 0x00 }, // F
 | 
				
			||||||
    {  5296, 0x0048,  30,  20,  20,   0,  31,   0,   0, 0x00 }, // H
 | 
					    {  5031, 0x0047,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // G
 | 
				
			||||||
    {  5596, 0x0049,   6,  20,  20,   0,   7,   0,   0, 0x00 }, // I
 | 
					    {  5331, 0x0048,  30,  20,  20,   0,  31,   0,   0, 0x00 }, // H
 | 
				
			||||||
    {  5656, 0x004A,  30,  20,  20,  -1,  29,   0,   0, 0x00 }, // J
 | 
					    {  5631, 0x0049,   6,  20,  20,   0,   7,   0,   0, 0x00 }, // I
 | 
				
			||||||
    {  5956, 0x004B,  30,  20,  20,   0,  29,   0,   0, 0x00 }, // K
 | 
					    {  5691, 0x004A,  30,  20,  20,  -1,  29,   0,   0, 0x00 }, // J
 | 
				
			||||||
    {  6256, 0x004C,  30,  20,  20,   0,  29,   0,   0, 0x00 }, // L
 | 
					    {  5991, 0x004B,  30,  20,  20,   0,  29,   0,   0, 0x00 }, // K
 | 
				
			||||||
    {  6556, 0x004D,  32,  20,  20,   0,  32,   0,   0, 0x00 }, // M
 | 
					    {  6291, 0x004C,  30,  20,  20,   0,  29,   0,   0, 0x00 }, // L
 | 
				
			||||||
    {  6876, 0x004E,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // N
 | 
					    {  6591, 0x004D,  32,  20,  20,   0,  32,   0,   0, 0x00 }, // M
 | 
				
			||||||
    {  7176, 0x004F,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // O
 | 
					    {  6911, 0x004E,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // N
 | 
				
			||||||
    {  7476, 0x0050,  31,  20,  20,   0,  31,   0,   0, 0x00 }, // P
 | 
					    {  7211, 0x004F,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // O
 | 
				
			||||||
    {  7796, 0x0051,  31,  20,  20,   0,  31,   0,   0, 0x00 }, // Q
 | 
					    {  7511, 0x0050,  31,  20,  20,   0,  31,   0,   0, 0x00 }, // P
 | 
				
			||||||
    {  8116, 0x0052,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // R
 | 
					    {  7831, 0x0051,  31,  20,  20,   0,  31,   0,   0, 0x00 }, // Q
 | 
				
			||||||
    {  8416, 0x0053,  32,  20,  20,   0,  32,   0,   0, 0x00 }, // S
 | 
					    {  8151, 0x0052,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // R
 | 
				
			||||||
    {  8736, 0x0054,  30,  20,  20,  -1,  28,   0,   0, 0x00 }, // T
 | 
					    {  8451, 0x0053,  32,  20,  20,   0,  32,   0,   0, 0x00 }, // S
 | 
				
			||||||
    {  9036, 0x0055,  30,  20,  20,   0,  31,   0,   0, 0x00 }, // U
 | 
					    {  8771, 0x0054,  30,  20,  20,  -1,  28,   0,   0, 0x00 }, // T
 | 
				
			||||||
    {  9336, 0x0056,  29,  20,  20,  -1,  27,   0,   0, 0x00 }, // V
 | 
					    {  9071, 0x0055,  30,  20,  20,   0,  31,   0,   0, 0x00 }, // U
 | 
				
			||||||
    {  9636, 0x0057,  28,  20,  20,   0,  28,   0,   0, 0x00 }, // W
 | 
					    {  9371, 0x0056,  29,  20,  20,  -1,  27,   0,   0, 0x00 }, // V
 | 
				
			||||||
    {  9916, 0x0058,  29,  20,  20,   0,  28,   0,   0, 0x00 }, // X
 | 
					    {  9671, 0x0057,  28,  20,  20,   0,  28,   0,   0, 0x00 }, // W
 | 
				
			||||||
    { 10216, 0x0059,  28,  20,  20,  -1,  27,   0,   0, 0x00 }, // Y
 | 
					    {  9951, 0x0058,  29,  20,  20,   0,  28,   0,   0, 0x00 }, // X
 | 
				
			||||||
    { 10496, 0x005A,  33,  20,  20,   0,  32,   0,   0, 0x00 }, // Z
 | 
					    { 10251, 0x0059,  28,  20,  20,  -1,  27,   0,   0, 0x00 }, // Y
 | 
				
			||||||
    { 10836, 0x0061,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // a
 | 
					    { 10531, 0x005A,  33,  20,  20,   0,  32,   0,   0, 0x00 }, // Z
 | 
				
			||||||
    { 11136, 0x0062,  30,  20,  20,   0,  31,   0,   0, 0x00 }, // b
 | 
					    { 10871, 0x0061,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // a
 | 
				
			||||||
    { 11436, 0x0063,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // c
 | 
					    { 11171, 0x0062,  30,  20,  20,   0,  31,   0,   0, 0x00 }, // b
 | 
				
			||||||
    { 11736, 0x0064,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // d
 | 
					    { 11471, 0x0063,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // c
 | 
				
			||||||
    { 12036, 0x0065,  29,  20,  20,   0,  30,   0,   0, 0x00 }, // e
 | 
					    { 11771, 0x0064,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // d
 | 
				
			||||||
    { 12336, 0x0066,  29,  20,  20,   0,  29,   0,   0, 0x00 }, // f
 | 
					    { 12071, 0x0065,  29,  20,  20,   0,  30,   0,   0, 0x00 }, // e
 | 
				
			||||||
    { 12636, 0x0067,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // g
 | 
					    { 12371, 0x0066,  29,  20,  20,   0,  29,   0,   0, 0x00 }, // f
 | 
				
			||||||
    { 12936, 0x0068,  30,  20,  20,   0,  31,   0,   0, 0x00 }, // h
 | 
					    { 12671, 0x0067,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // g
 | 
				
			||||||
    { 13236, 0x0069,   6,  20,  20,   0,   7,   0,   0, 0x00 }, // i
 | 
					    { 12971, 0x0068,  30,  20,  20,   0,  31,   0,   0, 0x00 }, // h
 | 
				
			||||||
    { 13296, 0x006A,  30,  20,  20,  -1,  29,   0,   0, 0x00 }, // j
 | 
					    { 13271, 0x0069,   6,  20,  20,   0,   7,   0,   0, 0x00 }, // i
 | 
				
			||||||
    { 13596, 0x006B,  30,  20,  20,   0,  29,   0,   0, 0x00 }, // k
 | 
					    { 13331, 0x006A,  30,  20,  20,  -1,  29,   0,   0, 0x00 }, // j
 | 
				
			||||||
    { 13896, 0x006C,  22,  20,  20,   0,  21,   0,   0, 0x00 }, // l
 | 
					    { 13631, 0x006B,  30,  20,  20,   0,  29,   0,   0, 0x00 }, // k
 | 
				
			||||||
    { 14116, 0x006D,  29,  20,  20,   0,  30,   0,   0, 0x00 }, // m
 | 
					    { 13931, 0x006C,  22,  20,  20,   0,  21,   0,   0, 0x00 }, // l
 | 
				
			||||||
    { 14416, 0x006E,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // n
 | 
					    { 14151, 0x006D,  29,  20,  20,   0,  30,   0,   0, 0x00 }, // m
 | 
				
			||||||
    { 14716, 0x006F,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // o
 | 
					    { 14451, 0x006E,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // n
 | 
				
			||||||
    { 15016, 0x0070,  29,  20,  20,   0,  29,   0,   0, 0x00 }, // p
 | 
					    { 14751, 0x006F,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // o
 | 
				
			||||||
    { 15316, 0x0071,  31,  20,  20,   0,  31,   0,   0, 0x00 }, // q
 | 
					    { 15051, 0x0070,  29,  20,  20,   0,  29,   0,   0, 0x00 }, // p
 | 
				
			||||||
    { 15636, 0x0072,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // r
 | 
					    { 15351, 0x0071,  31,  20,  20,   0,  31,   0,   0, 0x00 }, // q
 | 
				
			||||||
    { 15936, 0x0073,  32,  20,  20,   0,  32,   0,   0, 0x00 }, // s
 | 
					    { 15671, 0x0072,  30,  20,  20,   0,  30,   0,   0, 0x00 }, // r
 | 
				
			||||||
    { 16256, 0x0074,  30,  20,  20,  -1,  28,   0,   0, 0x00 }, // t
 | 
					    { 15971, 0x0073,  32,  20,  20,   0,  32,   0,   0, 0x00 }, // s
 | 
				
			||||||
    { 16556, 0x0075,  30,  20,  20,   0,  31,   0,   0, 0x00 }, // u
 | 
					    { 16291, 0x0074,  30,  20,  20,  -1,  28,   0,   0, 0x00 }, // t
 | 
				
			||||||
    { 16856, 0x0076,  29,  20,  20,  -1,  27,   0,   0, 0x00 }, // v
 | 
					    { 16591, 0x0075,  30,  20,  20,   0,  31,   0,   0, 0x00 }, // u
 | 
				
			||||||
    { 17156, 0x0077,  33,  20,  20,   0,  33,   0,   0, 0x00 }, // w
 | 
					    { 16891, 0x0076,  29,  20,  20,  -1,  27,   0,   0, 0x00 }, // v
 | 
				
			||||||
    { 17496, 0x0078,  29,  20,  20,   0,  28,   0,   0, 0x00 }, // x
 | 
					    { 17191, 0x0077,  33,  20,  20,   0,  33,   0,   0, 0x00 }, // w
 | 
				
			||||||
    { 17796, 0x0079,  30,  20,  20,   0,  31,   0,   0, 0x00 }, // y
 | 
					    { 17531, 0x0078,  29,  20,  20,   0,  28,   0,   0, 0x00 }, // x
 | 
				
			||||||
    { 18096, 0x007A,  33,  20,  20,   0,  32,   0,   0, 0x00 }  // z
 | 
					    { 17831, 0x0079,  30,  20,  20,   0,  31,   0,   0, 0x00 }, // y
 | 
				
			||||||
 | 
					    { 18131, 0x007A,  33,  20,  20,   0,  32,   0,   0, 0x00 }  // z
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// CHINN____30_4bpp
 | 
					// CHINN____30_4bpp
 | 
				
			||||||
@ -86,6 +87,6 @@ touchgfx::GeneratedFont& getFont_CHINN____30_4bpp();
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
touchgfx::GeneratedFont& getFont_CHINN____30_4bpp()
 | 
					touchgfx::GeneratedFont& getFont_CHINN____30_4bpp()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    static touchgfx::GeneratedFont CHINN____30_4bpp(glyphs_CHINN____30_4bpp, 65, 30, 30, 0, 0, 4, 1, 1, 1, unicodes_CHINN____30_4bpp, kerning_CHINN____30_4bpp, 63, 0, 0, 0);
 | 
					    static touchgfx::GeneratedFont CHINN____30_4bpp(glyphs_CHINN____30_4bpp, 66, 30, 30, 0, 0, 4, 1, 1, 1, unicodes_CHINN____30_4bpp, kerning_CHINN____30_4bpp, 63, 0, 0, 0);
 | 
				
			||||||
    return CHINN____30_4bpp;
 | 
					    return CHINN____30_4bpp;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -278,41 +278,12 @@ static_assert(sizeof(dataFieldDescs) / sizeof(dataFieldDescs[0]) ==
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#define PARAM_FIELD(FIELD) []() { return (void *)¶ms.FIELD; }
 | 
					#define PARAM_FIELD(FIELD) []() { return (void *)¶ms.FIELD; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void inc_bbal(void *valPtr) {
 | 
					 | 
				
			||||||
  // float *val = (float *)valPtr;
 | 
					 | 
				
			||||||
  // *val += 0.1f;
 | 
					 | 
				
			||||||
  // if (*val > 100.0f) {
 | 
					 | 
				
			||||||
  //   *val = 100.0f;
 | 
					 | 
				
			||||||
  // }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
void dec_bbal(void *valPtr) {
 | 
					 | 
				
			||||||
  // float *val = (float *)valPtr;
 | 
					 | 
				
			||||||
  // *val -= 0.1f;
 | 
					 | 
				
			||||||
  // if (*val < 0.0f) {
 | 
					 | 
				
			||||||
  //   *val = 0.0f;
 | 
					 | 
				
			||||||
  // }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
void inc_int(void *valPtr) {
 | 
					 | 
				
			||||||
  // int *val = (int *)valPtr;
 | 
					 | 
				
			||||||
  // *val += 1;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
void dec_int(void *valPtr) {
 | 
					 | 
				
			||||||
  // int *val = (int *)valPtr;
 | 
					 | 
				
			||||||
  // *val -= 1;
 | 
					 | 
				
			||||||
  // if (*val < 0) {
 | 
					 | 
				
			||||||
  //   *val = 0;
 | 
					 | 
				
			||||||
  // }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
NamedFieldDescription paramFieldDescs[] = {
 | 
					NamedFieldDescription paramFieldDescs[] = {
 | 
				
			||||||
    [PF_BBAL] = {NamedFieldKind::Float, "BBAL", 2, 1, PARAM_FIELD(bbal)},
 | 
					    [PF_BBAL] = {NamedFieldKind::Float, "BBAL", 2, 1, PARAM_FIELD(bbal)},
 | 
				
			||||||
    [PF_TC1] = {NamedFieldKind::Int, "TC1", 2, 0, PARAM_FIELD(tc1)},
 | 
					    [PF_SLIPREF] = {NamedFieldKind::Float, "SLIPREF", 2, 2,
 | 
				
			||||||
    [PF_TC2] = {NamedFieldKind::Int, "TC2", 2, 0, PARAM_FIELD(tc2)},
 | 
					                    PARAM_FIELD(slipref)},
 | 
				
			||||||
    [PF_TORQUEMAP] = {NamedFieldKind::Int, "MAP", 2, 0,
 | 
					    [PF_ASRP] = {NamedFieldKind::Int, "ASR-P", 2, 0, PARAM_FIELD(asrp)},
 | 
				
			||||||
                      PARAM_FIELD(torque_map)},
 | 
					    [PF_ASRON] = {NamedFieldKind::Int, "ASR-ON", 2, 0, PARAM_FIELD(asron)},
 | 
				
			||||||
    [PF_TEST1] = {NamedFieldKind::Int, "TEST1", 2, 0, PARAM_FIELD(test[0])},
 | 
					    [PF_TEST1] = {NamedFieldKind::Int, "TEST1", 2, 0, PARAM_FIELD(test[0])},
 | 
				
			||||||
    [PF_TEST2] = {NamedFieldKind::Int, "TEST2", 2, 0, PARAM_FIELD(test[1])},
 | 
					    [PF_TEST2] = {NamedFieldKind::Int, "TEST2", 2, 0, PARAM_FIELD(test[1])},
 | 
				
			||||||
    [PF_TEST3] = {NamedFieldKind::Int, "TEST3", 2, 0, PARAM_FIELD(test[2])},
 | 
					    [PF_TEST3] = {NamedFieldKind::Int, "TEST3", 2, 0, PARAM_FIELD(test[2])},
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user