Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
fdfcce57e1
60 changed files with 99 additions and 79 deletions
|
@ -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
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include "ch.h"
|
||||
#include "hal.h"
|
||||
#include <ch.h>
|
||||
#include <hal.h>
|
||||
|
||||
#include "eeconfig.h"
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include "ch.h"
|
||||
#include "hal.h"
|
||||
#include <ch.h>
|
||||
#include <hal.h>
|
||||
|
||||
#include "led.h"
|
||||
#include "sleep_led.h"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* TODO */
|
||||
|
||||
#include "ch.h"
|
||||
#include "hal.h"
|
||||
#include <ch.h>
|
||||
#include <hal.h>
|
||||
|
||||
#include "matrix.h"
|
||||
#include "action.h"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "ch.h"
|
||||
#include <ch.h>
|
||||
|
||||
#include "timer.h"
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include "action_layer.h"
|
||||
|
||||
#ifdef STM32_EEPROM_ENABLE
|
||||
# include "hal.h"
|
||||
# include <hal.h>
|
||||
# include "eeprom_stm32.h"
|
||||
#endif
|
||||
|
||||
|
|
|
@ -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) { \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue