Merge branch 'master' into portexpander-keyboard

2025-12-23 11:10:52 +00:00 · 2024-10-26 12:25:05 +02:00
parent a6ea4c56ac ea63f035d1
commit 413a579bff
20 changed files with 311 additions and 85 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -27,7 +27,6 @@
 #include "detect/ScanI2CTwoWire.h"
 #include <Wire.h>
 #endif
-#include "detect/axpDebug.h"
 #include "detect/einkScan.h"
 #include "graphics/RAKled.h"
 #include "graphics/Screen.h"
@@ -1193,4 +1192,4 @@ void loop()
        mainDelay.delay(delayMsec);
    }
 }
-#endif
+#endif