Making sure ports get passed from robot through

Author: alan412

src/blocks/mrc_component.ts

@@ -31,7 +31,7 @@ import * as toolboxItems from '../toolbox/items';
 import * as storageModule from '../storage/module';
 import * as storageModuleContent from '../storage/module_content';
 import * as storageNames from '../storage/names';
-import { createPortShadow } from './mrc_port';
+import { createPort } from './mrc_port';
 import { createNumberShadowValue } from './utils/value';
 import { ClassData, FunctionData } from './utils/python_json_types';
 import { renameMethodCallers } from './mrc_call_python_function'
@@ -167,13 +167,15 @@ const COMPONENT = {
     };
   },
   getArgName: function (this: ComponentBlock, i: number): string {
-    return this.getFieldValue(FIELD_NAME) + '__' + this.mrcArgs[i].name;
+    return this.getFieldValue(FIELD_NAME) + '__' + 'port';
   },
+
+  
   getComponentPorts: function (this: ComponentBlock, ports: {[argName: string]: string}): void {
     // Collect the ports for this component block.
     for (let i = 0; i < this.mrcArgs.length; i++) {
       const argName = this.getArgName(i);
-      ports[argName] = this.mrcArgs[i].type;
+      ports[argName] = this.mrcArgs[i].name;  
     }
   },
   /**
@@ -197,20 +199,16 @@ export const pythonFromBlock = function (
   if (block.mrcImportModule) {
     generator.addImport(block.mrcImportModule);
   }
-  let code = 'self.' + block.getFieldValue(FIELD_NAME) + ' = ' + block.getFieldValue(FIELD_TYPE);
-  if (block.mrcStaticFunctionName) {
-    code += '.' + block.mrcStaticFunctionName;
-  }
-  code += '(';
+  let code = 'self.' + block.getFieldValue(FIELD_NAME) + ' = ' + block.getFieldValue(FIELD_TYPE) + "(";
 
   for (let i = 0; i < block.mrcArgs.length; i++) {
     if (i != 0) {
       code += ', ';
     }
     if (generator.getModuleType() === storageModule.ModuleType.ROBOT) {
-      code += block.mrcArgs[i].name + ' = ' + generator.valueToCode(block, 'ARG' + i, Order.NONE);
+      code += generator.valueToCode(block, 'ARG' + i, Order.NONE);
     } else {
-      code += block.mrcArgs[i].name + ' = ' + block.getArgName(i);
+      code += block.getArgName(i);
     }
   }
   code += ')\n' + 'self.hardware.append(self.' + block.getFieldValue(FIELD_NAME) + ')\n';
@@ -257,12 +255,11 @@ function createComponentBlock(
 
   if (constructorData.expectedPortType) {
     extraState.params!.push({
-      //TODO(Alan): Make this a localized version of the port type
       'name': constructorData.expectedPortType,
       'type': 'Port',
     });
     if ( moduleType == storageModule.ModuleType.ROBOT ) {
-      inputs['ARG0'] = createPortShadow(constructorData.expectedPortType);
+      inputs['ARG0'] = createPort(constructorData.expectedPortType);
     }
   }
   return new toolboxItems.Block(BLOCK_NAME, extraState, fields, Object.keys(inputs).length ? inputs : null);

src/blocks/mrc_mechanism.ts

@@ -34,6 +34,7 @@ import * as storageNames from '../storage/names';
 import * as value from './utils/value';
 import { renameMethodCallers } from './mrc_call_python_function'
 import { renameMechanismName as renameMechanismNameInEventHandlers } from './mrc_event_handler'
+import { createPort } from './mrc_port';
 
 export const BLOCK_NAME = 'mrc_mechanism';
 export const OUTPUT_NAME = 'mrc_mechansim';
@@ -296,8 +297,7 @@ export function createMechanismBlock(
         name: port,
         type: parameterType,
       });
-      const defaultValue = (parameterType === 'int') ? '0' : '';
-      inputs['ARG' + i] = value.valueForFunctionArgInput(parameterType, defaultValue);
+      inputs['ARG' + i] = createPort(parameterType);
       i++;
     }
   });

src/blocks/mrc_port.ts

@@ -36,16 +36,14 @@ export type MrcPortType = {
 
 type PortBlock = Blockly.Block & PortMixin;
 interface PortMixin extends PortMixinType {
+  portType_ : string,
   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.
-   */
+  //TODO(Alan) - Figure out how to not have this duplicated for a simple port
+  portType: string,
   ports: MrcPortType[],
 }
 
@@ -63,6 +61,7 @@ const PORT = {
    */
   saveExtraState: function (this: PortBlock): PortExtraState {
     const state: PortExtraState = {
+      portType: this.portType_,
       ports: this.ports_
     };
 
@@ -73,6 +72,7 @@ const PORT = {
    * Load the ports from the block's extra state.
    */
   loadExtraState: function (this: PortBlock, state: PortExtraState): void {
+    this.portType_ = state.portType || '';
     this.ports_ = state.ports || [];
     this.updateShape_();
   },
@@ -123,12 +123,38 @@ export const pythonFromBlock = function (
       }
     }
   }
+  let code = `Port(port_type = PortType.${block.portType_}, `;
 
-  const code = ports.length === 1 ? ports[0] : `[${ports.join(', ')}]`;
+  if ( ports.length === 1 ) {
+     code += `location = ${ports[0]})`;
+  }
+  else if ( ports.length === 2 ) {
+    let port1Type = 'UNKNOWN';
+    let port2Type = 'UNKNOWN';
+
+    switch(block.portType_){
+      case 'USB_HUB':
+        port1Type = 'USB_PORT';
+        port2Type = 'USB_PORT';
+        break;
+      case 'EXPANSION_HUB_MOTOR':
+        port1Type = 'USB_PORT';
+        port2Type = 'MOTOR_PORT';
+        break;
+      case 'EXPANSION_HUB_SERVO':
+        port1Type = 'USB_PORT';
+        port2Type = 'SERVO_PORT';
+        break;
+    }
+
+    code += `\\ \n${_generator.INDENT}port1 = Port(port_type = PortType.${port1Type}, location = ${ports[0]}), `;
+    code += `\\ \n${_generator.INDENT}port2 = Port(port_type = PortType.${port2Type}, location = ${ports[1]}))`;
+  }
+
   return [code, Order.ATOMIC];
 }
 
-export function createPortShadow(portType : string) {
+export function createPort(portType : string) {
   //TODO: Based off of the port type, create the right number and type of ports
   const ports : MrcPortType[] = [];
   switch(portType){
@@ -172,13 +198,14 @@ export function createPortShadow(portType : string) {
       ports.push({ portType: 'servo', portNumber: 1 });
       break;
     default:
-      ports.push({ portType: 'unknown', portNumber: 1 });
+      ports.push({ portType: 'unknown:' + portType, portNumber: 1 });
       break;
   }
   return {
-    shadow: {
+    block: {
       type: 'mrc_port',
       extraState: {
+        portType: portType,
         ports: ports.map(port => ({
           portType: port.portType,
           portNumber: port.portNumber