Report a status consistent with the controls. Add ability to report failures

Author: pascal-fb-martin

houserelays.c

@@ -81,10 +81,12 @@ static const char *relays_status (const char *method, const char *uri,
     for (i = 0; i < count; ++i) {
         time_t pulsed = houserelays_gpio_deadline(i);
         const char *name = houserelays_gpio_name(i);
+        const char *status = houserelays_gpio_failure(i);
+        if (!status) status = houserelays_gpio_get(i)?"on":"off";
         const char *commanded = houserelays_gpio_commanded(i)?"on":"off";
 
         int point = echttp_json_add_object (context, container, name);
-        echttp_json_add_integer (context, point, "state", houserelays_gpio_get(i));
+        echttp_json_add_string (context, point, "state", status);
         echttp_json_add_string (context, point, "command", commanded);
         if (pulsed)
             echttp_json_add_integer (context, point, "pulse", (int)pulsed);

houserelays_gpio.c

@@ -40,6 +40,10 @@
  *    Return the name of a relay point. The point name serves as an
  *    identifier for application access.
  *
+ * const char *houserelays_gpio_failure (int point);
+ *
+ *    Return a strig describing the failure, or a null pointer if healthy.
+ *
  * const char *houserelays_gpio_description (int point);
  *
  *    Return the point's description. This is just text intended to help
@@ -169,6 +173,10 @@ const char *houserelays_gpio_description (int point) {
     return Relays[point].desc;
 }
 
+const char *houserelays_gpio_failure (int point) {
+    return 0; // A GPIO never fail, or never report it to us..
+}
+
 int houserelays_gpio_commanded (int point) {
     if (point < 0 || point > RelaysCount) return 0;
     return Relays[point].commanded;
@@ -181,7 +189,8 @@ time_t houserelays_gpio_deadline (int point) {
 
 int houserelays_gpio_get (int point) {
     if (point < 0 || point > RelaysCount) return 0;
-    return gpiod_line_get_value (Relays[point].line);
+    int state = gpiod_line_get_value (Relays[point].line);
+    return (state == Relays[point].on);
 }
 
 int houserelays_gpio_set (int point, int state, int pulse) {

houserelays_gpio.h

@@ -28,6 +28,8 @@ int houserelays_gpio_count (void);
 const char *houserelays_gpio_name (int point);
 const char *houserelays_gpio_description (int point);
 
+const char *houserelays_gpio_failure (int point);
+
 int    houserelays_gpio_commanded (int point);
 time_t houserelays_gpio_deadline  (int point);
 int    houserelays_gpio_get       (int point);

public/index.html

@@ -11,16 +11,20 @@
     for (const [key, value] of Object.entries(state)) {
         var state = document.getElementById ('state-'+key);
         var button = document.getElementById ('button-'+key);
-        if (value.state == button.controlOn) {
+        button.disabled = false;
+        if (value.state == 'on') {
             state.innerHTML = 'ON';
             button.innerHTML = 'OFF';
             button.controlState = 'off';
-        } else {
+        } else if (value.state == 'off') {
             state.innerHTML = 'OFF';
             button.innerHTML = 'ON';
             button.controlState = 'on';
+        } else {
+            state.innerHTML = value.state;
+            button.innerHTML = 'ON';
+            button.disabled = true;
         }
-        button.disabled = false;
     }
 }