Have ports being passed in

Author: alan412

src/blocks/mrc_component.ts

@@ -144,7 +144,9 @@ export const pythonFromBlock = function (
       if(i != 0){
         extension = '_' + (i + 1).toString();
       }
-      code += block.mrcArgs[i].name + " = " + block.getFieldValue('NAME') + extension; 
+      const newPort = block.getFieldValue('NAME') + extension + '_port';
+      generator.addHardwarePort(newPort, block.mrcArgs[i].type);
+      code += block.mrcArgs[i].name + " = " + newPort; 
     }else{
       code += block.mrcArgs[i].name + ' = ' + generator.valueToCode(block, fieldName, Order.NONE);
     }

src/blocks/mrc_mechanism_component_holder.ts

@@ -90,28 +90,49 @@ export const setup = function () {
   Blockly.Blocks[BLOCK_NAME] = MECHANISM_COMPONENT_HOLDER;
 }
 
-export const pythonFromBlock = function (
-  block: MechanismComponentHolderBlock,
-  generator: ExtendedPythonGenerator,
-) {
+function pythonFromBlockInRobot(block: MechanismComponentHolderBlock, generator: ExtendedPythonGenerator){
   let code = 'def define_hardware(self):\n' + generator.INDENT + 'self.hardware = []\n';
 
   let mechanisms = '';
   let components = '';
 
-  if (block.getInput('MECHANISMS')) {
-    mechanisms = generator.statementToCode(block, 'MECHANISMS');
-  }
-  if (block.getInput('COMPONENTS')) {
-    components = generator.statementToCode(block, 'COMPONENTS');
-  }
+  mechanisms = generator.statementToCode(block, 'MECHANISMS');
+  components = generator.statementToCode(block, 'COMPONENTS');
+
   const body = mechanisms + components;
   if(body != ''){
     code += body;
   }else{
     code += generator.INDENT + 'pass';
   }
+  generator.addClassMethodDefinition('define_hardware', code);
+}
+
+function pythonFromBlockInMechanism(block: MechanismComponentHolderBlock, generator: ExtendedPythonGenerator){
+  let components = '';
+
+  components = generator.statementToCode(block, 'COMPONENTS');
 
+  let code = 'def define_hardware(self' + generator.getListOfPorts(false) + '):\n' + 
+              generator.INDENT + 'self.hardware = []\n';
+
+  if(components != ''){
+    code += components;
+  }else{
+    code += generator.INDENT + 'pass';
+  }
   generator.addClassMethodDefinition('define_hardware', code);
-  return '';
+}
+
+export const pythonFromBlock = function (
+  block: MechanismComponentHolderBlock,
+  generator: ExtendedPythonGenerator,
+) {
+  if(block.getInput('MECHANISMS')){
+    pythonFromBlockInRobot(block, generator);
+  }
+  else{
+    pythonFromBlockInMechanism(block, generator);
+  }
+  return ''
 }

src/blocks/mrc_port.ts

@@ -59,8 +59,8 @@ export const pythonFromBlock = function (
   block: PortBlock,
   generator: ExtendedPythonGenerator,
 ) {
-    let code = "";
-    //TODO(Alan) - Make this real
+    //TODO (Alan) : Specify the type here as well
+    let code = block.getFieldValue('PORT_NUM');
 
-  return [code, Order.ATOMIC];
+    return [code, Order.ATOMIC];
 }

src/editor/extended_python_generator.ts

@@ -35,6 +35,7 @@ export class ExtendedPythonGenerator extends PythonGenerator {
   private context: GeneratorContext | null = null;
 
   private classMethods: {[key: string]: string} = Object.create(null);
+  private ports: {[key: string]: string} = Object.create(null);
 
   constructor() {
     super('Python');
@@ -65,7 +66,9 @@ export class ExtendedPythonGenerator extends PythonGenerator {
     let variableDefinitions = '';
 
     if (this.context?.getHasHardware()) {
-      variableDefinitions += this.INDENT + "self.define_hardware()\n";
+      variableDefinitions += this.INDENT + "self.define_hardware(";
+      variableDefinitions += this.getListOfPorts(true);
+      variableDefinitions += ')';
     }
 
     return variableDefinitions;
@@ -108,6 +111,28 @@ export class ExtendedPythonGenerator extends PythonGenerator {
     this.classMethods[methodName] = code;
   }
 
+  /**
+   * Add a Hardware Port
+   */
+  addHardwarePort(portName: string, type: string): void{
+    this.ports[portName] = type;
+  }
+
+  getListOfPorts(startWithFirst: boolean): string{
+    let returnString = ''
+    let firstPort = startWithFirst;
+    for (const port in this.ports) {
+      if(!firstPort){
+        returnString += ', ';
+      }
+      else{
+        firstPort = false;
+      }
+      returnString += port;
+    }
+    return returnString;
+  }
+
   finish(code: string): string {
     if (this.context && this.workspace) {
       const className = this.context.getClassName();

src/toolbox/hardware_category.ts

@@ -221,4 +221,4 @@ const category_mechanism =
     },
   ],
 }
-export const category = category_robot;
+export const category = category_mechanism;

src/toolbox/toolbox.ts

@@ -29,7 +29,7 @@ import {category as listsCategory} from './lists_category';
 import {category as miscCategory} from './misc_category';
 import {category as methodsCategory} from './methods_category';
 import {category as componentSampleCategory} from './component_samples_category';
-import {category as mechanismCategory} from './hardware_category';
+import {category as hardwareCategory} from './hardware_category';
 import {category as robotCategory} from './robot_category';
 
 export function getToolboxJSON(
@@ -82,7 +82,7 @@ export function getToolboxJSON(
         custom: 'VARIABLE',
       },
       methodsCategory,
-      //mechanismCategory,
+      hardwareCategory,
       //componentSampleCategory,
     ]);