[pull] main from wpilibsuite:main

docs/testing_before_pr_checklist.md

@@ -0,0 +1,22 @@
+For each PR, make sure each of these works
+
+# New items
+* [ ] Make a new project and make sure you can edit in Robot and TeleOp
+* [ ] Add an opmode "Auto" from the + next to Tabs
+* [ ] Add a mechanism "Arm" from the + next to Tabs
+# Using robot
+* [ ] Add a component to the Robot
+* [ ] Add a mechanism to the Robot
+* [ ] When editing an OpMode, make sure the component shows up in the toolbox Robot -> Components ->
+* [ ] When editing an OpMode, make sure the mechanism shows up in the toolbox Robot -> Mechanisms -> my_arm
+# Events
+* [ ] Add an event to the Mechanism
+* [ ] In Robot, make sure you can see the event handler in the toolbox Robot -> Mechanisms -> my_arm -> Events
+* [ ] In Opmode, make sure you can see the event handler in the toolbox Robot -> Mechanisms -> my_arm -> Events
+# Mechanims
+* [ ] Add a public component to the mechanism
+* [ ] Add a private component to the mechanism
+* [ ] Make sure that in the Robot you can see the public component (and not the private one) in the toolbox
+# Code Generation
+* [ ] Generate code (right now "Deploy") and make sure there are no errors in the console
+* [ ] Check that the deploy zip file contains robot.py, teleop.py, auto.py, and arm.py.

src/blocks/mrc_call_python_function.ts

