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

[Solax X1] Finetuning (#22421)

This commit is contained in:
SteWers 2024-11-03 17:33:51 +01:00 committed by GitHub
parent 5aaeecdbe8
commit 133cca3fd5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tasmota/tasmota_xnrg_energy/xnrg_12_solaxX1.ino
View File

@ -116,8 +116,7 @@ struct SOLAXX1_GLOBALDATA {
bool AddressAssigned = true; bool AddressAssigned = true;
uint8_t SendRetry_count = 20; uint8_t SendRetry_count = 20;
uint8_t QueryData_count = 0; uint8_t QueryData_count = 0;
uint8_t QueryID_count = 240; bool Command_QueryID = false;
bool Command_QueryID = false;;
bool Command_QueryConfig = false; bool Command_QueryConfig = false;
bool MeterMode = false; bool MeterMode = false;
float MeterPower = 5000; float MeterPower = 5000;
@ -450,7 +449,7 @@ void solaxX1_CyclicTask(void) { // Every 100/250 milliseconds
AddLog(LOG_LEVEL_INFO, PSTR("SX1: Inverter rated bus voltage: %s"),(char*)TempData); AddLog(LOG_LEVEL_INFO, PSTR("SX1: Inverter rated bus voltage: %s"),(char*)TempData);
solaxX1_global.Command_QueryID = false; solaxX1_global.Command_QueryID = false;
} else { } else {
AddLog(LOG_LEVEL_DEBUG, PSTR("SX1: Inverter serial number: %s"),(char*)solaxX1.SerialNumber); AddLog(LOG_LEVEL_INFO, PSTR("SX1: Inverter serial number: %s"),(char*)solaxX1.SerialNumber);
} }
DEBUG_SENSOR_LOG(PSTR("SX1: received ID data")); DEBUG_SENSOR_LOG(PSTR("SX1: received ID data"));
return; return;
@ -548,11 +547,11 @@ void solaxX1_CyclicTask(void) { // Every 100/250 milliseconds
return; return;
} }
// DEBUG_SENSOR_LOG(PSTR("SX1: solaxX1_global.AddressAssigned: %d, solaxX1_global.QueryData_count: %d, solaxX1_global.SendRetry_count: %d, solaxX1_global.QueryID_count: %d"), solaxX1_global.AddressAssigned, solaxX1_global.QueryData_count, solaxX1_global.SendRetry_count, solaxX1_global.QueryID_count); // DEBUG_SENSOR_LOG(PSTR("SX1: solaxX1_global.AddressAssigned: %d, solaxX1_global.QueryData_count: %d, solaxX1_global.SendRetry_count: %d"), solaxX1_global.AddressAssigned, solaxX1_global.QueryData_count, solaxX1_global.SendRetry_count);
if (solaxX1_global.AddressAssigned) { if (solaxX1_global.AddressAssigned) {
if (!solaxX1_global.QueryData_count) { // normal periodically query if (!solaxX1_global.QueryData_count) { // normal periodically query
solaxX1_global.QueryData_count = 5; solaxX1_global.QueryData_count = 5;
if (!solaxX1_global.QueryID_count || solaxX1_global.Command_QueryID) { // ID query if (!solaxX1.SerialNumber[0] || solaxX1_global.Command_QueryID) { // ID query
DEBUG_SENSOR_LOG(PSTR("SX1: Send ID query")); DEBUG_SENSOR_LOG(PSTR("SX1: Send ID query"));
solaxX1_QueryIDData(); solaxX1_QueryIDData();
} else if (solaxX1_global.Command_QueryConfig) { // Config query } else if (solaxX1_global.Command_QueryConfig) { // Config query
@ -562,7 +561,6 @@ void solaxX1_CyclicTask(void) { // Every 100/250 milliseconds
DEBUG_SENSOR_LOG(PSTR("SX1: Send live query")); DEBUG_SENSOR_LOG(PSTR("SX1: Send live query"));
solaxX1_QueryLiveData(); solaxX1_QueryLiveData();
} }
solaxX1_global.QueryID_count++; // query ID every 256th time
} // end normal periodically query } // end normal periodically query
solaxX1_global.QueryData_count--; solaxX1_global.QueryData_count--;
if (!solaxX1_global.SendRetry_count) { // Inverter went "off" if (!solaxX1_global.SendRetry_count) { // Inverter went "off"