From 2b9103fe64f1bd49f449a81a6638f2baac45ab31 Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Wed, 27 Nov 2019 15:19:07 +0100 Subject: [PATCH] device/Model01: Use a non-static setup() Make the Model01's `setup()` method non-static, so that we can call the parents `setup()` method too. We want to do that so if new drivers are added, we automatically pick those up. Signed-off-by: Gergely Nagy --- src/kaleidoscope/device/keyboardio/Model01.cpp | 2 +- src/kaleidoscope/device/keyboardio/Model01.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kaleidoscope/device/keyboardio/Model01.cpp b/src/kaleidoscope/device/keyboardio/Model01.cpp index 45ea4906..e9ec29e3 100644 --- a/src/kaleidoscope/device/keyboardio/Model01.cpp +++ b/src/kaleidoscope/device/keyboardio/Model01.cpp @@ -285,8 +285,8 @@ uint8_t Model01KeyScanner::previousPressedKeyswitchCount() { /********* Hardware plugin *********/ void Model01::setup() { - KeyScanner::setup(); Model01Hands::setup(); + kaleidoscope::device::Base::setup(); TWBR = 12; // This is 400mhz, which is the fastest we can drive the ATTiny } diff --git a/src/kaleidoscope/device/keyboardio/Model01.h b/src/kaleidoscope/device/keyboardio/Model01.h index 91d47a8d..a6d8e945 100644 --- a/src/kaleidoscope/device/keyboardio/Model01.h +++ b/src/kaleidoscope/device/keyboardio/Model01.h @@ -127,7 +127,7 @@ struct Model01Props : public kaleidoscope::device::ATmega32U4KeyboardProps { class Model01 : public kaleidoscope::device::ATmega32U4Keyboard { public: - static void setup(); + void setup(); static void enableHardwareTestMode(); };