aboutsummaryrefslogtreecommitdiff
path: root/drivers
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 /drivers
parented76f4394fd95413f7da11e2342b0965182ccb95 (diff)
parent501f2fdef115314713e94428d409e5c3b5bfc1c2 (diff)
downloadqmk_firmware-fdfcce57e1c46765e0aebf37ad3d9611a7384241.tar.gz
qmk_firmware-fdfcce57e1c46765e0aebf37ad3d9611a7384241.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'drivers')
-rw-r--r--drivers/chibios/analog.c2
-rw-r--r--drivers/chibios/i2c_master.h2
-rw-r--r--drivers/chibios/serial.c2
-rw-r--r--drivers/chibios/serial_usart.c4
-rw-r--r--drivers/chibios/spi_master.h2
-rw-r--r--drivers/chibios/ws2812.c4
-rw-r--r--drivers/chibios/ws2812_pwm.c2
-rw-r--r--drivers/eeprom/eeprom_stm32_L0_L1.c2
-rw-r--r--drivers/haptic/solenoid.c2
-rw-r--r--drivers/qwiic/micro_oled.c2
10 files changed, 12 insertions, 12 deletions
diff --git a/drivers/chibios/analog.c b/drivers/chibios/analog.c
index 6f6db6401..2b3872afb 100644
--- a/drivers/chibios/analog.c
+++ b/drivers/chibios/analog.c
@@ -16,7 +16,7 @@
16 16
17#include "quantum.h" 17#include "quantum.h"
18#include "analog.h" 18#include "analog.h"
19#include "ch.h" 19#include <ch.h>
20#include <hal.h> 20#include <hal.h>
21 21
22#if !HAL_USE_ADC 22#if !HAL_USE_ADC
diff --git a/drivers/chibios/i2c_master.h b/drivers/chibios/i2c_master.h
index b3e234e16..c68109acb 100644
--- a/drivers/chibios/i2c_master.h
+++ b/drivers/chibios/i2c_master.h
@@ -24,7 +24,7 @@
24 */ 24 */
25#pragma once 25#pragma once
26 26
27#include "ch.h" 27#include <ch.h>
28#include <hal.h> 28#include <hal.h>
29 29
30#ifdef I2C1_BANK 30#ifdef I2C1_BANK
diff --git a/drivers/chibios/serial.c b/drivers/chibios/serial.c
index 26c680653..54f7e1321 100644
--- a/drivers/chibios/serial.c
+++ b/drivers/chibios/serial.c
@@ -6,7 +6,7 @@
6#include "serial.h" 6#include "serial.h"
7#include "wait.h" 7#include "wait.h"
8 8
9#include "hal.h" 9#include <hal.h>
10 10
11// TODO: resolve/remove build warnings 11// TODO: resolve/remove build warnings
12#if defined(RGBLIGHT_ENABLE) && defined(RGBLED_SPLIT) && defined(PROTOCOL_CHIBIOS) && defined(WS2812_DRIVER_BITBANG) 12#if defined(RGBLIGHT_ENABLE) && defined(RGBLED_SPLIT) && defined(PROTOCOL_CHIBIOS) && defined(WS2812_DRIVER_BITBANG)
diff --git a/drivers/chibios/serial_usart.c b/drivers/chibios/serial_usart.c
index 72fcaed0c..827471761 100644
--- a/drivers/chibios/serial_usart.c
+++ b/drivers/chibios/serial_usart.c
@@ -2,8 +2,8 @@
2#include "serial.h" 2#include "serial.h"
3#include "printf.h" 3#include "printf.h"
4 4
5#include "ch.h" 5#include <ch.h>
6#include "hal.h" 6#include <hal.h>
7 7
8#ifndef USART_CR1_M0 8#ifndef USART_CR1_M0
9# define USART_CR1_M0 USART_CR1_M // some platforms (f1xx) dont have this so 9# define USART_CR1_M0 USART_CR1_M // some platforms (f1xx) dont have this so
diff --git a/drivers/chibios/spi_master.h b/drivers/chibios/spi_master.h
index 0c18587c9..5953bef77 100644
--- a/drivers/chibios/spi_master.h
+++ b/drivers/chibios/spi_master.h
@@ -18,7 +18,7 @@
18 18
19#include <ch.h> 19#include <ch.h>
20#include <hal.h> 20#include <hal.h>
21#include <quantum.h> 21#include "quantum.h"
22 22
23#ifndef SPI_DRIVER 23#ifndef SPI_DRIVER
24# define SPI_DRIVER SPID2 24# define SPI_DRIVER SPID2
diff --git a/drivers/chibios/ws2812.c b/drivers/chibios/ws2812.c
index 504fb4f07..59ed90374 100644
--- a/drivers/chibios/ws2812.c
+++ b/drivers/chibios/ws2812.c
@@ -1,7 +1,7 @@
1#include "quantum.h" 1#include "quantum.h"
2#include "ws2812.h" 2#include "ws2812.h"
3#include "ch.h" 3#include <ch.h>
4#include "hal.h" 4#include <hal.h>
5 5
6/* Adapted from https://github.com/bigjosh/SimpleNeoPixelDemo/ */ 6/* Adapted from https://github.com/bigjosh/SimpleNeoPixelDemo/ */
7 7
diff --git a/drivers/chibios/ws2812_pwm.c b/drivers/chibios/ws2812_pwm.c
index 14be0a9ed..7595e2fa2 100644
--- a/drivers/chibios/ws2812_pwm.c
+++ b/drivers/chibios/ws2812_pwm.c
@@ -1,6 +1,6 @@
1#include "ws2812.h" 1#include "ws2812.h"
2#include "quantum.h" 2#include "quantum.h"
3#include "hal.h" 3#include <hal.h>
4 4
5/* Adapted from https://github.com/joewa/WS2812-LED-Driver_ChibiOS/ */ 5/* Adapted from https://github.com/joewa/WS2812-LED-Driver_ChibiOS/ */
6 6
diff --git a/drivers/eeprom/eeprom_stm32_L0_L1.c b/drivers/eeprom/eeprom_stm32_L0_L1.c
index b62e6ffd7..ed26cc714 100644
--- a/drivers/eeprom/eeprom_stm32_L0_L1.c
+++ b/drivers/eeprom/eeprom_stm32_L0_L1.c
@@ -17,7 +17,7 @@
17#include <stdint.h> 17#include <stdint.h>
18#include <string.h> 18#include <string.h>
19 19
20#include "hal.h" 20#include <hal.h>
21#include "eeprom_driver.h" 21#include "eeprom_driver.h"
22#include "eeprom_stm32_L0_L1.h" 22#include "eeprom_stm32_L0_L1.h"
23 23
diff --git a/drivers/haptic/solenoid.c b/drivers/haptic/solenoid.c
index 2975ef893..3e61d5a17 100644
--- a/drivers/haptic/solenoid.c
+++ b/drivers/haptic/solenoid.c
@@ -15,7 +15,7 @@
15 * along with this program. If not, see <http://www.gnu.org/licenses/>. 15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18#include <timer.h> 18#include "timer.h"
19#include "solenoid.h" 19#include "solenoid.h"
20#include "haptic.h" 20#include "haptic.h"
21 21
diff --git a/drivers/qwiic/micro_oled.c b/drivers/qwiic/micro_oled.c
index bed6b2507..f63cf2e64 100644
--- a/drivers/qwiic/micro_oled.c
+++ b/drivers/qwiic/micro_oled.c
@@ -28,7 +28,7 @@
28 * along with this program. If not, see <http://www.gnu.org/licenses/>. 28 * along with this program. If not, see <http://www.gnu.org/licenses/>.
29 */ 29 */
30#include "micro_oled.h" 30#include "micro_oled.h"
31#include <print.h> 31#include "print.h"
32#include <stdlib.h> 32#include <stdlib.h>
33#include "util/font5x7.h" 33#include "util/font5x7.h"
34#include "util/font8x16.h" 34#include "util/font8x16.h"
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 15:18:54 +0000