added state counters and handled desired input

Author: ChrisGammell

src/app_state.c

@@ -14,10 +14,15 @@ LOG_MODULE_REGISTER(app_state, LOG_LEVEL_DBG);
 #include "app_state.h"
 #include "app_work.h"
 
-#define DEVICE_STATE_FMT "{\"example_int0\":%d,\"example_int1\":%d}"
+#define DEVICE_STATE_FMT "{\"counter_up\":%d,\"counter_down\":%d}"
+#define BUTTON_STATE_FMT "{\"last_press\":%d,\"this_press\":%d}"
+#define MAX_COUNT 10000
+#define MIN_COUNT 0
 
-uint32_t _example_int0;
-uint32_t _example_int1 = 1;
+uint32_t _counter_up = MIN_COUNT;
+uint32_t _counter_down = MAX_COUNT - 1;
+
+uint32_t _last_button_press_time=0;
 
 static struct golioth_client *client;
 
@@ -30,7 +35,7 @@ static int async_handler(struct golioth_req_rsp *rsp)
 		return rsp->err;
 	}
 
-	LOG_DBG("State successfully set");
+	//LOG_DBG("State successfully set");
 
 	return 0;
 }
@@ -41,6 +46,20 @@ void app_state_init(struct golioth_client *state_client)
 	k_sem_give(&update_actual);
 }
 
+
+void state_counter_change(void)
+{
+	if (_counter_down > MIN_COUNT)
+	{
+		_counter_down--;
+	}
+	if (_counter_up < MAX_COUNT)
+	{
+		_counter_up++;
+	}
+	app_state_update_actual();
+}
+
 static void reset_desired_state(void)
 {
 	LOG_INF("Resetting \"%s\" LightDB State endpoint to defaults.",
@@ -66,7 +85,7 @@ void app_state_update_actual(void)
 
 	char sbuf[strlen(DEVICE_STATE_FMT)+8]; /* small bit of extra space */
 
-	snprintk(sbuf, sizeof(sbuf), DEVICE_STATE_FMT, _example_int0, _example_int1);
+	snprintk(sbuf, sizeof(sbuf), DEVICE_STATE_FMT, _counter_up, _counter_down);
 
 	int err;
 
@@ -104,30 +123,30 @@ int app_state_desired_handler(struct golioth_req_rsp *rsp)
 	uint8_t state_change_count = 0;
 
 	if (ret & 1<<0) {
-		/* Process example_int0 */
-		if ((parsed_state.example_int0 >= 0) && (parsed_state.example_int0 < 10000)) {
-			LOG_DBG("Validated desired example_int0 value: %d", parsed_state.example_int0);
-			_example_int0 = parsed_state.example_int0;
+		/* Process counter_up */
+		if ((parsed_state.counter_up >= MIN_COUNT) && (parsed_state.counter_up < MAX_COUNT)) {
+			LOG_DBG("Validated desired counter_up value: %d", parsed_state.counter_up);
+			_counter_up = parsed_state.counter_up;
 			++desired_processed_count;
 			++state_change_count;
-		} else if (parsed_state.example_int0 == -1) {
-			LOG_DBG("No change requested for example_int0");
+		} else if (parsed_state.counter_up == -1) {
+			LOG_DBG("No change requested for counter_up");
 		} else {
-			LOG_ERR("Invalid desired example_int0 value: %d", parsed_state.example_int0);
+			LOG_ERR("Invalid desired counter_up value: %d", parsed_state.counter_up);
 			++desired_processed_count;
 		}
 	}
 	if (ret & 1<<1) {
-		/* Process example_int1 */
-		if ((parsed_state.example_int1 >= 0) && (parsed_state.example_int1 < 10000)) {
-			LOG_DBG("Validated desired example_int1 value: %d", parsed_state.example_int1);
-			_example_int1 = parsed_state.example_int1;
+		/* Process counter_down */
+		if ((parsed_state.counter_down >= MIN_COUNT) && (parsed_state.counter_down < MAX_COUNT)) {
+			LOG_DBG("Validated desired counter_down value: %d", parsed_state.counter_down);
+			_counter_down = parsed_state.counter_down;
 			++desired_processed_count;
 			++state_change_count;
-		} else if (parsed_state.example_int1 == -1) {
-			LOG_DBG("No change requested for example_int1");
+		} else if (parsed_state.counter_down == -1) {
+			LOG_DBG("No change requested for counter_down");
 		} else {
-			LOG_ERR("Invalid desired example_int1 value: %d", parsed_state.example_int1);
+			LOG_ERR("Invalid desired counter_down value: %d", parsed_state.counter_down);
 			++desired_processed_count;
 		}
 	}
@@ -160,5 +179,4 @@ void app_state_observe(void)
 	if (k_sem_take(&update_actual, K_NO_WAIT) == 0) {
 		app_state_update_actual();
 	}
-}
-
+}

src/app_state.h

@@ -11,9 +11,12 @@
 
 #define APP_STATE_DESIRED_ENDP "desired"
 #define APP_STATE_ACTUAL_ENDP  "state"
+#define APP_STATE_BUTTON_ENDP  "button"
 
 void app_state_init(struct golioth_client *state_client);
 void app_state_observe(void);
 void app_state_update_actual(void);
 
+void state_counter_change(void);
+
 #endif /* __APP_STATE_H__ */

src/json_helper.h

@@ -4,13 +4,13 @@
 #include <zephyr/data/json.h>
 
 struct app_state {
-    int32_t example_int0;
-    int32_t example_int1;
+    int32_t counter_up;
+    int32_t counter_down;
 };
 
 static const struct json_obj_descr app_state_descr[] = {
-    JSON_OBJ_DESCR_PRIM(struct app_state, example_int0, JSON_TOK_NUMBER),
-    JSON_OBJ_DESCR_PRIM(struct app_state, example_int1, JSON_TOK_NUMBER)
+    JSON_OBJ_DESCR_PRIM(struct app_state, counter_up, JSON_TOK_NUMBER),
+    JSON_OBJ_DESCR_PRIM(struct app_state, counter_down, JSON_TOK_NUMBER)
 };
 
 #endif

src/main.c

@@ -98,7 +98,9 @@ static void lte_handler(const struct lte_lc_evt *const evt)
 void button_pressed(const struct device *dev, struct gpio_callback *cb,
 					uint32_t pins)
 {
-	LOG_DBG("Button pressed at %d", k_cycle_get_32());
+	uint32_t button_kernel_time = k_cycle_get_32();
+	LOG_DBG("Button pressed at %d", button_kernel_time);
+
 	play_beep_once();
 	k_wakeup(_system_thread);
 }
@@ -205,6 +207,7 @@ void main(void)
 		}
 
 		app_work_sensor_read();
+		state_counter_change();
 
 		k_sleep(K_SECONDS(get_loop_delay_s()));