diff options
author | Ryan <fauxpark@gmail.com> | 2020-12-26 15:53:12 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-26 15:53:12 +1100 |
commit | 48f4768d33313e6a6ed48c31f95eb44feda10a51 (patch) | |
tree | 49944f8e0399fc661b9adbf7d8c0962995634579 /quantum | |
parent | 53eb7f0774881e8a9f6186a51e15135edc6f8575 (diff) |
Change include guards in quantum/ to pragma once (#11239)
Diffstat (limited to 'quantum')
50 files changed, 68 insertions, 204 deletions
diff --git a/quantum/api.h b/quantum/api.h index 90a4de8339..0a30e9d6cc 100644 --- a/quantum/api.h +++ b/quantum/api.h @@ -14,8 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _API_H_ -#define _API_H_ +#pragma once #ifdef __AVR__ # include "lufa.h" @@ -54,5 +53,3 @@ __attribute__((weak)) bool process_api_quantum(uint8_t length, uint8_t* data); __attribute__((weak)) bool process_api_keyboard(uint8_t length, uint8_t* data); __attribute__((weak)) bool process_api_user(uint8_t length, uint8_t* data); - -#endif diff --git a/quantum/api/api_sysex.h b/quantum/api/api_sysex.h index 58b8cbb663..382f4bea44 100644 --- a/quantum/api/api_sysex.h +++ b/quantum/api/api_sysex.h @@ -14,13 +14,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _API_SYSEX_H_ -#define _API_SYSEX_H_ +#pragma once #include "api.h" void send_bytes_sysex(uint8_t message_type, uint8_t data_type, uint8_t* bytes, uint16_t length); #define SEND_BYTES(mt, dt, b, l) send_bytes_sysex(mt, dt, b, l) - -#endif diff --git a/quantum/audio/audio.h b/quantum/audio/audio.h index 805cb4f7ab..bc00cd19e6 100644 --- a/quantum/audio/audio.h +++ b/quantum/audio/audio.h @@ -13,8 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef AUDIO_H -#define AUDIO_H + +#pragma once #include <stdint.h> #include <stdbool.h> @@ -103,5 +103,3 @@ void play_notes(float (*np)[][2], uint16_t n_count, bool n_repeat); #define PLAY_LOOP(note_array) play_notes(¬e_array, NOTE_ARRAY_SIZE((note_array)), true) bool is_playing_notes(void); - -#endif diff --git a/quantum/audio/luts.h b/quantum/audio/luts.h index 6fdd3b4635..74980b292e 100644 --- a/quantum/audio/luts.h +++ b/quantum/audio/luts.h @@ -14,6 +14,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#pragma once + #if defined(__AVR__) # include <avr/io.h> # include <avr/interrupt.h> @@ -23,14 +25,9 @@ # include <hal.h> #endif -#ifndef LUTS_H -# define LUTS_H - -# define VIBRATO_LUT_LENGTH 20 +#define VIBRATO_LUT_LENGTH 20 -# define FREQUENCY_LUT_LENGTH 349 +#define FREQUENCY_LUT_LENGTH 349 extern const float vibrato_lut[VIBRATO_LUT_LENGTH]; extern const uint16_t frequency_lut[FREQUENCY_LUT_LENGTH]; - -#endif /* LUTS_H */ diff --git a/quantum/audio/muse.h b/quantum/audio/muse.h index 6f382a7fee..ad2f96e43a 100644 --- a/quantum/audio/muse.h +++ b/quantum/audio/muse.h @@ -1,9 +1,6 @@ -#ifndef MUSE_H -#define MUSE_H +#pragma once #include "quantum.h" #include "process_audio.h" uint8_t muse_clock_pulse(void); - -#endif diff --git a/quantum/audio/musical_notes.h b/quantum/audio/musical_notes.h index 9742e19c43..8ac6aafd38 100644 --- a/quantum/audio/musical_notes.h +++ b/quantum/audio/musical_notes.h @@ -14,8 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef MUSICAL_NOTES_H -#define MUSICAL_NOTES_H +#pragma once // Tempo Placeholder #define TEMPO_DEFAULT 100 @@ -229,5 +228,3 @@ #define NOTE_GF8 NOTE_FS8 #define NOTE_AF8 NOTE_GS8 #define NOTE_BF8 NOTE_AS8 - -#endif diff --git a/quantum/audio/voices.h b/quantum/audio/voices.h index 0c45b0720e..abafa2b404 100644 --- a/quantum/audio/voices.h +++ b/quantum/audio/voices.h @@ -13,6 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#pragma once + #include <stdint.h> #include <stdbool.h> #if defined(__AVR__) @@ -21,14 +24,11 @@ #include "wait.h" #include "luts.h" -#ifndef VOICES_H -# define VOICES_H - float voice_envelope(float frequency); typedef enum { default_voice, -# ifdef AUDIO_VOICES +#ifdef AUDIO_VOICES something, drums, butts_fader, @@ -41,12 +41,10 @@ typedef enum { // duty_fourth_down, // duty_third_down, // duty_fifth_third_down, -# endif +#endif number_of_voices // important that this is last } voice_type; void set_voice(voice_type v); void voice_iterate(void); void voice_deiterate(void); - -#endif diff --git a/quantum/color.h b/quantum/color.h index f0ee782757..7448168b3a 100644 --- a/quantum/color.h +++ b/quantum/color.h @@ -14,8 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef COLOR_H -#define COLOR_H +#pragma once #include <stdint.h> #include <stdbool.h> @@ -86,4 +85,3 @@ RGB hsv_to_rgb_nocie(HSV hsv); #ifdef RGBW void convert_rgb_to_rgbw(LED_TYPE *led); #endif -#endif // COLOR_H diff --git a/quantum/keycode_config.h b/quantum/keycode_config.h index aa75ba2c13..f878168c5f 100644 --- a/quantum/keycode_config.h +++ b/quantum/keycode_config.h @@ -14,13 +14,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#pragma once + #include "eeconfig.h" #include "keycode.h" #include "action_code.h" -#ifndef KEYCODE_CONFIG_H -# define KEYCODE_CONFIG_H - uint16_t keycode_config(uint16_t keycode); uint8_t mod_config(uint8_t mod); @@ -42,5 +41,3 @@ typedef union { } keymap_config_t; extern keymap_config_t keymap_config; - -#endif /* KEYCODE_CONFIG_H */ diff --git a/quantum/keymap.h b/quantum/keymap.h index 90a2398ba4..191e813977 100644 --- a/quantum/keymap.h +++ b/quantum/keymap.h @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef KEYMAP_H -#define KEYMAP_H +#pragma once #include <stdint.h> #include <stdbool.h> @@ -55,5 +54,3 @@ uint16_t keymap_function_id_to_action(uint16_t function_id); extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; extern const uint16_t fn_actions[]; - -#endif diff --git a/quantum/keymap_extras/keymap_nordic.h b/quantum/keymap_extras/keymap_nordic.h index 8d2f76f273..76d2f4f6b0 100644 --- a/quantum/keymap_extras/keymap_nordic.h +++ b/quantum/keymap_extras/keymap_nordic.h @@ -13,8 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef KEYMAP_NORDIC_H -#define KEYMAP_NORDIC_H + +#pragma once #include "keymap.h" @@ -66,5 +66,3 @@ #define NO_BSLS ALGR(KC_MINS) #define NO_MU ALGR(KC_M) - -#endif diff --git a/quantum/keymap_extras/keymap_plover_dvorak.h b/quantum/keymap_extras/keymap_plover_dvorak.h index d40ff5c6bb..445a123151 100644 --- a/quantum/keymap_extras/keymap_plover_dvorak.h +++ b/quantum/keymap_extras/keymap_plover_dvorak.h @@ -13,8 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef KEYMAP_PLOVER_DVORAK_H -#define KEYMAP_PLOVER_DVORAK_H + +#pragma once #include "keymap_dvorak.h" @@ -43,5 +43,3 @@ #define PD_O DV_V #define PD_E DV_N #define PD_U DV_M - -#endif diff --git a/quantum/keymap_extras/keymap_steno.h b/quantum/keymap_extras/keymap_steno.h index 31dcbf7064..b9115fb8bf 100644 --- a/quantum/keymap_extras/keymap_steno.h +++ b/quantum/keymap_extras/keymap_steno.h @@ -13,8 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef KEYMAP_STENO_H -#define KEYMAP_STENO_H + +#pragma once #include "keymap.h" @@ -72,5 +72,3 @@ enum steno_keycodes { STN_ZR, STN__MAX = STN_ZR, // must be less than QK_STENO_BOLT }; - -#endif diff --git a/quantum/led_matrix.h b/quantum/led_matrix.h index 5867ba9876..7dcdf1d482 100644 --- a/quantum/led_matrix.h +++ b/quantum/led_matrix.h @@ -17,8 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef LED_MATRIX_H -#define LED_MATRIX_H +#pragma once #ifndef BACKLIGHT_ENABLE # error You must define BACKLIGHT_ENABLE with LED_MATRIX_ENABLE @@ -123,5 +122,3 @@ typedef struct { } led_matrix_driver_t; extern const led_matrix_driver_t led_matrix_driver; - -#endif diff --git a/quantum/led_tables.h b/quantum/led_tables.h index 8052d566cf..cd3e5d74c1 100644 --- a/quantum/led_tables.h +++ b/quantum/led_tables.h @@ -13,8 +13,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef LED_TABLES_H -#define LED_TABLES_H +#pragma once #include "progmem.h" #include <stdint.h> @@ -22,5 +21,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifdef USE_CIE1931_CURVE extern const uint8_t CIE1931_CURVE[] PROGMEM; #endif - -#endif diff --git a/quantum/pointing_device.h b/quantum/pointing_device.h index 29398ebb3a..aa074bb37d 100644 --- a/quantum/pointing_device.h +++ b/quantum/pointing_device.h @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef POINTING_DEVICE_H -#define POINTING_DEVICE_H +#pragma once #include <stdint.h> #include "host.h" @@ -27,5 +26,3 @@ void pointing_device_task(void); void pointing_device_send(void); report_mouse_t pointing_device_get_report(void); void pointing_device_set_report(report_mouse_t newMouseReport); - -#endif diff --git a/quantum/process_keycode/process_audio.h b/quantum/process_keycode/process_audio.h index 3a84c3d869..d89a834ea8 100644 --- a/quantum/process_keycode/process_audio.h +++ b/quantum/process_keycode/process_audio.h @@ -1,5 +1,4 @@ -#ifndef PROCESS_AUDIO_H -#define PROCESS_AUDIO_H +#pragma once float compute_freq_for_midi_note(uint8_t note); @@ -9,5 +8,3 @@ void process_audio_noteoff(uint8_t note); void process_audio_all_notes_off(void); void audio_on_user(void); - -#endif diff --git a/quantum/process_keycode/process_clicky.h b/quantum/process_keycode/process_clicky.h index f746edb951..67b6463c5d 100644 --- a/quantum/process_keycode/process_clicky.h +++ b/quantum/process_keycode/process_clicky.h @@ -1,5 +1,4 @@ -#ifndef PROCESS_CLICKY_H -#define PROCESS_CLICKY_H +#pragma once void clicky_play(void); bool process_clicky(uint16_t keycode, keyrecord_t *record); @@ -13,5 +12,3 @@ void clicky_on(void); void clicky_off(void); bool is_clicky_on(void); - -#endif diff --git a/quantum/process_keycode/process_combo.h b/quantum/process_keycode/process_combo.h index 0f01aae93e..e51a2f1f4e 100644 --- a/quantum/process_keycode/process_combo.h +++ b/quantum/process_keycode/process_combo.h @@ -14,8 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PROCESS_COMBO_H -#define PROCESS_COMBO_H +#pragma once #include "progmem.h" #include "quantum.h" @@ -62,5 +61,3 @@ void combo_enable(void); void combo_disable(void); void combo_toggle(void); bool is_combo_enabled(void); - -#endif diff --git a/quantum/process_keycode/process_key_lock.h b/quantum/process_keycode/process_key_lock.h index a8e110a4bf..baa0b39077 100644 --- a/quantum/process_keycode/process_key_lock.h +++ b/quantum/process_keycode/process_key_lock.h @@ -14,11 +14,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PROCESS_KEY_LOCK_H -#define PROCESS_KEY_LOCK_H +#pragma once #include "quantum.h" bool process_key_lock(uint16_t *keycode, keyrecord_t *record); - -#endif // PROCESS_KEY_LOCK_H diff --git a/quantum/process_keycode/process_leader.h b/quantum/process_keycode/process_leader.h index e0edf57b32..9844f27a1b 100644 --- a/quantum/process_keycode/process_leader.h +++ b/quantum/process_keycode/process_leader.h @@ -14,8 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PROCESS_LEADER_H -#define PROCESS_LEADER_H +#pragma once #include "quantum.h" @@ -37,5 +36,3 @@ void qk_leader_start(void); extern uint16_t leader_sequence[5]; \ extern uint8_t leader_sequence_size #define LEADER_DICTIONARY() if (leading && timer_elapsed(leader_time) > LEADER_TIMEOUT) - -#endif diff --git a/quantum/process_keycode/process_midi.h b/quantum/process_keycode/process_midi.h index ef5661dd4d..68c6eda666 100644 --- a/quantum/process_keycode/process_midi.h +++ b/quantum/process_keycode/process_midi.h @@ -14,8 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PROCESS_MIDI_H -#define PROCESS_MIDI_H +#pragma once #include "quantum.h" @@ -53,5 +52,3 @@ uint8_t midi_compute_note(uint16_t keycode); # endif // MIDI_ADVANCED #endif // MIDI_ENABLE - -#endif diff --git a/quantum/process_keycode/process_music.h b/quantum/process_keycode/process_music.h index 292bc53742..01014aa6c2 100644 --- a/quantum/process_keycode/process_music.h +++ b/quantum/process_keycode/process_music.h @@ -14,8 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PROCESS_MUSIC_H -#define PROCESS_MUSIC_H +#pragma once #include "quantum.h" @@ -57,5 +56,3 @@ bool music_mask_user(uint16_t keycode); # endif #endif // defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC)) - -#endif diff --git a/quantum/process_keycode/process_printer.h b/quantum/process_keycode/process_printer.h index 71d3a4b56a..3c6d06ff94 100644 --- a/quantum/process_keycode/process_printer.h +++ b/quantum/process_keycode/process_printer.h @@ -14,13 +14,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PROCESS_PRINTER_H -#define PROCESS_PRINTER_H +#pragma once #include "quantum.h" #include "protocol/serial.h" bool process_printer(uint16_t keycode, keyrecord_t *record); - -#endif diff --git a/quantum/process_keycode/process_steno.h b/quantum/process_keycode/process_steno.h index ed049eb13f..d11fd40af0 100644 --- a/quantum/process_keycode/process_steno.h +++ b/quantum/process_keycode/process_steno.h @@ -13,8 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PROCESS_STENO_H -#define PROCESS_STENO_H + +#pragma once #include "quantum.h" @@ -25,5 +25,3 @@ void steno_init(void); void steno_set_mode(steno_mode_t mode); uint8_t *steno_get_state(void); uint8_t *steno_get_chord(void); - -#endif diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h index 09ceef74d8..a013c5cabf 100644 --- a/quantum/process_keycode/process_tap_dance.h +++ b/quantum/process_keycode/process_tap_dance.h @@ -13,8 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PROCESS_TAP_DANCE_H -#define PROCESS_TAP_DANCE_H + +#pragma once #ifdef TAP_DANCE_ENABLE @@ -101,5 +101,3 @@ void qk_tap_dance_dual_role_reset(qk_tap_dance_state_t *state, void *user_data); # define TD(n) KC_NO #endif - -#endif diff --git a/quantum/process_keycode/process_terminal.h b/quantum/process_keycode/process_terminal.h index 8426f442b6..0159131e5b 100644 --- a/quantum/process_keycode/process_terminal.h +++ b/quantum/process_keycode/process_terminal.h @@ -14,8 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PROCESS_TERMINAL_H -#define PROCESS_TERMINAL_H +#pragma once #include "quantum.h" @@ -23,5 +22,3 @@ extern const char keycode_to_ascii_lut[58]; extern const char shifted_keycode_to_ascii_lut[58]; extern const char terminal_prompt[8]; bool process_terminal(uint16_t keycode, keyrecord_t *record); - -#endif
\ No newline at end of file diff --git a/quantum/process_keycode/process_terminal_nop.h b/quantum/process_keycode/process_terminal_nop.h index 56895b33c3..36e25320c5 100644 --- a/quantum/process_keycode/process_terminal_nop.h +++ b/quantum/process_keycode/process_terminal_nop.h @@ -14,12 +14,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PROCESS_TERMINAL_H -#define PROCESS_TERMINAL_H +#pragma once #include "quantum.h" #define TERM_ON KC_NO #define TERM_OFF KC_NO - -#endif
\ No newline at end of file diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index a2cc7b38d9..0160c5586d 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h @@ -13,8 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef QUANTUM_KEYCODES_H -#define QUANTUM_KEYCODES_H + +#pragma once #if defined(SEQUENCER_ENABLE) # include "sequencer.h" @@ -889,5 +889,3 @@ enum quantum_keycodes { #define DM_RSTP DYN_REC_STOP #define DM_PLY1 DYN_MACRO_PLAY1 #define DM_PLY2 DYN_MACRO_PLAY2 - -#endif // QUANTUM_KEYCODES_H diff --git a/quantum/rgb.h b/quantum/rgb.h index 7b6ea0542f..2602fc0b20 100644 --- a/quantum/rgb.h +++ b/quantum/rgb.h @@ -14,8 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef RGB_H -#define RGB_H +#pragma once __attribute__((weak)) void rgblight_toggle(void){}; @@ -38,5 +37,3 @@ __attribute__((weak)) void rgblight_decrease_val(void){}; __attribute__((weak)) void rgblight_increase_speed(void){}; __attribute__((weak)) void rgblight_decrease_speed(void){}; - -#endif
\ No newline at end of file diff --git a/quantum/rgb_matrix.h b/quantum/rgb_matrix.h index 1fd016d79a..8c80c1bff0 100644 --- a/quantum/rgb_matrix.h +++ b/quantum/rgb_matrix.h @@ -16,8 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef RGB_MATRIX_H -#define RGB_MATRIX_H +#pragma once #include <stdint.h> #include <stdbool.h> @@ -226,5 +225,3 @@ extern last_hit_t g_last_hit_tracker; #ifdef RGB_MATRIX_FRAMEBUFFER_EFFECTS extern uint8_t g_rgb_frame_buffer[MATRIX_ROWS][MATRIX_COLS]; #endif - -#endif diff --git a/quantum/rgblight.h b/quantum/rgblight.h index c3a9e94b7c..c02fd4f37b 100644 --- a/quantum/rgblight.h +++ b/quantum/rgblight.h @@ -13,8 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef RGBLIGHT_H -#define RGBLIGHT_H + +#pragma once |