fern/qmk-firmware
1
0
Fork 0
mirror of https://github.com/firewalkwithm3/qmk_firmware.git synced 2024-11-22 11:30:30 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Avoid name conflicts with usb_hid Arduino code (#13870)

Browse source 
* Avoid name conflicts with usb_hid Arduino code

* Fix tests
This commit is contained in:
Joel Challis 2021-08-06 06:53:38 +01:00 committed by GitHub
parent b9a1b61f6a
commit c588d232cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
quantum/quantum.h
View file

@ -15,7 +15,7 @@
*/
#pragma once
#include "platform.h"
#include "platform_deps.h"
#include "wait.h"
#include "matrix.h"
#include "keymap.h"

0
tmk_core/common/arm_atsam/platform.h → tmk_core/common/arm_atsam/platform_deps.h
View file

0
tmk_core/common/avr/platform.h → tmk_core/common/avr/platform_deps.h
View file

0
tmk_core/common/chibios/platform.h → tmk_core/common/chibios/platform_deps.h
View file

18
tmk_core/common/test/platform_deps.h Normal file
View file

@ -0,0 +1,18 @@
/* Copyright 2021 QMK
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
// here just to please the build