dandri/ZephCore
1
0 Fork 0
mirror of https://github.com/liquidraver/ZephCore.git synced 2026-10-23 08:12:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

companion radio set + tempradio bugfixes, touch 1200 support

Browse Source
This commit is contained in:
liquidraver committed 2026-02-21 15:11:16 +01:00
1 parent dcd8a03c5b
commit 9034e87a7f
7 files changed
+1186 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

zephcore/adapters/board/ZephyrBoard.cpp
+5 -3
View File
@@ -12,8 +12,9 @@
#if defined(CONFIG_SOC_SERIES_NRF52X) || defined(CONFIG_SOC_SERIES_NRF52)
#include <hal/nrf_power.h>
/* Adafruit bootloader GPREGRET magic values */
#define BOOTLOADER_DFU_UF2_MAGIC 0x57 /* Enter UF2 mass storage mode */
#define BOOTLOADER_DFU_OTA_MAGIC 0xA8 /* Enter BLE OTA DFU mode */
#define BOOTLOADER_DFU_SERIAL_MAGIC 0x4e /* Enter serial DFU mode (CDC only) */
#define BOOTLOADER_DFU_UF2_MAGIC 0x57 /* Enter UF2 mass storage mode (CDC + MSC) */
#define BOOTLOADER_DFU_OTA_MAGIC 0xA8 /* Enter BLE OTA DFU mode */
#define NRF52_GPREGRET 1
#endif
@@ -150,7 +151,8 @@ void ZephyrBoard::reboot()
void ZephyrBoard::rebootToBootloader()
{
#ifdef NRF52_GPREGRET
/* Write magic value to GPREGRET0 - enter UF2 mass storage mode */
/* Write magic value to GPREGRET0 - enter UF2 bootloader mode.
* UF2 supports both drag-and-drop (.uf2) and serial DFU (nrfutil). */
nrf_power_gpregret_set(NRF_POWER, 0, BOOTLOADER_DFU_UF2_MAGIC);
#endif
k_msleep(50); /* Let UART/USB flush */
zephcore/adapters/usb/ZephyrRepeaterUSB.cpp
+32 -7
View File
@@ -57,9 +57,27 @@ USBD_CONFIGURATION_DEFINE(zephcore_hs_config,
/* ZephyrBoard instance for bootloader entry */
static mesh::ZephyrBoard usb_board;
/* Track DTR state for Arduino-style 1200 baud touch detection.
* Arduino triggers on DTR drop (high→low) while baud rate is 1200.
* adafruit-nrfutil --touch 1200 opens port at 1200 baud (DTR high),
* then closes it (DTR low). We detect both the baud rate change and
* the DTR drop to cover all host tool implementations. */
static bool dtr_was_active;
static void enter_bootloader(void)
{
LOG_WRN("Entering bootloader (1200 baud touch)");
/* Small delay to let USB disconnect cleanly */
k_msleep(100);
usb_board.rebootToBootloader();
/* Never returns */
}
/*
* USB message callback - detect 1200 baud touch for bootloader entry.
* Arduino uses this method: when host opens port at 1200 baud, enter DFU.
* Two detection methods (matching Arduino behavior):
* 1. Baud rate set to 1200 (SET_LINE_CODING)
* 2. DTR drop while baud is 1200 (SET_CONTROL_LINE_STATE)
*/
static void usbd_msg_callback(struct usbd_context *const ctx, const struct usbd_msg *msg)
{
@@ -67,15 +85,22 @@ static void usbd_msg_callback(struct usbd_context *const ctx, const struct usbd_
uint32_t baudrate = 0;
int ret = uart_line_ctrl_get(msg->dev, UART_LINE_CTRL_BAUD_RATE, &baudrate);
if (ret == 0) {
LOG_DBG("CDC ACM baud rate change: %u", baudrate);
LOG_INF("CDC ACM baud rate: %u", baudrate);
if (baudrate == 1200) {
LOG_INF("1200 baud touch detected - entering bootloader");
/* Small delay to let USB disconnect cleanly */
k_msleep(100);
usb_board.rebootToBootloader();
/* Never returns */
enter_bootloader();
}
}
} else if (msg->type == USBD_MSG_CDC_ACM_CONTROL_LINE_STATE) {
uint32_t dtr = 0;
uint32_t baudrate = 0;
uart_line_ctrl_get(msg->dev, UART_LINE_CTRL_DTR, &dtr);
uart_line_ctrl_get(msg->dev, UART_LINE_CTRL_BAUD_RATE, &baudrate);
LOG_INF("CDC ACM DTR=%u baud=%u", dtr, baudrate);
/* Arduino method: DTR drop (high→low) while baud is 1200 */
if (dtr_was_active && !dtr && baudrate == 1200) {
enter_bootloader();
}
dtr_was_active = (dtr != 0);
}
}