From ec3e065f0d2c65175384699cb11fa388250fa914 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Tue, 14 Nov 2017 16:11:29 -0500 Subject: QMK DFU bootloader generation (#2009) * adds :bootloader target * update planck and preonic revisions * remove references to .h files for planck * update preonic keymap * only add keyboard.h files that exist * add production target * hook things up with the new lufa variables * update rules for planck/preonic * back backlight key turn of status led when pressed * add manufacturer/product strings to bootloader --- keyboards/preonic/config.h | 8 ++++++-- keyboards/preonic/keymaps/default/keymap.c | 8 +++++--- keyboards/preonic/rev1/config.h | 25 +++++++++++++++++++++++++ keyboards/preonic/rev1/info.json | 3 +++ keyboards/preonic/rev1/rules.mk | 0 keyboards/preonic/rev2/config.h | 25 +++++++++++++++++++++++++ keyboards/preonic/rev2/info.json | 3 +++ keyboards/preonic/rev2/rules.mk | 0 keyboards/preonic/rules.mk | 6 ++++-- 9 files changed, 71 insertions(+), 7 deletions(-) create mode 100644 keyboards/preonic/rev1/config.h create mode 100644 keyboards/preonic/rev1/info.json create mode 100644 keyboards/preonic/rev1/rules.mk create mode 100644 keyboards/preonic/rev2/config.h create mode 100644 keyboards/preonic/rev2/info.json create mode 100644 keyboards/preonic/rev2/rules.mk (limited to 'keyboards/preonic') diff --git a/keyboards/preonic/config.h b/keyboards/preonic/config.h index 74db9202d3..172fd645c2 100644 --- a/keyboards/preonic/config.h +++ b/keyboards/preonic/config.h @@ -23,9 +23,8 @@ along with this program. If not, see . /* USB Device descriptor parameter */ #define VENDOR_ID 0xFEED #define PRODUCT_ID 0x6061 -#define DEVICE_VER 0x0001 #define MANUFACTURER OLKB -#define PRODUCT The Preonic Keyboard +#define PRODUCT Preonic #define DESCRIPTION A compact ortholinear keyboard /* key matrix size */ @@ -37,6 +36,11 @@ along with this program. If not, see . #define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 } #define UNUSED_PINS +#define QMK_ESC_OUTPUT F1 +#define QMK_ESC_INPUT B5 +#define QMK_LED E6 +#define QMK_SPEAKER C6 + #define AUDIO_VOICES #define C6_AUDIO diff --git a/keyboards/preonic/keymaps/default/keymap.c b/keyboards/preonic/keymaps/default/keymap.c index 01f40542ca..c9d04958a0 100644 --- a/keyboards/preonic/keymaps/default/keymap.c +++ b/keyboards/preonic/keymaps/default/keymap.c @@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC}, {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL}, {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE}, - {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______}, + {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______}, {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} }, @@ -138,7 +138,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL}, {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS}, - {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______}, + {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______}, {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} }, @@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = { {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, - {_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL}, + {_______, RESET, DEBUG, _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL}, {_______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______}, {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______}, {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} @@ -212,8 +212,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef BACKLIGHT_ENABLE backlight_step(); #endif + PORTE &= ~(1<<6); } else { unregister_code(KC_RSFT); + PORTE |= (1<<6); } return false; break; diff --git a/keyboards/preonic/rev1/config.h b/keyboards/preonic/rev1/config.h new file mode 100644 index 0000000000..56dfedd457 --- /dev/null +++ b/keyboards/preonic/rev1/config.h @@ -0,0 +1,25 @@ +/* +Copyright 2017 Jack Humbert + +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 REV1_CONFIG_H +#define REV1_CONFIG_H + +#include "config_common.h" + +#define DEVICE_VER 0x0001 + +#endif \ No newline at end of file diff --git a/keyboards/preonic/rev1/info.json b/keyboards/preonic/rev1/info.json new file mode 100644 index 0000000000..43a7b495ce --- /dev/null +++ b/keyboards/preonic/rev1/info.json @@ -0,0 +1,3 @@ +{ + "identifier": "FEED:6061:0001" +} \ No newline at end of file diff --git a/keyboards/preonic/rev1/rules.mk b/keyboards/preonic/rev1/rules.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/preonic/rev2/config.h b/keyboards/preonic/rev2/config.h new file mode 100644 index 0000000000..20f11066be --- /dev/null +++ b/keyboards/preonic/rev2/config.h @@ -0,0 +1,25 @@ +/* +Copyright 2017 Jack Humbert + +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 REV2_CONFIG_H +#define REV2_CONFIG_H + +#include "config_common.h" + +#define DEVICE_VER 0x0002 + +#endif \ No newline at end of file diff --git a/keyboards/preonic/rev2/info.json b/keyboards/preonic/rev2/info.json new file mode 100644 index 0000000000..c8b9b16a7e --- /dev/null +++ b/keyboards/preonic/rev2/info.json @@ -0,0 +1,3 @@ +{ + "identifier": "FEED:6061:0002" +} \ No newline at end of file diff --git a/keyboards/preonic/rev2/rules.mk b/keyboards/preonic/rev2/rules.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/preonic/rules.mk b/keyboards/preonic/rules.mk index 51104e68ba..acef4d9713 100644 --- a/keyboards/preonic/rules.mk +++ b/keyboards/preonic/rules.mk @@ -55,7 +55,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096 BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) MOUSEKEY_ENABLE = no # Mouse keys(+4700) EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = no # Console for debug(+400) +CONSOLE_ENABLE = yes # Console for debug(+400) COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality @@ -69,4 +69,6 @@ API_SYSEX_ENABLE = no # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -LAYOUTS = ortho_5x12 \ No newline at end of file +LAYOUTS = ortho_5x12 + +DEFAULT_FOLDER = preonic/rev2 \ No newline at end of file -- cgit v1.2.1