Merge branch 'mdev' into pr/286

package.json

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

wled00/improv.cpp

@@ -212,7 +212,7 @@ void sendImprovInfoResponse() {
   bool useMdnsName = (strcmp(serverDescription, "WLED") == 0 && strlen(cmDNS) > 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("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};
 
   sendImprovRPCResult(ImprovRPCType::Request_Info, 4, str);

wled00/util.cpp

@@ -718,11 +718,11 @@ String generateDeviceFingerprint() {
   // mix in ADC calibration data:
   esp_adc_cal_characteristics_t ch;
   #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
-  #define BIT_WIDTH ADC_WIDTH_BIT_12
+  constexpr auto myBIT_WIDTH = ADC_WIDTH_BIT_12;
   #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[1] ^= ch.coeff_b;
   if (ch.low_curve) {

wled00/wled.h

@@ -7,7 +7,7 @@
  */
 
 // 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.
 #define _MoonModules_WLED_