If a pin cannot be configured, display a warning, but don't crash

FalconChristmas · Nov 15, 2024 · 5d76dea · 5d76dea
1 parent a117c89
commit 5d76dea
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/oled/fppoled.cpp b/src/oled/fppoled.cpp
@@ -28,6 +28,14 @@
 #endif
 #include <thread>
 
+class WarningHolder {
+    static void AddWarning(const std::string& w);
+};
+
+void WarningHolder::AddWarning(const std::string& w) {
+    printf("Warning: %s\n", w.c_str());
+}
+
 static FPPOLEDUtils* oled = nullptr;
 void sigInteruptHandler(int sig) {
     oled->cleanup();

diff --git a/src/util/GPIOUtils.cpp b/src/util/GPIOUtils.cpp
@@ -18,6 +18,7 @@
 #include <thread>
 
 #include "GPIOUtils.h"
+#include "../Warnings.h"
 #include "commands/Commands.h"
 
 // No platform information on how to control pins
@@ -145,7 +146,11 @@ int GPIODCapabilities::configPin(const std::string& mode,
         if (line.is_requested()) {
             line.release();
         }
-        line.request(req, 1);
+        try {
+            line.request(req, 1);
+        } catch (const std::exception& ex) {
+            WarningHolder::AddWarning("Could not configure pin " + name + " as " + mode + " (" + ex.what() + ")");
+        }
         lastRequestType = req.request_type;
     }
 #endif