Instances of GPIO Drivers, connected to load switches in topology

Author: moisesmata

FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentTopology.cpp

@@ -16,7 +16,14 @@
 static const struct gpio_dt_spec ledGpio = GPIO_DT_SPEC_GET(DT_NODELABEL(led0), gpios);
 static const struct gpio_dt_spec burnwire0Gpio = GPIO_DT_SPEC_GET(DT_NODELABEL(burnwire0), gpios);
 static const struct gpio_dt_spec burnwire1Gpio = GPIO_DT_SPEC_GET(DT_NODELABEL(burnwire1), gpios);
-static const struct device* mcp23017_dev = DEVICE_DT_GET(DT_NODELABEL(mcp23017));
+static const struct gpio_dt_spec face0LoadSwitchGpio = GPIO_DT_SPEC_GET(DT_NODELABEL(face0_enable), gpios);
+static const struct gpio_dt_spec face1LoadSwitchGpio = GPIO_DT_SPEC_GET(DT_NODELABEL(face1_enable), gpios);
+static const struct gpio_dt_spec face2LoadSwitchGpio = GPIO_DT_SPEC_GET(DT_NODELABEL(face2_enable), gpios);
+static const struct gpio_dt_spec face3LoadSwitchGpio = GPIO_DT_SPEC_GET(DT_NODELABEL(face3_enable), gpios);
+static const struct gpio_dt_spec face4LoadSwitchGpio = GPIO_DT_SPEC_GET(DT_NODELABEL(face4_enable), gpios);
+static const struct gpio_dt_spec face5LoadSwitchGpio = GPIO_DT_SPEC_GET(DT_NODELABEL(face5_enable), gpios);
+static const struct gpio_dt_spec payloadPowerLoadSwitchGpio = GPIO_DT_SPEC_GET(DT_NODELABEL(payload_pwr_enable), gpios);
+static const struct gpio_dt_spec payloadBatteryLoadSwitchGpio = GPIO_DT_SPEC_GET(DT_NODELABEL(payload_batt_enable), gpios);
 
 // Allows easy reference to objects in FPP/autocoder required namespaces
 using namespace ReferenceDeployment;
@@ -61,16 +68,14 @@ void configureTopology() {
     gpioWatchdog.open(ledGpio, Zephyr::ZephyrGpioDriver::GpioConfiguration::OUT);
     gpioBurnwire0.open(burnwire0Gpio, Zephyr::ZephyrGpioDriver::GpioConfiguration::OUT);
     gpioBurnwire1.open(burnwire1Gpio, Zephyr::ZephyrGpioDriver::GpioConfiguration::OUT);
-    /*
-    face4LoadSwitch.pin_configuration(mcp23017_dev, 0);  // Pin 0 on MCP23017
-    face0LoadSwitch.pin_configuration(mcp23017_dev, 1);  // Pin 1 on MCP23017
-    face1LoadSwitch.pin_configuration(mcp23017_dev, 2);  // Pin 2 on MCP23017
-    face2LoadSwitch.pin_configuration(mcp23017_dev, 3);  // Pin 3 on MCP23017
-    face3LoadSwitch.pin_configuration(mcp23017_dev, 4);  // Pin 4 on MCP23017
-    face5LoadSwitch.pin_configuration(mcp23017_dev, 5);  // Pin 5 on MCP23017
-    payloadPowerLoadSwitch.pin_configuration(mcp23017_dev, 7);  // Pin 7 on MCP23017
-    payloadBatteryLoadSwitch.pin_configuration(mcp23017_dev, 9);  // Pin 9 on MCP23017
-    */
+    gpioface4LS.open(face4LoadSwitchGpio, Zephyr::ZephyrGpioDriver::GpioConfiguration::OUT);
+    gpioface0LS.open(face0LoadSwitchGpio, Zephyr::ZephyrGpioDriver::GpioConfiguration::OUT);
+    gpioface1LS.open(face1LoadSwitchGpio, Zephyr::ZephyrGpioDriver::GpioConfiguration::OUT);
+    gpioface2LS.open(face2LoadSwitchGpio, Zephyr::ZephyrGpioDriver::GpioConfiguration::OUT);
+    gpioface3LS.open(face3LoadSwitchGpio, Zephyr::ZephyrGpioDriver::GpioConfiguration::OUT);
+    gpioface5LS.open(face5LoadSwitchGpio, Zephyr::ZephyrGpioDriver::GpioConfiguration::OUT);
+    gpioPayloadPowerLS.open(payloadPowerLoadSwitchGpio, Zephyr::ZephyrGpioDriver::GpioConfiguration::OUT);
+    gpioPayloadBatteryLS.open(payloadBatteryLoadSwitchGpio, Zephyr::ZephyrGpioDriver::GpioConfiguration::OUT);
 }
 
 // Public functions for use in main program are namespaced with deployment name ReferenceDeployment

