kopia lustrzana https://github.com/Aircoookie/WLED
Porównaj commity
5 Commity
6fb6173484
...
14289c5b0c
Autor | SHA1 | Data |
---|---|---|
Christophe Gagnier | 14289c5b0c | |
Blaž Kristan | 197f47befe | |
Woody | 6272969983 | |
Woody | b2e68db380 | |
Christophe Gagnier | 61a104ac4e |
|
@ -12,10 +12,12 @@ jobs:
|
||||||
with:
|
with:
|
||||||
days-before-stale: 120
|
days-before-stale: 120
|
||||||
days-before-close: 7
|
days-before-close: 7
|
||||||
|
stale-issue-label: 'stale'
|
||||||
|
stale-pr-label: 'stale'
|
||||||
exempt-issue-labels: 'pinned,keep,enhancement,confirmed'
|
exempt-issue-labels: 'pinned,keep,enhancement,confirmed'
|
||||||
exempt-pr-labels: 'pinned,keep,enhancement,confirmed'
|
exempt-pr-labels: 'pinned,keep,enhancement,confirmed'
|
||||||
exempt-all-milestones: true
|
exempt-all-milestones: true
|
||||||
operations-per-run: 150
|
operations-per-run: 1000
|
||||||
stale-issue-message: >
|
stale-issue-message: >
|
||||||
Hey! This issue has been open for quite some time without any new comments now.
|
Hey! This issue has been open for quite some time without any new comments now.
|
||||||
It will be closed automatically in a week if no further activity occurs.
|
It will be closed automatically in a week if no further activity occurs.
|
||||||
|
|
|
@ -6,3 +6,7 @@ PACKAGE_FILE = "package.json"
|
||||||
with open(PACKAGE_FILE, "r") as package:
|
with open(PACKAGE_FILE, "r") as package:
|
||||||
version = json.load(package)["version"]
|
version = json.load(package)["version"]
|
||||||
env.Append(BUILD_FLAGS=[f"-DWLED_VERSION={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);
|
delay(100);
|
||||||
sendToBroker("report/firmware", versionString); // Reports the firmware version
|
sendToBroker("report/firmware", versionString); // Reports the firmware version
|
||||||
delay(100);
|
delay(100);
|
||||||
|
sendToBroker("report/branch", branchString); // Reports the firmware branch
|
||||||
|
delay(100);
|
||||||
sendToBroker("report/ip", (char *)WiFi.localIP().toString().c_str()); // Reports the ip
|
sendToBroker("report/ip", (char *)WiFi.localIP().toString().c_str()); // Reports the ip
|
||||||
delay(100);
|
delay(100);
|
||||||
sendToBroker("report/network", (char *)WiFi.SSID().c_str()); // Reports the network name
|
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("ver")] = versionString;
|
||||||
root[F("vid")] = VERSION;
|
root[F("vid")] = VERSION;
|
||||||
|
root[F("branch")] = branchString;
|
||||||
//root[F("cn")] = WLED_CODENAME;
|
//root[F("cn")] = WLED_CODENAME;
|
||||||
|
|
||||||
JsonObject leds = root.createNestedObject("leds");
|
JsonObject leds = root.createNestedObject("leds");
|
||||||
|
|
|
@ -313,6 +313,8 @@ void WLED::setup()
|
||||||
DEBUG_PRINT(versionString);
|
DEBUG_PRINT(versionString);
|
||||||
DEBUG_PRINT(" ");
|
DEBUG_PRINT(" ");
|
||||||
DEBUG_PRINT(VERSION);
|
DEBUG_PRINT(VERSION);
|
||||||
|
DEBUG_PRINT(" ");
|
||||||
|
DEBUG_PRINT(branchString);
|
||||||
DEBUG_PRINTLN(F(" INIT---"));
|
DEBUG_PRINTLN(F(" INIT---"));
|
||||||
#ifdef ARDUINO_ARCH_ESP32
|
#ifdef ARDUINO_ARCH_ESP32
|
||||||
DEBUG_PRINT(F("esp32 "));
|
DEBUG_PRINT(F("esp32 "));
|
||||||
|
|
|
@ -254,8 +254,13 @@ using PSRAMDynamicJsonDocument = BasicJsonDocument<PSRAM_Allocator>;
|
||||||
#define WLED_VERSION "dev"
|
#define WLED_VERSION "dev"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef WLED_BRANCH
|
||||||
|
#define WLED_BRANCH "dev"
|
||||||
|
#endif
|
||||||
|
|
||||||
// Global Variable definitions
|
// Global Variable definitions
|
||||||
WLED_GLOBAL char versionString[] _INIT(TOSTRING(WLED_VERSION));
|
WLED_GLOBAL char versionString[] _INIT(TOSTRING(WLED_VERSION));
|
||||||
|
WLED_GLOBAL char branchString[] _INIT(TOSTRING(WLED_BRANCH));
|
||||||
#define WLED_CODENAME "Hoshi"
|
#define WLED_CODENAME "Hoshi"
|
||||||
|
|
||||||
// AP and OTA default passwords (for maximum security change them!)
|
// AP and OTA default passwords (for maximum security change them!)
|
||||||
|
|
Ładowanie…
Reference in New Issue