kopia lustrzana https://github.com/Aircoookie/WLED
Porównaj commity
2 Commity
14289c5b0c
...
6fb6173484
Autor | SHA1 | Data |
---|---|---|
Christophe Gagnier | 6fb6173484 | |
Christophe Gagnier | 61a104ac4e |
|
@ -6,3 +6,7 @@ PACKAGE_FILE = "package.json"
|
|||
with open(PACKAGE_FILE, "r") as package:
|
||||
version = json.load(package)["version"]
|
||||
env.Append(BUILD_FLAGS=[f"-DWLED_VERSION={version}"])
|
||||
if "-b" in version:
|
||||
env.Append(BUILD_FLAGS=[f"-DWLED_BRANCH=beta"])
|
||||
else:
|
||||
env.Append(BUILD_FLAGS=[f"-DWLED_BRANCH=stable"])
|
||||
|
|
|
@ -150,6 +150,8 @@ public:
|
|||
delay(100);
|
||||
sendToBroker("report/firmware", versionString); // Reports the firmware version
|
||||
delay(100);
|
||||
sendToBroker("report/branch", branchString); // Reports the firmware branch
|
||||
delay(100);
|
||||
sendToBroker("report/ip", (char *)WiFi.localIP().toString().c_str()); // Reports the ip
|
||||
delay(100);
|
||||
sendToBroker("report/network", (char *)WiFi.SSID().c_str()); // Reports the network name
|
||||
|
|
|
@ -613,6 +613,7 @@ void serializeInfo(JsonObject root)
|
|||
{
|
||||
root[F("ver")] = versionString;
|
||||
root[F("vid")] = VERSION;
|
||||
root[F("branch")] = branchString;
|
||||
//root[F("cn")] = WLED_CODENAME;
|
||||
|
||||
JsonObject leds = root.createNestedObject("leds");
|
||||
|
|
|
@ -313,6 +313,8 @@ void WLED::setup()
|
|||
DEBUG_PRINT(versionString);
|
||||
DEBUG_PRINT(" ");
|
||||
DEBUG_PRINT(VERSION);
|
||||
DEBUG_PRINT(" ");
|
||||
DEBUG_PRINT(branchString);
|
||||
DEBUG_PRINTLN(F(" INIT---"));
|
||||
#ifdef ARDUINO_ARCH_ESP32
|
||||
DEBUG_PRINT(F("esp32 "));
|
||||
|
|
|
@ -254,8 +254,13 @@ using PSRAMDynamicJsonDocument = BasicJsonDocument<PSRAM_Allocator>;
|
|||
#define WLED_VERSION "dev"
|
||||
#endif
|
||||
|
||||
#ifndef WLED_BRANCH
|
||||
#define WLED_BRANCH "dev"
|
||||
#endif
|
||||
|
||||
// Global Variable definitions
|
||||
WLED_GLOBAL char versionString[] _INIT(TOSTRING(WLED_VERSION));
|
||||
WLED_GLOBAL char branchString[] _INIT(TOSTRING(WLED_BRANCH));
|
||||
#define WLED_CODENAME "Hoshi"
|
||||
|
||||
// AP and OTA default passwords (for maximum security change them!)
|
||||
|
|
Ładowanie…
Reference in New Issue