FprimeZephyrReference/ReferenceDeployment/Top/instances.fpp

@@ -128,5 +128,22 @@ module ReferenceDeployment {
 
   instance antennaDeployer: Components.AntennaDeployer base id 0x10029000
 
-  instance fsSpace: Components.FsSpace base id 0x10030000
+  instance gpioface4LS: Zephyr.ZephyrGpioDriver base id 0x1002A000
+  
+  instance gpioface0LS: Zephyr.ZephyrGpioDriver base id 0x1002B000
+
+  instance gpioface1LS: Zephyr.ZephyrGpioDriver base id 0x1002C000
+
+  instance gpioface2LS: Zephyr.ZephyrGpioDriver base id 0x1002D000
+
+  instance gpioface3LS: Zephyr.ZephyrGpioDriver base id 0x1002E000
+
+  instance gpioface5LS: Zephyr.ZephyrGpioDriver base id 0x1002F000
+
+  instance gpioPayloadPowerLS: Zephyr.ZephyrGpioDriver base id 0x10030000
+  
+  instance gpioPayloadBatteryLS: Zephyr.ZephyrGpioDriver base id 0x10031000
+
+  instance fsSpace: Components.FsSpace base id 0x10032000
+
 }

FprimeZephyrReference/ReferenceDeployment/Top/topology.fpp

@@ -29,6 +29,14 @@ module ReferenceDeployment {
     instance gpioWatchdog
     instance gpioBurnwire0
     instance gpioBurnwire1
+    instance gpioface0LS
+    instance gpioface1LS
+    instance gpioface2LS
+    instance gpioface3LS
+    instance gpioface4LS
+    instance gpioface5LS
+    instance gpioPayloadPowerLS
+    instance gpioPayloadBatteryLS
     instance watchdog
     instance prmDb
     instance rtcManager
@@ -151,7 +159,18 @@ module ReferenceDeployment {
 
 
     connections Watchdog {
-      watchdog.gpioSet -> gpioDriver.gpioWrite
+      watchdog.gpioSet -> gpioWatchdog.gpioWrite
+    }
+
+    connections LoadSwitches {
+      face4LoadSwitch.gpioSet -> gpioface4LS.gpioWrite
+      face0LoadSwitch.gpioSet -> gpioface0LS.gpioWrite
+      face1LoadSwitch.gpioSet -> gpioface1LS.gpioWrite
+      face2LoadSwitch.gpioSet -> gpioface2LS.gpioWrite
+      face3LoadSwitch.gpioSet -> gpioface3LS.gpioWrite
+      face5LoadSwitch.gpioSet -> gpioface5LS.gpioWrite
+      payloadPowerLoadSwitch.gpioSet -> gpioPayloadPowerLS.gpioWrite
+      payloadBatteryLoadSwitch.gpioSet -> gpioPayloadBatteryLS.gpioWrite
     }
 
     connections BurnwireGpio {