drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

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

Browse source
This commit is contained in:
QMK Bot 2020-12-11 02:46:19 +00:00
commit fdfcce57e1
60 changed files with 99 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tmk_core/common/action.c
View file

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

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

@ -1,7 +1,7 @@
#include "bootloader.h"
#include "ch.h"
#include "hal.h"
#include <ch.h>
#include <hal.h>
#include "wait.h"
/* 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
#define __EEPROM_H
#include "ch.h"
#include "hal.h"
#include <ch.h>
#include <hal.h>
#include "flash_stm32.h"
// 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 "hal.h"
#include <ch.h>
#include <hal.h>
#include "eeconfig.h"

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

@ -23,8 +23,8 @@
extern "C" {
#endif
#include "ch.h"
#include "hal.h"
#include <ch.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;

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

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

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

@ -1,7 +1,7 @@
/* TODO */
#include "ch.h"
#include "hal.h"
#include <ch.h>
#include <hal.h>
#include "matrix.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"

2
tmk_core/common/eeconfig.c
View file

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

2
tmk_core/common/wait.h
View file

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

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

@ -15,8 +15,8 @@
* GPL v2 or later.
*/
#include "ch.h"
#include "hal.h"
#include <ch.h>
#include <hal.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 <string.h>

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

@ -25,7 +25,7 @@
#ifndef USB_DRIVER_H
# define USB_DRIVER_H
# include "hal_usb_cdc.h"
# include <hal_usb_cdc.h>
/*===========================================================================*/
/* 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.
*/
#include "ch.h"
#include "hal.h"
#include <ch.h>
#include <hal.h>
#include "usb_main.h"

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

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

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

@ -61,7 +61,7 @@ extern keymap_config_t keymap_config;
#endif
#ifdef AUDIO_ENABLE
# include <audio.h>
# include "audio.h"
#endif
#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; }
#elif defined(__arm__)
# include "ch.h"
# include <ch.h>
interrupt_setting_t store_and_clear_interrupt(void) {
chSysLock();

2
tmk_core/protocol/usb_descriptor.h
View file

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