From 16efd8d827da6a0522d3c6a6dc26ff775e5879cb Mon Sep 17 00:00:00 2001 From: "Ando \"Thor\" Nando" Date: Thu, 14 Nov 2024 16:35:43 +1100 Subject: [PATCH] update examples some more --- examples/use_config/nrf52840_ble_split/.cargo/config.toml | 6 +++--- .../use_config/nrf52840_ble_split_direct_pin/keyboard.toml | 2 +- rmk/src/split/peripheral.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/use_config/nrf52840_ble_split/.cargo/config.toml b/examples/use_config/nrf52840_ble_split/.cargo/config.toml index 784fa95f..0564abb9 100644 --- a/examples/use_config/nrf52840_ble_split/.cargo/config.toml +++ b/examples/use_config/nrf52840_ble_split/.cargo/config.toml @@ -3,9 +3,9 @@ # runner = "qemu-system-arm -cpu cortex-m3 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -kernel" [target.'cfg(all(target_arch = "arm", target_os = "none"))'] -# Have to use simmsb's elf2uf2 fork to flash https://github.com/simmsb/elf2uf2-rs +# Have to use simmsb's elf2uf2 fork to flash https://github.com/simmsb/elf2uf2-rs # runner = "elf2uf2-rs -d" -runner = "probe-rs run --chip nRF52840_xxAA" +runner = "probe-rs run --chip nRF52840_xxAA --allow-erase-all" linker = "flip-link" rustflags = [ # Previously, the linker arguments --nmagic and -Tlink.x were set here. @@ -35,4 +35,4 @@ target = "thumbv7em-none-eabihf" # Cortex-M4F and Cortex-M7F (with FPU) # target = "thumbv8m.main-none-eabihf" # Cortex-M33 (with FPU) [env] -DEFMT_LOG = "debug" \ No newline at end of file +DEFMT_LOG = "debug" diff --git a/examples/use_config/nrf52840_ble_split_direct_pin/keyboard.toml b/examples/use_config/nrf52840_ble_split_direct_pin/keyboard.toml index 6372558e..2b2f12da 100644 --- a/examples/use_config/nrf52840_ble_split_direct_pin/keyboard.toml +++ b/examples/use_config/nrf52840_ble_split_direct_pin/keyboard.toml @@ -1,5 +1,5 @@ [keyboard] -name = "RMK Keyboard" +name = "RMK Keyboard 3:" product_name = "RMK Keyboard" vendor_id = 0x4c4b product_id = 0x4643 diff --git a/rmk/src/split/peripheral.rs b/rmk/src/split/peripheral.rs index d9c2c464..f6ff5e94 100644 --- a/rmk/src/split/peripheral.rs +++ b/rmk/src/split/peripheral.rs @@ -117,9 +117,9 @@ pub async fn run_rmk_split_peripheral_direct_pin< ) { // Create the debouncer, use COL2ROW by default #[cfg(all(feature = "col2row", feature = "rapid_debouncer"))] - let debouncer = RapidDebouncer::::new(); + let debouncer = RapidDebouncer::::new(); #[cfg(all(feature = "col2row", not(feature = "rapid_debouncer")))] - let debouncer = DefaultDebouncer::::new(); + let debouncer = DefaultDebouncer::::new(); #[cfg(all(not(feature = "col2row"), feature = "rapid_debouncer"))] let debouncer = RapidDebouncer::::new(); #[cfg(all(not(feature = "col2row"), not(feature = "rapid_debouncer")))]