From 551d63b98ff95d5920c1477f1cc84475715bc5e6 Mon Sep 17 00:00:00 2001 From: Florian Didron Date: Wed, 6 Sep 2023 20:45:35 +0700 Subject: feat/voyager (#374) * feat: tentative fix for keyboard crash during esd testing * feat: adds support for the GD32 voyager * feat: adds voyager's dfu suffix * fix: instability issues over i2c * fix: more robust right side scan * fix: tentative delay after init * Revert "fix: tentative delay after init" This reverts commit b0a6461cf1cef60574eac1647fd14e1fe63a020c. * fix: scan left side in between right scan process * fix: resets matrix + layer state when reconnecting the right side * chore: comments and code cleanup * fix: restore previous control flow * fix: decouple led driver reinit from io expander reinit * feat: reinit led drivers independtly * fix: prevents slamming the led driver over i2c * Revert "fix: prevents slamming the led driver over i2c" This reverts commit 48b8c809ea7a99ad2c3e941b83313787985c95e0. * Revert "feat: reinit led drivers independtly" This reverts commit 6405e6b3673478af1d98244c4df6ab73b95b18e1. * fix: reboot on io expander * fix: wait time after reading the io expander * chore: code cleanup and some refactors. * feat: adds led brightness and status led control over hid * fix: remove stray printf * fix: compilation error on ergodox * fix: gd32 eeprom fix * fix: caps lock crash * fix: soft reset to bootloader key. * chore: move the app address define where it should be * fix: cleanup + debounce default * feat: tentatively set gd32 clock to 98Mhz * feat: realign to latest chibios contrib * chore: points to ZSA's chibios contrib fork --------- Co-authored-by: Florian Didron <0x6664@hey.com> --- platforms/chibios/bootloaders/ignition.c | 54 ++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 platforms/chibios/bootloaders/ignition.c (limited to 'platforms/chibios/bootloaders') diff --git a/platforms/chibios/bootloaders/ignition.c b/platforms/chibios/bootloaders/ignition.c new file mode 100644 index 0000000000..00d55db2b8 --- /dev/null +++ b/platforms/chibios/bootloaders/ignition.c @@ -0,0 +1,54 @@ +/* Copyright 2021 QMK + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "bootloader.h" + +#include +#include +#include "wait.h" +#include "gpio.h" + +#define APP_ADDRESS 0x08002000 + +__attribute__((weak)) void bootloader_jump(void) { + // The ignition bootloader is checking for a high signal on A8 for 100ms when powering on the board. + // Setting both A8 and A9 high will charge the capacitor quickly. + // Setting A9 low before reset will cause the capacitor to discharge + // thus making the bootloder unlikely to trigger twice between power cycles. + setPinOutputPushPull(A9); + setPinOutputPushPull(A8); + writePinHigh(A9); + writePinHigh(A8); + wait_ms(500); + writePinLow(A9); + + NVIC_SystemReset(); +} + +__attribute__((weak)) void mcu_reset(void) { + // When resetting the MCU, we want to jump to the application. + SCB->AIRCR = APP_ADDRESS & 0xFFFF; + + // Set the stack pointer to the applications stack pointer + __asm__ volatile("msr msp, %0" ::"g"(*(volatile uint32_t *)APP_ADDRESS)); + + // Jump to the application + (*(void (**)())(APP_ADDRESS + 4))(); + while (1) + ; +} + +__attribute__((weak)) void enter_bootloader_mode_if_requested(void) {} \ No newline at end of file -- cgit v1.2.3