Skip to content

Commit

Permalink
Merge branch 'hotfix/JoyCarFixedPorts'
Browse files Browse the repository at this point in the history
  • Loading branch information
@bjost2s
bjost2s committed Jan 12, 2024
2 parents 7164509 + 697226e commit 0690077
Show file tree
Hide file tree
Showing 21 changed files with 141 additions and 141 deletions.
14 changes: 7 additions & 7 deletions .../test/resources/crossCompilerTests/robotSpecific/joycar/action_LED_matrix_on_off_test.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,31 +224,31 @@
<statement name="BUS">
<block type="robConf_encoder" id="S(Xm/UHHH;N[4Km1TML1" intask="true" movable="false">
<field name="NAME">EL</field>
<field name="PORT">SPEED_L</field>
<field name="BRICK_PORT">SPEED_L</field>
</block>
<block type="robConf_encoder" id="S(Xm/UHHH;N[4Km1TML2" intask="true" movable="false">
<field name="NAME">ER</field>
<field name="PORT">SPEED_R</field>
<field name="BRICK_PORT">SPEED_R</field>
</block>
<block type="robConf_infrared" id="S(Xm/UHHH;N[4Km1TML6" intask="true" movable="false">
<field name="NAME">OL</field>
<field name="PORT">OBSTCL_L</field>
<field name="BRICK_PORT">OBSTCL_L</field>
</block>
<block type="robConf_infrared" id="S(Xm/UHHH;N[4Km1TML7" intask="true" movable="false">
<field name="NAME">OR</field>
<field name="PORT">OBSTCL_R</field>
<field name="BRICK_PORT">OBSTCL_R</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML3" intask="true" movable="false">
<field name="NAME">LL</field>
<field name="PORT">LINE_TRK_L</field>
<field name="BRICK_PORT">LINE_TRK_L</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML4" intask="true" movable="false">
<field name="NAME">LM</field>
<field name="PORT">LINE_TRK_M</field>
<field name="BRICK_PORT">LINE_TRK_M</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML5" intask="true" movable="false">
<field name="NAME">LR</field>
<field name="PORT">LINE_TRK_R</field>
<field name="BRICK_PORT">LINE_TRK_R</field>
</block>
</statement>
</block>
Expand Down
14 changes: 7 additions & 7 deletions ...er/src/test/resources/crossCompilerTests/robotSpecific/joycar/action_digital_pin_test.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,31 +121,31 @@
<statement name="BUS">
<block type="robConf_encoder" id="S(Xm/UHHH;N[4Km1TML1" intask="true" movable="false">
<field name="NAME">EL</field>
<field name="PORT">SPEED_L</field>
<field name="BRICK_PORT">SPEED_L</field>
</block>
<block type="robConf_encoder" id="S(Xm/UHHH;N[4Km1TML2" intask="true" movable="false">
<field name="NAME">ER</field>
<field name="PORT">SPEED_R</field>
<field name="BRICK_PORT">SPEED_R</field>
</block>
<block type="robConf_infrared" id="S(Xm/UHHH;N[4Km1TML6" intask="true" movable="false">
<field name="NAME">OL</field>
<field name="PORT">OBSTCL_L</field>
<field name="BRICK_PORT">OBSTCL_L</field>
</block>
<block type="robConf_infrared" id="S(Xm/UHHH;N[4Km1TML7" intask="true" movable="false">
<field name="NAME">OR</field>
<field name="PORT">OBSTCL_R</field>
<field name="BRICK_PORT">OBSTCL_R</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML3" intask="true" movable="false">
<field name="NAME">LL</field>
<field name="PORT">LINE_TRK_L</field>
<field name="BRICK_PORT">LINE_TRK_L</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML4" intask="true" movable="false">
<field name="NAME">LM</field>
<field name="PORT">LINE_TRK_M</field>
<field name="BRICK_PORT">LINE_TRK_M</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML5" intask="true" movable="false">
<field name="NAME">LR</field>
<field name="PORT">LINE_TRK_R</field>
<field name="BRICK_PORT">LINE_TRK_R</field>
</block>
</statement>
</block>
Expand Down
14 changes: 7 additions & 7 deletions ...Server/src/test/resources/crossCompilerTests/robotSpecific/joycar/action_display_test.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1557,31 +1557,31 @@
<statement name="BUS">
<block type="robConf_encoder" id="S(Xm/UHHH;N[4Km1TML1" intask="true" movable="false">
<field name="NAME">EL</field>
<field name="PORT">SPEED_L</field>
<field name="BRICK_PORT">SPEED_L</field>
</block>
<block type="robConf_encoder" id="S(Xm/UHHH;N[4Km1TML2" intask="true" movable="false">
<field name="NAME">ER</field>
<field name="PORT">SPEED_R</field>
<field name="BRICK_PORT">SPEED_R</field>
</block>
<block type="robConf_infrared" id="S(Xm/UHHH;N[4Km1TML6" intask="true" movable="false">
<field name="NAME">OL</field>
<field name="PORT">OBSTCL_L</field>
<field name="BRICK_PORT">OBSTCL_L</field>
</block>
<block type="robConf_infrared" id="S(Xm/UHHH;N[4Km1TML7" intask="true" movable="false">
<field name="NAME">OR</field>
<field name="PORT">OBSTCL_R</field>
<field name="BRICK_PORT">OBSTCL_R</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML3" intask="true" movable="false">
<field name="NAME">LL</field>
<field name="PORT">LINE_TRK_L</field>
<field name="BRICK_PORT">LINE_TRK_L</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML4" intask="true" movable="false">
<field name="NAME">LM</field>
<field name="PORT">LINE_TRK_M</field>
<field name="BRICK_PORT">LINE_TRK_M</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML5" intask="true" movable="false">
<field name="NAME">LR</field>
<field name="PORT">LINE_TRK_R</field>
<field name="BRICK_PORT">LINE_TRK_R</field>
</block>
</statement>
</block>
Expand Down
14 changes: 7 additions & 7 deletions ...taServer/src/test/resources/crossCompilerTests/robotSpecific/joycar/action_drive_test.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,31 +256,31 @@
<statement name="BUS">
<block type="robConf_encoder" id="S(Xm/UHHH;N[4Km1TML1" intask="true" movable="false">
<field name="NAME">EL</field>
<field name="PORT">SPEED_L</field>
<field name="BRICK_PORT">SPEED_L</field>
</block>
<block type="robConf_encoder" id="S(Xm/UHHH;N[4Km1TML2" intask="true" movable="false">
<field name="NAME">ER</field>
<field name="PORT">SPEED_R</field>
<field name="BRICK_PORT">SPEED_R</field>
</block>
<block type="robConf_infrared" id="S(Xm/UHHH;N[4Km1TML6" intask="true" movable="false">
<field name="NAME">OL</field>
<field name="PORT">OBSTCL_L</field>
<field name="BRICK_PORT">OBSTCL_L</field>
</block>
<block type="robConf_infrared" id="S(Xm/UHHH;N[4Km1TML7" intask="true" movable="false">
<field name="NAME">OR</field>
<field name="PORT">OBSTCL_R</field>
<field name="BRICK_PORT">OBSTCL_R</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML3" intask="true" movable="false">
<field name="NAME">LL</field>
<field name="PORT">LINE_TRK_L</field>
<field name="BRICK_PORT">LINE_TRK_L</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML4" intask="true" movable="false">
<field name="NAME">LM</field>
<field name="PORT">LINE_TRK_M</field>
<field name="BRICK_PORT">LINE_TRK_M</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML5" intask="true" movable="false">
<field name="NAME">LR</field>
<field name="PORT">LINE_TRK_R</field>
<field name="BRICK_PORT">LINE_TRK_R</field>
</block>
</statement>
</block>
Expand Down
14 changes: 7 additions & 7 deletions .../resources/crossCompilerTests/robotSpecific/joycar/action_drive_turn_steer_block_test.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1130,31 +1130,31 @@
<statement name="BUS">
<block type="robConf_encoder" id="S(Xm/UHHH;N[4Km1TML1" intask="true" movable="false">
<field name="NAME">EL</field>
<field name="PORT">SPEED_L</field>
<field name="BRICK_PORT">SPEED_L</field>
</block>
<block type="robConf_encoder" id="S(Xm/UHHH;N[4Km1TML2" intask="true" movable="false">
<field name="NAME">ER</field>
<field name="PORT">SPEED_R</field>
<field name="BRICK_PORT">SPEED_R</field>
</block>
<block type="robConf_infrared" id="S(Xm/UHHH;N[4Km1TML6" intask="true" movable="false">
<field name="NAME">OL</field>
<field name="PORT">OBSTCL_L</field>
<field name="BRICK_PORT">OBSTCL_L</field>
</block>
<block type="robConf_infrared" id="S(Xm/UHHH;N[4Km1TML7" intask="true" movable="false">
<field name="NAME">OR</field>
<field name="PORT">OBSTCL_R</field>
<field name="BRICK_PORT">OBSTCL_R</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML3" intask="true" movable="false">
<field name="NAME">LL</field>
<field name="PORT">LINE_TRK_L</field>
<field name="BRICK_PORT">LINE_TRK_L</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML4" intask="true" movable="false">
<field name="NAME">LM</field>
<field name="PORT">LINE_TRK_M</field>
<field name="BRICK_PORT">LINE_TRK_M</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML5" intask="true" movable="false">
<field name="NAME">LR</field>
<field name="PORT">LINE_TRK_R</field>
<field name="BRICK_PORT">LINE_TRK_R</field>
</block>
</statement>
</block>
Expand Down
14 changes: 7 additions & 7 deletions ...t/resources/crossCompilerTests/robotSpecific/joycar/action_move_motor_left_right_test.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,31 +301,31 @@
<statement name="BUS">
<block type="robConf_encoder" id="S(Xm/UHHH;N[4Km1TML1" intask="true" movable="false">
<field name="NAME">EL</field>
<field name="PORT">SPEED_L</field>
<field name="BRICK_PORT">SPEED_L</field>
</block>
<block type="robConf_encoder" id="S(Xm/UHHH;N[4Km1TML2" intask="true" movable="false">
<field name="NAME">ER</field>
<field name="PORT">SPEED_R</field>
<field name="BRICK_PORT">SPEED_R</field>
</block>
<block type="robConf_infrared" id="S(Xm/UHHH;N[4Km1TML6" intask="true" movable="false">
<field name="NAME">OL</field>
<field name="PORT">OBSTCL_L</field>
<field name="BRICK_PORT">OBSTCL_L</field>
</block>
<block type="robConf_infrared" id="S(Xm/UHHH;N[4Km1TML7" intask="true" movable="false">
<field name="NAME">OR</field>
<field name="PORT">OBSTCL_R</field>
<field name="BRICK_PORT">OBSTCL_R</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML3" intask="true" movable="false">
<field name="NAME">LL</field>
<field name="PORT">LINE_TRK_L</field>
<field name="BRICK_PORT">LINE_TRK_L</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML4" intask="true" movable="false">
<field name="NAME">LM</field>
<field name="PORT">LINE_TRK_M</field>
<field name="BRICK_PORT">LINE_TRK_M</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML5" intask="true" movable="false">
<field name="NAME">LR</field>
<field name="PORT">LINE_TRK_R</field>
<field name="BRICK_PORT">LINE_TRK_R</field>
</block>
</statement>
</block>
Expand Down
14 changes: 7 additions & 7 deletions ...taServer/src/test/resources/crossCompilerTests/robotSpecific/joycar/action_servo_test.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,31 +162,31 @@
<statement name="BUS">
<block type="robConf_encoder" id="S(Xm/UHHH;N[4Km1TML1" intask="true" movable="false">
<field name="NAME">EL</field>
<field name="PORT">SPEED_L</field>
<field name="BRICK_PORT">SPEED_L</field>
</block>
<block type="robConf_encoder" id="S(Xm/UHHH;N[4Km1TML2" intask="true" movable="false">
<field name="NAME">ER</field>
<field name="PORT">SPEED_R</field>
<field name="BRICK_PORT">SPEED_R</field>
</block>
<block type="robConf_infrared" id="S(Xm/UHHH;N[4Km1TML6" intask="true" movable="false">
<field name="NAME">OL</field>
<field name="PORT">OBSTCL_L</field>
<field name="BRICK_PORT">OBSTCL_L</field>
</block>
<block type="robConf_infrared" id="S(Xm/UHHH;N[4Km1TML7" intask="true" movable="false">
<field name="NAME">OR</field>
<field name="PORT">OBSTCL_R</field>
<field name="BRICK_PORT">OBSTCL_R</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML3" intask="true" movable="false">
<field name="NAME">LL</field>
<field name="PORT">LINE_TRK_L</field>
<field name="BRICK_PORT">LINE_TRK_L</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML4" intask="true" movable="false">
<field name="NAME">LM</field>
<field name="PORT">LINE_TRK_M</field>
<field name="BRICK_PORT">LINE_TRK_M</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML5" intask="true" movable="false">
<field name="NAME">LR</field>
<field name="PORT">LINE_TRK_R</field>
<field name="BRICK_PORT">LINE_TRK_R</field>
</block>
</statement>
</block>
Expand Down
14 changes: 7 additions & 7 deletions ...taServer/src/test/resources/crossCompilerTests/robotSpecific/joycar/action_sound_test.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,31 +173,31 @@
<statement name="BUS">
<block type="robConf_encoder" id="S(Xm/UHHH;N[4Km1TML1" intask="true" movable="false">
<field name="NAME">EL</field>
<field name="PORT">SPEED_L</field>
<field name="BRICK_PORT">SPEED_L</field>
</block>
<block type="robConf_encoder" id="S(Xm/UHHH;N[4Km1TML2" intask="true" movable="false">
<field name="NAME">ER</field>
<field name="PORT">SPEED_R</field>
<field name="BRICK_PORT">SPEED_R</field>
</block>
<block type="robConf_infrared" id="S(Xm/UHHH;N[4Km1TML6" intask="true" movable="false">
<field name="NAME">OL</field>
<field name="PORT">OBSTCL_L</field>
<field name="BRICK_PORT">OBSTCL_L</field>
</block>
<block type="robConf_infrared" id="S(Xm/UHHH;N[4Km1TML7" intask="true" movable="false">
<field name="NAME">OR</field>
<field name="PORT">OBSTCL_R</field>
<field name="BRICK_PORT">OBSTCL_R</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML3" intask="true" movable="false">
<field name="NAME">LL</field>
<field name="PORT">LINE_TRK_L</field>
<field name="BRICK_PORT">LINE_TRK_L</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML4" intask="true" movable="false">
<field name="NAME">LM</field>
<field name="PORT">LINE_TRK_M</field>
<field name="BRICK_PORT">LINE_TRK_M</field>
</block>
<block type="robConf_line" id="S(Xm/UHHH;N[4Km1TML5" intask="true" movable="false">
<field name="NAME">LR</field>
<field name="PORT">LINE_TRK_R</field>
<field name="BRICK_PORT">LINE_TRK_R</field>
</block>
</statement>
</block>
Expand Down
Loading

0 comments on commit 0690077

Please sign in to comment.