Tue, 12 May 2020 16:08:30 +0200
Consistent use of group names is important.
bmsd/co2meters.c | file | annotate | diff | comparison | revisions | |
bmsd/fermenters.c | file | annotate | diff | comparison | revisions | |
bmsd/ispindels.c | file | annotate | diff | comparison | revisions | |
bmsd/nodes.c | file | annotate | diff | comparison | revisions | |
bmsd/websocket.c | file | annotate | diff | comparison | revisions |
--- a/bmsd/co2meters.c Tue May 12 15:22:28 2020 +0200 +++ b/bmsd/co2meters.c Tue May 12 16:08:30 2020 +0200 @@ -139,7 +139,7 @@ } json_object_put(jobj); - msg = xstrcpy((char *)"{\"device\":\"co2meter\",\"node\":\""); + msg = xstrcpy((char *)"{\"device\":\"co2meters\",\"node\":\""); msg = xstrcat(msg, edge_node); msg = xstrcat(msg, (char *)"\",\"unit\":\""); msg = xstrcat(msg, alias);
--- a/bmsd/fermenters.c Tue May 12 15:22:28 2020 +0200 +++ b/bmsd/fermenters.c Tue May 12 16:08:30 2020 +0200 @@ -320,7 +320,7 @@ } json_object_put(jobj); - msg = xstrcpy((char *)"{\"device\":\"fermenter\",\"node\":\""); + msg = xstrcpy((char *)"{\"device\":\"fermenters\",\"node\":\""); msg = xstrcat(msg, edge_node); msg = xstrcat(msg, (char *)"\",\"unit\":\""); msg = xstrcat(msg, alias); @@ -761,7 +761,7 @@ if (tmpp->online) { syslog(LOG_NOTICE, "Offline fermenter %s/%s", tmpp->node, tmpp->alias); tmpp->online = false; - msg = xstrcpy((char *)"{\"device\":\"fermenter\",\"node\":\""); + msg = xstrcpy((char *)"{\"device\":\"fermenters\",\"node\":\""); msg = xstrcat(msg, edge_node); msg = xstrcat(msg, (char *)"\",\"unit\":\""); msg = xstrcat(msg, alias); @@ -779,7 +779,7 @@ if (tmpp->online) { syslog(LOG_NOTICE, "Offline fermenter %s/%s", tmpp->node, tmpp->alias); tmpp->online = false; - msg = xstrcpy((char *)"{\"device\":\"fermenter\",\"node\":\""); + msg = xstrcpy((char *)"{\"device\":\"fermenters\",\"node\":\""); msg = xstrcat(msg, edge_node); msg = xstrcat(msg, (char *)"\",\"unit\":\""); msg = xstrcat(msg, tmpp->alias);
--- a/bmsd/ispindels.c Tue May 12 15:22:28 2020 +0200 +++ b/bmsd/ispindels.c Tue May 12 16:08:30 2020 +0200 @@ -122,7 +122,7 @@ } } - msg = xstrcpy((char *)"{\"device\":\"ispindel\",\"node\":\""); + msg = xstrcpy((char *)"{\"device\":\"ispindels\",\"node\":\""); msg = xstrcat(msg, node); msg = xstrcat(msg, (char *)"\",\"unit\":\""); msg = xstrcat(msg, ispindel->alias);
--- a/bmsd/nodes.c Tue May 12 15:22:28 2020 +0200 +++ b/bmsd/nodes.c Tue May 12 16:08:30 2020 +0200 @@ -318,7 +318,7 @@ syslog(LOG_NOTICE, "Timeout fermenter %s/%s", tmpf->node, tmpf->alias); tmpf->online = false; fermenter_mysql_death(tmpf->node, tmpf->alias); - msg = xstrcpy((char *)"{\"device\":\"fermenter\",\"node\":\""); + msg = xstrcpy((char *)"{\"device\":\"fermenters\",\"node\":\""); msg = xstrcat(msg, tmpf->node); msg = xstrcat(msg, (char *)"\",\"unit\":\""); msg = xstrcat(msg, tmpf->alias); @@ -337,7 +337,7 @@ syslog(LOG_NOTICE, "Timeout co2meter %s/%s", tmpc->node, tmpc->alias); tmpc->online = false; co2meter_mysql_death(tmpc->node, tmpc->alias); - msg = xstrcpy((char *)"{\"device\":\"co2meter\",\"node\":\""); + msg = xstrcpy((char *)"{\"device\":\"co2meters\",\"node\":\""); msg = xstrcat(msg, tmpc->node); msg = xstrcat(msg, (char *)"\",\"unit\":\""); msg = xstrcat(msg, tmpc->alias); @@ -356,7 +356,7 @@ syslog(LOG_NOTICE, "Timeout ispindel %s", tmpi->node); tmpi->online = false; ispindel_mysql_death(tmpi->node); - msg = xstrcpy((char *)"{\"device\":\"ispindel\",\"node\":\""); + msg = xstrcpy((char *)"{\"device\":\"ispindels\",\"node\":\""); msg = xstrcat(msg, tmpi->node); msg = xstrcat(msg, (char *)"\",\"unit\":\""); msg = xstrcat(msg, tmpi->alias);
--- a/bmsd/websocket.c Tue May 12 15:22:28 2020 +0200 +++ b/bmsd/websocket.c Tue May 12 16:08:30 2020 +0200 @@ -159,9 +159,9 @@ /* * {"node":"host","group":"group","online":1,"lastseen":"datetime","temperature":20.5,"humidity":47,"ip":"ipaddr","rssi":-1} - * {"device":"fermenter","node":"seaport","unit":"unit0","online":1,"mode":"FRIDGE","yeast_lo":12.0,"yeast_hi":24.0,"air":19.875,"beer":19.812,"chiller":1.500,"heater":100,"cooler":0,"fan":100,"light":0,"door":0,"sp_lo":17.0,"sp_hi":17.5,"alarm":0,"stage":"PRIMARY"} - * {"device":"co2meter","node":"seaport","unit":"unit0","online":1,"mode":"ON","temperature":20.875,"pressure_channel":6,"pressure_voltage":0.834,"pressure_zero":0.110,"pressure_bar":2.3,"alarm":0} - * {"device":"ispindel","node":"seaport","unit":"unit0","online":1,"mode":"ON","temperature":20.875,"angle":45.223,"battery":4.121,"gravity":14.832,"alarm":0} + * {"device":"fermenters","node":"seaport","unit":"unit0","online":1,"mode":"FRIDGE","yeast_lo":12.0,"yeast_hi":24.0,"air":19.875,"beer":19.812,"chiller":1.500,"heater":100,"cooler":0,"fan":100,"light":0,"door":0,"sp_lo":17.0,"sp_hi":17.5,"alarm":0,"stage":"PRIMARY"} + * {"device":"co2meters","node":"seaport","unit":"unit0","online":1,"mode":"ON","temperature":20.875,"pressure_channel":6,"pressure_voltage":0.834,"pressure_zero":0.110,"pressure_bar":2.3,"alarm":0} + * {"device":"ispindels","node":"seaport","unit":"unit0","online":1,"mode":"ON","temperature":20.875,"angle":45.223,"battery":4.121,"gravity":14.832,"alarm":0} */ void ws_broadcast(char *msg) {