pull/276/head
sfeakes 2024-04-15 17:32:08 -05:00
parent 25e3e80f5a
commit 17b3f853a5
7 changed files with 12 additions and 4 deletions

View File

@ -1570,7 +1570,8 @@ void main_loop()
if (rs_fd == -1) {
LOG(AQUA_LOG,LOG_ERR, "Error Aqualink setting serial port: %s\n", _aqconfig_.serial_port);
exit(EXIT_FAILURE);
if (!_aqconfig_.ignore_tty_err)
exit(EXIT_FAILURE);
}
LOG(AQUA_LOG,LOG_NOTICE, "Listening to Aqualink RS8 on serial port: %s\n", _aqconfig_.serial_port);
@ -1650,6 +1651,9 @@ void main_loop()
{
if (blank_read == blank_read_reconnect) {
LOG(AQUA_LOG,LOG_ERR, "Nothing read on '%s', are you sure that's right?\n",_aqconfig_.serial_port);
// Reset blank reads here if we want to ignore TTY errors.
if (_aqconfig_.ignore_tty_err)
blank_read = 1;
} else if (blank_read == blank_read_reconnect*2) {
LOG(AQUA_LOG,LOG_ERR, "I'm done, exiting, please check '%s'\n",_aqconfig_.serial_port);
stopPacketLogger();

View File

@ -54,7 +54,7 @@ struct aqconfig
char *mqtt_server;
char *mqtt_user;
char *mqtt_passwd;
char mqtt_ID[MQTT_ID_LEN];
char mqtt_ID[MQTT_ID_LEN+1];
int dzidx_air_temp;
int dzidx_pool_water_temp;
int dzidx_spa_water_temp;

View File

@ -159,7 +159,10 @@ sd_journal *open_journal() {
sd_journal *journal;
char filter[51];
if (sd_journal_open(&journal, SD_JOURNAL_LOCAL_ONLY) < 0)
// Below works for local
//if (sd_journal_open(&journal, SD_JOURNAL_LOCAL_ONLY) < 0)
// Desting Docker install
if (sd_journal_open(&journal, SD_JOURNAL_ALL_NAMESPACES) < 0)
{
LOGSystemError(errno, NET_LOG, "Failed to open journal");
return journal;

View File

@ -865,7 +865,7 @@ bool set_PDA_numeric_field_value(struct aqualinkdata *aq_data, int val, int cur_
char *hghlight_chars;
int hlight_length=0;
int i=0;
//hghlight_chars = pda_m_hlightchars(&hlight_length);
hghlight_chars = pda_m_hlightchars(&hlight_length); // NSF May need to take this out and there for the LOG entry after while
while (hlight_length >= 15 || hlight_length <= 0) {
delay(500);
waitForPDANextMessageType(aq_data,CMD_PDA_HIGHLIGHTCHARS,5);

Binary file not shown.

Binary file not shown.

View File

@ -485,6 +485,7 @@
*/
if (data['deamonized'] == 'off') {
console.log("deamonized=" + data['deamonized'] + " Need to rename Restart to Reload");
//disablebutton("restart");
}
/*