Browse Source

Fix testcases and hex values.

jeroen
Jeroen Vreeken 3 years ago
parent
commit
c54185dd04
4 changed files with 7 additions and 4 deletions
  1. +1
    -2
      controller/block/block_setpoint_generator_3d.test.ctrl
  2. +4
    -1
      controller/controller/controller_load_parser.l
  3. +1
    -1
      controller/packet/packet.test.ctrl
  4. +1
    -0
      controller/packet/packet_eth.ctrl

+ 1
- 2
controller/block/block_setpoint_generator_3d.test.ctrl View File

@ -65,7 +65,6 @@ params {
{ "command", "command", "spg", $[SPEED], 201, -33.0 }
{ "command", "command", "spg", $[SPEED], 201, -33.0 }
{ "command", "command", "spg", $[SPEED], 201, -33.0 }
{ "command", "command", "spg", $[SPEED], 201, -33.0 }
{ "command", "command", "spg", $[SETPOINT_TRACK], 301, 999.0 }
{ "reset", "value", 12,
@ -125,7 +124,7 @@ params {
{ "id", "value", 22,
(int) { (int)0xffffffff, 123, 123, 123, 123, 123, 124, 125, 126, 200,
(int)0xffffffff, 201, 201, 201, 201, 201, 201, 201, 201, 201,
(int)0xffffffff, 127, 201, 201, 201, 201, 201, 201, 201, 201,
301, (int)0xffffffff }
}
}


+ 4
- 1
controller/controller/controller_load_parser.l View File

@ -60,7 +60,7 @@ double {doublesimple}|{doubleexp}
int {number}+
unsignedlong ("0x"|"0X"){hexdigit}{5,}
unsignedlong ("0x"|"0X"){hexdigit}{1,}
floatcast "("[ \t]*"float"[ \t]*")"
doublecast "("[ \t]*"double"[ \t]*")"
@ -165,3 +165,6 @@ boolcast "("[ \t]*"bool"[ \t]*")"
%%
int yywrap(yyscan_t scanner) { return 1; }
/* Dummy reference to prevent 'unused' errors */
void *controller_load_parser_l_dummy[] = { yy_fatal_error };

+ 1
- 1
controller/packet/packet.test.ctrl View File

@ -7,7 +7,7 @@ blocks (1.0, 0.0) {
{ "packet_sim", "packet" }
{ "packet_out_bool_byte", "bool4", "packet", 4 }
{ "packet_out_float_be", "float0", "packet", 0 }
{ "packet_in_float_be", "float32", "packet", 0x20 }
{ "packet_in_float_be", "float32", "packet", (int)0x20 }
{ "test_input_bool", "test_bool" }
{ "test_input_float", "test_float" }


+ 1
- 0
controller/packet/packet_eth.ctrl View File

@ -12,6 +12,7 @@ blocks (100.0, 0.0) {
{ "packet_in_float_be", "positionff", "packet", 16 }
{ "packet_in_float_be", "pid", "packet", 20 }
{ "packet_in_float_be", "motor_I", "packet", 24 }
{ "packet_in_bool_byte", "homed", "packet", 28 }
# { "debug", "debug_position" }
# { "debug", "debug_stick" }
# { "debug", "debug_speed" }


Loading…
Cancel
Save