jbrechtel/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Normalise include statements in core code (#11153)

Browse Source 
* Normalise include statements in core code

* Missed one
This commit is contained in:
Ryan
2020-12-11 13:45:24 +11:00
committed by Drashna Jael're
parent 63d0fe05bb
commit 8d5fa95f4f
48 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/chibios/analog.c
View File

@@ -16,7 +16,7 @@
#include "quantum.h" #include "quantum.h"
#include "analog.h" #include "analog.h"
#include "ch.h" #include <ch.h>
#include <hal.h> #include <hal.h>
#if !HAL_USE_ADC #if !HAL_USE_ADC

2
drivers/chibios/i2c_master.h
View File

@@ -24,7 +24,7 @@
*/ */
#pragma once #pragma once
#include "ch.h" #include <ch.h>
#include <hal.h> #include <hal.h>
#ifdef I2C1_BANK #ifdef I2C1_BANK

2
drivers/chibios/serial.c
View File

@@ -6,7 +6,7 @@
#include "serial.h" #include "serial.h"
#include "wait.h" #include "wait.h"
#include "hal.h" #include <hal.h>
// TODO: resolve/remove build warnings // TODO: resolve/remove build warnings
#if defined(RGBLIGHT_ENABLE) && defined(RGBLED_SPLIT) && defined(PROTOCOL_CHIBIOS) && defined(WS2812_DRIVER_BITBANG) #if defined(RGBLIGHT_ENABLE) && defined(RGBLED_SPLIT) && defined(PROTOCOL_CHIBIOS) && defined(WS2812_DRIVER_BITBANG)

4
drivers/chibios/serial_usart.c
View File

@@ -2,8 +2,8 @@
#include "serial.h" #include "serial.h"
#include "printf.h" #include "printf.h"
#include "ch.h" #include <ch.h>
#include "hal.h" #include <hal.h>
#ifndef USART_CR1_M0 #ifndef USART_CR1_M0
# define USART_CR1_M0 USART_CR1_M // some platforms (f1xx) dont have this so # define USART_CR1_M0 USART_CR1_M // some platforms (f1xx) dont have this so

2
drivers/chibios/spi_master.h
View File

@@ -18,7 +18,7 @@
#include <ch.h> #include <ch.h>
#include <hal.h> #include <hal.h>
#include <quantum.h> #include "quantum.h"
#ifndef SPI_DRIVER #ifndef SPI_DRIVER
# define SPI_DRIVER SPID2 # define SPI_DRIVER SPID2

4
drivers/chibios/ws2812.c
View File

@@ -1,7 +1,7 @@
#include "quantum.h" #include "quantum.h"
#include "ws2812.h" #include "ws2812.h"
#include "ch.h" #include <ch.h>
#include "hal.h" #include <hal.h>
/* Adapted from https://github.com/bigjosh/SimpleNeoPixelDemo/ */ /* Adapted from https://github.com/bigjosh/SimpleNeoPixelDemo/ */

2
drivers/chibios/ws2812_pwm.c
View File

@@ -1,6 +1,6 @@
#include "ws2812.h" #include "ws2812.h"
#include "quantum.h" #include "quantum.h"
#include "hal.h" #include <hal.h>
/* Adapted from https://github.com/joewa/WS2812-LED-Driver_ChibiOS/ */ /* Adapted from https://github.com/joewa/WS2812-LED-Driver_ChibiOS/ */

2
drivers/eeprom/eeprom_stm32_L0_L1.c
View File

@@ -17,7 +17,7 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include "hal.h" #include <hal.h>
#include "eeprom_driver.h" #include "eeprom_driver.h"
#include "eeprom_stm32_L0_L1.h" #include "eeprom_stm32_L0_L1.h"

2
drivers/haptic/solenoid.c
View File

@@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <timer.h> #include "timer.h"
#include "solenoid.h" #include "solenoid.h"
#include "haptic.h" #include "haptic.h"

2
drivers/qwiic/micro_oled.c
View File

@@ -28,7 +28,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "micro_oled.h" #include "micro_oled.h"
#include <print.h> #include "print.h"
#include <stdlib.h> #include <stdlib.h>
#include "util/font5x7.h" #include "util/font5x7.h"
#include "util/font8x16.h" #include "util/font8x16.h"

4
platforms/chibios/GENERIC_STM32_F042X6/board/board.c
View File

@@ -19,8 +19,8 @@
* generator plugin. Do not edit manually. * generator plugin. Do not edit manually.
*/ */
#include "hal.h" #include <hal.h>
#include "stm32_gpio.h" #include <stm32_gpio.h>
/*===========================================================================*/ /*===========================================================================*/
/* Driver local definitions. */ /* Driver local definitions. */

2
platforms/chibios/IC_TEENSY_3_1/board/board.c
View File

@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
#include "hal.h" #include <hal.h>
#if HAL_USE_PAL || defined(__DOXYGEN__) #if HAL_USE_PAL || defined(__DOXYGEN__)
/** /**

2
platforms/chibios/STM32_F103_STM32DUINO/board/board.c
View File

@@ -14,7 +14,7 @@
limitations under the License. limitations under the License.
*/ */
#include "hal.h" #include <hal.h>
// Value to place in RTC backup register 10 for persistent bootloader mode // Value to place in RTC backup register 10 for persistent bootloader mode
#define RTC_BOOTLOADER_FLAG 0x424C #define RTC_BOOTLOADER_FLAG 0x424C

4
quantum/audio/audio_chibios.c
View File

@@ -15,8 +15,8 @@
*/ */
#include "audio.h" #include "audio.h"
#include "ch.h" #include <ch.h>
#include "hal.h" #include <hal.h>
#include <string.h> #include <string.h>
#include "print.h" #include "print.h"

4
quantum/audio/luts.h
View File

@@ -19,8 +19,8 @@
# include <avr/interrupt.h> # include <avr/interrupt.h>
# include <avr/pgmspace.h> # include <avr/pgmspace.h>
#else #else
# include "ch.h" # include <ch.h>
# include "hal.h" # include <hal.h>
#endif #endif
#ifndef LUTS_H #ifndef LUTS_H

6
quantum/fauxclicky.c
View File

@@ -15,10 +15,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <avr/io.h> #include <avr/io.h>
#include <timer.h> #include "timer.h"
#include <fauxclicky.h> #include "fauxclicky.h"
#include <stdbool.h> #include <stdbool.h>
#include <musical_notes.h> #include "musical_notes.h"
bool fauxclicky_enabled = true; bool fauxclicky_enabled = true;
uint16_t note_start = 0; uint16_t note_start = 0;

2
quantum/fauxclicky.h
View File

@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif #endif
#include "musical_notes.h" #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_pressed_note[2] = MUSICAL_NOTE(_D4, 0.25);
__attribute__((weak)) float fauxclicky_released_note[2] = MUSICAL_NOTE(_C4, 0.125); __attribute__((weak)) float fauxclicky_released_note[2] = MUSICAL_NOTE(_C4, 0.125);

2
quantum/keymap.h
View File

@@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# include <avr/pgmspace.h> # include <avr/pgmspace.h>
#elif defined PROTOCOL_CHIBIOS #elif defined PROTOCOL_CHIBIOS
// We need to ensure that chibios is include before redefining reset // We need to ensure that chibios is include before redefining reset
# include "ch.h" # include <ch.h>
#endif #endif
#include "keycode.h" #include "keycode.h"
#include "action_macro.h" #include "action_macro.h"

4
quantum/process_keycode/process_key_lock.c
View File

@@ -14,8 +14,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "inttypes.h" #include <inttypes.h>
#include "stdint.h" #include <stdint.h>
#include "process_key_lock.h" #include "process_key_lock.h"
#define BV_64(shift) (((uint64_t)1) << (shift)) #define BV_64(shift) (((uint64_t)1) << (shift))

2
quantum/quantum.h
View File

@@ -21,7 +21,7 @@
# include <avr/interrupt.h> # include <avr/interrupt.h>
#endif #endif
#if defined(PROTOCOL_CHIBIOS) #if defined(PROTOCOL_CHIBIOS)
# include "hal.h" # include <hal.h>
# include "chibios_config.h" # include "chibios_config.h"
#endif #endif

2
quantum/rgb_matrix.c
View File

@@ -23,7 +23,7 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include "lib/lib8tion/lib8tion.h" #include <lib/lib8tion/lib8tion.h>
#ifndef RGB_MATRIX_CENTER #ifndef RGB_MATRIX_CENTER
const point_t k_rgb_matrix_center = {112, 32}; const point_t k_rgb_matrix_center = {112, 32};

6
quantum/rgblight.c
View File

@@ -24,7 +24,7 @@
# include "eeprom.h" # include "eeprom.h"
#endif #endif
#ifdef STM32_EEPROM_ENABLE #ifdef STM32_EEPROM_ENABLE
# include "hal.h" # include <hal.h>
# include "eeprom_stm32.h" # include "eeprom_stm32.h"
#endif #endif
#include "wait.h" #include "wait.h"
@@ -34,7 +34,7 @@
#include "color.h" #include "color.h"
#include "debug.h" #include "debug.h"
#include "led_tables.h" #include "led_tables.h"
#include "lib/lib8tion/lib8tion.h" #include <lib/lib8tion/lib8tion.h>
#ifdef VELOCIKEY_ENABLE #ifdef VELOCIKEY_ENABLE
# include "velocikey.h" # include "velocikey.h"
#endif #endif
@@ -985,7 +985,7 @@ void rgblight_task(void) {
# ifndef RGBLIGHT_BREATHE_TABLE_SIZE # ifndef RGBLIGHT_BREATHE_TABLE_SIZE
# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256 or 128 or 64 # define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256 or 128 or 64
# endif # endif
# include <rgblight_breathe_table.h> # include "rgblight_breathe_table.h"
# endif # endif
__attribute__((weak)) const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {30, 20, 10, 5}; __attribute__((weak)) const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {30, 20, 10, 5};

2
quantum/serial_link/system/serial_link.c
View File

@@ -24,7 +24,7 @@ SOFTWARE.
#include "report.h" #include "report.h"
#include "host_driver.h" #include "host_driver.h"
#include "serial_link/system/serial_link.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/byte_stuffer.h"
#include "serial_link/protocol/transport.h" #include "serial_link/protocol/transport.h"
#include "serial_link/protocol/frame_router.h" #include "serial_link/protocol/frame_router.h"

2
quantum/serial_link/system/serial_link.h
View File

@@ -36,7 +36,7 @@ host_driver_t* get_serial_link_driver(void);
void serial_link_update(void); void serial_link_update(void);
#if defined(PROTOCOL_CHIBIOS) #if defined(PROTOCOL_CHIBIOS)
# include "ch.h" # include <ch.h>
static inline void serial_link_lock(void) { chSysLock(); } static inline void serial_link_lock(void) { chSysLock(); }

2
quantum/split_common/split_util.c
View File

@@ -12,7 +12,7 @@
#endif #endif
#ifdef PROTOCOL_VUSB #ifdef PROTOCOL_VUSB
# include "usbdrv.h" # include <usbdrv/usbdrv.h>
#endif #endif
#ifdef EE_HANDS #ifdef EE_HANDS

2
quantum/split_common/transport.h
View File

@@ -1,6 +1,6 @@
#pragma once #pragma once
#include <common/matrix.h> #include "common/matrix.h"
void transport_master_init(void); void transport_master_init(void);
void transport_slave_init(void); void transport_slave_init(void);

2
quantum/via.h
View File

@@ -16,7 +16,7 @@
#pragma once #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. // Keyboard level code can change where VIA stores the magic.
// The magic is the build date YYMMDD encoded as BCD in 3 bytes, // The magic is the build date YYMMDD encoded as BCD in 3 bytes,

2
quantum/visualizer/lcd_backlight.h
View File

@@ -24,7 +24,7 @@ SOFTWARE.
#ifndef LCD_BACKLIGHT_H_ #ifndef LCD_BACKLIGHT_H_
#define LCD_BACKLIGHT_H_ #define LCD_BACKLIGHT_H_
#include "stdint.h" #include <stdint.h>
// Helper macros for storing hue, staturation and intensity as unsigned integers // Helper macros for storing hue, staturation and intensity as unsigned integers
#define LCD_COLOR(hue, saturation, intensity) (hue << 16 | saturation << 8 | intensity) #define LCD_COLOR(hue, saturation, intensity) (hue << 16 | saturation << 8 | intensity)

2
quantum/visualizer/led_backlight_keyframes.c
View File

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#include "gfx.h" #include "gfx.h"
#include "math.h" #include <math.h>
#include "led_backlight_keyframes.h" #include "led_backlight_keyframes.h"
static uint8_t fade_led_color(keyframe_animation_t* animation, int from, int to) { static uint8_t fade_led_color(keyframe_animation_t* animation, int from, int to) {

2
quantum/visualizer/visualizer.c
View File

@@ -26,7 +26,7 @@ SOFTWARE.
#include "visualizer.h" #include "visualizer.h"
#include <string.h> #include <string.h>
#ifdef PROTOCOL_CHIBIOS #ifdef PROTOCOL_CHIBIOS
# include "ch.h" # include <ch.h>
#endif #endif
#include "gfx.h" #include "gfx.h"

2
tmk_core/common/action.c
View File

@@ -48,7 +48,7 @@ int retro_tapping_counter = 0;
#endif #endif
#ifdef FAUXCLICKY_ENABLE #ifdef FAUXCLICKY_ENABLE
# include <fauxclicky.h> # include "fauxclicky.h"
#endif #endif
#ifdef IGNORE_MOD_TAP_INTERRUPT_PER_KEY #ifdef IGNORE_MOD_TAP_INTERRUPT_PER_KEY

4
tmk_core/common/chibios/bootloader.c
View File

@@ -1,7 +1,7 @@
#include "bootloader.h" #include "bootloader.h"
#include "ch.h" #include <ch.h>
#include "hal.h" #include <hal.h>
#include "wait.h" #include "wait.h"
/* This code should be checked whether it runs correctly on platforms */ /* This code should be checked whether it runs correctly on platforms */

4
tmk_core/common/chibios/eeprom_stm32.h
View File

@@ -24,8 +24,8 @@
#ifndef __EEPROM_H #ifndef __EEPROM_H
#define __EEPROM_H #define __EEPROM_H
#include "ch.h" #include <ch.h>
#include "hal.h" #include <hal.h>
#include "flash_stm32.h" #include "flash_stm32.h"
// HACK ALERT. This definition may not match your processor // HACK ALERT. This definition may not match your processor

4
tmk_core/common/chibios/eeprom_teensy.c
View File

@@ -1,5 +1,5 @@
#include "ch.h" #include <ch.h>
#include "hal.h" #include <hal.h>
#include "eeconfig.h" #include "eeconfig.h"

4
tmk_core/common/chibios/flash_stm32.h
View File

@@ -23,8 +23,8 @@
extern "C" { extern "C" {
#endif #endif
#include "ch.h" #include <ch.h>
#include "hal.h" #include <hal.h>
typedef enum { FLASH_BUSY = 1, FLASH_ERROR_PG, FLASH_ERROR_WRP, FLASH_ERROR_OPT, FLASH_COMPLETE, FLASH_TIMEOUT, FLASH_BAD_ADDRESS } FLASH_Status; typedef enum { FLASH_BUSY = 1, FLASH_ERROR_PG, FLASH_ERROR_WRP, FLASH_ERROR_OPT, FLASH_COMPLETE, FLASH_TIMEOUT, FLASH_BAD_ADDRESS } FLASH_Status;

4
tmk_core/common/chibios/sleep_led.c
View File

@@ -1,5 +1,5 @@
#include "ch.h" #include <ch.h>
#include "hal.h" #include <hal.h>
#include "led.h" #include "led.h"
#include "sleep_led.h" #include "sleep_led.h"

4
tmk_core/common/chibios/suspend.c
View File

@@ -1,7 +1,7 @@
/* TODO */ /* TODO */
#include "ch.h" #include <ch.h>
#include "hal.h" #include <hal.h>
#include "matrix.h" #include "matrix.h"
#include "action.h" #include "action.h"

2
tmk_core/common/chibios/timer.c
View File

@@ -1,4 +1,4 @@
#include "ch.h" #include <ch.h>
#include "timer.h" #include "timer.h"

2
tmk_core/common/eeconfig.c
View File

@@ -7,7 +7,7 @@
# include "oryx.h" # include "oryx.h"
#endif #endif
#ifdef STM32_EEPROM_ENABLE #ifdef STM32_EEPROM_ENABLE
# include "hal.h" # include <hal.h>
# include "eeprom_stm32.h" # include "eeprom_stm32.h"
#endif #endif

2
tmk_core/common/wait.h
View File

@@ -12,7 +12,7 @@ extern "C" {
# define wait_ms(ms) _delay_ms(ms) # define wait_ms(ms) _delay_ms(ms)
# define wait_us(us) _delay_us(us) # define wait_us(us) _delay_us(us)
#elif defined PROTOCOL_CHIBIOS #elif defined PROTOCOL_CHIBIOS
# include "ch.h" # include <ch.h>
# define wait_ms(ms) \ # define wait_ms(ms) \
do { \ do { \
if (ms != 0) { \ if (ms != 0) { \

4
tmk_core/protocol/chibios/main.c
View File

@@ -15,8 +15,8 @@
* GPL v2 or later. * GPL v2 or later.
*/ */
#include "ch.h" #include <ch.h>
#include "hal.h" #include <hal.h>
#include "usb_main.h" #include "usb_main.h"

2
tmk_core/protocol/chibios/usb_driver.c
View File

@@ -22,7 +22,7 @@
* @{ * @{
*/ */
#include "hal.h" #include <hal.h>
#include "usb_driver.h" #include "usb_driver.h"
#include <string.h> #include <string.h>

2
tmk_core/protocol/chibios/usb_driver.h
View File

@@ -25,7 +25,7 @@
#ifndef USB_DRIVER_H #ifndef USB_DRIVER_H
# define USB_DRIVER_H # define USB_DRIVER_H
# include "hal_usb_cdc.h" # include <hal_usb_cdc.h>
/*===========================================================================*/ /*===========================================================================*/
/* Driver constants. */ /* Driver constants. */

4
tmk_core/protocol/chibios/usb_main.c
View File

@@ -25,8 +25,8 @@
* makes the assumption this is safe to avoid littering with preprocessor directives. * makes the assumption this is safe to avoid littering with preprocessor directives.
*/ */
#include "ch.h" #include <ch.h>
#include "hal.h" #include <hal.h>
#include "usb_main.h" #include "usb_main.h"

4
tmk_core/protocol/chibios/usb_main.h
View File

@@ -21,8 +21,8 @@
// TESTING // TESTING
// extern uint8_t blinkLed; // extern uint8_t blinkLed;
#include "ch.h" #include <ch.h>
#include "hal.h" #include <hal.h>
/* ------------------------- /* -------------------------
* General USB driver header * General USB driver header

2
tmk_core/protocol/lufa/lufa.c
View File

@@ -61,7 +61,7 @@ extern keymap_config_t keymap_config;
#endif #endif
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
# include <audio.h> # include "audio.h"
#endif #endif
#ifdef BLUETOOTH_ENABLE #ifdef BLUETOOTH_ENABLE

2
tmk_core/protocol/midi/bytequeue/interrupt_setting.c
View File

@@ -32,7 +32,7 @@ interrupt_setting_t store_and_clear_interrupt(void) {
void restore_interrupt_setting(interrupt_setting_t setting) { SREG = setting; } void restore_interrupt_setting(interrupt_setting_t setting) { SREG = setting; }
#elif defined(__arm__) #elif defined(__arm__)
# include "ch.h" # include <ch.h>
interrupt_setting_t store_and_clear_interrupt(void) { interrupt_setting_t store_and_clear_interrupt(void) {
chSysLock(); chSysLock();

2
tmk_core/protocol/usb_descriptor.h
View File

@@ -46,7 +46,7 @@
#include <LUFA/Drivers/USB/USB.h> #include <LUFA/Drivers/USB/USB.h>
#ifdef PROTOCOL_CHIBIOS #ifdef PROTOCOL_CHIBIOS
# include "hal.h" # include <hal.h>
#endif #endif
#ifdef WEBUSB_ENABLE #ifdef WEBUSB_ENABLE
#include "webusb_descriptor.h" #include "webusb_descriptor.h"