Merge e3c06a3f66 into cc5d00e211

arch/portduino/portduino.ini

@@ -21,6 +21,7 @@ build_src_filter =
 
 lib_deps =
   ${env.lib_deps}
+  ${screen_base.lib_deps}
   ${networking_base.lib_deps}
   ${radiolib_base.lib_deps}
   ${environmental_base.lib_deps}

arch/stm32/stm32.ini

@@ -39,7 +39,7 @@ build_flags =
   -DHAL_RNG_MODULE_ENABLED
 
 build_src_filter =
-  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/api/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mesh/eth/> -<input> -<buzz> -<modules/RemoteHardwareModule.cpp> -<platform/nrf52> -<platform/portduino> -<platform/rp2xx0> -<mesh/raspihttp>
+  ${arduino_base.build_src_filter} -<graphics/> -<platform/esp32/> -<nimble/> -<mesh/api/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mesh/eth/> -<input> -<buzz> -<modules/RemoteHardwareModule.cpp> -<platform/nrf52> -<platform/portduino> -<platform/rp2xx0> -<mesh/raspihttp>
 
 board_upload.offset_address = 0x08000000
 upload_protocol = stlink

platformio.ini

@@ -59,8 +59,6 @@ build_flags = -Wno-missing-field-initializers
 monitor_speed = 115200
 monitor_filters = direct
 lib_deps =
-	# renovate: datasource=git-refs depName=meshtastic-esp8266-oled-ssd1306 packageName=https://github.com/meshtastic/esp8266-oled-ssd1306 gitBranch=master
-	https://github.com/meshtastic/esp8266-oled-ssd1306/archive/0119501e9983bd894830b02f545c377ee08d66fe.zip
 	# renovate: datasource=custom.pio depName=OneButton packageName=mathertel/library/OneButton
 	mathertel/OneButton@2.6.1
 	# renovate: datasource=git-refs depName=meshtastic-arduino-fsm packageName=https://github.com/meshtastic/arduino-fsm gitBranch=master
@@ -82,11 +80,18 @@ check_flags =
 	--suppressions-list=suppressions.txt
 	--inline-suppr
 
+; Common libs for platforms that support screens (not STM32)
+[screen_base]
+lib_deps =
+	# renovate: datasource=git-refs depName=meshtastic-esp8266-oled-ssd1306 packageName=https://github.com/meshtastic/esp8266-oled-ssd1306 gitBranch=master
+	https://github.com/meshtastic/esp8266-oled-ssd1306/archive/0119501e9983bd894830b02f545c377ee08d66fe.zip
+
 ; Common settings for conventional (non Portduino) Arduino targets
 [arduino_base]
 framework = arduino
 lib_deps =
 	${env.lib_deps}
+	${screen_base.lib_deps} ; arduino_base.lib_deps are not consumed by stm32wl
 	# renovate: datasource=custom.pio depName=NonBlockingRTTTL packageName=end2endzone/library/NonBlockingRTTTL
 	end2endzone/NonBlockingRTTTL@1.3.0
 build_flags = ${env.build_flags} -Os

src/FakeScreen.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include "power.h"
+namespace graphics
+{
+// Noop class for MESHTASTIC_EXCLUDE_SCREEN
+class Screen
+{
+  public:
+    enum FrameFocus : uint8_t {
+        FOCUS_DEFAULT,
+        FOCUS_PRESERVE,
+        FOCUS_FAULT,
+        FOCUS_TEXTMESSAGE,
+        FOCUS_MODULE,
+        FOCUS_CLOCK,
+        FOCUS_SYSTEM,
+    };
+
+    explicit Screen(){};
+    void setup() {}
+    void setOn(bool) {}
+    void doDeepSleep() {}
+    void showSimpleBanner(const char *message, uint32_t durationMs = 0) {}
+    void setFrames(FrameFocus focus) {}
+};
+} // namespace graphics
+
+inline bool shouldWakeOnReceivedMessage()
+{
+    return false;
+}

src/PowerFSM.cpp

