SDK >=3.3.0, buttons, TX error clear rate (#146)

sctanf · web-flow · commit b52bb546a65a · 2026-02-26T14:48:53.000-06:00
* Send multipress to server

* Hold to pair on boot only, update LED patterns/priorities

* More lenient TX error clear rate

* Fit firmware on nRF52820/32

* Ignore button hold if tracker is sleeping

* Add full_name to all board.yml

Fix compilation on sdk &gt;=3.3.0
diff --git a/boards/mocha-elec/mochi/board.yml b/boards/mocha-elec/mochi/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: mochi_uf2
+  full_name: Mochi
   vendor: mocha-elec
   socs:
     - name: nrf52833
diff --git a/boards/nordic/promicro_uf2/board.yml b/boards/nordic/promicro_uf2/board.yml
@@ -6,6 +6,7 @@
 
 board:
   name: promicro_uf2
+  full_name: Pro Micro
   vendor: nordic
   socs:
     - name: nrf52840
diff --git a/boards/nordic/promicro_uf2/promicro_uf2_chrysalis_defconfig b/boards/nordic/promicro_uf2/promicro_uf2_chrysalis_defconfig
@@ -6,7 +6,7 @@ CONFIG_HW_STACK_PROTECTION=y
 
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="SlimeVR"
-CONFIG_USB_DEVICE_PRODUCT="SlimeNRF Tracker ProMicro"
+CONFIG_USB_DEVICE_PRODUCT="SlimeNRF Tracker Pro Micro"
 
 CONFIG_BATTERY_USE_REG_LDO_MAPPING=y
 
diff --git a/boards/nordic/promicro_uf2/promicro_uf2_i2c_defconfig b/boards/nordic/promicro_uf2/promicro_uf2_i2c_defconfig
@@ -6,7 +6,7 @@ CONFIG_HW_STACK_PROTECTION=y
 
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="SlimeVR"
-CONFIG_USB_DEVICE_PRODUCT="SlimeNRF Tracker ProMicro"
+CONFIG_USB_DEVICE_PRODUCT="SlimeNRF Tracker Pro Micro"
 
 CONFIG_BATTERY_USE_REG_LDO_MAPPING=y
 
diff --git a/boards/nordic/promicro_uf2/promicro_uf2_smspi_defconfig b/boards/nordic/promicro_uf2/promicro_uf2_smspi_defconfig
@@ -9,7 +9,7 @@ CONFIG_HW_STACK_PROTECTION=y
 
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="SlimeVR"
-CONFIG_USB_DEVICE_PRODUCT="SlimeNRF Tracker ProMicro"
+CONFIG_USB_DEVICE_PRODUCT="SlimeNRF Tracker Pro Micro"
 
 CONFIG_BATTERY_USE_REG_LDO_MAPPING=y
 
diff --git a/boards/nordic/promicro_uf2/promicro_uf2_spi_defconfig b/boards/nordic/promicro_uf2/promicro_uf2_spi_defconfig
@@ -6,7 +6,7 @@ CONFIG_HW_STACK_PROTECTION=y
 
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="SlimeVR"
-CONFIG_USB_DEVICE_PRODUCT="SlimeNRF Tracker ProMicro"
+CONFIG_USB_DEVICE_PRODUCT="SlimeNRF Tracker Pro Micro"
 
 CONFIG_BATTERY_USE_REG_LDO_MAPPING=y
 
diff --git a/boards/nordic/test54l/board.yml b/boards/nordic/test54l/board.yml
@@ -1,5 +1,6 @@
 board:
   name: test54l
+  full_name: test54l
   vendor: nordic
   socs:
   - name: nrf54l15
diff --git a/boards/nordic/test805/board.yml b/boards/nordic/test805/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: test805
+  full_name: test805
   vendor: nordic
   socs:
     - name: nrf52805
diff --git a/boards/sctanf/slimenrf_r1/board.yml b/boards/sctanf/slimenrf_r1/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: slimenrf_r1
+  full_name: SlimeNRF R1
   vendor: sctanf
   socs:
     - name: nrf52840
diff --git a/boards/sctanf/slimenrf_r2/board.yml b/boards/sctanf/slimenrf_r2/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: slimenrf_r2
+  full_name: SlimeNRF R2
   vendor: sctanf
   socs:
     - name: nrf52832
diff --git a/boards/sctanf/slimenrf_r3/board.yml b/boards/sctanf/slimenrf_r3/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: slimenrf_r3
+  full_name: SlimeNRF R3
   vendor: sctanf
   socs:
     - name: nrf52840
diff --git a/boards/slimevr/slimevrmini_p1_uf2/board.yml b/boards/slimevr/slimevrmini_p1_uf2/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: slimevrmini_p1_uf2
+  full_name: SlimeVR Mini P1
   vendor: slimevr
   socs:
     - name: nrf52833
diff --git a/boards/slimevr/slimevrmini_p2_uf2/board.yml b/boards/slimevr/slimevrmini_p2_uf2/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: slimevrmini_p2_uf2
+  full_name: SlimeVR Mini P2
   vendor: slimevr
   socs:
     - name: nrf52833
diff --git a/boards/slimevr/slimevrmini_p3r6_uf2/board.yml b/boards/slimevr/slimevrmini_p3r6_uf2/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: slimevrmini_p3r6_uf2
+  full_name: smol P3R6
   vendor: slimevr
   socs:
     - name: nrf52833
diff --git a/boards/slimevr/slimevrmini_p3r7_uf2/board.yml b/boards/slimevr/slimevrmini_p3r7_uf2/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: slimevrmini_p3r7_uf2
+  full_name: smol P3R7
   vendor: slimevr
   socs:
     - name: nrf52833
diff --git a/boards/slimevr/slimevrmini_p4_uf2/board.yml b/boards/slimevr/slimevrmini_p4_uf2/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: slimevrmini_p4_uf2
+  full_name: Butterfly P4
   vendor: slimevr
   socs:
     - name: nrf52833
diff --git a/boards/slimevr/slimevrmini_p4r11_uf2/board.yml b/boards/slimevr/slimevrmini_p4r11_uf2/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: slimevrmini_p4r11_uf2
+  full_name: Butterfly P4R11
   vendor: slimevr
   socs:
     - name: nrf52833
diff --git a/boards/slimevr/slimevrmini_p4r9_uf2/board.yml b/boards/slimevr/slimevrmini_p4r9_uf2/board.yml
@@ -3,6 +3,7 @@
 
 board:
   name: slimevrmini_p4r9_uf2
+  full_name: Butterfly P4R9
   vendor: slimevr
   socs:
     - name: nrf52833
diff --git a/socs/nrf52820.overlay b/socs/nrf52820.overlay
@@ -1,7 +1,7 @@
 / {
-	sram0@20007000 {
+	sram0@20007800 {
 		compatible = "zephyr,memory-region", "mmio-sram";
-		reg = <0x20007000 DT_SIZE_K(4)>;
+		reg = <0x20007800 DT_SIZE_K(2)>;
 		zephyr,memory-region = "RETAINED_MEM";
 		status = "okay";
 
@@ -18,5 +18,5 @@
 
 &sram0 {
 	/* Shrink SRAM size to avoid overlap with retained memory region */
-	reg = <0x20000000 DT_SIZE_K(28)>;
+	reg = <0x20000000 DT_SIZE_K(30)>;
 };
diff --git a/socs/nrf52832.overlay b/socs/nrf52832.overlay
@@ -1,7 +1,7 @@
 / {
-	sram0@20007000 {
+	sram0@20007800 {
 		compatible = "zephyr,memory-region", "mmio-sram";
-		reg = <0x20007000 DT_SIZE_K(4)>;
+		reg = <0x20007800 DT_SIZE_K(2)>;
 		zephyr,memory-region = "RETAINED_MEM";
 		status = "okay";
 
@@ -18,5 +18,5 @@
 
 &sram0 {
 	/* Shrink SRAM size to avoid overlap with retained memory region */
-	reg = <0x20000000 DT_SIZE_K(28)>;
+	reg = <0x20000000 DT_SIZE_K(30)>;
 };
diff --git a/src/connection/esb.c b/src/connection/esb.c
@@ -57,7 +57,7 @@ static bool esb_paired = false;
 
 #define TX_ERROR_THRESHOLD 30
 #define TX_ERROR_MAX 100
-#define TX_ERROR_CLEAR_RATE 3
+#define TX_ERROR_CLEAR_RATE 10
 
 LOG_MODULE_REGISTER(esb_event, LOG_LEVEL_INF);
 
@@ -384,7 +384,7 @@ void esb_pair(void)
 			checksum = 8;
 		LOG_INF("Checksum: %02X", checksum);
 		tx_payload_pair.data[0] = checksum; // Use checksum to make sure packet is for this device
-		set_led(SYS_LED_PATTERN_SHORT, SYS_LED_PRIORITY_CONNECTION);
+		set_led(SYS_LED_PATTERN_SHORT, SYS_LED_PRIORITY_PAIR);
 		while (paired_addr[0] != checksum)
 		{
 			int64_t time_begin = k_uptime_get();
@@ -436,7 +436,7 @@ void esb_pair(void)
 			else
 				k_msleep(1000 - time_delta);
 		}
-		set_led(SYS_LED_PATTERN_ONESHOT_COMPLETE, SYS_LED_PRIORITY_CONNECTION);
+		set_led(SYS_LED_PATTERN_ONESHOT_COMPLETE, SYS_LED_PRIORITY_PAIR);
 		LOG_INF("Paired");
 		sys_write(PAIRED_ID, retained->paired_addr, paired_addr, sizeof(paired_addr)); // Write new address and tracker id
 		esb_deinitialize();
diff --git a/src/main.c b/src/main.c
@@ -57,39 +57,39 @@ int main(void)
 		reset_pin_reset = false;
 #endif
 
-	set_led(SYS_LED_PATTERN_ON, SYS_LED_PRIORITY_BOOT); // Boot LED
+	set_led(SYS_LED_PATTERN_ONESHOT_WAKE, SYS_LED_PRIORITY_BOOT); // Boot LED
 
 	uint8_t reboot_counter = reboot_counter_read();
 	bool booting_from_shutdown = !reboot_counter && (reset_pin_reset || button_read()); // 0 means from user shutdown or failed ram validation
 
 	/* if button is not held after booting from shutdown, power off again
 	 * if button press is normal, continue boot
-	 * if button is held for 5 seconds, reset pairing and continue boot
+	 * if button is held for 1 second, reset pairing and continue boot
+	 * if button is held but tracker was waking (not booting from shutdown) ignore the press // TODO: should it pass on to regular handler (e.g. intent to shutdown)
 	 */
 
-	if (button_read())
+	if (booting_from_shutdown)
 	{
-		while (button_read())
+		set_led(SYS_LED_PATTERN_ONESHOT_POWERON, SYS_LED_PRIORITY_BOOT);
+		if (button_read())
 		{
-			if (k_uptime_get() > 1000)
-				set_led(SYS_LED_PATTERN_LONG, SYS_LED_PRIORITY_BOOT);
-			if (k_uptime_get() > 5000)
+			set_status(SYS_STATUS_BUTTON_PRESSED, true); // prevent going to sleep while still holding
+			int64_t start_time = k_uptime_get();
+			while (button_read())
 			{
-				LOG_INF("Pairing requested");
-				esb_reset_pair();
-				break;
+				if (k_uptime_get() - start_time > 1000)
+				{
+					LOG_INF("Pairing requested");
+					esb_reset_pair();
+					break;
+				}
+				k_msleep(1);
 			}
-			k_msleep(1);
+			if (CONFIG_0_SETTINGS_READ(CONFIG_0_USER_SHUTDOWN) && k_uptime_get() - start_time < 50) // debounce // TODO: does sense pin stay configured?
+				sys_request_system_off(false);
+			set_status(SYS_STATUS_BUTTON_PRESSED, false);
 		}
-		if (CONFIG_0_SETTINGS_READ(CONFIG_0_USER_SHUTDOWN) && k_uptime_get() < 50 && booting_from_shutdown) // debounce
-			sys_request_system_off(false);
-		if (k_uptime_get() <= 5000)
-			set_led(SYS_LED_PATTERN_ONESHOT_POWERON, SYS_LED_PRIORITY_BOOT);
-		else
-			set_led(SYS_LED_PATTERN_OFF, SYS_LED_PRIORITY_BOOT);
 	}
-	else if (booting_from_shutdown)
-		set_led(SYS_LED_PATTERN_ONESHOT_POWERON, SYS_LED_PRIORITY_BOOT);
 
 	bool docked = dock_read();
 
@@ -129,12 +129,6 @@ int main(void)
 			sys_user_shutdown();
 	}
 
-	if (!booting_from_shutdown) // ONESHOT_POWERON automatically sets LED off
-	{
-		k_usleep(1); // TODO: its possible main is holding exec priority too long and causing stuff to break, very particularly during set_led?
-		set_led(SYS_LED_PATTERN_OFF, SYS_LED_PRIORITY_BOOT);
-	}
-
 	sys_reset_mode(reset_mode);
 
 	return 0;
diff --git a/src/system/led.c b/src/system/led.c
@@ -335,26 +335,31 @@ static void led_thread(void)
 			k_msleep(200);
 			break;
 
+		case SYS_LED_PATTERN_ONESHOT_WAKE:
+			led_pattern_state++;
+			led_pin_set(SYS_LED_COLOR_SUCCESS, 10000, !(led_pattern_state % 2) * 10000);
+			if (led_pattern_state == 3)
+				set_led(SYS_LED_PATTERN_OFF, SYS_LED_PRIORITY_HIGHEST);
+			else
+				k_msleep(100);
+			break;
 		case SYS_LED_PATTERN_ONESHOT_POWERON:
 			led_pattern_state++;
-			led_pin_set(SYS_LED_COLOR_DEFAULT, 10000, !(led_pattern_state % 2) * 10000);
-			if (led_pattern_state == 7)
+			led_pin_set(SYS_LED_COLOR_SUCCESS, 10000, !(led_pattern_state % 2) * 10000);
+			if (led_pattern_state == 5)
 				set_led(SYS_LED_PATTERN_OFF, SYS_LED_PRIORITY_HIGHEST);
 			else
-				k_msleep(200);
+				k_msleep(100);
 			break;
 		case SYS_LED_PATTERN_ONESHOT_POWEROFF:
-			if (led_pattern_state++ > 0)
-				led_pin_set(SYS_LED_COLOR_DEFAULT, (202 - led_pattern_state) * 50, (led_pattern_state != 202 ? 10000 : 0));
-			else
-				led_pin_set(SYS_LED_COLOR_DEFAULT, 10000, 0);
-			if (led_pattern_state == 202)
+			led_pattern_state++;
+			led_pin_set(SYS_LED_COLOR_CHARGING, 10000, !(led_pattern_state % 2) * 10000);
+			if (led_pattern_state == 7)
 				set_led(SYS_LED_PATTERN_OFF_FORCE, SYS_LED_PRIORITY_HIGHEST);
-			else if (led_pattern_state == 1)
-				k_msleep(250);
 			else
-				k_msleep(5);
+				k_msleep(100);
 			break;
+
 		case SYS_LED_PATTERN_ONESHOT_PROGRESS:
 			led_pattern_state++;
 			led_pin_set(SYS_LED_COLOR_SUCCESS, 10000, !(led_pattern_state % 2) * 10000);
diff --git a/src/system/led.h b/src/system/led.h
@@ -7,20 +7,24 @@ LED priorities (0 is highest)
 1: user interaction
 2: boot/power
 3: sensor
-4: connection (esb)
-5: status
-6: system (persist)
+4: pair (esb)
+5: error
+6: charger
+7: warn
+8: system (persist)
 */
 
 #define SYS_LED_PRIORITY_HIGHEST 0
 #define SYS_LED_PRIORITY_CRITICAL 0
 #define SYS_LED_PRIORITY_USER 1
 #define SYS_LED_PRIORITY_BOOT 2
 #define SYS_LED_PRIORITY_SENSOR 3
-#define SYS_LED_PRIORITY_CONNECTION 4
-#define SYS_LED_PRIORITY_STATUS 5
-#define SYS_LED_PRIORITY_SYSTEM 6
-#define SYS_LED_PATTERN_DEPTH 7
+#define SYS_LED_PRIORITY_PAIR 4
+#define SYS_LED_PRIORITY_ERROR 5
+#define SYS_LED_PRIORITY_CHARGER 6
+#define SYS_LED_PRIORITY_WARN 7
+#define SYS_LED_PRIORITY_SYSTEM 8
+#define SYS_LED_PATTERN_DEPTH 8
 
 // RGB
 // Red, Green, Blue
@@ -44,9 +48,11 @@ enum sys_led_pattern {
 	SYS_LED_PATTERN_LONG, // 500ms on 500ms off										// Default | indicates waiting
 	SYS_LED_PATTERN_FLASH, // 200ms on 200ms off									// Default | indicates readiness
 
-	SYS_LED_PATTERN_ONESHOT_POWERON, // 200ms on 200ms off, 3 times					// Default
-	SYS_LED_PATTERN_ONESHOT_POWEROFF, // 250ms off, 1000ms fade to off				// Default
-	SYS_LED_PATTERN_ONESHOT_PROGRESS, // 200ms on 200ms off, 2 times				// Success
+	SYS_LED_PATTERN_ONESHOT_WAKE, // 100ms on										// Success | wake from timeout
+	SYS_LED_PATTERN_ONESHOT_POWERON, // 100ms on 100ms off, 2 times					// Success | wake from shutdown
+	SYS_LED_PATTERN_ONESHOT_POWEROFF, // 100ms on 100ms off, 3 times				// Charging
+
+	SYS_LED_PATTERN_ONESHOT_PROGRESS, // 200ms on 200ms off, 2 times				// Success | progress indicator
 	SYS_LED_PATTERN_ONESHOT_COMPLETE, // 200ms on 200ms off, 4 times				// Success
 
 	SYS_LED_PATTERN_ON_PERSIST, // 20% duty cycle									// Success | indicates charged
diff --git a/src/system/power.c b/src/system/power.c
diff --git a/src/system/status.c b/src/system/status.c
diff --git a/src/system/system.c b/src/system/system.c
diff --git a/src/thread_priority.h b/src/thread_priority.h
