From 6b44b4ff8df20a7c2ee618c6ee4cd485d97c414c Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Fri, 26 Jun 2020 20:08:14 -0700 Subject: [PATCH] Remove use of ATMEGA_KEYSCANNER_BOILERPLATE for Atreus2 --- src/kaleidoscope/device/keyboardio/Atreus2.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/kaleidoscope/device/keyboardio/Atreus2.cpp b/src/kaleidoscope/device/keyboardio/Atreus2.cpp index 5a0ad92d..b13fe48d 100644 --- a/src/kaleidoscope/device/keyboardio/Atreus2.cpp +++ b/src/kaleidoscope/device/keyboardio/Atreus2.cpp @@ -25,8 +25,18 @@ namespace kaleidoscope { namespace device { namespace keyboardio { - -ATMEGA_KEYSCANNER_BOILERPLATE + const uint8_t kaleidoscope::Device::KeyScannerProps::matrix_rows; + const uint8_t kaleidoscope::Device::KeyScannerProps::matrix_columns; + constexpr uint8_t kaleidoscope::Device::KeyScannerProps::matrix_row_pins[matrix_rows]; + constexpr uint8_t kaleidoscope::Device::KeyScannerProps::matrix_col_pins[matrix_columns]; + template<> uint16_t kaleidoscope::Device::KeyScanner::previousKeyState_[kaleidoscope::Device::KeyScannerProps::matrix_rows] = {}; + template<> uint16_t kaleidoscope::Device::KeyScanner::keyState_[kaleidoscope::Device::KeyScannerProps::matrix_rows] = {}; + template<> uint16_t kaleidoscope::Device::KeyScanner::masks_[kaleidoscope::Device::KeyScannerProps::matrix_rows] = {}; + template<> uint8_t kaleidoscope::Device::KeyScanner::debounce_matrix_[kaleidoscope::Device::KeyScannerProps::matrix_rows][kaleidoscope::Device::KeyScannerProps::matrix_columns] = {}; + + ISR(TIMER1_OVF_vect) { + Runtime.device().keyScanner().do_scan_ = true; + } } }