Merge pull request #688 from keyboardio/atmega-fixes

A couple small changes to fix issues with the ATMegaKeyboard abstraction

src/kaleidoscope/hardware/ATMegaKeyboard.cpp

@@ -80,7 +80,7 @@ bool ATMegaKeyboard::isKeyswitchPressed(KeyAddr key_addr) {
 
 bool ATMegaKeyboard::isKeyswitchPressed(uint8_t keyIndex) {
   keyIndex--;
-  return isKeyswitchPressed(KeyAddr(keyIndex));
+  return isKeyswitchPressed(::KeyAddr(keyIndex));
 }
 
 
@@ -100,7 +100,7 @@ bool ATMegaKeyboard::wasKeyswitchPressed(KeyAddr key_addr) {
 
 bool ATMegaKeyboard::wasKeyswitchPressed(uint8_t keyIndex) {
   keyIndex--;
-  return wasKeyswitchPressed(KeyAddr(keyIndex));
+  return wasKeyswitchPressed(::KeyAddr(keyIndex));
 }
 
 
@@ -110,8 +110,7 @@ void __attribute__((optimize(3))) ATMegaKeyboard::actOnMatrixScan() {
       uint8_t keyState = (bitRead(KeyboardHardware.previousKeyState_[row], col) << 0) |
                          (bitRead(KeyboardHardware.keyState_[row], col) << 1);
       if (keyState) {
-       //handleKeyswitchEvent(Key_NoKey, KeyAddr(row, col), keyState);
-        handleKeyswitchEvent(Key_NoKey, row, col, keyState);
+        handleKeyswitchEvent(Key_NoKey, ::KeyAddr(row, col), keyState);
       }
     }
     KeyboardHardware.previousKeyState_[row] = KeyboardHardware.keyState_[row];

src/kaleidoscope/hardware/ATMegaKeyboard.h

@@ -50,6 +50,7 @@ struct cRGB {
   static const int8_t matrix_columns = NUM_ARGS(COL_PINS_);              \
   static constexpr uint8_t matrix_row_pins[matrix_rows] =  ROW_PINS_;    \
   static constexpr uint8_t matrix_col_pins[matrix_columns] =  COL_PINS_; \
+  typedef MatrixAddr<NUM_ARGS(ROW_PINS_), NUM_ARGS(COL_PINS_)> KeyAddr;  \
                                                                          \
   static uint16_t previousKeyState_[matrix_rows];                        \
   static uint16_t keyState_[matrix_rows];                                \

src/kaleidoscope/hardware/kbdfans/KBD4x.h

@@ -45,7 +45,6 @@ class KBD4x: public kaleidoscope::hardware::ATMegaKeyboard {
 
   static constexpr int8_t led_count = 0;
 
-  typedef MatrixAddr<matrix_rows, matrix_columns> KeyAddr;
   static constexpr int8_t numKeys() {
     return matrix_columns * matrix_rows;
   }

src/kaleidoscope/hardware/olkb/Planck.h

@@ -42,7 +42,6 @@ class Planck: public kaleidoscope::hardware::ATMegaKeyboard {
 
   static constexpr int8_t led_count = 0;
 
-  typedef MatrixAddr<matrix_rows, matrix_columns> KeyAddr;
   static constexpr int8_t numKeys() {
     return matrix_columns * matrix_rows;
   }

src/kaleidoscope/hardware/softhruf/Splitography.h

@@ -51,7 +51,6 @@ class Splitography: public kaleidoscope::hardware::ATMegaKeyboard {
 
   static constexpr int8_t led_count = 0;
 
-  typedef MatrixAddr<matrix_rows, matrix_columns> KeyAddr;
   static constexpr int8_t numKeys() {
     return matrix_columns * matrix_rows;
   }

src/kaleidoscope/hardware/technomancy/Atreus.h

@@ -65,7 +65,6 @@ class Atreus: public kaleidoscope::hardware::ATMegaKeyboard {
 
   static constexpr int8_t led_count = 0;
 
-  typedef MatrixAddr<matrix_rows, matrix_columns> KeyAddr;
   static constexpr int8_t numKeys() {
     return matrix_columns * matrix_rows;
   }

src/kaleidoscope/hardware/technomancy/Atreus2.h

@@ -43,7 +43,6 @@ class Atreus2: public kaleidoscope::hardware::ATMegaKeyboard {
   )
   static constexpr int8_t led_count = 0;
 
-  typedef MatrixAddr<matrix_rows, matrix_columns> KeyAddr;
   static constexpr int8_t numKeys() {
     return matrix_columns * matrix_rows;
   }