@@ -14,7 +14,11 @@
 #include "NodeDB.h"
 #include "PowerMon.h"
 #include "configuration.h"
+#if !MESHTASTIC_EXCLUDE_SCREEN
 #include "graphics/Screen.h"
+#else
+#include "FakeScreen.h"
+#endif
 #include "main.h"
 #include "sleep.h"
 #include "target_specific.h"

src/main.cpp

@@ -28,7 +28,11 @@
 #endif
 #include "detect/einkScan.h"
 #include "graphics/RAKled.h"
+#if !MESHTASTIC_EXCLUDE_SCREEN
 #include "graphics/Screen.h"
+#else
+#include "FakeScreen.h"
+#endif
 #include "main.h"
 #include "mesh/generated/meshtastic/config.pb.h"
 #include "meshUtils.h"
@@ -352,9 +356,11 @@ void setup()
     SPISettings spiSettings(4000000, MSBFIRST, SPI_MODE0);
 #endif
 
+#if !MESHTASTIC_EXCLUDE_SCREEN
     meshtastic_Config_DisplayConfig_OledType screen_model =
         meshtastic_Config_DisplayConfig_OledType::meshtastic_Config_DisplayConfig_OledType_OLED_AUTO;
     OLEDDISPLAY_GEOMETRY screen_geometry = GEOMETRY_128_64;
+#endif
 
 #ifdef USE_SEGGER
     auto mode = false ? SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL : SEGGER_RTT_MODE_NO_BLOCK_TRIM;
@@ -750,6 +756,7 @@ void setup()
     else
         playStartMelody();
 
+#if !MESHTASTIC_EXCLUDE_SCREEN
     // fixed screen override?
     if (config.display.oled != meshtastic_Config_DisplayConfig_OledType_OLED_AUTO)
         screen_model = config.display.oled;
@@ -762,6 +769,7 @@ void setup()
 #if defined(USE_SH1107_128_64)
     screen_model = meshtastic_Config_DisplayConfig_OledType_OLED_SH1107; // keep dimension of 128x64
 #endif
+#endif // MESHTASTIC_EXCLUDE_SCREEN
 
 #if !MESHTASTIC_EXCLUDE_I2C
 #if !defined(ARCH_STM32WL)

src/main.h

@@ -5,7 +5,11 @@
 #include "NodeStatus.h"
 #include "PowerStatus.h"
 #include "detect/ScanI2C.h"
+#if !MESHTASTIC_EXCLUDE_SCREEN
 #include "graphics/Screen.h"
+#else
+#include "FakeScreen.h"
+#endif
 #include "memGet.h"
 #include "mesh/generated/meshtastic/config.pb.h"
 #include "mesh/generated/meshtastic/telemetry.pb.h"

src/mesh/PhoneAPI.cpp

@@ -205,6 +205,7 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
         // app not to send locations on our behalf.
         fromRadioScratch.which_payload_variant = meshtastic_FromRadio_my_info_tag;
         strncpy(myNodeInfo.pio_env, optstr(APP_ENV), sizeof(myNodeInfo.pio_env));
+        myNodeInfo.nodedb_count = static_cast<uint16_t>(nodeDB->getNumMeshNodes());
         fromRadioScratch.my_info = myNodeInfo;
         state = STATE_SEND_UIDATA;
 

src/mesh/Router.cpp

