move esb to thread and do not reboot on actions

Author: sctanf

prj.conf

@@ -84,7 +84,7 @@ CONFIG_CRYPTO=n
 
 CONFIG_THREAD_NAME=y
 #CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=256
-#CONFIG_MAIN_STACK_SIZE=512
+CONFIG_MAIN_STACK_SIZE=512
 
 #CONFIG_HEAP_MEM_POOL_SIZE=2048
 CONFIG_ISR_STACK_SIZE=1024

src/connection/esb.c

@@ -47,6 +47,9 @@ LOG_MODULE_REGISTER(esb_event, LOG_LEVEL_INF);
 static void esb_packet_filter_thread(void);
 K_THREAD_DEFINE(esb_packet_filter_thread_id, 256, esb_packet_filter_thread, NULL, NULL, NULL, 6, 0, 0);
 
+static void esb_thread(void);
+K_THREAD_DEFINE(esb_thread_id, 512, esb_thread, NULL, NULL, NULL, 6, 0, 0);
+
 void event_handler(struct esb_evt const *event)
 {
 	switch (event->evt_id)
@@ -206,6 +209,13 @@ int esb_initialize(bool tx)
 	return 0;
 }
 
+static void esb_deinitialize(void)
+{
+	if (esb_initialized)
+		esb_disable();
+	esb_initialized = false;
+}
+
 inline void esb_set_addr_discovery(void)
 {
 	memcpy(base_addr_0, discovery_base_addr_0, sizeof(base_addr_0));
@@ -237,6 +247,7 @@ inline void esb_set_addr_paired(void)
 	memcpy(addr_prefix, addr_buffer + 8, sizeof(addr_prefix));
 }
 
+static bool esb_pairing = false;
 static bool esb_paired = false;
 
 void esb_pair(void)
@@ -250,7 +261,8 @@ void esb_pair(void)
 	memcpy(&tx_payload_pair.data[2], addr, 6);
 	LOG_INF("Device address: %012llX", *addr & 0xFFFFFFFFFFFF);
 	set_led(SYS_LED_PATTERN_SHORT, SYS_LED_PRIORITY_CONNECTION);
-	while (true) // Run indefinitely (User must reset/unplug dongle)
+	esb_pairing = true;
+	while (esb_pairing)
 	{
 		uint64_t found_addr = (*(uint64_t *)pairing_buf >> 16) & 0xFFFFFFFFFFFF;
 		uint16_t send_tracker_id = stored_trackers; // Use new tracker id
@@ -284,6 +296,28 @@ void esb_pair(void)
 		//esb_write_payload(&tx_payload_pair); // Add to TX buffer
 		k_msleep(10);
 	}
+	set_led(SYS_LED_PATTERN_OFF, SYS_LED_PRIORITY_CONNECTION);
+	esb_disable();
+	esb_receive();
+}
+
+void esb_reset_pair(void)
+{
+	esb_deinitialize(); // make sure esb is off
+	esb_paired = false;
+}
+
+void esb_finish_pair(void)
+{
+	esb_pairing = false;
+}
+
+void esb_clear(void)
+{
+	stored_trackers = 0;
+	sys_write(STORED_TRACKERS, NULL, &stored_trackers, sizeof(stored_trackers));
+	LOG_INF("NVS Reset");
+	esb_reset_pair();
 }
 
 // TODO:
@@ -307,11 +341,41 @@ void esb_receive(void)
 static void esb_packet_filter_thread(void)
 {
 	memset(discovered_trackers, 0, sizeof(discovered_trackers));
-	while (true) // reset count if its not above threshold
+	while (1) // reset count if its not above threshold
 	{
 		k_msleep(1000);
 		for (int i = 0; i < 256; i++)
 			if (discovered_trackers[i] < DETECTION_THRESHOLD)
 				discovered_trackers[i] = 0;
 	}
 }
+
+static void esb_thread(void)
+{
+	clocks_start();
+
+	sys_read(STORED_TRACKERS, &stored_trackers, sizeof(stored_trackers));
+	if (stored_trackers)
+		esb_paired = true;
+	for (int i = 0; i < stored_trackers; i++)
+		sys_read(STORED_ADDR_0+i, &stored_tracker_addr[i], sizeof(stored_tracker_addr[0]));
+	LOG_INF("%d/%d devices stored", stored_trackers, MAX_TRACKERS);
+
+	if (esb_paired)
+	{
+		esb_receive();
+		esb_initialize(false);
+		esb_start_rx();
+	}
+
+	while (1)
+	{
+		if (!esb_paired)
+		{
+			esb_pair();
+			esb_initialize(false);
+			esb_start_rx();
+		}
+		k_msleep(100);
+	}
+}

src/connection/esb.h

@@ -33,6 +33,9 @@ void esb_set_addr_discovery(void);
 void esb_set_addr_paired(void);
 
 void esb_pair(void);
