lay groundwork for a possible future architecture (#1571)

* lay groundwork for a possible future architecture * switch from feature opt-out to feature opt-in * lay groundwork for a possible future architecture * switch from feature opt-out to feature opt-in * fix USE_RTC in variant.h for rak4631_epaper and t-echo * ensure Screen.h is not included without configuration.h Co-authored-by: Peter Lawrence <12226419+majbthrd@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
2026-01-23 18:27:27 +00:00 · 2022-07-31 07:11:47 -05:00
parent fd27a814b7
commit ade32b1827
53 changed files with 405 additions and 330 deletions
--- a/src/mesh/MeshModule.h
+++ b/src/mesh/MeshModule.h
@@ -4,7 +4,7 @@
 #include "mesh/MeshTypes.h"
 #include <vector>

-#ifndef NO_SCREEN
+#if HAS_SCREEN
 #include <OLEDDisplay.h>
 #include <OLEDDisplayUi.h>
 #endif
@@ -72,7 +72,7 @@ class MeshModule
    static void observeUIEvents(Observer<const UIFrameEvent *> *observer);
    static AdminMessageHandleResult handleAdminMessageForAllPlugins(
        const MeshPacket &mp, AdminMessage *request, AdminMessage *response);
-#ifndef NO_SCREEN
+#if HAS_SCREEN
    virtual void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) { return; }
 #endif
  protected:
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -17,14 +17,14 @@
 #include <pb_decode.h>
 #include <pb_encode.h>

-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 #include "mesh/http/WiFiAPClient.h"
 #include "modules/esp32/StoreForwardModule.h"
 #include <Preferences.h>
 #include <nvs_flash.h>
 #endif

-#ifdef NRF52_SERIES
+#ifdef ARCH_NRF52
 #include <bluefruit.h>
 #include <utility/bonding.h>
 #endif
@@ -132,11 +132,11 @@ bool NodeDB::factoryReset()
    installDefaultDeviceState();
    // third, write to disk
    saveToDisk();
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
    // This will erase what's in NVS including ssl keys, persistant variables and ble pairing
    nvs_flash_erase();
 #endif
-#ifdef NRF52_SERIES
+#ifdef ARCH_NRF52
    Bluefruit.begin();
    DEBUG_MSG("Clearing bluetooth bonds!\n");
    bond_print_list(BLE_GAP_ROLE_PERIPH);
@@ -248,7 +248,7 @@ void NodeDB::init()

    strncpy(myNodeInfo.firmware_version, optstr(APP_VERSION), sizeof(myNodeInfo.firmware_version));

-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
    Preferences preferences;
    preferences.begin("meshtastic", false);
    myNodeInfo.reboot_count = preferences.getUInt("rebootCounter", 0);
