Modify LoadSwitch to use ZephyrGpioDriver Component

Author: moisesmata

FprimeZephyrReference/Components/LoadSwitch/LoadSwitch.cpp

@@ -9,7 +9,6 @@
 
 namespace Components {
 
-const struct device* LoadSwitch::m_device = nullptr;
 // ----------------------------------------------------------------------
 // Component construction and destruction
 // ----------------------------------------------------------------------
@@ -23,34 +22,31 @@ LoadSwitch ::~LoadSwitch() {}
 // ----------------------------------------------------------------------
 
 void LoadSwitch ::Reset_handler(FwIndexType portNum) {
-    gpio_pin_set(m_device, m_pinNum, 0);
+    this->gpioSet_out(0, Fw::Logic::LOW);
+    this->log_ACTIVITY_HI_StatusChanged(Fw::On::OFF);
+    this->tlmWrite_IsOn(Fw::On::OFF);
     k_sleep(K_MSEC(100));
-    gpio_pin_set(m_device, m_pinNum, 1);
+    this->gpioSet_out(0, Fw::Logic::HIGH);
+    this->log_ACTIVITY_HI_StatusChanged(Fw::On::ON);
+    this->tlmWrite_IsOn(Fw::On::ON);
 }
 
 // ----------------------------------------------------------------------
 // Handler implementations for commands
 // ----------------------------------------------------------------------
 
 void LoadSwitch ::TURN_ON_cmdHandler(FwOpcodeType opCode, U32 cmdSeq) {
-    gpio_pin_set(m_device, m_pinNum, 1);
+    this->gpioSet_out(0, Fw::Logic::HIGH);
     this->log_ACTIVITY_HI_StatusChanged(Fw::On::ON);
-    // I think some code needed to send this status to the port as well
+    this->tlmWrite_IsOn(Fw::On::ON);
     this->cmdResponse_out(opCode, cmdSeq, Fw::CmdResponse::OK);
 }
 
 void LoadSwitch ::TURN_OFF_cmdHandler(FwOpcodeType opCode, U32 cmdSeq) {
-    gpio_pin_set(m_device, m_pinNum, 0);
+    this->gpioSet_out(0, Fw::Logic::LOW);
     this->log_ACTIVITY_HI_StatusChanged(Fw::On::OFF);
-    // I think some code needed to send this status to the port as well
+    this->tlmWrite_IsOn(Fw::On::OFF);
     this->cmdResponse_out(opCode, cmdSeq, Fw::CmdResponse::OK);
 }
 
-// This is meant to be used in Topology.cpp to configure the pin and device
-void LoadSwitch ::pin_configuration(const struct device* device, uint8_t pinNum) {
-    this->m_pinNum = pinNum;
-    this->m_device = device;
-    gpio_pin_configure(m_device, m_pinNum, GPIO_OUTPUT_INACTIVE);
-}
-
 }  // namespace Components

FprimeZephyrReference/Components/LoadSwitch/LoadSwitch.hpp

@@ -28,12 +28,6 @@ class LoadSwitch final : public LoadSwitchComponentBase {
     //! Destroy LoadSwitch object
     ~LoadSwitch();
 
-    // ----------------------------------------------------------------------
-    // Configuration Meant to be used in ***Topology.cpp
-    // ----------------------------------------------------------------------
-
-    void pin_configuration(const struct device* device, uint8_t pinNum);
-
   private:
     // ----------------------------------------------------------------------
     // Handler implementations for commands
@@ -57,12 +51,6 @@ class LoadSwitch final : public LoadSwitchComponentBase {
     void Reset_handler(FwIndexType portNum  //!< The port number
                        ) override;
 
-    // ----------------------------------------------------------------------
-    // Member variables
-    // ----------------------------------------------------------------------
-
-    uint8_t m_pinNum;
-    static const struct device* m_device;
 };
 
 }  // namespace Components

FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentTopology.cpp

@@ -61,6 +61,7 @@ void configureTopology() {
     gpioDriver.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
@@ -69,6 +70,7 @@ void configureTopology() {
     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
+    */
 }
 
 // Public functions for use in main program are namespaced with deployment name ReferenceDeployment