mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rework for PR #14305 

- removed all changes in tasmota_template_legacy.h
- moved new GPIO at the end of the list in  tasmota_template.h
- removed unnecessary "flush" in xnrg_12_solaxX1.ino
This commit is contained in:
SteWers 2022-01-06 19:11:44 +01:00
parent 34112c833a
commit d88110e686
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tasmota/tasmota_template.h
View File

@ -74,7 +74,7 @@ enum UserSelectablePins {
GPIO_SSPI_MAX31865_CS1, // MAX31865 Chip Select GPIO_SSPI_MAX31865_CS1, // MAX31865 Chip Select
GPIO_HRE_CLOCK, GPIO_HRE_DATA, // HR-E Water Meter GPIO_HRE_CLOCK, GPIO_HRE_DATA, // HR-E Water Meter
GPIO_ADE7953_IRQ, // ADE7953 IRQ GPIO_ADE7953_IRQ, // ADE7953 IRQ
GPIO_SOLAXX1_TX, GPIO_SOLAXX1_RX, GPIO_SOLAXX1_RTS, // Solax Inverter Serial interface GPIO_SOLAXX1_TX, GPIO_SOLAXX1_RX, // Solax Inverter Serial interface
GPIO_ZIGBEE_TX, GPIO_ZIGBEE_RX, // Zigbee Serial interface GPIO_ZIGBEE_TX, GPIO_ZIGBEE_RX, // Zigbee Serial interface
GPIO_RDM6300_RX, // RDM6300 RX GPIO_RDM6300_RX, // RDM6300 RX
GPIO_IBEACON_TX, GPIO_IBEACON_RX, // HM17 IBEACON Serial interface GPIO_IBEACON_TX, GPIO_IBEACON_RX, // HM17 IBEACON Serial interface
@ -177,6 +177,7 @@ enum UserSelectablePins {
GPIO_HM330X_SET, // HM330X SET pin (sleep when low) GPIO_HM330X_SET, // HM330X SET pin (sleep when low)
GPIO_HEARTBEAT, GPIO_HEARTBEAT_INV, GPIO_HEARTBEAT, GPIO_HEARTBEAT_INV,
GPIO_SHIFT595_SRCLK, GPIO_SHIFT595_RCLK, GPIO_SHIFT595_OE, GPIO_SHIFT595_SER, // 74x595 Shift register GPIO_SHIFT595_SRCLK, GPIO_SHIFT595_RCLK, GPIO_SHIFT595_OE, GPIO_SHIFT595_SER, // 74x595 Shift register
GPIO_SOLAXX1_RTS, // Solax Inverter Serial interface
GPIO_SENSOR_END }; GPIO_SENSOR_END };
enum ProgramSelectablePins { enum ProgramSelectablePins {
@ -275,7 +276,7 @@ const char kSensorNames[] PROGMEM =
D_SENSOR_MAX31865_CS "|" D_SENSOR_MAX31865_CS "|"
D_SENSOR_HRE_CLOCK "|" D_SENSOR_HRE_DATA "|" D_SENSOR_HRE_CLOCK "|" D_SENSOR_HRE_DATA "|"
D_SENSOR_ADE7953_IRQ "|" D_SENSOR_ADE7953_IRQ "|"
D_SENSOR_SOLAXX1_TX "|" D_SENSOR_SOLAXX1_RX "|" D_SENSOR_SOLAXX1_RTS "|" D_SENSOR_SOLAXX1_TX "|" D_SENSOR_SOLAXX1_RX "|"
D_SENSOR_ZIGBEE_TXD "|" D_SENSOR_ZIGBEE_RXD "|" D_SENSOR_ZIGBEE_TXD "|" D_SENSOR_ZIGBEE_RXD "|"
D_SENSOR_RDM6300_RX "|" D_SENSOR_RDM6300_RX "|"
D_SENSOR_IBEACON_TX "|" D_SENSOR_IBEACON_RX "|" D_SENSOR_IBEACON_TX "|" D_SENSOR_IBEACON_RX "|"
@ -373,8 +374,8 @@ const char kSensorNames[] PROGMEM =
D_SENSOR_BL0942_RX "|" D_SENSOR_BL0942_RX "|"
D_SENSOR_HM330X_SET "|" D_SENSOR_HM330X_SET "|"
D_SENSOR_HEARTBEAT "|" D_SENSOR_HEARTBEAT "_i|" D_SENSOR_HEARTBEAT "|" D_SENSOR_HEARTBEAT "_i|"
D_GPIO_SHIFT595_SRCLK "|" D_GPIO_SHIFT595_RCLK "|" D_GPIO_SHIFT595_OE "|" D_GPIO_SHIFT595_SER "|" D_GPIO_SHIFT595_SRCLK "|" D_GPIO_SHIFT595_RCLK "|" D_GPIO_SHIFT595_OE "|" D_GPIO_SHIFT595_SER "|"
D_SENSOR_SOLAXX1_RTS "|"
; ;
const char kSensorNamesFixed[] PROGMEM = const char kSensorNamesFixed[] PROGMEM =

2
tasmota/tasmota_template_legacy.h
View File

@ -190,7 +190,6 @@ enum LegacyUserSelectablePins {
GPI8_OLED_RESET, // OLED Display Reset GPI8_OLED_RESET, // OLED Display Reset
GPI8_SOLAXX1_TX, // Solax Inverter tx pin GPI8_SOLAXX1_TX, // Solax Inverter tx pin
GPI8_SOLAXX1_RX, // Solax Inverter rx pin GPI8_SOLAXX1_RX, // Solax Inverter rx pin
GPI8_SOLAXX1_RTS, // Solax Inverter RTS pin
GPI8_ZIGBEE_TX, // Zigbee Serial interface GPI8_ZIGBEE_TX, // Zigbee Serial interface
GPI8_ZIGBEE_RX, // Zigbee Serial interface GPI8_ZIGBEE_RX, // Zigbee Serial interface
GPI8_RDM6300_RX, // RDM6300 RX GPI8_RDM6300_RX, // RDM6300 RX
@ -421,7 +420,6 @@ const uint16_t kGpioConvert[] PROGMEM = {
AGPIO(GPIO_OLED_RESET), // OLED Display Reset AGPIO(GPIO_OLED_RESET), // OLED Display Reset
AGPIO(GPIO_SOLAXX1_TX), // Solax Inverter tx pin AGPIO(GPIO_SOLAXX1_TX), // Solax Inverter tx pin
AGPIO(GPIO_SOLAXX1_RX), // Solax Inverter rx 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_TX), // Zigbee Serial interface
AGPIO(GPIO_ZIGBEE_RX), // Zigbee Serial interface AGPIO(GPIO_ZIGBEE_RX), // Zigbee Serial interface
AGPIO(GPIO_RDM6300_RX), AGPIO(GPIO_RDM6300_RX),

1
tasmota/xnrg_12_solaxX1.ino
View File

@ -162,7 +162,6 @@ void solaxX1_RS485Send(uint16_t msgLen)
solaxX1Serial->write(message, msgLen); solaxX1Serial->write(message, msgLen);
solaxX1Serial->write(highByte(crc)); solaxX1Serial->write(highByte(crc));
solaxX1Serial->write(lowByte(crc)); solaxX1Serial->write(lowByte(crc));
solaxX1Serial->flush();
if (PinUsed(GPIO_SOLAXX1_RTS)) { if (PinUsed(GPIO_SOLAXX1_RTS)) {
digitalWrite(Pin(GPIO_SOLAXX1_RTS), LOW); digitalWrite(Pin(GPIO_SOLAXX1_RTS), LOW);
} }