From f41e5ec928880bbc42e03b84af39eacaf3acac8d Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 27 Feb 2021 22:10:26 -0800 Subject: Compilation fixes for handwired/concertina/64key (#11987) * concatenate config.h to 64key directory * move rules.mk to 64key directory This commit makes the firmware actually compile. * insert complete rules.mk contents Conforms the file to QMK's template. * move info.json to 64key directory * remove concertina.h This file no longer serves a purpose now that everything is in the 64key directory. * complete 64key readme.md Conforms the file more to QMK's template. --- keyboards/handwired/concertina/64key/config.h | 7 +++++ keyboards/handwired/concertina/64key/info.json | 37 ++++++++++++++++++++++++++ keyboards/handwired/concertina/64key/readme.md | 21 +++++++++++++-- keyboards/handwired/concertina/64key/rules.mk | 25 +++++++++++++++++ keyboards/handwired/concertina/concertina.h | 23 ---------------- keyboards/handwired/concertina/config.h | 26 ------------------ keyboards/handwired/concertina/info.json | 37 -------------------------- keyboards/handwired/concertina/rules.mk | 9 ------- 8 files changed, 88 insertions(+), 97 deletions(-) create mode 100644 keyboards/handwired/concertina/64key/info.json create mode 100644 keyboards/handwired/concertina/64key/rules.mk delete mode 100644 keyboards/handwired/concertina/concertina.h delete mode 100644 keyboards/handwired/concertina/config.h delete mode 100644 keyboards/handwired/concertina/info.json delete mode 100644 keyboards/handwired/concertina/rules.mk (limited to 'keyboards') diff --git a/keyboards/handwired/concertina/64key/config.h b/keyboards/handwired/concertina/64key/config.h index 1b09c403f6..45b5a05ca4 100644 --- a/keyboards/handwired/concertina/64key/config.h +++ b/keyboards/handwired/concertina/64key/config.h @@ -18,6 +18,13 @@ #include "config_common.h" +/* USB device descriptors */ +#define VENDOR_ID 0x444D +#define PRODUCT_ID 0x3632 +#define DEVICE_VER 0x0001 +#define PRODUCT Concertina +#define MANUFACTURER Viktor Eikman + #define MATRIX_ROWS 8 #define MATRIX_COLS 8 diff --git a/keyboards/handwired/concertina/64key/info.json b/keyboards/handwired/concertina/64key/info.json new file mode 100644 index 0000000000..a7dd42b112 --- /dev/null +++ b/keyboards/handwired/concertina/64key/info.json @@ -0,0 +1,37 @@ +{ + "keyboard_name": "Concertina", + "url": "https://viktor.eikman.se/article/the-concertina/", + "maintainer": "veikman", + "width": 12, + "height": 8, + "layouts": { + "LAYOUT_64key": { + "key_count": 64, + "layout": [ + {"x":2, "y":0.5}, {"x":3, "y":0}, {"x":4, "y":0.3}, + {"x":8, "y":0.7}, {"x":9, "y":0.3}, {"x":10, "y":0}, + + {"x":2, "y":1.5}, {"x":3, "y":1}, {"x":4, "y":1.3}, {"x":5, "y":0.7}, + {"x":8, "y":0.7}, {"x":9, "y":1.3}, {"x":10, "y":1}, {"x":11, "y":1.5}, + + {"x":3, "y":2}, {"x":4, "y":2.3}, {"x":5, "y":1.7}, + {"x":8, "y":1.7}, {"x":9, "y":2.3}, {"x":10, "y":2}, + + {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, + {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, + + {"x":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}, {"x":3, "y":5}, {"x":4, "y":5}, {"x":5, "y":5}, + {"x":8, "y":5}, {"x":9, "y":5}, {"x":10, "y":5}, {"x":11, "y":5}, {"x":12, "y":5}, {"x":13, "y":5}, + + {"x":0, "y":6}, {"x":1, "y":6}, {"x":2, "y":6}, {"x":3, "y":6}, {"x":4, "y":6}, {"x":5, "y":6}, + {"x":8, "y":6}, {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6}, {"x":12, "y":6}, {"x":13, "y":6}, + + {"x":0, "y":7}, {"x":1, "y":7}, {"x":2, "y":7}, {"x":3, "y":7}, {"x":4, "y":7}, + {"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7}, {"x":12, "y":7}, {"x":13, "y":7}, + + {"x":3, "y":8}, + {"x":10, "y":8} + ] + } + } +} diff --git a/keyboards/handwired/concertina/64key/readme.md b/keyboards/handwired/concertina/64key/readme.md index 78d384f68d..069eb6b7e5 100644 --- a/keyboards/handwired/concertina/64key/readme.md +++ b/keyboards/handwired/concertina/64key/readme.md @@ -1,5 +1,8 @@ -The `64key` layout -================== +# Concertina 64-key + +![Concertina 64-key](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/handwired/concertina/64key/concertina-1-side-view.jpg) + +A diploid, concave, columnar keyboard. This folder represents the keyboard configuration identified as `concertina_64key` in the DMOTE application’s list of GNU make targets, as of @@ -13,3 +16,17 @@ not run Colemak. A full set of printable caps to match the keymap is available in the `dmote-keycap` application, [here](https://github.com/veikman/dmote-keycap). + +* Keyboard Maintainer: [Viktor Eikman](https://github.com/veikman) +* Hardware Supported: Concertina 64-key case, Pro Micro (ATmega32U4) +* Hardware Availability: [viktor.eikman.se](https://viktor.eikman.se/article/the-concertina/) + +Make example for this keyboard (after setting up your build environment): + + make handwired/concertina/64key:default + +Flashing example for this keyboard: + + make handwired/concertina/64key:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/handwired/concertina/64key/rules.mk b/keyboards/handwired/concertina/64key/rules.mk new file mode 100644 index 0000000000..fe1ea791e9 --- /dev/null +++ b/keyboards/handwired/concertina/64key/rules.mk @@ -0,0 +1,25 @@ +# Written for a Pro Micro. The keyboard case is compatible with much else. +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = caterina + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output + +TAP_DANCE_ENABLE = yes diff --git a/keyboards/handwired/concertina/concertina.h b/keyboards/handwired/concertina/concertina.h deleted file mode 100644 index b8a0c4cff6..0000000000 --- a/keyboards/handwired/concertina/concertina.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020-2021 Viktor Eikman - * - * 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 . - */ - -#pragma once - -#ifdef KEYBOARD_handwired_concertina_64key - #include "64key.h" -#endif - -#include "quantum.h" diff --git a/keyboards/handwired/concertina/config.h b/keyboards/handwired/concertina/config.h deleted file mode 100644 index 4f6cbadc1c..0000000000 --- a/keyboards/handwired/concertina/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2020-2021 Viktor Eikman - * - * 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 . - */ - -#pragma once - -#include "config_common.h" - -/* USB device descriptors */ -#define VENDOR_ID 0x444D -#define PRODUCT_ID 0x3632 -#define DEVICE_VER 0x0001 -#define PRODUCT Concertina -#define MANUFACTURER Viktor Eikman diff --git a/keyboards/handwired/concertina/info.json b/keyboards/handwired/concertina/info.json deleted file mode 100644 index a7dd42b112..0000000000 --- a/keyboards/handwired/concertina/info.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "keyboard_name": "Concertina", - "url": "https://viktor.eikman.se/article/the-concertina/", - "maintainer": "veikman", - "width": 12, - "height": 8, - "layouts": { - "LAYOUT_64key": { - "key_count": 64, - "layout": [ - {"x":2, "y":0.5}, {"x":3, "y":0}, {"x":4, "y":0.3}, - {"x":8, "y":0.7}, {"x":9, "y":0.3}, {"x":10, "y":0}, - - {"x":2, "y":1.5}, {"x":3, "y":1}, {"x":4, "y":1.3}, {"x":5, "y":0.7}, - {"x":8, "y":0.7}, {"x":9, "y":1.3}, {"x":10, "y":1}, {"x":11, "y":1.5}, - - {"x":3, "y":2}, {"x":4, "y":2.3}, {"x":5, "y":1.7}, - {"x":8, "y":1.7}, {"x":9, "y":2.3}, {"x":10, "y":2}, - - {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, - {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, - - {"x":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}, {"x":3, "y":5}, {"x":4, "y":5}, {"x":5, "y":5}, - {"x":8, "y":5}, {"x":9, "y":5}, {"x":10, "y":5}, {"x":11, "y":5}, {"x":12, "y":5}, {"x":13, "y":5}, - - {"x":0, "y":6}, {"x":1, "y":6}, {"x":2, "y":6}, {"x":3, "y":6}, {"x":4, "y":6}, {"x":5, "y":6}, - {"x":8, "y":6}, {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6}, {"x":12, "y":6}, {"x":13, "y":6}, - - {"x":0, "y":7}, {"x":1, "y":7}, {"x":2, "y":7}, {"x":3, "y":7}, {"x":4, "y":7}, - {"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7}, {"x":12, "y":7}, {"x":13, "y":7}, - - {"x":3, "y":8}, - {"x":10, "y":8} - ] - } - } -} diff --git a/keyboards/handwired/concertina/rules.mk b/keyboards/handwired/concertina/rules.mk deleted file mode 100644 index 94d6eadd00..0000000000 --- a/keyboards/handwired/concertina/rules.mk +++ /dev/null @@ -1,9 +0,0 @@ -# Written for a Pro Micro. The keyboard case is compatible with much else. -MCU = atmega32u4 -BOOTLOADER = caterina - -# Build options: -MOUSEKEY_ENABLE = yes -EXTRAKEY_ENABLE = yes -TAP_DANCE_ENABLE = yes -RGBLIGHT_ENABLE = no -- cgit v1.2.1