@@ -865,7 +865,7 @@ export function pythonFromBlock(
     generator: ExtendedPythonGenerator,
 ) {
   if (block.mrcImportModule) {
-    generator.addImport(block.mrcImportModule);
+    generator.importModule(block.mrcImportModule);
   }
   let code = '';
   let needOpenParen = true;

src/blocks/mrc_component.ts

@@ -246,7 +246,7 @@ export const pythonFromBlock = function (
   generator: ExtendedPythonGenerator,
 ) {
   if (block.mrcImportModule) {
-    generator.addImport(block.mrcImportModule);
+    generator.importModule(block.mrcImportModule);
   }
   let code = 'self.' + block.getFieldValue(FIELD_NAME) + ' = ' + block.getFieldValue(FIELD_TYPE) + "(";
 

src/blocks/mrc_get_python_enum_value.ts

@@ -150,7 +150,7 @@ export const pythonFromBlock = function(
   const enumClassName = block.getFieldValue(FIELD_ENUM_CLASS_NAME);
   const enumValue = block.getFieldValue(FIELD_ENUM_VALUE);
   if (getPythonEnumValueBlock.mrcImportModule) {
-    generator.addImport(getPythonEnumValueBlock.mrcImportModule);
+    generator.importModule(getPythonEnumValueBlock.mrcImportModule);
   }
   const code = enumClassName + '.' + enumValue;
   return [code, Order.MEMBER];

src/blocks/mrc_get_python_variable.ts

@@ -277,15 +277,15 @@ export const pythonFromBlock = function(
     case VariableKind.MODULE: {
       const moduleName = block.getFieldValue(FIELD_MODULE_OR_CLASS_NAME);
       if (getPythonVariableBlock.mrcImportModule) {
-        generator.addImport(getPythonVariableBlock.mrcImportModule);
+        generator.importModule(getPythonVariableBlock.mrcImportModule);
       }
       const code = moduleName + '.' + varName;
       return [code, Order.MEMBER];
     }
     case VariableKind.CLASS: {
       const className = block.getFieldValue(FIELD_MODULE_OR_CLASS_NAME);
       if (getPythonVariableBlock.mrcImportModule) {
-        generator.addImport(getPythonVariableBlock.mrcImportModule);        
+        generator.importModule(getPythonVariableBlock.mrcImportModule);
       }
       const code = className + '.' + varName;
       return [code, Order.MEMBER];

src/blocks/mrc_mechanism.ts

@@ -328,7 +328,7 @@ export const pythonFromBlock = function (
   generator: ExtendedPythonGenerator,
 ) {
   if (block.mrcImportModule) {
-    generator.addImport(block.mrcImportModule);
+    generator.importModule(block.mrcImportModule);
   }
   let code = 'self.' + block.getFieldValue(FIELD_NAME) + ' = ' + block.mrcImportModule + '.' + block.getFieldValue(FIELD_TYPE) + '(';
 

src/blocks/mrc_port.ts

@@ -115,7 +115,7 @@ const PORT = {
         appendFields(this.appendDummyInput(), PORT_TYPE_EXPANSION_HUB_SERVO_PORT, iField++);
         break;
       default:
-        throw new Error('Unexpected portType: ' + state.portType)
+        throw new Error('Unexpected portType: ' + state.portType);
     }
     this.mrcPortType = state.portType;
     this.mrcPortCount = iField;
@@ -129,17 +129,20 @@ export const setup = function () {
 export const pythonFromBlock = function (
     block: PortBlock,
     generator: ExtendedPythonGenerator) {
-  generator.addImport('port');
-
+
   const ports: string[] = [];
   for (let i = 0; i < block.mrcPortCount; i++) {
     ports.push(block.getFieldValue(FIELD_PREFIX_PORT_NUM + i));
   }
 
-  let code = 'port.';
+  const portType = generator.importModuleName('port', 'PortType');
+  const simplePort = generator.importModuleName('port', 'SimplePort');
+  const compoundPort = (ports.length === 2) ? generator.importModuleName('port', 'CompoundPort') : '';
+
+  let code = '';
 
   if (ports.length === 1) {
-     code += `SimplePort(port_type = port.PortType.${block.mrcPortType}, location = ${ports[0]})`;
+     code += `${simplePort}(port_type = ${portType}.${block.mrcPortType}, location = ${ports[0]})`;
 
   } else if (ports.length === 2) {
     let port1Type = 'UNKNOWN';
@@ -159,9 +162,9 @@ export const pythonFromBlock = function (
         port2Type = PORT_TYPE_EXPANSION_HUB_SERVO_PORT;
         break;
     }
-    code += `CompoundPort(port_type = port.PortType.${block.mrcPortType},\n`;
-    code += `${generator.INDENT}port1 = port.SimplePort(port_type = port.PortType.${port1Type}, location = ${ports[0]}),\n`;
-    code += `${generator.INDENT}port2 = port.SimplePort(port_type = port.PortType.${port2Type}, location = ${ports[1]}))`;
+    code += `${compoundPort}(port_type = ${portType}.${block.mrcPortType},\n`;
+    code += `${generator.INDENT}port1 = ${simplePort}(port_type = ${portType}.${port1Type}, location = ${ports[0]}),\n`;
+    code += `${generator.INDENT}port2 = ${simplePort}(port_type = ${portType}.${port2Type}, location = ${ports[1]}))`;
   }
 
   return [code, Order.FUNCTION_CALL];

src/blocks/mrc_set_python_variable.ts

@@ -268,7 +268,7 @@ export const pythonFromBlock = function(
       const moduleName = block.getFieldValue(FIELD_MODULE_OR_CLASS_NAME);
       const value = generator.valueToCode(block, 'VALUE', Order.NONE);
       if (setPythonVariableBlock.mrcImportModule) {
-        generator.addImport(setPythonVariableBlock.mrcImportModule);
+        generator.importModule(setPythonVariableBlock.mrcImportModule);
       }
       const code = moduleName + '.' + varName + ' = ' + value + '\n';
       return code;
@@ -277,7 +277,7 @@ export const pythonFromBlock = function(
       const className = block.getFieldValue(FIELD_MODULE_OR_CLASS_NAME);
       const value = generator.valueToCode(block, 'VALUE', Order.NONE);
       if (setPythonVariableBlock.mrcImportModule) {
-        generator.addImport(setPythonVariableBlock.mrcImportModule);
+        generator.importModule(setPythonVariableBlock.mrcImportModule);
       }
       const code = className + '.' + varName + ' = ' + value + '\n';
       return code;

src/blocks/utils/python.ts

@@ -287,3 +287,15 @@ export function getLegalName(proposedName: string, existingNames: string[]){
   }
   return newName;
 }
+
+export function isExistingPythonModule(moduleName: string): boolean {
+  for (const pythonData of allPythonData) {
+    // Process modules.
+    for (const moduleData of pythonData.modules) {
+      if (moduleData.moduleName === moduleName) {
+        return true;
+      }
+    }
+  }
+  return false;
+}