From b11657d1c8a3360779b6b412806d89ca3175fc5f Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Tue, 5 Jul 2016 13:48:12 +0300 Subject: [PATCH 1/4] Suprojects for ChibiOS testing --- keyboards/chibios_test/Makefile | 14 ++++ keyboards/chibios_test/chibios_test.c | 1 + keyboards/chibios_test/chibios_test.h | 6 ++ .../config.h | 8 +- .../keymaps/default/keymap.c | 2 +- .../stm32_f072_onekey/Makefile | 11 +-- .../stm32_f072_onekey/bootloader_defs.h | 0 .../stm32_f072_onekey/chconf.h | 0 .../chibios_test/stm32_f072_onekey/config.h | 7 ++ .../stm32_f072_onekey/halconf.h | 0 .../stm32_f072_onekey/led.c | 0 .../stm32_f072_onekey/matrix.c | 0 .../stm32_f072_onekey/mcuconf.h | 0 .../stm32_f072_onekey/stm32_f072_onekey.c | 0 .../stm32_f072_onekey/stm32_f072_onekey.h | 2 +- .../stm32_f103_onekey/Makefile | 14 +--- .../boards/GENERIC_STM32_F103/board.c | 0 .../boards/GENERIC_STM32_F103/board.h | 0 .../boards/GENERIC_STM32_F103/board.mk | 0 .../GENERIC_STM32_F103/mini_stm32_mapping.png | Bin .../boards/maple_mini_mapping.png | Bin .../stm32_f103_onekey/bootloader_defs.h | 0 .../stm32_f103_onekey/chconf.h | 0 .../chibios_test/stm32_f103_onekey/config.h | 6 ++ .../stm32_f103_onekey/flash.sh | 0 .../stm32_f103_onekey/halconf.h | 0 .../ld/STM32F103x8_stm32duino_bootloader.ld | 0 .../stm32_f103_onekey/led.c | 0 .../stm32_f103_onekey/matrix.c | 0 .../stm32_f103_onekey/mcuconf.h | 0 .../stm32_f103_onekey/stm32_f103_onekey.c | 0 .../stm32_f103_onekey/stm32_f103_onekey.h | 2 +- .../teensy_lc_onekey/Makefile | 17 +--- .../teensy_lc_onekey/Makefile.3.0 | 0 .../teensy_lc_onekey/Makefile.3.2 | 0 .../teensy_lc_onekey/chconf.h | 0 .../chibios_test/teensy_lc_onekey/config.h | 6 ++ .../teensy_lc_onekey/halconf.h | 0 .../teensy_lc_onekey/instructions.md | 0 .../teensy_lc_onekey/ld/MKL26Z64.ld | 0 .../{ => chibios_test}/teensy_lc_onekey/led.c | 0 .../teensy_lc_onekey/matrix.c | 0 .../teensy_lc_onekey/mcuconf.h | 0 .../teensy_lc_onekey/teensy_lc_onekey.c | 0 .../teensy_lc_onekey/teensy_lc_onekey.h | 2 +- .../keymaps/default/keymap.c | 25 ------ keyboards/stm32_f103_onekey/config.h | 75 ------------------ keyboards/teensy_lc_onekey/config.h | 75 ------------------ .../teensy_lc_onekey/keymaps/default/keymap.c | 32 -------- 49 files changed, 52 insertions(+), 253 deletions(-) create mode 100644 keyboards/chibios_test/Makefile create mode 100644 keyboards/chibios_test/chibios_test.c create mode 100644 keyboards/chibios_test/chibios_test.h rename keyboards/{stm32_f072_onekey => chibios_test}/config.h (91%) rename keyboards/{stm32_f103_onekey => chibios_test}/keymaps/default/keymap.c (96%) rename keyboards/{ => chibios_test}/stm32_f072_onekey/Makefile (77%) rename keyboards/{ => chibios_test}/stm32_f072_onekey/bootloader_defs.h (100%) rename keyboards/{ => chibios_test}/stm32_f072_onekey/chconf.h (100%) create mode 100644 keyboards/chibios_test/stm32_f072_onekey/config.h rename keyboards/{ => chibios_test}/stm32_f072_onekey/halconf.h (100%) rename keyboards/{ => chibios_test}/stm32_f072_onekey/led.c (100%) rename keyboards/{ => chibios_test}/stm32_f072_onekey/matrix.c (100%) rename keyboards/{ => chibios_test}/stm32_f072_onekey/mcuconf.h (100%) rename keyboards/{ => chibios_test}/stm32_f072_onekey/stm32_f072_onekey.c (100%) rename keyboards/{ => chibios_test}/stm32_f072_onekey/stm32_f072_onekey.h (71%) rename keyboards/{ => chibios_test}/stm32_f103_onekey/Makefile (76%) rename keyboards/{ => chibios_test}/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.c (100%) rename keyboards/{ => chibios_test}/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.h (100%) rename keyboards/{ => chibios_test}/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.mk (100%) rename keyboards/{ => chibios_test}/stm32_f103_onekey/boards/GENERIC_STM32_F103/mini_stm32_mapping.png (100%) rename keyboards/{ => chibios_test}/stm32_f103_onekey/boards/maple_mini_mapping.png (100%) rename keyboards/{ => chibios_test}/stm32_f103_onekey/bootloader_defs.h (100%) rename keyboards/{ => chibios_test}/stm32_f103_onekey/chconf.h (100%) create mode 100644 keyboards/chibios_test/stm32_f103_onekey/config.h rename keyboards/{ => chibios_test}/stm32_f103_onekey/flash.sh (100%) rename keyboards/{ => chibios_test}/stm32_f103_onekey/halconf.h (100%) rename keyboards/{ => chibios_test}/stm32_f103_onekey/ld/STM32F103x8_stm32duino_bootloader.ld (100%) rename keyboards/{ => chibios_test}/stm32_f103_onekey/led.c (100%) rename keyboards/{ => chibios_test}/stm32_f103_onekey/matrix.c (100%) rename keyboards/{ => chibios_test}/stm32_f103_onekey/mcuconf.h (100%) rename keyboards/{ => chibios_test}/stm32_f103_onekey/stm32_f103_onekey.c (100%) rename keyboards/{ => chibios_test}/stm32_f103_onekey/stm32_f103_onekey.h (70%) rename keyboards/{ => chibios_test}/teensy_lc_onekey/Makefile (69%) rename keyboards/{ => chibios_test}/teensy_lc_onekey/Makefile.3.0 (100%) rename keyboards/{ => chibios_test}/teensy_lc_onekey/Makefile.3.2 (100%) rename keyboards/{ => chibios_test}/teensy_lc_onekey/chconf.h (100%) create mode 100644 keyboards/chibios_test/teensy_lc_onekey/config.h rename keyboards/{ => chibios_test}/teensy_lc_onekey/halconf.h (100%) rename keyboards/{ => chibios_test}/teensy_lc_onekey/instructions.md (100%) rename keyboards/{ => chibios_test}/teensy_lc_onekey/ld/MKL26Z64.ld (100%) rename keyboards/{ => chibios_test}/teensy_lc_onekey/led.c (100%) rename keyboards/{ => chibios_test}/teensy_lc_onekey/matrix.c (100%) rename keyboards/{ => chibios_test}/teensy_lc_onekey/mcuconf.h (100%) rename keyboards/{ => chibios_test}/teensy_lc_onekey/teensy_lc_onekey.c (100%) rename keyboards/{ => chibios_test}/teensy_lc_onekey/teensy_lc_onekey.h (69%) delete mode 100644 keyboards/stm32_f072_onekey/keymaps/default/keymap.c delete mode 100644 keyboards/stm32_f103_onekey/config.h delete mode 100644 keyboards/teensy_lc_onekey/config.h delete mode 100644 keyboards/teensy_lc_onekey/keymaps/default/keymap.c diff --git a/keyboards/chibios_test/Makefile b/keyboards/chibios_test/Makefile new file mode 100644 index 0000000000..d9f2b8b83b --- /dev/null +++ b/keyboards/chibios_test/Makefile @@ -0,0 +1,14 @@ +SUBPROJECT_DEFAULT = stm32_f072_onekey + +#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration +MOUSEKEY_ENABLE ?= yes # Mouse keys +EXTRAKEY_ENABLE ?= yes # Audio control and System control +CONSOLE_ENABLE ?= yes # Console for debug +COMMAND_ENABLE ?= yes # Commands for debug and configuration +SLEEP_LED_ENABLE ?= yes # Breathing sleep LED during USB suspend +NKRO_ENABLE ?= yes # USB Nkey Rollover +CUSTOM_MATRIX ?= yes # Custom matrix file + +ifndef QUANTUM_DIR + include ../../Makefile +endif \ No newline at end of file diff --git a/keyboards/chibios_test/chibios_test.c b/keyboards/chibios_test/chibios_test.c new file mode 100644 index 0000000000..efe2d4a5d6 --- /dev/null +++ b/keyboards/chibios_test/chibios_test.c @@ -0,0 +1 @@ +#include "chibios_test.h" diff --git a/keyboards/chibios_test/chibios_test.h b/keyboards/chibios_test/chibios_test.h new file mode 100644 index 0000000000..25b0317710 --- /dev/null +++ b/keyboards/chibios_test/chibios_test.h @@ -0,0 +1,6 @@ +#ifndef KEYBOARDS_CHIBIOS_TEST_CHIBIOS_TEST_H_ +#define KEYBOARDS_CHIBIOS_TEST_CHIBIOS_TEST_H_ + +#include "quantum.h" + +#endif /* KEYBOARDS_CHIBIOS_TEST_CHIBIOS_TEST_H_ */ diff --git a/keyboards/stm32_f072_onekey/config.h b/keyboards/chibios_test/config.h similarity index 91% rename from keyboards/stm32_f072_onekey/config.h rename to keyboards/chibios_test/config.h index bb5251e1de..210f150670 100644 --- a/keyboards/stm32_f072_onekey/config.h +++ b/keyboards/chibios_test/config.h @@ -26,11 +26,11 @@ along with this program. If not, see . #define DEVICE_VER 0x0001 /* in python2: list(u"whatever".encode('utf-16-le')) */ /* at most 32 characters or the ugly hack in usb_main.c borks */ -#define MANUFACTURER "TMK" +#define MANUFACTURER "QMK" #define USBSTR_MANUFACTURER 'T', '\x00', 'M', '\x00', 'K', '\x00', ' ', '\x00', '\xc6', '\x00' -#define PRODUCT "ChibiOS TMK test" -#define USBSTR_PRODUCT 'C', '\x00', 'h', '\x00', 'i', '\x00', 'b', '\x00', 'i', '\x00', 'O', '\x00', 'S', '\x00', ' ', '\x00', 'T', '\x00', 'M', '\x00', 'K', '\x00', ' ', '\x00', 't', '\x00', 'e', '\x00', 's', '\x00', 't', '\x00' -#define DESCRIPTION "TMK keyboard firmware over ChibiOS" +#define PRODUCT "ChibiOS QMK test" +#define USBSTR_PRODUCT 'C', '\x00', 'h', '\x00', 'i', '\x00', 'b', '\x00', 'i', '\x00', 'O', '\x00', 'S', '\x00', ' ', '\x00', 'Q', '\x00', 'M', '\x00', 'K', '\x00', ' ', '\x00', 't', '\x00', 'e', '\x00', 's', '\x00', 't', '\x00' +#define DESCRIPTION "QMK keyboard firmware test for ChibiOS" /* key matrix size */ #define MATRIX_ROWS 1 diff --git a/keyboards/stm32_f103_onekey/keymaps/default/keymap.c b/keyboards/chibios_test/keymaps/default/keymap.c similarity index 96% rename from keyboards/stm32_f103_onekey/keymaps/default/keymap.c rename to keyboards/chibios_test/keymaps/default/keymap.c index c3b0f08403..239d70007a 100644 --- a/keyboards/stm32_f103_onekey/keymaps/default/keymap.c +++ b/keyboards/chibios_test/keymaps/default/keymap.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "stm32_f103_onekey.h" +#include "chibios_test.h" const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {{KC_CAPS}}, // test with KC_CAPS, KC_A, KC_BTLD diff --git a/keyboards/stm32_f072_onekey/Makefile b/keyboards/chibios_test/stm32_f072_onekey/Makefile similarity index 77% rename from keyboards/stm32_f072_onekey/Makefile rename to keyboards/chibios_test/stm32_f072_onekey/Makefile index 24abcb0e09..eae38c4b2b 100644 --- a/keyboards/stm32_f072_onekey/Makefile +++ b/keyboards/chibios_test/stm32_f072_onekey/Makefile @@ -36,15 +36,6 @@ ARMV = 6 # Build Options # comment out to disable the options. # -#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration -MOUSEKEY_ENABLE ?= yes # Mouse keys -EXTRAKEY_ENABLE ?= yes # Audio control and System control -CONSOLE_ENABLE ?= yes # Console for debug -COMMAND_ENABLE ?= yes # Commands for debug and configuration -SLEEP_LED_ENABLE ?= yes # Breathing sleep LED during USB suspend -NKRO_ENABLE ?= yes # USB Nkey Rollover -CUSTOM_MATRIX ?= yes # Custom matrix file - ifndef QUANTUM_DIR - include ../../Makefile + include ../../../Makefile endif diff --git a/keyboards/stm32_f072_onekey/bootloader_defs.h b/keyboards/chibios_test/stm32_f072_onekey/bootloader_defs.h similarity index 100% rename from keyboards/stm32_f072_onekey/bootloader_defs.h rename to keyboards/chibios_test/stm32_f072_onekey/bootloader_defs.h diff --git a/keyboards/stm32_f072_onekey/chconf.h b/keyboards/chibios_test/stm32_f072_onekey/chconf.h similarity index 100% rename from keyboards/stm32_f072_onekey/chconf.h rename to keyboards/chibios_test/stm32_f072_onekey/chconf.h diff --git a/keyboards/chibios_test/stm32_f072_onekey/config.h b/keyboards/chibios_test/stm32_f072_onekey/config.h new file mode 100644 index 0000000000..bbaf0dc4bf --- /dev/null +++ b/keyboards/chibios_test/stm32_f072_onekey/config.h @@ -0,0 +1,7 @@ +#ifndef KEYBOARDS_CHIBIOS_TEST_STM32_F072_ONEKEY_CONFIG_H_ +#define KEYBOARDS_CHIBIOS_TEST_STM32_F072_ONEKEY_CONFIG_H_ + +#include "../config.h" + + +#endif /* KEYBOARDS_CHIBIOS_TEST_STM32_F072_ONEKEY_CONFIG_H_ */ diff --git a/keyboards/stm32_f072_onekey/halconf.h b/keyboards/chibios_test/stm32_f072_onekey/halconf.h similarity index 100% rename from keyboards/stm32_f072_onekey/halconf.h rename to keyboards/chibios_test/stm32_f072_onekey/halconf.h diff --git a/keyboards/stm32_f072_onekey/led.c b/keyboards/chibios_test/stm32_f072_onekey/led.c similarity index 100% rename from keyboards/stm32_f072_onekey/led.c rename to keyboards/chibios_test/stm32_f072_onekey/led.c diff --git a/keyboards/stm32_f072_onekey/matrix.c b/keyboards/chibios_test/stm32_f072_onekey/matrix.c similarity index 100% rename from keyboards/stm32_f072_onekey/matrix.c rename to keyboards/chibios_test/stm32_f072_onekey/matrix.c diff --git a/keyboards/stm32_f072_onekey/mcuconf.h b/keyboards/chibios_test/stm32_f072_onekey/mcuconf.h similarity index 100% rename from keyboards/stm32_f072_onekey/mcuconf.h rename to keyboards/chibios_test/stm32_f072_onekey/mcuconf.h diff --git a/keyboards/stm32_f072_onekey/stm32_f072_onekey.c b/keyboards/chibios_test/stm32_f072_onekey/stm32_f072_onekey.c similarity index 100% rename from keyboards/stm32_f072_onekey/stm32_f072_onekey.c rename to keyboards/chibios_test/stm32_f072_onekey/stm32_f072_onekey.c diff --git a/keyboards/stm32_f072_onekey/stm32_f072_onekey.h b/keyboards/chibios_test/stm32_f072_onekey/stm32_f072_onekey.h similarity index 71% rename from keyboards/stm32_f072_onekey/stm32_f072_onekey.h rename to keyboards/chibios_test/stm32_f072_onekey/stm32_f072_onekey.h index 1f798c8255..0455ad342f 100644 --- a/keyboards/stm32_f072_onekey/stm32_f072_onekey.h +++ b/keyboards/chibios_test/stm32_f072_onekey/stm32_f072_onekey.h @@ -1,5 +1,5 @@ #ifndef STM32_F072_ONEKEY_H #define STM32_F072_ONEKEY_H -#include "quantum.h" +#include "chibios_test.h" #endif diff --git a/keyboards/stm32_f103_onekey/Makefile b/keyboards/chibios_test/stm32_f103_onekey/Makefile similarity index 76% rename from keyboards/stm32_f103_onekey/Makefile rename to keyboards/chibios_test/stm32_f103_onekey/Makefile index 5c1793c867..307ca5b198 100644 --- a/keyboards/stm32_f103_onekey/Makefile +++ b/keyboards/chibios_test/stm32_f103_onekey/Makefile @@ -46,19 +46,7 @@ ARMV = 7 # /tmk_core/tool/chibios/ch-bootloader-jump.patch #STM32_BOOTLOADER_ADDRESS = 0x1FFFC800 -# Build Options -# comment out to disable the options. -# -#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration -## BOOTMAGIC is not supported on STM32 chips yet. -MOUSEKEY_ENABLE ?= yes # Mouse keys -EXTRAKEY_ENABLE ?= yes # Audio control and System control -# CONSOLE_ENABLE ?= yes # Console for debug -COMMAND_ENABLE ?= yes # Commands for debug and configuration -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend -NKRO_ENABLE ?= yes # USB Nkey Rollover -CUSTOM_MATRIX ?= yes # Custom matrix file ifndef QUANTUM_DIR - include ../../Makefile + include ../../../Makefile endif diff --git a/keyboards/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.c b/keyboards/chibios_test/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.c similarity index 100% rename from keyboards/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.c rename to keyboards/chibios_test/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.c diff --git a/keyboards/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.h b/keyboards/chibios_test/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.h similarity index 100% rename from keyboards/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.h rename to keyboards/chibios_test/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.h diff --git a/keyboards/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.mk b/keyboards/chibios_test/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.mk similarity index 100% rename from keyboards/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.mk rename to keyboards/chibios_test/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.mk diff --git a/keyboards/stm32_f103_onekey/boards/GENERIC_STM32_F103/mini_stm32_mapping.png b/keyboards/chibios_test/stm32_f103_onekey/boards/GENERIC_STM32_F103/mini_stm32_mapping.png similarity index 100% rename from keyboards/stm32_f103_onekey/boards/GENERIC_STM32_F103/mini_stm32_mapping.png rename to keyboards/chibios_test/stm32_f103_onekey/boards/GENERIC_STM32_F103/mini_stm32_mapping.png diff --git a/keyboards/stm32_f103_onekey/boards/maple_mini_mapping.png b/keyboards/chibios_test/stm32_f103_onekey/boards/maple_mini_mapping.png similarity index 100% rename from keyboards/stm32_f103_onekey/boards/maple_mini_mapping.png rename to keyboards/chibios_test/stm32_f103_onekey/boards/maple_mini_mapping.png diff --git a/keyboards/stm32_f103_onekey/bootloader_defs.h b/keyboards/chibios_test/stm32_f103_onekey/bootloader_defs.h similarity index 100% rename from keyboards/stm32_f103_onekey/bootloader_defs.h rename to keyboards/chibios_test/stm32_f103_onekey/bootloader_defs.h diff --git a/keyboards/stm32_f103_onekey/chconf.h b/keyboards/chibios_test/stm32_f103_onekey/chconf.h similarity index 100% rename from keyboards/stm32_f103_onekey/chconf.h rename to keyboards/chibios_test/stm32_f103_onekey/chconf.h diff --git a/keyboards/chibios_test/stm32_f103_onekey/config.h b/keyboards/chibios_test/stm32_f103_onekey/config.h new file mode 100644 index 0000000000..de0b906f35 --- /dev/null +++ b/keyboards/chibios_test/stm32_f103_onekey/config.h @@ -0,0 +1,6 @@ +#ifndef KEYBOARDS_CHIBIOS_TEST_STM32_F103_ONEKEY_CONFIG_H_ +#define KEYBOARDS_CHIBIOS_TEST_STM32_F103_ONEKEY_CONFIG_H_ + +#include "../config.h" + +#endif /* KEYBOARDS_CHIBIOS_TEST_STM32_F103_ONEKEY_CONFIG_H_ */ diff --git a/keyboards/stm32_f103_onekey/flash.sh b/keyboards/chibios_test/stm32_f103_onekey/flash.sh similarity index 100% rename from keyboards/stm32_f103_onekey/flash.sh rename to keyboards/chibios_test/stm32_f103_onekey/flash.sh diff --git a/keyboards/stm32_f103_onekey/halconf.h b/keyboards/chibios_test/stm32_f103_onekey/halconf.h similarity index 100% rename from keyboards/stm32_f103_onekey/halconf.h rename to keyboards/chibios_test/stm32_f103_onekey/halconf.h diff --git a/keyboards/stm32_f103_onekey/ld/STM32F103x8_stm32duino_bootloader.ld b/keyboards/chibios_test/stm32_f103_onekey/ld/STM32F103x8_stm32duino_bootloader.ld similarity index 100% rename from keyboards/stm32_f103_onekey/ld/STM32F103x8_stm32duino_bootloader.ld rename to keyboards/chibios_test/stm32_f103_onekey/ld/STM32F103x8_stm32duino_bootloader.ld diff --git a/keyboards/stm32_f103_onekey/led.c b/keyboards/chibios_test/stm32_f103_onekey/led.c similarity index 100% rename from keyboards/stm32_f103_onekey/led.c rename to keyboards/chibios_test/stm32_f103_onekey/led.c diff --git a/keyboards/stm32_f103_onekey/matrix.c b/keyboards/chibios_test/stm32_f103_onekey/matrix.c similarity index 100% rename from keyboards/stm32_f103_onekey/matrix.c rename to keyboards/chibios_test/stm32_f103_onekey/matrix.c diff --git a/keyboards/stm32_f103_onekey/mcuconf.h b/keyboards/chibios_test/stm32_f103_onekey/mcuconf.h similarity index 100% rename from keyboards/stm32_f103_onekey/mcuconf.h rename to keyboards/chibios_test/stm32_f103_onekey/mcuconf.h diff --git a/keyboards/stm32_f103_onekey/stm32_f103_onekey.c b/keyboards/chibios_test/stm32_f103_onekey/stm32_f103_onekey.c similarity index 100% rename from keyboards/stm32_f103_onekey/stm32_f103_onekey.c rename to keyboards/chibios_test/stm32_f103_onekey/stm32_f103_onekey.c diff --git a/keyboards/stm32_f103_onekey/stm32_f103_onekey.h b/keyboards/chibios_test/stm32_f103_onekey/stm32_f103_onekey.h similarity index 70% rename from keyboards/stm32_f103_onekey/stm32_f103_onekey.h rename to keyboards/chibios_test/stm32_f103_onekey/stm32_f103_onekey.h index e4d0dd9c4f..89a62b2bbe 100644 --- a/keyboards/stm32_f103_onekey/stm32_f103_onekey.h +++ b/keyboards/chibios_test/stm32_f103_onekey/stm32_f103_onekey.h @@ -1,4 +1,4 @@ #ifndef STM32_F103_ONEKEY_H #define STM32_F103_ONEKEY_H -#include "quantum.h" +#include "chibios_test.h" #endif diff --git a/keyboards/teensy_lc_onekey/Makefile b/keyboards/chibios_test/teensy_lc_onekey/Makefile similarity index 69% rename from keyboards/teensy_lc_onekey/Makefile rename to keyboards/chibios_test/teensy_lc_onekey/Makefile index 064e618159..43ea9d82d9 100644 --- a/keyboards/teensy_lc_onekey/Makefile +++ b/keyboards/chibios_test/teensy_lc_onekey/Makefile @@ -44,19 +44,6 @@ MCU = cortex-m0plus # I.e. 6 for Teensy LC; 7 for Teensy 3.x ARMV = 6 -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration -## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.) -MOUSEKEY_ENABLE ?= yes # Mouse keys -EXTRAKEY_ENABLE ?= yes # Audio control and System control -CONSOLE_ENABLE ?= yes # Console for debug -COMMAND_ENABLE ?= yes # Commands for debug and configuration -SLEEP_LED_ENABLE ?= yes # Breathing sleep LED during USB suspend -NKRO_ENABLE ?= yes # USB Nkey Rollover -CUSTOM_MATRIX ?= yes # Custom matrix file - ifndef QUANTUM_DIR - include ../../Makefile -endif + include ../../../Makefile +endif \ No newline at end of file diff --git a/keyboards/teensy_lc_onekey/Makefile.3.0 b/keyboards/chibios_test/teensy_lc_onekey/Makefile.3.0 similarity index 100% rename from keyboards/teensy_lc_onekey/Makefile.3.0 rename to keyboards/chibios_test/teensy_lc_onekey/Makefile.3.0 diff --git a/keyboards/teensy_lc_onekey/Makefile.3.2 b/keyboards/chibios_test/teensy_lc_onekey/Makefile.3.2 similarity index 100% rename from keyboards/teensy_lc_onekey/Makefile.3.2 rename to keyboards/chibios_test/teensy_lc_onekey/Makefile.3.2 diff --git a/keyboards/teensy_lc_onekey/chconf.h b/keyboards/chibios_test/teensy_lc_onekey/chconf.h similarity index 100% rename from keyboards/teensy_lc_onekey/chconf.h rename to keyboards/chibios_test/teensy_lc_onekey/chconf.h diff --git a/keyboards/chibios_test/teensy_lc_onekey/config.h b/keyboards/chibios_test/teensy_lc_onekey/config.h new file mode 100644 index 0000000000..d9eb05d2ac --- /dev/null +++ b/keyboards/chibios_test/teensy_lc_onekey/config.h @@ -0,0 +1,6 @@ +#ifndef KEYBOARDS_CHIBIOS_TEST_TEENSY_LC_ONEKEY_CONFIG_H_ +#define KEYBOARDS_CHIBIOS_TEST_TEENSY_LC_ONEKEY_CONFIG_H_ + +#include "../config.h" + +#endif /* KEYBOARDS_CHIBIOS_TEST_TEENSY_LC_ONEKEY_CONFIG_H_ */ diff --git a/keyboards/teensy_lc_onekey/halconf.h b/keyboards/chibios_test/teensy_lc_onekey/halconf.h similarity index 100% rename from keyboards/teensy_lc_onekey/halconf.h rename to keyboards/chibios_test/teensy_lc_onekey/halconf.h diff --git a/keyboards/teensy_lc_onekey/instructions.md b/keyboards/chibios_test/teensy_lc_onekey/instructions.md similarity index 100% rename from keyboards/teensy_lc_onekey/instructions.md rename to keyboards/chibios_test/teensy_lc_onekey/instructions.md diff --git a/keyboards/teensy_lc_onekey/ld/MKL26Z64.ld b/keyboards/chibios_test/teensy_lc_onekey/ld/MKL26Z64.ld similarity index 100% rename from keyboards/teensy_lc_onekey/ld/MKL26Z64.ld rename to keyboards/chibios_test/teensy_lc_onekey/ld/MKL26Z64.ld diff --git a/keyboards/teensy_lc_onekey/led.c b/keyboards/chibios_test/teensy_lc_onekey/led.c similarity index 100% rename from keyboards/teensy_lc_onekey/led.c rename to keyboards/chibios_test/teensy_lc_onekey/led.c diff --git a/keyboards/teensy_lc_onekey/matrix.c b/keyboards/chibios_test/teensy_lc_onekey/matrix.c similarity index 100% rename from keyboards/teensy_lc_onekey/matrix.c rename to keyboards/chibios_test/teensy_lc_onekey/matrix.c diff --git a/keyboards/teensy_lc_onekey/mcuconf.h b/keyboards/chibios_test/teensy_lc_onekey/mcuconf.h similarity index 100% rename from keyboards/teensy_lc_onekey/mcuconf.h rename to keyboards/chibios_test/teensy_lc_onekey/mcuconf.h diff --git a/keyboards/teensy_lc_onekey/teensy_lc_onekey.c b/keyboards/chibios_test/teensy_lc_onekey/teensy_lc_onekey.c similarity index 100% rename from keyboards/teensy_lc_onekey/teensy_lc_onekey.c rename to keyboards/chibios_test/teensy_lc_onekey/teensy_lc_onekey.c diff --git a/keyboards/teensy_lc_onekey/teensy_lc_onekey.h b/keyboards/chibios_test/teensy_lc_onekey/teensy_lc_onekey.h similarity index 69% rename from keyboards/teensy_lc_onekey/teensy_lc_onekey.h rename to keyboards/chibios_test/teensy_lc_onekey/teensy_lc_onekey.h index f598bcf66d..747e830a7d 100644 --- a/keyboards/teensy_lc_onekey/teensy_lc_onekey.h +++ b/keyboards/chibios_test/teensy_lc_onekey/teensy_lc_onekey.h @@ -1,4 +1,4 @@ #ifndef TEENSY_LC_ONEKEY_H #define TEENSY_LC_ONEKEY_H -#include "quantum.h" +#include "chbibios_test.h" #endif diff --git a/keyboards/stm32_f072_onekey/keymaps/default/keymap.c b/keyboards/stm32_f072_onekey/keymaps/default/keymap.c deleted file mode 100644 index 6c48149f83..0000000000 --- a/keyboards/stm32_f072_onekey/keymaps/default/keymap.c +++ /dev/null @@ -1,25 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako - -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 2 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 . -*/ - -#include "stm32_f072_onekey.h" - -const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - {{KC_CAPS}}, // test with KC_CAPS, KC_A, KC_BTLD -}; - -const uint16_t fn_actions[] = { -}; diff --git a/keyboards/stm32_f103_onekey/config.h b/keyboards/stm32_f103_onekey/config.h deleted file mode 100644 index 19b14fe61a..0000000000 --- a/keyboards/stm32_f103_onekey/config.h +++ /dev/null @@ -1,75 +0,0 @@ -/* -Copyright 2015 Jun Wako - -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 2 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 . -*/ - -#ifndef CONFIG_H -#define CONFIG_H - - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6464 -#define DEVICE_VER 0x0001 -/* in python2: list(u"whatever".encode('utf-16-le')) */ -/* at most 32 characters or the ugly hack in usb_main.c borks */ -#define MANUFACTURER "TMK" -#define USBSTR_MANUFACTURER 'T', '\x00', 'M', '\x00', 'K', '\x00', ' ', '\x00', '\xc6', '\x00' -#define PRODUCT "ChibiOS TMK test" -#define USBSTR_PRODUCT 'C', '\x00', 'h', '\x00', 'i', '\x00', 'b', '\x00', 'i', '\x00', 'O', '\x00', 'S', '\x00', ' ', '\x00', 'T', '\x00', 'M', '\x00', 'K', '\x00', ' ', '\x00', 't', '\x00', 'e', '\x00', 's', '\x00', 't', '\x00' -#define DESCRIPTION "TMK keyboard firmware over ChibiOS" - -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 1 -#define DIODE_DIRECTION COL2ROW - -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - - - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT -//#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/teensy_lc_onekey/config.h b/keyboards/teensy_lc_onekey/config.h deleted file mode 100644 index 19b14fe61a..0000000000 --- a/keyboards/teensy_lc_onekey/config.h +++ /dev/null @@ -1,75 +0,0 @@ -/* -Copyright 2015 Jun Wako - -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 2 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 . -*/ - -#ifndef CONFIG_H -#define CONFIG_H - - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6464 -#define DEVICE_VER 0x0001 -/* in python2: list(u"whatever".encode('utf-16-le')) */ -/* at most 32 characters or the ugly hack in usb_main.c borks */ -#define MANUFACTURER "TMK" -#define USBSTR_MANUFACTURER 'T', '\x00', 'M', '\x00', 'K', '\x00', ' ', '\x00', '\xc6', '\x00' -#define PRODUCT "ChibiOS TMK test" -#define USBSTR_PRODUCT 'C', '\x00', 'h', '\x00', 'i', '\x00', 'b', '\x00', 'i', '\x00', 'O', '\x00', 'S', '\x00', ' ', '\x00', 'T', '\x00', 'M', '\x00', 'K', '\x00', ' ', '\x00', 't', '\x00', 'e', '\x00', 's', '\x00', 't', '\x00' -#define DESCRIPTION "TMK keyboard firmware over ChibiOS" - -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 1 -#define DIODE_DIRECTION COL2ROW - -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - - - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT -//#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/teensy_lc_onekey/keymaps/default/keymap.c b/keyboards/teensy_lc_onekey/keymaps/default/keymap.c deleted file mode 100644 index a109b49600..0000000000 --- a/keyboards/teensy_lc_onekey/keymaps/default/keymap.c +++ /dev/null @@ -1,32 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako - -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 2 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 . -*/ - -#include "keycode.h" -#include "action.h" -#include "action_macro.h" -#include "report.h" -#include "host.h" -#include "print.h" -#include "debug.h" -#include "keymap.h" - -const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - {{KC_A}}, -}; // to test: KC_CAPS, KT_BTLD, KC_A - -const uint16_t fn_actions[] = { -}; From 0a040a89e8a16ea1ebfef20cdc05f96b312cc853 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Tue, 5 Jul 2016 15:34:35 +0300 Subject: [PATCH 2/4] Move ChibiOS test board and ld Move the ChibiOS test subproject board and ld files to the kebyoard folder, so that the build system can find them --- .../boards/GENERIC_STM32_F103/board.c | 0 .../boards/GENERIC_STM32_F103/board.h | 0 .../boards/GENERIC_STM32_F103/board.mk | 0 .../GENERIC_STM32_F103/mini_stm32_mapping.png | Bin .../boards/maple_mini_mapping.png | Bin .../{teensy_lc_onekey => }/ld/MKL26Z64.ld | 0 .../ld/STM32F103x8_stm32duino_bootloader.ld | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/chibios_test/{stm32_f103_onekey => }/boards/GENERIC_STM32_F103/board.c (100%) rename keyboards/chibios_test/{stm32_f103_onekey => }/boards/GENERIC_STM32_F103/board.h (100%) rename keyboards/chibios_test/{stm32_f103_onekey => }/boards/GENERIC_STM32_F103/board.mk (100%) rename keyboards/chibios_test/{stm32_f103_onekey => }/boards/GENERIC_STM32_F103/mini_stm32_mapping.png (100%) rename keyboards/chibios_test/{stm32_f103_onekey => }/boards/maple_mini_mapping.png (100%) rename keyboards/chibios_test/{teensy_lc_onekey => }/ld/MKL26Z64.ld (100%) rename keyboards/chibios_test/{stm32_f103_onekey => }/ld/STM32F103x8_stm32duino_bootloader.ld (100%) diff --git a/keyboards/chibios_test/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.c b/keyboards/chibios_test/boards/GENERIC_STM32_F103/board.c similarity index 100% rename from keyboards/chibios_test/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.c rename to keyboards/chibios_test/boards/GENERIC_STM32_F103/board.c diff --git a/keyboards/chibios_test/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.h b/keyboards/chibios_test/boards/GENERIC_STM32_F103/board.h similarity index 100% rename from keyboards/chibios_test/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.h rename to keyboards/chibios_test/boards/GENERIC_STM32_F103/board.h diff --git a/keyboards/chibios_test/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.mk b/keyboards/chibios_test/boards/GENERIC_STM32_F103/board.mk similarity index 100% rename from keyboards/chibios_test/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.mk rename to keyboards/chibios_test/boards/GENERIC_STM32_F103/board.mk diff --git a/keyboards/chibios_test/stm32_f103_onekey/boards/GENERIC_STM32_F103/mini_stm32_mapping.png b/keyboards/chibios_test/boards/GENERIC_STM32_F103/mini_stm32_mapping.png similarity index 100% rename from keyboards/chibios_test/stm32_f103_onekey/boards/GENERIC_STM32_F103/mini_stm32_mapping.png rename to keyboards/chibios_test/boards/GENERIC_STM32_F103/mini_stm32_mapping.png diff --git a/keyboards/chibios_test/stm32_f103_onekey/boards/maple_mini_mapping.png b/keyboards/chibios_test/boards/maple_mini_mapping.png similarity index 100% rename from keyboards/chibios_test/stm32_f103_onekey/boards/maple_mini_mapping.png rename to keyboards/chibios_test/boards/maple_mini_mapping.png diff --git a/keyboards/chibios_test/teensy_lc_onekey/ld/MKL26Z64.ld b/keyboards/chibios_test/ld/MKL26Z64.ld similarity index 100% rename from keyboards/chibios_test/teensy_lc_onekey/ld/MKL26Z64.ld rename to keyboards/chibios_test/ld/MKL26Z64.ld diff --git a/keyboards/chibios_test/stm32_f103_onekey/ld/STM32F103x8_stm32duino_bootloader.ld b/keyboards/chibios_test/ld/STM32F103x8_stm32duino_bootloader.ld similarity index 100% rename from keyboards/chibios_test/stm32_f103_onekey/ld/STM32F103x8_stm32duino_bootloader.ld rename to keyboards/chibios_test/ld/STM32F103x8_stm32duino_bootloader.ld From 6e4f2e18e6cd0abffa52e6481d9761064698ec64 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Tue, 5 Jul 2016 15:53:40 +0300 Subject: [PATCH 3/4] Don't include common_config.h for ChibiOS test --- keyboards/chibios_test/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/chibios_test/config.h b/keyboards/chibios_test/config.h index 210f150670..c32a77b37f 100644 --- a/keyboards/chibios_test/config.h +++ b/keyboards/chibios_test/config.h @@ -18,8 +18,6 @@ along with this program. If not, see . #ifndef CONFIG_H #define CONFIG_H -#include "config_common.h" - /* USB Device descriptor parameter */ #define VENDOR_ID 0xFEED #define PRODUCT_ID 0x6464 From cf6cd15920522b139ba0f6c7e2b52e3d656a45d7 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Tue, 5 Jul 2016 15:54:59 +0300 Subject: [PATCH 4/4] Fix typo in teensy_lc_onkey.h --- keyboards/chibios_test/teensy_lc_onekey/teensy_lc_onekey.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/chibios_test/teensy_lc_onekey/teensy_lc_onekey.h b/keyboards/chibios_test/teensy_lc_onekey/teensy_lc_onekey.h index 747e830a7d..ea1c84e2f5 100644 --- a/keyboards/chibios_test/teensy_lc_onekey/teensy_lc_onekey.h +++ b/keyboards/chibios_test/teensy_lc_onekey/teensy_lc_onekey.h @@ -1,4 +1,4 @@ #ifndef TEENSY_LC_ONEKEY_H #define TEENSY_LC_ONEKEY_H -#include "chbibios_test.h" +#include "chibios_test.h" #endif