Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2020-12-26 04:56:43 +00:00
commit 0b37c0dfa0
60 changed files with 96 additions and 258 deletions

View file

@ -14,8 +14,8 @@ 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 <http://www.gnu.org/licenses/>.
*/
#ifndef ACTION_H
#define ACTION_H
#pragma once
#include <stdint.h>
#include <stdbool.h>
@ -124,5 +124,3 @@ void debug_action(action_t action);
#ifdef __cplusplus
}
#endif
#endif /* ACTION_H */

View file

@ -14,8 +14,8 @@ 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 <http://www.gnu.org/licenses/>.
*/
#ifndef ACTION_CODE_H
#define ACTION_CODE_H
#pragma once
/** \brief Action codes
*
@ -306,5 +306,3 @@ enum swap_hands_param_tap_op {
#define ACTION_SWAP_HANDS_OFF_ON() ACTION(ACT_SWAP_HANDS, OP_SH_OFF_ON)
#define ACTION_SWAP_HANDS_ON() ACTION(ACT_SWAP_HANDS, OP_SH_ON)
#define ACTION_SWAP_HANDS_OFF() ACTION(ACT_SWAP_HANDS, OP_SH_OFF)
#endif /* ACTION_CODE_H */

View file

@ -14,8 +14,8 @@ 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 <http://www.gnu.org/licenses/>.
*/
#ifndef ACTION_LAYER_H
#define ACTION_LAYER_H
#pragma once
#include <stdint.h>
#include "keyboard.h"
@ -120,5 +120,3 @@ uint8_t layer_switch_get_layer(keypos_t key);
/* return action depending on current layer status */
action_t layer_switch_get_action(keypos_t key);
#endif

View file

@ -14,8 +14,9 @@ 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 <http://www.gnu.org/licenses/>.
*/
#ifndef ACTION_MACRO_H
#define ACTION_MACRO_H
#pragma once
#include <stdint.h>
#include "progmem.h"
@ -120,5 +121,3 @@ enum macro_command_id {
/* for backward comaptibility */
#define MD(key) DOWN(KC_##key)
#define MU(key) UP(KC_##key)
#endif /* ACTION_MACRO_H */

View file

@ -14,8 +14,8 @@ 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 <http://www.gnu.org/licenses/>.
*/
#ifndef ACTION_TAPPING_H
#define ACTION_TAPPING_H
#pragma once
/* period of tapping(ms) */
#ifndef TAPPING_TERM
@ -36,5 +36,3 @@ uint16_t get_event_keycode(keyevent_t event, bool update_layer_cache);
uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record);
void action_tapping_process(keyrecord_t record);
#endif
#endif

View file

@ -14,8 +14,8 @@ 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 <http://www.gnu.org/licenses/>.
*/
#ifndef ACTION_UTIL_H
#define ACTION_UTIL_H
#pragma once
#include <stdint.h>
#include "report.h"
@ -98,5 +98,3 @@ void clear_oneshot_swaphands(void);
#ifdef __cplusplus
}
#endif
#endif

View file

@ -1,10 +1,7 @@
#ifndef _PRINTF_H_
#define _PRINTF_H_
#pragma once
#define CONSOLE_PRINTBUF_SIZE 512
void console_printf(char *fmt, ...);
#define __xprintf console_printf
#endif //_PRINTF_H_

View file

@ -1,5 +1,4 @@
#ifndef SUSPEND_AVR_H
#define SUSPEND_AVR_H
#pragma once
#include <stdint.h>
#include <stdbool.h>
@ -24,5 +23,3 @@ __asm__ __volatile__ ( \
: "r0" \
)
// clang-format on
#endif

View file

@ -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 TIMER_AVR_H
#define TIMER_AVR_H 1
#pragma once
#include <stdint.h>
@ -38,5 +37,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#if (TIMER_RAW_TOP > 255)
# error "Timer0 can't count 1ms at this clock freq. Use larger prescaler."
#endif
#endif

View file

