diff --git a/tasmota/language/bg_BG.h b/tasmota/language/bg_BG.h index 459031962..7c80a6cf6 100644 --- a/tasmota/language/bg_BG.h +++ b/tasmota/language/bg_BG.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 CS" #define D_SENSOR_MAX31855_CLK "MX31855 CLK" #define D_SENSOR_MAX31855_DO "MX31855 DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL CF1" #define D_SENSOR_HLW_CF "HLW8012 CF" diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h index d87650ec9..3aca1ffda 100644 --- a/tasmota/language/cs_CZ.h +++ b/tasmota/language/cs_CZ.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 CS" #define D_SENSOR_MAX31855_CLK "MX31855 CLK" #define D_SENSOR_MAX31855_DO "MX31855 DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL CF1" #define D_SENSOR_HLW_CF "HLW8012 CF" diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h index 9e25dfdaa..77fbfa5e9 100644 --- a/tasmota/language/de_DE.h +++ b/tasmota/language/de_DE.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 CS" #define D_SENSOR_MAX31855_CLK "MX31855 CLK" #define D_SENSOR_MAX31855_DO "MX31855 DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL CF1" #define D_SENSOR_HLW_CF "HLW8012 CF" diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h index 9dbaf45f5..a374cc116 100644 --- a/tasmota/language/el_GR.h +++ b/tasmota/language/el_GR.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 CS" #define D_SENSOR_MAX31855_CLK "MX31855 CLK" #define D_SENSOR_MAX31855_DO "MX31855 DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL CF1" #define D_SENSOR_HLW_CF "HLW8012 CF" diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h index 7a9b45b43..e091d2ad1 100644 --- a/tasmota/language/en_GB.h +++ b/tasmota/language/en_GB.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 CS" #define D_SENSOR_MAX31855_CLK "MX31855 CLK" #define D_SENSOR_MAX31855_DO "MX31855 DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL CF1" #define D_SENSOR_HLW_CF "HLW8012 CF" diff --git a/tasmota/language/es_ES.h b/tasmota/language/es_ES.h index 81e2248b4..0fa3221ba 100644 --- a/tasmota/language/es_ES.h +++ b/tasmota/language/es_ES.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 CS" #define D_SENSOR_MAX31855_CLK "MX31855 CLK" #define D_SENSOR_MAX31855_DO "MX31855 DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL CF1" #define D_SENSOR_HLW_CF "HLW8012 CF" diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h index 85b9648b8..5be788868 100644 --- a/tasmota/language/fr_FR.h +++ b/tasmota/language/fr_FR.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 CS" #define D_SENSOR_MAX31855_CLK "MX31855 CLK" #define D_SENSOR_MAX31855_DO "MX31855 DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL CF1" #define D_SENSOR_HLW_CF "HLW8012 CF" diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h index fb073ee3a..a673cacc0 100644 --- a/tasmota/language/he_HE.h +++ b/tasmota/language/he_HE.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 CS" #define D_SENSOR_MAX31855_CLK "MX31855 CLK" #define D_SENSOR_MAX31855_DO "MX31855 DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL CF1" #define D_SENSOR_HLW_CF "HLW8012 CF" diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h index 2171d2fba..69c467ef9 100644 --- a/tasmota/language/hu_HU.h +++ b/tasmota/language/hu_HU.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 CS" #define D_SENSOR_MAX31855_CLK "MX31855 CLK" #define D_SENSOR_MAX31855_DO "MX31855 DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL CF1" #define D_SENSOR_HLW_CF "HLW8012 CF" diff --git a/tasmota/language/it_IT.h b/tasmota/language/it_IT.h index bc07e8ea2..fc18d3d30 100644 --- a/tasmota/language/it_IT.h +++ b/tasmota/language/it_IT.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 - CS" #define D_SENSOR_MAX31855_CLK "MX31855 - CLK" #define D_SENSOR_MAX31855_DO "MX31855 - DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL - SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL - CF1" #define D_SENSOR_HLW_CF "HLW8012 - CF" diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h index 94b4de66f..a1f0f2972 100644 --- a/tasmota/language/ko_KO.h +++ b/tasmota/language/ko_KO.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 CS" #define D_SENSOR_MAX31855_CLK "MX31855 CLK" #define D_SENSOR_MAX31855_DO "MX31855 DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL CF1" #define D_SENSOR_HLW_CF "HLW8012 CF" diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h index 7f49f0f5f..edd09b795 100644 --- a/tasmota/language/nl_NL.h +++ b/tasmota/language/nl_NL.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 CS" #define D_SENSOR_MAX31855_CLK "MX31855 CLK" #define D_SENSOR_MAX31855_DO "MX31855 DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL CF1" #define D_SENSOR_HLW_CF "HLW8012 CF" diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h index f67fdefcc..b0f0962fe 100644 --- a/tasmota/language/pl_PL.h +++ b/tasmota/language/pl_PL.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 CS" #define D_SENSOR_MAX31855_CLK "MX31855 CLK" #define D_SENSOR_MAX31855_DO "MX31855 DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL CF1" #define D_SENSOR_HLW_CF "HLW8012 CF" diff --git a/tasmota/language/pt_BR.h b/tasmota/language/pt_BR.h index 3d669b19a..2af91db6e 100644 --- a/tasmota/language/pt_BR.h +++ b/tasmota/language/pt_BR.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 CS" #define D_SENSOR_MAX31855_CLK "MX31855 CLK" #define D_SENSOR_MAX31855_DO "MX31855 DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL CF1" #define D_SENSOR_HLW_CF "HLW8012 CF" diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h index 7dbfe4858..da6f46758 100644 --- a/tasmota/language/pt_PT.h +++ b/tasmota/language/pt_PT.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 CS" #define D_SENSOR_MAX31855_CLK "MX31855 CLK" #define D_SENSOR_MAX31855_DO "MX31855 DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL CF1" #define D_SENSOR_HLW_CF "HLW8012 CF" diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h index cbfd882b2..a6d66722f 100644 --- a/tasmota/language/ro_RO.h +++ b/tasmota/language/ro_RO.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 CS" #define D_SENSOR_MAX31855_CLK "MX31855 CLK" #define D_SENSOR_MAX31855_DO "MX31855 DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL CF1" #define D_SENSOR_HLW_CF "HLW8012 CF" diff --git a/tasmota/language/ru_RU.h b/tasmota/language/ru_RU.h index eae73b248..921398a2d 100644 --- a/tasmota/language/ru_RU.h +++ b/tasmota/language/ru_RU.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 CS" #define D_SENSOR_MAX31855_CLK "MX31855 CLK" #define D_SENSOR_MAX31855_DO "MX31855 DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL CF1" #define D_SENSOR_HLW_CF "HLW8012 CF" diff --git a/tasmota/language/sk_SK.h b/tasmota/language/sk_SK.h index 32deed082..b418924d5 100644 --- a/tasmota/language/sk_SK.h +++ b/tasmota/language/sk_SK.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 CS" #define D_SENSOR_MAX31855_CLK "MX31855 CLK" #define D_SENSOR_MAX31855_DO "MX31855 DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL CF1" #define D_SENSOR_HLW_CF "HLW8012 CF" diff --git a/tasmota/language/sv_SE.h b/tasmota/language/sv_SE.h index e335a856b..352c8b82d 100644 --- a/tasmota/language/sv_SE.h +++ b/tasmota/language/sv_SE.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 CS" #define D_SENSOR_MAX31855_CLK "MX31855 CLK" #define D_SENSOR_MAX31855_DO "MX31855 DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL CF1" #define D_SENSOR_HLW_CF "HLW8012 CF" diff --git a/tasmota/language/tr_TR.h b/tasmota/language/tr_TR.h index 1582c21c0..e5a34fdcd 100644 --- a/tasmota/language/tr_TR.h +++ b/tasmota/language/tr_TR.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 CS" #define D_SENSOR_MAX31855_CLK "MX31855 CLK" #define D_SENSOR_MAX31855_DO "MX31855 DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL CF1" #define D_SENSOR_HLW_CF "HLW8012 CF" diff --git a/tasmota/language/uk_UA.h b/tasmota/language/uk_UA.h index 5d0560e4e..001e6692c 100644 --- a/tasmota/language/uk_UA.h +++ b/tasmota/language/uk_UA.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 CS" #define D_SENSOR_MAX31855_CLK "MX31855 CLK" #define D_SENSOR_MAX31855_DO "MX31855 DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL CF1" #define D_SENSOR_HLW_CF "HLW8012 CF" diff --git a/tasmota/language/zh_CN.h b/tasmota/language/zh_CN.h index 560d804a8..9dbe6728b 100644 --- a/tasmota/language/zh_CN.h +++ b/tasmota/language/zh_CN.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 CS" #define D_SENSOR_MAX31855_CLK "MX31855 CLK" #define D_SENSOR_MAX31855_DO "MX31855 DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL CF1" #define D_SENSOR_HLW_CF "HLW8012 CF" diff --git a/tasmota/language/zh_TW.h b/tasmota/language/zh_TW.h index 3f1dfa7ba..c3ecf4027 100644 --- a/tasmota/language/zh_TW.h +++ b/tasmota/language/zh_TW.h @@ -622,6 +622,7 @@ #define D_SENSOR_MAX31855_CS "MX31855 CS" #define D_SENSOR_MAX31855_CLK "MX31855 CLK" #define D_SENSOR_MAX31855_DO "MX31855 DO" +#define D_SENSOR_MAX31865_CS "MX31865 CS" #define D_SENSOR_NRG_SEL "HLWBL SEL" // Suffix "i" #define D_SENSOR_NRG_CF1 "HLWBL CF1" #define D_SENSOR_HLW_CF "HLW8012 CF" diff --git a/tasmota/tasmota_template_ESP32.h b/tasmota/tasmota_template_ESP32.h index 698862f15..d2ab06ed0 100644 --- a/tasmota/tasmota_template_ESP32.h +++ b/tasmota/tasmota_template_ESP32.h @@ -88,9 +88,7 @@ enum UserSelectablePins { GPIO_TXD, GPIO_RXD, // Serial interface GPIO_ROT1A, GPIO_ROT1B, // Rotary switch GPIO_ADC_JOY, // Analog joystick - - GPIO_SPARE1, // Spare GPIOs - + GPIO_SSPI_MAX31865_CS1, // MAX31865 Chip Select GPIO_HRE_CLOCK, GPIO_HRE_DATA, // HR-E Water Meter GPIO_ADE7953_IRQ, // ADE7953 IRQ GPIO_SOLAXX1_TX, GPIO_SOLAXX1_RX, // Solax Inverter Serial interface @@ -195,9 +193,7 @@ const char kSensorNames[] PROGMEM = D_SENSOR_TXD "|" D_SENSOR_RXD "|" D_SENSOR_ROTARY "_a|" D_SENSOR_ROTARY "_b|" D_SENSOR_ADC_JOYSTICK "|" - - "Spare1|" - + D_SENSOR_MAX31865_CS "|" D_SENSOR_HRE_CLOCK "|" D_SENSOR_HRE_DATA "|" D_SENSOR_ADE7953_IRQ "|" D_SENSOR_SOLAXX1_TX "|" D_SENSOR_SOLAXX1_RX "|" @@ -246,6 +242,7 @@ const char kSensorNames[] PROGMEM = const char kSensorNamesFixed[] PROGMEM = D_SENSOR_USER; +#define MAX_MAX31865_CS 6 #define MAX_WEBCAM_DATA 8 #define MAX_WEBCAM_HSD 3 @@ -530,6 +527,9 @@ const uint16_t kGpioNiceList[] PROGMEM = { AGPIO(GPIO_MAX31855CLK), // MAX31855 Serial interface AGPIO(GPIO_MAX31855DO), // MAX31855 Serial interface #endif +#ifdef USE_MAX31855 + AGPIO(GPIO_SSPI_MAX31865_CS1) + MAX_MAX31865_CS, +#endif #ifdef USE_HRE AGPIO(GPIO_HRE_CLOCK), AGPIO(GPIO_HRE_DATA),