From a16ded6b31078e7973642d2d7ab51f4cda75197a Mon Sep 17 00:00:00 2001 From: Stefan <4pplet@protonmail.com> Date: Sun, 26 Apr 2020 22:54:46 +0200 Subject: [PATCH 01/78] added 4pplet keyboards added 4pplet keyboards --- keyboards/4pplet/aekiso60_rev_a/README.md | 14 + .../4pplet/aekiso60_rev_a/aekiso60_rev_a.c | 1 + .../4pplet/aekiso60_rev_a/aekiso60_rev_a.h | 21 + keyboards/4pplet/aekiso60_rev_a/config.h | 50 + keyboards/4pplet/aekiso60_rev_a/info.json | 384 ++++++++ .../aekiso60_rev_a/keymaps/default/keymap.c | 35 + keyboards/4pplet/aekiso60_rev_a/rules.mk | 65 ++ keyboards/4pplet/steezy60_rev_a/README.md | 14 + keyboards/4pplet/steezy60_rev_a/config.h | 48 + keyboards/4pplet/steezy60_rev_a/info.json | 883 ++++++++++++++++++ .../steezy60_rev_a/keymaps/4pplet/keymap.c | 34 + .../steezy60_rev_a/keymaps/default/keymap.c | 32 + keyboards/4pplet/steezy60_rev_a/rules.mk | 65 ++ .../4pplet/steezy60_rev_a/steezy60_rev_a.c | 1 + .../4pplet/steezy60_rev_a/steezy60_rev_a.h | 21 + keyboards/4pplet/waffling60_rev_a/README.md | 14 + keyboards/4pplet/waffling60_rev_a/config.h | 41 + keyboards/4pplet/waffling60_rev_a/info.json | 307 ++++++ .../waffling60_rev_a/keymaps/default/keymap.c | 32 + keyboards/4pplet/waffling60_rev_a/rules.mk | 64 ++ .../waffling60_rev_a/waffling60_rev_a.c | 94 ++ .../waffling60_rev_a/waffling60_rev_a.h | 58 ++ 22 files changed, 2278 insertions(+) create mode 100644 keyboards/4pplet/aekiso60_rev_a/README.md create mode 100644 keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.c create mode 100644 keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.h create mode 100644 keyboards/4pplet/aekiso60_rev_a/config.h create mode 100644 keyboards/4pplet/aekiso60_rev_a/info.json create mode 100644 keyboards/4pplet/aekiso60_rev_a/keymaps/default/keymap.c create mode 100644 keyboards/4pplet/aekiso60_rev_a/rules.mk create mode 100644 keyboards/4pplet/steezy60_rev_a/README.md create mode 100644 keyboards/4pplet/steezy60_rev_a/config.h create mode 100644 keyboards/4pplet/steezy60_rev_a/info.json create mode 100644 keyboards/4pplet/steezy60_rev_a/keymaps/4pplet/keymap.c create mode 100644 keyboards/4pplet/steezy60_rev_a/keymaps/default/keymap.c create mode 100644 keyboards/4pplet/steezy60_rev_a/rules.mk create mode 100644 keyboards/4pplet/steezy60_rev_a/steezy60_rev_a.c create mode 100644 keyboards/4pplet/steezy60_rev_a/steezy60_rev_a.h create mode 100644 keyboards/4pplet/waffling60_rev_a/README.md create mode 100644 keyboards/4pplet/waffling60_rev_a/config.h create mode 100644 keyboards/4pplet/waffling60_rev_a/info.json create mode 100644 keyboards/4pplet/waffling60_rev_a/keymaps/default/keymap.c create mode 100644 keyboards/4pplet/waffling60_rev_a/rules.mk create mode 100644 keyboards/4pplet/waffling60_rev_a/waffling60_rev_a.c create mode 100644 keyboards/4pplet/waffling60_rev_a/waffling60_rev_a.h diff --git a/keyboards/4pplet/aekiso60_rev_a/README.md b/keyboards/4pplet/aekiso60_rev_a/README.md new file mode 100644 index 000000000000..da8b0dcc1147 --- /dev/null +++ b/keyboards/4pplet/aekiso60_rev_a/README.md @@ -0,0 +1,14 @@ +# AEKISO60 + +A 60% PCB enabling use of ISO AEK keycaps and ALPS switches + +More info: https://geekhack.org/index.php?topic=103627.0 + +* Keyboard Maintainer: [4pplet](https://github.com/4pplet) +* Hardware Supported: AEKISO60 Rev A + +Make example for this keyboard (after setting up your build environment): + + make 4pplet/aekiso60_rev_a:default + +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). \ No newline at end of file diff --git a/keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.c b/keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.c new file mode 100644 index 000000000000..02f598ee76ab --- /dev/null +++ b/keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.c @@ -0,0 +1 @@ +#include "aekiso60_rev_a.h" diff --git a/keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.h b/keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.h new file mode 100644 index 000000000000..f2bb545a17dd --- /dev/null +++ b/keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.h @@ -0,0 +1,21 @@ +#pragma once + +#include "quantum.h" + +#define LAYOUT_all( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ + k40, k41, k43, k44, k45, k46, k48, k4a, k4b \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, KC_NO},\ + {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \ + {k40, k41, KC_NO, k43, k44, k45, k46, KC_NO, k48, KC_NO, k4a, k4b, KC_NO, KC_NO} \ +} + +void matrix_init_user(void); +void matrix_scan_user(void); diff --git a/keyboards/4pplet/aekiso60_rev_a/config.h b/keyboards/4pplet/aekiso60_rev_a/config.h new file mode 100644 index 000000000000..08e009620c77 --- /dev/null +++ b/keyboards/4pplet/aekiso60_rev_a/config.h @@ -0,0 +1,50 @@ +#ifndef CONFIG_H +#define CONFIG_H + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x4444 +#define PRODUCT_ID 0x0001 +#define DEVICE_VER 0x0001 +#define MANUFACTURER 4pplet +#define PRODUCT AEKISO60 Rev A +#define DESCRIPTION A steezy KEEB + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 14 +// ROWS: Top to bottom, COLS: Left to right +// 0 1 2 3 4 5 6 7 8 9 a b c d +#define MATRIX_ROW_PINS {C2,D0,B0,C7,C5} +#define MATRIX_COL_PINS {C4,C6,B7,B6,B5,B4,B3,B2,B1,D6,D5,D4,D2,D1} + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* define if matrix has ghost */ +//#define MATRIX_HAS_GHOST + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCING_DELAY 5 + +#define QMK_ESC_OUTPUT C4 // usually COL +#define QMK_ESC_INPUT C2 // usually ROW + +#define GRAVE_ESC_CTRL_OVERRIDE +#define GRAVE_ESC_ALT_OVERRIDE +#define GRAVE_ESC_GUI_OVERRIDE +#define GRAVE_ESC_SHIFT_OVERRIDE + +#define RGB_DI_PIN D3 +#define RGBLED_NUM 12 +#define BACKLIGHT_LEVELS 5 + +#define RGBLIGHT_HUE_STEP 8 +#define RGBLIGHT_SAT_STEP 8 +#define RGBLIGHT_VAL_STEP 8 +#define RGBLIGHT_ANIMATIONS + +#endif \ No newline at end of file diff --git a/keyboards/4pplet/aekiso60_rev_a/info.json b/keyboards/4pplet/aekiso60_rev_a/info.json new file mode 100644 index 000000000000..9079cdb67a77 --- /dev/null +++ b/keyboards/4pplet/aekiso60_rev_a/info.json @@ -0,0 +1,384 @@ +{ + "name": "AEKISO60 Rev A", + "vendorId": "0x4444", + "productId": "0x0001", + "lighting": "qmk_backlight_rgblight", + "matrix": {"rows": 5, "cols": 14}, + "layouts": { + "labels": [ + ["Right Shift", "Unified", "Split"], + ["Bottom Row", "AEK", "Tsangan", "WKL", "ANSI sym split", "ISO sym split", "ANSI Split", "ISO/ANSI combo split"] + ], + "keymap": [ + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "0,13" + ], + [ + { + "w": 1.75 + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "x": 0.25, + "c": "#aaaaaa", + "h": 2, + "h2": 1, + "x2": -0.25 + }, + "1,13" + ], + [ + { + "w": 2 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12" + ], + [ + { + "c": "#aaaaaa", + "w": 1.5 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "c": "#aaaaaa", + "w": 2.5 + }, + "3,12\n\n\n0,0", + { + "x": 0.5, + "w": 1.5 + }, + "3,12\n\n\n0,1", + "3,13\n\n\n0,1" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n1,0", + { + "w": 1.25 + }, + "4,1\n\n\n1,0", + { + "w": 1.5 + }, + "4,3\n\n\n1,0", + { + "c": "#cccccc", + "w": 6.5 + }, + "4,5\n\n\n1,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,8\n\n\n1,0", + { + "w": 1.25 + }, + "4,10\n\n\n1,0", + { + "w": 1.5 + }, + "4,11\n\n\n1,0" + ], + [ + { + "y": 0.5, + "w": 1.5 + }, + "4,0\n\n\n1,1", + "4,1\n\n\n1,1", + { + "w": 1.5 + }, + "4,3\n\n\n1,1", + { + "c": "#cccccc", + "w": 7 + }, + "4,5\n\n\n1,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,8\n\n\n1,1", + "4,10\n\n\n1,1", + { + "w": 1.5 + }, + "4,11\n\n\n1,1" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n1,2", + { + "d": true + }, + "4,1\n\n\n1,2", + { + "w": 1.5 + }, + "4,3\n\n\n1,2", + { + "c": "#cccccc", + "w": 7 + }, + "4,5\n\n\n1,2", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,8\n\n\n1,2", + { + "d": true + }, + "4,10\n\n\n1,2", + { + "w": 1.5 + }, + "4,11\n\n\n1,2" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n1,3", + { + "w": 1.25 + }, + "4,1\n\n\n1,3", + { + "w": 1.5 + }, + "4,3\n\n\n1,3", + { + "c": "#cccccc", + "w": 2.75 + }, + "4,4\n\n\n1,3", + "4,5\n\n\n1,3", + { + "w": 2.75 + }, + "4,6\n\n\n1,3", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,8\n\n\n1,3", + { + "w": 1.25 + }, + "4,10\n\n\n1,3", + { + "w": 1.5 + }, + "4,11\n\n\n1,3" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n1,4", + { + "w": 1.25 + }, + "4,1\n\n\n1,4", + { + "w": 1.5 + }, + "4,3\n\n\n1,4", + { + "c": "#cccccc", + "w": 2.5 + }, + "4,4\n\n\n1,4", + { + "w": 1.5 + }, + "4,5\n\n\n1,4", + { + "w": 2.5 + }, + "4,6\n\n\n1,4", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,8\n\n\n1,4", + { + "w": 1.25 + }, + "4,10\n\n\n1,4", + { + "w": 1.5 + }, + "4,11\n\n\n1,4" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n1,5", + { + "w": 1.25 + }, + "4,1\n\n\n1,5", + { + "w": 1.5 + }, + "4,3\n\n\n1,5", + { + "c": "#cccccc", + "w": 2.25 + }, + "4,4\n\n\n1,5", + { + "w": 1.5 + }, + "4,5\n\n\n1,5", + { + "w": 2.75 + }, + "4,6\n\n\n1,5", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,8\n\n\n1,5", + { + "w": 1.25 + }, + "4,10\n\n\n1,5", + { + "x": -1.25, + "w": 1.25 + }, + "4,10\n\n\n1,5", + { + "w": 1.5 + }, + "4,11\n\n\n1,5", + { + "x": -1.5, + "w": 1.5 + }, + "4,11\n\n\n1,5" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n1,6", + { + "w": 1.25 + }, + "4,1\n\n\n1,6", + { + "w": 1.5 + }, + "4,3\n\n\n1,6", + { + "c": "#cccccc", + "w": 2.5 + }, + "4,4\n\n\n1,6", + { + "w": 1.25 + }, + "4,5\n\n\n1,6", + { + "w": 2.75 + }, + "4,6\n\n\n1,6", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,8\n\n\n1,6", + { + "w": 1.25 + }, + "4,10\n\n\n1,6", + { + "w": 1.5 + }, + "4,11\n\n\n1,6" + ] + + +] + } +} \ No newline at end of file diff --git a/keyboards/4pplet/aekiso60_rev_a/keymaps/default/keymap.c b/keyboards/4pplet/aekiso60_rev_a/keymaps/default/keymap.c new file mode 100644 index 000000000000..4d49f62e3a24 --- /dev/null +++ b/keyboards/4pplet/aekiso60_rev_a/keymaps/default/keymap.c @@ -0,0 +1,35 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + +[0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, \ + KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, \ + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), \ + KC_LCTL, KC_LGUI, KC_LALT, _______, KC_SPC, _______, KC_RALT, KC_RGUI, KC_RCTL), + +[1] = LAYOUT_all( + KC_EXEC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, \ + _______, KC_BSPC, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, KC_PENT, \ + KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, KC_INS, \ + _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, \ + RESET, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______), + +[2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______), + +[3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______) +}; + + diff --git a/keyboards/4pplet/aekiso60_rev_a/rules.mk b/keyboards/4pplet/aekiso60_rev_a/rules.mk new file mode 100644 index 000000000000..fd57aa0a80b3 --- /dev/null +++ b/keyboards/4pplet/aekiso60_rev_a/rules.mk @@ -0,0 +1,65 @@ + +# MCU name +MCU = atmega32u2 + +# Processor frequency. +# This will define a symbol, F_CPU, in all source code files equal to the +# processor frequency in Hz. You can then use this symbol in your source code to +# calculate timings. Do NOT tack on a 'UL' at the end, this will be done +# automatically to create a 32-bit value in your source code. +# +# This will be an integer division of F_USB below, as it is sourced by +# F_USB after it has run through any CPU prescalers. Note that this value +# does not *change* the processor frequency - it should merely be updated to +# reflect the processor speed set externally so that the code can use accurate +# software delays. +F_CPU = 16000000 + + +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +ARCH = AVR8 + +# Input clock frequency. +# This will define a symbol, F_USB, in all source code files equal to the +# input clock frequency (before any prescaling is performed) in Hz. This value may +# differ from F_CPU if prescaling is used on the latter, and is required as the +# raw input clock is fed directly to the PLL sections of the AVR for high speed +# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' +# at the end, this will be done automatically to create a 32-bit value in your +# source code. +# +# If no clock division is performed on the input clock inside the AVR (via the +# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. +F_USB = $(F_CPU) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# Boot Section Size in *bytes* +# Teensy halfKay 512 +# Teensy++ halfKay 1024 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +# USBaspLoader 2048 +OPT_DEFS += -DBOOTLOADER_SIZE=4096 + +# Build Options +# comment out to disable the options. +# +# 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) +# COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no +UNICODE_ENABLE = no # Unicode +RAW_ENABLE = yes +BACKLIGHT_ENABLE = no +RGBLIGHT_ENABLE = no +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/4pplet/steezy60_rev_a/README.md b/keyboards/4pplet/steezy60_rev_a/README.md new file mode 100644 index 000000000000..80a9474dd0ce --- /dev/null +++ b/keyboards/4pplet/steezy60_rev_a/README.md @@ -0,0 +1,14 @@ +# Steezy60 + +A 60% PCB with a ton of layout options for SMK and Alps switches + +More info: https://geekhack.org/index.php?topic=103531.0 + +* Keyboard Maintainer: [4pplet](https://github.com/4pplet) +* Hardware Supported: Steezy60 Rev A + +Make example for this keyboard (after setting up your build environment): + + make 4pplet/steezy60_rev_a:default + +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). \ No newline at end of file diff --git a/keyboards/4pplet/steezy60_rev_a/config.h b/keyboards/4pplet/steezy60_rev_a/config.h new file mode 100644 index 000000000000..787deb7a0515 --- /dev/null +++ b/keyboards/4pplet/steezy60_rev_a/config.h @@ -0,0 +1,48 @@ +#ifndef CONFIG_H +#define CONFIG_H + +// Used Plan60 as template +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x4444 +#define PRODUCT_ID 0x0002 +#define DEVICE_VER 0x0001 +#define MANUFACTURER 4pplet +#define PRODUCT Steezy60 Rev A +#define DESCRIPTION A steezy keeb + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 +// ROWS: Top to bottom, COLS: Left to right + +#define MATRIX_ROW_PINS {C2,D0,B0,C7,C5} +#define MATRIX_COL_PINS {C4,C6,B7,B6,B5,B4,B3,B2,B1,D6,D5,D4,D2,D1} + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCING_DELAY 5 + +#define QMK_ESC_OUTPUT C4 // usually COL +#define QMK_ESC_INPUT C2 // usually ROW + +#define GRAVE_ESC_CTRL_OVERRIDE +#define GRAVE_ESC_ALT_OVERRIDE +#define GRAVE_ESC_GUI_OVERRIDE +#define GRAVE_ESC_SHIFT_OVERRIDE + +#define RGB_DI_PIN D3 +#define RGBLED_NUM 12 +#define BACKLIGHT_LEVELS 5 + +#define RGBLIGHT_HUE_STEP 8 +#define RGBLIGHT_SAT_STEP 8 +#define RGBLIGHT_VAL_STEP 8 +#define RGBLIGHT_ANIMATIONS + +#endif \ No newline at end of file diff --git a/keyboards/4pplet/steezy60_rev_a/info.json b/keyboards/4pplet/steezy60_rev_a/info.json new file mode 100644 index 000000000000..d51e7efbddb9 --- /dev/null +++ b/keyboards/4pplet/steezy60_rev_a/info.json @@ -0,0 +1,883 @@ +{ + "name": "Steezy60 Rev A", + "vendorId": "0x4444", + "productId": "0x0002", + "lighting": "qmk_backlight_rgblight", + "matrix": {"rows": 5, "cols": 14}, + "layouts": { + "labels": [ + ["Backspace", "Unified", "Split"], + ["Enter", "ANSI", "ISO", "BAE", "bae"], + ["Row 3", "1","2","3","4","5","6","7","8"], + ["Row 4", "1","2","3","4","5","6","7","8","9","10","11","12","13","14","15"] + ], + "keymap": + + +[ + [ + { + "c": "#aaaaaa" + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "4,13\n\n\n0,0", + { + "x": 0.75, + "c": "#cccccc" + }, + "0,13\n\n\n0,1", + { + "c": "#aaaaaa" + }, + "4,13\n\n\n0,1" + ], + [ + { + "w": 1.5 + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12\n\n\n1,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "1,13\n\n\n1,0", + { + "x": 0.75, + "c": "#cccccc", + "w": 1.5 + }, + "1,12\n\n\n1,3", + { + "c": "#aaaaaa", + "h": 2, + "w2": 2.25, + "h2": 1, + "x2": -1.25, + "y2": 1 + }, + "2,13\n\n\n1,3", + { + "x": 0.25, + "c": "#cccccc" + }, + "1,12\n\n\n1,1", + { + "x": 0.25, + "c": "#aaaaaa", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "2,13\n\n\n1,1", + { + "x": 0.25, + "c": "#cccccc" + }, + "1,12\n\n\n1,2", + { + "c": "#aaaaaa", + "w": 1.5, + "h": 2, + "w2": 2.25, + "h2": 1, + "x2": -0.75, + "y2": 1 + }, + "2,13\n\n\n1,2" + ], + [ + { + "w": 1.75 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "c": "#aaaaaa", + "w": 2.25 + }, + "2,13\n\n\n1,0", + { + "x": 3.75, + "c": "#cccccc" + }, + "2,12\n\n\n1,1" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "3,0\n\n\n2,0", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,0", + "3,3\n\n\n2,0", + "3,4\n\n\n2,0", + "3,5\n\n\n2,0", + "3,6\n\n\n2,0", + "3,7\n\n\n2,0", + "3,8\n\n\n2,0", + "3,9\n\n\n2,0", + "3,10\n\n\n2,0", + "3,11\n\n\n2,0", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "3,13\n\n\n2,0" + ], + [ + { + "w": 1.25 + }, + "4,0\n\n\n3,0", + { + "w": 1.25 + }, + "4,1\n\n\n3,0", + { + "w": 1.25 + }, + "4,3\n\n\n3,0", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,5\n\n\n3,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,7\n\n\n3,0", + { + "w": 1.25 + }, + "4,8\n\n\n3,0", + { + "w": 1.25 + }, + "4,10\n\n\n3,0", + { + "w": 1.25 + }, + "4,11\n\n\n3,0" + ], + [ + { + "y": 1, + "w": 1.5 + }, + "4,0\n\n\n3,1", + "4,1\n\n\n3,1", + { + "w": 1.5 + }, + "4,3\n\n\n3,1", + { + "c": "#cccccc", + "w": 7 + }, + "4,5\n\n\n3,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,8\n\n\n3,1", + "4,10\n\n\n3,1", + { + "w": 1.5 + }, + "4,11\n\n\n3,1" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n3,2", + { + "w": 1.25 + }, + "4,1\n\n\n3,2", + { + "w": 1.5 + }, + "4,3\n\n\n3,2", + { + "c": "#cccccc", + "w": 6.5 + }, + "4,5\n\n\n3,2", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,8\n\n\n3,2", + { + "w": 1.25 + }, + "4,10\n\n\n3,2", + { + "w": 1.5 + }, + "4,11\n\n\n3,2" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n3,3", + "4,1\n\n\n3,3", + { + "w": 1.5 + }, + "4,3\n\n\n3,3", + { + "c": "#cccccc", + "w": 6 + }, + "4,5\n\n\n3,3", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,7\n\n\n3,3", + "4,8\n\n\n3,3", + "4,10\n\n\n3,3", + { + "w": 1.5 + }, + "4,11\n\n\n3,3" + ], + [ + { + "w": 1.75 + }, + "4,0\n\n\n3,4", + { + "c": "#000000", + "w": 0.5, + "d": true + }, + "\n\n\n3,4", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "4,3\n\n\n3,4", + { + "c": "#cccccc", + "w": 7 + }, + "4,5\n\n\n3,4", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "4,8\n\n\n3,4", + { + "c": "#000000", + "w": 0.5, + "d": true + }, + "\n\n\n3,4", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "4,11\n\n\n3,4" + ], + [ + "4,0\n\n\n3,5", + "4,1\n\n\n3,5", + "4,2\n\n\n3,5", + "4,3\n\n\n3,5", + { + "c": "#cccccc", + "w": 6 + }, + "4,5\n\n\n3,5", + { + "c": "#aaaaaa" + }, + "4,7\n\n\n3,5", + "4,8\n\n\n3,5", + "4,9\n\n\n3,5", + "4,10\n\n\n3,5", + "4,11\n\n\n3,5" + ], + [ + { + "c": "#000000", + "w": 0.75, + "d": true + }, + "\n\n\n3,6", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,1\n\n\n3,6", + { + "w": 1.5 + }, + "4,3\n\n\n3,6", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,5\n\n\n3,6", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,7\n\n\n3,6", + "4,8\n\n\n3,6", + "4,10\n\n\n3,6", + "4,11\n\n\n3,6", + { + "c": "#000000", + "w": 0.75, + "d": true + }, + "\n\n\n3,6" + ], + [ + { + "y": 1, + "c": "#aaaaaa", + "w": 1.25 + }, + "4,0\n\n\n3,7", + { + "w": 1.25 + }, + "4,1\n\n\n3,7", + { + "w": 1.25 + }, + "4,3\n\n\n3,7", + { + "c": "#cccccc", + "w": 2.75 + }, + "4,6\n\n\n3,7", + { + "w": 1.25 + }, + "4,5\n\n\n3,7", + { + "w": 2.25 + }, + "4,6\n\n\n3,7", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,7\n\n\n3,7", + { + "w": 1.25 + }, + "4,8\n\n\n3,7", + { + "w": 1.25 + }, + "4,10\n\n\n3,7", + { + "w": 1.25 + }, + "4,11\n\n\n3,7" + ], + [ + { + "w": 1.25 + }, + "4,0\n\n\n3,8", + { + "w": 1.25 + }, + "4,1\n\n\n3,8", + { + "w": 1.25 + }, + "4,3\n\n\n3,8", + { + "c": "#cccccc", + "w": 2.25 + }, + "4,6\n\n\n3,8", + { + "w": 1.25 + }, + "4,5\n\n\n3,8", + { + "w": 2.75 + }, + "4,6\n\n\n3,8", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,7\n\n\n3,8", + { + "w": 1.25 + }, + "4,8\n\n\n3,8", + { + "w": 1.25 + }, + "4,10\n\n\n3,8", + { + "w": 1.25 + }, + "4,11\n\n\n3,8" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n3,9", + "4,1\n\n\n3,9", + { + "w": 1.5 + }, + "4,3\n\n\n3,9", + { + "c": "#cccccc", + "w": 2.25 + }, + "4,6\n\n\n3,9", + { + "w": 1.5 + }, + "4,5\n\n\n3,9", + { + "w": 2.25 + }, + "4,6\n\n\n3,9", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,7\n\n\n3,9", + "4,8\n\n\n3,9", + "4,10\n\n\n3,9", + { + "w": 1.5 + }, + "4,11\n\n\n3,9" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n3,10", + "4,1\n\n\n3,10", + { + "w": 1.5 + }, + "4,3\n\n\n3,10", + { + "c": "#cccccc", + "w": 2.25 + }, + "4,6\n\n\n3,10", + "4,5\n\n\n3,10", + { + "w": 2.75 + }, + "4,6\n\n\n3,10", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,7\n\n\n3,10", + "4,8\n\n\n3,10", + "4,10\n\n\n3,10", + { + "w": 1.5 + }, + "4,11\n\n\n3,10" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n3,11", + { + "w": 1.25 + }, + "4,1\n\n\n3,11", + { + "w": 1.5 + }, + "4,3\n\n\n3,11", + { + "c": "#cccccc", + "w": 2.75 + }, + "4,6\n\n\n3,11", + "4,5\n\n\n3,11", + { + "w": 2.75 + }, + "4,6\n\n\n3,11", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,8\n\n\n3,11", + { + "w": 1.25 + }, + "4,10\n\n\n3,11", + { + "w": 1.5 + }, + "4,11\n\n\n3,11" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n3,12", + { + "w": 1.25 + }, + "4,1\n\n\n3,12", + { + "w": 1.5 + }, + "4,3\n\n\n3,12", + { + "c": "#cccccc", + "w": 2.25 + }, + "4,6\n\n\n3,12", + { + "w": 1.5 + }, + "4,5\n\n\n3,12", + { + "w": 2.75 + }, + "4,6\n\n\n3,12", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,8\n\n\n3,12", + { + "w": 1.25 + }, + "4,10\n\n\n3,12", + { + "w": 1.5 + }, + "4,11\n\n\n3,12" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n3,13", + { + "w": 1.25 + }, + "4,1\n\n\n3,13", + { + "w": 1.5 + }, + "4,3\n\n\n3,13", + { + "c": "#cccccc", + "w": 2.75 + }, + "4,6\n\n\n3,13", + { + "w": 1.5 + }, + "4,5\n\n\n3,13", + { + "w": 2.25 + }, + "4,6\n\n\n3,13", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,8\n\n\n3,13", + { + "w": 1.25 + }, + "4,10\n\n\n3,13", + { + "w": 1.5 + }, + "4,11\n\n\n3,13" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n3,14", + "4,1\n\n\n3,14", + { + "w": 1.5 + }, + "4,3\n\n\n3,14", + { + "c": "#cccccc", + "w": 2.75 + }, + "4,6\n\n\n3,14", + { + "w": 1.5 + }, + "4,5\n\n\n3,14", + { + "w": 2.75 + }, + "4,6\n\n\n3,14", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,8\n\n\n3,14", + "4,10\n\n\n3,14", + { + "w": 1.5 + }, + "4,11\n\n\n3,14" + ], + [ + { + "y": 1, + "w": 2.25 + }, + "3,0\n\n\n2,1", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,1", + "3,3\n\n\n2,1", + "3,4\n\n\n2,1", + "3,5\n\n\n2,1", + "3,6\n\n\n2,1", + "3,7\n\n\n2,1", + "3,8\n\n\n2,1", + "3,9\n\n\n2,1", + "3,10\n\n\n2,1", + "3,11\n\n\n2,1", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,13\n\n\n2,1", + "4,12\n\n\n2,1" + ], + [ + { + "w": 1.25 + }, + "3,0\n\n\n2,2", + "3,1\n\n\n2,2", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,2", + "3,3\n\n\n2,2", + "3,4\n\n\n2,2", + "3,5\n\n\n2,2", + "3,6\n\n\n2,2", + "3,7\n\n\n2,2", + "3,8\n\n\n2,2", + "3,9\n\n\n2,2", + "3,10\n\n\n2,2", + "3,11\n\n\n2,2", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,13\n\n\n2,2", + "4,12\n\n\n2,2" + ], + [ + "3,0\n\n\n2,3", + { + "w": 1.25 + }, + "3,1\n\n\n2,3", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,3", + "3,3\n\n\n2,3", + "3,4\n\n\n2,3", + "3,5\n\n\n2,3", + "3,6\n\n\n2,3", + "3,7\n\n\n2,3", + "3,8\n\n\n2,3", + "3,9\n\n\n2,3", + "3,10\n\n\n2,3", + "3,11\n\n\n2,3", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,13\n\n\n2,3", + "4,12\n\n\n2,3" + ], + [ + { + "w": 2.25 + }, + "3,0\n\n\n2,4", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,4", + "3,3\n\n\n2,4", + "3,4\n\n\n2,4", + "3,5\n\n\n2,4", + "3,6\n\n\n2,4", + "3,7\n\n\n2,4", + "3,8\n\n\n2,4", + "3,9\n\n\n2,4", + "3,10\n\n\n2,4", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,12\n\n\n2,4", + "3,13\n\n\n2,4", + "4,12\n\n\n2,4" + ], + [ + { + "w": 2.25 + }, + "3,0\n\n\n2,5", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,5", + "3,3\n\n\n2,5", + "3,4\n\n\n2,5", + "3,5\n\n\n2,5", + "3,6\n\n\n2,5", + "3,7\n\n\n2,5", + "3,8\n\n\n2,5", + "3,9\n\n\n2,5", + "3,10\n\n\n2,5", + "3,11\n\n\n2,5", + "3,12\n\n\n2,5", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "4,12\n\n\n2,5" + ], + [ + { + "w": 2 + }, + "3,0\n\n\n2,6", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,6", + "3,3\n\n\n2,6", + "3,4\n\n\n2,6", + "3,5\n\n\n2,6", + "3,6\n\n\n2,6", + "3,7\n\n\n2,6", + "3,8\n\n\n2,6", + "3,9\n\n\n2,6", + "3,10\n\n\n2,6", + "3,11\n\n\n2,6", + "3,12\n\n\n2,6", + { + "c": "#aaaaaa" + }, + "3,13\n\n\n2,6", + "4,12\n\n\n2,6" + ], + [ + "3,0\n\n\n2,7", + { + "c": "#cccccc" + }, + "3,1\n\n\n2,7", + "3,2\n\n\n2,7", + "3,3\n\n\n2,7", + "3,4\n\n\n2,7", + "3,5\n\n\n2,7", + "3,6\n\n\n2,7", + "3,7\n\n\n2,7", + "3,8\n\n\n2,7", + "3,9\n\n\n2,7", + "3,10\n\n\n2,7", + "3,11\n\n\n2,7", + { + "c": "#aaaaaa" + }, + "3,12\n\n\n2,7", + "3,13\n\n\n2,7", + "4,12\n\n\n2,7" + ] +] + + + + } +} \ No newline at end of file diff --git a/keyboards/4pplet/steezy60_rev_a/keymaps/4pplet/keymap.c b/keyboards/4pplet/steezy60_rev_a/keymaps/4pplet/keymap.c new file mode 100644 index 000000000000..26649208e7d6 --- /dev/null +++ b/keyboards/4pplet/steezy60_rev_a/keymaps/4pplet/keymap.c @@ -0,0 +1,34 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT_all( + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS,KC_GRV, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ + KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, \ + KC_LSPO, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSPC, MO(2), \ + KC_LCTL, KC_LGUI, KC_NO, KC_LALT, KC_RALT, MO(2), KC_SPC, KC_RALT, KC_RGUI, KC_NO, KC_APP, KC_RCTRL), + +[1] = LAYOUT_all( + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS,KC_GRV, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ + KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, \ + KC_LSPO, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSPC, MO(2), \ + KC_LCTL, KC_LGUI, KC_NO, KC_LALT, KC_RALT, MO(2), KC_SPC, KC_RALT, KC_RGUI, KC_NO, KC_APP, KC_RCTRL), + +[2] = LAYOUT_all( + KC_EXEC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, _______, \ + _______, KC_BSPC, KC_UP, KC_ENT, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, KC_DEL, \ + KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, KC_PENT, \ + _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,\ + DF(1), DF(0), _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, RESET ), + +[3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) +}; + + diff --git a/keyboards/4pplet/steezy60_rev_a/keymaps/default/keymap.c b/keyboards/4pplet/steezy60_rev_a/keymaps/default/keymap.c new file mode 100644 index 000000000000..f1655c5bdb8f --- /dev/null +++ b/keyboards/4pplet/steezy60_rev_a/keymaps/default/keymap.c @@ -0,0 +1,32 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC,\ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ + KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, \ + KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSFT, KC_NO, \ + KC_LCTL, KC_LGUI, KC_NO, KC_LALT, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_RGUI, KC_NO, KC_APP, MO(1)), + +[1] = LAYOUT_all( + RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, \ + _______, KC_BSPC, KC_UP, KC_ENT, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______, \ + KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, _______, \ + _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,\ + _______, _______, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, _______ ), + +[2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), + +[3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) +}; \ No newline at end of file diff --git a/keyboards/4pplet/steezy60_rev_a/rules.mk b/keyboards/4pplet/steezy60_rev_a/rules.mk new file mode 100644 index 000000000000..9df6bb56d676 --- /dev/null +++ b/keyboards/4pplet/steezy60_rev_a/rules.mk @@ -0,0 +1,65 @@ + +# MCU name +MCU = atmega32u2 + +# Processor frequency. +# This will define a symbol, F_CPU, in all source code files equal to the +# processor frequency in Hz. You can then use this symbol in your source code to +# calculate timings. Do NOT tack on a 'UL' at the end, this will be done +# automatically to create a 32-bit value in your source code. +# +# This will be an integer division of F_USB below, as it is sourced by +# F_USB after it has run through any CPU prescalers. Note that this value +# does not *change* the processor frequency - it should merely be updated to +# reflect the processor speed set externally so that the code can use accurate +# software delays. +F_CPU = 16000000 + + +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +ARCH = AVR8 + +# Input clock frequency. +# This will define a symbol, F_USB, in all source code files equal to the +# input clock frequency (before any prescaling is performed) in Hz. This value may +# differ from F_CPU if prescaling is used on the latter, and is required as the +# raw input clock is fed directly to the PLL sections of the AVR for high speed +# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' +# at the end, this will be done automatically to create a 32-bit value in your +# source code. +# +# If no clock division is performed on the input clock inside the AVR (via the +# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. +F_USB = $(F_CPU) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# Boot Section Size in *bytes* +# Teensy halfKay 512 +# Teensy++ halfKay 1024 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +# USBaspLoader 2048 +OPT_DEFS += -DBOOTLOADER_SIZE=4096 + +# Build Options +# comment out to disable the options. +# +MOUSEKEY_ENABLE = no # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RAW_ENABLE = yes +BACKLIGHT_ENABLE = no +RGBLIGHT_ENABLE = no +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/4pplet/steezy60_rev_a/steezy60_rev_a.c b/keyboards/4pplet/steezy60_rev_a/steezy60_rev_a.c new file mode 100644 index 000000000000..ee498809a8cb --- /dev/null +++ b/keyboards/4pplet/steezy60_rev_a/steezy60_rev_a.c @@ -0,0 +1 @@ +#include "steezy60_rev_a.h" diff --git a/keyboards/4pplet/steezy60_rev_a/steezy60_rev_a.h b/keyboards/4pplet/steezy60_rev_a/steezy60_rev_a.h new file mode 100644 index 000000000000..3b8e3094b03c --- /dev/null +++ b/keyboards/4pplet/steezy60_rev_a/steezy60_rev_a.h @@ -0,0 +1,21 @@ +#pragma once + +#include "quantum.h" + +#define LAYOUT_all( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k4d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,k4c, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \ + {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \ + {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d} \ +} + +void matrix_init_user(void); +void matrix_scan_user(void); diff --git a/keyboards/4pplet/waffling60_rev_a/README.md b/keyboards/4pplet/waffling60_rev_a/README.md new file mode 100644 index 000000000000..888baffddcc0 --- /dev/null +++ b/keyboards/4pplet/waffling60_rev_a/README.md @@ -0,0 +1,14 @@ +# Steezy60 + +A 60% PCB for MX switches, one hot swap and one solder-pcb version with decent layout support. + +More info: https://geekhack.org/index.php?topic=103531.0 + +* Keyboard Maintainer: [4pplet](https://github.com/4pplet) +* Hardware Supported: waffling60 Rev A + +Make example for this keyboard (after setting up your build environment): + + make 4pplet/steezy60_rev_a:default + +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). \ No newline at end of file diff --git a/keyboards/4pplet/waffling60_rev_a/config.h b/keyboards/4pplet/waffling60_rev_a/config.h new file mode 100644 index 000000000000..fd2c5c28cda5 --- /dev/null +++ b/keyboards/4pplet/waffling60_rev_a/config.h @@ -0,0 +1,41 @@ +#ifndef CONFIG_H +#define CONFIG_H + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x4444 +#define PRODUCT_ID 0x0003 +#define DEVICE_VER 0x0001 +#define MANUFACTURER 4pplet +#define PRODUCT waffling60 Rev A +#define DESCRIPTION A steezy keeb + +/* key matrix size */ +#define MATRIX_ROWS 6 +#define MATRIX_COLS 11 +// ROWS: Top to bottom, COLS: Left to right + +#define MATRIX_ROW_PINS {D4,D1,C2,C4,C7,B2} +#define MATRIX_COL_PINS {D3,D0,D2,B6,B5,B4,B3,D6,D5,B0,B1} + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* define if matrix has ghost */ +//#define MATRIX_HAS_GHOST + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCING_DELAY 0 + +#define QMK_ESC_OUTPUT D3 // usually COL +#define QMK_ESC_INPUT D4 // usually ROW + +#define GRAVE_ESC_CTRL_OVERRIDE +#define GRAVE_ESC_ALT_OVERRIDE +#define GRAVE_ESC_GUI_OVERRIDE +#define GRAVE_ESC_SHIFT_OVERRIDE + +#endif diff --git a/keyboards/4pplet/waffling60_rev_a/info.json b/keyboards/4pplet/waffling60_rev_a/info.json new file mode 100644 index 000000000000..5e677596e120 --- /dev/null +++ b/keyboards/4pplet/waffling60_rev_a/info.json @@ -0,0 +1,307 @@ +{ + "name": "waffling60 Rev A", + "vendorId": "0x4444", + "productId": "0x0003", + "lighting": "qmk_backlight_rgblight", + "matrix": {"rows": 6, "cols": 11}, + "layouts": { + "labels": [ + ["Backspace", "Unified", "Split"], + ["ANSI/ISO", "ANSI", "ISO"], + ["Left Shift", "Unified" , "Split"], + ["Right Shift", "Unified", "Split"], + ["Bottom row", "Standard", "Tsangan","WKL", "Split"] + ], + "keymap": [ + + + + [ + { + "x": 3, + "c": "#aaaaaa" + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1", + "1,1", + "0,2", + "0,3", + "0,4", + "0,5", + "1,5", + "0,6", + "0,7", + "0,8", + "1,8", + "0,9", + { + "c": "#aaaaaa", + "w": 2 + }, + "0,10\n\n\n0,0", + { + "x": 1.5, + "c": "#cccccc" + }, + "0,10\n\n\n0,1", + { + "c": "#aaaaaa" + }, + "1,10\n\n\n0,1" + ], + [ + { + "x": 3, + "w": 1.5 + }, + "1,0", + { + "c": "#cccccc" + }, + "2,1", + "1,2", + "2,2", + "1,3", + "1,4", + "2,5", + "3,5", + "1,6", + "1,7", + "2,8", + "1,9", + "2,9", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "2,10\n\n\n1,0", + { + "x": 2.25, + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "2,10\n\n\n1,1" + ], + [ + { + "x": 3, + "w": 1.75 + }, + "2,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "2,3", + "3,3", + "2,4", + "4,5", + "2,6", + "3,6", + "2,7", + "3,8", + "3,9", + { + "c": "#aaaaaa", + "w": 2.25 + }, + "3,10\n\n\n1,0", + { + "x": 1.25, + "c": "#cccccc" + }, + "3,10\n\n\n1,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "3,0\n\n\n2,1", + "4,0\n\n\n2,1", + { + "x": 0.75, + "w": 2.25 + }, + "3,0\n\n\n2,0", + { + "c": "#cccccc" + }, + "4,1", + "4,2", + "4,3", + "3,4", + "4,4", + "5,5", + "4,6", + "3,7", + "4,7", + "4,8", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "4,9\n\n\n3,0", + { + "x": 0.75, + "w": 1.75 + }, + "4,9\n\n\n3,1", + "4,10\n\n\n3,1" + ], + [ + { + "x": 3, + "w": 1.25 + }, + "5,0\n\n\n4,0", + { + "w": 1.25 + }, + "5,1\n\n\n4,0", + { + "w": 1.25 + }, + "5,2\n\n\n4,0", + { + "c": "#cccccc", + "w": 6.25 + }, + "5,4\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "5,7\n\n\n4,0", + { + "w": 1.25 + }, + "5,8\n\n\n4,0", + { + "w": 1.25 + }, + "5,9\n\n\n4,0", + { + "w": 1.25 + }, + "5,10\n\n\n4,0" + ], + [ + { + "y": 0.75, + "x": 3, + "w": 1.5 + }, + "5,0\n\n\n4,1", + "5,1\n\n\n4,1", + { + "w": 1.5 + }, + "5,2\n\n\n4,1", + { + "c": "#cccccc", + "w": 7 + }, + "5,4\n\n\n4,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,8\n\n\n4,1", + "5,9\n\n\n4,1", + { + "w": 1.5 + }, + "5,10\n\n\n4,1" + ], + [ + { + "x": 3, + "w": 1.5 + }, + "5,0\n\n\n4,2", + { + "d": true + }, + "5,1\n\n\n4,2", + { + "w": 1.5 + }, + "5,2\n\n\n4,2", + { + "c": "#cccccc", + "w": 7 + }, + "5,4\n\n\n4,2", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,8\n\n\n4,2", + { + "d": true + }, + "5,9\n\n\n4,2", + { + "w": 1.5 + }, + "5,10\n\n\n4,2" + ], + [ + { + "x": 3, + "w": 1.25 + }, + "5,0\n\n\n4,3", + { + "w": 1.25 + }, + "5,1\n\n\n4,3", + { + "w": 1.25 + }, + "5,2\n\n\n4,3", + { + "c": "#cccccc", + "w": 2.25 + }, + "5,3\n\n\n4,3", + { + "w": 1.25 + }, + "5,4\n\n\n4,3", + { + "w": 2.75 + }, + "5,6\n\n\n4,3", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "5,7\n\n\n4,3", + { + "w": 1.25 + }, + "5,8\n\n\n4,3", + { + "w": 1.25 + }, + "5,9\n\n\n4,3", + { + "w": 1.25 + }, + "5,10\n\n\n4,3" + ] + + + +] + } +} \ No newline at end of file diff --git a/keyboards/4pplet/waffling60_rev_a/keymaps/default/keymap.c b/keyboards/4pplet/waffling60_rev_a/keymaps/default/keymap.c new file mode 100644 index 000000000000..105f6a0c81ef --- /dev/null +++ b/keyboards/4pplet/waffling60_rev_a/keymaps/default/keymap.c @@ -0,0 +1,32 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +// main layer +[_BASE1] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ + KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ + KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, \ + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, MO(_FN1)), +// basic function layer +[_FN1] = LAYOUT_all( + RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), +// extra layer for VIA +[_BASE2] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), +// extra layer for VIA +[_FN2] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) +}; diff --git a/keyboards/4pplet/waffling60_rev_a/rules.mk b/keyboards/4pplet/waffling60_rev_a/rules.mk new file mode 100644 index 000000000000..e2905bb2375e --- /dev/null +++ b/keyboards/4pplet/waffling60_rev_a/rules.mk @@ -0,0 +1,64 @@ + +# MCU name +MCU = atmega32u2 + +# Processor frequency. +# This will define a symbol, F_CPU, in all source code files equal to the +# processor frequency in Hz. You can then use this symbol in your source code to +# calculate timings. Do NOT tack on a 'UL' at the end, this will be done +# automatically to create a 32-bit value in your source code. +# +# This will be an integer division of F_USB below, as it is sourced by +# F_USB after it has run through any CPU prescalers. Note that this value +# does not *change* the processor frequency - it should merely be updated to +# reflect the processor speed set externally so that the code can use accurate +# software delays. +F_CPU = 16000000 + + +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +ARCH = AVR8 + +# Input clock frequency. +# This will define a symbol, F_USB, in all source code files equal to the +# input clock frequency (before any prescaling is performed) in Hz. This value may +# differ from F_CPU if prescaling is used on the latter, and is required as the +# raw input clock is fed directly to the PLL sections of the AVR for high speed +# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' +# at the end, this will be done automatically to create a 32-bit value in your +# source code. +# +# If no clock division is performed on the input clock inside the AVR (via the +# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. +F_USB = $(F_CPU) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# Boot Section Size in *bytes* +# Teensy halfKay 512 +# Teensy++ halfKay 1024 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +# USBaspLoader 2048 +OPT_DEFS += -DBOOTLOADER_SIZE=4096 + +# Build Options +# comment out to disable the options. +# + +# CONSOLE_ENABLE = yes +MOUSEKEY_ENABLE = no # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +NKRO_ENABLE = no # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RAW_ENABLE = no +VIA_ENABLE = yes + diff --git a/keyboards/4pplet/waffling60_rev_a/waffling60_rev_a.c b/keyboards/4pplet/waffling60_rev_a/waffling60_rev_a.c new file mode 100644 index 000000000000..a9d6f436422c --- /dev/null +++ b/keyboards/4pplet/waffling60_rev_a/waffling60_rev_a.c @@ -0,0 +1,94 @@ +#include "waffling60_rev_a.h" + +void keyboard_pre_init_user(void) { + // Call the keyboard pre init code. + init_led(); +} + +void init_led(void){ + // Set on match, clear on TOP + TCCR1A = ((1 << COM1A1) | (1 << COM1A0) | (1 << COM1B1)| (1 << COM1B0)| (1 << COM1C1)| (1 << COM1C0)); // all leds on. + // Phase + Frequency Correct PWM, Fcpu speed + TCCR1B = ((1 << CS10) | (1 << WGM13)); + // define end of timer + ICR1 = TIMER_TOP; + // default set to lowest, will not toggle + led_set_color(RGB_OFF); + + brightness_level = DEFAULT_BRIGHTNESS_LEVEL; + // Set our LED pins as output + setPinOutput(B7); + setPinOutput(C5); + setPinOutput(C6); +} + +bool led_update_user(led_t led_state) { +/* +By convention, return true from led_update_user() to get the led_update_kb() hook to run its code, +and return false when you would prefer not to run the code in led_update_kb(). +*/ + if(LOCK_INDICATORS) + return true; + else + return false; +} + +layer_state_t layer_state_set_user(layer_state_t state) { // just to illustrate, make changes if needed + if(LAYER_INDICATOR){ + switch (get_highest_layer(state)) { + case _FN1: + led_set_color(RGB_PINK); + break; + case _FN2: + led_set_color(RGB_ORANGE); + break; + default: + led_set_color(RGB_OFF); + break; + } + } + return state; +} + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if(res) { + // do not indicate multiple lock statuses in current implementation, + // sorted by most likely first (if capslock is on, it will be purple, regardless of numlock state) + if(led_state.caps_lock) + led_set_color(RGB_ORANGE); + else if(led_state.num_lock) + led_set_color(RGB_PINK); + else if(led_state.scroll_lock) + led_set_color(RGB_CYAN); + else if(led_state.compose) + led_set_color(RGB_PURPLE); + else if(led_state.kana) + led_set_color(RGB_YELLOW); + else + led_set_color(RGB_OFF); + } + return res; +} + +void led_set_color(uint8_t r, uint8_t g, uint8_t b){ + uint32_t base_brightness = cie_lightness(TIMER_TOP * (uint32_t)brightness_level / BRIGHTNESS_LEVELS); + OCR1C = (uint32_t)r * (uint32_t)base_brightness / 0xFF; + OCR1B = (uint32_t)g * (uint32_t)base_brightness / 0xFF; + OCR1A = (uint32_t)b * (uint32_t)base_brightness / 0xFF; +} +// See http://jared.geek.nz/2013/feb/linear-led-pwm +uint16_t cie_lightness(uint16_t v) { + if (v <= 5243) // if below 8% of max + return v / 9; // same as dividing by 900% + else { + uint32_t y = (((uint32_t)v + 10486) << 8) / (10486 + 0xFFFFUL); // add 16% of max and compare + // to get a useful result with integer division, we shift left in the expression above + // and revert what we've done again after squaring. + y = y * y * y >> 8; + if (y > 0xFFFFUL) // prevent overflow + return 0xFFFFU; + else + return (uint16_t)y; + } +} diff --git a/keyboards/4pplet/waffling60_rev_a/waffling60_rev_a.h b/keyboards/4pplet/waffling60_rev_a/waffling60_rev_a.h new file mode 100644 index 000000000000..2be094ae55ff --- /dev/null +++ b/keyboards/4pplet/waffling60_rev_a/waffling60_rev_a.h @@ -0,0 +1,58 @@ +#pragma once + +#include "quantum.h" + +#define RGB_OFF 0,0,0 +#define RGB_WHITE 255, 255, 255 +#define RGB_RED 255, 0, 0 +#define RGB_ORANGE 255, 20, 0 +#define RGB_YELLOW 255, 255, 0 +#define RGB_GREEN 0, 255, 0 +#define RGB_CYAN 0, 255, 255 +#define RGB_BLUE 0, 0, 255 +#define RGB_PURPLE 255, 0, 255 +#define RGB_PINK 255, 20, 20 + +// set LOCK_INDICATORS to false if not used or if leds are used for custom function +// do not use both, lock indicators will override layer indicator. +#define LOCK_INDICATORS false // indicate capslock, scroll lock etc with rgb led +#define LAYER_INDICATOR true // indicate layer with rgb led, functions may need modification. + +#define BRIGHTNESS_LEVELS 10 +#define DEFAULT_BRIGHTNESS_LEVEL 5 + +#define TIMER_TOP 0xFFFFU + +bool led_update_kb(led_t led_state); +bool led_update_user(led_t led_state); +void keyboard_pre_init_user(void); +void led_set_color(uint8_t r, uint8_t g, uint8_t b); +void init_led(void); +uint16_t cie_lightness(uint16_t v); + +// variables +uint16_t brightness_level; + +enum waffling_layers { + _BASE1, + _BASE2, + _FN1, + _FN2, +}; + +// k +#define LAYOUT_all( \ + k00, k01, k11, k02, k03, k04, k05, k15, k06, k07, k08, k18, k09, k0a, k1a, \ + k10, k21, k12, k22, k13, k14, k25, k35, k16, k17, k28, k19, k29, k2a, \ + k20, k31, k32, k23, k33, k24, k45, k26, k36, k27, k38, k39, k3a, \ + k30, k40, k41, k42, k43, k34, k44, k55, k46, k37, k47, k48, k49, k4a, \ + k50, k51, k52, k53, k54, k56, k57, k58, k59, k5a \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a}, \ + {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a}, \ + {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a}, \ + {k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a} \ +} From 40e5cc0f065c74f9d450ad98c69d57c8fc4e2023 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 08:14:30 +0200 Subject: [PATCH 02/78] Update keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.h Co-Authored-By: Ryan --- keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.h b/keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.h index f2bb545a17dd..f68a320b7fbc 100644 --- a/keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.h +++ b/keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.h @@ -16,6 +16,3 @@ {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \ {k40, k41, KC_NO, k43, k44, k45, k46, KC_NO, k48, KC_NO, k4a, k4b, KC_NO, KC_NO} \ } - -void matrix_init_user(void); -void matrix_scan_user(void); From bade8f808ce47b2fe4a29e8e6e8e1446d7c188d5 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 08:14:40 +0200 Subject: [PATCH 03/78] Update keyboards/4pplet/aekiso60_rev_a/config.h Co-Authored-By: Ryan --- keyboards/4pplet/aekiso60_rev_a/config.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/keyboards/4pplet/aekiso60_rev_a/config.h b/keyboards/4pplet/aekiso60_rev_a/config.h index 08e009620c77..e1de37b7ad9e 100644 --- a/keyboards/4pplet/aekiso60_rev_a/config.h +++ b/keyboards/4pplet/aekiso60_rev_a/config.h @@ -1,6 +1,3 @@ -#ifndef CONFIG_H -#define CONFIG_H - #pragma once #include "config_common.h" @@ -47,4 +44,4 @@ #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_ANIMATIONS -#endif \ No newline at end of file +#endif From d53da6e2e5cdc17015d7ff161b76b2d821fc68a3 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 08:14:49 +0200 Subject: [PATCH 04/78] Update keyboards/4pplet/aekiso60_rev_a/config.h Co-Authored-By: Ryan --- keyboards/4pplet/aekiso60_rev_a/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/4pplet/aekiso60_rev_a/config.h b/keyboards/4pplet/aekiso60_rev_a/config.h index e1de37b7ad9e..9a81885654c8 100644 --- a/keyboards/4pplet/aekiso60_rev_a/config.h +++ b/keyboards/4pplet/aekiso60_rev_a/config.h @@ -25,7 +25,7 @@ //#define MATRIX_HAS_GHOST /* Set 0 if debouncing isn't needed */ -#define DEBOUNCING_DELAY 5 +#define DEBOUNCE 5 #define QMK_ESC_OUTPUT C4 // usually COL #define QMK_ESC_INPUT C2 // usually ROW From 77de85cf5c312a40966497bc6ee74344fd35e761 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 08:15:17 +0200 Subject: [PATCH 05/78] Update keyboards/4pplet/waffling60_rev_a/config.h Co-Authored-By: Ryan --- keyboards/4pplet/waffling60_rev_a/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/4pplet/waffling60_rev_a/config.h b/keyboards/4pplet/waffling60_rev_a/config.h index fd2c5c28cda5..f51dfd98579a 100644 --- a/keyboards/4pplet/waffling60_rev_a/config.h +++ b/keyboards/4pplet/waffling60_rev_a/config.h @@ -28,7 +28,7 @@ //#define MATRIX_HAS_GHOST /* Set 0 if debouncing isn't needed */ -#define DEBOUNCING_DELAY 0 +#define DEBOUNCE 0 #define QMK_ESC_OUTPUT D3 // usually COL #define QMK_ESC_INPUT D4 // usually ROW From 02e21ac7f2f73fe24c85d30c63f94c41a1c39cd1 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 08:15:50 +0200 Subject: [PATCH 06/78] Update keyboards/4pplet/aekiso60_rev_a/rules.mk Co-Authored-By: Ryan --- keyboards/4pplet/aekiso60_rev_a/rules.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/4pplet/aekiso60_rev_a/rules.mk b/keyboards/4pplet/aekiso60_rev_a/rules.mk index fd57aa0a80b3..37faaeae0196 100644 --- a/keyboards/4pplet/aekiso60_rev_a/rules.mk +++ b/keyboards/4pplet/aekiso60_rev_a/rules.mk @@ -1,4 +1,3 @@ - # MCU name MCU = atmega32u2 @@ -62,4 +61,4 @@ UNICODE_ENABLE = no # Unicode RAW_ENABLE = yes BACKLIGHT_ENABLE = no RGBLIGHT_ENABLE = no -VIA_ENABLE = yes \ No newline at end of file +VIA_ENABLE = yes From 2ff611d1edc8dc23873040895a885084cf11eb3c Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 08:16:06 +0200 Subject: [PATCH 07/78] Update keyboards/4pplet/aekiso60_rev_a/rules.mk Co-Authored-By: Ryan --- keyboards/4pplet/aekiso60_rev_a/rules.mk | 53 ++++-------------------- 1 file changed, 9 insertions(+), 44 deletions(-) diff --git a/keyboards/4pplet/aekiso60_rev_a/rules.mk b/keyboards/4pplet/aekiso60_rev_a/rules.mk index 37faaeae0196..3e9467a27581 100644 --- a/keyboards/4pplet/aekiso60_rev_a/rules.mk +++ b/keyboards/4pplet/aekiso60_rev_a/rules.mk @@ -1,50 +1,15 @@ # MCU name MCU = atmega32u2 -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - -# Interrupt driven control endpoint task(+60) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT - - -# Boot Section Size in *bytes* -# Teensy halfKay 512 -# Teensy++ halfKay 1024 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -# USBaspLoader 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu # Build Options # comment out to disable the options. From 99205e04b3330761927b6eef215bf5e097615bc1 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 08:16:14 +0200 Subject: [PATCH 08/78] Update keyboards/4pplet/waffling60_rev_a/rules.mk Co-Authored-By: Ryan --- keyboards/4pplet/waffling60_rev_a/rules.mk | 54 ++++------------------ 1 file changed, 9 insertions(+), 45 deletions(-) diff --git a/keyboards/4pplet/waffling60_rev_a/rules.mk b/keyboards/4pplet/waffling60_rev_a/rules.mk index e2905bb2375e..178664e23169 100644 --- a/keyboards/4pplet/waffling60_rev_a/rules.mk +++ b/keyboards/4pplet/waffling60_rev_a/rules.mk @@ -2,50 +2,15 @@ # MCU name MCU = atmega32u2 -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - -# Interrupt driven control endpoint task(+60) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT - - -# Boot Section Size in *bytes* -# Teensy halfKay 512 -# Teensy++ halfKay 1024 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -# USBaspLoader 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu # Build Options # comment out to disable the options. @@ -61,4 +26,3 @@ UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RAW_ENABLE = no VIA_ENABLE = yes - From 8264359b2f29db25f73f4b5d81db6ce70f367a4c Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 08:16:32 +0200 Subject: [PATCH 09/78] Update keyboards/4pplet/waffling60_rev_a/rules.mk Co-Authored-By: Ryan --- keyboards/4pplet/waffling60_rev_a/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/4pplet/waffling60_rev_a/rules.mk b/keyboards/4pplet/waffling60_rev_a/rules.mk index 178664e23169..2131ff1911da 100644 --- a/keyboards/4pplet/waffling60_rev_a/rules.mk +++ b/keyboards/4pplet/waffling60_rev_a/rules.mk @@ -1,4 +1,3 @@ - # MCU name MCU = atmega32u2 From ffa23423d3052a02cb35cf4a986b105b5c2918b9 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 08:16:54 +0200 Subject: [PATCH 10/78] Update keyboards/4pplet/steezy60_rev_a/config.h Co-Authored-By: Ryan --- keyboards/4pplet/steezy60_rev_a/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/4pplet/steezy60_rev_a/config.h b/keyboards/4pplet/steezy60_rev_a/config.h index 787deb7a0515..b8c485f09572 100644 --- a/keyboards/4pplet/steezy60_rev_a/config.h +++ b/keyboards/4pplet/steezy60_rev_a/config.h @@ -26,7 +26,7 @@ #define DIODE_DIRECTION COL2ROW /* Set 0 if debouncing isn't needed */ -#define DEBOUNCING_DELAY 5 +#define DEBOUNCE 5 #define QMK_ESC_OUTPUT C4 // usually COL #define QMK_ESC_INPUT C2 // usually ROW @@ -45,4 +45,4 @@ #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_ANIMATIONS -#endif \ No newline at end of file +#endif From de2a1120789ec2653c389cf028ac582d6695e9e3 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 08:45:47 +0200 Subject: [PATCH 11/78] Delete info.json --- keyboards/4pplet/aekiso60_rev_a/info.json | 384 ---------------------- 1 file changed, 384 deletions(-) delete mode 100644 keyboards/4pplet/aekiso60_rev_a/info.json diff --git a/keyboards/4pplet/aekiso60_rev_a/info.json b/keyboards/4pplet/aekiso60_rev_a/info.json deleted file mode 100644 index 9079cdb67a77..000000000000 --- a/keyboards/4pplet/aekiso60_rev_a/info.json +++ /dev/null @@ -1,384 +0,0 @@ -{ - "name": "AEKISO60 Rev A", - "vendorId": "0x4444", - "productId": "0x0001", - "lighting": "qmk_backlight_rgblight", - "matrix": {"rows": 5, "cols": 14}, - "layouts": { - "labels": [ - ["Right Shift", "Unified", "Split"], - ["Bottom Row", "AEK", "Tsangan", "WKL", "ANSI sym split", "ISO sym split", "ANSI Split", "ISO/ANSI combo split"] - ], - "keymap": [ - [ - { - "c": "#aaaaaa", - "w": 1.25 - }, - "0,0", - { - "c": "#cccccc" - }, - "0,1", - "0,2", - "0,3", - "0,4", - "0,5", - "0,6", - "0,7", - "0,8", - "0,9", - "0,10", - "0,11", - "0,12", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "0,13" - ], - [ - { - "w": 1.75 - }, - "1,0", - { - "c": "#cccccc" - }, - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "1,9", - "1,10", - "1,11", - "1,12", - { - "x": 0.25, - "c": "#aaaaaa", - "h": 2, - "h2": 1, - "x2": -0.25 - }, - "1,13" - ], - [ - { - "w": 2 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - "2,12" - ], - [ - { - "c": "#aaaaaa", - "w": 1.5 - }, - "3,0", - { - "c": "#cccccc" - }, - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - "3,11", - { - "c": "#aaaaaa", - "w": 2.5 - }, - "3,12\n\n\n0,0", - { - "x": 0.5, - "w": 1.5 - }, - "3,12\n\n\n0,1", - "3,13\n\n\n0,1" - ], - [ - { - "w": 1.5 - }, - "4,0\n\n\n1,0", - { - "w": 1.25 - }, - "4,1\n\n\n1,0", - { - "w": 1.5 - }, - "4,3\n\n\n1,0", - { - "c": "#cccccc", - "w": 6.5 - }, - "4,5\n\n\n1,0", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,8\n\n\n1,0", - { - "w": 1.25 - }, - "4,10\n\n\n1,0", - { - "w": 1.5 - }, - "4,11\n\n\n1,0" - ], - [ - { - "y": 0.5, - "w": 1.5 - }, - "4,0\n\n\n1,1", - "4,1\n\n\n1,1", - { - "w": 1.5 - }, - "4,3\n\n\n1,1", - { - "c": "#cccccc", - "w": 7 - }, - "4,5\n\n\n1,1", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,8\n\n\n1,1", - "4,10\n\n\n1,1", - { - "w": 1.5 - }, - "4,11\n\n\n1,1" - ], - [ - { - "w": 1.5 - }, - "4,0\n\n\n1,2", - { - "d": true - }, - "4,1\n\n\n1,2", - { - "w": 1.5 - }, - "4,3\n\n\n1,2", - { - "c": "#cccccc", - "w": 7 - }, - "4,5\n\n\n1,2", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,8\n\n\n1,2", - { - "d": true - }, - "4,10\n\n\n1,2", - { - "w": 1.5 - }, - "4,11\n\n\n1,2" - ], - [ - { - "w": 1.5 - }, - "4,0\n\n\n1,3", - { - "w": 1.25 - }, - "4,1\n\n\n1,3", - { - "w": 1.5 - }, - "4,3\n\n\n1,3", - { - "c": "#cccccc", - "w": 2.75 - }, - "4,4\n\n\n1,3", - "4,5\n\n\n1,3", - { - "w": 2.75 - }, - "4,6\n\n\n1,3", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,8\n\n\n1,3", - { - "w": 1.25 - }, - "4,10\n\n\n1,3", - { - "w": 1.5 - }, - "4,11\n\n\n1,3" - ], - [ - { - "w": 1.5 - }, - "4,0\n\n\n1,4", - { - "w": 1.25 - }, - "4,1\n\n\n1,4", - { - "w": 1.5 - }, - "4,3\n\n\n1,4", - { - "c": "#cccccc", - "w": 2.5 - }, - "4,4\n\n\n1,4", - { - "w": 1.5 - }, - "4,5\n\n\n1,4", - { - "w": 2.5 - }, - "4,6\n\n\n1,4", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,8\n\n\n1,4", - { - "w": 1.25 - }, - "4,10\n\n\n1,4", - { - "w": 1.5 - }, - "4,11\n\n\n1,4" - ], - [ - { - "w": 1.5 - }, - "4,0\n\n\n1,5", - { - "w": 1.25 - }, - "4,1\n\n\n1,5", - { - "w": 1.5 - }, - "4,3\n\n\n1,5", - { - "c": "#cccccc", - "w": 2.25 - }, - "4,4\n\n\n1,5", - { - "w": 1.5 - }, - "4,5\n\n\n1,5", - { - "w": 2.75 - }, - "4,6\n\n\n1,5", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,8\n\n\n1,5", - { - "w": 1.25 - }, - "4,10\n\n\n1,5", - { - "x": -1.25, - "w": 1.25 - }, - "4,10\n\n\n1,5", - { - "w": 1.5 - }, - "4,11\n\n\n1,5", - { - "x": -1.5, - "w": 1.5 - }, - "4,11\n\n\n1,5" - ], - [ - { - "w": 1.5 - }, - "4,0\n\n\n1,6", - { - "w": 1.25 - }, - "4,1\n\n\n1,6", - { - "w": 1.5 - }, - "4,3\n\n\n1,6", - { - "c": "#cccccc", - "w": 2.5 - }, - "4,4\n\n\n1,6", - { - "w": 1.25 - }, - "4,5\n\n\n1,6", - { - "w": 2.75 - }, - "4,6\n\n\n1,6", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,8\n\n\n1,6", - { - "w": 1.25 - }, - "4,10\n\n\n1,6", - { - "w": 1.5 - }, - "4,11\n\n\n1,6" - ] - - -] - } -} \ No newline at end of file From d0f4f66938e43ce1683129e4c4d6df4400d0fd5f Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 08:46:23 +0200 Subject: [PATCH 12/78] Delete info.json --- keyboards/4pplet/steezy60_rev_a/info.json | 883 ---------------------- 1 file changed, 883 deletions(-) delete mode 100644 keyboards/4pplet/steezy60_rev_a/info.json diff --git a/keyboards/4pplet/steezy60_rev_a/info.json b/keyboards/4pplet/steezy60_rev_a/info.json deleted file mode 100644 index d51e7efbddb9..000000000000 --- a/keyboards/4pplet/steezy60_rev_a/info.json +++ /dev/null @@ -1,883 +0,0 @@ -{ - "name": "Steezy60 Rev A", - "vendorId": "0x4444", - "productId": "0x0002", - "lighting": "qmk_backlight_rgblight", - "matrix": {"rows": 5, "cols": 14}, - "layouts": { - "labels": [ - ["Backspace", "Unified", "Split"], - ["Enter", "ANSI", "ISO", "BAE", "bae"], - ["Row 3", "1","2","3","4","5","6","7","8"], - ["Row 4", "1","2","3","4","5","6","7","8","9","10","11","12","13","14","15"] - ], - "keymap": - - -[ - [ - { - "c": "#aaaaaa" - }, - "0,0", - { - "c": "#cccccc" - }, - "0,1", - "0,2", - "0,3", - "0,4", - "0,5", - "0,6", - "0,7", - "0,8", - "0,9", - "0,10", - "0,11", - "0,12", - { - "c": "#aaaaaa", - "w": 2 - }, - "4,13\n\n\n0,0", - { - "x": 0.75, - "c": "#cccccc" - }, - "0,13\n\n\n0,1", - { - "c": "#aaaaaa" - }, - "4,13\n\n\n0,1" - ], - [ - { - "w": 1.5 - }, - "1,0", - { - "c": "#cccccc" - }, - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "1,9", - "1,10", - "1,11", - "1,12\n\n\n1,0", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "1,13\n\n\n1,0", - { - "x": 0.75, - "c": "#cccccc", - "w": 1.5 - }, - "1,12\n\n\n1,3", - { - "c": "#aaaaaa", - "h": 2, - "w2": 2.25, - "h2": 1, - "x2": -1.25, - "y2": 1 - }, - "2,13\n\n\n1,3", - { - "x": 0.25, - "c": "#cccccc" - }, - "1,12\n\n\n1,1", - { - "x": 0.25, - "c": "#aaaaaa", - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, - "2,13\n\n\n1,1", - { - "x": 0.25, - "c": "#cccccc" - }, - "1,12\n\n\n1,2", - { - "c": "#aaaaaa", - "w": 1.5, - "h": 2, - "w2": 2.25, - "h2": 1, - "x2": -0.75, - "y2": 1 - }, - "2,13\n\n\n1,2" - ], - [ - { - "w": 1.75 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - { - "c": "#aaaaaa", - "w": 2.25 - }, - "2,13\n\n\n1,0", - { - "x": 3.75, - "c": "#cccccc" - }, - "2,12\n\n\n1,1" - ], - [ - { - "c": "#aaaaaa", - "w": 2.25 - }, - "3,0\n\n\n2,0", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,0", - "3,3\n\n\n2,0", - "3,4\n\n\n2,0", - "3,5\n\n\n2,0", - "3,6\n\n\n2,0", - "3,7\n\n\n2,0", - "3,8\n\n\n2,0", - "3,9\n\n\n2,0", - "3,10\n\n\n2,0", - "3,11\n\n\n2,0", - { - "c": "#aaaaaa", - "w": 2.75 - }, - "3,13\n\n\n2,0" - ], - [ - { - "w": 1.25 - }, - "4,0\n\n\n3,0", - { - "w": 1.25 - }, - "4,1\n\n\n3,0", - { - "w": 1.25 - }, - "4,3\n\n\n3,0", - { - "c": "#cccccc", - "w": 6.25 - }, - "4,5\n\n\n3,0", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "4,7\n\n\n3,0", - { - "w": 1.25 - }, - "4,8\n\n\n3,0", - { - "w": 1.25 - }, - "4,10\n\n\n3,0", - { - "w": 1.25 - }, - "4,11\n\n\n3,0" - ], - [ - { - "y": 1, - "w": 1.5 - }, - "4,0\n\n\n3,1", - "4,1\n\n\n3,1", - { - "w": 1.5 - }, - "4,3\n\n\n3,1", - { - "c": "#cccccc", - "w": 7 - }, - "4,5\n\n\n3,1", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,8\n\n\n3,1", - "4,10\n\n\n3,1", - { - "w": 1.5 - }, - "4,11\n\n\n3,1" - ], - [ - { - "w": 1.5 - }, - "4,0\n\n\n3,2", - { - "w": 1.25 - }, - "4,1\n\n\n3,2", - { - "w": 1.5 - }, - "4,3\n\n\n3,2", - { - "c": "#cccccc", - "w": 6.5 - }, - "4,5\n\n\n3,2", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,8\n\n\n3,2", - { - "w": 1.25 - }, - "4,10\n\n\n3,2", - { - "w": 1.5 - }, - "4,11\n\n\n3,2" - ], - [ - { - "w": 1.5 - }, - "4,0\n\n\n3,3", - "4,1\n\n\n3,3", - { - "w": 1.5 - }, - "4,3\n\n\n3,3", - { - "c": "#cccccc", - "w": 6 - }, - "4,5\n\n\n3,3", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,7\n\n\n3,3", - "4,8\n\n\n3,3", - "4,10\n\n\n3,3", - { - "w": 1.5 - }, - "4,11\n\n\n3,3" - ], - [ - { - "w": 1.75 - }, - "4,0\n\n\n3,4", - { - "c": "#000000", - "w": 0.5, - "d": true - }, - "\n\n\n3,4", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "4,3\n\n\n3,4", - { - "c": "#cccccc", - "w": 7 - }, - "4,5\n\n\n3,4", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "4,8\n\n\n3,4", - { - "c": "#000000", - "w": 0.5, - "d": true - }, - "\n\n\n3,4", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "4,11\n\n\n3,4" - ], - [ - "4,0\n\n\n3,5", - "4,1\n\n\n3,5", - "4,2\n\n\n3,5", - "4,3\n\n\n3,5", - { - "c": "#cccccc", - "w": 6 - }, - "4,5\n\n\n3,5", - { - "c": "#aaaaaa" - }, - "4,7\n\n\n3,5", - "4,8\n\n\n3,5", - "4,9\n\n\n3,5", - "4,10\n\n\n3,5", - "4,11\n\n\n3,5" - ], - [ - { - "c": "#000000", - "w": 0.75, - "d": true - }, - "\n\n\n3,6", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,1\n\n\n3,6", - { - "w": 1.5 - }, - "4,3\n\n\n3,6", - { - "c": "#cccccc", - "w": 6.25 - }, - "4,5\n\n\n3,6", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "4,7\n\n\n3,6", - "4,8\n\n\n3,6", - "4,10\n\n\n3,6", - "4,11\n\n\n3,6", - { - "c": "#000000", - "w": 0.75, - "d": true - }, - "\n\n\n3,6" - ], - [ - { - "y": 1, - "c": "#aaaaaa", - "w": 1.25 - }, - "4,0\n\n\n3,7", - { - "w": 1.25 - }, - "4,1\n\n\n3,7", - { - "w": 1.25 - }, - "4,3\n\n\n3,7", - { - "c": "#cccccc", - "w": 2.75 - }, - "4,6\n\n\n3,7", - { - "w": 1.25 - }, - "4,5\n\n\n3,7", - { - "w": 2.25 - }, - "4,6\n\n\n3,7", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "4,7\n\n\n3,7", - { - "w": 1.25 - }, - "4,8\n\n\n3,7", - { - "w": 1.25 - }, - "4,10\n\n\n3,7", - { - "w": 1.25 - }, - "4,11\n\n\n3,7" - ], - [ - { - "w": 1.25 - }, - "4,0\n\n\n3,8", - { - "w": 1.25 - }, - "4,1\n\n\n3,8", - { - "w": 1.25 - }, - "4,3\n\n\n3,8", - { - "c": "#cccccc", - "w": 2.25 - }, - "4,6\n\n\n3,8", - { - "w": 1.25 - }, - "4,5\n\n\n3,8", - { - "w": 2.75 - }, - "4,6\n\n\n3,8", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "4,7\n\n\n3,8", - { - "w": 1.25 - }, - "4,8\n\n\n3,8", - { - "w": 1.25 - }, - "4,10\n\n\n3,8", - { - "w": 1.25 - }, - "4,11\n\n\n3,8" - ], - [ - { - "w": 1.5 - }, - "4,0\n\n\n3,9", - "4,1\n\n\n3,9", - { - "w": 1.5 - }, - "4,3\n\n\n3,9", - { - "c": "#cccccc", - "w": 2.25 - }, - "4,6\n\n\n3,9", - { - "w": 1.5 - }, - "4,5\n\n\n3,9", - { - "w": 2.25 - }, - "4,6\n\n\n3,9", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,7\n\n\n3,9", - "4,8\n\n\n3,9", - "4,10\n\n\n3,9", - { - "w": 1.5 - }, - "4,11\n\n\n3,9" - ], - [ - { - "w": 1.5 - }, - "4,0\n\n\n3,10", - "4,1\n\n\n3,10", - { - "w": 1.5 - }, - "4,3\n\n\n3,10", - { - "c": "#cccccc", - "w": 2.25 - }, - "4,6\n\n\n3,10", - "4,5\n\n\n3,10", - { - "w": 2.75 - }, - "4,6\n\n\n3,10", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,7\n\n\n3,10", - "4,8\n\n\n3,10", - "4,10\n\n\n3,10", - { - "w": 1.5 - }, - "4,11\n\n\n3,10" - ], - [ - { - "w": 1.5 - }, - "4,0\n\n\n3,11", - { - "w": 1.25 - }, - "4,1\n\n\n3,11", - { - "w": 1.5 - }, - "4,3\n\n\n3,11", - { - "c": "#cccccc", - "w": 2.75 - }, - "4,6\n\n\n3,11", - "4,5\n\n\n3,11", - { - "w": 2.75 - }, - "4,6\n\n\n3,11", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,8\n\n\n3,11", - { - "w": 1.25 - }, - "4,10\n\n\n3,11", - { - "w": 1.5 - }, - "4,11\n\n\n3,11" - ], - [ - { - "w": 1.5 - }, - "4,0\n\n\n3,12", - { - "w": 1.25 - }, - "4,1\n\n\n3,12", - { - "w": 1.5 - }, - "4,3\n\n\n3,12", - { - "c": "#cccccc", - "w": 2.25 - }, - "4,6\n\n\n3,12", - { - "w": 1.5 - }, - "4,5\n\n\n3,12", - { - "w": 2.75 - }, - "4,6\n\n\n3,12", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,8\n\n\n3,12", - { - "w": 1.25 - }, - "4,10\n\n\n3,12", - { - "w": 1.5 - }, - "4,11\n\n\n3,12" - ], - [ - { - "w": 1.5 - }, - "4,0\n\n\n3,13", - { - "w": 1.25 - }, - "4,1\n\n\n3,13", - { - "w": 1.5 - }, - "4,3\n\n\n3,13", - { - "c": "#cccccc", - "w": 2.75 - }, - "4,6\n\n\n3,13", - { - "w": 1.5 - }, - "4,5\n\n\n3,13", - { - "w": 2.25 - }, - "4,6\n\n\n3,13", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,8\n\n\n3,13", - { - "w": 1.25 - }, - "4,10\n\n\n3,13", - { - "w": 1.5 - }, - "4,11\n\n\n3,13" - ], - [ - { - "w": 1.5 - }, - "4,0\n\n\n3,14", - "4,1\n\n\n3,14", - { - "w": 1.5 - }, - "4,3\n\n\n3,14", - { - "c": "#cccccc", - "w": 2.75 - }, - "4,6\n\n\n3,14", - { - "w": 1.5 - }, - "4,5\n\n\n3,14", - { - "w": 2.75 - }, - "4,6\n\n\n3,14", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,8\n\n\n3,14", - "4,10\n\n\n3,14", - { - "w": 1.5 - }, - "4,11\n\n\n3,14" - ], - [ - { - "y": 1, - "w": 2.25 - }, - "3,0\n\n\n2,1", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,1", - "3,3\n\n\n2,1", - "3,4\n\n\n2,1", - "3,5\n\n\n2,1", - "3,6\n\n\n2,1", - "3,7\n\n\n2,1", - "3,8\n\n\n2,1", - "3,9\n\n\n2,1", - "3,10\n\n\n2,1", - "3,11\n\n\n2,1", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,13\n\n\n2,1", - "4,12\n\n\n2,1" - ], - [ - { - "w": 1.25 - }, - "3,0\n\n\n2,2", - "3,1\n\n\n2,2", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,2", - "3,3\n\n\n2,2", - "3,4\n\n\n2,2", - "3,5\n\n\n2,2", - "3,6\n\n\n2,2", - "3,7\n\n\n2,2", - "3,8\n\n\n2,2", - "3,9\n\n\n2,2", - "3,10\n\n\n2,2", - "3,11\n\n\n2,2", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,13\n\n\n2,2", - "4,12\n\n\n2,2" - ], - [ - "3,0\n\n\n2,3", - { - "w": 1.25 - }, - "3,1\n\n\n2,3", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,3", - "3,3\n\n\n2,3", - "3,4\n\n\n2,3", - "3,5\n\n\n2,3", - "3,6\n\n\n2,3", - "3,7\n\n\n2,3", - "3,8\n\n\n2,3", - "3,9\n\n\n2,3", - "3,10\n\n\n2,3", - "3,11\n\n\n2,3", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,13\n\n\n2,3", - "4,12\n\n\n2,3" - ], - [ - { - "w": 2.25 - }, - "3,0\n\n\n2,4", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,4", - "3,3\n\n\n2,4", - "3,4\n\n\n2,4", - "3,5\n\n\n2,4", - "3,6\n\n\n2,4", - "3,7\n\n\n2,4", - "3,8\n\n\n2,4", - "3,9\n\n\n2,4", - "3,10\n\n\n2,4", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,12\n\n\n2,4", - "3,13\n\n\n2,4", - "4,12\n\n\n2,4" - ], - [ - { - "w": 2.25 - }, - "3,0\n\n\n2,5", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,5", - "3,3\n\n\n2,5", - "3,4\n\n\n2,5", - "3,5\n\n\n2,5", - "3,6\n\n\n2,5", - "3,7\n\n\n2,5", - "3,8\n\n\n2,5", - "3,9\n\n\n2,5", - "3,10\n\n\n2,5", - "3,11\n\n\n2,5", - "3,12\n\n\n2,5", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "4,12\n\n\n2,5" - ], - [ - { - "w": 2 - }, - "3,0\n\n\n2,6", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,6", - "3,3\n\n\n2,6", - "3,4\n\n\n2,6", - "3,5\n\n\n2,6", - "3,6\n\n\n2,6", - "3,7\n\n\n2,6", - "3,8\n\n\n2,6", - "3,9\n\n\n2,6", - "3,10\n\n\n2,6", - "3,11\n\n\n2,6", - "3,12\n\n\n2,6", - { - "c": "#aaaaaa" - }, - "3,13\n\n\n2,6", - "4,12\n\n\n2,6" - ], - [ - "3,0\n\n\n2,7", - { - "c": "#cccccc" - }, - "3,1\n\n\n2,7", - "3,2\n\n\n2,7", - "3,3\n\n\n2,7", - "3,4\n\n\n2,7", - "3,5\n\n\n2,7", - "3,6\n\n\n2,7", - "3,7\n\n\n2,7", - "3,8\n\n\n2,7", - "3,9\n\n\n2,7", - "3,10\n\n\n2,7", - "3,11\n\n\n2,7", - { - "c": "#aaaaaa" - }, - "3,12\n\n\n2,7", - "3,13\n\n\n2,7", - "4,12\n\n\n2,7" - ] -] - - - - } -} \ No newline at end of file From 9fe7bf8ab1307cd1f09ad317393b239182a2967f Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 08:53:37 +0200 Subject: [PATCH 13/78] Delete info.json --- keyboards/4pplet/waffling60_rev_a/info.json | 307 -------------------- 1 file changed, 307 deletions(-) delete mode 100644 keyboards/4pplet/waffling60_rev_a/info.json diff --git a/keyboards/4pplet/waffling60_rev_a/info.json b/keyboards/4pplet/waffling60_rev_a/info.json deleted file mode 100644 index 5e677596e120..000000000000 --- a/keyboards/4pplet/waffling60_rev_a/info.json +++ /dev/null @@ -1,307 +0,0 @@ -{ - "name": "waffling60 Rev A", - "vendorId": "0x4444", - "productId": "0x0003", - "lighting": "qmk_backlight_rgblight", - "matrix": {"rows": 6, "cols": 11}, - "layouts": { - "labels": [ - ["Backspace", "Unified", "Split"], - ["ANSI/ISO", "ANSI", "ISO"], - ["Left Shift", "Unified" , "Split"], - ["Right Shift", "Unified", "Split"], - ["Bottom row", "Standard", "Tsangan","WKL", "Split"] - ], - "keymap": [ - - - - [ - { - "x": 3, - "c": "#aaaaaa" - }, - "0,0", - { - "c": "#cccccc" - }, - "0,1", - "1,1", - "0,2", - "0,3", - "0,4", - "0,5", - "1,5", - "0,6", - "0,7", - "0,8", - "1,8", - "0,9", - { - "c": "#aaaaaa", - "w": 2 - }, - "0,10\n\n\n0,0", - { - "x": 1.5, - "c": "#cccccc" - }, - "0,10\n\n\n0,1", - { - "c": "#aaaaaa" - }, - "1,10\n\n\n0,1" - ], - [ - { - "x": 3, - "w": 1.5 - }, - "1,0", - { - "c": "#cccccc" - }, - "2,1", - "1,2", - "2,2", - "1,3", - "1,4", - "2,5", - "3,5", - "1,6", - "1,7", - "2,8", - "1,9", - "2,9", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "2,10\n\n\n1,0", - { - "x": 2.25, - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, - "2,10\n\n\n1,1" - ], - [ - { - "x": 3, - "w": 1.75 - }, - "2,0", - { - "c": "#cccccc" - }, - "3,1", - "3,2", - "2,3", - "3,3", - "2,4", - "4,5", - "2,6", - "3,6", - "2,7", - "3,8", - "3,9", - { - "c": "#aaaaaa", - "w": 2.25 - }, - "3,10\n\n\n1,0", - { - "x": 1.25, - "c": "#cccccc" - }, - "3,10\n\n\n1,1" - ], - [ - { - "c": "#aaaaaa", - "w": 1.25 - }, - "3,0\n\n\n2,1", - "4,0\n\n\n2,1", - { - "x": 0.75, - "w": 2.25 - }, - "3,0\n\n\n2,0", - { - "c": "#cccccc" - }, - "4,1", - "4,2", - "4,3", - "3,4", - "4,4", - "5,5", - "4,6", - "3,7", - "4,7", - "4,8", - { - "c": "#aaaaaa", - "w": 2.75 - }, - "4,9\n\n\n3,0", - { - "x": 0.75, - "w": 1.75 - }, - "4,9\n\n\n3,1", - "4,10\n\n\n3,1" - ], - [ - { - "x": 3, - "w": 1.25 - }, - "5,0\n\n\n4,0", - { - "w": 1.25 - }, - "5,1\n\n\n4,0", - { - "w": 1.25 - }, - "5,2\n\n\n4,0", - { - "c": "#cccccc", - "w": 6.25 - }, - "5,4\n\n\n4,0", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "5,7\n\n\n4,0", - { - "w": 1.25 - }, - "5,8\n\n\n4,0", - { - "w": 1.25 - }, - "5,9\n\n\n4,0", - { - "w": 1.25 - }, - "5,10\n\n\n4,0" - ], - [ - { - "y": 0.75, - "x": 3, - "w": 1.5 - }, - "5,0\n\n\n4,1", - "5,1\n\n\n4,1", - { - "w": 1.5 - }, - "5,2\n\n\n4,1", - { - "c": "#cccccc", - "w": 7 - }, - "5,4\n\n\n4,1", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "5,8\n\n\n4,1", - "5,9\n\n\n4,1", - { - "w": 1.5 - }, - "5,10\n\n\n4,1" - ], - [ - { - "x": 3, - "w": 1.5 - }, - "5,0\n\n\n4,2", - { - "d": true - }, - "5,1\n\n\n4,2", - { - "w": 1.5 - }, - "5,2\n\n\n4,2", - { - "c": "#cccccc", - "w": 7 - }, - "5,4\n\n\n4,2", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "5,8\n\n\n4,2", - { - "d": true - }, - "5,9\n\n\n4,2", - { - "w": 1.5 - }, - "5,10\n\n\n4,2" - ], - [ - { - "x": 3, - "w": 1.25 - }, - "5,0\n\n\n4,3", - { - "w": 1.25 - }, - "5,1\n\n\n4,3", - { - "w": 1.25 - }, - "5,2\n\n\n4,3", - { - "c": "#cccccc", - "w": 2.25 - }, - "5,3\n\n\n4,3", - { - "w": 1.25 - }, - "5,4\n\n\n4,3", - { - "w": 2.75 - }, - "5,6\n\n\n4,3", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "5,7\n\n\n4,3", - { - "w": 1.25 - }, - "5,8\n\n\n4,3", - { - "w": 1.25 - }, - "5,9\n\n\n4,3", - { - "w": 1.25 - }, - "5,10\n\n\n4,3" - ] - - - -] - } -} \ No newline at end of file From aab47a756a09f03b90ff1e8b3f0ce17fd77de3ec Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 08:54:33 +0200 Subject: [PATCH 14/78] removed VIA_ENABLE --- keyboards/4pplet/aekiso60_rev_a/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/4pplet/aekiso60_rev_a/rules.mk b/keyboards/4pplet/aekiso60_rev_a/rules.mk index 3e9467a27581..6fb46b85e605 100644 --- a/keyboards/4pplet/aekiso60_rev_a/rules.mk +++ b/keyboards/4pplet/aekiso60_rev_a/rules.mk @@ -26,4 +26,3 @@ UNICODE_ENABLE = no # Unicode RAW_ENABLE = yes BACKLIGHT_ENABLE = no RGBLIGHT_ENABLE = no -VIA_ENABLE = yes From 8c04f91c6db3c967a4620cc5dcadd73e34e0480f Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 08:55:09 +0200 Subject: [PATCH 15/78] Update config.h --- keyboards/4pplet/steezy60_rev_a/config.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/4pplet/steezy60_rev_a/config.h b/keyboards/4pplet/steezy60_rev_a/config.h index b8c485f09572..500d44cbac58 100644 --- a/keyboards/4pplet/steezy60_rev_a/config.h +++ b/keyboards/4pplet/steezy60_rev_a/config.h @@ -1,7 +1,3 @@ -#ifndef CONFIG_H -#define CONFIG_H - -// Used Plan60 as template #pragma once #include "config_common.h" From ddb05051b51f9473cc0135b1770dec793cb1411e Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 08:55:33 +0200 Subject: [PATCH 16/78] Update rules.mk --- keyboards/4pplet/steezy60_rev_a/rules.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/4pplet/steezy60_rev_a/rules.mk b/keyboards/4pplet/steezy60_rev_a/rules.mk index 9df6bb56d676..a1b7eb7a11c0 100644 --- a/keyboards/4pplet/steezy60_rev_a/rules.mk +++ b/keyboards/4pplet/steezy60_rev_a/rules.mk @@ -1,4 +1,3 @@ - # MCU name MCU = atmega32u2 @@ -62,4 +61,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RAW_ENABLE = yes BACKLIGHT_ENABLE = no RGBLIGHT_ENABLE = no -VIA_ENABLE = yes \ No newline at end of file +VIA_ENABLE = yes From dad690f67f60727e0864576072722ff0831fd593 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 08:55:54 +0200 Subject: [PATCH 17/78] Update steezy60_rev_a.h --- keyboards/4pplet/steezy60_rev_a/steezy60_rev_a.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/4pplet/steezy60_rev_a/steezy60_rev_a.h b/keyboards/4pplet/steezy60_rev_a/steezy60_rev_a.h index 3b8e3094b03c..b8c3fa6b05a3 100644 --- a/keyboards/4pplet/steezy60_rev_a/steezy60_rev_a.h +++ b/keyboards/4pplet/steezy60_rev_a/steezy60_rev_a.h @@ -16,6 +16,3 @@ {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \ {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d} \ } - -void matrix_init_user(void); -void matrix_scan_user(void); From f4587a184f6e11bd8d4e5e487b0a3716bc7e119f Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 08:56:22 +0200 Subject: [PATCH 18/78] Update config.h --- keyboards/4pplet/waffling60_rev_a/config.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/4pplet/waffling60_rev_a/config.h b/keyboards/4pplet/waffling60_rev_a/config.h index f51dfd98579a..113516fa80bd 100644 --- a/keyboards/4pplet/waffling60_rev_a/config.h +++ b/keyboards/4pplet/waffling60_rev_a/config.h @@ -1,6 +1,3 @@ -#ifndef CONFIG_H -#define CONFIG_H - #pragma once #include "config_common.h" From 82a0f1ab60a7b77cf373a2c25610dc30553cf041 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 08:56:53 +0200 Subject: [PATCH 19/78] Removed VIA_ENABLE --- keyboards/4pplet/waffling60_rev_a/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/4pplet/waffling60_rev_a/rules.mk b/keyboards/4pplet/waffling60_rev_a/rules.mk index 2131ff1911da..9a59f7794742 100644 --- a/keyboards/4pplet/waffling60_rev_a/rules.mk +++ b/keyboards/4pplet/waffling60_rev_a/rules.mk @@ -24,4 +24,3 @@ AUDIO_ENABLE = no UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RAW_ENABLE = no -VIA_ENABLE = yes From c623a2d001faa9af5f7c6271f658a3d3c2ae512a Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 08:58:00 +0200 Subject: [PATCH 20/78] Update keyboards/4pplet/steezy60_rev_a/rules.mk Co-Authored-By: Ryan --- keyboards/4pplet/steezy60_rev_a/rules.mk | 53 ++++-------------------- 1 file changed, 9 insertions(+), 44 deletions(-) diff --git a/keyboards/4pplet/steezy60_rev_a/rules.mk b/keyboards/4pplet/steezy60_rev_a/rules.mk index a1b7eb7a11c0..f2d96edb7e50 100644 --- a/keyboards/4pplet/steezy60_rev_a/rules.mk +++ b/keyboards/4pplet/steezy60_rev_a/rules.mk @@ -1,50 +1,15 @@ # MCU name MCU = atmega32u2 -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - -# Interrupt driven control endpoint task(+60) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT - - -# Boot Section Size in *bytes* -# Teensy halfKay 512 -# Teensy++ halfKay 1024 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -# USBaspLoader 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu # Build Options # comment out to disable the options. From e3192f99e5dbe316e048b68ae1692e267e80cde0 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 08:58:41 +0200 Subject: [PATCH 21/78] Removed VIA_ENABLE --- keyboards/4pplet/steezy60_rev_a/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/4pplet/steezy60_rev_a/rules.mk b/keyboards/4pplet/steezy60_rev_a/rules.mk index f2d96edb7e50..590bd0adeab1 100644 --- a/keyboards/4pplet/steezy60_rev_a/rules.mk +++ b/keyboards/4pplet/steezy60_rev_a/rules.mk @@ -26,4 +26,3 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RAW_ENABLE = yes BACKLIGHT_ENABLE = no RGBLIGHT_ENABLE = no -VIA_ENABLE = yes From 976afaee0485238ef3924f1fc3087cbf2ad93c6a Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 09:15:57 +0200 Subject: [PATCH 22/78] Update config.h --- keyboards/4pplet/aekiso60_rev_a/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/4pplet/aekiso60_rev_a/config.h b/keyboards/4pplet/aekiso60_rev_a/config.h index 9a81885654c8..8197540b2b7d 100644 --- a/keyboards/4pplet/aekiso60_rev_a/config.h +++ b/keyboards/4pplet/aekiso60_rev_a/config.h @@ -43,5 +43,3 @@ #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_ANIMATIONS - -#endif From cc1c93b3112cc07ba54558e2d87e23bda9ac8d67 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 09:16:42 +0200 Subject: [PATCH 23/78] Update config.h --- keyboards/4pplet/steezy60_rev_a/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/4pplet/steezy60_rev_a/config.h b/keyboards/4pplet/steezy60_rev_a/config.h index 500d44cbac58..c552a76d221a 100644 --- a/keyboards/4pplet/steezy60_rev_a/config.h +++ b/keyboards/4pplet/steezy60_rev_a/config.h @@ -40,5 +40,3 @@ #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_ANIMATIONS - -#endif From 65bd3b65e18af697cad00ef22c0ac17fe878e5aa Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 09:17:04 +0200 Subject: [PATCH 24/78] Update config.h --- keyboards/4pplet/waffling60_rev_a/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/4pplet/waffling60_rev_a/config.h b/keyboards/4pplet/waffling60_rev_a/config.h index 113516fa80bd..70c4515730d8 100644 --- a/keyboards/4pplet/waffling60_rev_a/config.h +++ b/keyboards/4pplet/waffling60_rev_a/config.h @@ -34,5 +34,3 @@ #define GRAVE_ESC_ALT_OVERRIDE #define GRAVE_ESC_GUI_OVERRIDE #define GRAVE_ESC_SHIFT_OVERRIDE - -#endif From d6630679c3b7c811c5db9373e7bd240ad1a728b5 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 09:37:28 +0200 Subject: [PATCH 25/78] adding fauxpark suggestion --- keyboards/4pplet/waffling60_rev_a/rules.mk | 28 +++++++++++++--------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/keyboards/4pplet/waffling60_rev_a/rules.mk b/keyboards/4pplet/waffling60_rev_a/rules.mk index 9a59f7794742..ab2de78aa1f3 100644 --- a/keyboards/4pplet/waffling60_rev_a/rules.mk +++ b/keyboards/4pplet/waffling60_rev_a/rules.mk @@ -12,15 +12,21 @@ MCU = atmega32u2 BOOTLOADER = atmel-dfu # Build Options -# comment out to disable the options. +# change yes to no to disable # - -# CONSOLE_ENABLE = yes -MOUSEKEY_ENABLE = no # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -NKRO_ENABLE = no # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -MIDI_ENABLE = no # MIDI controls -AUDIO_ENABLE = no -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RAW_ENABLE = no +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # 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 +MIDI_ENABLE = no # MIDI support +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs From bf665cce232a9710de7cdb14de8d054138ad4456 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 21:20:50 +0200 Subject: [PATCH 26/78] Update keyboards/4pplet/aekiso60_rev_a/config.h Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/4pplet/aekiso60_rev_a/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/4pplet/aekiso60_rev_a/config.h b/keyboards/4pplet/aekiso60_rev_a/config.h index 8197540b2b7d..ebbab1e36d87 100644 --- a/keyboards/4pplet/aekiso60_rev_a/config.h +++ b/keyboards/4pplet/aekiso60_rev_a/config.h @@ -14,7 +14,7 @@ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 // ROWS: Top to bottom, COLS: Left to right -// 0 1 2 3 4 5 6 7 8 9 a b c d +// 0 1 2 3 4 5 6 7 8 9 a b c d #define MATRIX_ROW_PINS {C2,D0,B0,C7,C5} #define MATRIX_COL_PINS {C4,C6,B7,B6,B5,B4,B3,B2,B1,D6,D5,D4,D2,D1} From cf6750c4028ce3dff222759648531ff29cd7dcc5 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 21:26:39 +0200 Subject: [PATCH 27/78] Update keyboards/4pplet/aekiso60_rev_a/rules.mk Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/4pplet/aekiso60_rev_a/rules.mk | 30 ++++++++++++++---------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/keyboards/4pplet/aekiso60_rev_a/rules.mk b/keyboards/4pplet/aekiso60_rev_a/rules.mk index 6fb46b85e605..f0a123479597 100644 --- a/keyboards/4pplet/aekiso60_rev_a/rules.mk +++ b/keyboards/4pplet/aekiso60_rev_a/rules.mk @@ -12,17 +12,21 @@ MCU = atmega32u2 BOOTLOADER = atmel-dfu # Build Options -# comment out to disable the options. +# change yes to no to disable # -# 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) -# COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -MIDI_ENABLE = no # MIDI controls -AUDIO_ENABLE = no -UNICODE_ENABLE = no # Unicode -RAW_ENABLE = yes -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = no +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # 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 +MIDI_ENABLE = no # MIDI support +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs +UNICODE_ENABLE = no # Unicode From 20e4790286959ee20e543752a30f17c8d9b2eb0a Mon Sep 17 00:00:00 2001 From: Stefan <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 21:36:41 +0200 Subject: [PATCH 28/78] some updates recommended by noroadsleft, still work in progress some updates recommended by noroadsleft, still work in progress --- keyboards/4pplet/aekiso60_rev_a/config.h | 6 ---- .../aekiso60_rev_a/keymaps/default/keymap.c | 32 +++++------------ .../aekiso60_rev_a/keymaps/via/keymap.c | 35 +++++++++++++++++++ .../aekiso60_rev_a/keymaps/via/rules.mk | 1 + keyboards/4pplet/steezy60_rev_a/config.h | 6 ---- .../steezy60_rev_a/keymaps/4pplet/keymap.c | 33 +++++++---------- .../steezy60_rev_a/keymaps/default/keymap.c | 32 +++++------------ .../steezy60_rev_a/keymaps/via/keymap.c | 32 +++++++++++++++++ .../steezy60_rev_a/keymaps/via/rules.mk | 1 + keyboards/4pplet/steezy60_rev_a/rules.mk | 30 +++++++++------- keyboards/4pplet/waffling60_rev_a/README.md | 2 +- keyboards/4pplet/waffling60_rev_a/config.h | 5 --- .../waffling60_rev_a/keymaps/default/keymap.c | 32 +++++------------ .../waffling60_rev_a/keymaps/via/keymap.c | 32 +++++++++++++++++ .../waffling60_rev_a/keymaps/via/rules.mk | 1 + keyboards/4pplet/waffling60_rev_a/rules.mk | 4 +-- 16 files changed, 162 insertions(+), 122 deletions(-) create mode 100644 keyboards/4pplet/aekiso60_rev_a/keymaps/via/keymap.c create mode 100644 keyboards/4pplet/aekiso60_rev_a/keymaps/via/rules.mk create mode 100644 keyboards/4pplet/steezy60_rev_a/keymaps/via/keymap.c create mode 100644 keyboards/4pplet/steezy60_rev_a/keymaps/via/rules.mk create mode 100644 keyboards/4pplet/waffling60_rev_a/keymaps/via/keymap.c create mode 100644 keyboards/4pplet/waffling60_rev_a/keymaps/via/rules.mk diff --git a/keyboards/4pplet/aekiso60_rev_a/config.h b/keyboards/4pplet/aekiso60_rev_a/config.h index ebbab1e36d87..d185e4ee016b 100644 --- a/keyboards/4pplet/aekiso60_rev_a/config.h +++ b/keyboards/4pplet/aekiso60_rev_a/config.h @@ -14,7 +14,6 @@ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 // ROWS: Top to bottom, COLS: Left to right -// 0 1 2 3 4 5 6 7 8 9 a b c d #define MATRIX_ROW_PINS {C2,D0,B0,C7,C5} #define MATRIX_COL_PINS {C4,C6,B7,B6,B5,B4,B3,B2,B1,D6,D5,D4,D2,D1} @@ -30,11 +29,6 @@ #define QMK_ESC_OUTPUT C4 // usually COL #define QMK_ESC_INPUT C2 // usually ROW -#define GRAVE_ESC_CTRL_OVERRIDE -#define GRAVE_ESC_ALT_OVERRIDE -#define GRAVE_ESC_GUI_OVERRIDE -#define GRAVE_ESC_SHIFT_OVERRIDE - #define RGB_DI_PIN D3 #define RGBLED_NUM 12 #define BACKLIGHT_LEVELS 5 diff --git a/keyboards/4pplet/aekiso60_rev_a/keymaps/default/keymap.c b/keyboards/4pplet/aekiso60_rev_a/keymaps/default/keymap.c index 4d49f62e3a24..4f3e895a5e1d 100644 --- a/keyboards/4pplet/aekiso60_rev_a/keymaps/default/keymap.c +++ b/keyboards/4pplet/aekiso60_rev_a/keymaps/default/keymap.c @@ -4,32 +4,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, \ - KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, \ - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), \ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, + KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_LCTL, KC_LGUI, KC_LALT, _______, KC_SPC, _______, KC_RALT, KC_RGUI, KC_RCTL), [1] = LAYOUT_all( - KC_EXEC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, \ - _______, KC_BSPC, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, KC_PENT, \ - KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, KC_INS, \ - _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, \ - RESET, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______), - -[2] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______), - -[3] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______) + KC_EXEC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + _______, KC_BSPC, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, KC_PENT, + KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, KC_INS, + _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, + RESET, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______) }; diff --git a/keyboards/4pplet/aekiso60_rev_a/keymaps/via/keymap.c b/keyboards/4pplet/aekiso60_rev_a/keymaps/via/keymap.c new file mode 100644 index 000000000000..4d49f62e3a24 --- /dev/null +++ b/keyboards/4pplet/aekiso60_rev_a/keymaps/via/keymap.c @@ -0,0 +1,35 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + +[0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, \ + KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, \ + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), \ + KC_LCTL, KC_LGUI, KC_LALT, _______, KC_SPC, _______, KC_RALT, KC_RGUI, KC_RCTL), + +[1] = LAYOUT_all( + KC_EXEC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, \ + _______, KC_BSPC, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, KC_PENT, \ + KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, KC_INS, \ + _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, \ + RESET, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______), + +[2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______), + +[3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______) +}; + + diff --git a/keyboards/4pplet/aekiso60_rev_a/keymaps/via/rules.mk b/keyboards/4pplet/aekiso60_rev_a/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/4pplet/aekiso60_rev_a/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/4pplet/steezy60_rev_a/config.h b/keyboards/4pplet/steezy60_rev_a/config.h index c552a76d221a..654454072d41 100644 --- a/keyboards/4pplet/steezy60_rev_a/config.h +++ b/keyboards/4pplet/steezy60_rev_a/config.h @@ -14,7 +14,6 @@ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 // ROWS: Top to bottom, COLS: Left to right - #define MATRIX_ROW_PINS {C2,D0,B0,C7,C5} #define MATRIX_COL_PINS {C4,C6,B7,B6,B5,B4,B3,B2,B1,D6,D5,D4,D2,D1} @@ -27,11 +26,6 @@ #define QMK_ESC_OUTPUT C4 // usually COL #define QMK_ESC_INPUT C2 // usually ROW -#define GRAVE_ESC_CTRL_OVERRIDE -#define GRAVE_ESC_ALT_OVERRIDE -#define GRAVE_ESC_GUI_OVERRIDE -#define GRAVE_ESC_SHIFT_OVERRIDE - #define RGB_DI_PIN D3 #define RGBLED_NUM 12 #define BACKLIGHT_LEVELS 5 diff --git a/keyboards/4pplet/steezy60_rev_a/keymaps/4pplet/keymap.c b/keyboards/4pplet/steezy60_rev_a/keymaps/4pplet/keymap.c index 26649208e7d6..67820f2ac0be 100644 --- a/keyboards/4pplet/steezy60_rev_a/keymaps/4pplet/keymap.c +++ b/keyboards/4pplet/steezy60_rev_a/keymaps/4pplet/keymap.c @@ -3,32 +3,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( - KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS,KC_GRV, \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ - KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, \ - KC_LSPO, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSPC, MO(2), \ + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS,KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, + KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSPO, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSPC, MO(2), KC_LCTL, KC_LGUI, KC_NO, KC_LALT, KC_RALT, MO(2), KC_SPC, KC_RALT, KC_RGUI, KC_NO, KC_APP, KC_RCTRL), [1] = LAYOUT_all( - KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS,KC_GRV, \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ - KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, \ - KC_LSPO, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSPC, MO(2), \ + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS,KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, + KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, + KC_LSPO, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSPC, MO(2), KC_LCTL, KC_LGUI, KC_NO, KC_LALT, KC_RALT, MO(2), KC_SPC, KC_RALT, KC_RGUI, KC_NO, KC_APP, KC_RCTRL), [2] = LAYOUT_all( - KC_EXEC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, _______, \ - _______, KC_BSPC, KC_UP, KC_ENT, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, KC_DEL, \ - KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, KC_PENT, \ - _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,\ - DF(1), DF(0), _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, RESET ), - -[3] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) + KC_EXEC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, _______, + _______, KC_BSPC, KC_UP, KC_ENT, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, KC_DEL, + KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, KC_PENT, + _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______, + DF(1), DF(0), _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, RESET ) }; diff --git a/keyboards/4pplet/steezy60_rev_a/keymaps/default/keymap.c b/keyboards/4pplet/steezy60_rev_a/keymaps/default/keymap.c index f1655c5bdb8f..6a922b0f3e0c 100644 --- a/keyboards/4pplet/steezy60_rev_a/keymaps/default/keymap.c +++ b/keyboards/4pplet/steezy60_rev_a/keymaps/default/keymap.c @@ -3,30 +3,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC,\ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ - KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, \ - KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSFT, KC_NO, \ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, + KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSFT, KC_NO, KC_LCTL, KC_LGUI, KC_NO, KC_LALT, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_RGUI, KC_NO, KC_APP, MO(1)), [1] = LAYOUT_all( - RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, \ - _______, KC_BSPC, KC_UP, KC_ENT, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______, \ - KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, _______, \ - _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,\ - _______, _______, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, _______ ), - -[2] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - -[3] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) + RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, + _______, KC_BSPC, KC_UP, KC_ENT, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______, + KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, _______, + _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, _______ ) }; \ No newline at end of file diff --git a/keyboards/4pplet/steezy60_rev_a/keymaps/via/keymap.c b/keyboards/4pplet/steezy60_rev_a/keymaps/via/keymap.c new file mode 100644 index 000000000000..603d85771da9 --- /dev/null +++ b/keyboards/4pplet/steezy60_rev_a/keymaps/via/keymap.c @@ -0,0 +1,32 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, + KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSFT, KC_NO, + KC_LCTL, KC_LGUI, KC_NO, KC_LALT, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_RGUI, KC_NO, KC_APP, MO(1)), + +[1] = LAYOUT_all( + RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, + _______, KC_BSPC, KC_UP, KC_ENT, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______, + KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, _______, + _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, _______ ), + +[2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), + +[3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) +}; \ No newline at end of file diff --git a/keyboards/4pplet/steezy60_rev_a/keymaps/via/rules.mk b/keyboards/4pplet/steezy60_rev_a/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/4pplet/steezy60_rev_a/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/4pplet/steezy60_rev_a/rules.mk b/keyboards/4pplet/steezy60_rev_a/rules.mk index 590bd0adeab1..f0a123479597 100644 --- a/keyboards/4pplet/steezy60_rev_a/rules.mk +++ b/keyboards/4pplet/steezy60_rev_a/rules.mk @@ -12,17 +12,21 @@ MCU = atmega32u2 BOOTLOADER = atmel-dfu # Build Options -# comment out to disable the options. +# change yes to no to disable # -MOUSEKEY_ENABLE = no # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = no # Console for debug(+400) -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -MIDI_ENABLE = no # MIDI controls -AUDIO_ENABLE = no -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RAW_ENABLE = yes -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = no +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # 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 +MIDI_ENABLE = no # MIDI support +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs +UNICODE_ENABLE = no # Unicode diff --git a/keyboards/4pplet/waffling60_rev_a/README.md b/keyboards/4pplet/waffling60_rev_a/README.md index 888baffddcc0..737c517fb58d 100644 --- a/keyboards/4pplet/waffling60_rev_a/README.md +++ b/keyboards/4pplet/waffling60_rev_a/README.md @@ -1,4 +1,4 @@ -# Steezy60 +# waffling60 A 60% PCB for MX switches, one hot swap and one solder-pcb version with decent layout support. diff --git a/keyboards/4pplet/waffling60_rev_a/config.h b/keyboards/4pplet/waffling60_rev_a/config.h index 70c4515730d8..d232d3e70a76 100644 --- a/keyboards/4pplet/waffling60_rev_a/config.h +++ b/keyboards/4pplet/waffling60_rev_a/config.h @@ -29,8 +29,3 @@ #define QMK_ESC_OUTPUT D3 // usually COL #define QMK_ESC_INPUT D4 // usually ROW - -#define GRAVE_ESC_CTRL_OVERRIDE -#define GRAVE_ESC_ALT_OVERRIDE -#define GRAVE_ESC_GUI_OVERRIDE -#define GRAVE_ESC_SHIFT_OVERRIDE diff --git a/keyboards/4pplet/waffling60_rev_a/keymaps/default/keymap.c b/keyboards/4pplet/waffling60_rev_a/keymaps/default/keymap.c index 105f6a0c81ef..01e006a7d161 100644 --- a/keyboards/4pplet/waffling60_rev_a/keymaps/default/keymap.c +++ b/keyboards/4pplet/waffling60_rev_a/keymaps/default/keymap.c @@ -3,30 +3,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // main layer [_BASE1] = LAYOUT_all( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC, \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ - KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ - KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, \ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, MO(_FN1)), // basic function layer [_FN1] = LAYOUT_all( - RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), -// extra layer for VIA -[_BASE2] = LAYOUT_all( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), -// extra layer for VIA -[_FN2] = LAYOUT_all( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) + RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/4pplet/waffling60_rev_a/keymaps/via/keymap.c b/keyboards/4pplet/waffling60_rev_a/keymaps/via/keymap.c new file mode 100644 index 000000000000..49263f9c0f9f --- /dev/null +++ b/keyboards/4pplet/waffling60_rev_a/keymaps/via/keymap.c @@ -0,0 +1,32 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +// main layer +[_BASE1] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, MO(_FN1)), +// basic function layer +[_FN1] = LAYOUT_all( + RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), +// extra layer for VIA +[_BASE2] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), +// extra layer for VIA +[_FN2] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) +}; diff --git a/keyboards/4pplet/waffling60_rev_a/keymaps/via/rules.mk b/keyboards/4pplet/waffling60_rev_a/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/4pplet/waffling60_rev_a/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/4pplet/waffling60_rev_a/rules.mk b/keyboards/4pplet/waffling60_rev_a/rules.mk index ab2de78aa1f3..f0a123479597 100644 --- a/keyboards/4pplet/waffling60_rev_a/rules.mk +++ b/keyboards/4pplet/waffling60_rev_a/rules.mk @@ -22,11 +22,11 @@ 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 +NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow MIDI_ENABLE = no # MIDI support -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE = no # Audio output on port C6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches HD44780_ENABLE = no # Enable support for HD44780 based LCDs +UNICODE_ENABLE = no # Unicode From 9832d66156393c12ed77255ae487b54414804d50 Mon Sep 17 00:00:00 2001 From: Stefan <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 22:12:33 +0200 Subject: [PATCH 29/78] made directorys for revisions per noroadsleft suggestion made directorys for revisions per noroadsleft suggestion --- keyboards/4pplet/{aekiso60_rev_a => aekiso60}/README.md | 2 +- .../{aekiso60_rev_a => aekiso60}/keymaps/default/keymap.c | 0 .../4pplet/{aekiso60_rev_a => aekiso60}/keymaps/via/keymap.c | 0 .../4pplet/{aekiso60_rev_a => aekiso60}/keymaps/via/rules.mk | 0 keyboards/4pplet/{aekiso60_rev_a => aekiso60/rev_a}/config.h | 0 keyboards/4pplet/aekiso60/rev_a/rev_a.c | 1 + .../{aekiso60_rev_a/aekiso60_rev_a.h => aekiso60/rev_a/rev_a.h} | 0 keyboards/4pplet/{aekiso60_rev_a => aekiso60/rev_a}/rules.mk | 0 keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.c | 1 - keyboards/4pplet/{steezy60_rev_a => steezy60}/README.md | 2 +- .../4pplet/{steezy60_rev_a => steezy60}/keymaps/4pplet/keymap.c | 0 .../{steezy60_rev_a => steezy60}/keymaps/default/keymap.c | 0 .../4pplet/{steezy60_rev_a => steezy60}/keymaps/via/keymap.c | 0 .../4pplet/{steezy60_rev_a => steezy60}/keymaps/via/rules.mk | 0 keyboards/4pplet/{steezy60_rev_a => steezy60/rev_a}/config.h | 0 keyboards/4pplet/steezy60/rev_a/rev_a.c | 1 + .../{steezy60_rev_a/steezy60_rev_a.h => steezy60/rev_a/rev_a.h} | 0 keyboards/4pplet/{steezy60_rev_a => steezy60/rev_a}/rules.mk | 0 keyboards/4pplet/steezy60_rev_a/steezy60_rev_a.c | 1 - keyboards/4pplet/{waffling60_rev_a => waffling60}/README.md | 2 +- .../{waffling60_rev_a => waffling60}/keymaps/default/keymap.c | 0 .../{waffling60_rev_a => waffling60}/keymaps/via/keymap.c | 0 .../{waffling60_rev_a => waffling60}/keymaps/via/rules.mk | 0 .../4pplet/{waffling60_rev_a => waffling60/rev_a}/config.h | 0 .../waffling60_rev_a.c => waffling60/rev_a/rev_a.c} | 2 +- .../waffling60_rev_a.h => waffling60/rev_a/rev_a.h} | 0 .../4pplet/{waffling60_rev_a => waffling60/rev_a}/rules.mk | 0 27 files changed, 6 insertions(+), 6 deletions(-) rename keyboards/4pplet/{aekiso60_rev_a => aekiso60}/README.md (93%) rename keyboards/4pplet/{aekiso60_rev_a => aekiso60}/keymaps/default/keymap.c (100%) rename keyboards/4pplet/{aekiso60_rev_a => aekiso60}/keymaps/via/keymap.c (100%) rename keyboards/4pplet/{aekiso60_rev_a => aekiso60}/keymaps/via/rules.mk (100%) rename keyboards/4pplet/{aekiso60_rev_a => aekiso60/rev_a}/config.h (100%) create mode 100644 keyboards/4pplet/aekiso60/rev_a/rev_a.c rename keyboards/4pplet/{aekiso60_rev_a/aekiso60_rev_a.h => aekiso60/rev_a/rev_a.h} (100%) rename keyboards/4pplet/{aekiso60_rev_a => aekiso60/rev_a}/rules.mk (100%) delete mode 100644 keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.c rename keyboards/4pplet/{steezy60_rev_a => steezy60}/README.md (93%) rename keyboards/4pplet/{steezy60_rev_a => steezy60}/keymaps/4pplet/keymap.c (100%) rename keyboards/4pplet/{steezy60_rev_a => steezy60}/keymaps/default/keymap.c (100%) rename keyboards/4pplet/{steezy60_rev_a => steezy60}/keymaps/via/keymap.c (100%) rename keyboards/4pplet/{steezy60_rev_a => steezy60}/keymaps/via/rules.mk (100%) rename keyboards/4pplet/{steezy60_rev_a => steezy60/rev_a}/config.h (100%) create mode 100644 keyboards/4pplet/steezy60/rev_a/rev_a.c rename keyboards/4pplet/{steezy60_rev_a/steezy60_rev_a.h => steezy60/rev_a/rev_a.h} (100%) rename keyboards/4pplet/{steezy60_rev_a => steezy60/rev_a}/rules.mk (100%) delete mode 100644 keyboards/4pplet/steezy60_rev_a/steezy60_rev_a.c rename keyboards/4pplet/{waffling60_rev_a => waffling60}/README.md (94%) rename keyboards/4pplet/{waffling60_rev_a => waffling60}/keymaps/default/keymap.c (100%) rename keyboards/4pplet/{waffling60_rev_a => waffling60}/keymaps/via/keymap.c (100%) rename keyboards/4pplet/{waffling60_rev_a => waffling60}/keymaps/via/rules.mk (100%) rename keyboards/4pplet/{waffling60_rev_a => waffling60/rev_a}/config.h (100%) rename keyboards/4pplet/{waffling60_rev_a/waffling60_rev_a.c => waffling60/rev_a/rev_a.c} (98%) rename keyboards/4pplet/{waffling60_rev_a/waffling60_rev_a.h => waffling60/rev_a/rev_a.h} (100%) rename keyboards/4pplet/{waffling60_rev_a => waffling60/rev_a}/rules.mk (100%) diff --git a/keyboards/4pplet/aekiso60_rev_a/README.md b/keyboards/4pplet/aekiso60/README.md similarity index 93% rename from keyboards/4pplet/aekiso60_rev_a/README.md rename to keyboards/4pplet/aekiso60/README.md index da8b0dcc1147..42c3d3421d28 100644 --- a/keyboards/4pplet/aekiso60_rev_a/README.md +++ b/keyboards/4pplet/aekiso60/README.md @@ -9,6 +9,6 @@ More info: https://geekhack.org/index.php?topic=103627.0 Make example for this keyboard (after setting up your build environment): - make 4pplet/aekiso60_rev_a:default + make 4pplet/aekiso60/rev_a:default 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). \ No newline at end of file diff --git a/keyboards/4pplet/aekiso60_rev_a/keymaps/default/keymap.c b/keyboards/4pplet/aekiso60/keymaps/default/keymap.c similarity index 100% rename from keyboards/4pplet/aekiso60_rev_a/keymaps/default/keymap.c rename to keyboards/4pplet/aekiso60/keymaps/default/keymap.c diff --git a/keyboards/4pplet/aekiso60_rev_a/keymaps/via/keymap.c b/keyboards/4pplet/aekiso60/keymaps/via/keymap.c similarity index 100% rename from keyboards/4pplet/aekiso60_rev_a/keymaps/via/keymap.c rename to keyboards/4pplet/aekiso60/keymaps/via/keymap.c diff --git a/keyboards/4pplet/aekiso60_rev_a/keymaps/via/rules.mk b/keyboards/4pplet/aekiso60/keymaps/via/rules.mk similarity index 100% rename from keyboards/4pplet/aekiso60_rev_a/keymaps/via/rules.mk rename to keyboards/4pplet/aekiso60/keymaps/via/rules.mk diff --git a/keyboards/4pplet/aekiso60_rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h similarity index 100% rename from keyboards/4pplet/aekiso60_rev_a/config.h rename to keyboards/4pplet/aekiso60/rev_a/config.h diff --git a/keyboards/4pplet/aekiso60/rev_a/rev_a.c b/keyboards/4pplet/aekiso60/rev_a/rev_a.c new file mode 100644 index 000000000000..d3db08ad193b --- /dev/null +++ b/keyboards/4pplet/aekiso60/rev_a/rev_a.c @@ -0,0 +1 @@ +#include "rev_a.h" diff --git a/keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.h b/keyboards/4pplet/aekiso60/rev_a/rev_a.h similarity index 100% rename from keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.h rename to keyboards/4pplet/aekiso60/rev_a/rev_a.h diff --git a/keyboards/4pplet/aekiso60_rev_a/rules.mk b/keyboards/4pplet/aekiso60/rev_a/rules.mk similarity index 100% rename from keyboards/4pplet/aekiso60_rev_a/rules.mk rename to keyboards/4pplet/aekiso60/rev_a/rules.mk diff --git a/keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.c b/keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.c deleted file mode 100644 index 02f598ee76ab..000000000000 --- a/keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.c +++ /dev/null @@ -1 +0,0 @@ -#include "aekiso60_rev_a.h" diff --git a/keyboards/4pplet/steezy60_rev_a/README.md b/keyboards/4pplet/steezy60/README.md similarity index 93% rename from keyboards/4pplet/steezy60_rev_a/README.md rename to keyboards/4pplet/steezy60/README.md index 80a9474dd0ce..34245b84ef6b 100644 --- a/keyboards/4pplet/steezy60_rev_a/README.md +++ b/keyboards/4pplet/steezy60/README.md @@ -9,6 +9,6 @@ More info: https://geekhack.org/index.php?topic=103531.0 Make example for this keyboard (after setting up your build environment): - make 4pplet/steezy60_rev_a:default + make 4pplet/steezy60/rev_a:default 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). \ No newline at end of file diff --git a/keyboards/4pplet/steezy60_rev_a/keymaps/4pplet/keymap.c b/keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c similarity index 100% rename from keyboards/4pplet/steezy60_rev_a/keymaps/4pplet/keymap.c rename to keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c diff --git a/keyboards/4pplet/steezy60_rev_a/keymaps/default/keymap.c b/keyboards/4pplet/steezy60/keymaps/default/keymap.c similarity index 100% rename from keyboards/4pplet/steezy60_rev_a/keymaps/default/keymap.c rename to keyboards/4pplet/steezy60/keymaps/default/keymap.c diff --git a/keyboards/4pplet/steezy60_rev_a/keymaps/via/keymap.c b/keyboards/4pplet/steezy60/keymaps/via/keymap.c similarity index 100% rename from keyboards/4pplet/steezy60_rev_a/keymaps/via/keymap.c rename to keyboards/4pplet/steezy60/keymaps/via/keymap.c diff --git a/keyboards/4pplet/steezy60_rev_a/keymaps/via/rules.mk b/keyboards/4pplet/steezy60/keymaps/via/rules.mk similarity index 100% rename from keyboards/4pplet/steezy60_rev_a/keymaps/via/rules.mk rename to keyboards/4pplet/steezy60/keymaps/via/rules.mk diff --git a/keyboards/4pplet/steezy60_rev_a/config.h b/keyboards/4pplet/steezy60/rev_a/config.h similarity index 100% rename from keyboards/4pplet/steezy60_rev_a/config.h rename to keyboards/4pplet/steezy60/rev_a/config.h diff --git a/keyboards/4pplet/steezy60/rev_a/rev_a.c b/keyboards/4pplet/steezy60/rev_a/rev_a.c new file mode 100644 index 000000000000..d3db08ad193b --- /dev/null +++ b/keyboards/4pplet/steezy60/rev_a/rev_a.c @@ -0,0 +1 @@ +#include "rev_a.h" diff --git a/keyboards/4pplet/steezy60_rev_a/steezy60_rev_a.h b/keyboards/4pplet/steezy60/rev_a/rev_a.h similarity index 100% rename from keyboards/4pplet/steezy60_rev_a/steezy60_rev_a.h rename to keyboards/4pplet/steezy60/rev_a/rev_a.h diff --git a/keyboards/4pplet/steezy60_rev_a/rules.mk b/keyboards/4pplet/steezy60/rev_a/rules.mk similarity index 100% rename from keyboards/4pplet/steezy60_rev_a/rules.mk rename to keyboards/4pplet/steezy60/rev_a/rules.mk diff --git a/keyboards/4pplet/steezy60_rev_a/steezy60_rev_a.c b/keyboards/4pplet/steezy60_rev_a/steezy60_rev_a.c deleted file mode 100644 index ee498809a8cb..000000000000 --- a/keyboards/4pplet/steezy60_rev_a/steezy60_rev_a.c +++ /dev/null @@ -1 +0,0 @@ -#include "steezy60_rev_a.h" diff --git a/keyboards/4pplet/waffling60_rev_a/README.md b/keyboards/4pplet/waffling60/README.md similarity index 94% rename from keyboards/4pplet/waffling60_rev_a/README.md rename to keyboards/4pplet/waffling60/README.md index 737c517fb58d..6c333a5607b0 100644 --- a/keyboards/4pplet/waffling60_rev_a/README.md +++ b/keyboards/4pplet/waffling60/README.md @@ -9,6 +9,6 @@ More info: https://geekhack.org/index.php?topic=103531.0 Make example for this keyboard (after setting up your build environment): - make 4pplet/steezy60_rev_a:default + make 4pplet/steezy60/rev_a:default 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). \ No newline at end of file diff --git a/keyboards/4pplet/waffling60_rev_a/keymaps/default/keymap.c b/keyboards/4pplet/waffling60/keymaps/default/keymap.c similarity index 100% rename from keyboards/4pplet/waffling60_rev_a/keymaps/default/keymap.c rename to keyboards/4pplet/waffling60/keymaps/default/keymap.c diff --git a/keyboards/4pplet/waffling60_rev_a/keymaps/via/keymap.c b/keyboards/4pplet/waffling60/keymaps/via/keymap.c similarity index 100% rename from keyboards/4pplet/waffling60_rev_a/keymaps/via/keymap.c rename to keyboards/4pplet/waffling60/keymaps/via/keymap.c diff --git a/keyboards/4pplet/waffling60_rev_a/keymaps/via/rules.mk b/keyboards/4pplet/waffling60/keymaps/via/rules.mk similarity index 100% rename from keyboards/4pplet/waffling60_rev_a/keymaps/via/rules.mk rename to keyboards/4pplet/waffling60/keymaps/via/rules.mk diff --git a/keyboards/4pplet/waffling60_rev_a/config.h b/keyboards/4pplet/waffling60/rev_a/config.h similarity index 100% rename from keyboards/4pplet/waffling60_rev_a/config.h rename to keyboards/4pplet/waffling60/rev_a/config.h diff --git a/keyboards/4pplet/waffling60_rev_a/waffling60_rev_a.c b/keyboards/4pplet/waffling60/rev_a/rev_a.c similarity index 98% rename from keyboards/4pplet/waffling60_rev_a/waffling60_rev_a.c rename to keyboards/4pplet/waffling60/rev_a/rev_a.c index a9d6f436422c..fe8496a5d45b 100644 --- a/keyboards/4pplet/waffling60_rev_a/waffling60_rev_a.c +++ b/keyboards/4pplet/waffling60/rev_a/rev_a.c @@ -1,4 +1,4 @@ -#include "waffling60_rev_a.h" +#include "rev_a.h" void keyboard_pre_init_user(void) { // Call the keyboard pre init code. diff --git a/keyboards/4pplet/waffling60_rev_a/waffling60_rev_a.h b/keyboards/4pplet/waffling60/rev_a/rev_a.h similarity index 100% rename from keyboards/4pplet/waffling60_rev_a/waffling60_rev_a.h rename to keyboards/4pplet/waffling60/rev_a/rev_a.h diff --git a/keyboards/4pplet/waffling60_rev_a/rules.mk b/keyboards/4pplet/waffling60/rev_a/rules.mk similarity index 100% rename from keyboards/4pplet/waffling60_rev_a/rules.mk rename to keyboards/4pplet/waffling60/rev_a/rules.mk From a4e6fd0d4fcc9e244a1bd533f984afcbe6df5633 Mon Sep 17 00:00:00 2001 From: Stefan <4pplet@protonmail.com> Date: Mon, 27 Apr 2020 23:05:32 +0200 Subject: [PATCH 30/78] renamed keyboard_pre_init_user to keyboard_pre_init_kb --- keyboards/4pplet/waffling60/rev_a/rev_a.c | 4 ++-- keyboards/4pplet/waffling60/rev_a/rev_a.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/4pplet/waffling60/rev_a/rev_a.c b/keyboards/4pplet/waffling60/rev_a/rev_a.c index fe8496a5d45b..653bd6bf32c2 100644 --- a/keyboards/4pplet/waffling60/rev_a/rev_a.c +++ b/keyboards/4pplet/waffling60/rev_a/rev_a.c @@ -1,6 +1,6 @@ #include "rev_a.h" -void keyboard_pre_init_user(void) { +void keyboard_pre_init_kb(void) { // Call the keyboard pre init code. init_led(); } @@ -33,7 +33,7 @@ and return false when you would prefer not to run the code in led_update_kb(). return false; } -layer_state_t layer_state_set_user(layer_state_t state) { // just to illustrate, make changes if needed +layer_state_t layer_state_set_kb(layer_state_t state) { // just to illustrate, make changes if needed if(LAYER_INDICATOR){ switch (get_highest_layer(state)) { case _FN1: diff --git a/keyboards/4pplet/waffling60/rev_a/rev_a.h b/keyboards/4pplet/waffling60/rev_a/rev_a.h index 2be094ae55ff..ca596fa52887 100644 --- a/keyboards/4pplet/waffling60/rev_a/rev_a.h +++ b/keyboards/4pplet/waffling60/rev_a/rev_a.h @@ -25,7 +25,7 @@ bool led_update_kb(led_t led_state); bool led_update_user(led_t led_state); -void keyboard_pre_init_user(void); +void keyboard_pre_init_kb(void); void led_set_color(uint8_t r, uint8_t g, uint8_t b); void init_led(void); uint16_t cie_lightness(uint16_t v); From 2219afcf4ed7ed590103e7f5f99cf3feb6f3d575 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Wed, 29 Apr 2020 09:44:13 +0200 Subject: [PATCH 31/78] Update keyboards/4pplet/aekiso60/rev_a/config.h Co-Authored-By: Drashna Jaelre --- keyboards/4pplet/aekiso60/rev_a/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h index d185e4ee016b..7505bcf7b9d2 100644 --- a/keyboards/4pplet/aekiso60/rev_a/config.h +++ b/keyboards/4pplet/aekiso60/rev_a/config.h @@ -26,8 +26,8 @@ /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 -#define QMK_ESC_OUTPUT C4 // usually COL -#define QMK_ESC_INPUT C2 // usually ROW +#define QMK_ESC_OUTPUT C4 // usually COL +#define QMK_ESC_INPUT C2 // usually ROW #define RGB_DI_PIN D3 #define RGBLED_NUM 12 From 037721256a833cb015f19863c705604d446fdd1c Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Wed, 29 Apr 2020 09:44:26 +0200 Subject: [PATCH 32/78] Update keyboards/4pplet/waffling60/rev_a/rev_a.c Co-Authored-By: Drashna Jaelre --- keyboards/4pplet/waffling60/rev_a/rev_a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/4pplet/waffling60/rev_a/rev_a.c b/keyboards/4pplet/waffling60/rev_a/rev_a.c index 653bd6bf32c2..851571260f6c 100644 --- a/keyboards/4pplet/waffling60/rev_a/rev_a.c +++ b/keyboards/4pplet/waffling60/rev_a/rev_a.c @@ -52,7 +52,7 @@ layer_state_t layer_state_set_kb(layer_state_t state) { // just to illustrate, m bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); - if(res) { + if(res && LOCK_INDICATORS) { // do not indicate multiple lock statuses in current implementation, // sorted by most likely first (if capslock is on, it will be purple, regardless of numlock state) if(led_state.caps_lock) From 12f150d2589f66162fb21f5f1f6a1dde32a3e219 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Wed, 29 Apr 2020 09:44:58 +0200 Subject: [PATCH 33/78] Update keyboards/4pplet/waffling60/rev_a/rev_a.c Co-Authored-By: Drashna Jaelre --- keyboards/4pplet/waffling60/rev_a/rev_a.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/keyboards/4pplet/waffling60/rev_a/rev_a.c b/keyboards/4pplet/waffling60/rev_a/rev_a.c index 851571260f6c..c4ad0ec70499 100644 --- a/keyboards/4pplet/waffling60/rev_a/rev_a.c +++ b/keyboards/4pplet/waffling60/rev_a/rev_a.c @@ -22,16 +22,6 @@ void init_led(void){ setPinOutput(C6); } -bool led_update_user(led_t led_state) { -/* -By convention, return true from led_update_user() to get the led_update_kb() hook to run its code, -and return false when you would prefer not to run the code in led_update_kb(). -*/ - if(LOCK_INDICATORS) - return true; - else - return false; -} layer_state_t layer_state_set_kb(layer_state_t state) { // just to illustrate, make changes if needed if(LAYER_INDICATOR){ From f4a7a188ad98d446a1b4fbc46656cf18434fdb0d Mon Sep 17 00:00:00 2001 From: Stefan <4pplet@protonmail.com> Date: Thu, 7 May 2020 21:57:25 +0200 Subject: [PATCH 34/78] started working on refactoring led function for waffling60 --- keyboards/4pplet/waffling60/rev_a/config.h | 2 ++ keyboards/4pplet/waffling60/rev_a/led.c | 26 ++++++++++++++++++++++ keyboards/4pplet/waffling60/rev_a/led.h | 7 ++++++ keyboards/4pplet/waffling60/rev_a/rev_a.c | 7 +++--- keyboards/4pplet/waffling60/rev_a/rev_a.h | 6 +++-- keyboards/4pplet/waffling60/rev_a/rules.mk | 6 ++++- keyboards/wilba_tech/zeal60/rules.mk | 2 +- 7 files changed, 49 insertions(+), 7 deletions(-) create mode 100644 keyboards/4pplet/waffling60/rev_a/led.c create mode 100644 keyboards/4pplet/waffling60/rev_a/led.h diff --git a/keyboards/4pplet/waffling60/rev_a/config.h b/keyboards/4pplet/waffling60/rev_a/config.h index d232d3e70a76..dd7a3ad25ebe 100644 --- a/keyboards/4pplet/waffling60/rev_a/config.h +++ b/keyboards/4pplet/waffling60/rev_a/config.h @@ -24,6 +24,8 @@ /* define if matrix has ghost */ //#define MATRIX_HAS_GHOST +#define RGBLED_NUM 1 + /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 0 diff --git a/keyboards/4pplet/waffling60/rev_a/led.c b/keyboards/4pplet/waffling60/rev_a/led.c new file mode 100644 index 000000000000..73b02b357166 --- /dev/null +++ b/keyboards/4pplet/waffling60/rev_a/led.c @@ -0,0 +1,26 @@ + +#include "rgblight.h" +#include "led.h" +extern rgblight_config_t rgblight_config; // Declared in rgblight.c + +#ifdef RGBLIGHT_ENABLE + const uint8_t backlight_pwm_map[BACKLIGHT_LEVELS] = BACKLIGHT_PWM_MAP; +#endif + +#ifdef RGBLIGHT_ENABLE + +//extern rgblight_config_t rgblight_config; + +void rgblight_set(void) { + +} +/* +void rgblight_disable(void) { + +} +*/ +void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b){ + +} + +#endif // RGBLIGHT_ENABLE diff --git a/keyboards/4pplet/waffling60/rev_a/led.h b/keyboards/4pplet/waffling60/rev_a/led.h new file mode 100644 index 000000000000..6319021a84f3 --- /dev/null +++ b/keyboards/4pplet/waffling60/rev_a/led.h @@ -0,0 +1,7 @@ +#ifndef LIGHTING_H +#define LIGHTING_H + +void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b); +void rgblight_set(void); + +#endif \ No newline at end of file diff --git a/keyboards/4pplet/waffling60/rev_a/rev_a.c b/keyboards/4pplet/waffling60/rev_a/rev_a.c index c4ad0ec70499..cf4582f8d2cb 100644 --- a/keyboards/4pplet/waffling60/rev_a/rev_a.c +++ b/keyboards/4pplet/waffling60/rev_a/rev_a.c @@ -1,4 +1,5 @@ #include "rev_a.h" +#include "led.h" void keyboard_pre_init_kb(void) { // Call the keyboard pre init code. @@ -13,7 +14,7 @@ void init_led(void){ // define end of timer ICR1 = TIMER_TOP; // default set to lowest, will not toggle - led_set_color(RGB_OFF); + led_set_color(RGB_YELLOW); brightness_level = DEFAULT_BRIGHTNESS_LEVEL; // Set our LED pins as output @@ -33,7 +34,7 @@ layer_state_t layer_state_set_kb(layer_state_t state) { // just to illustrate, m led_set_color(RGB_ORANGE); break; default: - led_set_color(RGB_OFF); + led_set_color(RGB_YELLOW); break; } } @@ -56,7 +57,7 @@ bool led_update_kb(led_t led_state) { else if(led_state.kana) led_set_color(RGB_YELLOW); else - led_set_color(RGB_OFF); + led_set_color(RGB_YELLOW); } return res; } diff --git a/keyboards/4pplet/waffling60/rev_a/rev_a.h b/keyboards/4pplet/waffling60/rev_a/rev_a.h index ca596fa52887..2f59a9412f50 100644 --- a/keyboards/4pplet/waffling60/rev_a/rev_a.h +++ b/keyboards/4pplet/waffling60/rev_a/rev_a.h @@ -1,7 +1,7 @@ #pragma once #include "quantum.h" - +/* #define RGB_OFF 0,0,0 #define RGB_WHITE 255, 255, 255 #define RGB_RED 255, 0, 0 @@ -12,7 +12,7 @@ #define RGB_BLUE 0, 0, 255 #define RGB_PURPLE 255, 0, 255 #define RGB_PINK 255, 20, 20 - +*/ // set LOCK_INDICATORS to false if not used or if leds are used for custom function // do not use both, lock indicators will override layer indicator. #define LOCK_INDICATORS false // indicate capslock, scroll lock etc with rgb led @@ -21,6 +21,8 @@ #define BRIGHTNESS_LEVELS 10 #define DEFAULT_BRIGHTNESS_LEVEL 5 +#define RGBLED_NUM 1 + #define TIMER_TOP 0xFFFFU bool led_update_kb(led_t led_state); diff --git a/keyboards/4pplet/waffling60/rev_a/rules.mk b/keyboards/4pplet/waffling60/rev_a/rules.mk index f0a123479597..0db7f3b41aee 100644 --- a/keyboards/4pplet/waffling60/rev_a/rules.mk +++ b/keyboards/4pplet/waffling60/rev_a/rules.mk @@ -24,9 +24,13 @@ 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 +#RGBLIGHT_ENABLE = custom # Enable keyboard RGB underglow MIDI_ENABLE = no # MIDI support AUDIO_ENABLE = no # Audio output on port C6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches HD44780_ENABLE = no # Enable support for HD44780 based LCDs UNICODE_ENABLE = no # Unicode +RGBLIGHT_CUSTOM_DRIVER = yes +RGBLIGHT_ENABLE = yes + +#SRC += lightning.c \ No newline at end of file diff --git a/keyboards/wilba_tech/zeal60/rules.mk b/keyboards/wilba_tech/zeal60/rules.mk index 31c960c22ee8..d49aba3e40ae 100644 --- a/keyboards/wilba_tech/zeal60/rules.mk +++ b/keyboards/wilba_tech/zeal60/rules.mk @@ -31,7 +31,7 @@ MIDI_ENABLE = no # MIDI controls AUDIO_ENABLE = no # Audio output on port C6 UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. +RGBLIGHT_ENABLE = custom # Enable WS2812 RGB underlight. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend From daf81c918f15a23d493330d0dff7512b54cc0121 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Fri, 12 Jun 2020 14:31:46 +0200 Subject: [PATCH 35/78] removed LED functionality --- .../waffling60/keymaps/default/keymap.c | 6 +- .../4pplet/waffling60/keymaps/via/keymap.c | 10 +-- keyboards/4pplet/waffling60/rev_a/config.h | 2 - keyboards/4pplet/waffling60/rev_a/led.c | 26 ------ keyboards/4pplet/waffling60/rev_a/led.h | 7 -- keyboards/4pplet/waffling60/rev_a/rev_a.c | 84 ------------------- keyboards/4pplet/waffling60/rev_a/rev_a.h | 40 --------- keyboards/4pplet/waffling60/rev_a/rules.mk | 8 +- 8 files changed, 10 insertions(+), 173 deletions(-) delete mode 100644 keyboards/4pplet/waffling60/rev_a/led.c delete mode 100644 keyboards/4pplet/waffling60/rev_a/led.h diff --git a/keyboards/4pplet/waffling60/keymaps/default/keymap.c b/keyboards/4pplet/waffling60/keymaps/default/keymap.c index 01e006a7d161..d61c3f6c548c 100644 --- a/keyboards/4pplet/waffling60/keymaps/default/keymap.c +++ b/keyboards/4pplet/waffling60/keymaps/default/keymap.c @@ -2,14 +2,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // main layer -[_BASE1] = LAYOUT_all( +[0] = LAYOUT_all( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, MO(_FN1)), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, MO(1)), // basic function layer -[_FN1] = LAYOUT_all( +[1] = LAYOUT_all( RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/4pplet/waffling60/keymaps/via/keymap.c b/keyboards/4pplet/waffling60/keymaps/via/keymap.c index 49263f9c0f9f..40ca2a28fe6b 100644 --- a/keyboards/4pplet/waffling60/keymaps/via/keymap.c +++ b/keyboards/4pplet/waffling60/keymaps/via/keymap.c @@ -2,28 +2,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // main layer -[_BASE1] = LAYOUT_all( +[0] = LAYOUT_all( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, MO(_FN1)), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, MO(1)), // basic function layer -[_FN1] = LAYOUT_all( +[1] = LAYOUT_all( RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), // extra layer for VIA -[_BASE2] = LAYOUT_all( +[2] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), // extra layer for VIA -[_FN2] = LAYOUT_all( +[3] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/4pplet/waffling60/rev_a/config.h b/keyboards/4pplet/waffling60/rev_a/config.h index dd7a3ad25ebe..d232d3e70a76 100644 --- a/keyboards/4pplet/waffling60/rev_a/config.h +++ b/keyboards/4pplet/waffling60/rev_a/config.h @@ -24,8 +24,6 @@ /* define if matrix has ghost */ //#define MATRIX_HAS_GHOST -#define RGBLED_NUM 1 - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 0 diff --git a/keyboards/4pplet/waffling60/rev_a/led.c b/keyboards/4pplet/waffling60/rev_a/led.c deleted file mode 100644 index 73b02b357166..000000000000 --- a/keyboards/4pplet/waffling60/rev_a/led.c +++ /dev/null @@ -1,26 +0,0 @@ - -#include "rgblight.h" -#include "led.h" -extern rgblight_config_t rgblight_config; // Declared in rgblight.c - -#ifdef RGBLIGHT_ENABLE - const uint8_t backlight_pwm_map[BACKLIGHT_LEVELS] = BACKLIGHT_PWM_MAP; -#endif - -#ifdef RGBLIGHT_ENABLE - -//extern rgblight_config_t rgblight_config; - -void rgblight_set(void) { - -} -/* -void rgblight_disable(void) { - -} -*/ -void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b){ - -} - -#endif // RGBLIGHT_ENABLE diff --git a/keyboards/4pplet/waffling60/rev_a/led.h b/keyboards/4pplet/waffling60/rev_a/led.h deleted file mode 100644 index 6319021a84f3..000000000000 --- a/keyboards/4pplet/waffling60/rev_a/led.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef LIGHTING_H -#define LIGHTING_H - -void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b); -void rgblight_set(void); - -#endif \ No newline at end of file diff --git a/keyboards/4pplet/waffling60/rev_a/rev_a.c b/keyboards/4pplet/waffling60/rev_a/rev_a.c index cf4582f8d2cb..d3db08ad193b 100644 --- a/keyboards/4pplet/waffling60/rev_a/rev_a.c +++ b/keyboards/4pplet/waffling60/rev_a/rev_a.c @@ -1,85 +1 @@ #include "rev_a.h" -#include "led.h" - -void keyboard_pre_init_kb(void) { - // Call the keyboard pre init code. - init_led(); -} - -void init_led(void){ - // Set on match, clear on TOP - TCCR1A = ((1 << COM1A1) | (1 << COM1A0) | (1 << COM1B1)| (1 << COM1B0)| (1 << COM1C1)| (1 << COM1C0)); // all leds on. - // Phase + Frequency Correct PWM, Fcpu speed - TCCR1B = ((1 << CS10) | (1 << WGM13)); - // define end of timer - ICR1 = TIMER_TOP; - // default set to lowest, will not toggle - led_set_color(RGB_YELLOW); - - brightness_level = DEFAULT_BRIGHTNESS_LEVEL; - // Set our LED pins as output - setPinOutput(B7); - setPinOutput(C5); - setPinOutput(C6); -} - - -layer_state_t layer_state_set_kb(layer_state_t state) { // just to illustrate, make changes if needed - if(LAYER_INDICATOR){ - switch (get_highest_layer(state)) { - case _FN1: - led_set_color(RGB_PINK); - break; - case _FN2: - led_set_color(RGB_ORANGE); - break; - default: - led_set_color(RGB_YELLOW); - break; - } - } - return state; -} - -bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - if(res && LOCK_INDICATORS) { - // do not indicate multiple lock statuses in current implementation, - // sorted by most likely first (if capslock is on, it will be purple, regardless of numlock state) - if(led_state.caps_lock) - led_set_color(RGB_ORANGE); - else if(led_state.num_lock) - led_set_color(RGB_PINK); - else if(led_state.scroll_lock) - led_set_color(RGB_CYAN); - else if(led_state.compose) - led_set_color(RGB_PURPLE); - else if(led_state.kana) - led_set_color(RGB_YELLOW); - else - led_set_color(RGB_YELLOW); - } - return res; -} - -void led_set_color(uint8_t r, uint8_t g, uint8_t b){ - uint32_t base_brightness = cie_lightness(TIMER_TOP * (uint32_t)brightness_level / BRIGHTNESS_LEVELS); - OCR1C = (uint32_t)r * (uint32_t)base_brightness / 0xFF; - OCR1B = (uint32_t)g * (uint32_t)base_brightness / 0xFF; - OCR1A = (uint32_t)b * (uint32_t)base_brightness / 0xFF; -} -// See http://jared.geek.nz/2013/feb/linear-led-pwm -uint16_t cie_lightness(uint16_t v) { - if (v <= 5243) // if below 8% of max - return v / 9; // same as dividing by 900% - else { - uint32_t y = (((uint32_t)v + 10486) << 8) / (10486 + 0xFFFFUL); // add 16% of max and compare - // to get a useful result with integer division, we shift left in the expression above - // and revert what we've done again after squaring. - y = y * y * y >> 8; - if (y > 0xFFFFUL) // prevent overflow - return 0xFFFFU; - else - return (uint16_t)y; - } -} diff --git a/keyboards/4pplet/waffling60/rev_a/rev_a.h b/keyboards/4pplet/waffling60/rev_a/rev_a.h index 2f59a9412f50..3ac296877977 100644 --- a/keyboards/4pplet/waffling60/rev_a/rev_a.h +++ b/keyboards/4pplet/waffling60/rev_a/rev_a.h @@ -1,46 +1,6 @@ #pragma once #include "quantum.h" -/* -#define RGB_OFF 0,0,0 -#define RGB_WHITE 255, 255, 255 -#define RGB_RED 255, 0, 0 -#define RGB_ORANGE 255, 20, 0 -#define RGB_YELLOW 255, 255, 0 -#define RGB_GREEN 0, 255, 0 -#define RGB_CYAN 0, 255, 255 -#define RGB_BLUE 0, 0, 255 -#define RGB_PURPLE 255, 0, 255 -#define RGB_PINK 255, 20, 20 -*/ -// set LOCK_INDICATORS to false if not used or if leds are used for custom function -// do not use both, lock indicators will override layer indicator. -#define LOCK_INDICATORS false // indicate capslock, scroll lock etc with rgb led -#define LAYER_INDICATOR true // indicate layer with rgb led, functions may need modification. - -#define BRIGHTNESS_LEVELS 10 -#define DEFAULT_BRIGHTNESS_LEVEL 5 - -#define RGBLED_NUM 1 - -#define TIMER_TOP 0xFFFFU - -bool led_update_kb(led_t led_state); -bool led_update_user(led_t led_state); -void keyboard_pre_init_kb(void); -void led_set_color(uint8_t r, uint8_t g, uint8_t b); -void init_led(void); -uint16_t cie_lightness(uint16_t v); - -// variables -uint16_t brightness_level; - -enum waffling_layers { - _BASE1, - _BASE2, - _FN1, - _FN2, -}; // k #define LAYOUT_all( \ diff --git a/keyboards/4pplet/waffling60/rev_a/rules.mk b/keyboards/4pplet/waffling60/rev_a/rules.mk index 0db7f3b41aee..f68a948ca6b6 100644 --- a/keyboards/4pplet/waffling60/rev_a/rules.mk +++ b/keyboards/4pplet/waffling60/rev_a/rules.mk @@ -24,13 +24,9 @@ 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 = custom # Enable keyboard RGB underglow +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow MIDI_ENABLE = no # MIDI support AUDIO_ENABLE = no # Audio output on port C6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches HD44780_ENABLE = no # Enable support for HD44780 based LCDs -UNICODE_ENABLE = no # Unicode -RGBLIGHT_CUSTOM_DRIVER = yes -RGBLIGHT_ENABLE = yes - -#SRC += lightning.c \ No newline at end of file +UNICODE_ENABLE = no # Unicode \ No newline at end of file From 462beafcbe0a6c087d3eca810e704a34082128df Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Thu, 18 Jun 2020 11:07:32 +0200 Subject: [PATCH 36/78] Update keyboards/wilba_tech/zeal60/rules.mk Co-authored-by: Drashna Jaelre --- keyboards/wilba_tech/zeal60/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/wilba_tech/zeal60/rules.mk b/keyboards/wilba_tech/zeal60/rules.mk index d49aba3e40ae..3087aa3cd821 100644 --- a/keyboards/wilba_tech/zeal60/rules.mk +++ b/keyboards/wilba_tech/zeal60/rules.mk @@ -31,7 +31,7 @@ MIDI_ENABLE = no # MIDI controls AUDIO_ENABLE = no # Audio output on port C6 UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = custom # Enable WS2812 RGB underlight. +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend From 188ff5a99528682b531faaa4cdc844f483f5ee11 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Sun, 21 Jun 2020 20:22:46 +0200 Subject: [PATCH 37/78] Update keyboards/wilba_tech/zeal60/rules.mk Co-authored-by: Ryan --- keyboards/wilba_tech/zeal60/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/wilba_tech/zeal60/rules.mk b/keyboards/wilba_tech/zeal60/rules.mk index 3087aa3cd821..31c960c22ee8 100644 --- a/keyboards/wilba_tech/zeal60/rules.mk +++ b/keyboards/wilba_tech/zeal60/rules.mk @@ -31,7 +31,7 @@ MIDI_ENABLE = no # MIDI controls AUDIO_ENABLE = no # Audio output on port C6 UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend From 4a88767424f2c6203d8f46c18b1edd63c3da4449 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Sun, 21 Jun 2020 20:22:56 +0200 Subject: [PATCH 38/78] Update keyboards/4pplet/waffling60/rev_a/rules.mk Co-authored-by: Ryan --- keyboards/4pplet/waffling60/rev_a/rules.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/4pplet/waffling60/rev_a/rules.mk b/keyboards/4pplet/waffling60/rev_a/rules.mk index f68a948ca6b6..494e07bc0ca6 100644 --- a/keyboards/4pplet/waffling60/rev_a/rules.mk +++ b/keyboards/4pplet/waffling60/rev_a/rules.mk @@ -28,5 +28,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow MIDI_ENABLE = no # MIDI support AUDIO_ENABLE = no # Audio output on port C6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches -HD44780_ENABLE = no # Enable support for HD44780 based LCDs -UNICODE_ENABLE = no # Unicode \ No newline at end of file +UNICODE_ENABLE = no # Unicode From 5b0869af3613411b47af2ceae56a241f75192d7f Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Sun, 21 Jun 2020 20:23:06 +0200 Subject: [PATCH 39/78] Update keyboards/4pplet/steezy60/rev_a/rules.mk Co-authored-by: Ryan --- keyboards/4pplet/steezy60/rev_a/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/4pplet/steezy60/rev_a/rules.mk b/keyboards/4pplet/steezy60/rev_a/rules.mk index f0a123479597..494e07bc0ca6 100644 --- a/keyboards/4pplet/steezy60/rev_a/rules.mk +++ b/keyboards/4pplet/steezy60/rev_a/rules.mk @@ -28,5 +28,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow MIDI_ENABLE = no # MIDI support AUDIO_ENABLE = no # Audio output on port C6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches -HD44780_ENABLE = no # Enable support for HD44780 based LCDs UNICODE_ENABLE = no # Unicode From 70af9ae35416297c34ce63859c2f5a448520a081 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Sun, 21 Jun 2020 20:23:16 +0200 Subject: [PATCH 40/78] Update keyboards/4pplet/aekiso60/keymaps/via/keymap.c Co-authored-by: Ryan --- .../4pplet/aekiso60/keymaps/via/keymap.c | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/keyboards/4pplet/aekiso60/keymaps/via/keymap.c b/keyboards/4pplet/aekiso60/keymaps/via/keymap.c index 4d49f62e3a24..d2036f60bd76 100644 --- a/keyboards/4pplet/aekiso60/keymaps/via/keymap.c +++ b/keyboards/4pplet/aekiso60/keymaps/via/keymap.c @@ -4,32 +4,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, \ - KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, \ - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), \ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, + KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_LCTL, KC_LGUI, KC_LALT, _______, KC_SPC, _______, KC_RALT, KC_RGUI, KC_RCTL), [1] = LAYOUT_all( - KC_EXEC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, \ - _______, KC_BSPC, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, KC_PENT, \ - KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, KC_INS, \ - _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, \ + KC_EXEC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + _______, KC_BSPC, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, KC_PENT, + KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, KC_INS, + _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, RESET, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______), [2] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), [3] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) }; - From ddca8eded9ef954c760bbfc097aa8234446d7b48 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Sun, 21 Jun 2020 20:23:28 +0200 Subject: [PATCH 41/78] Update keyboards/4pplet/aekiso60/rev_a/rules.mk Co-authored-by: Ryan --- keyboards/4pplet/aekiso60/rev_a/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/4pplet/aekiso60/rev_a/rules.mk b/keyboards/4pplet/aekiso60/rev_a/rules.mk index f0a123479597..494e07bc0ca6 100644 --- a/keyboards/4pplet/aekiso60/rev_a/rules.mk +++ b/keyboards/4pplet/aekiso60/rev_a/rules.mk @@ -28,5 +28,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow MIDI_ENABLE = no # MIDI support AUDIO_ENABLE = no # Audio output on port C6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches -HD44780_ENABLE = no # Enable support for HD44780 based LCDs UNICODE_ENABLE = no # Unicode From 5f6cbdd22ca391d4d34ebfbdaa32197aae61ca7f Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Sun, 23 Aug 2020 12:31:56 +0200 Subject: [PATCH 42/78] Update config.h added debounce to prevent stuttering with some switches --- keyboards/4pplet/waffling60/rev_a/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/4pplet/waffling60/rev_a/config.h b/keyboards/4pplet/waffling60/rev_a/config.h index d232d3e70a76..6bbc68be60bc 100644 --- a/keyboards/4pplet/waffling60/rev_a/config.h +++ b/keyboards/4pplet/waffling60/rev_a/config.h @@ -25,7 +25,7 @@ //#define MATRIX_HAS_GHOST /* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 0 +#define DEBOUNCE 5 #define QMK_ESC_OUTPUT D3 // usually COL #define QMK_ESC_INPUT D4 // usually ROW From ef907cdd7f1c53a3367fb33c0b6a58943ed0cfc2 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Sun, 23 Aug 2020 12:41:50 +0200 Subject: [PATCH 43/78] Update README.md --- keyboards/4pplet/waffling60/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/4pplet/waffling60/README.md b/keyboards/4pplet/waffling60/README.md index 6c333a5607b0..a6b56a69ea7f 100644 --- a/keyboards/4pplet/waffling60/README.md +++ b/keyboards/4pplet/waffling60/README.md @@ -5,7 +5,7 @@ A 60% PCB for MX switches, one hot swap and one solder-pcb version with decent l More info: https://geekhack.org/index.php?topic=103531.0 * Keyboard Maintainer: [4pplet](https://github.com/4pplet) -* Hardware Supported: waffling60 Rev A +* Hardware Supported: [waffling60](https://github.com/4pplet/waffling60) Make example for this keyboard (after setting up your build environment): From f4a03b6bf0819c0114566b91b0cbea985e3619e1 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Sun, 6 Sep 2020 09:09:50 +0200 Subject: [PATCH 44/78] Adding masterwork classy_tkl --- keyboards/masterwork/classy_tkl/info.json | 295 ++++++++++++++++++ .../classy_tkl/keymaps/default/config.h | 19 ++ .../classy_tkl/keymaps/default/keymap.c | 13 + .../classy_tkl/keymaps/default/readme.md | 1 + .../keymaps/default_tkl_ansi_wkl/config.h | 19 ++ .../keymaps/default_tkl_ansi_wkl/keymap.c | 13 + .../keymaps/default_tkl_ansi_wkl/readme.md | 1 + .../keymaps/default_tkl_iso_wkl/config.h | 19 ++ .../keymaps/default_tkl_iso_wkl/keymap.c | 13 + .../keymaps/default_tkl_iso_wkl/readme.md | 1 + .../classy_tkl/keymaps/via/keymap.c | 34 ++ .../classy_tkl/keymaps/via/rules.mk | 1 + keyboards/masterwork/classy_tkl/readme.md | 15 + .../masterwork/classy_tkl/rev_a/config.h | 59 ++++ keyboards/masterwork/classy_tkl/rev_a/rev_a.c | 69 ++++ keyboards/masterwork/classy_tkl/rev_a/rev_a.h | 79 +++++ .../masterwork/classy_tkl/rev_a/rules.mk | 44 +++ 17 files changed, 695 insertions(+) create mode 100644 keyboards/masterwork/classy_tkl/info.json create mode 100644 keyboards/masterwork/classy_tkl/keymaps/default/config.h create mode 100644 keyboards/masterwork/classy_tkl/keymaps/default/keymap.c create mode 100644 keyboards/masterwork/classy_tkl/keymaps/default/readme.md create mode 100644 keyboards/masterwork/classy_tkl/keymaps/default_tkl_ansi_wkl/config.h create mode 100644 keyboards/masterwork/classy_tkl/keymaps/default_tkl_ansi_wkl/keymap.c create mode 100644 keyboards/masterwork/classy_tkl/keymaps/default_tkl_ansi_wkl/readme.md create mode 100644 keyboards/masterwork/classy_tkl/keymaps/default_tkl_iso_wkl/config.h create mode 100644 keyboards/masterwork/classy_tkl/keymaps/default_tkl_iso_wkl/keymap.c create mode 100644 keyboards/masterwork/classy_tkl/keymaps/default_tkl_iso_wkl/readme.md create mode 100644 keyboards/masterwork/classy_tkl/keymaps/via/keymap.c create mode 100644 keyboards/masterwork/classy_tkl/keymaps/via/rules.mk create mode 100644 keyboards/masterwork/classy_tkl/readme.md create mode 100644 keyboards/masterwork/classy_tkl/rev_a/config.h create mode 100644 keyboards/masterwork/classy_tkl/rev_a/rev_a.c create mode 100644 keyboards/masterwork/classy_tkl/rev_a/rev_a.h create mode 100644 keyboards/masterwork/classy_tkl/rev_a/rules.mk diff --git a/keyboards/masterwork/classy_tkl/info.json b/keyboards/masterwork/classy_tkl/info.json new file mode 100644 index 000000000000..6cf97c9c8819 --- /dev/null +++ b/keyboards/masterwork/classy_tkl/info.json @@ -0,0 +1,295 @@ +{ + "keyboard_name": "Classy TKL", + "url": "https://geekhack.org/index.php?topic=105933", + "maintainer": "qmk", + "width": 18.25, + "height": 6.5, + "layouts": { + "LAYOUT_all": { + "key_count": 89, + "layout": [ + { "label": "Esc", "x": 0, "y": 0 }, + { "label": "F1", "x": 2, "y": 0 }, + { "label": "F2", "x": 3, "y": 0 }, + { "label": "F3", "x": 4, "y": 0 }, + { "label": "F4", "x": 5, "y": 0 }, + { "label": "F5", "x": 6.5, "y": 0 }, + { "label": "F6", "x": 7.5, "y": 0 }, + { "label": "F7", "x": 8.5, "y": 0 }, + { "label": "F8", "x": 9.5, "y": 0 }, + { "label": "F9", "x": 11, "y": 0 }, + { "label": "F10", "x": 12, "y": 0 }, + { "label": "F11", "x": 13, "y": 0 }, + { "label": "F12", "x": 14, "y": 0 }, + { "label": "PrtSc", "x": 15.25, "y": 0 }, + { "label": "Scroll Lock", "x": 16.25, "y": 0 }, + { "label": "Pause", "x": 17.25, "y": 0 }, + { "label": "~", "x": 0, "y": 1.5 }, + { "label": "!", "x": 1, "y": 1.5 }, + { "label": "@", "x": 2, "y": 1.5 }, + { "label": "#", "x": 3, "y": 1.5 }, + { "label": "$", "x": 4, "y": 1.5 }, + { "label": "%", "x": 5, "y": 1.5 }, + { "label": "^", "x": 6, "y": 1.5 }, + { "label": "&", "x": 7, "y": 1.5 }, + { "label": "*", "x": 8, "y": 1.5 }, + { "label": "(", "x": 9, "y": 1.5 }, + { "label": ")", "x": 10, "y": 1.5 }, + { "label": "_", "x": 11, "y": 1.5 }, + { "label": "+", "x": 12, "y": 1.5 }, + { "label": "Backspace", "x": 13, "y": 1.5 }, + { "label": "Backspace2", "x": 14, "y": 1.5 }, + { "label": "Insert", "x": 15.25, "y": 1.5 }, + { "label": "Home", "x": 16.25, "y": 1.5 }, + { "label": "PgUp", "x": 17.25, "y": 1.5 }, + { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 }, + { "label": "Q", "x": 1.5, "y": 2.5 }, + { "label": "W", "x": 2.5, "y": 2.5 }, + { "label": "E", "x": 3.5, "y": 2.5 }, + { "label": "R", "x": 4.5, "y": 2.5 }, + { "label": "T", "x": 5.5, "y": 2.5 }, + { "label": "Y", "x": 6.5, "y": 2.5 }, + { "label": "U", "x": 7.5, "y": 2.5 }, + { "label": "I", "x": 8.5, "y": 2.5 }, + { "label": "O", "x": 9.5, "y": 2.5 }, + { "label": "P", "x": 10.5, "y": 2.5 }, + { "label": "{", "x": 11.5, "y": 2.5 }, + { "label": "}", "x": 12.5, "y": 2.5 }, + { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 }, + { "label": "Delete", "x": 15.25, "y": 2.5 }, + { "label": "End", "x": 16.25, "y": 2.5 }, + { "label": "PgDn", "x": 17.25, "y": 2.5 }, + { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 }, + { "label": "A", "x": 1.75, "y": 3.5 }, + { "label": "S", "x": 2.75, "y": 3.5 }, + { "label": "D", "x": 3.75, "y": 3.5 }, + { "label": "F", "x": 4.75, "y": 3.5 }, + { "label": "G", "x": 5.75, "y": 3.5 }, + { "label": "H", "x": 6.75, "y": 3.5 }, + { "label": "J", "x": 7.75, "y": 3.5 }, + { "label": "K", "x": 8.75, "y": 3.5 }, + { "label": "L", "x": 9.75, "y": 3.5 }, + { "label": ":", "x": 10.75, "y": 3.5 }, + { "label": "\"", "x": 11.75, "y": 3.5 }, + { "label": "Enter", "x": 12.75, "y": 3.5, "w": 2.25 }, + { "label": "Shift", "x": 0, "y": 4.5, "w": 1.25 }, + { "label": "|", "x": 1.25, "y": 4.5 }, + { "label": "Z", "x": 2.25, "y": 4.5 }, + { "label": "X", "x": 3.25, "y": 4.5 }, + { "label": "C", "x": 4.25, "y": 4.5 }, + { "label": "V", "x": 5.25, "y": 4.5 }, + { "label": "B", "x": 6.25, "y": 4.5 }, + { "label": "N", "x": 7.25, "y": 4.5 }, + { "label": "M", "x": 8.25, "y": 4.5 }, + { "label": "<", "x": 9.25, "y": 4.5 }, + { "label": ">", "x": 10.25, "y": 4.5 }, + { "label": "?", "x": 11.25, "y": 4.5 }, + { "label": "Shift", "x": 12.25, "y": 4.5, "w": 1.75 }, + { "label": "Shift2", "x": 14, "y": 4.5, "w": 1 }, + { "label": "Up", "x": 16.25, "y": 4.5 }, + { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.5 }, + { "label": "Win", "x": 1.5, "y": 5.5, "w": 1 }, + { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.5 }, + { "label": "Space", "x": 4, "y": 5.5, "w": 7 }, + { "label": "Alt", "x": 11, "y": 5.5, "w": 1.5 }, + { "label": "Win", "x": 12.5, "y": 5.5, "w": 1 }, + { "label": "Ctrl", "x": 13.5, "y": 5.5, "w": 1.5 }, + { "label": "Left", "x": 15.25, "y": 5.5 }, + { "label": "Down", "x": 16.25, "y": 5.5 }, + { "label": "Right", "x": 17.25, "y": 5.5 } + ] + }, + "LAYOUT_tkl_ansi_wkl": { + "key_count": 84, + "layout": [ + { "label": "Esc", "x": 0, "y": 0 }, + { "label": "F1", "x": 2, "y": 0 }, + { "label": "F2", "x": 3, "y": 0 }, + { "label": "F3", "x": 4, "y": 0 }, + { "label": "F4", "x": 5, "y": 0 }, + { "label": "F5", "x": 6.5, "y": 0 }, + { "label": "F6", "x": 7.5, "y": 0 }, + { "label": "F7", "x": 8.5, "y": 0 }, + { "label": "F8", "x": 9.5, "y": 0 }, + { "label": "F9", "x": 11, "y": 0 }, + { "label": "F10", "x": 12, "y": 0 }, + { "label": "F11", "x": 13, "y": 0 }, + { "label": "F12", "x": 14, "y": 0 }, + { "label": "PrtSc", "x": 15.25, "y": 0 }, + { "label": "Scroll Lock", "x": 16.25, "y": 0 }, + { "label": "Pause", "x": 17.25, "y": 0 }, + { "label": "~", "x": 0, "y": 1.5 }, + { "label": "!", "x": 1, "y": 1.5 }, + { "label": "@", "x": 2, "y": 1.5 }, + { "label": "#", "x": 3, "y": 1.5 }, + { "label": "$", "x": 4, "y": 1.5 }, + { "label": "%", "x": 5, "y": 1.5 }, + { "label": "^", "x": 6, "y": 1.5 }, + { "label": "&", "x": 7, "y": 1.5 }, + { "label": "*", "x": 8, "y": 1.5 }, + { "label": "(", "x": 9, "y": 1.5 }, + { "label": ")", "x": 10, "y": 1.5 }, + { "label": "_", "x": 11, "y": 1.5 }, + { "label": "+", "x": 12, "y": 1.5 }, + { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 }, + { "label": "Insert", "x": 15.25, "y": 1.5 }, + { "label": "Home", "x": 16.25, "y": 1.5 }, + { "label": "PgUp", "x": 17.25, "y": 1.5 }, + { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 }, + { "label": "Q", "x": 1.5, "y": 2.5 }, + { "label": "W", "x": 2.5, "y": 2.5 }, + { "label": "E", "x": 3.5, "y": 2.5 }, + { "label": "R", "x": 4.5, "y": 2.5 }, + { "label": "T", "x": 5.5, "y": 2.5 }, + { "label": "Y", "x": 6.5, "y": 2.5 }, + { "label": "U", "x": 7.5, "y": 2.5 }, + { "label": "I", "x": 8.5, "y": 2.5 }, + { "label": "O", "x": 9.5, "y": 2.5 }, + { "label": "P", "x": 10.5, "y": 2.5 }, + { "label": "{", "x": 11.5, "y": 2.5 }, + { "label": "}", "x": 12.5, "y": 2.5 }, + { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 }, + { "label": "Delete", "x": 15.25, "y": 2.5 }, + { "label": "End", "x": 16.25, "y": 2.5 }, + { "label": "PgDn", "x": 17.25, "y": 2.5 }, + { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 }, + { "label": "A", "x": 1.75, "y": 3.5 }, + { "label": "S", "x": 2.75, "y": 3.5 }, + { "label": "D", "x": 3.75, "y": 3.5 }, + { "label": "F", "x": 4.75, "y": 3.5 }, + { "label": "G", "x": 5.75, "y": 3.5 }, + { "label": "H", "x": 6.75, "y": 3.5 }, + { "label": "J", "x": 7.75, "y": 3.5 }, + { "label": "K", "x": 8.75, "y": 3.5 }, + { "label": "L", "x": 9.75, "y": 3.5 }, + { "label": ":", "x": 10.75, "y": 3.5 }, + { "label": "\"", "x": 11.75, "y": 3.5 }, + { "label": "Enter", "x": 12.75, "y": 3.5, "w": 2.25 }, + { "label": "Shift", "x": 0, "y": 4.5, "w": 2.25 }, + { "label": "Z", "x": 2.25, "y": 4.5 }, + { "label": "X", "x": 3.25, "y": 4.5 }, + { "label": "C", "x": 4.25, "y": 4.5 }, + { "label": "V", "x": 5.25, "y": 4.5 }, + { "label": "B", "x": 6.25, "y": 4.5 }, + { "label": "N", "x": 7.25, "y": 4.5 }, + { "label": "M", "x": 8.25, "y": 4.5 }, + { "label": "<", "x": 9.25, "y": 4.5 }, + { "label": ">", "x": 10.25, "y": 4.5 }, + { "label": "?", "x": 11.25, "y": 4.5 }, + { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 }, + { "label": "Up", "x": 16.25, "y": 4.5 }, + { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.5 }, + { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.5 }, + { "label": "Space", "x": 4, "y": 5.5, "w": 7 }, + { "label": "Alt", "x": 11, "y": 5.5, "w": 1.5 }, + { "label": "Ctrl", "x": 13.5, "y": 5.5, "w": 1.5 }, + { "label": "Left", "x": 15.25, "y": 5.5 }, + { "label": "Down", "x": 16.25, "y": 5.5 }, + { "label": "Right", "x": 17.25, "y": 5.5 } + ] + }, + "LAYOUT_tkl_iso_wkl": { + "key_count": 85, + "layout": [ + { "label": "Esc", "x": 0, "y": 0 }, + { "label": "F1", "x": 2, "y": 0 }, + { "label": "F2", "x": 3, "y": 0 }, + { "label": "F3", "x": 4, "y": 0 }, + { "label": "F4", "x": 5, "y": 0 }, + { "label": "F5", "x": 6.5, "y": 0 }, + { "label": "F6", "x": 7.5, "y": 0 }, + { "label": "F7", "x": 8.5, "y": 0 }, + { "label": "F8", "x": 9.5, "y": 0 }, + { "label": "F9", "x": 11, "y": 0 }, + { "label": "F10", "x": 12, "y": 0 }, + { "label": "F11", "x": 13, "y": 0 }, + { "label": "F12", "x": 14, "y": 0 }, + { "label": "PrtSc", "x": 15.25, "y": 0 }, + { "label": "Scroll Lock", "x": 16.25, "y": 0 }, + { "label": "Pause", "x": 17.25, "y": 0 }, + { "label": "\u00ac", "x": 0, "y": 1.5 }, + { "label": "!", "x": 1, "y": 1.5 }, + { "label": "\"", "x": 2, "y": 1.5 }, + { "label": "\u00a3", "x": 3, "y": 1.5 }, + { "label": "$", "x": 4, "y": 1.5 }, + { "label": "%", "x": 5, "y": 1.5 }, + { "label": "^", "x": 6, "y": 1.5 }, + { "label": "&", "x": 7, "y": 1.5 }, + { "label": "*", "x": 8, "y": 1.5 }, + { "label": "(", "x": 9, "y": 1.5 }, + { "label": ")", "x": 10, "y": 1.5 }, + { "label": "_", "x": 11, "y": 1.5 }, + { "label": "+", "x": 12, "y": 1.5 }, + { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 }, + { "label": "Insert", "x": 15.25, "y": 1.5 }, + { "label": "Home", "x": 16.25, "y": 1.5 }, + { "label": "PgUp", "x": 17.25, "y": 1.5 }, + { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 }, + { "label": "Q", "x": 1.5, "y": 2.5 }, + { "label": "W", "x": 2.5, "y": 2.5 }, + { "label": "E", "x": 3.5, "y": 2.5 }, + { "label": "R", "x": 4.5, "y": 2.5 }, + { "label": "T", "x": 5.5, "y": 2.5 }, + { "label": "Y", "x": 6.5, "y": 2.5 }, + { "label": "U", "x": 7.5, "y": 2.5 }, + { "label": "I", "x": 8.5, "y": 2.5 }, + { "label": "O", "x": 9.5, "y": 2.5 }, + { "label": "P", "x": 10.5, "y": 2.5 }, + { "label": "{", "x": 11.5, "y": 2.5 }, + { "label": "}", "x": 12.5, "y": 2.5 }, + { "label": "Delete", "x": 15.25, "y": 2.5 }, + { "label": "End", "x": 16.25, "y": 2.5 }, + { "label": "PgDn", "x": 17.25, "y": 2.5 }, + { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 }, + { "label": "A", "x": 1.75, "y": 3.5 }, + { "label": "S", "x": 2.75, "y": 3.5 }, + { "label": "D", "x": 3.75, "y": 3.5 }, + { "label": "F", "x": 4.75, "y": 3.5 }, + { "label": "G", "x": 5.75, "y": 3.5 }, + { "label": "H", "x": 6.75, "y": 3.5 }, + { "label": "J", "x": 7.75, "y": 3.5 }, + { "label": "K", "x": 8.75, "y": 3.5 }, + { "label": "L", "x": 9.75, "y": 3.5 }, + { "label": ":", "x": 10.75, "y": 3.5 }, + { "label": "@", "x": 11.75, "y": 3.5 }, + { "label": "~", "x": 12.75, "y": 3.5 }, + { + "label": "Enter", + "x": 13.75, + "y": 2.5, + "ks": [ + [0, 0], + [1.5, 0], + [1.5, 2], + [0.25, 2], + [0.25, 1], + [0, 1], + [0, 0] + ] + }, + { "label": "Shift", "x": 0, "y": 4.5, "w": 1.25 }, + { "label": "|", "x": 1.25, "y": 4.5 }, + { "label": "Z", "x": 2.25, "y": 4.5 }, + { "label": "X", "x": 3.25, "y": 4.5 }, + { "label": "C", "x": 4.25, "y": 4.5 }, + { "label": "V", "x": 5.25, "y": 4.5 }, + { "label": "B", "x": 6.25, "y": 4.5 }, + { "label": "N", "x": 7.25, "y": 4.5 }, + { "label": "M", "x": 8.25, "y": 4.5 }, + { "label": "<", "x": 9.25, "y": 4.5 }, + { "label": ">", "x": 10.25, "y": 4.5 }, + { "label": "?", "x": 11.25, "y": 4.5 }, + { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 }, + { "label": "Up", "x": 16.25, "y": 4.5 }, + { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.5 }, + { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.5 }, + { "label": "Space", "x": 4, "y": 5.5, "w": 7 }, + { "label": "AltGr", "x": 11, "y": 5.5, "w": 1.5 }, + { "label": "Ctrl", "x": 13.5, "y": 5.5, "w": 1.5 }, + { "label": "Left", "x": 15.25, "y": 5.5 }, + { "label": "Down", "x": 16.25, "y": 5.5 }, + { "label": "Right", "x": 17.25, "y": 5.5 } + ] + } + } +} diff --git a/keyboards/masterwork/classy_tkl/keymaps/default/config.h b/keyboards/masterwork/classy_tkl/keymaps/default/config.h new file mode 100644 index 000000000000..e328e5a3b04c --- /dev/null +++ b/keyboards/masterwork/classy_tkl/keymaps/default/config.h @@ -0,0 +1,19 @@ +/* Copyright 2020 Mathias Andersson + * + * 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 + +// place overrides here diff --git a/keyboards/masterwork/classy_tkl/keymaps/default/keymap.c b/keyboards/masterwork/classy_tkl/keymaps/default/keymap.c new file mode 100644 index 000000000000..541430973c0b --- /dev/null +++ b/keyboards/masterwork/classy_tkl/keymaps/default/keymap.c @@ -0,0 +1,13 @@ +#include QMK_KEYBOARD_H + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC, KC_INS , KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, KC_UP, + KC_LCTL, KC_NO, KC_LALT, KC_SPC, KC_RALT, KC_NO, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT) +}; +// clang-format on diff --git a/keyboards/masterwork/classy_tkl/keymaps/default/readme.md b/keyboards/masterwork/classy_tkl/keymaps/default/readme.md new file mode 100644 index 000000000000..72b4eb54a072 --- /dev/null +++ b/keyboards/masterwork/classy_tkl/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default winkeyless ANSI keymap for the Classy TKL diff --git a/keyboards/masterwork/classy_tkl/keymaps/default_tkl_ansi_wkl/config.h b/keyboards/masterwork/classy_tkl/keymaps/default_tkl_ansi_wkl/config.h new file mode 100644 index 000000000000..e328e5a3b04c --- /dev/null +++ b/keyboards/masterwork/classy_tkl/keymaps/default_tkl_ansi_wkl/config.h @@ -0,0 +1,19 @@ +/* Copyright 2020 Mathias Andersson + * + * 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 + +// place overrides here diff --git a/keyboards/masterwork/classy_tkl/keymaps/default_tkl_ansi_wkl/keymap.c b/keyboards/masterwork/classy_tkl/keymaps/default_tkl_ansi_wkl/keymap.c new file mode 100644 index 000000000000..ce3bcd713c91 --- /dev/null +++ b/keyboards/masterwork/classy_tkl/keymaps/default_tkl_ansi_wkl/keymap.c @@ -0,0 +1,13 @@ +#include QMK_KEYBOARD_H + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_tkl_ansi_wkl( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS , KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT) +}; +// clang-format on diff --git a/keyboards/masterwork/classy_tkl/keymaps/default_tkl_ansi_wkl/readme.md b/keyboards/masterwork/classy_tkl/keymaps/default_tkl_ansi_wkl/readme.md new file mode 100644 index 000000000000..72b4eb54a072 --- /dev/null +++ b/keyboards/masterwork/classy_tkl/keymaps/default_tkl_ansi_wkl/readme.md @@ -0,0 +1 @@ +# The default winkeyless ANSI keymap for the Classy TKL diff --git a/keyboards/masterwork/classy_tkl/keymaps/default_tkl_iso_wkl/config.h b/keyboards/masterwork/classy_tkl/keymaps/default_tkl_iso_wkl/config.h new file mode 100644 index 000000000000..e328e5a3b04c --- /dev/null +++ b/keyboards/masterwork/classy_tkl/keymaps/default_tkl_iso_wkl/config.h @@ -0,0 +1,19 @@ +/* Copyright 2020 Mathias Andersson + * + * 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 + +// place overrides here diff --git a/keyboards/masterwork/classy_tkl/keymaps/default_tkl_iso_wkl/keymap.c b/keyboards/masterwork/classy_tkl/keymaps/default_tkl_iso_wkl/keymap.c new file mode 100644 index 000000000000..6e1e1d570583 --- /dev/null +++ b/keyboards/masterwork/classy_tkl/keymaps/default_tkl_iso_wkl/keymap.c @@ -0,0 +1,13 @@ +#include QMK_KEYBOARD_H + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_tkl_iso_wkl( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS , KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL , KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT) +}; +// clang-format on diff --git a/keyboards/masterwork/classy_tkl/keymaps/default_tkl_iso_wkl/readme.md b/keyboards/masterwork/classy_tkl/keymaps/default_tkl_iso_wkl/readme.md new file mode 100644 index 000000000000..a4b8c86b1dcd --- /dev/null +++ b/keyboards/masterwork/classy_tkl/keymaps/default_tkl_iso_wkl/readme.md @@ -0,0 +1 @@ +# The default winkeyless ISO keymap for the Classy TKL diff --git a/keyboards/masterwork/classy_tkl/keymaps/via/keymap.c b/keyboards/masterwork/classy_tkl/keymaps/via/keymap.c new file mode 100644 index 000000000000..218548f92f5e --- /dev/null +++ b/keyboards/masterwork/classy_tkl/keymaps/via/keymap.c @@ -0,0 +1,34 @@ +#include QMK_KEYBOARD_H + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC, KC_INS , KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, KC_UP, + KC_LCTL, KC_NO, KC_LALT, KC_SPC, KC_RALT, KC_NO, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [1] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + [2] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + [3] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) +}; +// clang-format on diff --git a/keyboards/masterwork/classy_tkl/keymaps/via/rules.mk b/keyboards/masterwork/classy_tkl/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/masterwork/classy_tkl/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/masterwork/classy_tkl/readme.md b/keyboards/masterwork/classy_tkl/readme.md new file mode 100644 index 000000000000..7c3941827091 --- /dev/null +++ b/keyboards/masterwork/classy_tkl/readme.md @@ -0,0 +1,15 @@ +# Classy TKL + +![Classy TKL](https://i.imgur.com/p1dxfYK.jpg) + +A short description of the keyboard/project + +Keyboard Maintainer: [Mathias Andersson](https://github.com/wraul) +Hardware Supported: Classy TKL PCB +Hardware Availability: https://geekhack.org/index.php?topic=105933 + +Make example for this keyboard (after setting up your build environment): + + make masterwork/classy_tkl:default + +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/masterwork/classy_tkl/rev_a/config.h b/keyboards/masterwork/classy_tkl/rev_a/config.h new file mode 100644 index 000000000000..91ef8ec190ad --- /dev/null +++ b/keyboards/masterwork/classy_tkl/rev_a/config.h @@ -0,0 +1,59 @@ +/* +Copyright 2020 Mathias Andersson + +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 descriptor parameter */ +#define VENDOR_ID 0x4D57 // "MW" = Masterwork +#define PRODUCT_ID 0x0001 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Masterwork +#define PRODUCT Classy TKL +#define DESCRIPTION A classy keyboard + +/* key matrix size */ +#define MATRIX_ROWS 6 +#define MATRIX_COLS 17 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS \ + { C7, F0, F1, F4, F5, F6 } +#define MATRIX_COL_PINS \ + { B4, D7, D6, D4, C6, D5, D3, D2, D1, D0, B7, B3, B2, B1, B0, E6, F7 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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 diff --git a/keyboards/masterwork/classy_tkl/rev_a/rev_a.c b/keyboards/masterwork/classy_tkl/rev_a/rev_a.c new file mode 100644 index 000000000000..56f8a995712d --- /dev/null +++ b/keyboards/masterwork/classy_tkl/rev_a/rev_a.c @@ -0,0 +1,69 @@ +/* Copyright 2020 Mathias Andersson + * + * 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 . + */ +#include "rev_a.h" + +#define CAPS_PIN B5 +#define SCROLL_PIN B6 + +// Optional override functions below. +// You can leave any or all of these undefined. +// These are only required if you want to perform custom actions. + +void matrix_init_kb(void) { + // put your keyboard start-up code here + // runs once when the firmware starts up + + setPinOutput(CAPS_PIN); + setPinOutput(SCROLL_PIN); + + matrix_init_user(); +} + +/* + +void matrix_scan_kb(void) { + // put your looping keyboard code here + // runs every cycle (a lot) + + matrix_scan_user(); +} + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + // put your per-action keyboard code here + // runs for every action, just before processing by the firmware + + return process_record_user(keycode, record); +} + +*/ + +void led_set_kb(uint8_t usb_led) { + // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here + + if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { + writePinHigh(CAPS_PIN); + } else { + writePinLow(CAPS_PIN); + } + + if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) { + writePinHigh(SCROLL_PIN); + } else { + writePinLow(SCROLL_PIN); + } + + led_set_user(usb_led); +} diff --git a/keyboards/masterwork/classy_tkl/rev_a/rev_a.h b/keyboards/masterwork/classy_tkl/rev_a/rev_a.h new file mode 100644 index 000000000000..7e55819dcd1a --- /dev/null +++ b/keyboards/masterwork/classy_tkl/rev_a/rev_a.h @@ -0,0 +1,79 @@ +/* Copyright 2020 Mathias Andersson + * + * 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 "quantum.h" + +/* This a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +// clang-format off +#define LAYOUT_all( \ + k00, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k3D, k1E, k1F, k1G, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4F, \ + k50, k52, k53, k57, k5B, k5C, k5D, k5E, k5F, k5G \ +) \ +{ \ + { k00, KC_NO, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, KC_NO, KC_NO, KC_NO }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, KC_NO, k4F, KC_NO }, \ + { k50, KC_NO, k52, k53, KC_NO, KC_NO, KC_NO, k57, KC_NO, KC_NO, KC_NO, k5B, k5C, k5D, k5E, k5F, k5G }, \ +} + +#define LAYOUT_tkl_ansi_wkl( \ + k00, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k3D, k1E, k1F, k1G, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \ + k40, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4F, \ + k50, k53, k57, k5B, k5D, k5E, k5F, k5G \ +) \ +{ \ + { k00, KC_NO, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, KC_NO, k1E, k1F, k1G }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, KC_NO, KC_NO, KC_NO }, \ + { k40, KC_NO, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, KC_NO, KC_NO, k4F, KC_NO }, \ + { k50, KC_NO, KC_NO, k53, KC_NO, KC_NO, KC_NO, k57, KC_NO, KC_NO, KC_NO, k5B, KC_NO, k5D, k5E, k5F, k5G }, \ +} + +#define LAYOUT_tkl_iso_wkl( \ + k00, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k3D, k1E, k1F, k1G, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4F, \ + k50, k53, k57, k5B, k5D, k5E, k5F, k5G \ +) \ +{ \ + { k00, KC_NO, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, KC_NO, k1E, k1F, k1G }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, KC_NO, KC_NO, KC_NO }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, KC_NO, KC_NO, k4F, KC_NO }, \ + { k50, KC_NO, KC_NO, k53, KC_NO, KC_NO, KC_NO, k57, KC_NO, KC_NO, KC_NO, k5B, KC_NO, k5D, k5E, k5F, k5G }, \ +} +// clang-format on diff --git a/keyboards/masterwork/classy_tkl/rev_a/rules.mk b/keyboards/masterwork/classy_tkl/rev_a/rules.mk new file mode 100644 index 000000000000..d7b8b9215468 --- /dev/null +++ b/keyboards/masterwork/classy_tkl/rev_a/rules.mk @@ -0,0 +1,44 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu + +# If you don't know the bootloader type, then you can specify the +# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line +# Teensy halfKay 512 +# Teensy++ halfKay 1024 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +# USBaspLoader 2048 +# OPT_DEFS += -DBOOTLOADER_SIZE=4096 + +# Build Options +# change yes to no to disable +# +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 +# 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 = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs + +# Supported layouts +LAYOUTS = tkl_ansi_wkl tkl_iso_wkl From 6b2f2fc5dca56181b723715607d6cd6af8c2a2b7 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 7 Sep 2020 08:20:47 +0200 Subject: [PATCH 45/78] Update keyboards/masterwork/classy_tkl/rev_a/rev_a.c Co-authored-by: Drashna Jaelre --- keyboards/masterwork/classy_tkl/rev_a/rev_a.c | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/keyboards/masterwork/classy_tkl/rev_a/rev_a.c b/keyboards/masterwork/classy_tkl/rev_a/rev_a.c index 56f8a995712d..c7a83751772a 100644 --- a/keyboards/masterwork/classy_tkl/rev_a/rev_a.c +++ b/keyboards/masterwork/classy_tkl/rev_a/rev_a.c @@ -50,20 +50,10 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { */ -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { - writePinHigh(CAPS_PIN); - } else { - writePinLow(CAPS_PIN); - } - - if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) { - writePinHigh(SCROLL_PIN); - } else { - writePinLow(SCROLL_PIN); +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if(res) { + writePin(CAPS_PIN, led_state.caps_lock); + writePin(SCROLL_PIN, led_state.scroll_lock); } - - led_set_user(usb_led); -} + return res From 3f8c51ee3f44de40842edd0c7b5f94041e129d90 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 7 Sep 2020 08:20:56 +0200 Subject: [PATCH 46/78] Update keyboards/masterwork/classy_tkl/rev_a/rules.mk Co-authored-by: Drashna Jaelre --- keyboards/masterwork/classy_tkl/rev_a/rules.mk | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/keyboards/masterwork/classy_tkl/rev_a/rules.mk b/keyboards/masterwork/classy_tkl/rev_a/rules.mk index d7b8b9215468..1592c925396a 100644 --- a/keyboards/masterwork/classy_tkl/rev_a/rules.mk +++ b/keyboards/masterwork/classy_tkl/rev_a/rules.mk @@ -2,23 +2,8 @@ MCU = atmega32u4 # Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp BOOTLOADER = atmel-dfu -# If you don't know the bootloader type, then you can specify the -# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line -# Teensy halfKay 512 -# Teensy++ halfKay 1024 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -# USBaspLoader 2048 -# OPT_DEFS += -DBOOTLOADER_SIZE=4096 # Build Options # change yes to no to disable From 44f69c72bbda099182d4dfdc618b573e12063381 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 7 Sep 2020 08:21:07 +0200 Subject: [PATCH 47/78] Update keyboards/masterwork/classy_tkl/rev_a/rules.mk Co-authored-by: Drashna Jaelre --- keyboards/masterwork/classy_tkl/rev_a/rules.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/masterwork/classy_tkl/rev_a/rules.mk b/keyboards/masterwork/classy_tkl/rev_a/rules.mk index 1592c925396a..21faadb82779 100644 --- a/keyboards/masterwork/classy_tkl/rev_a/rules.mk +++ b/keyboards/masterwork/classy_tkl/rev_a/rules.mk @@ -22,8 +22,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow MIDI_ENABLE = no # MIDI support BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE = no # Audio output on port C6 -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches -HD44780_ENABLE = no # Enable support for HD44780 based LCDs # Supported layouts LAYOUTS = tkl_ansi_wkl tkl_iso_wkl From 937975e25004776ba7b6790426682f7cc75b2883 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 7 Sep 2020 10:31:37 +0200 Subject: [PATCH 48/78] Update rev_a.c --- keyboards/masterwork/classy_tkl/rev_a/rev_a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/masterwork/classy_tkl/rev_a/rev_a.c b/keyboards/masterwork/classy_tkl/rev_a/rev_a.c index c7a83751772a..d84ba9bf6465 100644 --- a/keyboards/masterwork/classy_tkl/rev_a/rev_a.c +++ b/keyboards/masterwork/classy_tkl/rev_a/rev_a.c @@ -56,4 +56,4 @@ bool led_update_kb(led_t led_state) { writePin(CAPS_PIN, led_state.caps_lock); writePin(SCROLL_PIN, led_state.scroll_lock); } - return res + return res; From 827be10e76ff2397bafcfe06b323133f81dc726c Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Mon, 7 Sep 2020 12:13:36 +0200 Subject: [PATCH 49/78] Update rev_a.c --- keyboards/masterwork/classy_tkl/rev_a/rev_a.c | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/masterwork/classy_tkl/rev_a/rev_a.c b/keyboards/masterwork/classy_tkl/rev_a/rev_a.c index d84ba9bf6465..a95dcb6633f7 100644 --- a/keyboards/masterwork/classy_tkl/rev_a/rev_a.c +++ b/keyboards/masterwork/classy_tkl/rev_a/rev_a.c @@ -57,3 +57,4 @@ bool led_update_kb(led_t led_state) { writePin(SCROLL_PIN, led_state.scroll_lock); } return res; +} From df083b440c7e562b6bce3caa4cfdadb3a4d9782f Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Tue, 8 Sep 2020 10:21:50 +0200 Subject: [PATCH 50/78] updated name from masterwork to masterworks --- keyboards/{masterwork => masterworks}/classy_tkl/info.json | 0 .../classy_tkl/keymaps/default/config.h | 0 .../classy_tkl/keymaps/default/keymap.c | 0 .../classy_tkl/keymaps/default/readme.md | 0 .../classy_tkl/keymaps/default_tkl_ansi_wkl/config.h | 0 .../classy_tkl/keymaps/default_tkl_ansi_wkl/keymap.c | 0 .../classy_tkl/keymaps/default_tkl_ansi_wkl/readme.md | 0 .../classy_tkl/keymaps/default_tkl_iso_wkl/config.h | 0 .../classy_tkl/keymaps/default_tkl_iso_wkl/keymap.c | 0 .../classy_tkl/keymaps/default_tkl_iso_wkl/readme.md | 0 .../classy_tkl/keymaps/via/keymap.c | 0 .../classy_tkl/keymaps/via/rules.mk | 0 keyboards/{masterwork => masterworks}/classy_tkl/readme.md | 4 ++-- .../{masterwork => masterworks}/classy_tkl/rev_a/config.h | 4 ++-- .../{masterwork => masterworks}/classy_tkl/rev_a/rev_a.c | 0 .../{masterwork => masterworks}/classy_tkl/rev_a/rev_a.h | 0 .../{masterwork => masterworks}/classy_tkl/rev_a/rules.mk | 0 17 files changed, 4 insertions(+), 4 deletions(-) rename keyboards/{masterwork => masterworks}/classy_tkl/info.json (100%) rename keyboards/{masterwork => masterworks}/classy_tkl/keymaps/default/config.h (100%) rename keyboards/{masterwork => masterworks}/classy_tkl/keymaps/default/keymap.c (100%) rename keyboards/{masterwork => masterworks}/classy_tkl/keymaps/default/readme.md (100%) rename keyboards/{masterwork => masterworks}/classy_tkl/keymaps/default_tkl_ansi_wkl/config.h (100%) rename keyboards/{masterwork => masterworks}/classy_tkl/keymaps/default_tkl_ansi_wkl/keymap.c (100%) rename keyboards/{masterwork => masterworks}/classy_tkl/keymaps/default_tkl_ansi_wkl/readme.md (100%) rename keyboards/{masterwork => masterworks}/classy_tkl/keymaps/default_tkl_iso_wkl/config.h (100%) rename keyboards/{masterwork => masterworks}/classy_tkl/keymaps/default_tkl_iso_wkl/keymap.c (100%) rename keyboards/{masterwork => masterworks}/classy_tkl/keymaps/default_tkl_iso_wkl/readme.md (100%) rename keyboards/{masterwork => masterworks}/classy_tkl/keymaps/via/keymap.c (100%) rename keyboards/{masterwork => masterworks}/classy_tkl/keymaps/via/rules.mk (100%) rename keyboards/{masterwork => masterworks}/classy_tkl/readme.md (83%) rename keyboards/{masterwork => masterworks}/classy_tkl/rev_a/config.h (95%) rename keyboards/{masterwork => masterworks}/classy_tkl/rev_a/rev_a.c (100%) rename keyboards/{masterwork => masterworks}/classy_tkl/rev_a/rev_a.h (100%) rename keyboards/{masterwork => masterworks}/classy_tkl/rev_a/rules.mk (100%) diff --git a/keyboards/masterwork/classy_tkl/info.json b/keyboards/masterworks/classy_tkl/info.json similarity index 100% rename from keyboards/masterwork/classy_tkl/info.json rename to keyboards/masterworks/classy_tkl/info.json diff --git a/keyboards/masterwork/classy_tkl/keymaps/default/config.h b/keyboards/masterworks/classy_tkl/keymaps/default/config.h similarity index 100% rename from keyboards/masterwork/classy_tkl/keymaps/default/config.h rename to keyboards/masterworks/classy_tkl/keymaps/default/config.h diff --git a/keyboards/masterwork/classy_tkl/keymaps/default/keymap.c b/keyboards/masterworks/classy_tkl/keymaps/default/keymap.c similarity index 100% rename from keyboards/masterwork/classy_tkl/keymaps/default/keymap.c rename to keyboards/masterworks/classy_tkl/keymaps/default/keymap.c diff --git a/keyboards/masterwork/classy_tkl/keymaps/default/readme.md b/keyboards/masterworks/classy_tkl/keymaps/default/readme.md similarity index 100% rename from keyboards/masterwork/classy_tkl/keymaps/default/readme.md rename to keyboards/masterworks/classy_tkl/keymaps/default/readme.md diff --git a/keyboards/masterwork/classy_tkl/keymaps/default_tkl_ansi_wkl/config.h b/keyboards/masterworks/classy_tkl/keymaps/default_tkl_ansi_wkl/config.h similarity index 100% rename from keyboards/masterwork/classy_tkl/keymaps/default_tkl_ansi_wkl/config.h rename to keyboards/masterworks/classy_tkl/keymaps/default_tkl_ansi_wkl/config.h diff --git a/keyboards/masterwork/classy_tkl/keymaps/default_tkl_ansi_wkl/keymap.c b/keyboards/masterworks/classy_tkl/keymaps/default_tkl_ansi_wkl/keymap.c similarity index 100% rename from keyboards/masterwork/classy_tkl/keymaps/default_tkl_ansi_wkl/keymap.c rename to keyboards/masterworks/classy_tkl/keymaps/default_tkl_ansi_wkl/keymap.c diff --git a/keyboards/masterwork/classy_tkl/keymaps/default_tkl_ansi_wkl/readme.md b/keyboards/masterworks/classy_tkl/keymaps/default_tkl_ansi_wkl/readme.md similarity index 100% rename from keyboards/masterwork/classy_tkl/keymaps/default_tkl_ansi_wkl/readme.md rename to keyboards/masterworks/classy_tkl/keymaps/default_tkl_ansi_wkl/readme.md diff --git a/keyboards/masterwork/classy_tkl/keymaps/default_tkl_iso_wkl/config.h b/keyboards/masterworks/classy_tkl/keymaps/default_tkl_iso_wkl/config.h similarity index 100% rename from keyboards/masterwork/classy_tkl/keymaps/default_tkl_iso_wkl/config.h rename to keyboards/masterworks/classy_tkl/keymaps/default_tkl_iso_wkl/config.h diff --git a/keyboards/masterwork/classy_tkl/keymaps/default_tkl_iso_wkl/keymap.c b/keyboards/masterworks/classy_tkl/keymaps/default_tkl_iso_wkl/keymap.c similarity index 100% rename from keyboards/masterwork/classy_tkl/keymaps/default_tkl_iso_wkl/keymap.c rename to keyboards/masterworks/classy_tkl/keymaps/default_tkl_iso_wkl/keymap.c diff --git a/keyboards/masterwork/classy_tkl/keymaps/default_tkl_iso_wkl/readme.md b/keyboards/masterworks/classy_tkl/keymaps/default_tkl_iso_wkl/readme.md similarity index 100% rename from keyboards/masterwork/classy_tkl/keymaps/default_tkl_iso_wkl/readme.md rename to keyboards/masterworks/classy_tkl/keymaps/default_tkl_iso_wkl/readme.md diff --git a/keyboards/masterwork/classy_tkl/keymaps/via/keymap.c b/keyboards/masterworks/classy_tkl/keymaps/via/keymap.c similarity index 100% rename from keyboards/masterwork/classy_tkl/keymaps/via/keymap.c rename to keyboards/masterworks/classy_tkl/keymaps/via/keymap.c diff --git a/keyboards/masterwork/classy_tkl/keymaps/via/rules.mk b/keyboards/masterworks/classy_tkl/keymaps/via/rules.mk similarity index 100% rename from keyboards/masterwork/classy_tkl/keymaps/via/rules.mk rename to keyboards/masterworks/classy_tkl/keymaps/via/rules.mk diff --git a/keyboards/masterwork/classy_tkl/readme.md b/keyboards/masterworks/classy_tkl/readme.md similarity index 83% rename from keyboards/masterwork/classy_tkl/readme.md rename to keyboards/masterworks/classy_tkl/readme.md index 7c3941827091..ee9822fdcc38 100644 --- a/keyboards/masterwork/classy_tkl/readme.md +++ b/keyboards/masterworks/classy_tkl/readme.md @@ -5,11 +5,11 @@ A short description of the keyboard/project Keyboard Maintainer: [Mathias Andersson](https://github.com/wraul) -Hardware Supported: Classy TKL PCB +Hardware Supported: [Classy TKL PCB](https://github.com/4pplet/classyTKL) Hardware Availability: https://geekhack.org/index.php?topic=105933 Make example for this keyboard (after setting up your build environment): - make masterwork/classy_tkl:default + make masterworks/classy_tkl:default 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/masterwork/classy_tkl/rev_a/config.h b/keyboards/masterworks/classy_tkl/rev_a/config.h similarity index 95% rename from keyboards/masterwork/classy_tkl/rev_a/config.h rename to keyboards/masterworks/classy_tkl/rev_a/config.h index 91ef8ec190ad..06877820ec9b 100644 --- a/keyboards/masterwork/classy_tkl/rev_a/config.h +++ b/keyboards/masterworks/classy_tkl/rev_a/config.h @@ -20,10 +20,10 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D57 // "MW" = Masterwork +#define VENDOR_ID 0x4D57 // "MW" = Masterworks #define PRODUCT_ID 0x0001 #define DEVICE_VER 0x0001 -#define MANUFACTURER Masterwork +#define MANUFACTURER Masterworks #define PRODUCT Classy TKL #define DESCRIPTION A classy keyboard diff --git a/keyboards/masterwork/classy_tkl/rev_a/rev_a.c b/keyboards/masterworks/classy_tkl/rev_a/rev_a.c similarity index 100% rename from keyboards/masterwork/classy_tkl/rev_a/rev_a.c rename to keyboards/masterworks/classy_tkl/rev_a/rev_a.c diff --git a/keyboards/masterwork/classy_tkl/rev_a/rev_a.h b/keyboards/masterworks/classy_tkl/rev_a/rev_a.h similarity index 100% rename from keyboards/masterwork/classy_tkl/rev_a/rev_a.h rename to keyboards/masterworks/classy_tkl/rev_a/rev_a.h diff --git a/keyboards/masterwork/classy_tkl/rev_a/rules.mk b/keyboards/masterworks/classy_tkl/rev_a/rules.mk similarity index 100% rename from keyboards/masterwork/classy_tkl/rev_a/rules.mk rename to keyboards/masterworks/classy_tkl/rev_a/rules.mk From f0994afceb5727a3805ac86c674cf5920fa11b95 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Wed, 9 Sep 2020 08:15:01 +0200 Subject: [PATCH 51/78] Update keyboards/masterworks/classy_tkl/info.json Co-authored-by: Drashna Jaelre --- keyboards/masterworks/classy_tkl/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/masterworks/classy_tkl/info.json b/keyboards/masterworks/classy_tkl/info.json index 6cf97c9c8819..8fe94a787bca 100644 --- a/keyboards/masterworks/classy_tkl/info.json +++ b/keyboards/masterworks/classy_tkl/info.json @@ -189,7 +189,6 @@ ] }, "LAYOUT_tkl_iso_wkl": { - "key_count": 85, "layout": [ { "label": "Esc", "x": 0, "y": 0 }, { "label": "F1", "x": 2, "y": 0 }, From e0705e23421a4510a2601832407db10aecaa96c0 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Wed, 9 Sep 2020 08:15:09 +0200 Subject: [PATCH 52/78] Update keyboards/masterworks/classy_tkl/info.json Co-authored-by: Drashna Jaelre --- keyboards/masterworks/classy_tkl/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/masterworks/classy_tkl/info.json b/keyboards/masterworks/classy_tkl/info.json index 8fe94a787bca..ae1ee7a88170 100644 --- a/keyboards/masterworks/classy_tkl/info.json +++ b/keyboards/masterworks/classy_tkl/info.json @@ -100,7 +100,6 @@ ] }, "LAYOUT_tkl_ansi_wkl": { - "key_count": 84, "layout": [ { "label": "Esc", "x": 0, "y": 0 }, { "label": "F1", "x": 2, "y": 0 }, From 38d9c627922678153a709bdd6f6654dda41db751 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Wed, 9 Sep 2020 08:15:17 +0200 Subject: [PATCH 53/78] Update keyboards/masterworks/classy_tkl/info.json Co-authored-by: Drashna Jaelre --- keyboards/masterworks/classy_tkl/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/masterworks/classy_tkl/info.json b/keyboards/masterworks/classy_tkl/info.json index ae1ee7a88170..f569bce0f3b0 100644 --- a/keyboards/masterworks/classy_tkl/info.json +++ b/keyboards/masterworks/classy_tkl/info.json @@ -6,7 +6,6 @@ "height": 6.5, "layouts": { "LAYOUT_all": { - "key_count": 89, "layout": [ { "label": "Esc", "x": 0, "y": 0 }, { "label": "F1", "x": 2, "y": 0 }, From e9008dc6d556b31937c441c567c414664b99c9d9 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Wed, 9 Sep 2020 08:19:53 +0200 Subject: [PATCH 54/78] added license header to keymap --- .../classy_tkl/keymaps/default/keymap.c | 16 ++++++++++++++++ .../keymaps/default_tkl_ansi_wkl/keymap.c | 16 ++++++++++++++++ .../keymaps/default_tkl_iso_wkl/keymap.c | 16 ++++++++++++++++ .../masterworks/classy_tkl/keymaps/via/keymap.c | 16 ++++++++++++++++ 4 files changed, 64 insertions(+) diff --git a/keyboards/masterworks/classy_tkl/keymaps/default/keymap.c b/keyboards/masterworks/classy_tkl/keymaps/default/keymap.c index 541430973c0b..a87656059c68 100644 --- a/keyboards/masterworks/classy_tkl/keymaps/default/keymap.c +++ b/keyboards/masterworks/classy_tkl/keymaps/default/keymap.c @@ -1,3 +1,19 @@ +/* +Copyright 2020 Mathias Andersson + +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 . +*/ #include QMK_KEYBOARD_H // clang-format off diff --git a/keyboards/masterworks/classy_tkl/keymaps/default_tkl_ansi_wkl/keymap.c b/keyboards/masterworks/classy_tkl/keymaps/default_tkl_ansi_wkl/keymap.c index ce3bcd713c91..bb7b256fdadd 100644 --- a/keyboards/masterworks/classy_tkl/keymaps/default_tkl_ansi_wkl/keymap.c +++ b/keyboards/masterworks/classy_tkl/keymaps/default_tkl_ansi_wkl/keymap.c @@ -1,3 +1,19 @@ +/* +Copyright 2020 Mathias Andersson + +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 . +*/ #include QMK_KEYBOARD_H // clang-format off diff --git a/keyboards/masterworks/classy_tkl/keymaps/default_tkl_iso_wkl/keymap.c b/keyboards/masterworks/classy_tkl/keymaps/default_tkl_iso_wkl/keymap.c index 6e1e1d570583..1456ee02a204 100644 --- a/keyboards/masterworks/classy_tkl/keymaps/default_tkl_iso_wkl/keymap.c +++ b/keyboards/masterworks/classy_tkl/keymaps/default_tkl_iso_wkl/keymap.c @@ -1,3 +1,19 @@ +/* +Copyright 2020 Mathias Andersson + +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 . +*/ #include QMK_KEYBOARD_H // clang-format off diff --git a/keyboards/masterworks/classy_tkl/keymaps/via/keymap.c b/keyboards/masterworks/classy_tkl/keymaps/via/keymap.c index 218548f92f5e..c26f147eacd5 100644 --- a/keyboards/masterworks/classy_tkl/keymaps/via/keymap.c +++ b/keyboards/masterworks/classy_tkl/keymaps/via/keymap.c @@ -1,3 +1,19 @@ +/* +Copyright 2020 Mathias Andersson + +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 . +*/ #include QMK_KEYBOARD_H // clang-format off From 508fe4324b814f7a6b32cb484490ff580a4aa297 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Fri, 11 Sep 2020 15:24:48 +0200 Subject: [PATCH 55/78] Update keyboards/masterworks/classy_tkl/info.json Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/masterworks/classy_tkl/info.json | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/keyboards/masterworks/classy_tkl/info.json b/keyboards/masterworks/classy_tkl/info.json index f569bce0f3b0..5cf93dfbd94e 100644 --- a/keyboards/masterworks/classy_tkl/info.json +++ b/keyboards/masterworks/classy_tkl/info.json @@ -250,20 +250,7 @@ { "label": ":", "x": 10.75, "y": 3.5 }, { "label": "@", "x": 11.75, "y": 3.5 }, { "label": "~", "x": 12.75, "y": 3.5 }, - { - "label": "Enter", - "x": 13.75, - "y": 2.5, - "ks": [ - [0, 0], - [1.5, 0], - [1.5, 2], - [0.25, 2], - [0.25, 1], - [0, 1], - [0, 0] - ] - }, + { "label": "Enter", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 }, { "label": "Shift", "x": 0, "y": 4.5, "w": 1.25 }, { "label": "|", "x": 1.25, "y": 4.5 }, { "label": "Z", "x": 2.25, "y": 4.5 }, From b395c7ea4fa6ce189bf74029e874b0428e26d06c Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Fri, 11 Sep 2020 15:24:59 +0200 Subject: [PATCH 56/78] Update keyboards/masterworks/classy_tkl/rev_a/config.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/masterworks/classy_tkl/rev_a/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/masterworks/classy_tkl/rev_a/config.h b/keyboards/masterworks/classy_tkl/rev_a/config.h index 06877820ec9b..0821b1dfcec8 100644 --- a/keyboards/masterworks/classy_tkl/rev_a/config.h +++ b/keyboards/masterworks/classy_tkl/rev_a/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . #define DEVICE_VER 0x0001 #define MANUFACTURER Masterworks #define PRODUCT Classy TKL -#define DESCRIPTION A classy keyboard /* key matrix size */ #define MATRIX_ROWS 6 From 325d15b510d4a9fab2e7d87ff7eb7c4a41da648f Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Fri, 11 Sep 2020 15:25:10 +0200 Subject: [PATCH 57/78] Update keyboards/masterworks/classy_tkl/rev_a/rev_a.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/masterworks/classy_tkl/rev_a/rev_a.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/keyboards/masterworks/classy_tkl/rev_a/rev_a.c b/keyboards/masterworks/classy_tkl/rev_a/rev_a.c index a95dcb6633f7..58c0393db7e3 100644 --- a/keyboards/masterworks/classy_tkl/rev_a/rev_a.c +++ b/keyboards/masterworks/classy_tkl/rev_a/rev_a.c @@ -32,24 +32,6 @@ void matrix_init_kb(void) { matrix_init_user(); } -/* - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -*/ - bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { From 51240b0f477c0c7f5ea9df31d78d9cec20a4ad2b Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Fri, 11 Sep 2020 15:25:29 +0200 Subject: [PATCH 58/78] Update keyboards/masterworks/classy_tkl/rev_a/rules.mk Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/masterworks/classy_tkl/rev_a/rules.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/masterworks/classy_tkl/rev_a/rules.mk b/keyboards/masterworks/classy_tkl/rev_a/rules.mk index 21faadb82779..e18a7f055bf2 100644 --- a/keyboards/masterworks/classy_tkl/rev_a/rules.mk +++ b/keyboards/masterworks/classy_tkl/rev_a/rules.mk @@ -20,8 +20,8 @@ NKRO_ENABLE = yes # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow MIDI_ENABLE = no # MIDI support -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE = no # Audio output on port C6 +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output # Supported layouts LAYOUTS = tkl_ansi_wkl tkl_iso_wkl From 82cb82aa338d0416913d785440783dd8ea0b04dc Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Fri, 11 Sep 2020 15:25:39 +0200 Subject: [PATCH 59/78] Update keyboards/masterworks/classy_tkl/rev_a/rules.mk Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/masterworks/classy_tkl/rev_a/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/masterworks/classy_tkl/rev_a/rules.mk b/keyboards/masterworks/classy_tkl/rev_a/rules.mk index e18a7f055bf2..34bcd87a4aaa 100644 --- a/keyboards/masterworks/classy_tkl/rev_a/rules.mk +++ b/keyboards/masterworks/classy_tkl/rev_a/rules.mk @@ -19,7 +19,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = yes # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -MIDI_ENABLE = no # MIDI support BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output From a0643177e9710f8f40785ed1ab3035e1f98652c0 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Fri, 11 Sep 2020 15:26:54 +0200 Subject: [PATCH 60/78] Update keyboards/masterworks/classy_tkl/readme.md Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/masterworks/classy_tkl/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/masterworks/classy_tkl/readme.md b/keyboards/masterworks/classy_tkl/readme.md index ee9822fdcc38..e61bfb429b97 100644 --- a/keyboards/masterworks/classy_tkl/readme.md +++ b/keyboards/masterworks/classy_tkl/readme.md @@ -4,9 +4,9 @@ A short description of the keyboard/project -Keyboard Maintainer: [Mathias Andersson](https://github.com/wraul) -Hardware Supported: [Classy TKL PCB](https://github.com/4pplet/classyTKL) -Hardware Availability: https://geekhack.org/index.php?topic=105933 +* Keyboard Maintainer: [Mathias Andersson](https://github.com/wraul) +* Hardware Supported: [Classy TKL PCB](https://github.com/4pplet/classyTKL) +* Hardware Availability: https://geekhack.org/index.php?topic=105933 Make example for this keyboard (after setting up your build environment): From 3b1667287bfffcdf18b0a2b9e3b344cb69c12ed5 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Sat, 12 Sep 2020 14:41:39 +0200 Subject: [PATCH 61/78] Update keyboards/masterworks/classy_tkl/rev_a/rev_a.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/masterworks/classy_tkl/rev_a/rev_a.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/masterworks/classy_tkl/rev_a/rev_a.h b/keyboards/masterworks/classy_tkl/rev_a/rev_a.h index 7e55819dcd1a..73e68b598d07 100644 --- a/keyboards/masterworks/classy_tkl/rev_a/rev_a.h +++ b/keyboards/masterworks/classy_tkl/rev_a/rev_a.h @@ -63,8 +63,8 @@ #define LAYOUT_tkl_iso_wkl( \ k00, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k3D, k1E, k1F, k1G, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, k2F, k2G, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k2D, \ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4F, \ k50, k53, k57, k5B, k5D, k5E, k5F, k5G \ ) \ From 82104619e5b6842bfb5cceb3e0ce7a4230751b3a Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Sat, 12 Sep 2020 14:44:46 +0200 Subject: [PATCH 62/78] Update keyboards/masterworks/classy_tkl/readme.md Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/masterworks/classy_tkl/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/masterworks/classy_tkl/readme.md b/keyboards/masterworks/classy_tkl/readme.md index e61bfb429b97..0557ed7f4c4c 100644 --- a/keyboards/masterworks/classy_tkl/readme.md +++ b/keyboards/masterworks/classy_tkl/readme.md @@ -1,6 +1,6 @@ # Classy TKL -![Classy TKL](https://i.imgur.com/p1dxfYK.jpg) +![Classy TKL](https://i.imgur.com/p1dxfYKl.jpg) A short description of the keyboard/project From 36069e8a96fac5b6c680797754c66211e2ebb910 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Tue, 3 Nov 2020 11:57:57 +0100 Subject: [PATCH 63/78] adding bootleg and waffling60 rev b adding bootleg and waffling60 rev b --- keyboards/4pplet/bootleg/README.md | 12 +++ keyboards/4pplet/bootleg/info.json | 79 +++++++++++++++++++ .../4pplet/bootleg/keymaps/default/keymap.c | 34 ++++++++ keyboards/4pplet/bootleg/keymaps/via/keymap.c | 48 +++++++++++ keyboards/4pplet/bootleg/keymaps/via/rules.mk | 1 + keyboards/4pplet/bootleg/rev_a/config.h | 43 ++++++++++ keyboards/4pplet/bootleg/rev_a/rev_a.c | 17 ++++ keyboards/4pplet/bootleg/rev_a/rev_a.h | 34 ++++++++ keyboards/4pplet/bootleg/rev_a/rules.mk | 32 ++++++++ keyboards/4pplet/waffling60/README.md | 5 +- keyboards/4pplet/waffling60/info.json | 79 +++++++++++++++++++ .../waffling60/keymaps/default/keymap.c | 16 ++++ .../4pplet/waffling60/keymaps/via/keymap.c | 18 ++++- keyboards/4pplet/waffling60/rev_b/config.h | 56 +++++++++++++ keyboards/4pplet/waffling60/rev_b/rev_b.c | 40 ++++++++++ keyboards/4pplet/waffling60/rev_b/rev_b.h | 38 +++++++++ keyboards/4pplet/waffling60/rev_b/rules.mk | 31 ++++++++ 17 files changed, 580 insertions(+), 3 deletions(-) create mode 100644 keyboards/4pplet/bootleg/README.md create mode 100644 keyboards/4pplet/bootleg/info.json create mode 100644 keyboards/4pplet/bootleg/keymaps/default/keymap.c create mode 100644 keyboards/4pplet/bootleg/keymaps/via/keymap.c create mode 100644 keyboards/4pplet/bootleg/keymaps/via/rules.mk create mode 100644 keyboards/4pplet/bootleg/rev_a/config.h create mode 100644 keyboards/4pplet/bootleg/rev_a/rev_a.c create mode 100644 keyboards/4pplet/bootleg/rev_a/rev_a.h create mode 100644 keyboards/4pplet/bootleg/rev_a/rules.mk create mode 100644 keyboards/4pplet/waffling60/info.json create mode 100644 keyboards/4pplet/waffling60/rev_b/config.h create mode 100644 keyboards/4pplet/waffling60/rev_b/rev_b.c create mode 100644 keyboards/4pplet/waffling60/rev_b/rev_b.h create mode 100644 keyboards/4pplet/waffling60/rev_b/rules.mk diff --git a/keyboards/4pplet/bootleg/README.md b/keyboards/4pplet/bootleg/README.md new file mode 100644 index 000000000000..3ced86e616ab --- /dev/null +++ b/keyboards/4pplet/bootleg/README.md @@ -0,0 +1,12 @@ +# bootleg + +A 60% PCB for non tray-mount keyboards + +* Keyboard Maintainer: [4pplet](https://github.com/4pplet) +* Hardware Supported: bootleg Rev A + +Make example for this keyboard (after setting up your build environment): + + make 4pplet/bootleg/rev_a:default + +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/4pplet/bootleg/info.json b/keyboards/4pplet/bootleg/info.json new file mode 100644 index 000000000000..4abffda374fb --- /dev/null +++ b/keyboards/4pplet/bootleg/info.json @@ -0,0 +1,79 @@ +{ + "keyboard_name": "bootleg Rev A", + "url": "https://github.com/4pplet/bootlegs", + "maintainer": "4pplet", + "width": 15, + "height": 5, + "layouts": { + "LAYOUT_all": { + "layout": [ + { "label": "Esc", "x": 0, "y": 0 }, + { "label": "!", "x": 1, "y": 0 }, + { "label": "@", "x": 2, "y": 0 }, + { "label": "#", "x": 3, "y": 0 }, + { "label": "$", "x": 4, "y": 0 }, + { "label": "%", "x": 5, "y": 0 }, + { "label": "^", "x": 6, "y": 0 }, + { "label": "&", "x": 7, "y": 0 }, + { "label": "*", "x": 8, "y": 0 }, + { "label": "(", "x": 9, "y": 0 }, + { "label": ")", "x": 10, "y": 0 }, + { "label": "_", "x": 11, "y": 0 }, + { "label": "+", "x": 12, "y": 0 }, + { "label": "|", "x": 13, "y": 0 }, + { "label": "~", "x": 14, "y": 0 }, + { "label": "Tab", "x": 0, "y": 1, "w": 1.5 }, + { "label": "Q", "x": 1.5, "y": 1 }, + { "label": "W", "x": 2.5, "y": 1 }, + { "label": "E", "x": 3.5, "y": 1 }, + { "label": "R", "x": 4.5, "y": 1 }, + { "label": "T", "x": 5.5, "y": 1 }, + { "label": "Y", "x": 6.5, "y": 1 }, + { "label": "U", "x": 7.5, "y": 1 }, + { "label": "I", "x": 8.5, "y": 1 }, + { "label": "O", "x": 9.5, "y": 1 }, + { "label": "P", "x": 10.5, "y": 1 }, + { "label": "{", "x": 11.5, "y": 1 }, + { "label": "}", "x": 12.5, "y": 1 }, + { "label": "Backsp.", "x": 13.5, "y": 1, "w": 1.5 }, + { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 }, + { "label": "A", "x": 1.75, "y": 2 }, + { "label": "S", "x": 2.75, "y": 2 }, + { "label": "D", "x": 3.75, "y": 2 }, + { "label": "F", "x": 4.75, "y": 2 }, + { "label": "G", "x": 5.75, "y": 2 }, + { "label": "H", "x": 6.75, "y": 2 }, + { "label": "J", "x": 7.75, "y": 2 }, + { "label": "K", "x": 8.75, "y": 2 }, + { "label": "L", "x": 9.75, "y": 2 }, + { "label": ":", "x": 10.75, "y": 2 }, + { "label": "\"", "x": 11.75, "y": 2 }, + { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 }, + { "label": "Shift", "x": 0, "y": 3, "w": 1.25 }, + { "label": "|", "x": 1.25, "y": 3 }, + { "label": "Z", "x": 2.25, "y": 3 }, + { "label": "X", "x": 3.25, "y": 3 }, + { "label": "C", "x": 4.25, "y": 3 }, + { "label": "V", "x": 5.25, "y": 3 }, + { "label": "B", "x": 6.25, "y": 3 }, + { "label": "N", "x": 7.25, "y": 3 }, + { "label": "M", "x": 8.25, "y": 3 }, + { "label": "<", "x": 9.25, "y": 3 }, + { "label": ">", "x": 10.25, "y": 3 }, + { "label": "?", "x": 11.25, "y": 3 }, + { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 }, + { "label": "Fn", "x": 14, "y": 3, "w": 1 }, + { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 }, + { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 }, + { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 }, + { "label": "Space1", "x": 3.75, "y": 4, "w": 2.25 }, + { "label": "Space2", "x": 6, "y": 4, "w": 1.25 }, + { "label": "Space3", "x": 7.25, "y": 4, "w": 2.75 }, + { "label": "Alt", "x": 10, "y": 4, "w": 1.25 }, + { "label": "Menu", "x": 11.25, "y": 4, "w": 1.25 }, + { "label": "Win", "x": 12.5, "y": 4, "w": 1.25 }, + { "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25 } + ] + } + } +} diff --git a/keyboards/4pplet/bootleg/keymaps/default/keymap.c b/keyboards/4pplet/bootleg/keymaps/default/keymap.c new file mode 100644 index 000000000000..c9ae421af1e7 --- /dev/null +++ b/keyboards/4pplet/bootleg/keymaps/default/keymap.c @@ -0,0 +1,34 @@ +/* +Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.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 . +*/ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +// main layer +[0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, MO(1)), +// basic function layer +[1] = LAYOUT_all( + RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) +}; diff --git a/keyboards/4pplet/bootleg/keymaps/via/keymap.c b/keyboards/4pplet/bootleg/keymaps/via/keymap.c new file mode 100644 index 000000000000..b83266d8c12c --- /dev/null +++ b/keyboards/4pplet/bootleg/keymaps/via/keymap.c @@ -0,0 +1,48 @@ +/* +Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.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 . +*/ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +// main layer +[0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, MO(1)), +// basic function layer +[1] = LAYOUT_all( + RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), +// extra layer for VIA +[2] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), +// extra layer for VIA +[3] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) +}; diff --git a/keyboards/4pplet/bootleg/keymaps/via/rules.mk b/keyboards/4pplet/bootleg/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/4pplet/bootleg/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/4pplet/bootleg/rev_a/config.h b/keyboards/4pplet/bootleg/rev_a/config.h new file mode 100644 index 000000000000..9ff971e42c2e --- /dev/null +++ b/keyboards/4pplet/bootleg/rev_a/config.h @@ -0,0 +1,43 @@ +/* +Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.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 . +*/ +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x4444 +#define PRODUCT_ID 0x0004 +#define DEVICE_VER 0x0001 +#define MANUFACTURER 4pplet +#define PRODUCT bootleg Rev A +#define DESCRIPTION + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 +// ROWS: Top to bottom, COLS: Left to right +#define MATRIX_ROW_PINS {D0,C2,C4,D4,D2} +#define MATRIX_COL_PINS {C5,C6,C7,B7,B6,B5,B4,B3,B2,B1,B0,D6,D5,D3,D1} + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +#define QMK_ESC_OUTPUT C4 // usually COL +#define QMK_ESC_INPUT D0 // usually ROW diff --git a/keyboards/4pplet/bootleg/rev_a/rev_a.c b/keyboards/4pplet/bootleg/rev_a/rev_a.c new file mode 100644 index 000000000000..b4f233d379e8 --- /dev/null +++ b/keyboards/4pplet/bootleg/rev_a/rev_a.c @@ -0,0 +1,17 @@ +/* +Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.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 . +*/ +#include "rev_a.h" diff --git a/keyboards/4pplet/bootleg/rev_a/rev_a.h b/keyboards/4pplet/bootleg/rev_a/rev_a.h new file mode 100644 index 000000000000..f9bbb445cb5d --- /dev/null +++ b/keyboards/4pplet/bootleg/rev_a/rev_a.h @@ -0,0 +1,34 @@ +/* +Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.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 . +*/ +#pragma once + +#include "quantum.h" + +#define LAYOUT_all( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1d, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ + k40, k41, k43, k45, k47, k48, k4a, k4b, k4d, k4e \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1d, k1e}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d}, \ + {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e}, \ + {k40, k41, k43, k45, k47, k48, k4a, k4b, k4d, k4e } \ +} diff --git a/keyboards/4pplet/bootleg/rev_a/rules.mk b/keyboards/4pplet/bootleg/rev_a/rules.mk new file mode 100644 index 000000000000..f0a123479597 --- /dev/null +++ b/keyboards/4pplet/bootleg/rev_a/rules.mk @@ -0,0 +1,32 @@ +# MCU name +MCU = atmega32u2 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # 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 +MIDI_ENABLE = no # MIDI support +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs +UNICODE_ENABLE = no # Unicode diff --git a/keyboards/4pplet/waffling60/README.md b/keyboards/4pplet/waffling60/README.md index a6b56a69ea7f..bf5fda880387 100644 --- a/keyboards/4pplet/waffling60/README.md +++ b/keyboards/4pplet/waffling60/README.md @@ -9,6 +9,7 @@ More info: https://geekhack.org/index.php?topic=103531.0 Make example for this keyboard (after setting up your build environment): - make 4pplet/steezy60/rev_a:default + make 4pplet/waffling60/rev_a:default + make 4pplet/waffling60/rev_b:default -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). \ No newline at end of file +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/4pplet/waffling60/info.json b/keyboards/4pplet/waffling60/info.json new file mode 100644 index 000000000000..6c5c83fad6c1 --- /dev/null +++ b/keyboards/4pplet/waffling60/info.json @@ -0,0 +1,79 @@ +{ + "keyboard_name": "Waffling60 Rev A", + "url": "https://github.com/4pplet/waffling60", + "maintainer": "4pplet", + "width": 15, + "height": 5, + "layouts": { + "LAYOUT_all": { + "layout": [ + { "label": "Esc", "x": 0, "y": 0 }, + { "label": "!", "x": 1, "y": 0 }, + { "label": "@", "x": 2, "y": 0 }, + { "label": "#", "x": 3, "y": 0 }, + { "label": "$", "x": 4, "y": 0 }, + { "label": "%", "x": 5, "y": 0 }, + { "label": "^", "x": 6, "y": 0 }, + { "label": "&", "x": 7, "y": 0 }, + { "label": "*", "x": 8, "y": 0 }, + { "label": "(", "x": 9, "y": 0 }, + { "label": ")", "x": 10, "y": 0 }, + { "label": "_", "x": 11, "y": 0 }, + { "label": "+", "x": 12, "y": 0 }, + { "label": "|", "x": 13, "y": 0 }, + { "label": "~", "x": 14, "y": 0 }, + { "label": "Tab", "x": 0, "y": 1, "w": 1.5 }, + { "label": "Q", "x": 1.5, "y": 1 }, + { "label": "W", "x": 2.5, "y": 1 }, + { "label": "E", "x": 3.5, "y": 1 }, + { "label": "R", "x": 4.5, "y": 1 }, + { "label": "T", "x": 5.5, "y": 1 }, + { "label": "Y", "x": 6.5, "y": 1 }, + { "label": "U", "x": 7.5, "y": 1 }, + { "label": "I", "x": 8.5, "y": 1 }, + { "label": "O", "x": 9.5, "y": 1 }, + { "label": "P", "x": 10.5, "y": 1 }, + { "label": "{", "x": 11.5, "y": 1 }, + { "label": "}", "x": 12.5, "y": 1 }, + { "label": "Backsp.", "x": 13.5, "y": 1, "w": 1.5 }, + { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 }, + { "label": "A", "x": 1.75, "y": 2 }, + { "label": "S", "x": 2.75, "y": 2 }, + { "label": "D", "x": 3.75, "y": 2 }, + { "label": "F", "x": 4.75, "y": 2 }, + { "label": "G", "x": 5.75, "y": 2 }, + { "label": "H", "x": 6.75, "y": 2 }, + { "label": "J", "x": 7.75, "y": 2 }, + { "label": "K", "x": 8.75, "y": 2 }, + { "label": "L", "x": 9.75, "y": 2 }, + { "label": ":", "x": 10.75, "y": 2 }, + { "label": "\"", "x": 11.75, "y": 2 }, + { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 }, + { "label": "Shift", "x": 0, "y": 3, "w": 1.25 }, + { "label": "|", "x": 1.25, "y": 3 }, + { "label": "Z", "x": 2.25, "y": 3 }, + { "label": "X", "x": 3.25, "y": 3 }, + { "label": "C", "x": 4.25, "y": 3 }, + { "label": "V", "x": 5.25, "y": 3 }, + { "label": "B", "x": 6.25, "y": 3 }, + { "label": "N", "x": 7.25, "y": 3 }, + { "label": "M", "x": 8.25, "y": 3 }, + { "label": "<", "x": 9.25, "y": 3 }, + { "label": ">", "x": 10.25, "y": 3 }, + { "label": "?", "x": 11.25, "y": 3 }, + { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 }, + { "label": "Fn", "x": 14, "y": 3, "w": 1 }, + { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 }, + { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 }, + { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 }, + { "label": "Space1", "x": 3.75, "y": 4, "w": 2.25 }, + { "label": "Space2", "x": 6, "y": 4, "w": 1.25 }, + { "label": "Space3", "x": 7.25, "y": 4, "w": 2.75 }, + { "label": "Alt", "x": 10, "y": 4, "w": 1.25 }, + { "label": "Menu", "x": 11.25, "y": 4, "w": 1.25 }, + { "label": "Win", "x": 12.5, "y": 4, "w": 1.25 }, + { "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25 } + ] + } + } +} diff --git a/keyboards/4pplet/waffling60/keymaps/default/keymap.c b/keyboards/4pplet/waffling60/keymaps/default/keymap.c index d61c3f6c548c..c9ae421af1e7 100644 --- a/keyboards/4pplet/waffling60/keymaps/default/keymap.c +++ b/keyboards/4pplet/waffling60/keymaps/default/keymap.c @@ -1,3 +1,19 @@ +/* +Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.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 . +*/ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/4pplet/waffling60/keymaps/via/keymap.c b/keyboards/4pplet/waffling60/keymaps/via/keymap.c index 40ca2a28fe6b..d20c6bf06cdd 100644 --- a/keyboards/4pplet/waffling60/keymaps/via/keymap.c +++ b/keyboards/4pplet/waffling60/keymaps/via/keymap.c @@ -1,3 +1,19 @@ +/* +Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.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 . +*/ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -29,4 +45,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) -}; +}; \ No newline at end of file diff --git a/keyboards/4pplet/waffling60/rev_b/config.h b/keyboards/4pplet/waffling60/rev_b/config.h new file mode 100644 index 000000000000..686d458747a1 --- /dev/null +++ b/keyboards/4pplet/waffling60/rev_b/config.h @@ -0,0 +1,56 @@ +/* +Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.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 . +*/ +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x4444 +#define PRODUCT_ID 0x0005 +#define DEVICE_VER 0x0002 +#define MANUFACTURER 4pplet +#define PRODUCT waffling60 Rev B +#define DESCRIPTION 4pplet Keyboards + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 14 +// ROWS: Top to bottom, COLS: Left to right + +#define MATRIX_ROW_PINS {C2,D0,B0,D6,D5} +#define MATRIX_COL_PINS {C4,C5,D2,C6,C7,B7,B6,B5,B4,B3,B2,B1,D1,D4} + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* define if matrix has ghost */ +//#define MATRIX_HAS_GHOST + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +#define QMK_ESC_OUTPUT C2 // usually COL +#define QMK_ESC_INPUT C4 // usually ROW + +#define RGB_DI_PIN D3 +#define RGBLED_NUM 1 +#define BACKLIGHT_LEVELS 5 + +#define RGBLIGHT_HUE_STEP 8 +#define RGBLIGHT_SAT_STEP 8 +#define RGBLIGHT_VAL_STEP 8 +#define RGBLIGHT_ANIMATIONS diff --git a/keyboards/4pplet/waffling60/rev_b/rev_b.c b/keyboards/4pplet/waffling60/rev_b/rev_b.c new file mode 100644 index 000000000000..7f42d518b0ba --- /dev/null +++ b/keyboards/4pplet/waffling60/rev_b/rev_b.c @@ -0,0 +1,40 @@ +/* +Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.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 . +*/ +#include "rev_b.h" + +void matrix_init_kb(void) { + // put your keyboard start-up code here + // runs once when the firmware starts up + + matrix_init_user(); +} + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if(CAPS_LOCK_ENABLE){ + if(res) { + if(led_state.caps_lock){ + rgblight_enable(); + rgblight_mode(1); + rgblight_sethsv_noeeprom(CAPS_LOCK_COLOR); + } + else + rgblight_disable_noeeprom(); + } + } + return res; +} diff --git a/keyboards/4pplet/waffling60/rev_b/rev_b.h b/keyboards/4pplet/waffling60/rev_b/rev_b.h new file mode 100644 index 000000000000..e6dc7a15dba5 --- /dev/null +++ b/keyboards/4pplet/waffling60/rev_b/rev_b.h @@ -0,0 +1,38 @@ +/* +Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.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 . +*/ +#pragma once + +// defines to set RGB-led behaviour. Off by default +#define CAPS_LOCK_ENABLE false +#define CAPS_LOCK_COLOR HSV_ORANGE + +#include "quantum.h" + +#define LAYOUT_all( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k1d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ + k40, k41, k42, k44, k46, k48, k4a, k4b, k4c, k4d \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \ + {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \ + {k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, KC_NO, k4a, k4b, k4c, k4d}, \ +} diff --git a/keyboards/4pplet/waffling60/rev_b/rules.mk b/keyboards/4pplet/waffling60/rev_b/rules.mk new file mode 100644 index 000000000000..e5a62c69a733 --- /dev/null +++ b/keyboards/4pplet/waffling60/rev_b/rules.mk @@ -0,0 +1,31 @@ +# MCU name +MCU = atmega32u2 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # 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 +MIDI_ENABLE = no # MIDI support +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +UNICODE_ENABLE = no # Unicode From dce99654e1a621cd0f799e6d6d9b66867d8e4c19 Mon Sep 17 00:00:00 2001 From: 4pplet Date: Mon, 23 Nov 2020 12:56:22 +0100 Subject: [PATCH 64/78] added readme for each revision, since lint check failed added readme for each revision, since lint check failed. --- keyboards/4pplet/waffling60/rev_a/readme.md | 14 ++++++++++++++ keyboards/4pplet/waffling60/rev_b/readme.md | 14 ++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 keyboards/4pplet/waffling60/rev_a/readme.md create mode 100644 keyboards/4pplet/waffling60/rev_b/readme.md diff --git a/keyboards/4pplet/waffling60/rev_a/readme.md b/keyboards/4pplet/waffling60/rev_a/readme.md new file mode 100644 index 000000000000..1519fa66fcdc --- /dev/null +++ b/keyboards/4pplet/waffling60/rev_a/readme.md @@ -0,0 +1,14 @@ +# waffling60 + +A 60% PCB for MX switches, one hot swap and one solder-pcb version with decent layout support. + +More info: https://geekhack.org/index.php?topic=103531.0 + +* Keyboard Maintainer: [4pplet](https://github.com/4pplet) +* Hardware Supported: [waffling60](https://github.com/4pplet/waffling60) + +Make example for this keyboard (after setting up your build environment): + + make 4pplet/waffling60/rev_a:default + +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/4pplet/waffling60/rev_b/readme.md b/keyboards/4pplet/waffling60/rev_b/readme.md new file mode 100644 index 000000000000..27ca8ca9cadd --- /dev/null +++ b/keyboards/4pplet/waffling60/rev_b/readme.md @@ -0,0 +1,14 @@ +# waffling60 + +A 60% PCB for MX switches, one hot swap and one solder-pcb version with decent layout support. + +More info: https://geekhack.org/index.php?topic=103531.0 + +* Keyboard Maintainer: [4pplet](https://github.com/4pplet) +* Hardware Supported: [waffling60](https://github.com/4pplet/waffling60) + +Make example for this keyboard (after setting up your build environment): + + make 4pplet/waffling60/rev_b:default + +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). From 71bf5ca3793171296303ca474831d9107b54fbb7 Mon Sep 17 00:00:00 2001 From: 4pplet Date: Mon, 23 Nov 2020 12:59:57 +0100 Subject: [PATCH 65/78] adding readme for rev_a bootleg, lint fail. adding readme for rev_a bootleg, lint fail. --- keyboards/4pplet/bootleg/rev_a/README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 keyboards/4pplet/bootleg/rev_a/README.md diff --git a/keyboards/4pplet/bootleg/rev_a/README.md b/keyboards/4pplet/bootleg/rev_a/README.md new file mode 100644 index 000000000000..3ced86e616ab --- /dev/null +++ b/keyboards/4pplet/bootleg/rev_a/README.md @@ -0,0 +1,12 @@ +# bootleg + +A 60% PCB for non tray-mount keyboards + +* Keyboard Maintainer: [4pplet](https://github.com/4pplet) +* Hardware Supported: bootleg Rev A + +Make example for this keyboard (after setting up your build environment): + + make 4pplet/bootleg/rev_a:default + +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). From aa59e1a33b767bdc21d9bdcbc8f4bdf8e1147bda Mon Sep 17 00:00:00 2001 From: 4pplet Date: Mon, 23 Nov 2020 13:04:56 +0100 Subject: [PATCH 66/78] Delete README.md --- keyboards/4pplet/bootleg/rev_a/README.md | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 keyboards/4pplet/bootleg/rev_a/README.md diff --git a/keyboards/4pplet/bootleg/rev_a/README.md b/keyboards/4pplet/bootleg/rev_a/README.md deleted file mode 100644 index 3ced86e616ab..000000000000 --- a/keyboards/4pplet/bootleg/rev_a/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# bootleg - -A 60% PCB for non tray-mount keyboards - -* Keyboard Maintainer: [4pplet](https://github.com/4pplet) -* Hardware Supported: bootleg Rev A - -Make example for this keyboard (after setting up your build environment): - - make 4pplet/bootleg/rev_a:default - -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). From 7ca332fd51970b426978eaac622215f66b39892d Mon Sep 17 00:00:00 2001 From: 4pplet Date: Mon, 23 Nov 2020 13:05:15 +0100 Subject: [PATCH 67/78] Create readme.md --- keyboards/4pplet/bootleg/rev_a/readme.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 keyboards/4pplet/bootleg/rev_a/readme.md diff --git a/keyboards/4pplet/bootleg/rev_a/readme.md b/keyboards/4pplet/bootleg/rev_a/readme.md new file mode 100644 index 000000000000..3ced86e616ab --- /dev/null +++ b/keyboards/4pplet/bootleg/rev_a/readme.md @@ -0,0 +1,12 @@ +# bootleg + +A 60% PCB for non tray-mount keyboards + +* Keyboard Maintainer: [4pplet](https://github.com/4pplet) +* Hardware Supported: bootleg Rev A + +Make example for this keyboard (after setting up your build environment): + + make 4pplet/bootleg/rev_a:default + +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). From a5430783f308a18941c3d31c1f14f5a4d3bc4117 Mon Sep 17 00:00:00 2001 From: 4pplet Date: Mon, 23 Nov 2020 14:20:32 +0100 Subject: [PATCH 68/78] Update rules.mk --- keyboards/4pplet/waffling60/rev_b/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/4pplet/waffling60/rev_b/rules.mk b/keyboards/4pplet/waffling60/rev_b/rules.mk index e5a62c69a733..5e616bbf712c 100644 --- a/keyboards/4pplet/waffling60/rev_b/rules.mk +++ b/keyboards/4pplet/waffling60/rev_b/rules.mk @@ -24,7 +24,7 @@ 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 +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow MIDI_ENABLE = no # MIDI support AUDIO_ENABLE = no # Audio output on port C6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches From 982ca1eac147e32d10a6a123635e8d524ed82661 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Thu, 26 Nov 2020 12:55:46 +0100 Subject: [PATCH 69/78] Update keyboards/4pplet/bootleg/rev_a/rules.mk Co-authored-by: Ryan --- keyboards/4pplet/bootleg/rev_a/rules.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/keyboards/4pplet/bootleg/rev_a/rules.mk b/keyboards/4pplet/bootleg/rev_a/rules.mk index f0a123479597..a02d37d70634 100644 --- a/keyboards/4pplet/bootleg/rev_a/rules.mk +++ b/keyboards/4pplet/bootleg/rev_a/rules.mk @@ -2,13 +2,6 @@ MCU = atmega32u2 # Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp BOOTLOADER = atmel-dfu # Build Options From a4c41c12876dd6071b84240137fae9a159c9812a Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Thu, 26 Nov 2020 12:55:54 +0100 Subject: [PATCH 70/78] Update keyboards/4pplet/bootleg/rev_a/config.h Co-authored-by: Ryan --- keyboards/4pplet/bootleg/rev_a/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/4pplet/bootleg/rev_a/config.h b/keyboards/4pplet/bootleg/rev_a/config.h index 9ff971e42c2e..4d3122afd2cb 100644 --- a/keyboards/4pplet/bootleg/rev_a/config.h +++ b/keyboards/4pplet/bootleg/rev_a/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define DEVICE_VER 0x0001 #define MANUFACTURER 4pplet #define PRODUCT bootleg Rev A -#define DESCRIPTION /* key matrix size */ #define MATRIX_ROWS 5 From c2c3e4772328cff49e43d31f892b43ba78427d20 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Thu, 26 Nov 2020 12:56:04 +0100 Subject: [PATCH 71/78] Update keyboards/4pplet/waffling60/rev_b/config.h Co-authored-by: Ryan --- keyboards/4pplet/waffling60/rev_b/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/4pplet/waffling60/rev_b/config.h b/keyboards/4pplet/waffling60/rev_b/config.h index 686d458747a1..eb9882d73816 100644 --- a/keyboards/4pplet/waffling60/rev_b/config.h +++ b/keyboards/4pplet/waffling60/rev_b/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define DEVICE_VER 0x0002 #define MANUFACTURER 4pplet #define PRODUCT waffling60 Rev B -#define DESCRIPTION 4pplet Keyboards /* key matrix size */ #define MATRIX_ROWS 5 From 3d3d3471fce9f02ebf0d8721307d824dede443b2 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Thu, 26 Nov 2020 12:56:11 +0100 Subject: [PATCH 72/78] Update keyboards/4pplet/waffling60/rev_b/rules.mk Co-authored-by: Ryan --- keyboards/4pplet/waffling60/rev_b/rules.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/keyboards/4pplet/waffling60/rev_b/rules.mk b/keyboards/4pplet/waffling60/rev_b/rules.mk index 5e616bbf712c..9da62b43dacf 100644 --- a/keyboards/4pplet/waffling60/rev_b/rules.mk +++ b/keyboards/4pplet/waffling60/rev_b/rules.mk @@ -2,13 +2,6 @@ MCU = atmega32u2 # Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp BOOTLOADER = atmel-dfu # Build Options From 2be514260039891f1125bd7e68552d17bd9c1ff0 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Thu, 26 Nov 2020 12:56:19 +0100 Subject: [PATCH 73/78] Update keyboards/4pplet/waffling60/rev_b/rev_b.c Co-authored-by: Ryan --- keyboards/4pplet/waffling60/rev_b/rev_b.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/keyboards/4pplet/waffling60/rev_b/rev_b.c b/keyboards/4pplet/waffling60/rev_b/rev_b.c index 7f42d518b0ba..5f701b57f43b 100644 --- a/keyboards/4pplet/waffling60/rev_b/rev_b.c +++ b/keyboards/4pplet/waffling60/rev_b/rev_b.c @@ -16,13 +16,6 @@ along with this program. If not, see . */ #include "rev_b.h" -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(CAPS_LOCK_ENABLE){ From f71250342720352ef8f714cc553e84769abe263b Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Thu, 26 Nov 2020 12:56:27 +0100 Subject: [PATCH 74/78] Update keyboards/4pplet/waffling60/rev_b/rules.mk Co-authored-by: Ryan --- keyboards/4pplet/waffling60/rev_b/rules.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/keyboards/4pplet/waffling60/rev_b/rules.mk b/keyboards/4pplet/waffling60/rev_b/rules.mk index 9da62b43dacf..6ed906f1de2c 100644 --- a/keyboards/4pplet/waffling60/rev_b/rules.mk +++ b/keyboards/4pplet/waffling60/rev_b/rules.mk @@ -17,8 +17,6 @@ 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 = yes # Enable keyboard RGB underglow -MIDI_ENABLE = no # MIDI support -AUDIO_ENABLE = no # Audio output on port C6 -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches -UNICODE_ENABLE = no # Unicode +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +BLUETOOTH_ENABLE # Enable Bluetooth +AUDIO_ENABLE = no # Audio output From dcfce2fbcf2e3ebaeb6b2335ebe1d703a8086e66 Mon Sep 17 00:00:00 2001 From: 4pplet <4pplet@protonmail.com> Date: Thu, 26 Nov 2020 12:56:34 +0100 Subject: [PATCH 75/78] Update keyboards/4pplet/bootleg/rev_a/rules.mk Co-authored-by: Ryan --- keyboards/4pplet/bootleg/rev_a/rules.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/keyboards/4pplet/bootleg/rev_a/rules.mk b/keyboards/4pplet/bootleg/rev_a/rules.mk index a02d37d70634..380c35d4f7a4 100644 --- a/keyboards/4pplet/bootleg/rev_a/rules.mk +++ b/keyboards/4pplet/bootleg/rev_a/rules.mk @@ -18,8 +18,5 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -MIDI_ENABLE = no # MIDI support -AUDIO_ENABLE = no # Audio output on port C6 -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches -HD44780_ENABLE = no # Enable support for HD44780 based LCDs -UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output From 9f4d10cfaee05b1d8f91495a132dbd7c3dadb699 Mon Sep 17 00:00:00 2001 From: 4pplet Date: Thu, 26 Nov 2020 12:57:36 +0100 Subject: [PATCH 76/78] Delete README.md --- keyboards/4pplet/bootleg/README.md | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 keyboards/4pplet/bootleg/README.md diff --git a/keyboards/4pplet/bootleg/README.md b/keyboards/4pplet/bootleg/README.md deleted file mode 100644 index 3ced86e616ab..000000000000 --- a/keyboards/4pplet/bootleg/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# bootleg - -A 60% PCB for non tray-mount keyboards - -* Keyboard Maintainer: [4pplet](https://github.com/4pplet) -* Hardware Supported: bootleg Rev A - -Make example for this keyboard (after setting up your build environment): - - make 4pplet/bootleg/rev_a:default - -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). From 9ccc03eb57723f237e9156df93fbbd91a179a65d Mon Sep 17 00:00:00 2001 From: 4pplet Date: Thu, 26 Nov 2020 12:57:47 +0100 Subject: [PATCH 77/78] Create readme.md --- keyboards/4pplet/bootleg/readme.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 keyboards/4pplet/bootleg/readme.md diff --git a/keyboards/4pplet/bootleg/readme.md b/keyboards/4pplet/bootleg/readme.md new file mode 100644 index 000000000000..3ced86e616ab --- /dev/null +++ b/keyboards/4pplet/bootleg/readme.md @@ -0,0 +1,12 @@ +# bootleg + +A 60% PCB for non tray-mount keyboards + +* Keyboard Maintainer: [4pplet](https://github.com/4pplet) +* Hardware Supported: bootleg Rev A + +Make example for this keyboard (after setting up your build environment): + + make 4pplet/bootleg/rev_a:default + +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). From cf080674713d2b548499fff33b6f9a1233a48df0 Mon Sep 17 00:00:00 2001 From: 4pplet Date: Fri, 27 Nov 2020 00:13:49 +0100 Subject: [PATCH 78/78] Update rules.mk --- keyboards/4pplet/waffling60/rev_b/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/4pplet/waffling60/rev_b/rules.mk b/keyboards/4pplet/waffling60/rev_b/rules.mk index 6ed906f1de2c..69c524b7366d 100644 --- a/keyboards/4pplet/waffling60/rev_b/rules.mk +++ b/keyboards/4pplet/waffling60/rev_b/rules.mk @@ -18,5 +18,5 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -BLUETOOTH_ENABLE # Enable Bluetooth +BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output