mirror of
https://github.com/qmk/qmk_firmware.git
synced 2026-09-30 05:50:43 +02:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
@@ -25,8 +25,6 @@
|
||||
# define TIMESTAMP_GETTER TCNT0
|
||||
#elif defined(PROTOCOL_CHIBIOS)
|
||||
# define TIMESTAMP_GETTER chSysGetRealtimeCounterX()
|
||||
#elif defined(PROTOCOL_ARM_ATSAM)
|
||||
# error arm_atsam not currently supported
|
||||
#else
|
||||
# error Unknown protocol in use
|
||||
#endif
|
||||
|
||||
@@ -17,10 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#pragma once
|
||||
|
||||
#ifndef PROTOCOL_ARM_ATSAM
|
||||
# include <stdio.h>
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdbool.h>
|
||||
#include "print.h"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user