diff options
author | QMK Bot <hello@qmk.fm> | 2020-12-16 03:27:52 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2020-12-16 03:27:52 +0000 |
commit | 2e0f2025bd9f400dd8f5b0cad8ba80667193408d (patch) | |
tree | 2e3d0fb98b20bdd4e39b4719abdffe4e29e242e9 /keyboards/helix | |
parent | 416dea2c54c885a1d58d6924be6b346c8eb87f47 (diff) | |
parent | 9366ed728280f4875ebbba9c0ef1eade03c96d35 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/helix')
-rw-r--r-- | keyboards/helix/local_drivers/ssd1306.c | 2 | ||||
-rw-r--r-- | keyboards/helix/rev1/config.h | 2 | ||||
-rw-r--r-- | keyboards/helix/rev1/keymaps/OLED_sample/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/helix/rev2/keymaps/five_rows/oled_display.c | 4 | ||||
-rw-r--r-- | keyboards/helix/rev2/split_scomm.c | 4 | ||||
-rw-r--r-- | keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/keyboards/helix/local_drivers/ssd1306.c b/keyboards/helix/local_drivers/ssd1306.c index c6fc4b7854..1cfb38037c 100644 --- a/keyboards/helix/local_drivers/ssd1306.c +++ b/keyboards/helix/local_drivers/ssd1306.c @@ -8,7 +8,7 @@ #ifndef LOCAL_GLCDFONT #include "common/glcdfont.c" #else -#include <helixfont.h> +#include "helixfont.h" #endif #ifdef PROTOCOL_LUFA #include "lufa.h" diff --git a/keyboards/helix/rev1/config.h b/keyboards/helix/rev1/config.h index 6c6ebea68a..7e9616ba18 100644 --- a/keyboards/helix/rev1/config.h +++ b/keyboards/helix/rev1/config.h @@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define PRODUCT Helix Alpha #define DESCRIPTION A split keyboard for the cheap makers -#include <serial_config.h> +#include "serial_config.h" #define HELIX_ROWS 5 diff --git a/keyboards/helix/rev1/keymaps/OLED_sample/keymap.c b/keyboards/helix/rev1/keymaps/OLED_sample/keymap.c index cc73e36fb6..6838b90e5e 100644 --- a/keyboards/helix/rev1/keymaps/OLED_sample/keymap.c +++ b/keyboards/helix/rev1/keymaps/OLED_sample/keymap.c @@ -1,6 +1,6 @@ #include QMK_KEYBOARD_H #include "bootloader.h" -#include "LUFA/Drivers/Peripheral/TWI.h" +#include <LUFA/Drivers/Peripheral/TWI.h> #ifdef AUDIO_ENABLE #include "audio.h" #endif diff --git a/keyboards/helix/rev2/keymaps/five_rows/oled_display.c b/keyboards/helix/rev2/keymaps/five_rows/oled_display.c index c1f039e5b1..127d80cc7d 100644 --- a/keyboards/helix/rev2/keymaps/five_rows/oled_display.c +++ b/keyboards/helix/rev2/keymaps/five_rows/oled_display.c @@ -17,12 +17,12 @@ #include QMK_KEYBOARD_H #include <stdio.h> #ifdef CONSOLE_ENABLE - #include <print.h> + #include "print.h" #endif #ifdef SSD1306OLED #include "ssd1306.h" #endif -#include "string.h" +#include <string.h> #include "layer_number.h" extern int current_default_layer; diff --git a/keyboards/helix/rev2/split_scomm.c b/keyboards/helix/rev2/split_scomm.c index ada7867960..378781b98c 100644 --- a/keyboards/helix/rev2/split_scomm.c +++ b/keyboards/helix/rev2/split_scomm.c @@ -5,10 +5,10 @@ #include <stdbool.h> #include <stdint.h> #include <stddef.h> -#include <split_scomm.h> +#include "split_scomm.h" #include "serial.h" #ifdef CONSOLE_ENABLE - #include <print.h> + #include "print.h" #endif uint8_t volatile serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH] = {0}; diff --git a/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c b/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c index c1f039e5b1..127d80cc7d 100644 --- a/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c +++ b/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c @@ -17,12 +17,12 @@ #include QMK_KEYBOARD_H #include <stdio.h> #ifdef CONSOLE_ENABLE - #include <print.h> + #include "print.h" #endif #ifdef SSD1306OLED #include "ssd1306.h" #endif -#include "string.h" +#include <string.h> #include "layer_number.h" extern int current_default_layer; |