change orders and names of samples

Author: alan412

src/toolbox/hardware_category.ts

@@ -11,15 +11,13 @@ const category_robot =
       kind: 'block',
       type: 'mrc_mechanism',
       fields: {
-        NAME: 'my_drive',
-        TYPE: 'DriveMecanum'
+        NAME: 'claw',
+        TYPE: 'Claw'
       },
       extraState: {
-        importModule: 'DriveMecanum',
-        params: [{ name: 'front_left_drive', type: 'int' },
-        { name: 'front_right_drive', type: 'int' },
-        { name: 'back_left_drive', type: 'int' },
-        { name: 'back_right_drive', type: 'int' },
+        importModule: 'claw',
+        params: [{ name: 'gripper_port', type: 'int' },
+        { name: 'piece_sensor_port', type: 'int' },
         ]
       },
       inputs: {
@@ -36,26 +34,8 @@ const category_robot =
           shadow: {
             type: 'mrc_port',
             fields: {
-              TYPE: 'SmartMotor',
-              PORT_NUM: 2
-            },
-          },
-        },
-        ARG2: {
-          shadow: {
-            type: 'mrc_port',
-            fields: {
-              TYPE: 'SmartMotor',
-              PORT_NUM: 3
-            },
-          },
-        },
-        ARG3: {
-          shadow: {
-            type: 'mrc_port',
-            fields: {
-              TYPE: 'SmartMotor',
-              PORT_NUM: 4
+              TYPE: 'SmartIO',
+              PORT_NUM: 1
             },
           },
         },
@@ -65,13 +45,15 @@ const category_robot =
       kind: 'block',
       type: 'mrc_mechanism',
       fields: {
-        NAME: 'my_claw',
-        TYPE: 'Claw'
+        NAME: 'drive',
+        TYPE: 'DriveMecanum'
       },
       extraState: {
-        importModule: 'claw',
-        params: [{ name: 'port_gripper', type: 'int' },
-        { name: 'port_piece_sensor', type: 'int' },
+        importModule: 'DriveMecanum',
+        params: [{ name: 'front_left_drive_port', type: 'int' },
+        { name: 'front_right_drive_port', type: 'int' },
+        { name: 'back_left_drive_port', type: 'int' },
+        { name: 'back_right_drive_port', type: 'int' },
         ]
       },
       inputs: {
@@ -88,8 +70,26 @@ const category_robot =
           shadow: {
             type: 'mrc_port',
             fields: {
-              TYPE: 'SmartIO',
-              PORT_NUM: 1
+              TYPE: 'SmartMotor',
+              PORT_NUM: 2
+            },
+          },
+        },
+        ARG2: {
+          shadow: {
+            type: 'mrc_port',
+            fields: {
+              TYPE: 'SmartMotor',
+              PORT_NUM: 3
+            },
+          },
+        },
+        ARG3: {
+          shadow: {
+            type: 'mrc_port',
+            fields: {
+              TYPE: 'SmartMotor',
+              PORT_NUM: 4
             },
           },
         },
@@ -108,7 +108,7 @@ const category_robot =
       },
       extraState: {
         importModule: 'smart_motor',
-        params: [{ name: 'motorPort', type: 'int' }]
+        params: [{ name: 'motor_port', type: 'int' }]
       },
       inputs: {
         ARG0: {
@@ -131,7 +131,7 @@ const category_robot =
       },
       extraState: {
         importModule: 'color_range_sensor',
-        params: [{ name: 'I2CPort', type: 'int' }]
+        params: [{ name: 'i2c_port', type: 'int' }]
       },
       inputs: {
         ARG0: {
@@ -154,7 +154,7 @@ const category_robot =
       },
       extraState: {
         importModule: 'rev_touch_sensor',
-        params: [{ name: 'SmartIOPort', type: 'int' }]
+        params: [{ name: 'smartIO_port', type: 'int' }]
       },
       inputs: {
         ARG0: {
@@ -189,7 +189,7 @@ const category_mechanism =
       },
       extraState: {
         importModule: 'smart_motor',
-        params: [{ name: 'motorPort', type: 'int' }],
+        params: [{ name: 'motor_port', type: 'int' }],
         hideParams: true
       },
     },
@@ -202,7 +202,7 @@ const category_mechanism =
       },
       extraState: {
         importModule: 'color_range_sensor',
-        params: [{ name: 'I2CPort', type: 'int' }],
+        params: [{ name: 'i2c_port', type: 'int' }],
         hideParams: true
       },
     },
@@ -215,7 +215,7 @@ const category_mechanism =
       },
       extraState: {
         importModule: 'rev_touch_sensor',
-        params: [{ name: 'SmartIOPort', type: 'int' }],
+        params: [{ name: 'smartIO_port', type: 'int' }],
         hideParams: true
       },
     },

src/toolbox/robot_category.ts

@@ -5,7 +5,7 @@ export const category =
     contents: [
         {
             kind: 'category',
-            name: 'my_drive',
+            name: 'drive',
             contents: [
                 {
                     kind: 'block',
@@ -30,10 +30,10 @@ export const category =
                         tooltip: 'Drive (robot relative)',
                         importModule: '',
                         componentClassName: 'rev.ColorRangeSensor',
-                        componentName: 'robot.my_drive',
+                        componentName: 'robot.drive',
                     },
                     fields: {
-                        COMPONENT_NAME: 'robot.my_drive',
+                        COMPONENT_NAME: 'robot.drive',
                         FUNC: 'drive_field_relative',
                     },
                     inputs: {},
@@ -42,7 +42,7 @@ export const category =
         },
         {
             kind: 'category',
-            name: 'my_claw',
+            name: 'claw',
             contents: [
                 {
                     kind: 'category',
@@ -69,7 +69,7 @@ export const category =
                                 componentName: 'colorSensor',
                             },
                             fields: {
-                                COMPONENT_NAME: 'robot.my_claw.piece_sensor',
+                                COMPONENT_NAME: 'robot.claw.piece_sensor',
                                 FUNC: 'get_color_rgb',
                             },
                             inputs: {},
@@ -88,7 +88,7 @@ export const category =
                                 componentName: 'colorSensor',
                             },
                             fields: {
-                                COMPONENT_NAME: 'robot.my_claw.piece_sensor',
+                                COMPONENT_NAME: 'robot.claw.piece_sensor',
                                 FUNC: 'get_color_hsv',
                             },
                             inputs: {},
@@ -107,7 +107,7 @@ export const category =
                                 componentName: 'colorSensor',
                             },
                             fields: {
-                                COMPONENT_NAME: 'robot.my_claw.piece_sensor',
+                                COMPONENT_NAME: 'robot.claw.piece_sensor',
                                 FUNC: 'get_distance_mm',
                             },
                             inputs: {},

src/toolbox/toolbox.ts

@@ -62,12 +62,16 @@ export function getToolboxJSON(
       {
         kind: 'sep',
       },
-      miscCategory,
+      robotCategory,
+      {
+        kind: 'sep',
+      },
       logicCategory,
       loopCategory,
       mathCategory,
       textCategory,
       listsCategory,
+      miscCategory,
       {
         kind: 'sep',
       },
@@ -78,9 +82,8 @@ export function getToolboxJSON(
         custom: 'VARIABLE',
       },
       methodsCategory,
-      mechanismCategory,
-      robotCategory,
-      componentSampleCategory,
+      //mechanismCategory,
+      //componentSampleCategory,
     ]);
 
   return {