From 6fd2fa153bfdfc0817da596d3c99fe262e275b48 Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Wed, 29 Jun 2022 09:29:44 +0200 Subject: [PATCH] hardware: Fix the bootloader props on a number of devices A number of devices declared the bootloader in their device properties as `BootLoader`, while the base class, and anything using it, was looking for `Bootloader`. This resulted in these devices using the default, dummy bootloader, rather than the one we intended to set. This patch corrects that, and everything's using `Bootloader` now, including the documentation. Signed-off-by: Gergely Nagy --- docs/api-reference/device-apis.md | 2 +- .../src/kaleidoscope/device/dygma/Raise.h | 2 +- .../src/kaleidoscope/device/gd32/Eval.h | 2 +- .../src/kaleidoscope/device/keyboardio/Atreus2.h | 2 +- .../src/kaleidoscope/device/keyboardio/Imago.h | 2 +- .../src/kaleidoscope/device/keyboardio/Model01.h | 2 +- .../src/kaleidoscope/device/keyboardio/Model100.h | 2 +- .../src/kaleidoscope/device/softhruf/Splitography.h | 2 +- .../src/kaleidoscope/device/technomancy/Atreus.h | 4 ++-- src/kaleidoscope/device/virtual/Virtual.h | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/api-reference/device-apis.md b/docs/api-reference/device-apis.md index bdbabd05..30cec588 100644 --- a/docs/api-reference/device-apis.md +++ b/docs/api-reference/device-apis.md @@ -175,7 +175,7 @@ struct KeypadProps : kaleidoscope::device::ATmega32U4KeyboardProps { }; typedef kaleidoscope::driver::keyscanner::ATmega KeyScanner; - typedef kaleidoscope::driver::bootloader::avr::Caterina BootLoader; + typedef kaleidoscope::driver::bootloader::avr::Caterina Bootloader; static constexpr const char *short_name = "imaginary-keypad"; }; diff --git a/plugins/Kaleidoscope-Hardware-Dygma-Raise/src/kaleidoscope/device/dygma/Raise.h b/plugins/Kaleidoscope-Hardware-Dygma-Raise/src/kaleidoscope/device/dygma/Raise.h index 70cbadf3..a0b4987a 100644 --- a/plugins/Kaleidoscope-Hardware-Dygma-Raise/src/kaleidoscope/device/dygma/Raise.h +++ b/plugins/Kaleidoscope-Hardware-Dygma-Raise/src/kaleidoscope/device/dygma/Raise.h @@ -170,7 +170,7 @@ struct RaiseProps : kaleidoscope::device::BaseProps { typedef RaiseKeyScanner KeyScanner; typedef RaiseStorageProps StorageProps; typedef kaleidoscope::driver::storage::Flash Storage; - typedef kaleidoscope::driver::bootloader::samd::Bossac BootLoader; + typedef kaleidoscope::driver::bootloader::samd::Bossac Bootloader; typedef RaiseSideFlasherProps SideFlasherProps; typedef kaleidoscope::util::flasher::KeyboardioI2CBootloader SideFlasher; diff --git a/plugins/Kaleidoscope-Hardware-GD32-Eval/src/kaleidoscope/device/gd32/Eval.h b/plugins/Kaleidoscope-Hardware-GD32-Eval/src/kaleidoscope/device/gd32/Eval.h index 560a5e40..7d402084 100644 --- a/plugins/Kaleidoscope-Hardware-GD32-Eval/src/kaleidoscope/device/gd32/Eval.h +++ b/plugins/Kaleidoscope-Hardware-GD32-Eval/src/kaleidoscope/device/gd32/Eval.h @@ -37,7 +37,7 @@ struct EvalProps : kaleidoscope::device::BaseProps { typedef kaleidoscope::driver::hid::KeyboardioProps HIDProps; typedef kaleidoscope::driver::hid::Keyboardio HID; - typedef kaleidoscope::driver::bootloader::gd32::Base BootLoader; + typedef kaleidoscope::driver::bootloader::gd32::Base Bootloader; typedef EvalStorageProps StorageProps; typedef kaleidoscope::driver::storage::GD32Flash Storage; diff --git a/plugins/Kaleidoscope-Hardware-Keyboardio-Atreus/src/kaleidoscope/device/keyboardio/Atreus2.h b/plugins/Kaleidoscope-Hardware-Keyboardio-Atreus/src/kaleidoscope/device/keyboardio/Atreus2.h index eb3108df..81766c64 100644 --- a/plugins/Kaleidoscope-Hardware-Keyboardio-Atreus/src/kaleidoscope/device/keyboardio/Atreus2.h +++ b/plugins/Kaleidoscope-Hardware-Keyboardio-Atreus/src/kaleidoscope/device/keyboardio/Atreus2.h @@ -45,7 +45,7 @@ struct AtreusProps : kaleidoscope::device::ATmega32U4KeyboardProps { }; typedef kaleidoscope::driver::keyscanner::ATmega KeyScanner; - typedef kaleidoscope::driver::bootloader::avr::Caterina BootLoader; + typedef kaleidoscope::driver::bootloader::avr::Caterina Bootloader; static constexpr const char *short_name = "atreus"; }; diff --git a/plugins/Kaleidoscope-Hardware-Keyboardio-Imago/src/kaleidoscope/device/keyboardio/Imago.h b/plugins/Kaleidoscope-Hardware-Keyboardio-Imago/src/kaleidoscope/device/keyboardio/Imago.h index dd6103a1..dd36f544 100644 --- a/plugins/Kaleidoscope-Hardware-Keyboardio-Imago/src/kaleidoscope/device/keyboardio/Imago.h +++ b/plugins/Kaleidoscope-Hardware-Keyboardio-Imago/src/kaleidoscope/device/keyboardio/Imago.h @@ -99,7 +99,7 @@ struct ImagoProps : kaleidoscope::device::ATmega32U4KeyboardProps { typedef kaleidoscope::driver::keyscanner::ATmega KeyScanner; typedef ImagoLEDDriverProps LEDDriverProps; typedef ImagoLEDDriver LEDDriver; - typedef kaleidoscope::driver::bootloader::avr::Caterina BootLoader; + typedef kaleidoscope::driver::bootloader::avr::Caterina Bootloader; static constexpr const char *short_name = "imago"; }; diff --git a/plugins/Kaleidoscope-Hardware-Keyboardio-Model01/src/kaleidoscope/device/keyboardio/Model01.h b/plugins/Kaleidoscope-Hardware-Keyboardio-Model01/src/kaleidoscope/device/keyboardio/Model01.h index 680f31a0..8ad40ab9 100644 --- a/plugins/Kaleidoscope-Hardware-Keyboardio-Model01/src/kaleidoscope/device/keyboardio/Model01.h +++ b/plugins/Kaleidoscope-Hardware-Keyboardio-Model01/src/kaleidoscope/device/keyboardio/Model01.h @@ -126,7 +126,7 @@ struct Model01Props : public kaleidoscope::device::ATmega32U4KeyboardProps { typedef Model01LEDDriver LEDDriver; typedef Model01KeyScannerProps KeyScannerProps; typedef Model01KeyScanner KeyScanner; - typedef kaleidoscope::driver::bootloader::avr::Caterina BootLoader; + typedef kaleidoscope::driver::bootloader::avr::Caterina Bootloader; static constexpr const char *short_name = "kbio01"; }; diff --git a/plugins/Kaleidoscope-Hardware-Keyboardio-Model100/src/kaleidoscope/device/keyboardio/Model100.h b/plugins/Kaleidoscope-Hardware-Keyboardio-Model100/src/kaleidoscope/device/keyboardio/Model100.h index 18d0c0a1..05374878 100644 --- a/plugins/Kaleidoscope-Hardware-Keyboardio-Model100/src/kaleidoscope/device/keyboardio/Model100.h +++ b/plugins/Kaleidoscope-Hardware-Keyboardio-Model100/src/kaleidoscope/device/keyboardio/Model100.h @@ -141,7 +141,7 @@ struct Model100Props : public kaleidoscope::device::BaseProps { typedef Model100StorageProps StorageProps; typedef kaleidoscope::driver::storage::GD32Flash Storage; - typedef kaleidoscope::driver::bootloader::gd32::Base BootLoader; + typedef kaleidoscope::driver::bootloader::gd32::Base Bootloader; static constexpr const char *short_name = "kbio100"; typedef kaleidoscope::driver::mcu::GD32Props MCUProps; diff --git a/plugins/Kaleidoscope-Hardware-SOFTHRUF-Splitography/src/kaleidoscope/device/softhruf/Splitography.h b/plugins/Kaleidoscope-Hardware-SOFTHRUF-Splitography/src/kaleidoscope/device/softhruf/Splitography.h index 706322c7..d6177622 100644 --- a/plugins/Kaleidoscope-Hardware-SOFTHRUF-Splitography/src/kaleidoscope/device/softhruf/Splitography.h +++ b/plugins/Kaleidoscope-Hardware-SOFTHRUF-Splitography/src/kaleidoscope/device/softhruf/Splitography.h @@ -53,7 +53,7 @@ struct SplitographyProps : kaleidoscope::device::ATmega32U4KeyboardProps { #endif // KALEIDOSCOPE_VIRTUAL_BUILD }; typedef kaleidoscope::driver::keyscanner::ATmega KeyScanner; - typedef kaleidoscope::driver::bootloader::avr::FLIP BootLoader; + typedef kaleidoscope::driver::bootloader::avr::FLIP Bootloader; static constexpr const char *short_name = "splitography"; }; diff --git a/plugins/Kaleidoscope-Hardware-Technomancy-Atreus/src/kaleidoscope/device/technomancy/Atreus.h b/plugins/Kaleidoscope-Hardware-Technomancy-Atreus/src/kaleidoscope/device/technomancy/Atreus.h index 35a40683..c7d950ea 100644 --- a/plugins/Kaleidoscope-Hardware-Technomancy-Atreus/src/kaleidoscope/device/technomancy/Atreus.h +++ b/plugins/Kaleidoscope-Hardware-Technomancy-Atreus/src/kaleidoscope/device/technomancy/Atreus.h @@ -67,9 +67,9 @@ struct AtreusProps : kaleidoscope::device::ATmega32U4KeyboardProps { typedef kaleidoscope::driver::keyscanner::ATmega KeyScanner; #ifdef KALEIDOSCOPE_HARDWARE_ATREUS_PINOUT_LEGACY_TEENSY2 - typedef kaleidoscope::driver::bootloader::avr::HalfKay BootLoader; + typedef kaleidoscope::driver::bootloader::avr::HalfKay Bootloader; #else - typedef kaleidoscope::driver::bootloader::avr::Caterina BootLoader; + typedef kaleidoscope::driver::bootloader::avr::Caterina Bootloader; #endif static constexpr const char *short_name = "atreus"; }; diff --git a/src/kaleidoscope/device/virtual/Virtual.h b/src/kaleidoscope/device/virtual/Virtual.h index f974abf1..29d53f40 100644 --- a/src/kaleidoscope/device/virtual/Virtual.h +++ b/src/kaleidoscope/device/virtual/Virtual.h @@ -131,7 +131,7 @@ struct VirtualProps : public kaleidoscope::DeviceProps { typedef kaleidoscope::driver::mcu::None MCU; typedef kaleidoscope::driver::bootloader::None - BootLoader; + Bootloader; typedef typename kaleidoscope::DeviceProps::StorageProps StorageProps;