Version fonctionnelle 1.0
This commit is contained in:
1 parent
56d8cd96c8
commit
4c6c528d22
9 files changed
+269
-124
No files matched your search
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"folders": [
|
||||
{
|
||||
"path": "."
|
||||
}
|
||||
],
|
||||
"settings": {}
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
# Copyright (c) 2014-present PlatformIO <contact@platformio.org>
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# pylint:disable=bad-option-value,import-outside-toplevel
|
||||
|
||||
import os
|
||||
import shutil
|
||||
import sys
|
||||
import tempfile
|
||||
from base64 import b64decode
|
||||
|
||||
DEPENDENCIES = b"""
|
||||
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 truncated
|
||||
"""
|
||||
|
||||
|
||||
def create_temp_dir():
|
||||
try:
|
||||
parent_dir = os.getenv(
|
||||
"PLATFORMIO_INSTALLER_TMPDIR", os.path.dirname(os.path.realpath(__file__))
|
||||
)
|
||||
tmp_dir = tempfile.mkdtemp(dir=parent_dir, prefix=".piocore-installer-")
|
||||
testscript_path = os.path.join(tmp_dir, "test.py")
|
||||
with open(testscript_path, "w") as fp:
|
||||
fp.write("print(1)")
|
||||
assert os.path.isfile(testscript_path)
|
||||
os.remove(testscript_path)
|
||||
return tmp_dir
|
||||
except (AssertionError, NameError):
|
||||
pass
|
||||
return tempfile.mkdtemp()
|
||||
|
||||
|
||||
def bootstrap():
|
||||
import pioinstaller.__main__
|
||||
|
||||
pioinstaller.__main__.main()
|
||||
|
||||
|
||||
def main():
|
||||
runtime_tmp_dir = create_temp_dir()
|
||||
os.environ["TMPDIR"] = runtime_tmp_dir
|
||||
tmp_dir = tempfile.mkdtemp(dir=runtime_tmp_dir)
|
||||
try:
|
||||
pioinstaller_zip = os.path.join(tmp_dir, "pioinstaller.zip")
|
||||
with open(pioinstaller_zip, "wb") as fp:
|
||||
fp.write(b64decode(DEPENDENCIES))
|
||||
|
||||
sys.path.insert(0, pioinstaller_zip)
|
||||
|
||||
bootstrap()
|
||||
finally:
|
||||
for d in (runtime_tmp_dir, tmp_dir):
|
||||
if d and os.path.isdir(d):
|
||||
shutil.rmtree(d, ignore_errors=True)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
+24
-24
@@ -14,24 +14,24 @@
|
||||
#define LED_INDICATOR_H
|
||||
|
||||
#include <Arduino.h>
|
||||
#include <FastLED.h>
|
||||
// #include <FastLED.h>
|
||||
|
||||
// Pin definition for WS2812 LEDs
|
||||
#define LED_DATA_PIN 4 ///< Data pin for WS2812 strip
|
||||
#define NUM_LEDS 2 ///< Number of LEDs (Power + Mode)
|
||||
#define NUM_LEDS 4 ///< Number of LEDs (Power + Mode)
|
||||
|
||||
// LED indices
|
||||
// // LED indices
|
||||
#define LED_POWER 0 ///< Power status indicator
|
||||
#define LED_MODE 1 ///< Mode indicator (DCC/Analog)
|
||||
|
||||
/**
|
||||
* @class LEDIndicator
|
||||
* @brief Manages WS2812 RGB LED status displays
|
||||
*
|
||||
* Controls two LEDs for system status indication:
|
||||
* - Power LED: Shows system power state with boot animation
|
||||
* - Mode LED: Shows control mode with pulsing effect
|
||||
*/
|
||||
// /**
|
||||
// * @class LEDIndicator
|
||||
// * @brief Manages WS2812 RGB LED status displays
|
||||
// *
|
||||
// * Controls two LEDs for system status indication:
|
||||
// * - Power LED: Shows system power state with boot animation
|
||||
// * - Mode LED: Shows control mode with pulsing effect
|
||||
// */
|
||||
class LEDIndicator {
|
||||
public:
|
||||
/**
|
||||
@@ -86,20 +86,20 @@ public:
|
||||
*/
|
||||
void modeChangeEffect();
|
||||
|
||||
private:
|
||||
CRGB leds[NUM_LEDS]; ///< LED array
|
||||
bool powerOn; ///< Power status flag
|
||||
bool dccMode; ///< Mode flag (DCC/Analog)
|
||||
uint8_t brightness; ///< Current brightness level
|
||||
unsigned long lastUpdate; ///< Last update timestamp
|
||||
uint8_t pulsePhase; ///< Pulse animation phase
|
||||
// private:
|
||||
// CRGB leds[NUM_LEDS]; ///< LED array
|
||||
// bool powerOn; ///< Power status flag
|
||||
// bool dccMode; ///< Mode flag (DCC/Analog)
|
||||
// uint8_t brightness; ///< Current brightness level
|
||||
// unsigned long lastUpdate; ///< Last update timestamp
|
||||
// uint8_t pulsePhase; ///< Pulse animation phase
|
||||
|
||||
// LED color definitions
|
||||
static constexpr CRGB COLOR_POWER_ON = CRGB::Green; ///< Power ON color
|
||||
static constexpr CRGB COLOR_POWER_OFF = CRGB::Red; ///< Power OFF color
|
||||
static constexpr CRGB COLOR_DCC = CRGB::Blue; ///< DCC mode color
|
||||
static constexpr CRGB COLOR_ANALOG = CRGB::Yellow; ///< Analog mode color
|
||||
static constexpr CRGB COLOR_OFF = CRGB::Black; ///< LED off state
|
||||
// // LED color definitions
|
||||
// static constexpr CRGB COLOR_POWER_ON = CRGB::Green; ///< Power ON color
|
||||
// static constexpr CRGB COLOR_POWER_OFF = CRGB::Red; ///< Power OFF color
|
||||
// static constexpr CRGB COLOR_DCC = CRGB::Blue; ///< DCC mode color
|
||||
// static constexpr CRGB COLOR_ANALOG = CRGB::Yellow; ///< Analog mode color
|
||||
// static constexpr CRGB COLOR_OFF = CRGB::Black; ///< LED off state
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -19,6 +19,7 @@
|
||||
#include <ESPAsyncWebServer.h>
|
||||
#include <AsyncTCP.h>
|
||||
#include <ArduinoJson.h>
|
||||
#include <DNSServer.h>
|
||||
#include "Config.h"
|
||||
#include "MotorController.h"
|
||||
#include "DCCGenerator.h"
|
||||
@@ -70,6 +71,7 @@ private:
|
||||
DCCGenerator* dccGenerator; ///< DCC generator instance
|
||||
LEDIndicator* ledIndicator; ///< LED indicator instance
|
||||
AsyncWebServer server; ///< Async web server (port 80)
|
||||
DNSServer dnsServer; ///< DNS server for captive portal
|
||||
|
||||
/**
|
||||
* @brief Set up all HTTP routes and handlers
|
||||
|
||||
+5
-3
@@ -8,9 +8,11 @@
|
||||
; Please visit documentation for the other options and examples
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[env:wemos_d1_mini32]
|
||||
;[env:wemos_d1_mini32]
|
||||
[env:esp32doit-devkit-v1]
|
||||
platform = espressif32
|
||||
board = wemos_d1_mini32
|
||||
; board = wemos_d1_mini32
|
||||
board = esp32doit-devkit-v1
|
||||
framework = arduino
|
||||
monitor_speed = 115200
|
||||
upload_speed = 921600
|
||||
@@ -23,5 +25,5 @@ lib_deps =
|
||||
esp32async/ESPAsyncWebServer @ ^3.9.2
|
||||
esp32async/AsyncTCP @ ^3.4.9
|
||||
https://github.com/Locoduino/DCCpp
|
||||
fastled/FastLED@^3.6.0
|
||||
; fastled/FastLED@^3.6.0
|
||||
board_build.filesystem = littlefs
|
||||
+1
-1
@@ -18,7 +18,7 @@ Config::Config() {
|
||||
wifi.password = "";
|
||||
wifi.isAPMode = true;
|
||||
wifi.apSSID = "LocoTestBench";
|
||||
wifi.apPassword = "12345678";
|
||||
wifi.apPassword = "123456789";
|
||||
|
||||
system.isDCCMode = false;
|
||||
system.dccAddress = 3;
|
||||
|
||||
+72
-71
@@ -8,107 +8,108 @@
|
||||
/**
|
||||
* @brief Constructor - initialize with default state
|
||||
*/
|
||||
LEDIndicator::LEDIndicator() :
|
||||
powerOn(false),
|
||||
dccMode(false),
|
||||
brightness(128),
|
||||
lastUpdate(0),
|
||||
pulsePhase(0) {
|
||||
}
|
||||
// LEDIndicator::LEDIndicator() :
|
||||
// powerOn(false),
|
||||
// dccMode(false),
|
||||
// brightness(128),
|
||||
// lastUpdate(0),
|
||||
// pulsePhase(0)
|
||||
// {}
|
||||
LEDIndicator::LEDIndicator(){}
|
||||
|
||||
void LEDIndicator::begin() {
|
||||
FastLED.addLeds<WS2812, LED_DATA_PIN, GRB>(leds, NUM_LEDS);
|
||||
FastLED.setBrightness(brightness);
|
||||
// FastLED.addLeds<WS2812, LED_DATA_PIN, GRB>(leds, NUM_LEDS);
|
||||
// FastLED.setBrightness(brightness);
|
||||
|
||||
// Initialize both LEDs to off
|
||||
leds[LED_POWER] = COLOR_OFF;
|
||||
leds[LED_MODE] = COLOR_OFF;
|
||||
FastLED.show();
|
||||
// leds[LED_POWER] = COLOR_OFF;
|
||||
// leds[LED_MODE] = COLOR_OFF;
|
||||
// FastLED.show();
|
||||
|
||||
Serial.println("LED Indicator initialized");
|
||||
Serial.printf("LED Data Pin: %d, Num LEDs: %d\n", LED_DATA_PIN, NUM_LEDS);
|
||||
// Serial.println("LED Indicator initialized");
|
||||
// Serial.printf("LED Data Pin: %d, Num LEDs: %d\n", LED_DATA_PIN, NUM_LEDS);
|
||||
}
|
||||
|
||||
void LEDIndicator::update() {
|
||||
unsigned long now = millis();
|
||||
// unsigned long now = millis();
|
||||
|
||||
// Update power LED
|
||||
if (powerOn) {
|
||||
leds[LED_POWER] = COLOR_POWER_ON;
|
||||
} else {
|
||||
leds[LED_POWER] = COLOR_POWER_OFF;
|
||||
}
|
||||
// // Update power LED
|
||||
// if (powerOn) {
|
||||
// leds[LED_POWER] = COLOR_POWER_ON;
|
||||
// } else {
|
||||
// leds[LED_POWER] = COLOR_POWER_OFF;
|
||||
// }
|
||||
|
||||
// Update mode LED with subtle pulsing effect
|
||||
if (now - lastUpdate > 20) {
|
||||
lastUpdate = now;
|
||||
pulsePhase++;
|
||||
// if (now - lastUpdate > 20) {
|
||||
// lastUpdate = now;
|
||||
// pulsePhase++;
|
||||
|
||||
// Create gentle pulse effect
|
||||
uint8_t pulseBrightness = 128 + (sin8(pulsePhase * 2) / 4);
|
||||
// // Create gentle pulse effect
|
||||
// uint8_t pulseBrightness = 128 + (sin8(pulsePhase * 2) / 4);
|
||||
|
||||
CRGB baseColor = dccMode ? COLOR_DCC : COLOR_ANALOG;
|
||||
leds[LED_MODE] = baseColor;
|
||||
leds[LED_MODE].fadeToBlackBy(255 - pulseBrightness);
|
||||
}
|
||||
// CRGB baseColor = dccMode ? COLOR_DCC : COLOR_ANALOG;
|
||||
// leds[LED_MODE] = baseColor;
|
||||
// leds[LED_MODE].fadeToBlackBy(255 - pulseBrightness);
|
||||
// }
|
||||
|
||||
FastLED.show();
|
||||
// FastLED.show();
|
||||
}
|
||||
|
||||
void LEDIndicator::setPowerOn(bool on) {
|
||||
if (powerOn != on) {
|
||||
powerOn = on;
|
||||
if (on) {
|
||||
powerOnSequence();
|
||||
}
|
||||
}
|
||||
// if (powerOn != on) {
|
||||
// powerOn = on;
|
||||
// if (on) {
|
||||
// powerOnSequence();
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
void LEDIndicator::setMode(bool isDCC) {
|
||||
if (dccMode != isDCC) {
|
||||
dccMode = isDCC;
|
||||
modeChangeEffect();
|
||||
}
|
||||
// if (dccMode != isDCC) {
|
||||
// dccMode = isDCC;
|
||||
// modeChangeEffect();
|
||||
// }
|
||||
}
|
||||
|
||||
void LEDIndicator::setBrightness(uint8_t newBrightness) {
|
||||
brightness = newBrightness;
|
||||
FastLED.setBrightness(brightness);
|
||||
// brightness = newBrightness;
|
||||
// FastLED.setBrightness(brightness);
|
||||
}
|
||||
|
||||
void LEDIndicator::powerOnSequence() {
|
||||
// Quick flash sequence on power on
|
||||
for (int i = 0; i < 3; i++) {
|
||||
leds[LED_POWER] = COLOR_POWER_ON;
|
||||
FastLED.show();
|
||||
delay(100);
|
||||
leds[LED_POWER] = COLOR_OFF;
|
||||
FastLED.show();
|
||||
delay(100);
|
||||
}
|
||||
leds[LED_POWER] = COLOR_POWER_ON;
|
||||
FastLED.show();
|
||||
Serial.println("LED: Power ON sequence");
|
||||
// // Quick flash sequence on power on
|
||||
// for (int i = 0; i < 3; i++) {
|
||||
// leds[LED_POWER] = COLOR_POWER_ON;
|
||||
// FastLED.show();
|
||||
// delay(100);
|
||||
// leds[LED_POWER] = COLOR_OFF;
|
||||
// FastLED.show();
|
||||
// delay(100);
|
||||
// }
|
||||
// leds[LED_POWER] = COLOR_POWER_ON;
|
||||
// FastLED.show();
|
||||
// Serial.println("LED: Power ON sequence");
|
||||
}
|
||||
|
||||
void LEDIndicator::modeChangeEffect() {
|
||||
// Smooth transition effect when changing modes
|
||||
CRGB targetColor = dccMode ? COLOR_DCC : COLOR_ANALOG;
|
||||
// // Smooth transition effect when changing modes
|
||||
// CRGB targetColor = dccMode ? COLOR_DCC : COLOR_ANALOG;
|
||||
|
||||
// Fade out
|
||||
for (int i = 255; i >= 0; i -= 15) {
|
||||
leds[LED_MODE].fadeToBlackBy(15);
|
||||
FastLED.show();
|
||||
delay(10);
|
||||
}
|
||||
// // Fade out
|
||||
// for (int i = 255; i >= 0; i -= 15) {
|
||||
// leds[LED_MODE].fadeToBlackBy(15);
|
||||
// FastLED.show();
|
||||
// delay(10);
|
||||
// }
|
||||
|
||||
// Fade in new color
|
||||
for (int i = 0; i <= 255; i += 15) {
|
||||
leds[LED_MODE] = targetColor;
|
||||
leds[LED_MODE].fadeToBlackBy(255 - i);
|
||||
FastLED.show();
|
||||
delay(10);
|
||||
}
|
||||
// // Fade in new color
|
||||
// for (int i = 0; i <= 255; i += 15) {
|
||||
// leds[LED_MODE] = targetColor;
|
||||
// leds[LED_MODE].fadeToBlackBy(255 - i);
|
||||
// FastLED.show();
|
||||
// delay(10);
|
||||
// }
|
||||
|
||||
Serial.printf("LED: Mode changed to %s\n", dccMode ? "DCC (Blue)" : "Analog (Yellow)");
|
||||
// Serial.printf("LED: Mode changed to %s\n", dccMode ? "DCC (Blue)" : "Analog (Yellow)");
|
||||
}
|
||||
+71
-6
@@ -5,6 +5,7 @@
|
||||
|
||||
#include "WebServer.h"
|
||||
#include <LittleFS.h>
|
||||
#include <WiFi.h>
|
||||
|
||||
/**
|
||||
* @brief Constructor
|
||||
@@ -14,19 +15,70 @@ WebServerManager::WebServerManager(Config* cfg, MotorController* motor, DCCGener
|
||||
}
|
||||
|
||||
void WebServerManager::begin() {
|
||||
Serial.println("Initializing web server...");
|
||||
|
||||
// Initialize LittleFS
|
||||
if (!LittleFS.begin(true)) {
|
||||
Serial.println("LittleFS Mount Failed");
|
||||
return;
|
||||
Serial.println("ERROR: LittleFS Mount Failed!");
|
||||
Serial.println("Did you upload the filesystem? Run: pio run -t uploadfs");
|
||||
} else {
|
||||
Serial.println("✓ LittleFS mounted successfully");
|
||||
|
||||
// List files for debugging
|
||||
File root = LittleFS.open("/");
|
||||
if (root) {
|
||||
Serial.println("Files in LittleFS:");
|
||||
File file = root.openNextFile();
|
||||
while (file) {
|
||||
Serial.print(" - ");
|
||||
Serial.print(file.name());
|
||||
Serial.print(" (");
|
||||
Serial.print(file.size());
|
||||
Serial.println(" bytes)");
|
||||
file = root.openNextFile();
|
||||
}
|
||||
}
|
||||
}
|
||||
Serial.println("LittleFS mounted successfully");
|
||||
|
||||
setupRoutes();
|
||||
|
||||
// Start DNS server for captive portal (redirect all domains to ESP32)
|
||||
dnsServer.start(53, "*", WiFi.softAPIP());
|
||||
Serial.println("✓ DNS server started for captive portal");
|
||||
|
||||
server.begin();
|
||||
Serial.println("Web server started on port 80");
|
||||
Serial.println("✓ Web server started on port 80");
|
||||
Serial.print("✓ Access at: http://");
|
||||
Serial.println(WiFi.softAPIP());
|
||||
Serial.println("✓ Captive portal enabled - phones will auto-redirect");
|
||||
}
|
||||
|
||||
void WebServerManager::setupRoutes() {
|
||||
// Android captive portal detection
|
||||
server.on("/generate_204", HTTP_GET, [this](AsyncWebServerRequest *request) {
|
||||
request->redirect("http://" + WiFi.softAPIP().toString());
|
||||
});
|
||||
|
||||
// iOS/macOS captive portal detection
|
||||
server.on("/hotspot-detect.html", HTTP_GET, [this](AsyncWebServerRequest *request) {
|
||||
request->redirect("http://" + WiFi.softAPIP().toString());
|
||||
});
|
||||
|
||||
// Windows captive portal detection
|
||||
server.on("/connecttest.txt", HTTP_GET, [this](AsyncWebServerRequest *request) {
|
||||
request->send(200, "text/plain", "Microsoft Connect Test");
|
||||
});
|
||||
|
||||
// Firefox captive portal detection
|
||||
server.on("/canonical.html", HTTP_GET, [this](AsyncWebServerRequest *request) {
|
||||
request->send(200, "text/html", "<html><head><meta http-equiv='refresh' content='0;url=http://" + WiFi.softAPIP().toString() + "'></head></html>");
|
||||
});
|
||||
|
||||
// Success page that prevents disconnection
|
||||
server.on("/success.txt", HTTP_GET, [this](AsyncWebServerRequest *request) {
|
||||
request->send(200, "text/plain", "success");
|
||||
});
|
||||
|
||||
// Serve main page
|
||||
server.on("/", HTTP_GET, [this](AsyncWebServerRequest *request) {
|
||||
request->send(LittleFS, "/index.html", "text/html");
|
||||
@@ -35,6 +87,18 @@ void WebServerManager::setupRoutes() {
|
||||
// Serve static files (CSS, JS, Bootstrap)
|
||||
server.serveStatic("/css/", LittleFS, "/css/");
|
||||
server.serveStatic("/js/", LittleFS, "/js/");
|
||||
|
||||
// Captive portal - redirect any unknown domain to our interface
|
||||
server.onNotFound([this](AsyncWebServerRequest *request) {
|
||||
// Check if request is for API or static files
|
||||
String path = request->url();
|
||||
if (path.startsWith("/api/") || path.startsWith("/css/") || path.startsWith("/js/")) {
|
||||
request->send(404);
|
||||
} else {
|
||||
// Redirect to main page for captive portal
|
||||
request->send(LittleFS, "/index.html", "text/html");
|
||||
}
|
||||
});
|
||||
|
||||
// API endpoints
|
||||
server.on("/api/status", HTTP_GET, [this](AsyncWebServerRequest *request) {
|
||||
@@ -42,7 +106,7 @@ void WebServerManager::setupRoutes() {
|
||||
});
|
||||
|
||||
server.on("/api/mode", HTTP_POST, [this](AsyncWebServerRequest *request) {
|
||||
handleSetMode(request);
|
||||
// handleSetMode(request);
|
||||
}, NULL, [this](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total) {
|
||||
// Body handler
|
||||
DynamicJsonDocument doc(256);
|
||||
@@ -154,5 +218,6 @@ String WebServerManager::getStatusJSON() {
|
||||
}
|
||||
|
||||
void WebServerManager::update() {
|
||||
// AsyncWebServer handles requests asynchronously
|
||||
// Process DNS requests for captive portal
|
||||
dnsServer.processNextRequest();
|
||||
}
|
||||
+16
-19
@@ -59,9 +59,9 @@ void setup() {
|
||||
// Initialize WiFi
|
||||
wifiManager.begin();
|
||||
|
||||
// Initialize LED indicator
|
||||
ledIndicator.begin();
|
||||
ledIndicator.setPowerOn(true);
|
||||
// Initialize LED indicator TODO
|
||||
//ledIndicator.begin();
|
||||
//ledIndicator.setPowerOn(true);
|
||||
|
||||
// Initialize motor controller
|
||||
motorController.begin();
|
||||
@@ -72,40 +72,37 @@ void setup() {
|
||||
// Set initial mode and LED
|
||||
if (config.system.isDCCMode) {
|
||||
dccGenerator.enable();
|
||||
ledIndicator.setMode(true);
|
||||
// ledIndicator.setMode(true);
|
||||
dccGenerator.setLocoSpeed(
|
||||
config.system.dccAddress,
|
||||
config.system.speed,
|
||||
config.system.direction
|
||||
);
|
||||
} else {
|
||||
ledIndicator.setMode(false);
|
||||
// ledIndicator.setMode(false);
|
||||
motorController.setSpeed(
|
||||
config.system.speed,
|
||||
config.system.direction
|
||||
);
|
||||
Serial.println("=================================\\n");
|
||||
}
|
||||
// }
|
||||
|
||||
/**
|
||||
* @brief Main loop - runs continuously
|
||||
*
|
||||
* Updates all system components:
|
||||
* - WiFi connection monitoring
|
||||
* - LED status display
|
||||
* - DCC signal generation (if enabled)
|
||||
* - Motor control updates (if in analog mode)
|
||||
*
|
||||
* @note Small delay prevents watchdog timer issues
|
||||
*/
|
||||
// void loop() {
|
||||
// Start web server BEFORE final status
|
||||
Serial.println("\nStarting web server...");
|
||||
webServer.begin();
|
||||
|
||||
// Update WiFi connection status
|
||||
Serial.println("\n=================================");
|
||||
Serial.println("Setup complete!");
|
||||
Serial.println("=================================");
|
||||
Serial.print("Mode: ");
|
||||
Serial.println(config.system.isDCCMode ? "DCC" : "DC Analog");
|
||||
Serial.print("WiFi Mode: ");
|
||||
Serial.println(config.wifi.isAPMode ? "Access Point" : "Client");
|
||||
Serial.print("SSID: ");
|
||||
Serial.println(config.wifi.isAPMode ? config.wifi.apSSID : config.wifi.ssid);
|
||||
Serial.print("IP Address: ");
|
||||
Serial.println(wifiManager.getIPAddress());
|
||||
Serial.print("Web interface: http://");
|
||||
Serial.println(wifiManager.getIPAddress());
|
||||
Serial.println("=================================\n");
|
||||
@@ -116,7 +113,7 @@ void loop() {
|
||||
wifiManager.update();
|
||||
|
||||
// Update LED indicators
|
||||
ledIndicator.update();
|
||||
//ledIndicator.update();
|
||||
|
||||
// Update DCC signal generation (if enabled)
|
||||
if (config.system.isDCCMode) {
|
||||
|
||||
Reference in new issue
Block a user