Add multiple configuration options for a minimized build (GPS,WiFi,BT,MQTT,Screen). (#3469)

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>

src/mesh/Channels.cpp

@@ -7,7 +7,9 @@
 
 #include <assert.h>
 
+#if !MESHTASTIC_EXCLUDE_MQTT
 #include "mqtt/MQTT.h"
+#endif
 
 /// 16 bytes of random PSK for our _public_ default channel that all devices power up on (AES128)
 static const uint8_t defaultpsk[] = {0xd4, 0xf1, 0xbb, 0x3a, 0x20, 0x29, 0x07, 0x59,
@@ -18,7 +20,9 @@ Channels channels;
 const char *Channels::adminChannel = "admin";
 const char *Channels::gpioChannel = "gpio";
 const char *Channels::serialChannel = "serial";
+#if !MESHTASTIC_EXCLUDE_MQTT
 const char *Channels::mqttChannel = "mqtt";
+#endif
 
 uint8_t xorHash(const uint8_t *p, size_t len)
 {
@@ -195,10 +199,12 @@ void Channels::onConfigChanged()
         if (ch.role == meshtastic_Channel_Role_PRIMARY)
             primaryIndex = i;
     }
+#if !MESHTASTIC_EXCLUDE_MQTT
     if (channels.anyMqttEnabled() && mqtt && !mqtt->isEnabled()) {
         LOG_DEBUG("MQTT is enabled on at least one channel, so set MQTT thread to run immediately\n");
         mqtt->start();
     }
+#endif
 }
 
 meshtastic_Channel &Channels::getByIndex(ChannelIndex chIndex)

src/mesh/MeshService.cpp

@@ -1,10 +1,11 @@
 #include "configuration.h"
-#include <assert.h>
-#include <string>
+
+#if !MESHTASTIC_EXCLUDE_GPS
+#include "GPS.h"
+#endif
 
 #include "../concurrency/Periodic.h"
 #include "BluetoothCommon.h" // needed for updateBatteryLevel, FIXME, eventually when we pull mesh out into a lib we shouldn't be whacking bluetooth from here
-#include "GPS.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
@@ -15,8 +16,10 @@
 #include "modules/NodeInfoModule.h"
 #include "modules/PositionModule.h"
 #include "power.h"
+#include <assert.h>
+#include <string>
 
-#ifdef ARCH_ESP32
+#if defined(ARCH_ESP32) && !MESHTASTIC_EXCLUDE_BLUETOOTH
 #include "nimble/NimbleBluetooth.h"
 #endif
 
@@ -71,10 +74,11 @@ MeshService::MeshService()
 void MeshService::init()
 {
     // moved much earlier in boot (called from setup())
-    // nodeDB->init();
-
+    // nodeDB.init();
+#if HAS_GPS
     if (gps)
         gpsObserver.observe(&gps->newStatus);
+#endif
 }
 
 int MeshService::handleFromRadio(const meshtastic_MeshPacket *mp)
@@ -270,11 +274,13 @@ void MeshService::sendNetworkPing(NodeNum dest, bool wantReplies)
     assert(node);
 
     if (hasValidPosition(node)) {
+#if HAS_GPS
         if (positionModule) {
             LOG_INFO("Sending position ping to 0x%x, wantReplies=%d, channel=%d\n", dest, wantReplies, node->channel);
             positionModule->sendOurPosition(dest, wantReplies, node->channel);
         }
     } else {
+#endif
         if (nodeInfoModule) {
             LOG_INFO("Sending nodeinfo ping to 0x%x, wantReplies=%d, channel=%d\n", dest, wantReplies, node->channel);
             nodeInfoModule->sendOurNodeInfo(dest, wantReplies, node->channel);
@@ -344,6 +350,7 @@ meshtastic_NodeInfoLite *MeshService::refreshLocalMeshNode()
     return node;
 }
 
+#if HAS_GPS
 int MeshService::onGPSChanged(const meshtastic::GPSStatus *newStatus)
 {
     // Update our local node info with our position (even if we don't decide to update anyone else)
@@ -377,7 +384,7 @@ int MeshService::onGPSChanged(const meshtastic::GPSStatus *newStatus)
 
     return 0;
 }
-
+#endif
 bool MeshService::isToPhoneQueueEmpty()
 {
     return toPhoneQueue.isEmpty();

src/mesh/MeshService.h

@@ -23,9 +23,10 @@ extern Allocator<meshtastic_MqttClientProxyMessage> &mqttClientProxyMessagePool;
  */
 class MeshService
 {
+#if HAS_GPS
     CallbackObserver<MeshService, const meshtastic::GPSStatus *> gpsObserver =
         CallbackObserver<MeshService, const meshtastic::GPSStatus *>(this, &MeshService::onGPSChanged);
-
+#endif
     /// received packets waiting for the phone to process them
     /// FIXME, change to a DropOldestQueue and keep a count of the number of dropped packets to ensure
     /// we never hang because android hasn't been there in a while
@@ -132,10 +133,11 @@ class MeshService
     ErrorCode sendQueueStatusToPhone(const meshtastic_QueueStatus &qs, ErrorCode res, uint32_t mesh_packet_id);
 
   private:
+#if HAS_GPS
     /// Called when our gps position has changed - updates nodedb and sends Location message out into the mesh
     /// returns 0 to allow further processing
     int onGPSChanged(const meshtastic::GPSStatus *arg);
-
+#endif
     /// Handle a packet that just arrived from the radio.  This method does _ReliableRouternot_ free the provided packet.  If it
     /// needs to keep the packet around it makes a copy
     int handleFromRadio(const meshtastic_MeshPacket *p);

src/mesh/NodeDB.cpp

@@ -1,11 +1,12 @@
 #include "configuration.h"
-
+#if !MESHTASTIC_EXCLUDE_GPS
+#include "GPS.h"
+#endif
 #include "../detect/ScanI2C.h"
 #include "Channels.h"
 #include "CryptoEngine.h"
 #include "Default.h"
 #include "FSCommon.h"
-#include "GPS.h"
 #include "MeshRadio.h"
 #include "NodeDB.h"
 #include "PacketHistory.h"
@@ -25,7 +26,9 @@
 #include <vector>
 
 #ifdef ARCH_ESP32
+#if !MESHTASTIC_EXCLUDE_WIFI
 #include "mesh/wifi/WiFiAPClient.h"
+#endif
 #include "modules/esp32/StoreForwardModule.h"
 #include <Preferences.h>
 #include <nvs_flash.h>
@@ -230,7 +233,7 @@ void NodeDB::installDefaultConfig()
     config.has_position = true;
     config.has_power = true;
     config.has_network = true;
-    config.has_bluetooth = true;
+    config.has_bluetooth = (HAS_BLUETOOTH ? true : false);
     config.device.rebroadcast_mode = meshtastic_Config_DeviceConfig_RebroadcastMode_ALL;
 
     config.lora.sx126x_rx_boosted_gain = true;

src/mesh/PhoneAPI.cpp

@@ -1,13 +1,16 @@
-#include "PhoneAPI.h"
+#include "configuration.h"
+#if !MESHTASTIC_EXCLUDE_GPS
+#include "GPS.h"
+#endif
+
 #include "Channels.h"
 #include "Default.h"
-#include "GPS.h"
 #include "MeshService.h"
 #include "NodeDB.h"
+#include "PhoneAPI.h"
 #include "PowerFSM.h"
 #include "RadioInterface.h"
 #include "TypeConversions.h"
-#include "configuration.h"
 #include "main.h"
 #include "xmodem.h"
 
@@ -18,8 +21,9 @@
 #if ToRadio_size > MAX_TO_FROM_RADIO_SIZE
 #error ToRadio is too big
 #endif
-
+#if !MESHTASTIC_EXCLUDE_MQTT
 #include "mqtt/MQTT.h"
+#endif
 
 PhoneAPI::PhoneAPI()
 {
@@ -104,6 +108,7 @@ bool PhoneAPI::handleToRadio(const uint8_t *buf, size_t bufLength)
             LOG_INFO("Got xmodem packet\n");
             xModem.handlePacket(toRadioScratch.xmodemPacket);
             break;
+#if !MESHTASTIC_EXCLUDE_MQTT
         case meshtastic_ToRadio_mqttClientProxyMessage_tag:
             LOG_INFO("Got MqttClientProxy message\n");
             if (mqtt && moduleConfig.mqtt.proxy_to_client_enabled && moduleConfig.mqtt.enabled &&
@@ -114,6 +119,7 @@ bool PhoneAPI::handleToRadio(const uint8_t *buf, size_t bufLength)
                          "not enabled\n");
             }
             break;
+#endif
         case meshtastic_ToRadio_heartbeat_tag:
             LOG_DEBUG("Got client heartbeat\n");
             break;

src/mesh/Router.cpp

@@ -11,9 +11,9 @@
 extern "C" {
 #include "mesh/compression/unishox2.h"
 }
-
+#if !MESHTASTIC_EXCLUDE_MQTT
 #include "mqtt/MQTT.h"
-
+#endif
 /**
  * Router todo
  *
@@ -261,11 +261,12 @@ ErrorCode Router::send(meshtastic_MeshPacket *p)
             abortSendAndNak(encodeResult, p);
             return encodeResult; // FIXME - this isn't a valid ErrorCode
         }
-
+#if !MESHTASTIC_EXCLUDE_MQTT
         // Only publish to MQTT if we're the original transmitter of the packet
         if (moduleConfig.mqtt.enabled && p->from == nodeDB->getNodeNum() && mqtt) {
             mqtt->onSend(*p, *p_decoded, chIndex);
         }
+#endif
         packetPool.release(p_decoded);
     }
 
@@ -465,10 +466,12 @@ void Router::handleReceived(meshtastic_MeshPacket *p, RxSource src)
             cancelSending(p->from, p->id);
             skipHandle = true;
         }
-
+#if !MESHTASTIC_EXCLUDE_MQTT
         // Publish received message to MQTT if we're not the original transmitter of the packet
         if (!skipHandle && moduleConfig.mqtt.enabled && getFrom(p) != nodeDB->getNodeNum() && mqtt)
             mqtt->onSend(*p_encrypted, *p, p->channel);
+#endif
+
     } else {
         printPacket("packet decoding failed or skipped (no PSK?)", p);
     }

src/mesh/eth/ethClient.cpp

@@ -2,9 +2,12 @@
 #include "NodeDB.h"
 #include "RTC.h"
 #include "concurrency/Periodic.h"
+#include "configuration.h"
 #include "main.h"
 #include "mesh/api/ethServerAPI.h"
+#if !MESHTASTIC_EXCLUDE_MQTT
 #include "mqtt/MQTT.h"
+#endif
 #include "target_specific.h"
 #include <RAK13800_W5100S.h>
 #include <SPI.h>
@@ -66,11 +69,12 @@ static int32_t reconnectETH()
 
             ethStartupComplete = true;
         }
-
+#if !MESHTASTIC_EXCLUDE_MQTT
         // FIXME this is kinda yucky, instead we should just have an observable for 'wifireconnected'
         if (mqtt && !moduleConfig.mqtt.proxy_to_client_enabled && !mqtt->isConnectedDirectly()) {
             mqtt->reconnect();
         }
+#endif
     }
 
 #ifndef DISABLE_NTP

src/mesh/http/ContentHandler.cpp

@@ -6,7 +6,9 @@
 #include "main.h"
 #include "mesh/http/ContentHelper.h"
 #include "mesh/http/WebServer.h"
+#if !MESHTASTIC_EXCLUDE_WIFI
 #include "mesh/wifi/WiFiAPClient.h"
+#endif
 #include "mqtt/JSON.h"
 #include "power.h"
 #include "sleep.h"

src/mesh/http/WebServer.cpp

@@ -1,14 +1,14 @@
+#include "configuration.h"
 #if !MESHTASTIC_EXCLUDE_WEBSERVER
-#include "mesh/http/WebServer.h"
 #include "NodeDB.h"
 #include "graphics/Screen.h"
 #include "main.h"
+#include "mesh/http/WebServer.h"
 #include "mesh/wifi/WiFiAPClient.h"
 #include "sleep.h"
 #include <HTTPBodyParser.hpp>
 #include <HTTPMultipartBodyParser.hpp>
 #include <HTTPURLEncodedBodyParser.hpp>
-
 #include <WebServer.h>
 #include <WiFi.h>
 

src/mesh/wifi/WiFiAPClient.cpp

@@ -1,18 +1,24 @@
-#include "mesh/wifi/WiFiAPClient.h"
+#include "configuration.h"
+#if !MESHTASTIC_EXCLUDE_WIFI
 #include "NodeDB.h"
 #include "RTC.h"
 #include "concurrency/Periodic.h"
-#include "configuration.h"
+#include "mesh/wifi/WiFiAPClient.h"
+
 #include "main.h"
 #include "mesh/api/WiFiServerAPI.h"
+#if !MESHTASTIC_EXCLUDE_MQTT
 #include "mqtt/MQTT.h"
+#endif
 #include "target_specific.h"
 #include <WiFi.h>
 #include <WiFiUdp.h>
 #ifdef ARCH_ESP32
 #if !MESHTASTIC_EXCLUDE_WEBSERVER
+#if !MESHTASTIC_EXCLUDE_WEBSERVER
 #include "mesh/http/WebServer.h"
 #endif
+#endif
 #include <ESPmDNS.h>
 #include <esp_wifi.h>
 static void WiFiEvent(WiFiEvent_t event);
@@ -408,3 +414,4 @@ uint8_t getWifiDisconnectReason()
 {
     return wifiDisconnectReason;
 }
+#endif

src/mesh/wifi/WiFiAPClient.h

@@ -5,7 +5,7 @@
 #include <Arduino.h>
 #include <functional>
 
-#if defined(HAS_WIFI) && !defined(ARCH_PORTDUINO)
+#if HAS_WIFI && !defined(ARCH_PORTDUINO)
 #include <WiFi.h>
 #endif