Beginnings of port possibly having multiple pieces

Author: alan412

src/blocks/mrc_component.ts

@@ -268,7 +268,7 @@ function createComponentBlock(
       if (argData.type === 'int') {
         const portType = getPortTypeForArgument(argData.name);
         if (portType) {
-          inputs['ARG' + i] = createPortShadow(portType, 1);
+          inputs['ARG' + i] = createPortShadow(portType);
         } else {
           inputs['ARG' + i] = createNumberShadowValue(1);
         }

src/blocks/mrc_port.ts

@@ -29,25 +29,80 @@ import { ExtendedPythonGenerator } from '../editor/extended_python_generator';
 export const BLOCK_NAME = 'mrc_port';
 export const OUTPUT_NAME = 'mrc_port';
 
+export type MrcPortType = {
+  portType: string,
+  portNumber: number,
+};
 
 type PortBlock = Blockly.Block & PortMixin;
 interface PortMixin extends PortMixinType {
+  ports_ : MrcPortType[],
 }
 type PortMixinType = typeof PORT;
 
+type PortExtraState = {
+  /**
+   * The ports.
+   * For instance methods, args[0].name is the self label and args[0].type is
+   * the self type.
+   */
+  ports: MrcPortType[],
+}
+
 const PORT = {
   /**
     * Block initialization.
     */
   init: function (this: PortBlock): void {
     this.setStyle(MRC_STYLE_PORTS);
-    this.appendDummyInput()
-      .appendField(createFieldNonEditableText(''), 'TYPE')
-      .appendField(new Blockly.FieldTextInput(''), 'PORT_NUM');
-
-    //this.setOutput(true, OUTPUT_NAME);
     this.setOutput(true);
   },
+
+  /**
+   * Save the ports to the block's extra state.
+   */
+  saveExtraState: function (this: PortBlock): PortExtraState {
+    const state: PortExtraState = {
+      ports: this.ports_
+    };
+
+    return state;
+  },
+
+  /**
+   * Load the ports from the block's extra state.
+   */
+  loadExtraState: function (this: PortBlock, state: PortExtraState): void {
+    this.ports_ = state.ports || [];
+    this.updateShape_();
+  },
+
+  /**
+   * Update the block's shape based on the current ports.
+   */
+  updateShape_: function (this: PortBlock): void {
+    // Remove all existing inputs
+    for (let i = this.inputList.length - 1; i >= 0; i--) {
+      const input = this.inputList[i];
+      if (input && (input.name.startsWith('PORT_'))) {
+        this.removeInput(input.name, true);
+      }
+    }
+
+    // Initialize ports if not set
+    if (!this.ports_) {
+      this.ports_ = [{ portType: '', portNumber: 0 }];
+    }
+
+    // Add inputs for each port
+    for (let i = 0; i < this.ports_.length; i++) {
+      const port = this.ports_[i];
+      this.appendDummyInput('PORT_' + i)
+        .appendField(createFieldNonEditableText(port.portType), 'TYPE_' + i)
+        .appendField(new Blockly.FieldTextInput(port.portNumber.toString()), 'PORT_NUM_' + i)
+        .setAlign(Blockly.inputs.Align.RIGHT);
+    }
+  },
 }
 
 export const setup = function () {
@@ -57,19 +112,56 @@ export const setup = function () {
 export const pythonFromBlock = function (
     block: PortBlock,
     _generator: ExtendedPythonGenerator) {
-  // TODO (Alan) : Specify the type here as well
-  let code = block.getFieldValue('PORT_NUM');
-
+  const ports: string[] = [];
+  
+  for (let i = 0; i < block.inputList.length; i++) {
+    const input = block.inputList[i];
+    if (input.name.startsWith('PORT_')) {
+      const portNumField = input.fieldRow.find(field => field.name === 'PORT_NUM_' + i);
+      if (portNumField) {
+        ports.push(portNumField.getValue() as string);
+      }
+    }
+  }
+  
+  const code = ports.length === 1 ? ports[0] : `[${ports.join(', ')}]`;
   return [code, Order.ATOMIC];
 }
 
-export function createPortShadow(portType: string, portNum: Number) {
+export function createPortShadow(portType : string) {
+  //TODO: Based off of the port type, create the right number and type of ports
+  const ports : MrcPortType[] = [];
+  switch(portType){
+    case 'I2C_PORT':
+      ports.push({ portType: 'i2c', portNumber: 1 });
+      break;
+    case 'SMART_IO_PORT':
+      ports.push({ portType: 'smartio', portNumber: 1 });
+      break;
+    case 'EXPANSION_MOTOR_PORT':
+      ports.push({ portType: 'usb', portNumber: 1 });
+      ports.push({ portType: 'motor', portNumber: 1 });
+      break;
+    case 'EXPANSION_SERVO_PORT':
+      ports.push({ portType: 'usb', portNumber: 1 });
+      ports.push({ portType: 'servo', portNumber: 1 });
+      break;
+    case 'SMART_MOTOR_PORT':
+      ports.push({ portType: 'MotionCore port', portNumber: 1 });
+      break;
+    case 'SERVO_PORT':
+      ports.push({ portType: 'servo', portNumber: 1 });
+      break;
+  }
+
   return {
     shadow: {
       type: 'mrc_port',
-      fields: {
-        TYPE: portType,
-        PORT_NUM: portNum,
+      extraState: {
+        ports: ports.map(port => ({
+          portType: port.portType,
+          portNumber: port.portNumber
+        }))
       },
     },
   };

src/toolbox/test_category.ts

@@ -20,6 +20,17 @@ export function getCategory(): toolboxItems.Category {
 
   addBuiltInFunctionBlocks([printFunction], contents);
 
+  contents.push({
+    kind: 'block',
+    type: 'mrc_port',
+    extraState: {
+      ports: [
+        { portType: 'USB Port', portNumber: 1 },
+        { portType: 'Expansion Hub Motor Port', portNumber: 2 },
+      ],
+    },
+  });
+
   return {
     kind: 'category',
     name: Blockly.Msg['MRC_CATEGORY_TEST'],