patrick/OpenDTU
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use same line ending in printf as in println

Browse Source 
This prevents mistakes in the webconsole
This commit is contained in:
Thomas Basler 2023-01-04 18:48:33 +01:00
parent 9d6bab3f2b
commit 7c33688167
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Hoymiles/src/inverters/InverterAbstract.cpp
View File

@ -108,12 +108,12 @@ void InverterAbstract::clearRxFragmentBuffer()
void InverterAbstract::addRxFragment(uint8_t fragment[], uint8_t len) void InverterAbstract::addRxFragment(uint8_t fragment[], uint8_t len)
{ {
if (len < 11) { if (len < 11) {
Hoymiles.getMessageOutput()->printf("FATAL: (%s, %d) fragment too short\n", __FILE__, __LINE__); Hoymiles.getMessageOutput()->printf("FATAL: (%s, %d) fragment too short\r\n", __FILE__, __LINE__);
return; return;
} }
if (len - 11 > MAX_RF_PAYLOAD_SIZE) { if (len - 11 > MAX_RF_PAYLOAD_SIZE) {
Hoymiles.getMessageOutput()->printf("FATAL: (%s, %d) fragment too large\n", __FILE__, __LINE__); Hoymiles.getMessageOutput()->printf("FATAL: (%s, %d) fragment too large\r\n", __FILE__, __LINE__);
return; return;
} }

2
lib/Hoymiles/src/parser/AlarmLogParser.cpp
View File

@ -15,7 +15,7 @@ void AlarmLogParser::clearBuffer()
void AlarmLogParser::appendFragment(uint8_t offset, uint8_t* payload, uint8_t len) void AlarmLogParser::appendFragment(uint8_t offset, uint8_t* payload, uint8_t len)
{ {
if (offset + len > ALARM_LOG_PAYLOAD_SIZE) { if (offset + len > ALARM_LOG_PAYLOAD_SIZE) {
Hoymiles.getMessageOutput()->printf("FATAL: (%s, %d) stats packet too large for buffer (%d > %d)\n", __FILE__, __LINE__, offset + len, ALARM_LOG_PAYLOAD_SIZE); Hoymiles.getMessageOutput()->printf("FATAL: (%s, %d) stats packet too large for buffer (%d > %d)\r\n", __FILE__, __LINE__, offset + len, ALARM_LOG_PAYLOAD_SIZE);
return; return;
} }
memcpy(&_payloadAlarmLog[offset], payload, len); memcpy(&_payloadAlarmLog[offset], payload, len);

4
lib/Hoymiles/src/parser/DevInfoParser.cpp
View File

@ -37,7 +37,7 @@ void DevInfoParser::clearBufferAll()
void DevInfoParser::appendFragmentAll(uint8_t offset, uint8_t* payload, uint8_t len) void DevInfoParser::appendFragmentAll(uint8_t offset, uint8_t* payload, uint8_t len)
{ {
if (offset + len > DEV_INFO_SIZE) { if (offset + len > DEV_INFO_SIZE) {
Hoymiles.getMessageOutput()->printf("FATAL: (%s, %d) dev info all packet too large for buffer\n", __FILE__, __LINE__); Hoymiles.getMessageOutput()->printf("FATAL: (%s, %d) dev info all packet too large for buffer\r\n", __FILE__, __LINE__);
return; return;
} }
memcpy(&_payloadDevInfoAll[offset], payload, len); memcpy(&_payloadDevInfoAll[offset], payload, len);
@ -53,7 +53,7 @@ void DevInfoParser::clearBufferSimple()
void DevInfoParser::appendFragmentSimple(uint8_t offset, uint8_t* payload, uint8_t len) void DevInfoParser::appendFragmentSimple(uint8_t offset, uint8_t* payload, uint8_t len)
{ {
if (offset + len > DEV_INFO_SIZE) { if (offset + len > DEV_INFO_SIZE) {
Hoymiles.getMessageOutput()->printf("FATAL: (%s, %d) dev info Simple packet too large for buffer\n", __FILE__, __LINE__); Hoymiles.getMessageOutput()->printf("FATAL: (%s, %d) dev info Simple packet too large for buffer\r\n", __FILE__, __LINE__);
return; return;
} }
memcpy(&_payloadDevInfoSimple[offset], payload, len); memcpy(&_payloadDevInfoSimple[offset], payload, len);

2
lib/Hoymiles/src/parser/StatisticsParser.cpp
View File

@ -43,7 +43,7 @@ void StatisticsParser::clearBuffer()
void StatisticsParser::appendFragment(uint8_t offset, uint8_t* payload, uint8_t len) void StatisticsParser::appendFragment(uint8_t offset, uint8_t* payload, uint8_t len)
{ {
if (offset + len > STATISTIC_PACKET_SIZE) { if (offset + len > STATISTIC_PACKET_SIZE) {
Hoymiles.getMessageOutput()->printf("FATAL: (%s, %d) stats packet too large for buffer\n", __FILE__, __LINE__); Hoymiles.getMessageOutput()->printf("FATAL: (%s, %d) stats packet too large for buffer\r\n", __FILE__, __LINE__);
return; return;
} }
memcpy(&_payloadStatistic[offset], payload, len); memcpy(&_payloadStatistic[offset], payload, len);

2
lib/Hoymiles/src/parser/SystemConfigParaParser.cpp
View File

@ -15,7 +15,7 @@ void SystemConfigParaParser::clearBuffer()
void SystemConfigParaParser::appendFragment(uint8_t offset, uint8_t* payload, uint8_t len) void SystemConfigParaParser::appendFragment(uint8_t offset, uint8_t* payload, uint8_t len)
{ {
if (offset + len > (SYSTEM_CONFIG_PARA_SIZE)) { if (offset + len > (SYSTEM_CONFIG_PARA_SIZE)) {
Hoymiles.getMessageOutput()->printf("FATAL: (%s, %d) stats packet too large for buffer\n", __FILE__, __LINE__); Hoymiles.getMessageOutput()->printf("FATAL: (%s, %d) stats packet too large for buffer\r\n", __FILE__, __LINE__);
return; return;
} }
memcpy(&_payload[offset], payload, len); memcpy(&_payload[offset], payload, len);

12
src/MqttHandleInverter.cpp
View File

@ -186,17 +186,17 @@ void MqttHandleInverterClass::onMqttMessage(const espMqttClientTypes::MessagePro
if (!strcmp(setting, TOPIC_SUB_LIMIT_PERSISTENT_RELATIVE)) { if (!strcmp(setting, TOPIC_SUB_LIMIT_PERSISTENT_RELATIVE)) {
// Set inverter limit relative persistent // Set inverter limit relative persistent
MessageOutput.printf("Limit Persistent: %d %%\n", payload_val); MessageOutput.printf("Limit Persistent: %d %%\r\n", payload_val);
inv->sendActivePowerControlRequest(Hoymiles.getRadio(), payload_val, PowerLimitControlType::RelativPersistent); inv->sendActivePowerControlRequest(Hoymiles.getRadio(), payload_val, PowerLimitControlType::RelativPersistent);
} else if (!strcmp(setting, TOPIC_SUB_LIMIT_PERSISTENT_ABSOLUTE)) { } else if (!strcmp(setting, TOPIC_SUB_LIMIT_PERSISTENT_ABSOLUTE)) {
// Set inverter limit absolute persistent // Set inverter limit absolute persistent
MessageOutput.printf("Limit Persistent: %d W\n", payload_val); MessageOutput.printf("Limit Persistent: %d W\r\n", payload_val);
inv->sendActivePowerControlRequest(Hoymiles.getRadio(), payload_val, PowerLimitControlType::AbsolutPersistent); inv->sendActivePowerControlRequest(Hoymiles.getRadio(), payload_val, PowerLimitControlType::AbsolutPersistent);
} else if (!strcmp(setting, TOPIC_SUB_LIMIT_NONPERSISTENT_RELATIVE)) { } else if (!strcmp(setting, TOPIC_SUB_LIMIT_NONPERSISTENT_RELATIVE)) {
// Set inverter limit relative non persistent // Set inverter limit relative non persistent
MessageOutput.printf("Limit Non-Persistent: %d %%\n", payload_val); MessageOutput.printf("Limit Non-Persistent: %d %%\r\n", payload_val);
if (!properties.retain) { if (!properties.retain) {
inv->sendActivePowerControlRequest(Hoymiles.getRadio(), payload_val, PowerLimitControlType::RelativNonPersistent); inv->sendActivePowerControlRequest(Hoymiles.getRadio(), payload_val, PowerLimitControlType::RelativNonPersistent);
} else { } else {
@ -205,7 +205,7 @@ void MqttHandleInverterClass::onMqttMessage(const espMqttClientTypes::MessagePro
} else if (!strcmp(setting, TOPIC_SUB_LIMIT_NONPERSISTENT_ABSOLUTE)) { } else if (!strcmp(setting, TOPIC_SUB_LIMIT_NONPERSISTENT_ABSOLUTE)) {
// Set inverter limit absolute non persistent // Set inverter limit absolute non persistent
MessageOutput.printf("Limit Non-Persistent: %d W\n", payload_val); MessageOutput.printf("Limit Non-Persistent: %d W\r\n", payload_val);
if (!properties.retain) { if (!properties.retain) {
inv->sendActivePowerControlRequest(Hoymiles.getRadio(), payload_val, PowerLimitControlType::AbsolutNonPersistent); inv->sendActivePowerControlRequest(Hoymiles.getRadio(), payload_val, PowerLimitControlType::AbsolutNonPersistent);
} else { } else {
@ -214,12 +214,12 @@ void MqttHandleInverterClass::onMqttMessage(const espMqttClientTypes::MessagePro
} else if (!strcmp(setting, TOPIC_SUB_POWER)) { } else if (!strcmp(setting, TOPIC_SUB_POWER)) {
// Turn inverter on or off // Turn inverter on or off
MessageOutput.printf("Set inverter power to: %d\n", payload_val); MessageOutput.printf("Set inverter power to: %d\r\n", payload_val);
inv->sendPowerControlRequest(Hoymiles.getRadio(), payload_val > 0); inv->sendPowerControlRequest(Hoymiles.getRadio(), payload_val > 0);
} else if (!strcmp(setting, TOPIC_SUB_RESTART)) { } else if (!strcmp(setting, TOPIC_SUB_RESTART)) {
// Restart inverter // Restart inverter
MessageOutput.printf("Restart inverter\n"); MessageOutput.printf("Restart inverter\r\n");
if (!properties.retain && payload_val == 1) { if (!properties.retain && payload_val == 1) {
inv->sendRestartControlRequest(Hoymiles.getRadio()); inv->sendRestartControlRequest(Hoymiles.getRadio());
} else { } else {

4
src/NetworkSettings.cpp
View File

@ -48,7 +48,7 @@ void NetworkSettingsClass::NetworkEvent(WiFiEvent_t event)
raiseEvent(network_event::NETWORK_CONNECTED); raiseEvent(network_event::NETWORK_CONNECTED);
break; break;
case ARDUINO_EVENT_ETH_GOT_IP: case ARDUINO_EVENT_ETH_GOT_IP:
MessageOutput.printf("ETH got IP: %s\n", ETH.localIP().toString().c_str()); MessageOutput.printf("ETH got IP: %s\r\n", ETH.localIP().toString().c_str());
if (_networkMode == network_mode::Ethernet) { if (_networkMode == network_mode::Ethernet) {
raiseEvent(network_event::NETWORK_GOT_IP); raiseEvent(network_event::NETWORK_GOT_IP);
} }
@ -76,7 +76,7 @@ void NetworkSettingsClass::NetworkEvent(WiFiEvent_t event)
} }
break; break;
case ARDUINO_EVENT_WIFI_STA_GOT_IP: case ARDUINO_EVENT_WIFI_STA_GOT_IP:
MessageOutput.printf("WiFi got ip: %s\n", WiFi.localIP().toString().c_str()); MessageOutput.printf("WiFi got ip: %s\r\n", WiFi.localIP().toString().c_str());
if (_networkMode == network_mode::WiFi) { if (_networkMode == network_mode::WiFi) {
raiseEvent(network_event::NETWORK_GOT_IP); raiseEvent(network_event::NETWORK_GOT_IP);
} }