Add changes to GpioDriver for nasa/fprime#2943 (#78)

* Fixing LedBlinker workshop for new GPIO driver * Fixing UT breakage --------- Co-authored-by: Michael D Starch <[email protected]>
fprime-community · Oct 15, 2024 · 10ef6c1 · 10ef6c1
1 parent 65ddedd
commit 10ef6c1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/Components/Led/test/ut/LedTester.cpp b/Components/Led/test/ut/LedTester.cpp
@@ -91,8 +91,9 @@ void LedTester ::testBlinkInterval() {
 // Handlers for typed from ports
 // ----------------------------------------------------------------------
 
-void LedTester ::from_gpioSet_handler(const NATIVE_INT_TYPE portNum, const Fw::Logic& state) {
+Drv::GpioStatus LedTester ::from_gpioSet_handler(const NATIVE_INT_TYPE portNum, const Fw::Logic& state) {
     this->pushFromPortEntry_gpioSet(state);
+    return Drv::GpioStatus::OP_OK;
 }
 
 }  // end namespace Components
diff --git a/Components/Led/test/ut/LedTester.hpp b/Components/Led/test/ut/LedTester.hpp
@@ -50,8 +50,8 @@ class LedTester : public LedGTestBase {
 
     //! Handler for from_gpioSet
     //!
-    void from_gpioSet_handler(const NATIVE_INT_TYPE portNum, /*!< The port number*/
-                              const Fw::Logic& state);
+    Drv::GpioStatus from_gpioSet_handler(const NATIVE_INT_TYPE portNum, /*!< The port number*/
+                                         const Fw::Logic& state);
 
   private:
     // ----------------------------------------------------------------------

diff --git a/LedBlinker/Top/LedBlinkerTopology.cpp b/LedBlinker/Top/LedBlinkerTopology.cpp
@@ -111,9 +111,9 @@ void configureTopology() {
 
     // Note: Uncomment when using Svc:TlmPacketizer
     // tlmSend.setPacketList(LedBlinkerPacketsPkts, LedBlinkerPacketsIgnore, 1);
-    bool gpio_success = gpioDriver.open(13, Drv::LinuxGpioDriver::GpioDirection::GPIO_OUT);
-    if (!gpio_success) {
-        Fw::Logger::log("[ERROR] Failed to open GPIO pin\n");
+    Os::File::Status gpio_success = gpioDriver.open("/dev/gpiochip0", 13, Drv::LinuxGpioDriver::GpioConfiguration::GPIO_OUTPUT);
+    if (gpio_success != Os::File::Status::OP_OK) {
+        Fw::Logger::log("[ERROR] Failed to open GPIO pin: %d\n", gpio_success);
     }
 }
 

diff --git a/fprime b/fprime