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

Minor refactor

Browse Source
This commit is contained in:
Theo Arends 2019-10-18 12:03:01 +02:00
parent f8104cacdd
commit 531c38b231
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
sonoff/xnrg_12_solaxX1.ino
View File

@ -291,23 +291,23 @@ void solaxX1250MSecond(void) // Every Second
solaxX1_QueryLiveData(); solaxX1_QueryLiveData();
EnergyUpdateTotal(solaxX1.energy_total, true); // 484.708 kWh EnergyUpdateTotal(solaxX1.energy_total, true); // 484.708 kWh
} }
} // End data Ready } // End data Ready
if (0 == solaxX1_send_retry && 255 != solaxX1_nodata_count) { if (0 == solaxX1_send_retry && 255 != solaxX1_nodata_count) {
solaxX1_send_retry = 12; solaxX1_send_retry = 12;
solaxX1_QueryLiveData(); solaxX1_QueryLiveData();
} }
// While the inverter has not stable ambient light, will send an address adquired but go offline again, // While the inverter has not stable ambient light, will send an address adquired but go offline again,
// so no data will be received when the query is send, then we start the countdown to set the inverter as offline again. // so no data will be received when the query is send, then we start the countdown to set the inverter as offline again.
if (255 == solaxX1_nodata_count) { if (255 == solaxX1_nodata_count) {
solaxX1_nodata_count = 0; solaxX1_nodata_count = 0;
solaxX1_send_retry = 12; solaxX1_send_retry = 12;
} }
} // end hasAddress && (data_ready || solaxX1_send_retry == 0) } // end hasAddress && (data_ready || solaxX1_send_retry == 0)
else else
{ {
if ((solaxX1_nodata_count % 4) == 0) { DEBUG_SENSOR_LOG(PSTR("SX1: No Data count: %d"), solaxX1_nodata_count); } if ((solaxX1_nodata_count % 4) == 0) { DEBUG_SENSOR_LOG(PSTR("SX1: No Data count: %d"), solaxX1_nodata_count); }
if (solaxX1_nodata_count < 10 * 4) // max. seconds without data if (solaxX1_nodata_count < 10 * 4) // max. seconds without data
{ {
@ -317,7 +317,7 @@ void solaxX1250MSecond(void) // Every Second
{ {
// no data from RS485, reset values to 0 and set inverter as offline // no data from RS485, reset values to 0 and set inverter as offline
solaxX1_nodata_count = 255; solaxX1_nodata_count = 255;
solaxX1_send_retry = 12; solaxX1_send_retry = 12;
protocolStatus.status = 0b00001000; // queryOffline protocolStatus.status = 0b00001000; // queryOffline
Energy.data_valid[0] = ENERGY_WATCHDOG; Energy.data_valid[0] = ENERGY_WATCHDOG;
@ -326,7 +326,7 @@ void solaxX1250MSecond(void) // Every Second
//solaxX1.energy_today = solaxX1.energy_total = solaxX1.runtime_total = 0; //solaxX1.energy_today = solaxX1.energy_total = solaxX1.runtime_total = 0;
} }
} }
if (!protocolStatus.hasAddress && (data_ready || solaxX1_send_retry == 0)) if (!protocolStatus.hasAddress && (data_ready || solaxX1_send_retry == 0))
{ {
if (data_ready) if (data_ready)
@ -408,12 +408,11 @@ void solaxX1SnsInit(void)
AddLog_P(LOG_LEVEL_DEBUG, PSTR("SX1: Solax X1 Inverter Init")); AddLog_P(LOG_LEVEL_DEBUG, PSTR("SX1: Solax X1 Inverter Init"));
DEBUG_SENSOR_LOG(PSTR("SX1: RX pin: %d, TX pin: %d"), pin[GPIO_SOLAXX1_RX], pin[GPIO_SOLAXX1_TX]); DEBUG_SENSOR_LOG(PSTR("SX1: RX pin: %d, TX pin: %d"), pin[GPIO_SOLAXX1_RX], pin[GPIO_SOLAXX1_TX]);
protocolStatus.status = 0b00100000; // hasAddress protocolStatus.status = 0b00100000; // hasAddress
solaxX1Serial = new TasmotaSerial(pin[GPIO_SOLAXX1_RX], pin[GPIO_SOLAXX1_TX], 1); solaxX1Serial = new TasmotaSerial(pin[GPIO_SOLAXX1_RX], pin[GPIO_SOLAXX1_TX], 1);
if (solaxX1Serial->begin(SOLAXX1_SPEED)) if (solaxX1Serial->begin(SOLAXX1_SPEED)) {
{
if (solaxX1Serial->hardwareSerial()) { ClaimSerial(); } if (solaxX1Serial->hardwareSerial()) { ClaimSerial(); }
}else { } else {
energy_flg = ENERGY_NONE; energy_flg = ENERGY_NONE;
} }
} }
@ -503,26 +502,25 @@ bool Xnrg12(uint8_t function)
{ {
bool result = false; bool result = false;
switch (function) switch (function) {
{ case FUNC_EVERY_250_MSECOND:
case FUNC_EVERY_250_MSECOND: if (uptime > 4) { solaxX1250MSecond(); }
if (uptime > 4) { solaxX1250MSecond(); } break;
break; case FUNC_JSON_APPEND:
case FUNC_INIT: solaxX1Show(1);
solaxX1SnsInit(); break;
break;
case FUNC_PRE_INIT:
solaxX1DrvInit();
break;
case FUNC_JSON_APPEND:
solaxX1Show(1);
break;
#ifdef USE_WEBSERVER #ifdef USE_WEBSERVER
case FUNC_WEB_SENSOR: case FUNC_WEB_SENSOR:
solaxX1Show(0); solaxX1Show(0);
break; break;
#endif // USE_WEBSERVER #endif // USE_WEBSERVER
} case FUNC_INIT:
solaxX1SnsInit();
break;
case FUNC_PRE_INIT:
solaxX1DrvInit();
break;
}
return result; return result;
} }