diff options
author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-02-27 22:10:26 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-28 17:10:26 +1100 |
commit | f41e5ec928880bbc42e03b84af39eacaf3acac8d (patch) | |
tree | 993e29f42140124a3701aff9f3cc9da215a4f533 | |
parent | cd12fe86d3bce4221498848e9fced62fd708bdd8 (diff) |
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.
-rw-r--r-- | keyboards/handwired/concertina/64key/config.h | 7 | ||||
-rw-r--r-- | keyboards/handwired/concertina/64key/info.json (renamed from keyboards/handwired/concertina/info.json) | 0 | ||||
-rw-r--r-- | keyboards/handwired/concertina/64key/readme.md | 21 | ||||
-rw-r--r-- | keyboards/handwired/concertina/64key/rules.mk | 25 | ||||
-rw-r--r-- | keyboards/handwired/concertina/concertina.h | 23 | ||||
-rw-r--r-- | keyboards/handwired/concertina/config.h | 26 | ||||
-rw-r--r-- | keyboards/handwired/concertina/rules.mk | 9 |
7 files changed, 51 insertions, 60 deletions
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/info.json b/keyboards/handwired/concertina/64key/info.json index a7dd42b112..a7dd42b112 100644 --- a/keyboards/handwired/concertina/info.json +++ b/keyboards/handwired/concertina/64key/info.json 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 <http://www.gnu.org/licenses/>. - */ - -#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 <http://www.gnu.org/licenses/>. - */ - -#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/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 |