jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-28 05:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert CSE7766 8N1 support - not needed

Browse Source
This commit is contained in:
Theo Arends 2023-01-10 09:48:49 +01:00
parent b0094a0ddf
commit f9177dfa3a
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasmota/include/tasmota_template.h
View File

@ -204,7 +204,7 @@ enum UserSelectablePins {
GPIO_LD2410_TX, GPIO_LD2410_RX, // HLK-LD2410 GPIO_LD2410_TX, GPIO_LD2410_RX, // HLK-LD2410
GPIO_MBR_TX_ENA, GPIO_NRG_MBS_TX_ENA, // Modbus Bridge Serial Transmit Enable GPIO_MBR_TX_ENA, GPIO_NRG_MBS_TX_ENA, // Modbus Bridge Serial Transmit Enable
GPIO_ME007_TRIG, GPIO_ME007_RX, // ME007 Serial/Trigger interface GPIO_ME007_TRIG, GPIO_ME007_RX, // ME007 Serial/Trigger interface
GPIO_TUYAMCUBR_TX, GPIO_TUYAMCUBR_RX, // TuyaMCU Bridge GPIO_TUYAMCUBR_TX, GPIO_TUYAMCUBR_RX, // TuyaMCU Bridge
GPIO_SENSOR_END }; GPIO_SENSOR_END };
// Error as warning to rethink GPIO usage with max 2045 // Error as warning to rethink GPIO usage with max 2045
@ -825,7 +825,7 @@ const uint16_t kGpioNiceList[] PROGMEM = {
#endif #endif
#ifdef USE_CSE7766 #ifdef USE_CSE7766
AGPIO(GPIO_CSE7766_TX), // CSE7766 Serial interface (S31 and Pow R2) AGPIO(GPIO_CSE7766_TX), // CSE7766 Serial interface (S31 and Pow R2)
AGPIO(GPIO_CSE7766_RX) + 2, // CSE7766 Serial interface (S31 and Pow R2) (1 = RX1 (8E1), 2 = RX2 (8N1)) AGPIO(GPIO_CSE7766_RX), // CSE7766 Serial interface (S31 and Pow R2)
#endif #endif
#ifdef USE_MCP39F501 #ifdef USE_MCP39F501
AGPIO(GPIO_MCP39F5_TX), // MCP39F501 Serial interface (Shelly2) AGPIO(GPIO_MCP39F5_TX), // MCP39F501 Serial interface (Shelly2)

22
tasmota/tasmota_xnrg_energy/xnrg_02_cse7766.ino
View File

@ -225,23 +225,13 @@ void CseEverySecond(void) {
void CseSnsInit(void) { void CseSnsInit(void) {
// Software serial init needs to be done here as earlier (serial) interrupts may lead to Exceptions // Software serial init needs to be done here as earlier (serial) interrupts may lead to Exceptions
uint32_t pin_rx = Pin(GPIO_CSE7766_RX, GPIO_ANY); // CseSerial = new TasmotaSerial(Pin(GPIO_CSE7766_RX), Pin(GPIO_CSE7766_TX), 1);
// CseSerial = new TasmotaSerial(pin_rx, Pin(GPIO_CSE7766_TX), 1); CseSerial = new TasmotaSerial(Pin(GPIO_CSE7766_RX), -1, 1);
CseSerial = new TasmotaSerial(pin_rx, -1, 1); if (CseSerial->begin(4800, SERIAL_8E1)) {
// 0 (1 = RX1 (8E1)), 1 (2 = RX2 (8N1))
uint32_t option = GetPin(pin_rx) - AGPIO(GPIO_CSE7766_RX);
uint32_t config = (1 == option) ? SERIAL_8N1 : SERIAL_8E1;
if (CseSerial->begin(4800, config)) {
config = (1 == option) ? TS_SERIAL_8N1 : TS_SERIAL_8E1;
if (CseSerial->hardwareSerial()) { if (CseSerial->hardwareSerial()) {
SetSerial(4800, config); SetSerial(4800, TS_SERIAL_8E1);
ClaimSerial(); ClaimSerial();
} }
#ifdef ESP32
AddLog(LOG_LEVEL_DEBUG, PSTR("NRG: Serial UART%d set to %s 4800 bit/s"), CseSerial->getUart(), GetSerialConfig(config).c_str());
#endif
if (0 == Settings->param[P_CSE7766_INVALID_POWER]) { if (0 == Settings->param[P_CSE7766_INVALID_POWER]) {
Settings->param[P_CSE7766_INVALID_POWER] = CSE_MAX_INVALID_POWER; // SetOption39 1..255 Settings->param[P_CSE7766_INVALID_POWER] = CSE_MAX_INVALID_POWER; // SetOption39 1..255
} }
@ -253,8 +243,8 @@ void CseSnsInit(void) {
} }
void CseDrvInit(void) { void CseDrvInit(void) {
// if (PinUsed(GPIO_CSE7766_RX, GPIO_ANY) && PinUsed(GPIO_CSE7766_TX)) { // if (PinUsed(GPIO_CSE7766_RX) && PinUsed(GPIO_CSE7766_TX)) {
if (PinUsed(GPIO_CSE7766_RX, GPIO_ANY)) { if (PinUsed(GPIO_CSE7766_RX)) {
Cse.rx_buffer = (uint8_t*)(malloc(CSE_BUFFER_SIZE)); Cse.rx_buffer = (uint8_t*)(malloc(CSE_BUFFER_SIZE));
if (Cse.rx_buffer != nullptr) { if (Cse.rx_buffer != nullptr) {
TasmotaGlobal.energy_driver = XNRG_02; TasmotaGlobal.energy_driver = XNRG_02;