diff options
author | Fred Sundvik <fsundvik@gmail.com> | 2016-07-05 13:48:12 +0300 |
---|---|---|
committer | Fred Sundvik <fsundvik@gmail.com> | 2016-07-05 14:56:34 +0300 |
commit | b11657d1c8a3360779b6b412806d89ca3175fc5f (patch) | |
tree | d1c3bd6f08f759bff82e9e976f3d42f62a9dc459 | |
parent | 94d3159d9dbdf711b830c6d7c5a53324097be0a5 (diff) |
Suprojects for ChibiOS testing
-rw-r--r-- | keyboards/chibios_test/Makefile | 14 | ||||
-rw-r--r-- | keyboards/chibios_test/chibios_test.c | 1 | ||||
-rw-r--r-- | keyboards/chibios_test/chibios_test.h | 6 | ||||
-rw-r--r-- | keyboards/chibios_test/config.h (renamed from keyboards/stm32_f072_onekey/config.h) | 8 | ||||
-rw-r--r-- | keyboards/chibios_test/keymaps/default/keymap.c (renamed from keyboards/stm32_f072_onekey/keymaps/default/keymap.c) | 2 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f072_onekey/Makefile (renamed from keyboards/stm32_f072_onekey/Makefile) | 11 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f072_onekey/bootloader_defs.h (renamed from keyboards/stm32_f072_onekey/bootloader_defs.h) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f072_onekey/chconf.h (renamed from keyboards/stm32_f072_onekey/chconf.h) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f072_onekey/config.h | 7 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f072_onekey/halconf.h (renamed from keyboards/stm32_f072_onekey/halconf.h) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f072_onekey/led.c (renamed from keyboards/stm32_f072_onekey/led.c) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f072_onekey/matrix.c (renamed from keyboards/stm32_f072_onekey/matrix.c) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f072_onekey/mcuconf.h (renamed from keyboards/stm32_f072_onekey/mcuconf.h) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f072_onekey/stm32_f072_onekey.c (renamed from keyboards/stm32_f072_onekey/stm32_f072_onekey.c) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f072_onekey/stm32_f072_onekey.h (renamed from keyboards/stm32_f072_onekey/stm32_f072_onekey.h) | 2 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f103_onekey/Makefile (renamed from keyboards/stm32_f103_onekey/Makefile) | 14 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.c (renamed from keyboards/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.c) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.h (renamed from keyboards/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.h) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.mk (renamed from keyboards/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.mk) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f103_onekey/boards/GENERIC_STM32_F103/mini_stm32_mapping.png (renamed from keyboards/stm32_f103_onekey/boards/GENERIC_STM32_F103/mini_stm32_mapping.png) | bin | 162908 -> 162908 bytes | |||
-rw-r--r-- | keyboards/chibios_test/stm32_f103_onekey/boards/maple_mini_mapping.png (renamed from keyboards/stm32_f103_onekey/boards/maple_mini_mapping.png) | bin | 237977 -> 237977 bytes | |||
-rw-r--r-- | keyboards/chibios_test/stm32_f103_onekey/bootloader_defs.h (renamed from keyboards/stm32_f103_onekey/bootloader_defs.h) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f103_onekey/chconf.h (renamed from keyboards/stm32_f103_onekey/chconf.h) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f103_onekey/config.h | 6 | ||||
-rwxr-xr-x | keyboards/chibios_test/stm32_f103_onekey/flash.sh (renamed from keyboards/stm32_f103_onekey/flash.sh) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f103_onekey/halconf.h (renamed from keyboards/stm32_f103_onekey/halconf.h) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f103_onekey/ld/STM32F103x8_stm32duino_bootloader.ld (renamed from keyboards/stm32_f103_onekey/ld/STM32F103x8_stm32duino_bootloader.ld) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f103_onekey/led.c (renamed from keyboards/stm32_f103_onekey/led.c) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f103_onekey/matrix.c (renamed from keyboards/stm32_f103_onekey/matrix.c) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f103_onekey/mcuconf.h (renamed from keyboards/stm32_f103_onekey/mcuconf.h) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f103_onekey/stm32_f103_onekey.c (renamed from keyboards/stm32_f103_onekey/stm32_f103_onekey.c) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/stm32_f103_onekey/stm32_f103_onekey.h (renamed from keyboards/stm32_f103_onekey/stm32_f103_onekey.h) | 2 | ||||
-rw-r--r-- | keyboards/chibios_test/teensy_lc_onekey/Makefile (renamed from keyboards/teensy_lc_onekey/Makefile) | 17 | ||||
-rw-r--r-- | keyboards/chibios_test/teensy_lc_onekey/Makefile.3.0 (renamed from keyboards/teensy_lc_onekey/Makefile.3.0) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/teensy_lc_onekey/Makefile.3.2 (renamed from keyboards/teensy_lc_onekey/Makefile.3.2) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/teensy_lc_onekey/chconf.h (renamed from keyboards/teensy_lc_onekey/chconf.h) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/teensy_lc_onekey/config.h | 6 | ||||
-rw-r--r-- | keyboards/chibios_test/teensy_lc_onekey/halconf.h (renamed from keyboards/teensy_lc_onekey/halconf.h) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/teensy_lc_onekey/instructions.md (renamed from keyboards/teensy_lc_onekey/instructions.md) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/teensy_lc_onekey/ld/MKL26Z64.ld (renamed from keyboards/teensy_lc_onekey/ld/MKL26Z64.ld) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/teensy_lc_onekey/led.c (renamed from keyboards/teensy_lc_onekey/led.c) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/teensy_lc_onekey/matrix.c (renamed from keyboards/teensy_lc_onekey/matrix.c) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/teensy_lc_onekey/mcuconf.h (renamed from keyboards/teensy_lc_onekey/mcuconf.h) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/teensy_lc_onekey/teensy_lc_onekey.c (renamed from keyboards/teensy_lc_onekey/teensy_lc_onekey.c) | 0 | ||||
-rw-r--r-- | keyboards/chibios_test/teensy_lc_onekey/teensy_lc_onekey.h (renamed from keyboards/teensy_lc_onekey/teensy_lc_onekey.h) | 2 | ||||
-rw-r--r-- | keyboards/stm32_f103_onekey/config.h | 75 | ||||
-rw-r--r-- | keyboards/stm32_f103_onekey/keymaps/default/keymap.c | 25 | ||||
-rw-r--r-- | keyboards/teensy_lc_onekey/config.h | 75 | ||||
-rw-r--r-- | keyboards/teensy_lc_onekey/keymaps/default/keymap.c | 32 |
49 files changed, 52 insertions, 253 deletions
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 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 <http://www.gnu.org/licenses/>. #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_f072_onekey/keymaps/default/keymap.c b/keyboards/chibios_test/keymaps/default/keymap.c index 6c48149f83..239d70007a 100644 --- a/keyboards/stm32_f072_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 <http://www.gnu.org/licenses/>. */ -#include "stm32_f072_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 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 index 02c48c4e6d..02c48c4e6d 100644 --- a/keyboards/stm32_f072_onekey/bootloader_defs.h +++ b/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 index 99fa8ce398..99fa8ce398 100644 --- a/keyboards/stm32_f072_onekey/chconf.h +++ b/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 index 1a450d6327..1a450d6327 100644 --- a/keyboards/stm32_f072_onekey/halconf.h +++ b/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 index 18edb8ba89..18edb8ba89 100644 --- a/keyboards/stm32_f072_onekey/led.c +++ b/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 index a05b38cd4c..a05b38cd4c 100644 --- a/keyboards/stm32_f072_onekey/matrix.c +++ b/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 index 3d877aaa2b..3d877aaa2b 100644 --- a/keyboards/stm32_f072_onekey/mcuconf.h +++ b/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 index 820d062ffd..820d062ffd 100644 --- a/keyboards/stm32_f072_onekey/stm32_f072_onekey.c +++ b/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 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 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_dir>/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 index 31319ef575..31319ef575 100644 --- a/keyboards/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.c +++ b/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 index 7253e77826..7253e77826 100644 --- a/keyboards/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.h +++ b/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 index d692c0ee46..d692c0ee46 100644 --- a/keyboards/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.mk +++ b/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 Binary files differindex c44a7d9ebc..c44a7d9ebc 100644 --- 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 diff --git a/keyboards/stm32_f103_onekey/boards/maple_mini_mapping.png b/keyboards/chibios_test/stm32_f103_onekey/boards/maple_mini_mapping.png Binary files differindex 12cfa81db2..12cfa81db2 100644 --- a/keyboards/stm32_f103_onekey/boards/maple_mini_mapping.png +++ b/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 index 0f45203cb6..0f45203cb6 100644 --- a/keyboards/stm32_f103_onekey/bootloader_defs.h +++ b/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 index dfb1f9dfb9..dfb1f9dfb9 100644 --- a/keyboards/stm32_f103_onekey/chconf.h +++ b/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 index 15501dfa57..15501dfa57 100755 --- a/keyboards/stm32_f103_onekey/flash.sh +++ b/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 index 1a450d6327..1a450d6327 100644 --- a/keyboards/stm32_f103_onekey/halconf.h +++ b/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 index 00613328ed..00613328ed 100644 --- a/keyboards/stm32_f103_onekey/ld/STM32F103x8_stm32duino_bootloader.ld +++ b/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 index f5c55f7d9b..f5c55f7d9b 100644 --- a/keyboards/stm32_f103_onekey/led.c +++ b/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 index ea9d8d057b..ea9d8d057b 100644 --- a/keyboards/stm32_f103_onekey/matrix.c +++ b/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 index 626332a6aa..626332a6aa 100644 --- a/keyboards/stm32_f103_onekey/mcuconf.h +++ b/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 index 7fa99bb28d..7fa99bb28d 100644 --- a/keyboards/stm32_f103_onekey/stm32_f103_onekey.c +++ b/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 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 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 index dbf12c3631..dbf12c3631 100644 --- a/keyboards/teensy_lc_onekey/Makefile.3.0 +++ b/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 index 41bfa41a0c..41bfa41a0c 100644 --- a/keyboards/teensy_lc_onekey/Makefile.3.2 +++ b/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 index cb36996c33..cb36996c33 100644 --- a/keyboards/teensy_lc_onekey/chconf.h +++ b/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 index b1d2cd5502..b1d2cd5502 100644 --- a/keyboards/teensy_lc_onekey/halconf.h +++ b/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 index 16886a015c..16886a015c 100644 --- a/keyboards/teensy_lc_onekey/instructions.md +++ b/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 index fb141f888c..fb141f888c 100644 --- a/keyboards/teensy_lc_onekey/ld/MKL26Z64.ld +++ b/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 index dfa60c1076..dfa60c1076 100644 --- a/keyboards/teensy_lc_onekey/led.c +++ b/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 index 7dab04f02b..7dab04f02b 100644 --- a/keyboards/teensy_lc_onekey/matrix.c +++ b/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 index c636590197..c636590197 100644 --- a/keyboards/teensy_lc_onekey/mcuconf.h +++ b/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 index b6c4327932..b6c4327932 100644 --- a/keyboards/teensy_lc_onekey/teensy_lc_onekey.c +++ b/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 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_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 <wakojun@gmail.com> - -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 <http://www.gnu.org/licenses/>. -*/ - -#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/stm32_f103_onekey/keymaps/default/keymap.c b/keyboards/stm32_f103_onekey/keymaps/default/keymap.c deleted file mode 100644 index c3b0f08403..0000000000 --- a/keyboards/stm32_f103_onekey/keymaps/default/keymap.c +++ /dev/null @@ -1,25 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako <wakojun@gmail.com> - -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 <http://www.gnu.org/licenses/>. -*/ - -#include "stm32_f103_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/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 <wakojun@gmail.com> - -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 <http://www.gnu.org/licenses/>. -*/ - -#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 <wakojun@gmail.com> - -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 <http://www.gnu.org/licenses/>. -*/ - -#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[] = { -}; |