+void esb_reset_pair(void);
+void esb_finish_pair(void);
+void esb_clear(void);
 void esb_write_sync(uint16_t led_clock);
 void esb_receive(void);
 

src/console.c

@@ -31,6 +31,7 @@
 #include <zephyr/console/console.h>
 #include <zephyr/sys/reboot.h>
 #include <zephyr/logging/log_ctrl.h>
+#include "esb.h"
 
 #include <ctype.h>
 
@@ -171,13 +172,15 @@ static void console_thread(void)
 	printk("list                         Get paired devices\n");
 	printk("reboot                       Soft reset the device\n");
 	printk("pair                         Enter pairing mode\n");
+	printk("exit                         Exit pairing mode\n");
 	printk("clear                        Clear stored devices\n");
 
 	uint8_t command_info[] = "info";
 	uint8_t command_uptime[] = "uptime";
 	uint8_t command_list[] = "list";
 	uint8_t command_reboot[] = "reboot";
 	uint8_t command_pair[] = "pair";
+	uint8_t command_exit[] = "exit";
 	uint8_t command_clear[] = "clear";
 
 #if DFU_EXISTS
@@ -215,17 +218,15 @@ static void console_thread(void)
 		}
 		else if (memcmp(line, command_pair, sizeof(command_pair)) == 0)
 		{
-			skip_dfu();
-			reboot_counter_write(101);
-			k_msleep(1);
-			sys_reboot(SYS_REBOOT_WARM);
+			esb_reset_pair();
+		}
+		else if (memcmp(line, command_exit, sizeof(command_exit)) == 0)
+		{
+			esb_finish_pair();
 		}
 		else if (memcmp(line, command_clear, sizeof(command_clear)) == 0) 
 		{
-			skip_dfu();
-			reboot_counter_write(102);
-			k_msleep(1);
-			sys_reboot(SYS_REBOOT_WARM);
+			esb_clear();
 		}
 #if DFU_EXISTS
 		else if (memcmp(line, command_dfu, sizeof(command_dfu)) == 0)

src/main.c

@@ -22,80 +22,14 @@
 */
 #include "globals.h"
 #include "system/system.h"
-//#include "timer.h"
-#include "connection/esb.h"
 
 #include <zephyr/kernel.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/sys/reboot.h>
 
 LOG_MODULE_REGISTER(main, LOG_LEVEL_INF);
 
-#define DFU_EXISTS CONFIG_BUILD_OUTPUT_UF2
-
-int main(void) {
+int main(void)
+{
 	set_led(SYS_LED_PATTERN_ACTIVE_PERSIST, SYS_LED_PRIORITY_SYSTEM);
 
-	uint8_t reboot_counter = reboot_counter_read();
-
-	uint8_t reset_mode = reboot_counter - 100;
-	if (reboot_counter != 100) {
-		reboot_counter_write(100);
-	}
-
-	clocks_start();
-
-	switch (reset_mode) {
-		case 1:
-			LOG_INF("Pairing requested");
-			sys_read(STORED_TRACKERS, &stored_trackers, sizeof(stored_trackers));
-			for (int i = 0; i < stored_trackers; i++) {
-				sys_read(
-					STORED_ADDR_0 + i,
-					&stored_tracker_addr[i],
-					sizeof(stored_tracker_addr[0])
-				);
-			}
-			esb_pair();  // this will not return
-			break;
-		case 2:
-			sys_write(STORED_TRACKERS, NULL, &stored_trackers, sizeof(stored_trackers));
-			LOG_INF("NVS Reset");
-			LOG_INF("Pairing requested");
-			esb_pair();  // this will not return
-			break;
-#if DFU_EXISTS  // Using Adafruit bootloader
-		case 3:  // DFU_MAGIC_UF2_RESET, Reset mode DFU
-			LOG_INF("DFU requested");
-			NRF_POWER->GPREGRET = 0x57;
-			sys_reboot(SYS_REBOOT_COLD);
-#endif
-		default:
-			sys_read(STORED_TRACKERS, &stored_trackers, sizeof(stored_trackers));
-			if (stored_trackers == 0) {
-				esb_pair();  // this will not return // TODO:
-			}
-			for (int i = 0; i < stored_trackers; i++) {
-				sys_read(
-					STORED_ADDR_0 + i,
-					&stored_tracker_addr[i],
-					sizeof(stored_tracker_addr[0])
-				);
-			}
-			LOG_INF("%d/%d devices stored", stored_trackers, MAX_TRACKERS);
-			break;
-	}
-
-	//	k_msleep(1); // TODO: fixes some weird issue with the device bootlooping, what
-	//is the cause
-
-	esb_receive();
-
-	esb_initialize(false);
-
-	esb_start_rx();
-
-	// timer_init();
-
 	return 0;
 }