Fixed i2c port (not smart io!).

Author: lizlooney

src/blocks/mrc_component.ts

@@ -39,17 +39,17 @@ export const FIELD_TYPE = 'TYPE';
 
 // key is a regex pattern that matches a function argument name, value is type of mrc_port block to use.
 // TODO: Improve these regex pattern.
-// TODO: Should the types here match the PortType values in external_samples/component.py?
+// The types here match the PortType values in external_samples/component.py.
 const RECOGNIZED_PORT_ARG_NAME_PATTERNS: { [key: string]: string } = {
-  'can_port': 'SmartCan',
-  'i2c_port': 'SmartIO',
-  'io_port': 'SmartIO',
-  'smartIO_port': 'SmartIO',
-  'smart_io_port': 'SmartIO',
-  'motor_port': 'SmartMotor',
-  'servo_port': 'SmartIO',
-  'smart_motor_port': 'SmartMotor',
-  'usb_port': 'USBPort',
+  'can_port': 'CAN_PORT',
+  'io_port': 'SMART_IO_PORT',
+  'smartIO_port': 'SMART_IO_PORT',
+  'smart_io_port': 'SMART_IO_PORT',
+  'motor_port': 'SMART_MOTOR_PORT',
+  'smart_motor_port': 'SMART_MOTOR_PORT',
+  'servo_port': 'SERVO_PORT',
+  'i2c_port': 'I2C_PORT',
+  'usb_port': 'USB_PORT',
 };
 
 

src/blocks/mrc_mechanism_component_holder.ts

@@ -29,6 +29,7 @@ import * as commonStorage from '../storage/common_storage';
 import { OUTPUT_NAME as MECHANISM_OUTPUT } from './mrc_mechanism';
 import { BLOCK_NAME as  MRC_MECHANISM_NAME } from './mrc_mechanism';
 import { BLOCK_NAME as  MRC_COMPONENT_NAME } from './mrc_component';
+import * as  Component from './mrc_component';
 import { OUTPUT_NAME as COMPONENT_OUTPUT } from './mrc_component';
 import { BLOCK_NAME as  MRC_EVENT_NAME } from './mrc_event';
 import { OUTPUT_NAME as EVENT_OUTPUT } from './mrc_event';
@@ -137,9 +138,9 @@ const MECHANISM_COMPONENT_HOLDER = {
       // Walk through all connected component blocks.
       let componentBlock = componentsInput.connection.targetBlock();
       while (componentBlock) {
-        if (componentBlock.type === 'mrc_component') {
-          const componentName = componentBlock.getFieldValue('NAME');
-          const componentType = componentBlock.getFieldValue('TYPE');
+        if (componentBlock.type === MRC_COMPONENT_NAME) {
+          const componentName = componentBlock.getFieldValue(Component.FIELD_NAME);
+          const componentType = componentBlock.getFieldValue(Component.FIELD_TYPE);
 
           if (componentName && componentType) {
             components.push({