From e83ea97a68a571e30704aa5bc769f0bff62a92a0 Mon Sep 17 00:00:00 2001 From: cschwinne Date: Wed, 10 Jan 2018 00:37:45 +0100 Subject: [PATCH] Added /build subpage to view build options --- wled00/wled00.ino | 3 ++- wled00/wled02_xml.ino | 2 +- wled00/wled05_init.ino | 44 +++++++++++++++++++++++++++++++++++++++++ wled00/wled12_alexa.ino | 7 +------ 4 files changed, 48 insertions(+), 8 deletions(-) diff --git a/wled00/wled00.ino b/wled00/wled00.ino index 497583206..fd74ad829 100644 --- a/wled00/wled00.ino +++ b/wled00/wled00.ino @@ -28,7 +28,8 @@ #include "WS2812FX.h" //version in format yymmddb (b = daily build) -#define VERSION 1801095 +#define VERSION 1801101 +const String versionName = "WLED 0.5dev"; //AP and OTA default passwords (change them!) String appass = "wled1234"; diff --git a/wled00/wled02_xml.ino b/wled00/wled02_xml.ino index b7de4abe4..651e7f135 100644 --- a/wled00/wled02_xml.ino +++ b/wled00/wled02_xml.ino @@ -161,7 +161,7 @@ String getSettings() resp += "Not active"; } resp += "\";"; - resp += dg + "(\"msg\")[0]" + ih + "\"WLED 0.5dev (build " + VERSION + ") OK\";"; + resp += dg + "(\"msg\")[0]" + ih + "\""+ versionName +" (build " + VERSION + ") OK\";"; return resp; } diff --git a/wled00/wled05_init.ino b/wled00/wled05_init.ino index da7bc1610..04d160776 100644 --- a/wled00/wled05_init.ino +++ b/wled00/wled05_init.ino @@ -122,6 +122,50 @@ void wledInit() val += "mA currently\nNotice: This is just an estimate which does not take into account several factors (like effects and wire resistance). It is NOT an accurate measurement!"; server.send(200, "text/plain", val); }); + server.on("/build", HTTP_GET, [](){ + String info = "hard-coded build info:\r\n\n"; + #ifdef ARDUINO_ARCH_ESP32 + info += "platform: esp32\r\n"; + #else + info += "platform: esp8266\r\n"; + #endif + info += "name: " + versionName + "\r\n"; + info += "version: " + (String)VERSION + "\r\n"; + #ifdef RGBW + info += "rgbw: true\r\n"; + #else + info += "rgbw: false\r\n"; + #endif + info += "max-leds: " + (String)LEDCOUNT + "\r\n"; + info += "max-direct: " + (String)MAXDIRECT + "\r\n"; + #ifdef USEOVERLAYS + info += "overlays: true\r\n"; + #else + info += "overlays: false\r\n"; + #endif + #ifdef CRONIXIE + info += "cronixie: true\r\n"; + #else + info += "cronixie: false\r\n"; + #endif + #ifdef USEFS + info += "spiffs: true\r\n"; + #else + info += "spiffs: false\r\n"; + #endif + #ifdef DEBUG + info += "debug: true\r\n"; + #else + info += "debug: false\r\n"; + #endif + info += "button-pin: gpio" + String(buttonPin) + "\r\n"; + #ifdef ARDUINO_ARCH_ESP32 + info += "strip-pin: gpio" + String(PIN) + "\r\n"; + #else + info += "strip-pin: gpio2\r\n"; + #endif + server.send(200, "text/plain", info); + }); if (!otaLock){ server.on("/edit", HTTP_GET, [](){ if(!handleFileRead("/edit.htm")) server.send(200, "text/html", PAGE_edit); diff --git a/wled00/wled12_alexa.ino b/wled00/wled12_alexa.ino index 8cf9c0a0f..3effe3916 100644 --- a/wled00/wled12_alexa.ino +++ b/wled00/wled12_alexa.ino @@ -5,7 +5,7 @@ * https://github.com/kakopappa/arduino-esp8266-alexa-wemo-switch * https://github.com/probonopd/ESP8266HueEmulator */ -#ifndef TEST//ARDUINO_ARCH_ESP32 + void alexaInit() { if (alexaEnabled && WiFi.status() == WL_CONNECTED) @@ -277,8 +277,3 @@ boolean connectUDP(){ return state; } -#else -void handleAlexa(){}; -bool handleAlexaApiCall(String u, String b){return false;}; -void alexaInit(){}; -#endif