@ -2,8 +2,7 @@
Extended itoa, puts and printf (C)ChaN, 2011
-----------------------------------------------------------------------------*/
#ifndef XPRINTF_H
#define XPRINTF_H
#pragma once
#include <inttypes.h>
#include <avr/pgmspace.h>
@ -102,5 +101,3 @@ char xatoi(char **str, long *ret);
#ifdef __cplusplus
}
#endif
#endif

View file

@ -15,10 +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 BOOTLOADER_H
#define BOOTLOADER_H
#pragma once
/* give code for your bootloader to come up if needed */
void bootloader_jump(void);
#endif

View file

@ -1,5 +1,4 @@
#ifndef BOOTMAGIC_H
#define BOOTMAGIC_H
#pragma once
/* FIXME: Add special doxygen comments for defines here. */
@ -101,5 +100,3 @@
void bootmagic(void);
bool bootmagic_scan_keycode(uint8_t keycode);
#endif

View file

@ -21,8 +21,7 @@
* This library also assumes that the pages are not used by the firmware.
*/
#ifndef __EEPROM_H
#define __EEPROM_H
#pragma once
#include <ch.h>
#include <hal.h>
@ -83,5 +82,3 @@ uint16_t EEPROM_Init(void);
void EEPROM_Erase(void);
uint16_t EEPROM_WriteDataByte(uint16_t Address, uint8_t DataByte);
uint8_t EEPROM_ReadDataByte(uint16_t Address);
#endif /* __EEPROM_H */

View file

@ -16,8 +16,7 @@
* Modifications for QMK and STM32F303 by Yiancar
*/
#ifndef __FLASH_STM32_H
#define __FLASH_STM32_H
#pragma once
#ifdef __cplusplus
extern "C" {
@ -41,5 +40,3 @@ void FLASH_ClearFlag(uint32_t FLASH_FLAG);
#ifdef __cplusplus
}
#endif
#endif /* __FLASH_STM32_H */

View file

@ -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 DEBUG_H
#define DEBUG_H 1
#pragma once
#include <stdbool.h>
#include "print.h"
@ -168,5 +167,3 @@ extern debug_config_t debug_config;
# define debug_bin_reverse(data)
#endif /* NO_DEBUG */
#endif

View file

@ -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 EECONFIG_H
#define EECONFIG_H
#pragma once
#include <stdint.h>
#include <stdbool.h>
@ -111,5 +110,3 @@ void eeconfig_update_haptic(uint32_t val);
bool eeconfig_read_handedness(void);
void eeconfig_update_handedness(bool val);
#endif

View file

@ -1,5 +1,4 @@
#ifndef TMK_CORE_COMMON_EEPROM_H_
#define TMK_CORE_COMMON_EEPROM_H_
#pragma once
#if defined(__AVR__) && !defined(EEPROM_DRIVER)
# include <avr/eeprom.h>
@ -20,5 +19,3 @@ void eeprom_update_word(uint16_t *__p, uint16_t __value);
void eeprom_update_dword(uint32_t *__p, uint32_t __value);
void eeprom_update_block(const void *__src, void *__dst, size_t __n);
#endif
#endif /* TMK_CORE_COMMON_EEPROM_H_ */

View file

@ -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 HOST_DRIVER_H
#define HOST_DRIVER_H
#pragma once
#include <stdint.h>
#include "report.h"
@ -31,5 +30,3 @@ typedef struct {
void (*send_system)(uint16_t);
void (*send_consumer)(uint16_t);
} host_driver_t;
#endif

View file

@ -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 KEYBOARD_H
#define KEYBOARD_H
#pragma once
#include <stdbool.h>
#include <stdint.h>
@ -77,5 +76,3 @@ void housekeeping_task_user(void);
#ifdef __cplusplus
}
#endif
#endif

View file

@ -21,8 +21,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* See https://web.archive.org/web/20060218214400/http://www.usb.org/developers/devclass_docs/Hut1_12.pdf
* or http://www.usb.org/developers/hidpage/Hut1_12v2.pdf (older)
*/
#ifndef KEYCODE_H
#define KEYCODE_H
#pragma once
/* FIXME: Add doxygen comments here */
@ -542,4 +542,3 @@ enum mouse_keys {
KC_MS_ACCEL1,
KC_MS_ACCEL2
};
#endif

