quantum: remove direct `quantum.h` includes (#21507)

master
Ryan 2023-07-16 23:42:56 +10:00 committed by GitHub
parent b9e5895184
commit da2d2f947d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
51 changed files with 208 additions and 62 deletions

View File

@ -1,6 +1,6 @@
// Copyright 2022 Cole Smith <cole@boadsource.xyz>
// SPDX-License-Identifier: GPL-2.0-or-later
#include "encoder.h"
#include "quantum.h"
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {

View File

@ -19,8 +19,7 @@
#include "rgb_matrix.h"
#include "i2c_master.h"
#include "is31fl3733-dual.h"
#include "gpio.h"
static void init(void) {
i2c_init(&I2CD1, I2C1_SCL_PIN, I2C1_SDA_PIN);

View File

@ -1,3 +1,6 @@
// Copyright 2023 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

View File

@ -22,6 +22,7 @@ RGB_MATRIX_EFFECT(unlocked)
#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#include "dynamic_keymap.h"
#include "action_layer.h"
static bool active_keys_initialized = false;
static uint8_t active_keys_table[RGB_MATRIX_LED_COUNT] = {0};

View File

@ -22,6 +22,12 @@
#include "raw_hid.h"
#include "rgb_matrix.h"
#include "version.h"
#include "keyboard.h"
#include "eeprom.h"
#include "matrix.h"
#include "action_layer.h"
#include "bootloader.h"
#include "wait.h"
enum Command {
CMD_PROBE = 1, // Probe for System76 EC protocol

View File

@ -15,13 +15,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if defined(__AVR__)
# include <avr/pgmspace.h>
# include <avr/interrupt.h>
# include <avr/io.h>
#endif
#include "audio.h"
#include "gpio.h"
#include <avr/interrupt.h>
extern bool playing_note;
extern bool playing_melody;

View File

@ -16,8 +16,9 @@
*/
#include "audio.h"
#include <ch.h>
#include <hal.h>
#include "gpio.h"
#include <math.h>
#include "util.h"
// Need to disable GCC's "tautological-compare" warning for this file, as it causes issues when running `KEEP_INTERMEDIATES=yes`. Corresponding pop at the end of the file.
#pragma GCC diagnostic push

View File

@ -16,8 +16,7 @@
*/
#include "audio.h"
#include "ch.h"
#include "hal.h"
#include "gpio.h"
// Need to disable GCC's "tautological-compare" warning for this file, as it causes issues when running `KEEP_INTERMEDIATES=yes`. Corresponding pop at the end of the file.
#pragma GCC diagnostic push

View File

@ -12,8 +12,7 @@
// function.
#include "audio.h"
#include "ch.h"
#include "hal.h"
#include "gpio.h"
#if !defined(AUDIO_PIN)
# error "Audio feature enabled, but no pin selected - see docs/feature_audio under the ARM PWM settings"

View File

@ -25,8 +25,7 @@ this driver uses the chibios-PWM system to produce a square-wave on any given ou
*/
#include "audio.h"
#include "ch.h"
#include "hal.h"
#include "gpio.h"
#if !defined(AUDIO_PIN)
# error "Audio feature enabled, but no pin selected - see docs/feature_audio under the ARM PWM settings"

View File

@ -583,3 +583,6 @@ uint16_t audio_duration_to_ms(uint16_t duration_bpm) {
uint16_t audio_ms_to_duration(uint16_t duration_ms) {
return ((uint32_t)duration_ms * 2 * note_tempo) / 1875;
}
__attribute__((weak)) void audio_on_user(void) {}
__attribute__((weak)) void audio_off_user(void) {}

View File

@ -21,12 +21,6 @@
#include "musical_notes.h"
#include "song_list.h"
#include "voices.h"
#include "quantum.h"
#include <math.h>
#if defined(__AVR__)
# include <avr/io.h>
#endif
#if defined(AUDIO_DRIVER_PWM)
# include "audio_pwm.h"
@ -280,3 +274,6 @@ bool audio_update_state(void);
#define increase_tempo(t) audio_increase_tempo(t)
#define decrease_tempo(t) audio_decrease_tempo(t)
// vibrato functions are not used in any keyboards
void audio_on_user(void);
void audio_off_user(void);

View File

@ -1,5 +1,7 @@
#include "muse.h"
#include <stdbool.h>
enum { MUSE_OFF, MUSE_ON, MUSE_C_1_2, MUSE_C1, MUSE_C2, MUSE_C4, MUSE_C8, MUSE_C3, MUSE_C6, MUSE_B1, MUSE_B2, MUSE_B3, MUSE_B4, MUSE_B5, MUSE_B6, MUSE_B7, MUSE_B8, MUSE_B9, MUSE_B10, MUSE_B11, MUSE_B12, MUSE_B13, MUSE_B14, MUSE_B15, MUSE_B16, MUSE_B17, MUSE_B18, MUSE_B19, MUSE_B20, MUSE_B21, MUSE_B22, MUSE_B23, MUSE_B24, MUSE_B25, MUSE_B26, MUSE_B27, MUSE_B28, MUSE_B29, MUSE_B30, MUSE_B31 };
bool number_of_ones_to_bool[16] = {1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1};

View File

@ -1,6 +1,5 @@
#pragma once
#include "quantum.h"
#include "process_audio.h"
#include <stdint.h>
uint8_t muse_clock_pulse(void);

View File

@ -16,7 +16,9 @@
*/
#include "voices.h"
#include "audio.h"
#include "timer.h"
#include <stdlib.h>
#include <math.h>
uint8_t note_timbre = TIMBRE_DEFAULT;
bool glissando = false;

View File

@ -13,7 +13,12 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "quantum.h"
#include "bootmagic.h"
#include "matrix.h"
#include "keyboard.h"
#include "wait.h"
#include "eeconfig.h"
#include "bootloader.h"
/** \brief Reset eeprom
*

View File

@ -14,14 +14,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "keymap_introspection.h" // to get keymaps[][][]
#include "eeprom.h"
#include "progmem.h" // to read default from flash
#include "quantum.h" // for send_string()
#include "dynamic_keymap.h"
#include "keymap_introspection.h"
#include "action.h"
#include "eeprom.h"
#include "progmem.h"
#include "send_string.h"
#include "keycodes.h"
#ifdef VIA_ENABLE
# include "via.h" // for VIA_EEPROM_CONFIG_END
# include "via.h"
# define DYNAMIC_KEYMAP_EEPROM_START (VIA_EEPROM_CONFIG_END)
#else
# define DYNAMIC_KEYMAP_EEPROM_START (EECONFIG_SIZE)

View File

@ -16,6 +16,11 @@
*/
#include "encoder.h"
#include "keyboard.h"
#include "action.h"
#include "keycodes.h"
#include "wait.h"
#ifdef SPLIT_KEYBOARD
# include "split_util.h"
#endif

View File

@ -17,7 +17,9 @@
#pragma once
#include "quantum.h"
#include <stdint.h>
#include <stdbool.h>
#include "gpio.h"
#include "util.h"
void encoder_init(void);

View File

@ -22,6 +22,7 @@
extern "C" {
#include "encoder.h"
#include "keyboard.h"
#include "encoder/tests/mock_split.h"
}

View File

@ -16,8 +16,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#include "quantum.h"
#include "keyboard.h"
#include "keycode_config.h"
#include "matrix.h"
#include "keymap_introspection.h"
#include "magic.h"
@ -33,6 +33,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "sendchar.h"
#include "eeconfig.h"
#include "action_layer.h"
#ifdef AUDIO_ENABLE
# include "audio.h"
#endif
#if defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))
# include "process_music.h"
#endif
#ifdef BACKLIGHT_ENABLE
# include "backlight.h"
#endif
@ -54,9 +60,27 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef ENCODER_ENABLE
# include "encoder.h"
#endif
#ifdef HAPTIC_ENABLE
# include "haptic.h"
#endif
#ifdef AUTO_SHIFT_ENABLE
# include "process_auto_shift.h"
#endif
#ifdef COMBO_ENABLE
# include "process_combo.h"
#endif
#ifdef TAP_DANCE_ENABLE
# include "process_tap_dance.h"
#endif
#ifdef STENO_ENABLE
# include "process_steno.h"
#endif
#ifdef KEY_OVERRIDE_ENABLE
# include "process_key_override.h"
#endif
#ifdef SECURE_ENABLE
# include "secure.h"
#endif
#ifdef POINTING_DEVICE_ENABLE
# include "pointing_device.h"
#endif
@ -64,7 +88,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# include "process_midi.h"
#endif
#ifdef JOYSTICK_ENABLE
# include "process_joystick.h"
# include "joystick.h"
#endif
#ifdef HD44780_ENABLE
# include "hd44780.h"
@ -108,6 +132,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef LEADER_ENABLE
# include "leader.h"
#endif
#ifdef UNICODE_COMMON_ENABLE
# include "unicode.h"
#endif
#ifdef WPM_ENABLE
# include "wpm.h"
#endif
static uint32_t last_input_modification_time = 0;
uint32_t last_input_activity_time(void) {

View File

@ -20,6 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdbool.h>
#include <stdint.h>
#include "timer.h"
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -22,7 +22,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "action_layer.h"
#include "action.h"
#include "debug.h"
#include "quantum.h"
#include "keycode_config.h"
#include "quantum_keycodes.h"
#ifdef ENCODER_MAP_ENABLE
# include "encoder.h"
#endif
#ifdef BACKLIGHT_ENABLE
# include "backlight.h"

View File

@ -20,8 +20,13 @@
#include "led_matrix.h"
#include "progmem.h"
#include "eeprom.h"
#include "eeconfig.h"
#include "keyboard.h"
#include "sync_timer.h"
#include "debug.h"
#include <string.h>
#include <math.h>
#include <stdlib.h>
#include "led_tables.h"
#include <lib/lib8tion/lib8tion.h>

View File

@ -23,7 +23,7 @@
#include <stdint.h>
#include <stdbool.h>
#include "led_matrix_types.h"
#include "quantum.h"
#include "keyboard.h"
#ifdef IS31FL3731
# include "is31fl3731-simple.h"

View File

@ -20,7 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "util.h"
#include "matrix.h"
#include "debounce.h"
#include "quantum.h"
#include "atomic_util.h"
#ifdef SPLIT_KEYBOARD
# include "split_common/split_util.h"
# include "split_common/transactions.h"

View File

@ -1,9 +1,9 @@
#include "quantum.h"
#include "matrix.h"
#include "debounce.h"
#include "wait.h"
#include "print.h"
#include "debug.h"
#ifdef SPLIT_KEYBOARD
# include "split_common/split_util.h"
# include "split_common/transactions.h"

View File

@ -7,6 +7,7 @@
#ifdef AUDIO_ENABLE
# include "audio.h"
# include <math.h>
#endif
/*******************************************************************************

View File

@ -18,6 +18,9 @@
#ifdef POINTING_DEVICE_AUTO_MOUSE_ENABLE
# include "pointing_device_auto_mouse.h"
# include "debug.h"
# include "action_util.h"
# include "quantum_keycodes.h"
/* local data structure for tracking auto mouse */
static auto_mouse_context_t auto_mouse_context = {

View File

@ -16,11 +16,14 @@
#pragma once
#include <string.h>
#include "quantum.h"
#include <stdint.h>
#include <stdbool.h>
#include "pointing_device.h"
#include "print.h"
#include "keycodes.h"
#include "action.h"
#include "report.h"
#include "action_layer.h"
#include "action_tapping.h"
/* check settings and set defaults */
#ifndef POINTING_DEVICE_AUTO_MOUSE_ENABLE

View File

@ -1,5 +1,6 @@
#include "audio.h"
#include "process_audio.h"
#include <math.h>
#ifndef VOICE_CHANGE_SONG
# define VOICE_CHANGE_SONG SONG(VOICE_CHANGE_SOUND)
@ -61,6 +62,3 @@ void process_audio_noteoff(uint8_t note) {
void process_audio_all_notes_off(void) {
stop_all_notes();
}
__attribute__((weak)) void audio_on_user(void) {}
__attribute__((weak)) void audio_off_user(void) {}

View File

@ -10,6 +10,3 @@ bool process_audio(uint16_t keycode, keyrecord_t *record);
void process_audio_noteon(uint8_t note);
void process_audio_noteoff(uint8_t note);
void process_audio_all_notes_off(void);
void audio_on_user(void);
void audio_off_user(void);

View File

@ -1,5 +1,7 @@
#include "audio.h"
#include "process_clicky.h"
#include "audio.h"
#include "eeconfig.h"
#include <stdlib.h>
#ifdef AUDIO_CLICKY

View File

@ -19,6 +19,10 @@
#include "report.h"
#include "timer.h"
#include "debug.h"
#include "wait.h"
#include "action_util.h"
#include "quantum.h"
#include "quantum_keycodes.h"
#ifndef KEY_OVERRIDE_REPEAT_DELAY
# define KEY_OVERRIDE_REPEAT_DELAY 500

View File

@ -13,6 +13,7 @@
// limitations under the License.
#include "repeat_key.h"
#include "quantum_keycodes.h"
// Variables saving the state of the last key press.
static keyrecord_t last_record = {0};

View File

@ -14,7 +14,10 @@
#pragma once
#include "quantum.h"
#include <stdint.h>
#include <stdbool.h>
#include "action.h"
#include "keyboard.h"
uint16_t get_last_keycode(void); /**< Keycode of the last key. */
uint8_t get_last_mods(void); /**< Mods active with the last key. */

View File

@ -19,8 +19,13 @@
#include "rgb_matrix.h"
#include "progmem.h"
#include "eeprom.h"
#include "eeconfig.h"
#include "keyboard.h"
#include "sync_timer.h"
#include "debug.h"
#include <string.h>
#include <math.h>
#include <stdlib.h>
#include <lib/lib8tion/lib8tion.h>

View File

@ -22,7 +22,7 @@
#include <stdbool.h>
#include "rgb_matrix_types.h"
#include "color.h"
#include "quantum.h"
#include "keyboard.h"
#ifdef IS31FL3731
# include "is31fl3731.h"

View File

@ -15,6 +15,7 @@
*/
#include "rgb_matrix.h"
#include "util.h"
/* Each driver needs to define the struct
* const rgb_matrix_driver_t rgb_matrix_driver;

View File

@ -18,8 +18,8 @@
#include "keyboard.h"
#include "timer.h"
#include "transport.h"
#include "quantum.h"
#include "wait.h"
#include "debug.h"
#include "usb_util.h"
#ifdef EE_HANDS

View File

@ -2,7 +2,6 @@
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>
#include "matrix.h"

View File

@ -20,13 +20,50 @@
#include "crc.h"
#include "debug.h"
#include "matrix.h"
#include "quantum.h"
#include "host.h"
#include "action_util.h"
#include "sync_timer.h"
#include "wait.h"
#include "transactions.h"
#include "transport.h"
#include "transaction_id_define.h"
#include "split_util.h"
#include "synchronization_util.h"
#ifdef BACKLIGHT_ENABLE
# include "backlight.h"
#endif
#ifdef RGBLIGHT_ENABLE
# include "rgblight.h"
#endif
#ifdef LED_MATRIX_ENABLE
# include "led_matrix.h"
#endif
#ifdef RGB_MATRIX_ENABLE
# include "rgb_matrix.h"
#endif
#ifdef OLED_ENABLE
# include "oled_driver.h"
#endif
#ifdef ST7565_ENABLE
# include "st7565.h"
#endif
#ifdef ENCODER_ENABLE
# include "encoder.h"
#endif
#ifdef HAPTIC_ENABLE
# include "haptic.h"
#endif
#ifdef POINTING_DEVICE_ENABLE
# include "pointing_device.h"
#endif
#ifdef OS_DETECTION_ENABLE
# include "os_detection.h"
#endif
#ifdef WPM_ENABLE
# include "wpm.h"
#endif
#define SYNC_TIMER_OFFSET 2
#ifndef FORCED_SYNC_THROTTLE_MS

View File

@ -16,8 +16,8 @@
#pragma once
#include "stdint.h"
#include "stdbool.h"
#include <stdint.h>
#include <stdbool.h>
#include "matrix.h"
#include "transaction_id_define.h"

View File

@ -16,8 +16,8 @@
#pragma once
#include "stdint.h"
#include "stdbool.h"
#include <stdint.h>
#include <stdbool.h>
#include "progmem.h"
#include "action_layer.h"

View File

@ -25,6 +25,8 @@
#include "wait.h"
#include "send_string.h"
#include "utf8.h"
#include "debug.h"
#include "quantum.h"
#if defined(AUDIO_ENABLE)
# include "audio.h"

View File

@ -17,8 +17,7 @@
#pragma once
#include <stdint.h>
#include "quantum.h"
#include "quantum_keycodes.h"
typedef union {
uint8_t raw;

View File

@ -22,19 +22,41 @@
# error "DYNAMIC_KEYMAP_ENABLE is not enabled"
#endif
#include "quantum.h"
#include "via.h"
#include "raw_hid.h"
#include "dynamic_keymap.h"
#include "eeprom.h"
#include "eeconfig.h"
#include "matrix.h"
#include "timer.h"
#include "wait.h"
#include "version.h" // for QMK_BUILDDATE used in EEPROM magic
#if defined(AUDIO_ENABLE)
# include "audio.h"
#endif
#if defined(BACKLIGHT_ENABLE)
# include "backlight.h"
#endif
#if defined(RGBLIGHT_ENABLE)
# include "rgblight.h"
#endif
#if (defined(RGB_MATRIX_ENABLE) || defined(LED_MATRIX_ENABLE))
# include <lib/lib8tion/lib8tion.h>
#endif
#if defined(RGB_MATRIX_ENABLE)
# include "rgb_matrix.h"
#endif
#if defined(LED_MATRIX_ENABLE)
# include "led_matrix.h"
#endif
// Can be called in an overriding via_init_kb() to test if keyboard level code usage of
// EEPROM is invalid and use/save defaults.
bool via_eeprom_is_valid(void) {

View File

@ -17,6 +17,7 @@
#pragma once
#include "eeconfig.h" // for EECONFIG_SIZE
#include "action.h"
// Keyboard level code can change where VIA stores the magic.
// The magic is the build date YYMMDD encoded as BCD in 3 bytes,

View File

@ -21,6 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "report.h"
#include "host.h"
#include "host_driver.h"
#include "suspend.h"
#include "keycode_config.h"
#include <string.h>

View File

@ -24,6 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# include "led.h"
# include "rgb_matrix.h"
# include "eeprom.h"
# include "host.h"
# include <string.h>
# include <math.h>

View File

@ -16,7 +16,9 @@
#pragma once
#include <stdint.h>
#include <stdbool.h>
#include "gpio.h"
typedef int16_t spi_status_t;