show volcano version and runtime

include/menu.h

@@ -45,17 +45,19 @@ void menu_run(void (*cb)(struct menu_state *), bool centered);
 
 extern bool menu_got_input;
 
-#define ADD_STATIC_ELEMENT(name) {\
-    menu->length += 1; \
-    if (((menu->length - 1) >= menu->off) \
-        && ((menu->length - 1 - menu->off) < menu->lines)) { \
-        if ((menu->length - 1) == menu->selection) { \
+#define ADD_STATIC_ELEMENT(format, ...) {                                \
+    menu->length += 1;                                                   \
+    if (((menu->length - 1) >= menu->off)                                \
+        && ((menu->length - 1 - menu->off) < menu->lines)) {             \
+        if ((menu->length - 1) == menu->selection) {                     \
             pos += snprintf(menu->buff + pos, MENU_MAX_LEN - pos, "> "); \
-        } else { \
+        } else {                                                         \
             pos += snprintf(menu->buff + pos, MENU_MAX_LEN - pos, "  "); \
-        } \
-        pos += snprintf(menu->buff + pos, MENU_MAX_LEN - pos, name "\n"); \
-    } \
+        }                                                                \
+        pos += snprintf(menu->buff + pos, MENU_MAX_LEN - pos,            \
+                        format __VA_OPT__(,) __VA_ARGS__);               \
+        pos += snprintf(menu->buff + pos, MENU_MAX_LEN - pos, "\n");     \
+    }                                                                    \
 }
 
 #endif // __MENU_H__

include/volcano.h

@@ -24,6 +24,8 @@
 
 #include "models.h"
 
+#define VOLCANO_FW_LEN 12
+
 enum volcano_state {
     VOLCANO_STATE_NONE = 0,
     VOLCANO_STATE_HEATER = (1 << 0),
@@ -61,10 +63,16 @@ int16_t volcano_get_auto_shutoff(void);
 // v in seconds, returns < 0 on error
 int8_t volcano_set_auto_shutoff(uint16_t v);
 
-// returns 0-10, or < 0 on error
+// returns 0 - 100, or < 0 on error
 int8_t volcano_get_brightness(void);
 
-// v in 0-10, returns < 0 on error
+// v in 0 - 100, returns < 0 on error
 int8_t volcano_set_brightness(uint8_t v);
 
+// val is filled with VOLCANO_FW_LEN bytes, returns < 0 on error
+int8_t volcano_get_firmware(char *val);
+
+// returns minutes, or < 0 on error
+int32_t volcano_get_runtime(void);
+
 #endif // __VOLCANO_H__

src/console.c

@@ -283,6 +283,13 @@ static void cnsl_interpret(const char *line) {
         r = volcano_get_brightness();
         println("volcano brightness: %d", r);
 
+        char fw[VOLCANO_FW_LEN + 1] = {0};
+        r = volcano_get_firmware(fw);
+        println("volcano firmware: %s", fw);
+
+        int32_t rt = volcano_get_runtime();
+        println("volcano runtime: %ld min", rt);
+
 #ifdef TEST_VOLCANO_AUTO_CONNECT
         ble_disconnect();
 #endif // TEST_VOLCANO_AUTO_CONNECT

src/state_volcano_conf.c

@@ -37,6 +37,8 @@ static bool val_vibrate = false;
 static bool val_disp_cool = false;
 static uint16_t val_auto_shutoff = 0;
 static uint8_t val_brightness = 0;
+static char val_fw[VOLCANO_FW_LEN] = {0};
+static int32_t val_rt = 0;
 
 void state_volcano_conf_target(bd_addr_t addr, bd_addr_type_t type) {
     debug("%s %d", bd_addr_to_str(addr), type);
@@ -125,8 +127,9 @@ static void fetch_values(void) {
     val_disp_cool = (r == 1);
 
     val_auto_shutoff = volcano_get_auto_shutoff();
-
     val_brightness = volcano_get_brightness();
+    volcano_get_firmware(val_fw);
+    val_rt = volcano_get_runtime();
 }
 
 static void exit_cb(void) {
@@ -171,6 +174,8 @@ static void draw(struct menu_state *menu) {
     ADD_STATIC_ELEMENT("Disp. Cool");
     ADD_STATIC_ELEMENT("Auto Shutoff");
     ADD_STATIC_ELEMENT("Brightness");
+    ADD_STATIC_ELEMENT("FW: %s", val_fw);
+    ADD_STATIC_ELEMENT("RT: %.1f h", val_rt / 60.0f);
 
     if (menu->selection < 0) {
         menu->selection = 0;

src/volcano.c

@@ -22,6 +22,7 @@
 #include "volcano.h"
 
 #define UUID_SRVC_1       0x10
+#define UUID_FIRMWARE     0x03
 #define UUID_PRJSTAT1     0x0C
 #define UUID_PRJSTAT2     0x0D
 #define UUID_PRJSTAT3     0x0E
@@ -36,6 +37,8 @@
 #define UUID_HEATER_OFF   0x10
 #define UUID_PUMP_ON      0x13
 #define UUID_PUMP_OFF     0x14
+#define UUID_HEAT_HOURS   0x15
+#define UUID_HEAT_MINUTES 0x16
 
 #define MASK_PRJSTAT1_HEIZUNG_ENA        0x0020
 #define MASK_PRJSTAT1_AUTOBLESHUTDOWN    0x0200
@@ -381,3 +384,49 @@ int8_t volcano_set_brightness(uint8_t val) {
     }
     return r;
 }
+
+int8_t volcano_get_firmware(char *val) {
+    if (val == NULL) {
+        return -1;
+    }
+
+    uuid_base[1] = UUID_SRVC_1;
+    uuid_base[3] = UUID_FIRMWARE;
+
+    uint8_t buff[VOLCANO_FW_LEN];
+    int32_t r = ble_read(uuid_base, buff, sizeof(buff));
+    if (r != sizeof(buff)) {
+        debug("ble_read unexpected value %ld", r);
+        return -1;
+    }
+
+    memcpy(val, buff, sizeof(buff));
+    return 0;
+}
+
+int32_t volcano_get_runtime(void) {
+    int32_t val = 0;
+
+    uuid_base[1] = UUID_SRVC_2;
+    uuid_base[3] = UUID_HEAT_HOURS;
+
+    uint32_t buff;
+    int32_t r = ble_read(uuid_base, (uint8_t *)&buff, sizeof(buff));
+    if (r != sizeof(buff)) {
+        debug("ble_read 1 unexpected value %ld", r);
+        return -1;
+    }
+
+    val = buff * 60;
+    uuid_base[3] = UUID_HEAT_MINUTES;
+
+    uint16_t buff2;
+    r = ble_read(uuid_base, (uint8_t *)&buff2, sizeof(buff2));
+    if (r != sizeof(buff2)) {
+        debug("ble_read 2 unexpected value %ld", r);
+        return -1;
+    }
+
+    val += buff2;
+    return val;
+}