Skip to content

Commit

Permalink
change version numbering scheme
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
softhack007 committed Dec 11, 2024
1 parent a5e9df6 commit 2cc0848
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
16 changes: 9 additions & 7 deletions wled00/data/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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} &nbsp;<i>"${vcn}"</i><p>(WLEDMM ${i.rel}.bin)</p><p><em>build ${i.vid}</em></p><table>
${urows}
${urows===""?'':'<tr><td colspan=2><hr style="height:1px;border-width:0;color:SeaGreen;background-color:Seagreen"></td></tr>'}
Expand Down
5 changes: 3 additions & 2 deletions wled00/improv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 2 additions & 3 deletions wled00/wled.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_
Expand Down

0 comments on commit 2cc0848

Please sign in to comment.