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-16 03:27:52 +00:00
commit 2e0f2025bd
81 changed files with 108 additions and 291 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tmk_core/protocol/chibios/lufa_utils/LUFA/Drivers/USB/USB.h
View file

@ -1,6 +1,6 @@
#include "progmem.h"
#include "stddef.h"
#include "inttypes.h"
#include <stddef.h>
#include <inttypes.h>
#define ATTR_PACKED __attribute__((packed))
/** Concatenates the given input into a single token, via the C Preprocessor.

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

@ -31,7 +31,7 @@
#include "led.h"
#include "sendchar.h"
#include "debug.h"
#include "printf.h"
#include "print.h"
#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
// Change this to be TRUE once we've migrated keyboards to the new init system