summaryrefslogtreecommitdiff
path: root/quantum
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2020-12-11 02:46:19 +0000
committerQMK Bot <hello@qmk.fm>2020-12-11 02:46:19 +0000
commitfdfcce57e1c46765e0aebf37ad3d9611a7384241 (patch)
tree9524405fef6cc3b16965517735dc0ef315f67ab1 /quantum
parented76f4394fd95413f7da11e2342b0965182ccb95 (diff)
parent501f2fdef115314713e94428d409e5c3b5bfc1c2 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum')
-rw-r--r--quantum/audio/audio_chibios.c4
-rw-r--r--quantum/audio/luts.h4
-rw-r--r--quantum/fauxclicky.c6
-rw-r--r--quantum/fauxclicky.h2
-rw-r--r--quantum/keymap.h2
-rw-r--r--quantum/process_keycode/process_key_lock.c4
-rw-r--r--quantum/quantum.h2
-rw-r--r--quantum/rgb_matrix.c2
-rw-r--r--quantum/rgblight.c6
-rw-r--r--quantum/serial_link/system/serial_link.c2
-rw-r--r--quantum/serial_link/system/serial_link.h2
-rw-r--r--quantum/split_common/split_util.c2
-rw-r--r--quantum/split_common/transport.h2
-rw-r--r--quantum/via.h2
-rw-r--r--quantum/visualizer/lcd_backlight.h2
-rw-r--r--quantum/visualizer/led_backlight_keyframes.c2
-rw-r--r--quantum/visualizer/visualizer.c2
17 files changed, 24 insertions, 24 deletions
diff --git a/quantum/audio/audio_chibios.c b/quantum/audio/audio_chibios.c
index fba7c59873..1f147f2c92 100644
--- a/quantum/audio/audio_chibios.c
+++ b/quantum/audio/audio_chibios.c
@@ -15,8 +15,8 @@
*/
#include "audio.h"
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
#include <string.h>
#include "print.h"
diff --git a/quantum/audio/luts.h b/quantum/audio/luts.h
index 117d74cd00..6fdd3b4635 100644
--- a/quantum/audio/luts.h
+++ b/quantum/audio/luts.h
@@ -19,8 +19,8 @@
# include <avr/interrupt.h>
# include <avr/pgmspace.h>
#else
-# include "ch.h"
-# include "hal.h"
+# include <ch.h>
+# include <hal.h>
#endif
#ifndef LUTS_H
diff --git a/quantum/fauxclicky.c b/quantum/fauxclicky.c
index a57e2ed075..53499c9c1e 100644
--- a/quantum/fauxclicky.c
+++ b/quantum/fauxclicky.c
@@ -15,10 +15,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <avr/interrupt.h>
#include <avr/io.h>
-#include <timer.h>
-#include <fauxclicky.h>
+#include "timer.h"
+#include "fauxclicky.h"
#include <stdbool.h>
-#include <musical_notes.h>
+#include "musical_notes.h"
bool fauxclicky_enabled = true;
uint16_t note_start = 0;
diff --git a/quantum/fauxclicky.h b/quantum/fauxclicky.h
index 5c056918a7..bfaacf9096 100644
--- a/quantum/fauxclicky.h
+++ b/quantum/fauxclicky.h
@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
#include "musical_notes.h"
-#include "stdbool.h"
+#include <stdbool.h>
__attribute__((weak)) float fauxclicky_pressed_note[2] = MUSICAL_NOTE(_D4, 0.25);
__attribute__((weak)) float fauxclicky_released_note[2] = MUSICAL_NOTE(_C4, 0.125);
diff --git a/quantum/keymap.h b/quantum/keymap.h
index de3bece11e..90a2398ba4 100644
--- a/quantum/keymap.h
+++ b/quantum/keymap.h
@@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# include <avr/pgmspace.h>
#elif defined PROTOCOL_CHIBIOS
// We need to ensure that chibios is include before redefining reset
-# include "ch.h"
+# include <ch.h>
#endif
#include "keycode.h"
#include "action_macro.h"
diff --git a/quantum/process_keycode/process_key_lock.c b/quantum/process_keycode/process_key_lock.c
index 602127a74b..4bd58f0c1e 100644
--- a/quantum/process_keycode/process_key_lock.c
+++ b/quantum/process_keycode/process_key_lock.c
@@ -14,8 +14,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "inttypes.h"
-#include "stdint.h"
+#include <inttypes.h>
+#include <stdint.h>
#include "process_key_lock.h"
#define BV_64(shift) (((uint64_t)1) << (shift))
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 59c3dd4904..9b2b9dee6b 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -21,7 +21,7 @@
# include <avr/interrupt.h>
#endif
#if defined(PROTOCOL_CHIBIOS)
-# include "hal.h"
+# include <hal.h>
# include "chibios_config.h"
#endif
diff --git a/quantum/rgb_matrix.c b/quantum/rgb_matrix.c
index a3dd51f7b3..fd04adc27e 100644
--- a/quantum/rgb_matrix.c
+++ b/quantum/rgb_matrix.c
@@ -23,7 +23,7 @@
#include <string.h>
#include <math.h>
-#include "lib/lib8tion/lib8tion.h"
+#include <lib/lib8tion/lib8tion.h>
#ifndef RGB_MATRIX_CENTER
const point_t k_rgb_matrix_center = {112, 32};
diff --git a/quantum/rgblight.c b/quantum/rgblight.c
index 65308572db..c6d84ccd66 100644
--- a/quantum/rgblight.c
+++ b/quantum/rgblight.c
@@ -24,7 +24,7 @@
# include "eeprom.h"
#endif
#ifdef STM32_EEPROM_ENABLE
-# include "hal.h"
+# include <hal.h>
# include "eeprom_stm32.h"
#endif
#include "wait.h"
@@ -34,7 +34,7 @@
#include "color.h"
#include "debug.h"
#include "led_tables.h"
-#include "lib/lib8tion/lib8tion.h"
+#include <lib/lib8tion/lib8tion.h>
#ifdef VELOCIKEY_ENABLE
# include "velocikey.h"
#endif
@@ -982,7 +982,7 @@ void rgblight_task(void) {
# ifndef RGBLIGHT_BREATHE_TABLE_SIZE
# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256 or 128 or 64
# endif
-# include <rgblight_breathe_table.h>
+# include "rgblight_breathe_table.h"
# endif
__attribute__((weak)) const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {30, 20, 10, 5};
diff --git a/quantum/serial_link/system/serial_link.c b/quantum/serial_link/system/serial_link.c
index c59c068944..f77483ad8c 100644
--- a/quantum/serial_link/system/serial_link.c
+++ b/quantum/serial_link/system/serial_link.c
@@ -24,7 +24,7 @@ SOFTWARE.
#include "report.h"
#include "host_driver.h"
#include "serial_link/system/serial_link.h"
-#include "hal.h"
+#include <hal.h>
#include "serial_link/protocol/byte_stuffer.h"
#include "serial_link/protocol/transport.h"
#include "serial_link/protocol/frame_router.h"
diff --git a/quantum/serial_link/system/serial_link.h b/quantum/serial_link/system/serial_link.h
index f48fbe9ea7..b6a4739575 100644
--- a/quantum/serial_link/system/serial_link.h
+++ b/quantum/serial_link/system/serial_link.h
@@ -36,7 +36,7 @@ host_driver_t* get_serial_link_driver(void);
void serial_link_update(void);
#if defined(PROTOCOL_CHIBIOS)
-# include "ch.h"
+# include <ch.h>
static inline void serial_link_lock(void) { chSysLock(); }
diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c
index e8e944d710..97d49961dc 100644
--- a/quantum/split_common/split_util.c
+++ b/quantum/split_common/split_util.c
@@ -12,7 +12,7 @@
#endif
#ifdef PROTOCOL_VUSB
-# include "usbdrv.h"
+# include <usbdrv/usbdrv.h>
#endif
#ifdef EE_HANDS
diff --git a/quantum/split_common/transport.h b/quantum/split_common/transport.h
index ccce57e444..f3e752bf9b 100644
--- a/quantum/split_common/transport.h
+++ b/quantum/split_common/transport.h
@@ -1,6 +1,6 @@
#pragma once
-#include <common/matrix.h>
+#include "common/matrix.h"
void transport_master_init(void);
void transport_slave_init(void);
diff --git a/quantum/via.h b/quantum/via.h
index 373843f901..d0510fcabd 100644
--- a/quantum/via.h
+++ b/quantum/via.h
@@ -16,7 +16,7 @@
#pragma once
-#include <tmk_core/common/eeconfig.h> // for EECONFIG_SIZE
+#include "tmk_core/common/eeconfig.h" // for EECONFIG_SIZE
// Keyboard level code can change where VIA stores the magic.
// The magic is the build date YYMMDD encoded as BCD in 3 bytes,
diff --git a/quantum/visualizer/lcd_backlight.h b/quantum/visualizer/lcd_backlight.h
index 7b0b6a9fd5..0a1535edf5 100644
--- a/quantum/visualizer/lcd_backlight.h
+++ b/quantum/visualizer/lcd_backlight.h
@@ -24,7 +24,7 @@ SOFTWARE.
#ifndef LCD_BACKLIGHT_H_
#define LCD_BACKLIGHT_H_
-#include "stdint.h"
+#include <stdint.h>
// Helper macros for storing hue, staturation and intensity as unsigned integers
#define LCD_COLOR(hue, saturation, intensity) (hue << 16 | saturation << 8 | intensity)
diff --git a/quantum/visualizer/led_backlight_keyframes.c b/quantum/visualizer/led_backlight_keyframes.c
index d81117d2be..338ada5227 100644
--- a/quantum/visualizer/led_backlight_keyframes.c
+++ b/quantum/visualizer/led_backlight_keyframes.c
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
#include "gfx.h"
-#include "math.h"
+#include <math.h>
#include "led_backlight_keyframes.h"
static uint8_t fade_led_color(keyframe_animation_t* animation, int from, int to) {
diff --git a/quantum/visualizer/visualizer.c b/quantum/visualizer/visualizer.c
index 9e9cb6d410..709affbb77 100644
--- a/quantum/visualizer/visualizer.c
+++ b/quantum/visualizer/visualizer.c
@@ -26,7 +26,7 @@ SOFTWARE.
#include "visualizer.h"
#include <string.h>
#ifdef PROTOCOL_CHIBIOS
-# include "ch.h"
+# include <ch.h>
#endif
#include "gfx.h"