volcano brightness and auto shutoff conf

include/volcano.h

@@ -55,4 +55,16 @@ enum volcano_state volcano_get_state(void);
 int8_t volcano_get_vibration(void);
 int8_t volcano_get_display_cooling(void);
 
+// returns seconds, or < 0 on error
+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
+int8_t volcano_get_brightness(void);
+
+// v in 0-10, returns < 0 on error
+int8_t volcano_set_brightness(uint8_t v);
+
 #endif // __VOLCANO_H__

src/console.c

@@ -277,6 +277,12 @@ static void cnsl_interpret(const char *line) {
         r = volcano_get_display_cooling();
         println("volcano display cooling: %d", r);
 
+        int16_t time = volcano_get_auto_shutoff();
+        println("volcano auto shutoff: %d", time);
+
+        r = volcano_get_brightness();
+        println("volcano brightness: %d", r);
+
 #ifdef TEST_VOLCANO_AUTO_CONNECT
         ble_disconnect();
 #endif // TEST_VOLCANO_AUTO_CONNECT

src/state_volcano_conf.c

@@ -35,6 +35,8 @@ static bool connected = false;
 static bool val_celsius = false;
 static bool val_vibrate = false;
 static bool val_disp_cool = false;
+static uint16_t val_auto_shutoff = 0;
+static uint8_t val_brightness = 0;
 
 void state_volcano_conf_target(bd_addr_t addr, bd_addr_type_t type) {
     debug("%s %d", bd_addr_to_str(addr), type);
@@ -75,6 +77,26 @@ static void enter_cb(int selection) {
         state_value_return(STATE_VOLCANO_CONF);
         state_switch(STATE_VALUE);
         break;
+
+    case 3:
+        // Auto Shutoff
+        state_value_set(&val_auto_shutoff,
+                        sizeof(val_auto_shutoff),
+                        0, 60 * 60, VAL_STEP_INCREMENT, 60,
+                        "Auto Shutoff");
+        state_value_return(STATE_VOLCANO_CONF);
+        state_switch(STATE_VALUE);
+        break;
+
+    case 4:
+        // Brightness
+        state_value_set(&val_brightness,
+                        sizeof(val_brightness),
+                        0, 100, VAL_STEP_INCREMENT, 10,
+                        "Brightness");
+        state_value_return(STATE_VOLCANO_CONF);
+        state_switch(STATE_VALUE);
+        break;
     }
 }
 
@@ -84,6 +106,10 @@ static void send_values(void) {
     volcano_set_vibration(val_vibrate);
     sleep_ms(150);
     volcano_set_display_cooling(val_disp_cool);
+    sleep_ms(150);
+    volcano_set_auto_shutoff(val_auto_shutoff);
+    sleep_ms(150);
+    volcano_set_brightness(val_brightness);
 }
 
 static void fetch_values(void) {
@@ -97,6 +123,10 @@ static void fetch_values(void) {
 
     r = volcano_get_display_cooling();
     val_disp_cool = (r == 1);
+
+    val_auto_shutoff = volcano_get_auto_shutoff();
+
+    val_brightness = volcano_get_brightness();
 }
 
 static void exit_cb(void) {
@@ -139,6 +169,8 @@ static void draw(struct menu_state *menu) {
     ADD_STATIC_ELEMENT("Celsius");
     ADD_STATIC_ELEMENT("Vibrate");
     ADD_STATIC_ELEMENT("Disp. Cool");
+    ADD_STATIC_ELEMENT("Auto Shutoff");
+    ADD_STATIC_ELEMENT("Brightness");
 
     if (menu->selection < 0) {
         menu->selection = 0;

src/volcano.c

@@ -30,6 +30,8 @@
 #define UUID_WRITE_SRVC   0x00
 #define UUID_CURRENT_TEMP 0x01
 #define UUID_TARGET_TEMP  0x03
+#define UUID_BRIGHTNESS   0x05
+#define UUID_SHUTOFF_TIME 0x0D
 #define UUID_HEATER_ON    0x0F
 #define UUID_HEATER_OFF   0x10
 #define UUID_PUMP_ON      0x13
@@ -305,7 +307,6 @@ int8_t volcano_set_display_cooling(bool value) {
         debug("ble_write unexpected value %d", r);
     }
     return r;
-
 }
 
 int8_t volcano_get_display_cooling(void) {
@@ -322,3 +323,61 @@ int8_t volcano_get_display_cooling(void) {
     uint32_t *v = (uint32_t *)buff;
     return (*v & MASK_PRJSTAT2_DISPLAY_ON_COOLING) ? 0 : 1;
 }
+
+int16_t volcano_get_auto_shutoff(void) {
+    uuid_base[1] = UUID_SRVC_2;
+    uuid_base[3] = UUID_SHUTOFF_TIME;
+
+    uint8_t buff[2];
+    int32_t r = ble_read(uuid_base, buff, sizeof(buff));
+    if (r != sizeof(buff)) {
+        debug("ble_read unexpected value %ld", r);
+        return -1;
+    }
+
+    uint16_t *v = (uint16_t *)buff;
+    return *v;
+
+}
+
+int8_t volcano_set_auto_shutoff(uint16_t v) {
+    uuid_base[1] = UUID_SRVC_2;
+    uuid_base2[1] = UUID_SRVC_2;
+    uuid_base[3] = UUID_WRITE_SRVC;
+    uuid_base2[3] = UUID_SHUTOFF_TIME;
+
+    int8_t r = ble_write(uuid_base, uuid_base2, (uint8_t *)&v, sizeof(v));
+    if (r != 0) {
+        debug("ble_write unexpected value %d", r);
+    }
+    return r;
+}
+
+int8_t volcano_get_brightness(void) {
+    uuid_base[1] = UUID_SRVC_2;
+    uuid_base[3] = UUID_BRIGHTNESS;
+
+    uint8_t buff[2];
+    int32_t r = ble_read(uuid_base, buff, sizeof(buff));
+    if (r != sizeof(buff)) {
+        debug("ble_read unexpected value %ld", r);
+        return -1;
+    }
+
+    uint16_t *v = (uint16_t *)buff;
+    return *v;
+}
+
+int8_t volcano_set_brightness(uint8_t val) {
+    uuid_base[1] = UUID_SRVC_2;
+    uuid_base2[1] = UUID_SRVC_2;
+    uuid_base[3] = UUID_WRITE_SRVC;
+    uuid_base2[3] = UUID_BRIGHTNESS;
+
+    uint16_t v = val;
+    int8_t r = ble_write(uuid_base, uuid_base2, (uint8_t *)&v, sizeof(v));
+    if (r != 0) {
+        debug("ble_write unexpected value %d", r);
+    }
+    return r;
+}