Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mdev' into pr/286

Browse Source
This commit is contained in:
Frank
2025-11-29 00:48:07 +01:00
parent 260f26dadb 6ae4507531
commit f423710e78
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "wled", "name": "wled",
"version": "14.7.0-dev", "version": "14.7.0-mdev",
"description": "Tools for WLED project", "description": "Tools for WLED project",
"main": "tools/cdata.js", "main": "tools/cdata.js",
"directories": { "directories": {

2
wled00/improv.cpp
View File

@@ -212,7 +212,7 @@ void sendImprovInfoResponse() {
bool useMdnsName = (strcmp(serverDescription, "WLED") == 0 && strlen(cmDNS) > 0); bool useMdnsName = (strcmp(serverDescription, "WLED") == 0 && strlen(cmDNS) > 0);
char vString[32] = { '\0' }; 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("0.14.1-b34.42/%i"),VERSION); // upstream baseline
snprintf_P(vString, sizeof(vString)-1, PSTR("14.5.1-dev/%i"),VERSION); // WLEDMM version snprintf_P(vString, sizeof(vString)-1, PSTR("14.7.0-mdev/%i"),VERSION); // WLEDMM version
const char *str[4] = {"WLED", vString, bString, useMdnsName ? cmDNS : serverDescription}; const char *str[4] = {"WLED", vString, bString, useMdnsName ? cmDNS : serverDescription};
sendImprovRPCResult(ImprovRPCType::Request_Info, 4, str); sendImprovRPCResult(ImprovRPCType::Request_Info, 4, str);

6
wled00/util.cpp
View File

@@ -718,11 +718,11 @@ String generateDeviceFingerprint() {
// mix in ADC calibration data: // mix in ADC calibration data:
esp_adc_cal_characteristics_t ch; esp_adc_cal_characteristics_t ch;
#if SOC_ADC_MAX_BITWIDTH == 13 // S2 has 13 bit ADC #if SOC_ADC_MAX_BITWIDTH == 13 // S2 has 13 bit ADC
#define BIT_WIDTH ADC_WIDTH_BIT_13 constexpr auto myBIT_WIDTH = ADC_WIDTH_BIT_13;
#else #else
#define BIT_WIDTH ADC_WIDTH_BIT_12 constexpr auto myBIT_WIDTH = ADC_WIDTH_BIT_12;
#endif #endif
esp_adc_cal_characterize(ADC_UNIT_1, ADC_ATTEN_DB_11, BIT_WIDTH, 1100, &ch); esp_adc_cal_characterize(ADC_UNIT_1, ADC_ATTEN_DB_11, myBIT_WIDTH, 1100, &ch);
fp[0] ^= ch.coeff_a; fp[0] ^= ch.coeff_a;
fp[1] ^= ch.coeff_b; fp[1] ^= ch.coeff_b;
if (ch.low_curve) { if (ch.low_curve) {

2
wled00/wled.h
View File

@@ -7,7 +7,7 @@
*/ */
// version code in format yymmddb (b = daily build) // version code in format yymmddb (b = daily build)
#define VERSION 2510241 #define VERSION 2511281
// 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. // 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_ #define _MoonModules_WLED_