diff options
author | stein3 <stein3@gmail.com> | 2020-10-06 07:15:41 -0700 |
---|---|---|
committer | stein3 <stein3@gmail.com> | 2020-10-06 07:15:41 -0700 |
commit | 2e402741a89c5eec8cf30c966ce6f36d6ec9249b (patch) | |
tree | 3592e8c5e6bd19943ae55db7fc02a5f755afbb51 /keyboards/helix/local_drivers | |
parent | 3e5e4f74272c610bb9fa737f674f8e65ed6100ca (diff) | |
parent | 2013f6313430b977e557e482d30daa279a46e75d (diff) | |
download | qmk_firmware-2e402741a89c5eec8cf30c966ce6f36d6ec9249b.tar.gz |
Merge branch 'master' into meteor
Diffstat (limited to 'keyboards/helix/local_drivers')
-rw-r--r-- | keyboards/helix/local_drivers/ssd1306.c | 5 | ||||
-rw-r--r-- | keyboards/helix/local_drivers/ssd1306.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/keyboards/helix/local_drivers/ssd1306.c b/keyboards/helix/local_drivers/ssd1306.c index dd3290ba0..c6fc4b785 100644 --- a/keyboards/helix/local_drivers/ssd1306.c +++ b/keyboards/helix/local_drivers/ssd1306.c @@ -10,15 +10,14 @@ #else #include <helixfont.h> #endif -#ifdef ADAFRUIT_BLE_ENABLE -#include "adafruit_ble.h" -#endif #ifdef PROTOCOL_LUFA #include "lufa.h" #endif #include "sendchar.h" #include "timer.h" +struct CharacterMatrix display; + // Set this to 1 to help diagnose early startup problems // when testing power-on with ble. Turn it off otherwise, // as the latency of printing most of the debug info messes diff --git a/keyboards/helix/local_drivers/ssd1306.h b/keyboards/helix/local_drivers/ssd1306.h index f9f91c6fe..bcb30f885 100644 --- a/keyboards/helix/local_drivers/ssd1306.h +++ b/keyboards/helix/local_drivers/ssd1306.h @@ -66,7 +66,7 @@ struct CharacterMatrix { bool dirty; }; -struct CharacterMatrix display; +extern struct CharacterMatrix display; bool iota_gfx_init(bool rotate); void iota_gfx_task(void); |