From 9366ed728280f4875ebbba9c0ef1eade03c96d35 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 16 Dec 2020 14:27:23 +1100 Subject: [PATCH] Normalise include statements in keyboard code (#11185) --- drivers/chibios/serial_usart.c | 2 +- drivers/qwiic/micro_oled.c | 2 +- keyboards/40percentclub/ut47/led.c | 2 +- keyboards/ai03/orbit/matrix.h | 2 +- keyboards/ai03/orbit/transport.h | 2 +- .../device_one/boards/DEVICE_ONE/board.c | 4 +- keyboards/cannonkeys/bluepill/keyboard.c | 4 +- keyboards/cannonkeys/bluepill/ws2812.c | 2 +- keyboards/cannonkeys/satisfaction75/led.c | 3 +- .../satisfaction75/satisfaction75.c | 4 +- .../boards/GENERIC_STM32_F042X6/board.c | 4 +- keyboards/clueboard/60/led.c | 4 +- keyboards/clueboard/66_hotswap/gen1/led.c | 20 --- keyboards/clueboard/66_hotswap/gen1/matrix.c | 159 ------------------ keyboards/clueboard/66_hotswap/gen1/rules.mk | 3 - keyboards/converter/adb_usb/led.h | 2 +- keyboards/converter/hp_46010a/matrix.c | 2 +- keyboards/converter/ibm_terminal/led.c | 2 +- keyboards/converter/siemens_tastatur/matrix.c | 4 +- .../keymaps/vlukash_trackpad_right/trackpad.h | 2 +- keyboards/crkbd/rev1/legacy/config.h | 2 +- keyboards/crkbd/rev1/legacy/split_scomm.c | 2 +- keyboards/cu75/cu75.c | 2 +- .../duckypad/keymaps/default/keymap.c | 2 +- keyboards/dm9records/ergoinu/config.h | 2 +- keyboards/ergodone/twimaster.c | 2 +- keyboards/ergodox_infinity/ergodox_infinity.c | 4 +- keyboards/ergodox_infinity/led.c | 2 +- keyboards/ergodox_infinity/matrix.c | 2 +- .../boards/ERGODOX_STM32_BOARD/board.c | 2 +- keyboards/ergodox_stm32/ergodox_stm32.h | 2 +- .../macropad_v2/keymaps/via/keymap.c | 2 +- .../hadron/ver2/keymaps/default/keymap.c | 2 +- .../hadron/ver2/keymaps/side_numpad/keymap.c | 2 +- keyboards/handwired/bluepill/bluepill70/led.c | 2 +- .../handwired/bluepill/bluepill70/matrix.c | 4 +- .../boards/GENERIC_STM32_F103/board.c | 2 +- keyboards/handwired/dactyl/twimaster.c | 2 +- .../dmote/62key/keymaps/default/keymap.c | 4 +- keyboards/handwired/promethium/promethium.h | 2 +- keyboards/helix/local_drivers/ssd1306.c | 2 +- keyboards/helix/rev1/config.h | 2 +- .../helix/rev1/keymaps/OLED_sample/keymap.c | 2 +- .../rev2/keymaps/five_rows/oled_display.c | 4 +- keyboards/helix/rev2/split_scomm.c | 4 +- .../keymaps/five_rows/oled_display.c | 4 +- keyboards/infinity60/led.c | 2 +- keyboards/infinity60/led_controller.c | 4 +- keyboards/infinity60/matrix.c | 2 +- keyboards/jm60/boards/JM60_BOARD/board.c | 2 +- keyboards/jm60/led.c | 2 +- keyboards/jm60/matrix.c | 2 +- keyboards/keyboardio/model01/config.h | 2 +- keyboards/keyboardio/model01/leds.c | 8 +- keyboards/keyboardio/model01/leds.h | 4 +- keyboards/keyboardio/model01/matrix.c | 4 +- keyboards/keyboardio/model01/model01.c | 4 +- keyboards/keyboardio/model01/model01.h | 2 +- .../lets_split/keymaps/OLED_sample/keymap.c | 2 +- keyboards/lfkeyboards/TWIlib.c | 2 +- keyboards/lfkeyboards/lfk78/lfk78.c | 2 +- keyboards/lfkeyboards/lighting.c | 2 +- .../matrix/m20add/boards/m20add_bd/board.c | 4 +- keyboards/matrix/noah/boards/noah_bd/board.c | 4 +- keyboards/matrix/noah/matrix.c | 4 +- keyboards/meira/TWIlib.c | 2 +- keyboards/meira/lighting.c | 2 +- keyboards/moonlander/matrix.c | 4 +- keyboards/mxss/rgblight.c | 4 +- keyboards/nek_type_a/mcp23017.c | 4 +- keyboards/oddball/adns.c | 2 +- keyboards/phoenix/phoenix.c | 2 +- keyboards/planck/ez/ez.c | 4 +- keyboards/terrazzo/terrazzo.c | 2 +- keyboards/wilba_tech/wt_rgb_backlight.c | 4 +- keyboards/yosino58/config.h | 2 +- keyboards/yosino58/rev1/split_scomm.c | 4 +- quantum/audio/voices.c | 2 +- tmk_core/common/led.h | 4 +- .../chibios/lufa_utils/LUFA/Drivers/USB/USB.h | 4 +- tmk_core/protocol/chibios/main.c | 2 +- 81 files changed, 108 insertions(+), 291 deletions(-) delete mode 100644 keyboards/clueboard/66_hotswap/gen1/led.c delete mode 100644 keyboards/clueboard/66_hotswap/gen1/matrix.c diff --git a/drivers/chibios/serial_usart.c b/drivers/chibios/serial_usart.c index ded78410e..a3e21f90b 100644 --- a/drivers/chibios/serial_usart.c +++ b/drivers/chibios/serial_usart.c @@ -1,6 +1,6 @@ #include "quantum.h" #include "serial.h" -#include "printf.h" +#include "print.h" #include #include diff --git a/drivers/qwiic/micro_oled.c b/drivers/qwiic/micro_oled.c index f63cf2e64..c7a4ee081 100644 --- a/drivers/qwiic/micro_oled.c +++ b/drivers/qwiic/micro_oled.c @@ -32,7 +32,7 @@ #include #include "util/font5x7.h" #include "util/font8x16.h" -#include "string.h" +#include #define TOTALFONTS 2 const unsigned char* fonts_pointer[] = {font5x7, font8x16}; diff --git a/keyboards/40percentclub/ut47/led.c b/keyboards/40percentclub/ut47/led.c index 9458c038f..f5d8ffc12 100644 --- a/keyboards/40percentclub/ut47/led.c +++ b/keyboards/40percentclub/ut47/led.c @@ -16,7 +16,7 @@ along with this program. If not, see . */ #include -#include "stdint.h" +#include #include "led.h" diff --git a/keyboards/ai03/orbit/matrix.h b/keyboards/ai03/orbit/matrix.h index c2bdd3098..664372b76 100644 --- a/keyboards/ai03/orbit/matrix.h +++ b/keyboards/ai03/orbit/matrix.h @@ -1,3 +1,3 @@ #pragma once -#include +#include "common/matrix.h" diff --git a/keyboards/ai03/orbit/transport.h b/keyboards/ai03/orbit/transport.h index 422e2ecb9..67597652f 100644 --- a/keyboards/ai03/orbit/transport.h +++ b/keyboards/ai03/orbit/transport.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "common/matrix.h" #define ROWS_PER_HAND (MATRIX_ROWS/2) diff --git a/keyboards/akegata_denki/device_one/boards/DEVICE_ONE/board.c b/keyboards/akegata_denki/device_one/boards/DEVICE_ONE/board.c index 8e0303523..20b857d00 100644 --- a/keyboards/akegata_denki/device_one/boards/DEVICE_ONE/board.c +++ b/keyboards/akegata_denki/device_one/boards/DEVICE_ONE/board.c @@ -16,8 +16,8 @@ * generator plugin. Do not edit manually. */ -#include "hal.h" -#include "stm32_gpio.h" +#include +#include /*===========================================================================*/ /* Driver local definitions. */ diff --git a/keyboards/cannonkeys/bluepill/keyboard.c b/keyboards/cannonkeys/bluepill/keyboard.c index c2e5946d4..6a8edd4a9 100644 --- a/keyboards/cannonkeys/bluepill/keyboard.c +++ b/keyboards/cannonkeys/bluepill/keyboard.c @@ -1,5 +1,5 @@ -#include "ch.h" -#include "hal.h" +#include +#include #include "util.h" #include "quantum.h" diff --git a/keyboards/cannonkeys/bluepill/ws2812.c b/keyboards/cannonkeys/bluepill/ws2812.c index d30806d56..779e90519 100644 --- a/keyboards/cannonkeys/bluepill/ws2812.c +++ b/keyboards/cannonkeys/bluepill/ws2812.c @@ -6,7 +6,7 @@ */ #include "ws2812.h" -#include "stdlib.h" +#include #define BYTES_FOR_LED_BYTE 4 #define NB_COLORS 3 diff --git a/keyboards/cannonkeys/satisfaction75/led.c b/keyboards/cannonkeys/satisfaction75/led.c index 3ddcec202..18ef06acf 100644 --- a/keyboards/cannonkeys/satisfaction75/led.c +++ b/keyboards/cannonkeys/satisfaction75/led.c @@ -15,10 +15,9 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "hal.h" +#include #include "led_custom.h" #include "satisfaction75.h" -#include "printf.h" static void breathing_callback(PWMDriver *pwmp); diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.c b/keyboards/cannonkeys/satisfaction75/satisfaction75.c index c0ea68669..fd85b8230 100644 --- a/keyboards/cannonkeys/satisfaction75/satisfaction75.c +++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.c @@ -2,8 +2,8 @@ #include "print.h" #include "debug.h" -#include "ch.h" -#include "hal.h" +#include +#include #ifdef QWIIC_MICRO_OLED_ENABLE #include "micro_oled.h" diff --git a/keyboards/chavdai40/boards/GENERIC_STM32_F042X6/board.c b/keyboards/chavdai40/boards/GENERIC_STM32_F042X6/board.c index 2bd2c5e21..faf576541 100644 --- a/keyboards/chavdai40/boards/GENERIC_STM32_F042X6/board.c +++ b/keyboards/chavdai40/boards/GENERIC_STM32_F042X6/board.c @@ -19,8 +19,8 @@ * generator plugin. Do not edit manually. */ -#include "hal.h" -#include "stm32_gpio.h" +#include +#include /*===========================================================================*/ /* Driver local definitions. */ diff --git a/keyboards/clueboard/60/led.c b/keyboards/clueboard/60/led.c index 20756f1e7..ad11ad5d4 100644 --- a/keyboards/clueboard/60/led.c +++ b/keyboards/clueboard/60/led.c @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -#include "hal.h" -#include "printf.h" +#include +#include "print.h" #ifdef BACKLIGHT_ENABLE #include "backlight.h" diff --git a/keyboards/clueboard/66_hotswap/gen1/led.c b/keyboards/clueboard/66_hotswap/gen1/led.c deleted file mode 100644 index f67259d2e..000000000 --- a/keyboards/clueboard/66_hotswap/gen1/led.c +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2017 skully - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . -*/ - -#include "hal.h" -#include "led.h" -#include "printf.h" diff --git a/keyboards/clueboard/66_hotswap/gen1/matrix.c b/keyboards/clueboard/66_hotswap/gen1/matrix.c deleted file mode 100644 index 05386215e..000000000 --- a/keyboards/clueboard/66_hotswap/gen1/matrix.c +++ /dev/null @@ -1,159 +0,0 @@ -#include -#include -#include -#include "hal.h" -#include "timer.h" -#include "wait.h" -#include "printf.h" -#include "matrix.h" -#include "action.h" -#include "keycode.h" -#include - -/* - * #define MATRIX_ROW_PINS { PB11, PA6, PA3, PA2, PA1, PB5, PB6, PC15, PC14, PC13 } - * #define MATRIX_COL_PINS { PB10, PB2, PB1, PB0, PA7, PB4, PB3, PB7 } - */ -/* matrix state(1:on, 0:off) */ -static matrix_row_t matrix[MATRIX_ROWS]; -static matrix_row_t matrix_debouncing[MATRIX_COLS]; -static bool debouncing = false; -static uint16_t debouncing_time = 0; - -__attribute__ ((weak)) -void matrix_init_user(void) {} - -__attribute__ ((weak)) -void matrix_scan_user(void) {} - -__attribute__ ((weak)) -void matrix_init_kb(void) { - matrix_init_user(); -} - -__attribute__ ((weak)) -void matrix_scan_kb(void) { - matrix_scan_user(); -} - -void matrix_init(void) { - printf("matrix init\n"); - //debug_matrix = true; - - // actual matrix setup - palSetPadMode(GPIOB, 10, PAL_MODE_OUTPUT_PUSHPULL); - palSetPadMode(GPIOB, 2, PAL_MODE_OUTPUT_PUSHPULL); - palSetPadMode(GPIOB, 1, PAL_MODE_OUTPUT_PUSHPULL); - palSetPadMode(GPIOB, 0, PAL_MODE_OUTPUT_PUSHPULL); - palSetPadMode(GPIOA, 7, PAL_MODE_OUTPUT_PUSHPULL); - palSetPadMode(GPIOB, 4, PAL_MODE_OUTPUT_PUSHPULL); - palSetPadMode(GPIOB, 3, PAL_MODE_OUTPUT_PUSHPULL); - palSetPadMode(GPIOB, 7, PAL_MODE_OUTPUT_PUSHPULL); - - palSetPadMode(GPIOB, 11, PAL_MODE_INPUT_PULLDOWN); - palSetPadMode(GPIOA, 6, PAL_MODE_INPUT_PULLDOWN); - palSetPadMode(GPIOA, 3, PAL_MODE_INPUT_PULLDOWN); - palSetPadMode(GPIOA, 2, PAL_MODE_INPUT_PULLDOWN); - palSetPadMode(GPIOA, 1, PAL_MODE_INPUT_PULLDOWN); - palSetPadMode(GPIOB, 5, PAL_MODE_INPUT_PULLDOWN); - palSetPadMode(GPIOB, 6, PAL_MODE_INPUT_PULLDOWN); - palSetPadMode(GPIOC, 15, PAL_MODE_INPUT_PULLDOWN); - palSetPadMode(GPIOC, 14, PAL_MODE_INPUT_PULLDOWN); - palSetPadMode(GPIOC, 13, PAL_MODE_INPUT_PULLDOWN); - - memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t)); - memset(matrix_debouncing, 0, MATRIX_COLS * sizeof(matrix_row_t)); - - matrix_init_quantum(); -} - -uint8_t matrix_scan(void) { - // actual matrix - for (int col = 0; col < MATRIX_COLS; col++) { - matrix_row_t data = 0; - - // strobe col { PB10, PB2, PB1, PB0, PA7, PB4, PB3, PB7 } - switch (col) { - case 0: palSetPad(GPIOB, 10); break; - case 1: palSetPad(GPIOB, 2); break; - case 2: palSetPad(GPIOB, 1); break; - case 3: palSetPad(GPIOB, 0); break; - case 4: palSetPad(GPIOA, 7); break; - case 5: palSetPad(GPIOB, 4); break; - case 6: palSetPad(GPIOB, 3); break; - case 7: palSetPad(GPIOB, 7); break; - } - - // need wait to settle pin state - wait_us(20); - - // read row data { PB11, PA6, PA3, PA2, PA1, PB5, PB6, PC15, PC14, PC13 } - data = ( - (palReadPad(GPIOB, 11) << 0 ) | - (palReadPad(GPIOA, 6) << 1 ) | - (palReadPad(GPIOA, 3) << 2 ) | - (palReadPad(GPIOA, 2) << 3 ) | - (palReadPad(GPIOA, 1) << 4 ) | - (palReadPad(GPIOB, 5) << 5 ) | - (palReadPad(GPIOB, 6) << 6 ) | - (palReadPad(GPIOC, 15) << 7 ) | - (palReadPad(GPIOC, 14) << 8 ) | - (palReadPad(GPIOC, 13) << 9 ) - ); - - // unstrobe col { B11, B10, B2, B1, A7, B0 } - switch (col) { - case 0: palClearPad(GPIOB, 10); break; - case 1: palClearPad(GPIOB, 2); break; - case 2: palClearPad(GPIOB, 1); break; - case 3: palClearPad(GPIOB, 0); break; - case 4: palClearPad(GPIOA, 7); break; - case 5: palClearPad(GPIOB, 4); break; - case 6: palClearPad(GPIOB, 3); break; - case 7: palClearPad(GPIOB, 7); break; - } - - if (matrix_debouncing[col] != data) { - matrix_debouncing[col] = data; - debouncing = true; - debouncing_time = timer_read(); - } - } - - if (debouncing && timer_elapsed(debouncing_time) > DEBOUNCE) { - for (int row = 0; row < MATRIX_ROWS; row++) { - matrix[row] = 0; - for (int col = 0; col < MATRIX_COLS; col++) { - matrix[row] |= ((matrix_debouncing[col] & (1 << row) ? 1 : 0) << col); - } - } - debouncing = false; - } - - matrix_scan_quantum(); - - return 1; -} - -bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & (1< #ifndef LED_H #define LED_H -#include "stdint.h" +#include /* keyboard LEDs */ diff --git a/keyboards/converter/hp_46010a/matrix.c b/keyboards/converter/hp_46010a/matrix.c index ac9224087..72a098746 100644 --- a/keyboards/converter/hp_46010a/matrix.c +++ b/keyboards/converter/hp_46010a/matrix.c @@ -29,7 +29,7 @@ along with this program. If not, see . #include "util.h" #include "matrix.h" #include "timer.h" -#include "LUFA/Drivers/Peripheral/SPI.h" +#include #include "config.h" diff --git a/keyboards/converter/ibm_terminal/led.c b/keyboards/converter/ibm_terminal/led.c index e448e84ec..e0f31ee4e 100644 --- a/keyboards/converter/ibm_terminal/led.c +++ b/keyboards/converter/ibm_terminal/led.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "stdint.h" +#include #include "ps2.h" #include "led.h" diff --git a/keyboards/converter/siemens_tastatur/matrix.c b/keyboards/converter/siemens_tastatur/matrix.c index 9fcfe9fdf..2da4e33d3 100644 --- a/keyboards/converter/siemens_tastatur/matrix.c +++ b/keyboards/converter/siemens_tastatur/matrix.c @@ -22,8 +22,8 @@ along with this program. If not, see . #include "wait.h" #include "print.h" #include "matrix.h" -#include "ch.h" -#include "hal.h" +#include +#include static matrix_row_t matrix[MATRIX_ROWS]; static matrix_row_t matrix_debouncing[MATRIX_ROWS]; diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_right/trackpad.h b/keyboards/crkbd/keymaps/vlukash_trackpad_right/trackpad.h index 755abc7de..cce460a97 100644 --- a/keyboards/crkbd/keymaps/vlukash_trackpad_right/trackpad.h +++ b/keyboards/crkbd/keymaps/vlukash_trackpad_right/trackpad.h @@ -4,7 +4,7 @@ #include "quantum.h" #include "report.h" #include -#include "../../lib/lufa/LUFA/Drivers/Peripheral/SPI.h" +#include // Trackpad speed adjustments #define POINTER_SPEED_MULTIPLIER 2 diff --git a/keyboards/crkbd/rev1/legacy/config.h b/keyboards/crkbd/rev1/legacy/config.h index 9e3676414..eae6f788a 100644 --- a/keyboards/crkbd/rev1/legacy/config.h +++ b/keyboards/crkbd/rev1/legacy/config.h @@ -18,6 +18,6 @@ along with this program. If not, see . #pragma once -#include +#include "serial_config.h" #define PRODUCT Corne Keyboard Rev.1 (Legacy Split) diff --git a/keyboards/crkbd/rev1/legacy/split_scomm.c b/keyboards/crkbd/rev1/legacy/split_scomm.c index c14bb32a4..eccf2f3d2 100644 --- a/keyboards/crkbd/rev1/legacy/split_scomm.c +++ b/keyboards/crkbd/rev1/legacy/split_scomm.c @@ -23,7 +23,7 @@ along with this program. If not, see . #include #include #include -#include +#include "split_scomm.h" #include "serial.h" #ifdef CONSOLE_ENABLE #include "debug.h" diff --git a/keyboards/cu75/cu75.c b/keyboards/cu75/cu75.c index 60c92b708..80941df39 100644 --- a/keyboards/cu75/cu75.c +++ b/keyboards/cu75/cu75.c @@ -10,7 +10,7 @@ #ifdef AUDIO_ENABLE float test_sound[][2] = SONG(STARTUP_SOUND); -#include