From 2cc08486fdd32d7793335c4456e055ec49cf5fa1 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 11 Dec 2024 15:09:05 +0100
Subject: [PATCH] change version numbering scheme
* use 14.5.0-dev instead of "0.14.5.0-b32.41.dev"
* new release name "Small Step"
* semantic versioning compatibility checked, see https://jubianchi.github.io/semver-check/#/version/14.5.0-dev
---
.github/ISSUE_TEMPLATE/bug.yml | 2 +-
package-lock.json | 4 ++--
package.json | 2 +-
wled00/data/index.js | 16 +++++++++-------
wled00/improv.cpp | 5 +++--
wled00/wled.h | 5 ++---
6 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 34b5904de5..937dfa9c50 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -48,7 +48,7 @@ body:
attributes:
label: What version/release of MM WLED?
description: You can find this in by going to Config -> Security & Updates -> Scroll to Bottom. Copy and paste the entire line after "Server message"
- placeholder: "e.g. build 2401290, WLEDMM_0.14.1-b32.40_esp32_4MB_M.bin"
+ placeholder: "e.g. build 2401290, WLEDMM_14.5.0-beta_esp32_4MB_M.bin"
validations:
required: true
- type: dropdown
diff --git a/package-lock.json b/package-lock.json
index 59697131a3..d6cd2b9c05 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "wled",
- "version": "0.14.1-b32.41.dev",
+ "version": "14.5.0-dev",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "wled",
- "version": "0.14.1-b32.41.dev",
+ "version": "14.5.0-dev",
"license": "EUPL-1.2",
"dependencies": {
"clean-css": "^4.2.3",
diff --git a/package.json b/package.json
index b6763b3347..4e82f27c5a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wled",
- "version": "0.14.1-b32.41.dev",
+ "version": "14.5.0-dev",
"description": "Tools for WLED project",
"main": "tools/cdata.js",
"directories": {
diff --git a/wled00/data/index.js b/wled00/data/index.js
index 7dced6a4a3..fb183d820d 100644
--- a/wled00/data/index.js
+++ b/wled00/data/index.js
@@ -684,18 +684,20 @@ function populateInfo(i)
urows += inforow(k,val);
}
}
- var vcn = "Kuuhaku";
- if (i.ver.startsWith("0.14.")) vcn = "Hoshi";
+ var vcn = "Small Step"; // WLED-MM 14.5.0, release Dec 2024
+// if (i.ver.startsWith("0.14.")) vcn = "Hoshi";
// if (i.ver.includes("-bl")) vcn = "Supāku";
if (i.cn) vcn = i.cn;
//WLEDMM: add total heap and total PSRAM, and build number, add bin name
- if (i.ver.includes("0.14.0")) vcn = "Lupo"; // check for MM versioning scheme
- if (i.ver.includes("0.14.0-b15")) vcn = "Sitting Ducks"; // late easter egg
- if (i.ver.includes("0.14.0-b2")) vcn = "This is the way"; // recently watched The Mandalorian? I have spoken ;-)
- if (i.ver.includes("0.14.0-b15.22")) vcn = "Lupo";
- if (i.ver.includes("0.14.1-b3")) vcn = "Fried Chicken"; // final line of "One Vision" by Queen
+ //if (i.ver.includes("0.14.0")) vcn = "Lupo"; // check for MM versioning scheme
+ //if (i.ver.includes("0.14.0-b15")) vcn = "Sitting Ducks"; // late easter egg
+ //if (i.ver.includes("0.14.0-b2")) vcn = "This is the way"; // recently watched The Mandalorian? I have spoken ;-)
+ //if (i.ver.includes("0.14.0-b15.22")) vcn = "Lupo";
+ //if (i.ver.includes("0.14.1-b")) vcn = "Fried Chicken"; // final line of "One Vision" by Queen
if (i.ver.includes("0.14.3-b")) vcn = "Fried Chicken";
+ if (i.ver.includes("14.5.")) vcn = "Small Step";
+
cn += `v${i.ver} "${vcn}"(WLEDMM ${i.rel}.bin)
build ${i.vid}
${urows}
${urows===""?'':'
|
'}
diff --git a/wled00/improv.cpp b/wled00/improv.cpp
index afcbbbb2e5..cbe292c729 100644
--- a/wled00/improv.cpp
+++ b/wled00/improv.cpp
@@ -210,8 +210,9 @@ void sendImprovInfoResponse() {
//Use serverDescription if it has been changed from the default "WLED", else mDNS name
bool useMdnsName = (strcmp(serverDescription, "WLED") == 0 && strlen(cmDNS) > 0);
- char vString[32];
- snprintf_P(vString, sizeof(vString)-1, PSTR("0.14.1-b32.41/%i"),VERSION);
+ char vString[32] = { '\0' };
+ //snprintf_P(vString, sizeof(vString)-1, PSTR("0.14.1-b34.42/%i"),VERSION); // upstream baseline
+ snprintf_P(vString, sizeof(vString)-1, PSTR("14.5.0-dev/%i"),VERSION); // WLEDMM version
const char *str[4] = {"WLED", vString, bString, useMdnsName ? cmDNS : serverDescription};
sendImprovRPCResult(ImprovRPCType::Request_Info, 4, str);
diff --git a/wled00/wled.h b/wled00/wled.h
index 7af6b43c3b..f146c35bca 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -3,12 +3,11 @@
/*
Main sketch, global variable declarations
@title WLED project sketch
- @version 0.14.1-b1x
- @author Christian Schwinne
+ @version 14.5.0-dev
*/
// version code in format yymmddb (b = daily build)
-#define VERSION 2412030
+#define VERSION 2412110
// WLEDMM - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
#define _MoonModules_WLED_