View file

@ -1,6 +1,3 @@
#ifndef MAGIC_H
#define MAGIC_H
#pragma once
void magic(void);
#endif

View file

@ -14,8 +14,8 @@ 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 <http://www.gnu.org/licenses/>.
*/
#ifndef MATRIX_H
#define MATRIX_H
#pragma once
#include <stdint.h>
#include <stdbool.h>
@ -76,5 +76,3 @@ void matrix_scan_user(void);
#ifdef __cplusplus
}
#endif
#endif

View file

@ -15,9 +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 MOUSEKEY_H
# define MOUSEKEY_H
#endif
#pragma once
#include <stdbool.h>
#include "host.h"

View file

@ -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 NODEBUG_H
#define NODEBUG_H
#pragma once
#ifndef NO_DEBUG
# define NO_DEBUG
@ -25,5 +24,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#else
# include "debug.h"
#endif
#endif

View file

@ -22,8 +22,7 @@
* THE SOFTWARE.
*/
#ifndef PRINT_H__
#define PRINT_H__ 1
#pragma once
#include <stdint.h>
#include <stdbool.h>
@ -269,5 +268,3 @@ extern "C"
#define pbin16(data) print_bin16(data)
#define pbin_reverse(data) print_bin_reverse8(data)
#define pbin_reverse16(data) print_bin_reverse16(data)
#endif

View file

@ -1,8 +1,5 @@
#ifndef _RAW_HID_H_
#define _RAW_HID_H_
#pragma once
void raw_hid_receive(uint8_t *data, uint8_t length);
void raw_hid_send(uint8_t *data, uint8_t length);
#endif

View file

@ -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 SENDCHAR_H
#define SENDCHAR_H
#pragma once
#include <stdint.h>
@ -30,5 +29,3 @@ int8_t sendchar(uint8_t c);
#ifdef __cplusplus
}
#endif
#endif

View file

@ -1,5 +1,4 @@
#ifndef SLEEP_LED_H
#define SLEEP_LED_H
#pragma once
#ifdef SLEEP_LED_ENABLE
@ -16,5 +15,3 @@ void sleep_led_toggle(void);
# define sleep_led_toggle()
#endif
#endif

View file

@ -1,5 +1,4 @@
#ifndef SUSPEND_H
#define SUSPEND_H
#pragma once
#include <stdint.h>
#include <stdbool.h>
@ -13,5 +12,3 @@ void suspend_wakeup_init_user(void);
void suspend_wakeup_init_kb(void);
void suspend_power_down_user(void);
void suspend_power_down_kb(void);
#endif

View file

@ -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 TIMER_H
#define TIMER_H 1
#pragma once
#include <stdint.h>
#include <stdbool.h>
@ -51,5 +50,3 @@ uint32_t timer_elapsed32(uint32_t last);
#ifdef __cplusplus
}
#endif
#endif

View file

@ -1,5 +1,4 @@
#ifndef _uart_included_h_
#define _uart_included_h_
#pragma once
#include <stdint.h>
@ -7,5 +6,3 @@ void uart_init(uint32_t baud);
void uart_putchar(uint8_t c);
uint8_t uart_getchar(void);
uint8_t uart_available(void);
#endif

View file

@ -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 UTIL_H
#define UTIL_H
#pragma once
#include <stdint.h>
@ -46,5 +45,3 @@ uint32_t bitrev32(uint32_t bits);
#ifdef __cplusplus
}
#endif
#endif

View file

@ -1,10 +1,7 @@
#ifndef _VIRTSER_H_
#define _VIRTSER_H_
#pragma once
/* Define this function in your code to process incoming bytes */
void virtser_recv(const uint8_t ch);
/* Call this to send a character over the Virtual Serial Device */
void virtser_send(const uint8_t byte);
#endif

View file

@ -1,5 +1,4 @@
#ifndef WAIT_H
#define WAIT_H
#pragma once
#include <inttypes.h>
@ -41,5 +40,3 @@ void wait_ms(uint32_t ms);
#ifdef __cplusplus
}
#endif
#endif