Replace UrlEncode library with local implementation.

include/UrlEncode.h

@@ -0,0 +1,34 @@
+//+--------------------------------------------------------------------------
+//
+// File:        UrlEncode.h
+//
+// NightDriverStrip - (c) 2026 Plummer's Software LLC.  All Rights Reserved.
+//
+// This file is part of the NightDriver software project.
+//
+//    NightDriver is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    NightDriver is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with Nightdriver.  It is normally found in copying.txt
+//    If not, see <https://www.gnu.org/licenses/>.
+//
+// Description:
+//
+//   Helper to URL-encode strings for API calls.
+//   Implemenation provides RFC 1738 style percent-encoding.
+//
+//---------------------------------------------------------------------------
+
+#pragma once
+
+#include <Arduino.h>
+
+String urlEncode(const String& str);

include/effects/matrix/PatternStocks.h

@@ -39,7 +39,6 @@
 #include <gfxfont.h>                // Adafruit GFX font structs
 #include <string.h>
 #include <HTTPClient.h>
-#include <UrlEncode.h>
 #include <ledstripeffect.h>
 #include <ArduinoJson.h>
 #include "systemcontainer.h"

include/effects/matrix/PatternSubscribers.h

@@ -33,7 +33,9 @@
 #ifndef PatternSub_H
 #define PatternSub_H
 
-#include <UrlEncode.h>
+#if ENABLE_WIFI
+
+#include <HTTPClient.h>
 #include "systemcontainer.h"
 
 extern const GFXfont Apple5x7 PROGMEM;
@@ -286,4 +288,6 @@ class PatternSubscribers : public EffectWithId<PatternSubscribers>
     }
 };
 
+#endif // ENABLE_WIFI
+
 #endif

include/effects/matrix/PatternWeather.h

@@ -604,4 +604,4 @@ class PatternWeather : public EffectWithId<PatternWeather>
     }
 };
 
-#endif
+#endif

include/effects/strip/misceffects.h

@@ -387,8 +387,10 @@ class StatusEffect : public EffectWithId<StatusEffect>
           color = CRGB::Purple;
         else if (!WiFi.isConnected())
           color = CRGB::Red;
+        #if ENABLE_NTP
         else if (!NTPTimeClient::HasClockBeenSet())
           color = CRGB::Green;
+        #endif
 
         if (_everyNth != 1)
           fillSolidOnAllChannels(CRGB::Black);

include/globals.h

@@ -117,11 +117,11 @@
     #endif
 #endif
 
-#define XSTR(x) STR(x)              // The defs will generate the stringized version of it
+#define XSTR(x) ND_STR(x)           // The defs will generate the stringized version of it
 #if FLASH_VERSION > 99
-    #define STR(x) "v"#x
+    #define ND_STR(x) "v"#x
 #else
-    #define STR(x) "v0"#x
+    #define ND_STR(x) "v0"#x
 #endif
 #define FLASH_VERSION_NAME_X(x) "v"#x
 #define FLASH_VERSION_NAME XSTR(FLASH_VERSION)
@@ -261,20 +261,56 @@ extern RemoteDebug Debug;           // Let everyone in the project know about it
 #ifndef ENABLE_WIFI
     #define ENABLE_WIFI             1   // Connect to WiFi
 #endif
+
+// Check for nonsensical network configurations
+#if !ENABLE_WIFI
+    #if defined(ENABLE_WEBSERVER) && ENABLE_WEBSERVER
+        #error "ENABLE_WEBSERVER requires ENABLE_WIFI"
+    #endif
+    #if defined(ENABLE_NTP) && ENABLE_NTP
+        #error "ENABLE_NTP requires ENABLE_WIFI"
+    #endif
+    #if defined(ENABLE_OTA) && ENABLE_OTA
+        #error "ENABLE_OTA requires ENABLE_WIFI"
+    #endif
+    #if defined(INCOMING_WIFI_ENABLED) && INCOMING_WIFI_ENABLED
+        #error "INCOMING_WIFI_ENABLED requires ENABLE_WIFI"
+    #endif
+    #if defined(COLORDATA_SERVER_ENABLED) && COLORDATA_SERVER_ENABLED
+        #error "COLORDATA_SERVER_ENABLED requires ENABLE_WIFI"
+    #endif
+#endif
+
 #ifndef INCOMING_WIFI_ENABLED
