SolaxX1 RTS #1

xmurx · Jan 5, 2022 · 2e77ed0 · 2e77ed0
1 parent c808257
commit 2e77ed0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
@@ -788,9 +788,9 @@
  #define DDS2382_SPEED 9600 // Hiking DDS2382 Modbus RS485 serial speed (default: 9600 baud)
 //#define USE_DDSU666 // Add support for Chint DDSU666 Modbus energy monitor (+0k6 code)
  #define DDSU666_SPEED 9600 // Chint DDSU666 Modbus RS485 serial speed (default: 9600 baud)
-//#define USE_SOLAX_X1 // Add support for Solax X1 series Modbus log info (+3k1 code)
+#define USE_SOLAX_X1 // Add support for Solax X1 series Modbus log info (+3k1 code)
  #define SOLAXX1_SPEED 9600 // Solax X1 Modbus RS485 serial speed (default: 9600 baud)
- #define SOLAXX1_PV2 // Solax X1 using second PV
+// #define SOLAXX1_PV2 // Solax X1 using second PV
 //#define USE_LE01MR // Add support for F&F LE-01MR Modbus energy monitor (+1k code)
  #define LE01MR_SPEED 9600 // LE-01MR modbus baudrate (default: 9600)
  #define LE01MR_ADDR 1 // LE-01MR modbus address (default: 0x01)

diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
@@ -74,7 +74,7 @@ enum UserSelectablePins {
  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
+ GPIO_SOLAXX1_TX, GPIO_SOLAXX1_RX, GPIO_SOLAXX1_RTS,  // Solax Inverter Serial interface
  GPIO_ZIGBEE_TX, GPIO_ZIGBEE_RX, // Zigbee Serial interface
  GPIO_RDM6300_RX, // RDM6300 RX
  GPIO_IBEACON_TX, GPIO_IBEACON_RX, // HM17 IBEACON Serial interface
@@ -275,7 +275,7 @@ const char kSensorNames[] PROGMEM =
  D_SENSOR_MAX31865_CS "|"
  D_SENSOR_HRE_CLOCK "|" D_SENSOR_HRE_DATA "|"
  D_SENSOR_ADE7953_IRQ "|"
- D_SENSOR_SOLAXX1_TX "|" D_SENSOR_SOLAXX1_RX "|"
+ D_SENSOR_SOLAXX1_TX "|" D_SENSOR_SOLAXX1_RX "|" D_SENSOR_SOLAXX1_RTS "|"
  D_SENSOR_ZIGBEE_TXD "|" D_SENSOR_ZIGBEE_RXD "|"
  D_SENSOR_RDM6300_RX "|"
  D_SENSOR_IBEACON_TX "|" D_SENSOR_IBEACON_RX "|"
@@ -711,6 +711,7 @@ const uint16_t kGpioNiceList[] PROGMEM = {
 #ifdef USE_SOLAX_X1
  AGPIO(GPIO_SOLAXX1_TX), // Solax Inverter tx pin
  AGPIO(GPIO_SOLAXX1_RX), // Solax Inverter rx pin
+ AGPIO(GPIO_SOLAXX1_RTS), // Solax Inverter RTS pin
 #endif // USE_SOLAX_X1
 #ifdef USE_LE01MR
  AGPIO(GPIO_LE01MR_TX), // F7F LE-01MR energy meter tx pin

diff --git a/tasmota/tasmota_template_legacy.h b/tasmota/tasmota_template_legacy.h
@@ -190,6 +190,7 @@ enum LegacyUserSelectablePins {
  GPI8_OLED_RESET, // OLED Display Reset
  GPI8_SOLAXX1_TX, // Solax Inverter tx pin
  GPI8_SOLAXX1_RX, // Solax Inverter rx pin
+ GPI8_SOLAXX1_RTS, // Solax Inverter RTS pin
  GPI8_ZIGBEE_TX, // Zigbee Serial interface
  GPI8_ZIGBEE_RX, // Zigbee Serial interface
  GPI8_RDM6300_RX, // RDM6300 RX
@@ -420,6 +421,7 @@ const uint16_t kGpioConvert[] PROGMEM = {
  AGPIO(GPIO_OLED_RESET), // OLED Display Reset
  AGPIO(GPIO_SOLAXX1_TX), // Solax Inverter tx pin
  AGPIO(GPIO_SOLAXX1_RX), // Solax Inverter rx pin
+ AGPIO(GPIO_SOLAXX1_RTS), // Solax Inverter RTS pin
  AGPIO(GPIO_ZIGBEE_TX), // Zigbee Serial interface
  AGPIO(GPIO_ZIGBEE_RX), // Zigbee Serial interface
  AGPIO(GPIO_RDM6300_RX),