~ruther/qmk_firmware

f41e5ec928880bbc42e03b84af39eacaf3acac8d — James Young 4 years ago cd12fe8
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.
7 files changed, 51 insertions(+), 60 deletions(-)

M keyboards/handwired/concertina/64key/config.h
R keyboards/handwired/concertina/{ => 64key}/info.json
M keyboards/handwired/concertina/64key/readme.md
A keyboards/handwired/concertina/64key/rules.mk
D keyboards/handwired/concertina/concertina.h
D keyboards/handwired/concertina/config.h
D keyboards/handwired/concertina/rules.mk
M keyboards/handwired/concertina/64key/config.h => keyboards/handwired/concertina/64key/config.h +7 -0
@@ 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


R keyboards/handwired/concertina/info.json => keyboards/handwired/concertina/64key/info.json +0 -0
M keyboards/handwired/concertina/64key/readme.md => keyboards/handwired/concertina/64key/readme.md +19 -2
@@ 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).

A keyboards/handwired/concertina/64key/rules.mk => keyboards/handwired/concertina/64key/rules.mk +25 -0
@@ 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

D keyboards/handwired/concertina/concertina.h => keyboards/handwired/concertina/concertina.h +0 -23
@@ 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"

D keyboards/handwired/concertina/config.h => keyboards/handwired/concertina/config.h +0 -26
@@ 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

D keyboards/handwired/concertina/rules.mk => keyboards/handwired/concertina/rules.mk +0 -9
@@ 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