-    #define INCOMING_WIFI_ENABLED   1   // Accepting incoming color data and commands
+    #if ENABLE_WIFI
+        #define INCOMING_WIFI_ENABLED   1   // Accepting incoming color data and commands
+    #else
+        #define INCOMING_WIFI_ENABLED   0
+    #endif
 #endif
 #ifndef TIME_BEFORE_LOCAL
     #define TIME_BEFORE_LOCAL       1   // How many seconds before the lamp times out and shows local content
 #endif
 #ifndef ENABLE_NTP
-    #define ENABLE_NTP              1   // Set the clock from the web
+    #if ENABLE_WIFI
+        #define ENABLE_NTP              1   // Set the clock from the web
+    #else
+        #define ENABLE_NTP              0
+    #endif
 #endif
 #ifndef ENABLE_OTA
-    #define ENABLE_OTA              1
+    #if ENABLE_WIFI
+        #define ENABLE_OTA              1
+    #else
+        #define ENABLE_OTA              0
+    #endif
 #endif
 #ifndef ENABLE_WEBSERVER
-    #define ENABLE_WEBSERVER        1   // Turn on the internal webserver
+    #if ENABLE_WIFI
+        #define ENABLE_WEBSERVER        1   // Turn on the internal webserver
+    #else
+        #define ENABLE_WEBSERVER        0
+    #endif
 #endif
 
 #ifndef LED_PIN0

include/network.h

@@ -67,12 +67,9 @@
       CompileTimeCreds = 1
     };
 
-    void processRemoteDebugCmd();
-
     WiFiConnectResult ConnectToWiFi(const String& ssid, const String& password);
     WiFiConnectResult ConnectToWiFi(const String* ssid, const String* password);
     void UpdateNTPTime();
-    void SetupOTA(const String & strHostname);
     bool ReadWiFiConfig(WifiCredSource source, String& WiFi_ssid, String& WiFi_password);
     bool WriteWiFiConfig(WifiCredSource source, const String& WiFi_ssid, const String& WiFi_password);
     bool ClearWiFiConfig(WifiCredSource source);

include/ntptimeclient.h

@@ -30,6 +30,7 @@
 
 #pragma once
 
+#if ENABLE_NTP
 #include <sys/cdefs.h>
 #include <sys/time.h>
 #include <ctime>
@@ -59,10 +60,7 @@ class NTPTimeClient
     }
 
     static bool UpdateClockFromWeb(WiFiUDP * pUDP);
-
-    static void ShowUptime();
 };
 
-
-
+#endif // ENABLE_NTP
 

include/webserver.h

@@ -39,6 +39,8 @@
 
 #pragma once
 
+#if ENABLE_WEBSERVER
+
 #include "deviceconfig.h"
 #include "network.h"
 
@@ -238,3 +240,4 @@ inline CWebServer::StatisticsType operator&(CWebServer::StatisticsType lhs, CWeb
 // Set value in lambda using a forwarding function. Reports success based on function's return value,
 //   which must be implicitly convertable to bool
 #define CONFIRM_VALUE(functionCall) [&](auto value)->bool { return functionCall; }
+#endif  // ENABLE_WEBSERVER

platformio.ini

@@ -58,7 +58,6 @@ lib_deps        = crankyoldgit/IRremoteESP8266  @ ^2.8.6
                   esp32async/ESPAsyncWebServer  @ ^3.7.10
                   bblanchon/ArduinoJson         @ ^7.4.2
                   https://github.com/PlummersSoftwareLLC/RemoteDebug
-                  plageoj/UrlEncode    @ ^1.0.1
 
 ; This partition table is the default and fits everything in 4M of flash without OTA.
 board_build.partitions = config/partitions_custom_noota.csv

src/debug_cli.cpp

@@ -496,6 +496,42 @@ static void DoCat(const cli_argv &argv)
     file.close();
 }
 