@@ -339,11 +339,11 @@ void NodeDB::loadFromDisk()
        if (devicestate.version < DEVICESTATE_MIN_VER) {
            DEBUG_MSG("Warn: devicestate %d is old, discarding\n", devicestate.version);
            installDefaultDeviceState();
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
            // This will erase what's in NVS including ssl keys, persistant variables and ble pairing
            nvs_flash_erase();
 #endif
-#ifdef NRF52_SERIES
+#ifdef ARCH_NRF52
            Bluefruit.begin();
            DEBUG_MSG("Clearing bluetooth bonds!\n");
            bond_print_list(BLE_GAP_ROLE_PERIPH);
@@ -669,7 +669,7 @@ void recordCriticalError(CriticalErrorCode code, uint32_t address, const char *f
    myNodeInfo.error_count++;

    // Currently portuino is mostly used for simulation.  Make sue the user notices something really bad happend
-#ifdef PORTDUINO
+#ifdef ARCH_PORTDUINO
    DEBUG_MSG("A critical failure occurred, portduino is exiting...");
    exit(2);
 #endif
--- a/src/mesh/RadioLibInterface.cpp
+++ b/src/mesh/RadioLibInterface.cpp
@@ -11,7 +11,7 @@
 // FIXME, we default to 4MHz SPI, SPI mode 0, check if the datasheet says it can really do that
 static SPISettings spiSettings(4000000, MSBFIRST, SPI_MODE0);

-#ifdef PORTDUINO
+#ifdef ARCH_PORTDUINO

 void LockingModule::SPItransfer(uint8_t cmd, uint8_t reg, uint8_t *dataOut, uint8_t *dataIn, uint8_t numBytes)
 {
@@ -45,7 +45,7 @@ RadioLibInterface::RadioLibInterface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq
    instance = this;
 }

-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 // ESP32 doesn't use that flag
 #define YIELD_FROM_ISR(x) portYIELD_FROM_ISR()
 #else
@@ -96,7 +96,7 @@ bool RadioLibInterface::canSendImmediately()
        if (busyTx && (millis() - lastTxStart > 60000)) {
            DEBUG_MSG("Hardware Failure! busyTx for more than 60s\n");
            RECORD_CRITICALERROR(CriticalErrorCode_TransmitFailed);
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
            if (busyTx && (millis() - lastTxStart > 65000)) // After 5s more, reboot
                ESP.restart();
 #endif
--- a/src/mesh/RadioLibInterface.h
+++ b/src/mesh/RadioLibInterface.h
@@ -41,7 +41,7 @@ class LockingModule : public Module
    {
    }
    
-#ifdef PORTDUINO
+#ifdef ARCH_PORTDUINO
    void SPItransfer(uint8_t cmd, uint8_t reg, uint8_t *dataOut, uint8_t *dataIn, uint8_t numBytes) override;
 #else
    void SPIbeginTransaction() override;
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -11,7 +11,7 @@ extern "C" {
 #include "mesh/compression/unishox2.h"
 }

-#if defined(HAS_WIFI) || defined(PORTDUINO)
+#if HAS_WIFI
 #include "mqtt/MQTT.h"
 #endif

@@ -213,7 +213,7 @@ ErrorCode Router::send(MeshPacket *p)
    if (p->which_payloadVariant == MeshPacket_decoded_tag) {
        ChannelIndex chIndex = p->channel; // keep as a local because we are about to change it

-#if defined(HAS_WIFI) || defined(PORTDUINO)
+#if HAS_WIFI
        // check if we should send decrypted packets to mqtt

        // truth table:
@@ -244,7 +244,7 @@ ErrorCode Router::send(MeshPacket *p)
            return encodeResult; // FIXME - this isn't a valid ErrorCode
        }

-#if defined(HAS_WIFI) || defined(PORTDUINO)
+#if HAS_WIFI
        // the packet is now encrypted.
        // check if we should send encrypted packets to mqtt
        if (mqtt && shouldActuallyEncrypt)
--- a/src/mesh/http/ContentHandler.cpp
+++ b/src/mesh/http/ContentHandler.cpp
@@ -14,7 +14,7 @@
 #include <HTTPURLEncodedBodyParser.hpp>
 #include <json11.hpp>

-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 #include "esp_task_wdt.h"
 #endif

@@ -787,7 +787,7 @@ void handleBlinkLED(HTTPRequest *req, HTTPResponse *res)
            count = count - 1;
        }
    } else {
-#ifndef NO_SCREEN
+#if HAS_SCREEN
        screen->blink();
 #endif
    }
--- a/src/mesh/http/WebServer.cpp
+++ b/src/mesh/http/WebServer.cpp
@@ -11,7 +11,7 @@
 #include <WebServer.h>
 #include <WiFi.h>

-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 #include "esp_task_wdt.h"
 #endif

@@ -152,7 +152,7 @@ void createSSLCert()

                    yield();
                    esp_task_wdt_reset();
-#ifndef NO_SCREEN
+#if HAS_SCREEN
                    if (millis() / 1000 >= 3) {
                        screen->setSSLFrames();
                    }
--- a/src/mesh/http/WiFiAPClient.h
+++ b/src/mesh/http/WiFiAPClient.h
@@ -4,7 +4,7 @@
 #include <Arduino.h>
 #include <functional>

-#ifdef HAS_WIFI
+#ifdef ARCH_ESP32
 #include <DNSServer.h>
 #include <WiFi.h>
 #endif
--- a/src/mesh/mesh-pb-constants.cpp
+++ b/src/mesh/mesh-pb-constants.cpp
@@ -32,6 +32,7 @@ bool pb_decode_from_bytes(const uint8_t *srcbuf, size_t srcbufsize, const pb_msg
    }
 }

+#ifdef FSCom
 /// Read from an Arduino File
 bool readcb(pb_istream_t *stream, uint8_t *buf, size_t count)
 {
@@ -59,6 +60,7 @@ bool writecb(pb_ostream_t *stream, const uint8_t *buf, size_t count)
    // DEBUG_MSG("writing %d bytes to protobuf file\n", count);
    return file->write(buf, count) == count;
 }
+#endif

 bool is_in_helper(uint32_t n, const uint32_t *array, pb_size_t count)
 {