In mrc_port.ts.

- Added constants for port types.
- Added constants for field prefixes.
- Added constants for visible port labels.
- Removed type MrcPortType, ports_ from PortMixin, and ports from PortExtraState.
- Renamed PortMixin portType_ to mrcPortType.
- Added mrcPortCount to PortMixin.
- Rewrote loadExtraState to create the appropriate fields for the portType.
- Removed updateShape.
- Simplified the code in pythonFromBlock that collects the ports.
- Generate code for CompoundPort without trailing backslashes.
- Changed Order.ATOMIC to Order.FUNCTION_CALL.
- Updated createPort to specify the field values.

In field_number_dropdown.ts:
Removed defaultVal parameter in createFieldNumberDropdown function.

In external_samples/port.py:
Replace PortType enum value BASE_COMPOUND with a module variable named _base_compound.
Removed PortType enum value SERVO_PORT.
Added PortType enum value USB_HUB_PORT.

Removed external_samples/servo.py.

Author: lizlooney

external_samples/port.py

@@ -19,20 +19,25 @@
 from enum import Enum
 from typing import Self
 
+_base_compound = 256
+
 class PortType(Enum):
+    # Ports on the SystemCore.
     CAN_PORT = 1
     SMART_IO_PORT = 2
-    SMART_MOTOR_PORT = 3
-    SERVO_PORT = 4
-    I2C_PORT = 5
-    USB_PORT = 6
-    EXPANSION_HUB_MOTOR_PORT = 7  # This is the port on the expansion hub
-    EXPANSION_HUB_SERVO_PORT = 8  # This is the port on the expansion hub
+    I2C_PORT = 3
+    USB_PORT = 4
+
+    # Ports on other devices.
+    SMART_MOTOR_PORT = 5  # A motor port on MotionCore.
+    USB_HUB_PORT = 6  # A port on a usb hub.
+    EXPANSION_HUB_MOTOR_PORT = 7  # A motor port on an expansion hub.
+    EXPANSION_HUB_SERVO_PORT = 8  # A servo port on an expansion hub.
 
-    BASE_COMPOUND = 256
-    USB_HUB = BASE_COMPOUND + 1
-    EXPANSION_HUB_MOTOR = BASE_COMPOUND + 2   # This is combination expansion hub and motor
-    EXPANSION_HUB_SERVO = BASE_COMPOUND + 3   # This is combination expansion hub and servo
+    # Compound ports
+    USB_HUB = _base_compound + 1  # A compound port with USB_PORT and USB_HUB_PORT.
+    EXPANSION_HUB_MOTOR = _base_compound + 2  # A compound port with USB_PORT and EXPANSION_HUB_MOTOR_PORT.
+    EXPANSION_HUB_SERVO = _base_compound + 3  # A compound port with USB_PORT and EXPANSION_HUB_SERVO_PORT.
 
 class Port(ABC):
     """Abstract base class for all port types."""
@@ -58,7 +63,7 @@ def __init__(self, port_type: PortType, location: int):
             port_type: PortType for this port (must be a simple type)
             location: int location for this port
         """
-        if port_type.value >= PortType.BASE_COMPOUND.value:
+        if port_type.value >= _base_compound:
             raise ValueError("Port must be of a simple type")
         super().__init__(port_type)
         self.location = location
@@ -80,7 +85,7 @@ def __init__(self, port_type: PortType, port1: Port, port2: Port):
             port1: First Port for compound ports
             port2: Second Port for compound ports
         """
-        if port_type.value < PortType.BASE_COMPOUND.value:
+        if port_type.value < _base_compound:
             raise ValueError("Port must be of a compound type")
         super().__init__(port_type)
         self.port1 = port1

external_samples/servo.py

@@ -63,7 +63,6 @@
 import expansion_hub_servo
 import port
 import rev_touch_sensor
-import servo
 import smart_motor
 import spark_mini
 import sparkfun_led_stick
@@ -126,7 +125,6 @@ def main(argv):
     expansion_hub_servo,
     port,
     rev_touch_sensor,
-    servo,
     smart_motor,
     spark_mini,
     sparkfun_led_stick,