diff --git a/Robot_3D.blockly b/Robot_3D.blockly index ab6c18246d2afebd2721b83a70171b6ebeeef53b..c5d1233cff7cbb7dddeddf82b70990bb63a3e472 100644 --- a/Robot_3D.blockly +++ b/Robot_3D.blockly @@ -11,7 +11,7 @@ <block type="text_print" id="bf81loEa-M]n1A5ir)o`"> <value name="TEXT"> <shadow type="text" id="G.TQ_0wkBW$ZXRBs3Afi"> - <field name="TEXT">Version 2023/01/10</field> + <field name="TEXT">Version 2023/02/17</field> </shadow> </value> <next> diff --git a/Robot_3D.py b/Robot_3D.py index 7d00b982e3f810d315025fadeb2344f6f6e8577e..34c9489b0c42f1369293815c00684fed4a4b3d97 100644 --- a/Robot_3D.py +++ b/Robot_3D.py @@ -11,7 +11,7 @@ poslist = None p = None -print('Version 2023/01/10') +print('Version 2023/02/17') logging.basicConfig(level=logging.WARNING, format="%(asctime)s %(levelname)-10s %(funcName)3s %(message)s #%(filename)3s:%(lineno)d") poslist = [[1150, 38, 1800], [1150, 38, 1900], [1150, 38, 1100], [1650, 65, 1800], [1650, 65, 1900], [1650, 65, 1100], [1150, 38, 1800], [1150, 38, 1900]] init_3DRobot() diff --git a/lib/Axes1Ref.blockly b/lib/Axes1Ref.blockly index b96ac98ad4170ead24b266cdaa831d6990eeea68..74ac9d3330da92e4f6eae34576b8aa1117452661 100644 --- a/lib/Axes1Ref.blockly +++ b/lib/Axes1Ref.blockly @@ -1248,7 +1248,7 @@ <field name="OP">OR</field> <value name="A"> <block type="input_mini_switch_if_state" id="YEq_8el9+|%L`uRZs`ID"> - <field name="instance_name">TXT_M_I3_mini_switch</field> + <field name="instance_name">TXT_M_I4_mini_switch</field> <field name="property_name">open</field> </block> </value> diff --git a/lib/Axes1Ref.py b/lib/Axes1Ref.py index 90b27738a5f8123e2c6da4f063e17a60a6dc5321..800dea500f4148ecb8846261ec216cb95f915b35 100644 --- a/lib/Axes1Ref.py +++ b/lib/Axes1Ref.py @@ -141,7 +141,7 @@ def moveRef(num): TXT_M_M4_encodermotor.stop_sync() TXT_M_M4_encodermotor.set_speed(int(SPEED_REF), Motor.CW) TXT_M_M4_encodermotor.start_sync() - while not ((TXT_M_I3_mini_switch.is_open()) or _b_exit): + while not ((TXT_M_I4_mini_switch.is_open()) or _b_exit): _check_timeout_exit(num) TXT_M_M4_encodermotor.stop_sync() abspos[int(num - 1)] = 0