Merge remote-tracking branch 'upstream/master' into develop
This commit is contained in:
commit
4ec8764c70
20 changed files with 307 additions and 42 deletions
|
@ -15,16 +15,7 @@
|
|||
*/
|
||||
#pragma once
|
||||
|
||||
#if defined(__AVR__)
|
||||
# include <avr/pgmspace.h>
|
||||
# include <avr/io.h>
|
||||
# include <avr/interrupt.h>
|
||||
#endif
|
||||
#if defined(PROTOCOL_CHIBIOS)
|
||||
# include <hal.h>
|
||||
# include "chibios_config.h"
|
||||
#endif
|
||||
|
||||
#include "platform.h"
|
||||
#include "wait.h"
|
||||
#include "matrix.h"
|
||||
#include "keymap.h"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue