aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2020-09-17 01:42:24 +0100
committerGitHub <noreply@github.com>2020-09-17 10:42:24 +1000
commite9b3a12c6e43444f5f6a6e3f63b5e4ece80740eb (patch)
tree7c574d7f5f0fa35fd6b200ea6c3ac48db553fe0f
parent424eeb8af738697e05446c0949099416955df226 (diff)
downloadfirmware-e9b3a12c6e43444f5f6a6e3f63b5e4ece80740eb.tar.gz
firmware-e9b3a12c6e43444f5f6a6e3f63b5e4ece80740eb.tar.bz2
firmware-e9b3a12c6e43444f5f6a6e3f63b5e4ece80740eb.zip
Fix ssd1306 compilation on avr-gcc 10 (#9267)
-rw-r--r--drivers/avr/ssd1306.c2
-rw-r--r--drivers/avr/ssd1306.h2
-rw-r--r--keyboards/claw44/ssd1306.c2
-rw-r--r--keyboards/claw44/ssd1306.h2
-rw-r--r--keyboards/comet46/ssd1306.c2
-rw-r--r--keyboards/comet46/ssd1306.h2
-rw-r--r--keyboards/crkbd/ssd1306.c2
-rw-r--r--keyboards/crkbd/ssd1306.h2
-rw-r--r--keyboards/helix/local_drivers/ssd1306.c2
-rw-r--r--keyboards/helix/local_drivers/ssd1306.h2
-rw-r--r--keyboards/yosino58/ssd1306.c2
-rw-r--r--keyboards/yosino58/ssd1306.h2
12 files changed, 18 insertions, 6 deletions
diff --git a/drivers/avr/ssd1306.c b/drivers/avr/ssd1306.c
index 205f74950..1a09a2bcb 100644
--- a/drivers/avr/ssd1306.c
+++ b/drivers/avr/ssd1306.c
@@ -11,6 +11,8 @@
# 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/drivers/avr/ssd1306.h b/drivers/avr/ssd1306.h
index 9669d1b7e..9131afcf6 100644
--- a/drivers/avr/ssd1306.h
+++ b/drivers/avr/ssd1306.h
@@ -66,7 +66,7 @@ struct CharacterMatrix {
bool dirty;
};
-struct CharacterMatrix display;
+extern struct CharacterMatrix display;
bool iota_gfx_init(void);
void iota_gfx_task(void);
diff --git a/keyboards/claw44/ssd1306.c b/keyboards/claw44/ssd1306.c
index e04a43135..7dea1cc17 100644
--- a/keyboards/claw44/ssd1306.c
+++ b/keyboards/claw44/ssd1306.c
@@ -10,6 +10,8 @@
#include "sendchar.h"
#include "timer.h"
+struct CharacterMatrix display;
+
extern const unsigned char font[] PROGMEM;
// Set this to 1 to help diagnose early startup problems
diff --git a/keyboards/claw44/ssd1306.h b/keyboards/claw44/ssd1306.h
index 0ca093093..11a3cc67f 100644
--- a/keyboards/claw44/ssd1306.h
+++ b/keyboards/claw44/ssd1306.h
@@ -65,7 +65,7 @@ struct CharacterMatrix {
bool dirty;
};
-struct CharacterMatrix display;
+extern struct CharacterMatrix display;
bool iota_gfx_init(bool rotate);
void iota_gfx_task(void);
diff --git a/keyboards/comet46/ssd1306.c b/keyboards/comet46/ssd1306.c
index abbed4a49..4bd2d80bc 100644
--- a/keyboards/comet46/ssd1306.c
+++ b/keyboards/comet46/ssd1306.c
@@ -10,6 +10,8 @@
#include "sendchar.h"
#include "timer.h"
+struct CharacterMatrix display;
+
extern const unsigned char font[] PROGMEM;
// Set this to 1 to help diagnose early startup problems
diff --git a/keyboards/comet46/ssd1306.h b/keyboards/comet46/ssd1306.h
index 0ca093093..11a3cc67f 100644
--- a/keyboards/comet46/ssd1306.h
+++ b/keyboards/comet46/ssd1306.h
@@ -65,7 +65,7 @@ struct CharacterMatrix {
bool dirty;
};
-struct CharacterMatrix display;
+extern struct CharacterMatrix display;
bool iota_gfx_init(bool rotate);
void iota_gfx_task(void);
diff --git a/keyboards/crkbd/ssd1306.c b/keyboards/crkbd/ssd1306.c
index b2676f386..4ec8a9a00 100644
--- a/keyboards/crkbd/ssd1306.c
+++ b/keyboards/crkbd/ssd1306.c
@@ -10,6 +10,8 @@
#include "sendchar.h"
#include "timer.h"
+struct CharacterMatrix display;
+
extern const unsigned char font[] PROGMEM;
#ifndef OLED_BLANK_CHAR
diff --git a/keyboards/crkbd/ssd1306.h b/keyboards/crkbd/ssd1306.h
index 0ca093093..11a3cc67f 100644
--- a/keyboards/crkbd/ssd1306.h
+++ b/keyboards/crkbd/ssd1306.h
@@ -65,7 +65,7 @@ struct CharacterMatrix {
bool dirty;
};
-struct CharacterMatrix display;
+extern struct CharacterMatrix display;
bool iota_gfx_init(bool rotate);
void iota_gfx_task(void);
diff --git a/keyboards/helix/local_drivers/ssd1306.c b/keyboards/helix/local_drivers/ssd1306.c
index 00b2fb0ee..c6fc4b785 100644
--- a/keyboards/helix/local_drivers/ssd1306.c
+++ b/keyboards/helix/local_drivers/ssd1306.c
@@ -16,6 +16,8 @@
#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);
diff --git a/keyboards/yosino58/ssd1306.c b/keyboards/yosino58/ssd1306.c
index ff6ba210d..abd9de2f7 100644
--- a/keyboards/yosino58/ssd1306.c
+++ b/keyboards/yosino58/ssd1306.c
@@ -10,6 +10,8 @@
#include "sendchar.h"
#include "timer.h"
+struct CharacterMatrix display;
+
extern const unsigned char font[] PROGMEM;
// Set this to 1 to help diagnose early startup problems
diff --git a/keyboards/yosino58/ssd1306.h b/keyboards/yosino58/ssd1306.h
index acaf6217e..35e4c144c 100644
--- a/keyboards/yosino58/ssd1306.h
+++ b/keyboards/yosino58/ssd1306.h
@@ -70,7 +70,7 @@ struct CharacterMatrix {
bool dirty;
};
-struct CharacterMatrix display;
+extern struct CharacterMatrix display;
bool iota_gfx_init(bool rotate);
void iota_gfx_task(void);