From 38880d1d244d1715c75cf96595d10913b5cfc54a Mon Sep 17 00:00:00 2001
From: Karel Tucek <kareltucek@centrum.cz>
Date: Fri, 29 May 2026 18:02:15 +0200
Subject: [PATCH] Make uhk80 respect reenumeration type to not get stuck in
 bootloader

---
 right/src/usb_commands/usb_command_reenumerate.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/right/src/usb_commands/usb_command_reenumerate.c b/right/src/usb_commands/usb_command_reenumerate.c
index 10df69289..741671ec2 100644
--- a/right/src/usb_commands/usb_command_reenumerate.c
+++ b/right/src/usb_commands/usb_command_reenumerate.c
@@ -1,3 +1,4 @@
+#include "lib/bootloader/src/bootloader/wormhole.h"
 #ifdef __ZEPHYR__
 #include <zephyr/retention/bootmode.h>
 #include <zephyr/sys/reboot.h>
@@ -58,10 +59,11 @@ void UsbCommand_Reenumerate(const uint8_t *GenericHidOutBuffer, uint8_t *Generic
     StateWormhole_Open();
     StateWormhole.wasReboot = true;
     Trace_Printc("Reenumerating...");
+    LogU("Reenumerating...");
 #ifdef __ZEPHYR__
-    printk("Reenumerating...");
+    uint8_t enumerationMode = GetUsbRxBufferUint8(1);
     k_sleep (K_MSEC(100)); //let it flush logs
-    bootmode_set(BOOT_MODE_TYPE_BOOTLOADER);
+    bootmode_set(enumerationMode == EnumerationMode_Bootloader ? BOOT_MODE_TYPE_BOOTLOADER : BOOT_MODE_TYPE_NORMAL);
     sys_reboot(SYS_REBOOT_COLD);
 #else
     Wormhole.magicNumber = WORMHOLE_MAGIC_NUMBER;