+void DoUptime(const cli_argv &)
+{
+    struct timeval timeval = { 0 };
+    // Microseconds since boot. File wrap bugreport in 292 million years.
+    auto uptime = esp_timer_get_time();
+
+    timeval.tv_sec = uptime / MICROS_PER_SECOND;
+
+    char buf[128];
+    struct tm *tm = gmtime(&timeval.tv_sec);
+    // No, I don't care about leap seconds.
+    strftime(buf, sizeof(buf), "%X", tm);
+    int ndays = timeval.tv_sec / (24 * 60 * 60);
+    cli_printf("Uptime: %d days - %s\n", ndays, buf);
+
+    const char* reason_text = "Unknown";
+    esp_reset_reason_t reason = esp_reset_reason();
+    switch (reason)
+    {
+        case ESP_RST_POWERON: reason_text = "Power On"; break;
+        case ESP_RST_EXT: reason_text = "External Pin"; break;
+        case ESP_RST_SW: reason_text = "Software Restart"; break;
+        case ESP_RST_PANIC: reason_text = "Panic"; break;
+        case ESP_RST_INT_WDT: reason_text = "Watchdog barked"; break;
+        case ESP_RST_TASK_WDT: reason_text = "Task Watchdog barked"; break;
+        case ESP_RST_WDT: reason_text = "Other Watchdog barked"; break;
+        case ESP_RST_DEEPSLEEP: reason_text = "Reset in deep sleep"; break;
+        case ESP_RST_BROWNOUT: reason_text = "Brownout"; break;
+        case ESP_RST_SDIO: reason_text = "Reset over SDIO"; break;
+        // Documented,  but not defined in ESP-IDF esp_system.h (v5.1.0) yet.
+        // case ESP_RST_USB: reason_text = "Reset by USB peripheral"; break;
+        default: reason_text = "Unknown"; break;
+    }
+    cli_printf("Last boot reason: (%d): %s\n", reason, reason_text);
+}
+
 static const command core_commands[] = {
     {"cat", "Display file content", "Printing file...", DoCat},
     {"reboot", "Reboot system", "Rebooting. Please stand by...", [](const cli_argv &) { esp_restart(); }},
@@ -567,6 +603,7 @@ static const command core_commands[] = {
         g_ptrSystem->DeviceConfig().SetBrightness(val);
         cli_printf("Brightness: %d\n", val);
     }},
+    {"uptime", "Show system uptime", "Showing uptime...", DoUptime},
     {"help", "Display command line options", "Displaying system help",
      PrintHelp} // Function pointer logic requires PrintHelp signature match. It does.
 };

src/deviceconfig.cpp

@@ -105,6 +105,7 @@ bool DeviceConfig::SetTimeZone(const String& newTimeZone, bool skipWrite)
     return true;
 }
 
+#if ENABLE_WIFI
 DeviceConfig::ValidateResponse DeviceConfig::ValidateOpenWeatherAPIKey(const String &newOpenWeatherAPIKey)
 {
     HTTPClient http;
@@ -142,6 +143,7 @@ DeviceConfig::ValidateResponse DeviceConfig::ValidateOpenWeatherAPIKey(const Str
         }
     }
 }
+#endif  // ENABLE_WIFI
 
 void DeviceConfig::SetColorSettings(const CRGB& newGlobalColor, const CRGB& newSecondColor)
 {

src/drawing.cpp

@@ -68,6 +68,7 @@ uint16_t WiFiDraw()
         if (false == bufferManager.IsEmpty())
         {
             std::shared_ptr<LEDBuffer> pBuffer;
+            #if ENABLE_NTP
             if (NTPTimeClient::HasClockBeenSet() == false)
             {
                 pBuffer = bufferManager.GetOldestBuffer();
@@ -81,6 +82,9 @@ uint16_t WiFiDraw()
                 while (!bufferManager.IsEmpty() && bufferManager.PeekOldestBuffer()->IsBufferOlderThan(tv))
                     pBuffer = bufferManager.GetOldestBuffer();
             }
+            #else
+            pBuffer = bufferManager.GetOldestBuffer();
+            #endif
 
             if (pBuffer)
             {

src/main.cpp

@@ -550,8 +550,10 @@ void setup()
     taskManager.StartColorDataThread();
     taskManager.StartSocketThread();
 
+
+    #if ENABLE_WIFI
     DebugCLI::InitDebugCLI();
-    InitNetworkCLI();
+    #endif
 
     SaveEffectManagerConfig();
     // Start the main loop