Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
fdfcce57e1
60 changed files with 99 additions and 79 deletions
|
@ -15,8 +15,8 @@
|
|||
* GPL v2 or later.
|
||||
*/
|
||||
|
||||
#include "ch.h"
|
||||
#include "hal.h"
|
||||
#include <ch.h>
|
||||
#include <hal.h>
|
||||
|
||||
#include "usb_main.h"
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
* @{
|
||||
*/
|
||||
|
||||
#include "hal.h"
|
||||
#include <hal.h>
|
||||
#include "usb_driver.h"
|
||||
#include <string.h>
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#ifndef USB_DRIVER_H
|
||||
# define USB_DRIVER_H
|
||||
|
||||
# include "hal_usb_cdc.h"
|
||||
# include <hal_usb_cdc.h>
|
||||
|
||||
/*===========================================================================*/
|
||||
/* Driver constants. */
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -61,7 +61,7 @@ extern keymap_config_t keymap_config;
|
|||
#endif
|
||||
|
||||
#ifdef AUDIO_ENABLE
|
||||
# include <audio.h>
|
||||
# include "audio.h"
|
||||
#endif
|
||||
|
||||
#ifdef BLUETOOTH_ENABLE
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
#include <LUFA/Drivers/USB/USB.h>
|
||||
|
||||
#ifdef PROTOCOL_CHIBIOS
|
||||
# include "hal.h"
|
||||
# include <hal.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue