diff options
| author | QMK Bot <hello@qmk.fm> | 2021-08-06 05:54:10 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-08-06 05:54:10 +0000 |
| commit | 538d9d7890353b1766e647576c5cb1f5e9d147d3 (patch) | |
| tree | 2c74b28b23fe681453ad1f3e4663f08282346499 | |
| parent | 3ba2ce40a51628c943c2eb8573fa8e4c9763821e (diff) | |
| parent | c588d232cb97904400b048db923ee86e5bf9abcc (diff) | |
| download | qmk_firmware-538d9d7890353b1766e647576c5cb1f5e9d147d3.tar.gz qmk_firmware-538d9d7890353b1766e647576c5cb1f5e9d147d3.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | quantum/quantum.h | 2 | ||||
| -rw-r--r-- | tmk_core/common/arm_atsam/platform_deps.h (renamed from tmk_core/common/arm_atsam/platform.h) | 0 | ||||
| -rw-r--r-- | tmk_core/common/avr/platform_deps.h (renamed from tmk_core/common/avr/platform.h) | 0 | ||||
| -rw-r--r-- | tmk_core/common/chibios/platform_deps.h (renamed from tmk_core/common/chibios/platform.h) | 0 | ||||
| -rw-r--r-- | tmk_core/common/test/platform_deps.h | 18 |
5 files changed, 19 insertions, 1 deletions
diff --git a/quantum/quantum.h b/quantum/quantum.h index d44dc26d2e..ffb5e0df45 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -15,7 +15,7 @@ */ #pragma once -#include "platform.h" +#include "platform_deps.h" #include "wait.h" #include "matrix.h" #include "keymap.h" diff --git a/tmk_core/common/arm_atsam/platform.h b/tmk_core/common/arm_atsam/platform_deps.h index f296d1d535..f296d1d535 100644 --- a/tmk_core/common/arm_atsam/platform.h +++ b/tmk_core/common/arm_atsam/platform_deps.h diff --git a/tmk_core/common/avr/platform.h b/tmk_core/common/avr/platform_deps.h index 45d9dcebfa..45d9dcebfa 100644 --- a/tmk_core/common/avr/platform.h +++ b/tmk_core/common/avr/platform_deps.h diff --git a/tmk_core/common/chibios/platform.h b/tmk_core/common/chibios/platform_deps.h index 8243dcec53..8243dcec53 100644 --- a/tmk_core/common/chibios/platform.h +++ b/tmk_core/common/chibios/platform_deps.h diff --git a/tmk_core/common/test/platform_deps.h b/tmk_core/common/test/platform_deps.h new file mode 100644 index 0000000000..f296d1d535 --- /dev/null +++ b/tmk_core/common/test/platform_deps.h @@ -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 |