diff --git a/KeyboardConfig.h b/KeyboardConfig.h index a9b4aedc..08aa1b7f 100644 --- a/KeyboardConfig.h +++ b/KeyboardConfig.h @@ -2,6 +2,7 @@ #include "implementation/Model01Beta.h" + // These global proxy functions are a cheap hack to avoid // a circular dependency between the keyboard hardware class // and the 'userspace' LED implementation. If my C++ were stronger, there woudl @@ -10,3 +11,4 @@ void led_set_crgb_at(uint8_t i, cRGB crgb); void led_sync(void); + diff --git a/KeyboardioFirmware.h b/KeyboardioFirmware.h index 68a04b04..934b42c4 100644 --- a/KeyboardioFirmware.h +++ b/KeyboardioFirmware.h @@ -25,6 +25,7 @@ void setup(); #include "generated/keymaps.h" #include "key_events.h" +extern Model01Beta_ KeyboardHardware; extern uint8_t matrixState[ROWS][COLS]; extern const Key keymaps[KEYMAPS][ROWS][COLS]; diff --git a/LEDControl.h b/LEDControl.h index 9eb143e9..9f4e9d3b 100644 --- a/LEDControl.h +++ b/LEDControl.h @@ -4,6 +4,7 @@ #include "cRGB.h" #include "KeyboardConfig.h" + #define LED_MODES 7 #define LED_MODE_OFF 0 #define LED_MODE_STEADY 1 diff --git a/implementation/Model01Beta.h b/implementation/Model01Beta.h index 7a715bcd..02ce0d50 100644 --- a/implementation/Model01Beta.h +++ b/implementation/Model01Beta.h @@ -19,7 +19,6 @@ #define LEFT_COLS 8 #define LEFT_ROWS 4 -//class Model01Beta_; class Model01Beta_ { public: @@ -136,4 +135,4 @@ class Model01Beta_ { #define LED_APOSTROPHE 62 #define LED_MINUS 63 -extern Model01Beta_ KeyboardHardware; +