@@ -651,11 +651,12 @@ void Router::handleReceived(meshtastic_MeshPacket *p, RxSource src)
         shouldIgnoreNonstandardPorts = true;
 #endif
         if (shouldIgnoreNonstandardPorts && p->which_payload_variant == meshtastic_MeshPacket_decoded_tag &&
-            IS_ONE_OF(p->decoded.portnum, meshtastic_PortNum_ATAK_FORWARDER, meshtastic_PortNum_ATAK_PLUGIN,
-                      meshtastic_PortNum_PAXCOUNTER_APP, meshtastic_PortNum_IP_TUNNEL_APP, meshtastic_PortNum_AUDIO_APP,
-                      meshtastic_PortNum_PRIVATE_APP, meshtastic_PortNum_DETECTION_SENSOR_APP, meshtastic_PortNum_RANGE_TEST_APP,
-                      meshtastic_PortNum_REMOTE_HARDWARE_APP)) {
-            LOG_DEBUG("Ignore packet on blacklisted portnum for CORE_PORTNUMS_ONLY");
+            !IS_ONE_OF(p->decoded.portnum, meshtastic_PortNum_TEXT_MESSAGE_APP, meshtastic_PortNum_TEXT_MESSAGE_COMPRESSED_APP,
+                       meshtastic_PortNum_POSITION_APP, meshtastic_PortNum_NODEINFO_APP, meshtastic_PortNum_ROUTING_APP,
+                       meshtastic_PortNum_TELEMETRY_APP, meshtastic_PortNum_ADMIN_APP, meshtastic_PortNum_ALERT_APP,
+                       meshtastic_PortNum_KEY_VERIFICATION_APP, meshtastic_PortNum_WAYPOINT_APP,
+                       meshtastic_PortNum_STORE_FORWARD_APP, meshtastic_PortNum_TRACEROUTE_APP)) {
+            LOG_DEBUG("Ignore packet on non-standard portnum for CORE_PORTNUMS_ONLY");
             cancelSending(p->from, p->id);
             skipHandle = true;
         }

src/modules/Telemetry/DeviceTelemetry.cpp

@@ -10,8 +10,10 @@
 #include "configuration.h"
 #include "main.h"
 #include "memGet.h"
+#if !MESHTASTIC_EXCLUDE_SCREEN
 #include <OLEDDisplay.h>
 #include <OLEDDisplayUi.h>
+#endif
 #include <meshUtils.h>
 
 #define MAGIC_USB_BATTERY_LEVEL 101

src/modules/Telemetry/DeviceTelemetry.h

@@ -2,8 +2,10 @@
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "NodeDB.h"
 #include "ProtobufModule.h"
+#if !MESHTASTIC_EXCLUDE_SCREEN
 #include <OLEDDisplay.h>
 #include <OLEDDisplayUi.h>
+#endif
 
 class DeviceTelemetryModule : private concurrency::OSThread, public ProtobufModule<meshtastic_Telemetry>
 {

src/modules/TextMessageModule.cpp

@@ -4,7 +4,11 @@
 #include "PowerFSM.h"
 #include "buzz.h"
 #include "configuration.h"
+#if !MESHTASTIC_EXCLUDE_SCREEN
 #include "graphics/Screen.h"
+#else
+#include "FakeScreen.h"
+#endif
 TextMessageModule *textMessageModule;
 
 ProcessMessage TextMessageModule::handleReceived(const meshtastic_MeshPacket &mp)

src/modules/WaypointModule.cpp

@@ -2,12 +2,12 @@
 #include "NodeDB.h"
 #include "PowerFSM.h"
 #include "configuration.h"
-#include "graphics/draw/CompassRenderer.h"
 
 #if HAS_SCREEN
 #include "gps/RTC.h"
 #include "graphics/Screen.h"
 #include "graphics/TimeFormatters.h"
+#include "graphics/draw/CompassRenderer.h"
 #include "graphics/draw/NodeListRenderer.h"
 #include "main.h"
 #endif

src/motion/MotionSensor.cpp

@@ -1,7 +1,7 @@
 #include "MotionSensor.h"
-#include "graphics/draw/CompassRenderer.h"
 
 #if !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+#include "graphics/draw/CompassRenderer.h"
 
 char timeRemainingBuffer[12];
 

variants/nrf52840/gat562_mesh_trial_tracker/variant.h

@@ -19,8 +19,6 @@
 #ifndef _VARIANT_GAT562_MESH_TRIAL_TRACKER_
 #define _VARIANT_GAT562_MESH_TRIAL_TRACKER_
 
-#define GAT562_MESH_TRIAL_TRACKER
-
 // led pin 2 (blue), see https://github.com/meshtastic/firmware/blob/master/src/mesh/NodeDB.cpp#L723
 #define RAK4630