implemented the epansion line stuff

made adjustments to to the grain cable by adding i2c as an option as long as you set and expander line, also ajusted DeviceAvailability so that an i2c address will not be claimed if the component has an expansion line set, updated the device wizard to removed pin options if the i2c port was selected and vice versa for pins since we now have a components that supports both types, updated the components setting to set the default address type based on the restriction passed in that is set by the wizard, and fall back to what is was before if one is not passed in
2025-07-11 13:56:17 -06:00 · 2025-07-11 13:56:17 -06:00 · 3325c9d75b
commit 3325c9d75b
parent 54a826bc2d
11 changed files with 113 additions and 36 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -42,7 +42,7 @@
        "mui-tel-input": "^7.0.0",
        "notistack": "^3.0.1",
        "openweathermap-ts": "^1.2.10",
-        "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#staging",
+        "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#cable_expander",
        "query-string": "^9.2.1",
        "react": "^18.3.1",
        "react-beautiful-dnd": "^13.1.1",
@ -10889,7 +10889,7 @@
    },
    "node_modules/protobuf-ts": {
      "version": "1.0.0",
-      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#4523ffef42032eb4a923bd50d4cfcccbb1397dbd",
+      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#eff6e4e51be080fdee9503d74ee66a0504436545",
      "dependencies": {
        "protobufjs": "^6.8.8"
      }
--- a/package.json
+++ b/package.json
@ -54,7 +54,7 @@
    "mui-tel-input": "^7.0.0",
    "notistack": "^3.0.1",
    "openweathermap-ts": "^1.2.10",
-    "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#staging",
+    "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#cable_expander",
    "query-string": "^9.2.1",
    "react": "^18.3.1",
    "react-beautiful-dnd": "^13.1.1",
--- a/src/component/ComponentSettings.tsx
+++ b/src/component/ComponentSettings.tsx
@ -169,6 +169,7 @@ export default function ComponentSettings(props: Props) {
  const [removeDialogOpen, setRemoveDialogOpen] = useState(false);
  const [formComponent, setFormComponent] = useState<Component>(new Component());
  const [cableID, setCableID] = useState(0);
+  const [expansionLine, setExpansionLine] = useState(0);
  const [overlayIndex, setOverlayIndex] = useState(0);
  const [overlayColourDialog, setOverlayCoulourDialog] = useState(false);
  const [tabVal, setTabVal] = useState(0);
@ -222,6 +223,9 @@ export default function ComponentSettings(props: Props) {
  const isFormValid = () => {
    //let { component } = form;
    let type = or(formComponent.settings.type, "");
+    if(supportsExpansion() && expansionLine === 0){
+      return false
+    }
    return isComponentTypeValid(type) && isAddressValid(formComponent);
  };

@ -238,7 +242,6 @@ export default function ComponentSettings(props: Props) {
    componentType: quack.ComponentType
  ): number[] => {
    let positions = availablePositions.get(addressType);
-    console.log(positions)
    if (!positions) return [];
    switch (addressType) {
      case quack.AddressType.ADDRESS_TYPE_I2C:
@ -306,6 +309,7 @@ export default function ComponentSettings(props: Props) {
    const component = formComponent;
    //component.settings.calibrationCoefficient = Number(form.coefficient);
    if (cableID > 0) component.settings.addressType = cableID + 8;
+    component.settings.expansionLine = expansionLine
    componentAPI
      .add(device.id(), component.settings, as)
      .then((_response: any) => {
@ -372,10 +376,10 @@ export default function ComponentSettings(props: Props) {
      let ext = extension(type, subtype);
      formComponent.settings.type = type;
      formComponent.settings.subtype = subtype;
-      formComponent.settings.addressType = getAddressTypes(
+      formComponent.settings.addressType = or(addressTypeRestriction, getAddressTypes(
        formComponent.settings.type,
        formComponent.settings.subtype
-      )[0];
+      )[0]);
      formComponent.settings.address = or(
        getAvailablePositions(formComponent.settings.addressType, formComponent.settings.type)[0],
        Component.create().settings.address
@ -398,11 +402,19 @@ export default function ComponentSettings(props: Props) {
  };

  const handlePositionChanged = (event: any) => {
+    setCableID(0)
+    setExpansionLine(0)
    let f = cloneDeep(formComponent);
-    f.settings.address = event.target.value
-      .toString()
-      .split(":")
-      .pop();
+    //split the string
+    let split: string[] = event.target.value.toString().split(":")
+    // pop the addres off of the end of the array
+    f.settings.address = parseInt(split.pop() ?? "0")
+    // pop the address type out of the array next
+    f.settings.addressType = parseInt(split.pop() ?? "0")
+    // f.settings.address = event.target.value
+    //   .toString()
+    //   .split(":")
+    //   .pop();
    setFormComponent(f);
  };

@ -413,7 +425,6 @@ export default function ComponentSettings(props: Props) {
    for (let i = 0; i < addressTypes.length; i++) {
      let addressType = addressTypes[i];
      let availablePositions = getAvailablePositions(addressType, type);
-      console.log(availablePositions)

      availableMenuItemPositions.push(
        <MenuItem key={addressType} divider disabled>
@ -490,6 +501,21 @@ export default function ComponentSettings(props: Props) {
    );
  };

+  const isCableComponent = () => {
+    return (formComponent.settings.type === quack.ComponentType.COMPONENT_TYPE_GRAIN_CABLE ||
+              formComponent.settings.type ===
+                quack.ComponentType.COMPONENT_TYPE_DRAGER_GAS_DONGLE ||
+              formComponent.settings.type === quack.ComponentType.COMPONENT_TYPE_PRESSURE_CABLE ||
+              (formComponent.settings.type === quack.ComponentType.COMPONENT_TYPE_CAPACITOR_CABLE &&
+                formComponent.subType() ===
+                  quack.CapacitorCableSubtype.CAPACITOR_CABLE_SUBTYPE_FROG))
+  }
+
+  const supportsExpansion = () => {
+    return (formComponent.settings.type === quack.ComponentType.COMPONENT_TYPE_GRAIN_CABLE &&
+            formComponent.settings.addressType === quack.AddressType.ADDRESS_TYPE_I2C)
+  }
+
  const addForm = () => {
    return (
      <DialogContent>
@ -543,14 +569,8 @@ export default function ComponentSettings(props: Props) {
                formComponent.settings.subtype
              )}
            </TextField>
-            {(formComponent.settings.type === quack.ComponentType.COMPONENT_TYPE_GRAIN_CABLE ||
-              formComponent.settings.type ===
-                quack.ComponentType.COMPONENT_TYPE_DRAGER_GAS_DONGLE ||
-              formComponent.settings.type === quack.ComponentType.COMPONENT_TYPE_PRESSURE_CABLE ||
-              (formComponent.settings.type === quack.ComponentType.COMPONENT_TYPE_CAPACITOR_CABLE &&
-                formComponent.subType() ===
-                  quack.CapacitorCableSubtype.CAPACITOR_CABLE_SUBTYPE_FROG)) &&
-              setComponentAddrType()}
+            {supportsExpansion() && setExpLine()}
+            {(isCableComponent() && !supportsExpansion())&& setComponentAddrType()}
          </React.Fragment>
        ) : activeStep === 1 ? (
          <ComponentForm
@ -582,6 +602,28 @@ export default function ComponentSettings(props: Props) {
      </DialogContent>
    );
  };
+
+  const setExpLine = () => {
+    return (
+      <TextField
+        label="Expansion Line"
+        type="number"
+        margin="normal"
+        error={expansionLine < 1 || expansionLine > 12}
+        fullWidth
+        variant="outlined"
+        value={expansionLine}
+        helperText="Enter line the cable is connected to on your expander"
+        onChange={e => {
+          let number = parseInt(e.target.value);
+          if (number < 0 || isNaN(number)) number = 0;
+          if (number > 12) number = 12;
+          setExpansionLine(number);
+        }}
+      />
+    );
+  };
+
  const setComponentAddrType = () => {
    return (
      <TextField
--- a/src/device/DeviceWizard.tsx
+++ b/src/device/DeviceWizard.tsx
@ -198,16 +198,23 @@ export default function DeviceWizard(props: Props) {

  /**
   * function that restricts the pin availabilty in the availability map to the pin of the port that was selected
-   * does nothing for I2C ports as the restrictions for that are handled by the component type
   * @param port port that was selected
   * @param availability availability map of the device
   * @returns modified availability map
   */
  const adjustAvailablePositions = (port: PortInformation, availability: DeviceAvailabilityMap) => {
    let currentAvailability = availability;
+    console.log(port)
    switch (port.addressType) {
      case quack.AddressType.ADDRESS_TYPE_CONFIGURABLE_PIN_ARRAY:
        currentAvailability.set(port.addressType, [{ address: port.address, label: port.label }]);
+        //since we now have a component type that can be pins or i2c need to remove i2c options if they selected a pin port
+        currentAvailability.set(quack.AddressType.ADDRESS_TYPE_I2C, new Map());
+        break;
+      case quack.AddressType.ADDRESS_TYPE_I2C:
+        //since we now have a component type that can be pins or i2c need to remove pin options if they selected the i2c port
+        currentAvailability.set(quack.AddressType.ADDRESS_TYPE_CONFIGURABLE_PIN_ARRAY, []);
+        break;
    }
    return currentAvailability;
  };
--- a/src/models/Component.ts
+++ b/src/models/Component.ts
@ -67,18 +67,25 @@ export class Component {
    return quack.ComponentID.fromObject({
      type: this.settings.type,
      addressType: this.settings.addressType,
-      address: this.settings.address
+      address: this.settings.address,
+      expansionLine: this.settings.expansionLine,
+      muxLine: this.settings.muxLine
    });
  }

  public locationString(): string {
-    return (
-      or(this.settings.type, 0).toString() +
+    let compositeLocation = or(this.settings.type, 0).toString() +
      "-" +
      or(this.settings.addressType, 0).toString() +
      "-" +
      or(this.settings.address, 0).toString()
-    );
+    if(this.settings.expansionLine){
+      compositeLocation = compositeLocation + "-" + this.settings.expansionLine
+    }
+      if(this.settings.muxLine){
+      compositeLocation = compositeLocation + ":" + this.settings.muxLine
+    }
+    return compositeLocation;
  }

  public type(): quack.ComponentType {
--- a/src/pbHelpers/AddressTypes/I2C.ts
+++ b/src/pbHelpers/AddressTypes/I2C.ts
@ -16,7 +16,8 @@ export const I2C: AddressTypeExtension = {
      [quack.ComponentType.COMPONENT_TYPE_CAPACITANCE, 0x4f],
      [quack.ComponentType.COMPONENT_TYPE_CAPACITOR_CABLE, 0x4f],
      [quack.ComponentType.COMPONENT_TYPE_SEN5X, 0x68],
-      [quack.ComponentType.COMPONENT_TYPE_AIRFLOW, 0x29]
+      [quack.ComponentType.COMPONENT_TYPE_AIRFLOW, 0x29],
+      [quack.ComponentType.COMPONENT_TYPE_GRAIN_CABLE, 0x70]
    ]);

    const offset = offsets.get(componentType);
--- a/src/pbHelpers/Bin.ts
+++ b/src/pbHelpers/Bin.ts
@ -16,6 +16,7 @@ export const GetBinShapeDescribers = (): BinShapeDescriber[] => {
  ];
 };

+// DEPRECATED -- the bon now knows its components from the relative object table
 export const HasGrainCable = (bin?: pond.BinSettings): boolean => {
  if (bin && bin.deviceComponents) {
    bin.deviceComponents.forEach(dc => {
--- a/src/pbHelpers/Component.ts
+++ b/src/pbHelpers/Component.ts
@ -23,7 +23,9 @@ export function getComponentIDString(component?: Component): string {
    ? componentIDToString({
        type: component.settings.type,
        addressType: component.settings.addressType,
-        address: component.settings.address
+        address: component.settings.address,
+        expansionLine: component.settings.expansionLine,
+        muxLine: component.settings.muxLine
      })
    : "0-0-0";
 }
@ -40,13 +42,18 @@ export function componentIDToString(componentID?: quack.IComponentID | null): st
  if (!componentID) {
    return "0-0-0";
  }
-  return (
-    or(componentID.type, 0).toString() +
+  let compositeLocation = or(componentID.type, 0).toString() +
    "-" +
    or(componentID.addressType, 0).toString() +
    "-" +
    or(componentID.address, 0).toString()
-  );
+  if(componentID.expansionLine){
+    compositeLocation = compositeLocation + "-" + componentID.expansionLine
+  }
+  if(componentID.muxLine){
+    compositeLocation = compositeLocation + ":" + componentID.muxLine
+  }
+  return compositeLocation;
 }

 export function stringToComponentId(componentIDString: string): quack.ComponentID {
--- a/src/pbHelpers/ComponentTypes/GrainCable.ts
+++ b/src/pbHelpers/ComponentTypes/GrainCable.ts
@ -176,7 +176,7 @@ export function GrainCable(subtype: number = 0): ComponentTypeExtension {
    isSource: true,
    isArray: true,
    isCalibratable: false,
-    addressTypes: [quack.AddressType.ADDRESS_TYPE_CONFIGURABLE_PIN_ARRAY],
+    addressTypes: [quack.AddressType.ADDRESS_TYPE_CONFIGURABLE_PIN_ARRAY, quack.AddressType.ADDRESS_TYPE_I2C],
    interactionResultTypes: [],
    states: [],
    measurements: [
--- a/src/pbHelpers/DeviceAvailability.ts
+++ b/src/pbHelpers/DeviceAvailability.ts
@ -11,6 +11,11 @@ export type DevicePositions = number[] | ComponentAvailabilityMap | Configurable
 export type DeviceAvailabilityMap = Map<quack.AddressType, DevicePositions>;
 export type OffsetAvailabilityMap = Map<quack.AddressType, number[][]>;

+//component types that can be connected to an expander in the I2C port
+const ExpansionComponentTypes: quack.ComponentType[] = [
+  quack.ComponentType.COMPONENT_TYPE_GRAIN_CABLE
+]
+
 const DefaultPinArray: ConfigurablePin[] = [
  { address: 1, label: "1" },
  { address: 2, label: "2" },
@ -60,7 +65,8 @@ const DefaultAvailability: DeviceAvailabilityMap = new Map<quack.AddressType, De
      [quack.ComponentType.COMPONENT_TYPE_CAPACITANCE, [0x50]],
      [quack.ComponentType.COMPONENT_TYPE_CAPACITOR_CABLE, [0x50]],
      [quack.ComponentType.COMPONENT_TYPE_SEN5X, [0x69]],
-      [quack.ComponentType.COMPONENT_TYPE_AIRFLOW, [0x2a]]
+      [quack.ComponentType.COMPONENT_TYPE_AIRFLOW, [0x2a]],
+      [quack.ComponentType.COMPONENT_TYPE_GRAIN_CABLE, [0x71]] // the address cables will use when they are plugged into the expander with V2 device only
    ])
  ],
  [quack.AddressType.ADDRESS_TYPE_DAC, [0, 1]],
@ -103,7 +109,8 @@ export class DeviceAvailability {
  ClaimAddress(
    addressType: quack.AddressType,
    componentType: quack.ComponentType,
-    address: number
+    address: number,
+    expansionLine?: number
  ) {
    let offset = addressType - 8;
    if (offset > 0) addressType = addressType - (7 + offset);
@ -127,6 +134,9 @@ export class DeviceAvailability {
        break;
      case quack.AddressType.ADDRESS_TYPE_I2C:
      case quack.AddressType.ADDRESS_TYPE_SPI:
+        if(expansionLine){
+          break;
+        }
        let addressTypePositions = cloneDeep(
          this.availability.get(addressType) as ComponentAvailabilityMap
        );
@ -171,7 +181,8 @@ export function FindAvailablePositions(
      available.ClaimAddress(
        component.settings.addressType,
        component.settings.type,
-        or(component.settings.address, 0)
+        or(component.settings.address, 0),
+        component.settings.expansionLine
      );
    }
  });
--- a/src/products/Bindapt/BindaptAvailability.ts
+++ b/src/products/Bindapt/BindaptAvailability.ts
@ -246,7 +246,7 @@ export const BindaptV2MonitorAvailability: DeviceAvailabilityMap = new Map<
  [
    quack.AddressType.ADDRESS_TYPE_I2C,
    new Map<quack.ComponentType, number[]>([
-      //[quack.ComponentType.COMPONENT_TYPE_PRESSURE, [0x18]],
+      [quack.ComponentType.COMPONENT_TYPE_PRESSURE, [0x18]],
      [quack.ComponentType.COMPONENT_TYPE_DHT, [0x40]],
      // [quack.ComponentType.COMPONENT_TYPE_VAPOUR_PRESSURE_DEFICIT, [0x40]], //component type deprecated?
      [quack.ComponentType.COMPONENT_TYPE_LIDAR, [0x62]],
@ -278,12 +278,13 @@ export const BindaptV2AutomateAvailability: DeviceAvailabilityMap = new Map<
  [
    quack.AddressType.ADDRESS_TYPE_I2C,
    new Map<quack.ComponentType, number[]>([
-      //[quack.ComponentType.COMPONENT_TYPE_PRESSURE, [0x18]],
+      [quack.ComponentType.COMPONENT_TYPE_PRESSURE, [0x18]],
      [quack.ComponentType.COMPONENT_TYPE_DHT, [0x40]],
      // [quack.ComponentType.COMPONENT_TYPE_VAPOUR_PRESSURE_DEFICIT, [0x40]], //component type deprecated?
      [quack.ComponentType.COMPONENT_TYPE_LIDAR, [0x62]],
      [quack.ComponentType.COMPONENT_TYPE_CO2, [0x61]],
-      [quack.ComponentType.COMPONENT_TYPE_SEN5X, [0x69]]
+      [quack.ComponentType.COMPONENT_TYPE_SEN5X, [0x69]],
+      [quack.ComponentType.COMPONENT_TYPE_GRAIN_CABLE, [0x71]]
    ])
  ],
  [quack.AddressType.ADDRESS_TYPE_POWER, [0]],