added service 20

linux/boardtest/LibgpiodTest.cpp

@@ -13,7 +13,7 @@ LibgpiodTest::LibgpiodTest(object_id_t objectId, object_id_t gpioIfobjectId,
         sif::error << "LibgpiodTest::LibgpiodTest: Invalid Gpio interface." << std::endl;
     }
     gpioInterface->initialize(gpioCookie);
-    testCase = TestCases::READ;
+    testCase = TestCases::LOOPBACK;
 }
 
 LibgpiodTest::~LibgpiodTest() {
@@ -25,7 +25,7 @@ ReturnValue_t LibgpiodTest::performPeriodicAction() {
 
     switch(testCase) {
     case(TestCases::READ): {
-        result = gpioInterface->readGpio(gpioIds::Test_ID, &gpioState);
+        result = gpioInterface->readGpio(gpioIds::TEST_ID_0, &gpioState);
         if (result != RETURN_OK) {
             sif::debug << "LibgpiodTest::performPeriodicAction: Failed to read gpio "
                     << std::endl;
@@ -38,7 +38,7 @@ ReturnValue_t LibgpiodTest::performPeriodicAction() {
         break;
     }
     case(TestCases::LOOPBACK): {
-
+        break;
     }
     }
 
@@ -46,3 +46,37 @@ ReturnValue_t LibgpiodTest::performPeriodicAction() {
     return RETURN_OK;
 }
 
+ReturnValue_t LibgpiodTest::performOneShotAction() {
+    int gpioState;
+    ReturnValue_t result;
+
+    switch(testCase) {
+    case(TestCases::READ): {
+        break;
+    }
+    case(TestCases::LOOPBACK): {
+        result = gpioInterface->pullHigh(gpioIds::TEST_ID_0);
+        if(result == HasReturnvaluesIF::RETURN_OK) {
+            sif::info << "LibgpiodTest::performOneShotAction:"
+                    "GPIO pulled high successfully for loopback test" << std::endl;
+        }
+        else {
+            sif::warning << "LibgpiodTest::performOneShotAction: Could not pull GPIO high!"
+                    << std::endl;
+            return HasReturnvaluesIF::RETURN_OK;
+        }
+        result = gpioInterface->readGpio(gpioIds::TEST_ID_1, &gpioState);
+        if(result == HasReturnvaluesIF::RETURN_OK and gpioState == 1) {
+            sif::info << "LibgpiodTest::performOneShotAction:"
+                    "GPIO state read successfully and is high" << std::endl;
+        }
+        else {
+            sif::warning << "LibgpiodTest::performOneShotAction: GPIO read and is not high!"
+                    << std::endl;
+            return HasReturnvaluesIF::RETURN_OK;
+        }
+        break;
+    }
+    }
+    return HasReturnvaluesIF::RETURN_OK;
+}

linux/boardtest/LibgpiodTest.h

@@ -23,7 +23,8 @@ public:
     virtual ~LibgpiodTest();
 
 protected:
-    virtual ReturnValue_t performPeriodicAction() override;
+    ReturnValue_t performOneShotAction() override;
+    ReturnValue_t performPeriodicAction() override;
 
 private:
     GpioIF* gpioInterface;

linux/gpio/GpioCookie.cpp

@@ -4,17 +4,23 @@
 GpioCookie::GpioCookie() {
 }
 
-void GpioCookie::addGpio(gpioId_t gpioId, GpioConfig_t gpioConfig){
+ReturnValue_t GpioCookie::addGpio(gpioId_t gpioId, GpioConfig_t& gpioConfig){
 	auto gpioMapIter = gpioMap.find(gpioId);
 	if(gpioMapIter == gpioMap.end()) {
 		auto statusPair = gpioMap.emplace(gpioId, gpioConfig);
 		if (statusPair.second == false) {
+#if FSFW_VERBOSE_LEVEL >= 1
 			sif::error << "GpioCookie::addGpio: Failed to add GPIO " << gpioId <<
 			        "to GPIO map" << std::endl;
+#endif
+			return HasReturnvaluesIF::RETURN_FAILED;
 		}
-		return;
+		return HasReturnvaluesIF::RETURN_OK;
 	}
+#if FSFW_VERBOSE_LEVEL >= 1
 	sif::error << "GpioCookie::addGpio: GPIO already exists in GPIO map " << std::endl;
+#endif
+	return HasReturnvaluesIF::RETURN_FAILED;
 }
 
 GpioMap GpioCookie::getGpioMap() const {

linux/gpio/GpioCookie.h

@@ -23,7 +23,7 @@ public:
 
     virtual ~GpioCookie();
 
-    void addGpio(gpioId_t gpioId, GpioConfig_t gpioConfig);
+    ReturnValue_t addGpio(gpioId_t gpioId, GpioConfig_t& gpioConfig);
     /**
      * @brief	Get map with registered GPIOs.
      */

linux/gpio/GpioIF.h

@@ -29,6 +29,7 @@ public:
 	 * 			functionality to pull a certain GPIO to high logic level.
 	 *
 	 * @param gpioId	A unique number which specifies the GPIO to drive.
+	 * @return  Returns RETURN_OK for success. This should never return RETURN_FAILED.
 	 */
 	virtual ReturnValue_t pullHigh(gpioId_t gpioId) = 0;
 

linux/gpio/LinuxLibgpioIF.h

@@ -58,6 +58,7 @@ private:
 	 * @brief   Performs the initial configuration of all GPIOs specified in the GpioMap mapToAdd.
 	 */
 	ReturnValue_t configureGpios(GpioMap& mapToAdd);
+
 };
 
 #endif /* LINUX_GPIO_LINUXLIBGPIOIF_H_ */

linux/gpio/gpioDefinitions.h

@@ -28,6 +28,9 @@ enum Direction {
  *                      pointer.
  */
 typedef struct GpioConfig {
+    GpioConfig(): chipname(), lineNum(0), consumer(), direction(gpio::Direction::OUT),
+            initValue(0) {};
+
     GpioConfig(std::string chipname_, int lineNum_, std::string consumer_,
             gpio::Direction direction_, int initValue_):
             chipname(chipname_), lineNum(lineNum_), consumer(consumer_),