Merge remote-tracking branch 'Tasmota/development' into work

Jason2866 · Nov 18, 2024 · 7ac2240 · 7ac2240
2 parents 776b0ff + 3778f22
commit 7ac2240
Show file tree

Hide file tree

Showing 6 changed files with 328 additions and 326 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 - ESP32 upgrade by file upload response based on file size (#22500)
+- Wrong GUI Module and Template drop down list indexes regression
 
 ### Removed
 

diff --git a/tasmota/include/tasmota.h b/tasmota/include/tasmota.h
@@ -107,7 +107,7 @@ const uint8_t MAX_I2S = 2;                  // Max number of Hardware I2S contro
   const uint8_t MAX_RMT = 0;                // Max number or RMT channels (0 if unknown)
   #endif
 #else
-const uint8_t MAX_SPI = 0;                  // Max number of Hardware SPI controllers (ESP8266 = 0, no choice)
+const uint8_t MAX_SPI = 1;                  // Max number of Hardware SPI controllers
 const uint8_t MAX_I2S = 0;                  // Max number of Hardware I2S controllers (ESP8266 = 0, no choice)
 const uint8_t MAX_RMT = 0;                  // No RMT channel on ESP8266
 #endif

diff --git a/tasmota/include/tasmota_globals.h b/tasmota/include/tasmota_globals.h
@@ -543,6 +543,7 @@ const char kWebColors[] PROGMEM =
 
 #define AGPIO(x) ((x)<<5)
 #define BGPIO(x) ((x)>>5)
+#define AGMAX(x) ((x)?(x-1):0)
 
 #ifdef USE_DEVICE_GROUPS
 #define SendDeviceGroupMessage(DEVICE_INDEX, REQUEST_TYPE, ...) _SendDeviceGroupMessage(DEVICE_INDEX, REQUEST_TYPE, __VA_ARGS__, 0)