From a96658bcc182b83b5a54d0b6965c951248966e04 Mon Sep 17 00:00:00 2001 From: NCKiser Date: Mon, 28 Aug 2023 14:23:18 -0500 Subject: [PATCH 01/11] Added kiserdesigns keyboard folder and Madeline keyboard --- keyboards/kiserdesigns/madeline/config.h | 53 +++++++++++++ keyboards/kiserdesigns/madeline/info.json | 67 ++++++++++++++++ .../madeline/keymaps/default/config.h | 23 ++++++ .../madeline/keymaps/default/keymap.c | 78 +++++++++++++++++++ .../madeline/keymaps/default/rules.mk | 2 + keyboards/kiserdesigns/madeline/madeline.c | 16 ++++ keyboards/kiserdesigns/madeline/madeline.h | 33 ++++++++ keyboards/kiserdesigns/madeline/readme.md | 23 ++++++ keyboards/kiserdesigns/madeline/rules.mk | 10 +++ 9 files changed, 305 insertions(+) create mode 100644 keyboards/kiserdesigns/madeline/config.h create mode 100644 keyboards/kiserdesigns/madeline/info.json create mode 100644 keyboards/kiserdesigns/madeline/keymaps/default/config.h create mode 100644 keyboards/kiserdesigns/madeline/keymaps/default/keymap.c create mode 100644 keyboards/kiserdesigns/madeline/keymaps/default/rules.mk create mode 100644 keyboards/kiserdesigns/madeline/madeline.c create mode 100644 keyboards/kiserdesigns/madeline/madeline.h create mode 100644 keyboards/kiserdesigns/madeline/readme.md create mode 100644 keyboards/kiserdesigns/madeline/rules.mk diff --git a/keyboards/kiserdesigns/madeline/config.h b/keyboards/kiserdesigns/madeline/config.h new file mode 100644 index 000000000000..62241274c6fc --- /dev/null +++ b/keyboards/kiserdesigns/madeline/config.h @@ -0,0 +1,53 @@ + /* Copyright TJ Campie + * + * 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 + +#ifndef CONFIG_H +#define CONFIG_H + +/* key matrix size */ +#define MATRIX_ROWS 4 +#define MATRIX_COLS 10 + +/* + * 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 { GP5, GP4, GP12, GP7 } +#define MATRIX_COL_PINS { GP25, GP26, GP27, GP28, GP29, GP9, GP0, GP1, GP2, GP3 } + +#define ENCODERS_PAD_A { GP13 } +#define ENCODERS_PAD_B { GP15 } +#define ENCODER_RESOLUTIONS { 4 } + +/* 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 + +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17 +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U + +#define RP2040_FLASH_GENERIC_03H + +#endif diff --git a/keyboards/kiserdesigns/madeline/info.json b/keyboards/kiserdesigns/madeline/info.json new file mode 100644 index 000000000000..f32a5c7d73fa --- /dev/null +++ b/keyboards/kiserdesigns/madeline/info.json @@ -0,0 +1,67 @@ +{ + "manufacturer": "rubybuilds", + "keyboard_name": "Madeline", + "maintainer": "rossmann360", + "board": "GENERIC_RP_RP2040", + "bootloader": "rp2040", + "bootmagic": { + "enabled": true + }, + "debounce": 5, + "diode_direction": "COL2ROW", + "encoder": { + "enabled": true + }, + "mouse_key": { + "enabled": true + }, + "processor": "RP2040", + "url": "kb.rubybuilds.com", + "usb": { + "device_version": "0.0.1", + "pid": "0x6D64", + "vid": "0x5242" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"x": 0, "y": 0}, + {"x": 1, "y": 0}, + {"x": 2, "y": 0}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0}, + {"x": 6.5, "y": 0}, + {"x": 7.5, "y": 0}, + {"x": 8.5, "y": 0}, + {"x": 9.5, "y": 0}, + {"x": 10.5, "y": 0, "w": 1.25}, + {"x": 0, "y": 1, "w": 1.25}, + {"x": 1.25, "y": 1}, + {"x": 2.25, "y": 1}, + {"x": 3.25, "y": 1}, + {"x": 4.25, "y": 1}, + {"x": 6.75, "y": 1}, + {"x": 7.75, "y": 1}, + {"x": 8.75, "y": 1}, + {"x": 9.75, "y": 1}, + {"x": 10.75, "y": 1}, + {"x": 0, "y": 2, "w": 1.75}, + {"x": 1.75, "y": 2}, + {"x": 2.75, "y": 2}, + {"x": 3.75, "y": 2}, + {"x": 4.75, "y": 2}, + {"x": 6.25, "y": 2}, + {"x": 7.25, "y": 2}, + {"x": 8.25, "y": 2}, + {"x": 9.25, "y": 2}, + {"x": 10.25, "y": 2, "w": 1.5}, + {"x": 0, "y": 3}, + {"x": 2.5, "y": 3}, + {"x": 3.5, "y": 3, "w": 2.25}, + {"x": 6.25, "y": 3, "w": 2}, + {"x": 8.25, "y": 3}, + {"x": 10.75, "y": 3} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/kiserdesigns/madeline/keymaps/default/config.h b/keyboards/kiserdesigns/madeline/keymaps/default/config.h new file mode 100644 index 000000000000..5ecf35d4b52b --- /dev/null +++ b/keyboards/kiserdesigns/madeline/keymaps/default/config.h @@ -0,0 +1,23 @@ + /* Copyright TJ Campie + * + * 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 + +#define TAP_CODE_DELAY 10 + +#ifdef COMBO_ENABLE +# define COMBO_COUNT 5 +# define COMBO_TERM 200 +#endif diff --git a/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c b/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c new file mode 100644 index 000000000000..f37b1c64f6fd --- /dev/null +++ b/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c @@ -0,0 +1,78 @@ + /* 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 + +enum layers{ + _BASE, + _NUM_SYM, + _NAV +}; +enum combo_events { + COMBO_BSPC, + COMBO_NUMBAK, + COMBO_TAB, + COMBO_ESC, + COMBO_DEL, +}; + +#define KC_NUM_SPC LT(_NUM_SYM, KC_SPC) +#define KC_GA LGUI_T(KC_A) +#define KC_AS LALT_T(KC_S) +#define KC_CD LCTL_T(KC_D) +#define KC_SF LSFT_T(KC_F) +#define KC_SJ RSFT_T(KC_J) +#define KC_CK RCTL_T(KC_K) +#define KC_AL RALT_T(KC_L) +#define KC_GSCLN RGUI_T(KC_SCLN) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_GA, KC_AS, KC_CD, KC_SF, KC_G, KC_H, KC_SJ, KC_CK, KC_AL, KC_ENT, + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, + KC_LCTL, KC_LALT, KC_BSPC, LT(_NUM_SYM,KC_SPACE), KC_RGUI, KC_RCTL + ), + + [_NUM_SYM] = LAYOUT( + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS, + KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_NO, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) } + +}; +#endif + +#ifdef COMBO_ENABLE +const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END}; +const uint16_t PROGMEM combo_numbak[] = {KC_0, KC_9, COMBO_END}; +const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END}; +const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END}; +const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; + +combo_t key_combos[COMBO_COUNT] = { + [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), + [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC), + [COMBO_TAB] = COMBO(combo_tab,KC_TAB), + [COMBO_ESC] = COMBO(combo_esc,KC_ESC), + [COMBO_DEL] = COMBO(combo_del,KC_DEL), + +}; +#endif diff --git a/keyboards/kiserdesigns/madeline/keymaps/default/rules.mk b/keyboards/kiserdesigns/madeline/keymaps/default/rules.mk new file mode 100644 index 000000000000..cbd8b4aa81ff --- /dev/null +++ b/keyboards/kiserdesigns/madeline/keymaps/default/rules.mk @@ -0,0 +1,2 @@ +COMBO_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/kiserdesigns/madeline/madeline.c b/keyboards/kiserdesigns/madeline/madeline.c new file mode 100644 index 000000000000..5d50eb9b0763 --- /dev/null +++ b/keyboards/kiserdesigns/madeline/madeline.c @@ -0,0 +1,16 @@ + /* Copyright TJ Campie + * + * 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 "madeline.h" diff --git a/keyboards/kiserdesigns/madeline/madeline.h b/keyboards/kiserdesigns/madeline/madeline.h new file mode 100644 index 000000000000..d9c1c6850494 --- /dev/null +++ b/keyboards/kiserdesigns/madeline/madeline.h @@ -0,0 +1,33 @@ + /* Copyright TJ Campie + * + * 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 XXX KC_NO + +#define LAYOUT( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ + K30, K31, K33, K36, K37, K39 \ +) \ +{ \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \ + { K30, K31, XXX, K33, XXX, XXX, K36, K37, XXX, K39 } \ +} diff --git a/keyboards/kiserdesigns/madeline/readme.md b/keyboards/kiserdesigns/madeline/readme.md new file mode 100644 index 000000000000..c3710dcf667c --- /dev/null +++ b/keyboards/kiserdesigns/madeline/readme.md @@ -0,0 +1,23 @@ +# Madeline + +![Madeline](https://i.imgur.com/MBT5kg2.jpg) + +*A cool QAZ-Alice hybrid designed based on the Adalyn by [Marv](https://github.com/MarvFPV/Adalyn) with a PCB by [Rossman360](https://github.com/Rossman360)* +* Keyboard Maintainer: [NCKiser](https://github.com/NCKiser) +* Hardware Supported: Madeline PCB, rp2040 +* Hardware Availability: kb.rubybuilds.com + +Make example for this keyboard (after setting up your build environment): + + make kiserdesigns/madeline:default + +Flashing example for this keyboard: + + make kiserdesigns/madeline:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). +## Bootloader +Enter the bootloader in 3 ways: +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly double-tap the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/kiserdesigns/madeline/rules.mk b/keyboards/kiserdesigns/madeline/rules.mk new file mode 100644 index 000000000000..53d52d8ab8ac --- /dev/null +++ b/keyboards/kiserdesigns/madeline/rules.mk @@ -0,0 +1,10 @@ +# Madeline, rp2040 + +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +COMBO_ENABLE = no From e6e9b7e9bb9c4d3ee150ebd03082adc9cd5c102e Mon Sep 17 00:00:00 2001 From: NCKiser Date: Mon, 28 Aug 2023 14:39:20 -0500 Subject: [PATCH 02/11] coding conventions update: copyright, whitespace, and comments --- keyboards/kiserdesigns/madeline/config.h | 20 +---- .../madeline/keymaps/default/config.h | 4 +- .../madeline/keymaps/default/keymap.c | 77 +++++++++---------- keyboards/kiserdesigns/madeline/madeline.c | 4 +- keyboards/kiserdesigns/madeline/madeline.h | 20 +++-- 5 files changed, 49 insertions(+), 76 deletions(-) diff --git a/keyboards/kiserdesigns/madeline/config.h b/keyboards/kiserdesigns/madeline/config.h index 62241274c6fc..69e94d7e0acc 100644 --- a/keyboards/kiserdesigns/madeline/config.h +++ b/keyboards/kiserdesigns/madeline/config.h @@ -1,6 +1,4 @@ - /* Copyright TJ Campie - * - * This program is free software: you can redistribute it and/or modify + /* 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. @@ -15,23 +13,9 @@ */ #pragma once -#ifndef CONFIG_H -#define CONFIG_H - -/* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 10 -/* - * 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 { GP5, GP4, GP12, GP7 } #define MATRIX_COL_PINS { GP25, GP26, GP27, GP28, GP29, GP9, GP0, GP1, GP2, GP3 } @@ -49,5 +33,3 @@ #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U #define RP2040_FLASH_GENERIC_03H - -#endif diff --git a/keyboards/kiserdesigns/madeline/keymaps/default/config.h b/keyboards/kiserdesigns/madeline/keymaps/default/config.h index 5ecf35d4b52b..53ba2f820c4b 100644 --- a/keyboards/kiserdesigns/madeline/keymaps/default/config.h +++ b/keyboards/kiserdesigns/madeline/keymaps/default/config.h @@ -1,6 +1,4 @@ - /* Copyright TJ Campie - * - * This program is free software: you can redistribute it and/or modify + /* 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. diff --git a/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c b/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c index f37b1c64f6fd..f715fefd9e93 100644 --- a/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c +++ b/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c @@ -11,19 +11,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include QMK_KEYBOARD_H +#include QMK_KEYBOARD_H -enum layers{ - _BASE, - _NUM_SYM, - _NAV +enum layers { + _BASE, + _NUM_SYM }; enum combo_events { - COMBO_BSPC, - COMBO_NUMBAK, - COMBO_TAB, - COMBO_ESC, - COMBO_DEL, + COMBO_BSPC, + COMBO_NUMBAK, + COMBO_TAB, + COMBO_ESC, + COMBO_DEL, }; #define KC_NUM_SPC LT(_NUM_SYM, KC_SPC) @@ -37,42 +36,40 @@ enum combo_events { #define KC_GSCLN RGUI_T(KC_SCLN) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, - KC_GA, KC_AS, KC_CD, KC_SF, KC_G, KC_H, KC_SJ, KC_CK, KC_AL, KC_ENT, - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, - KC_LCTL, KC_LALT, KC_BSPC, LT(_NUM_SYM,KC_SPACE), KC_RGUI, KC_RCTL - ), + [_BASE] = LAYOUT( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_GA, KC_AS, KC_CD, KC_SF, KC_G, KC_H, KC_SJ, KC_CK, KC_AL, KC_ENT, + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, + KC_LCTL, KC_LALT, KC_BSPC, LT(_NUM_SYM,KC_SPACE), KC_RGUI, KC_RCTL + ), - [_NUM_SYM] = LAYOUT( - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, - KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS, - KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_NO, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ) + [_NUM_SYM] = LAYOUT( + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS, + KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_NO, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [1] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) } - -}; + const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) } + }; #endif #ifdef COMBO_ENABLE -const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END}; -const uint16_t PROGMEM combo_numbak[] = {KC_0, KC_9, COMBO_END}; -const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END}; -const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END}; -const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; + const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END}; + const uint16_t PROGMEM combo_numbak[] = {KC_0, KC_9, COMBO_END}; + const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END}; + const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END}; + const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { - [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), - [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC), - [COMBO_TAB] = COMBO(combo_tab,KC_TAB), - [COMBO_ESC] = COMBO(combo_esc,KC_ESC), - [COMBO_DEL] = COMBO(combo_del,KC_DEL), - -}; + combo_t key_combos[COMBO_COUNT] = { + [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), + [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC), + [COMBO_TAB] = COMBO(combo_tab,KC_TAB), + [COMBO_ESC] = COMBO(combo_esc,KC_ESC), + [COMBO_DEL] = COMBO(combo_del,KC_DEL), + }; #endif diff --git a/keyboards/kiserdesigns/madeline/madeline.c b/keyboards/kiserdesigns/madeline/madeline.c index 5d50eb9b0763..e4ce9f6e1ac3 100644 --- a/keyboards/kiserdesigns/madeline/madeline.c +++ b/keyboards/kiserdesigns/madeline/madeline.c @@ -1,6 +1,4 @@ - /* Copyright TJ Campie - * - * This program is free software: you can redistribute it and/or modify + /* 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. diff --git a/keyboards/kiserdesigns/madeline/madeline.h b/keyboards/kiserdesigns/madeline/madeline.h index d9c1c6850494..ccc6e27af04d 100644 --- a/keyboards/kiserdesigns/madeline/madeline.h +++ b/keyboards/kiserdesigns/madeline/madeline.h @@ -1,6 +1,4 @@ - /* Copyright TJ Campie - * - * This program is free software: you can redistribute it and/or modify + /* 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. @@ -20,14 +18,14 @@ #define XXX KC_NO #define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ - K30, K31, K33, K36, K37, K39 \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ + K30, K31, K33, K36, K37, K39 \ ) \ { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \ - { K30, K31, XXX, K33, XXX, XXX, K36, K37, XXX, K39 } \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \ + { K30, K31, XXX, K33, XXX, XXX, K36, K37, XXX, K39 } \ } From 6a2b3c073b37fce68032cfbba5d56acfe625cd3e Mon Sep 17 00:00:00 2001 From: NCKiser Date: Mon, 28 Aug 2023 15:25:00 -0500 Subject: [PATCH 03/11] PR checklist: copyright, moved more to info.json, etc --- keyboards/kiserdesigns/madeline/config.h | 16 +--- keyboards/kiserdesigns/madeline/info.json | 89 ++++++++++--------- .../madeline/keymaps/default/config.h | 4 +- .../madeline/keymaps/default/keymap.c | 4 +- keyboards/kiserdesigns/madeline/madeline.c | 4 +- keyboards/kiserdesigns/madeline/madeline.h | 19 +--- keyboards/kiserdesigns/madeline/rules.mk | 3 - 7 files changed, 63 insertions(+), 76 deletions(-) diff --git a/keyboards/kiserdesigns/madeline/config.h b/keyboards/kiserdesigns/madeline/config.h index 69e94d7e0acc..5e00f27c093d 100644 --- a/keyboards/kiserdesigns/madeline/config.h +++ b/keyboards/kiserdesigns/madeline/config.h @@ -1,4 +1,6 @@ - /* This program is free software: you can redistribute it and/or modify + /* Copyright 2023 Noah Kiser (NCKiser) + * + * 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. @@ -13,19 +15,7 @@ */ #pragma once -#define MATRIX_ROWS 4 -#define MATRIX_COLS 10 - -#define MATRIX_ROW_PINS { GP5, GP4, GP12, GP7 } -#define MATRIX_COL_PINS { GP25, GP26, GP27, GP28, GP29, GP9, GP0, GP1, GP2, GP3 } - -#define ENCODERS_PAD_A { GP13 } -#define ENCODERS_PAD_B { GP15 } -#define ENCODER_RESOLUTIONS { 4 } - -/* 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 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET diff --git a/keyboards/kiserdesigns/madeline/info.json b/keyboards/kiserdesigns/madeline/info.json index f32a5c7d73fa..8dfc7ccede27 100644 --- a/keyboards/kiserdesigns/madeline/info.json +++ b/keyboards/kiserdesigns/madeline/info.json @@ -1,7 +1,7 @@ { - "manufacturer": "rubybuilds", "keyboard_name": "Madeline", - "maintainer": "rossmann360", + "manufacturer": "rubybuilds", + "maintainer": "NCKiser", "board": "GENERIC_RP_RP2040", "bootloader": "rp2040", "bootmagic": { @@ -10,13 +10,20 @@ "debounce": 5, "diode_direction": "COL2ROW", "encoder": { - "enabled": true + "enabled": true, + "rotary": [ + { "pin_a": "GP13", "pin_b": "GP15", "resolution": 4 } + ] + }, + "matrix_pins": { + "cols": [ "GP25", "GP26", "GP27", "GP28", "GP29", "GP9", "GP0", "GP1", "GP2", "GP3" ], + "rows": [ "GP5", "GP4", "GP12", "GP7" ] }, "mouse_key": { "enabled": true }, "processor": "RP2040", - "url": "kb.rubybuilds.com", + "url": "https://qmk.fm/keyboards", "usb": { "device_version": "0.0.1", "pid": "0x6D64", @@ -25,43 +32,43 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - {"x": 10.5, "y": 0, "w": 1.25}, - {"x": 0, "y": 1, "w": 1.25}, - {"x": 1.25, "y": 1}, - {"x": 2.25, "y": 1}, - {"x": 3.25, "y": 1}, - {"x": 4.25, "y": 1}, - {"x": 6.75, "y": 1}, - {"x": 7.75, "y": 1}, - {"x": 8.75, "y": 1}, - {"x": 9.75, "y": 1}, - {"x": 10.75, "y": 1}, - {"x": 0, "y": 2, "w": 1.75}, - {"x": 1.75, "y": 2}, - {"x": 2.75, "y": 2}, - {"x": 3.75, "y": 2}, - {"x": 4.75, "y": 2}, - {"x": 6.25, "y": 2}, - {"x": 7.25, "y": 2}, - {"x": 8.25, "y": 2}, - {"x": 9.25, "y": 2}, - {"x": 10.25, "y": 2, "w": 1.5}, - {"x": 0, "y": 3}, - {"x": 2.5, "y": 3}, - {"x": 3.5, "y": 3, "w": 2.25}, - {"x": 6.25, "y": 3, "w": 2}, - {"x": 8.25, "y": 3}, - {"x": 10.75, "y": 3} + {"x": 0, "y": 0, "matrix": [0,0]}, + {"x": 1, "y": 0, "matrix": [0,1]}, + {"x": 2, "y": 0, "matrix": [0,2]}, + {"x": 3, "y": 0, "matrix": [0,3]}, + {"x": 4, "y": 0, "matrix": [0,4]}, + {"x": 6.5, "y": 0, "matrix": [0,5]}, + {"x": 7.5, "y": 0, "matrix": [0,6]}, + {"x": 8.5, "y": 0, "matrix": [0,7]}, + {"x": 9.5, "y": 0, "matrix": [0,8]}, + {"x": 10.5, "y": 0, "w": 1.25, "matrix": [0,9]}, + {"x": 0, "y": 1, "w": 1.25, "matrix": [1,0]}, + {"x": 1.25, "y": 1, "matrix": [1,1]}, + {"x": 2.25, "y": 1, "matrix": [1,2]}, + {"x": 3.25, "y": 1, "matrix": [1,3]}, + {"x": 4.25, "y": 1, "matrix": [1,4]}, + {"x": 6.75, "y": 1, "matrix": [1,5]}, + {"x": 7.75, "y": 1, "matrix": [1,6]}, + {"x": 8.75, "y": 1, "matrix": [1,7]}, + {"x": 9.75, "y": 1, "matrix": [1,8]}, + {"x": 10.75, "y": 1, "matrix": [1,9]}, + {"x": 0, "y": 2, "w": 1.75, "matrix": [2,0]}, + {"x": 1.75, "y": 2, "matrix": [2,1]}, + {"x": 2.75, "y": 2, "matrix": [2,2]}, + {"x": 3.75, "y": 2, "matrix": [2,3]}, + {"x": 4.75, "y": 2, "matrix": [2,4]}, + {"x": 6.25, "y": 2, "matrix": [2,5]}, + {"x": 7.25, "y": 2, "matrix": [2,6]}, + {"x": 8.25, "y": 2, "matrix": [2,7]}, + {"x": 9.25, "y": 2, "matrix": [2,8]}, + {"x": 10.25, "y": 2, "w": 1.5, "matrix": [2,9]}, + {"x": 0, "y": 3, "matrix": [3,0]}, + {"x": 2.5, "y": 3, "matrix": [3,1]}, + {"x": 3.5, "y": 3, "w": 2.25, "matrix": [3,3]}, + {"x": 6.25, "y": 3, "w": 2, "matrix": [3,6]}, + {"x": 8.25, "y": 3, "matrix": [3,7]}, + {"x": 10.75, "y": 3, "matrix": [3,9]} ] } } -} \ No newline at end of file +} diff --git a/keyboards/kiserdesigns/madeline/keymaps/default/config.h b/keyboards/kiserdesigns/madeline/keymaps/default/config.h index 53ba2f820c4b..7f2070d05456 100644 --- a/keyboards/kiserdesigns/madeline/keymaps/default/config.h +++ b/keyboards/kiserdesigns/madeline/keymaps/default/config.h @@ -1,4 +1,6 @@ - /* This program is free software: you can redistribute it and/or modify + /* Copyright 2023 Noah Kiser (NCKiser) + * + * 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. diff --git a/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c b/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c index f715fefd9e93..9fd92b898dae 100644 --- a/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c +++ b/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c @@ -1,4 +1,6 @@ - /* This program is free software: you can redistribute it and/or modify + /* Copyright 2023 Noah Kiser (NCKiser) + * + * 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. diff --git a/keyboards/kiserdesigns/madeline/madeline.c b/keyboards/kiserdesigns/madeline/madeline.c index e4ce9f6e1ac3..0383bb03b23c 100644 --- a/keyboards/kiserdesigns/madeline/madeline.c +++ b/keyboards/kiserdesigns/madeline/madeline.c @@ -1,4 +1,6 @@ - /* This program is free software: you can redistribute it and/or modify + /* Copyright 2023 Noah Kiser (NCKiser) + * + * 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. diff --git a/keyboards/kiserdesigns/madeline/madeline.h b/keyboards/kiserdesigns/madeline/madeline.h index ccc6e27af04d..1f57e85c23ce 100644 --- a/keyboards/kiserdesigns/madeline/madeline.h +++ b/keyboards/kiserdesigns/madeline/madeline.h @@ -1,4 +1,6 @@ - /* This program is free software: you can redistribute it and/or modify + /* Copyright 2023 Noah Kiser (NCKiser) + * + * 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. @@ -14,18 +16,3 @@ #pragma once #include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ - K30, K31, K33, K36, K37, K39 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \ - { K30, K31, XXX, K33, XXX, XXX, K36, K37, XXX, K39 } \ -} diff --git a/keyboards/kiserdesigns/madeline/rules.mk b/keyboards/kiserdesigns/madeline/rules.mk index 53d52d8ab8ac..f5bb01049613 100644 --- a/keyboards/kiserdesigns/madeline/rules.mk +++ b/keyboards/kiserdesigns/madeline/rules.mk @@ -1,5 +1,3 @@ -# Madeline, rp2040 - EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration @@ -7,4 +5,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -COMBO_ENABLE = no From b81e63afb216642f750e5b45fdbcd3eaaf52f291 Mon Sep 17 00:00:00 2001 From: NCKiser Date: Mon, 28 Aug 2023 15:35:06 -0500 Subject: [PATCH 04/11] spacing on license header to try to fix lint --- keyboards/kiserdesigns/madeline/config.h | 30 +++++++++---------- .../madeline/keymaps/default/config.h | 30 +++++++++---------- .../madeline/keymaps/default/keymap.c | 30 +++++++++---------- keyboards/kiserdesigns/madeline/madeline.c | 30 +++++++++---------- keyboards/kiserdesigns/madeline/madeline.h | 30 +++++++++---------- 5 files changed, 75 insertions(+), 75 deletions(-) diff --git a/keyboards/kiserdesigns/madeline/config.h b/keyboards/kiserdesigns/madeline/config.h index 5e00f27c093d..8522d7cd431c 100644 --- a/keyboards/kiserdesigns/madeline/config.h +++ b/keyboards/kiserdesigns/madeline/config.h @@ -1,18 +1,18 @@ - /* Copyright 2023 Noah Kiser (NCKiser) - * - * 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 . - */ +/* Copyright 2021 Noah Kiser (NCKiser) + * + * 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 #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kiserdesigns/madeline/keymaps/default/config.h b/keyboards/kiserdesigns/madeline/keymaps/default/config.h index 7f2070d05456..217e123699dc 100644 --- a/keyboards/kiserdesigns/madeline/keymaps/default/config.h +++ b/keyboards/kiserdesigns/madeline/keymaps/default/config.h @@ -1,18 +1,18 @@ - /* Copyright 2023 Noah Kiser (NCKiser) - * - * 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 . - */ +/* Copyright 2021 Noah Kiser (NCKiser) + * + * 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 #define TAP_CODE_DELAY 10 diff --git a/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c b/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c index 9fd92b898dae..dc39222f175a 100644 --- a/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c +++ b/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c @@ -1,18 +1,18 @@ - /* Copyright 2023 Noah Kiser (NCKiser) - * - * 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 . - */ +/* Copyright 2021 Noah Kiser (NCKiser) + * + * 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 enum layers { diff --git a/keyboards/kiserdesigns/madeline/madeline.c b/keyboards/kiserdesigns/madeline/madeline.c index 0383bb03b23c..f13661669f3a 100644 --- a/keyboards/kiserdesigns/madeline/madeline.c +++ b/keyboards/kiserdesigns/madeline/madeline.c @@ -1,16 +1,16 @@ - /* Copyright 2023 Noah Kiser (NCKiser) - * - * 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 . - */ +/* Copyright 2021 Noah Kiser (NCKiser) + * + * 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 "madeline.h" diff --git a/keyboards/kiserdesigns/madeline/madeline.h b/keyboards/kiserdesigns/madeline/madeline.h index 1f57e85c23ce..6e57641bee9c 100644 --- a/keyboards/kiserdesigns/madeline/madeline.h +++ b/keyboards/kiserdesigns/madeline/madeline.h @@ -1,18 +1,18 @@ - /* Copyright 2023 Noah Kiser (NCKiser) - * - * 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 . - */ +/* Copyright 2021 Noah Kiser (NCKiser) + * + * 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" From 4e93ad61ca3e885bbcb78b6a6f16d3a50715c09c Mon Sep 17 00:00:00 2001 From: NCKiser Date: Mon, 28 Aug 2023 16:00:28 -0500 Subject: [PATCH 05/11] remove default/duplicate data from info.json, remove combos and cleaned up keymap --- keyboards/kiserdesigns/madeline/info.json | 2 -- .../madeline/keymaps/default/config.h | 5 ---- .../madeline/keymaps/default/keymap.c | 28 ++----------------- 3 files changed, 2 insertions(+), 33 deletions(-) diff --git a/keyboards/kiserdesigns/madeline/info.json b/keyboards/kiserdesigns/madeline/info.json index 8dfc7ccede27..db8276f33426 100644 --- a/keyboards/kiserdesigns/madeline/info.json +++ b/keyboards/kiserdesigns/madeline/info.json @@ -2,12 +2,10 @@ "keyboard_name": "Madeline", "manufacturer": "rubybuilds", "maintainer": "NCKiser", - "board": "GENERIC_RP_RP2040", "bootloader": "rp2040", "bootmagic": { "enabled": true }, - "debounce": 5, "diode_direction": "COL2ROW", "encoder": { "enabled": true, diff --git a/keyboards/kiserdesigns/madeline/keymaps/default/config.h b/keyboards/kiserdesigns/madeline/keymaps/default/config.h index 217e123699dc..a2cb12f4f812 100644 --- a/keyboards/kiserdesigns/madeline/keymaps/default/config.h +++ b/keyboards/kiserdesigns/madeline/keymaps/default/config.h @@ -16,8 +16,3 @@ #pragma once #define TAP_CODE_DELAY 10 - -#ifdef COMBO_ENABLE -# define COMBO_COUNT 5 -# define COMBO_TERM 200 -#endif diff --git a/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c b/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c index dc39222f175a..c1af9a9f320b 100644 --- a/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c +++ b/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c @@ -19,13 +19,6 @@ enum layers { _BASE, _NUM_SYM }; -enum combo_events { - COMBO_BSPC, - COMBO_NUMBAK, - COMBO_TAB, - COMBO_ESC, - COMBO_DEL, -}; #define KC_NUM_SPC LT(_NUM_SYM, KC_SPC) #define KC_GA LGUI_T(KC_A) @@ -35,19 +28,18 @@ enum combo_events { #define KC_SJ RSFT_T(KC_J) #define KC_CK RCTL_T(KC_K) #define KC_AL RALT_T(KC_L) -#define KC_GSCLN RGUI_T(KC_SCLN) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT( KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_GA, KC_AS, KC_CD, KC_SF, KC_G, KC_H, KC_SJ, KC_CK, KC_AL, KC_ENT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, - KC_LCTL, KC_LALT, KC_BSPC, LT(_NUM_SYM,KC_SPACE), KC_RGUI, KC_RCTL + KC_LCTL, KC_LALT, KC_BSPC, KC_NUM_SPC, KC_RGUI, KC_RCTL ), [_NUM_SYM] = LAYOUT( KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, - KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS, + KC_ESC, KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_BSPC, KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_NO, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) @@ -59,19 +51,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) } }; #endif - -#ifdef COMBO_ENABLE - const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END}; - const uint16_t PROGMEM combo_numbak[] = {KC_0, KC_9, COMBO_END}; - const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END}; - const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END}; - const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; - - combo_t key_combos[COMBO_COUNT] = { - [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), - [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC), - [COMBO_TAB] = COMBO(combo_tab,KC_TAB), - [COMBO_ESC] = COMBO(combo_esc,KC_ESC), - [COMBO_DEL] = COMBO(combo_del,KC_DEL), - }; -#endif From 7f583383503ee181fb6940586aecbc52f68497e7 Mon Sep 17 00:00:00 2001 From: NCKiser Date: Mon, 28 Aug 2023 16:03:17 -0500 Subject: [PATCH 06/11] disabled combos --- keyboards/kiserdesigns/madeline/keymaps/default/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/kiserdesigns/madeline/keymaps/default/rules.mk b/keyboards/kiserdesigns/madeline/keymaps/default/rules.mk index cbd8b4aa81ff..ee325681483f 100644 --- a/keyboards/kiserdesigns/madeline/keymaps/default/rules.mk +++ b/keyboards/kiserdesigns/madeline/keymaps/default/rules.mk @@ -1,2 +1 @@ -COMBO_ENABLE = yes ENCODER_MAP_ENABLE = yes From ed4e7ecfe6a08222d65ae6c6078889ec9aee3bc2 Mon Sep 17 00:00:00 2001 From: NCKiser <37519411+NCKiser@users.noreply.github.com> Date: Mon, 28 Aug 2023 16:31:15 -0500 Subject: [PATCH 07/11] use reduced image size Co-authored-by: Drashna Jaelre --- keyboards/kiserdesigns/madeline/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kiserdesigns/madeline/readme.md b/keyboards/kiserdesigns/madeline/readme.md index c3710dcf667c..138368282a9a 100644 --- a/keyboards/kiserdesigns/madeline/readme.md +++ b/keyboards/kiserdesigns/madeline/readme.md @@ -1,6 +1,6 @@ # Madeline -![Madeline](https://i.imgur.com/MBT5kg2.jpg) +![Madeline](https://i.imgur.com/MBT5kg2h.jpg) *A cool QAZ-Alice hybrid designed based on the Adalyn by [Marv](https://github.com/MarvFPV/Adalyn) with a PCB by [Rossman360](https://github.com/Rossman360)* * Keyboard Maintainer: [NCKiser](https://github.com/NCKiser) From e64f602a7c7a9a98d4209e55b3bc17c84b760dca Mon Sep 17 00:00:00 2001 From: NCKiser Date: Mon, 28 Aug 2023 17:10:36 -0500 Subject: [PATCH 08/11] moved tap_code_delay to info.json --- keyboards/kiserdesigns/madeline/info.json | 5 ++++- keyboards/kiserdesigns/madeline/keymaps/default/config.h | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/keyboards/kiserdesigns/madeline/info.json b/keyboards/kiserdesigns/madeline/info.json index db8276f33426..962d27563c3d 100644 --- a/keyboards/kiserdesigns/madeline/info.json +++ b/keyboards/kiserdesigns/madeline/info.json @@ -10,7 +10,7 @@ "encoder": { "enabled": true, "rotary": [ - { "pin_a": "GP13", "pin_b": "GP15", "resolution": 4 } + { "pin_a": "GP13", "pin_b": "GP15", "resolution": 4 } ] }, "matrix_pins": { @@ -21,6 +21,9 @@ "enabled": true }, "processor": "RP2040", + "qmk": { + "tap_keycode_delay": 10 + }, "url": "https://qmk.fm/keyboards", "usb": { "device_version": "0.0.1", diff --git a/keyboards/kiserdesigns/madeline/keymaps/default/config.h b/keyboards/kiserdesigns/madeline/keymaps/default/config.h index a2cb12f4f812..3cf1803806c6 100644 --- a/keyboards/kiserdesigns/madeline/keymaps/default/config.h +++ b/keyboards/kiserdesigns/madeline/keymaps/default/config.h @@ -14,5 +14,3 @@ * along with this program. If not, see . */ #pragma once - -#define TAP_CODE_DELAY 10 From 85939f3b189d20f70274eee54fab2dfb6a87f0fe Mon Sep 17 00:00:00 2001 From: NCKiser Date: Mon, 28 Aug 2023 17:39:44 -0500 Subject: [PATCH 09/11] removed .c and .h files, moved rules.mk to info.json --- keyboards/kiserdesigns/madeline/info.json | 16 +++++++++------- .../madeline/keymaps/default/config.h | 16 ---------------- keyboards/kiserdesigns/madeline/madeline.c | 16 ---------------- keyboards/kiserdesigns/madeline/madeline.h | 18 ------------------ keyboards/kiserdesigns/madeline/rules.mk | 8 +------- 5 files changed, 10 insertions(+), 64 deletions(-) delete mode 100644 keyboards/kiserdesigns/madeline/keymaps/default/config.h delete mode 100644 keyboards/kiserdesigns/madeline/madeline.c delete mode 100644 keyboards/kiserdesigns/madeline/madeline.h diff --git a/keyboards/kiserdesigns/madeline/info.json b/keyboards/kiserdesigns/madeline/info.json index 962d27563c3d..97e880d1c524 100644 --- a/keyboards/kiserdesigns/madeline/info.json +++ b/keyboards/kiserdesigns/madeline/info.json @@ -3,23 +3,25 @@ "manufacturer": "rubybuilds", "maintainer": "NCKiser", "bootloader": "rp2040", - "bootmagic": { - "enabled": true - }, "diode_direction": "COL2ROW", "encoder": { "enabled": true, "rotary": [ - { "pin_a": "GP13", "pin_b": "GP15", "resolution": 4 } + { "pin_a": "GP13", "pin_b": "GP15" } ] }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": [ "GP25", "GP26", "GP27", "GP28", "GP29", "GP9", "GP0", "GP1", "GP2", "GP3" ], "rows": [ "GP5", "GP4", "GP12", "GP7" ] }, - "mouse_key": { - "enabled": true - }, "processor": "RP2040", "qmk": { "tap_keycode_delay": 10 diff --git a/keyboards/kiserdesigns/madeline/keymaps/default/config.h b/keyboards/kiserdesigns/madeline/keymaps/default/config.h deleted file mode 100644 index 3cf1803806c6..000000000000 --- a/keyboards/kiserdesigns/madeline/keymaps/default/config.h +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Noah Kiser (NCKiser) - * - * 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 diff --git a/keyboards/kiserdesigns/madeline/madeline.c b/keyboards/kiserdesigns/madeline/madeline.c deleted file mode 100644 index f13661669f3a..000000000000 --- a/keyboards/kiserdesigns/madeline/madeline.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Noah Kiser (NCKiser) - * - * 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 "madeline.h" diff --git a/keyboards/kiserdesigns/madeline/madeline.h b/keyboards/kiserdesigns/madeline/madeline.h deleted file mode 100644 index 6e57641bee9c..000000000000 --- a/keyboards/kiserdesigns/madeline/madeline.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2021 Noah Kiser (NCKiser) - * - * 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" diff --git a/keyboards/kiserdesigns/madeline/rules.mk b/keyboards/kiserdesigns/madeline/rules.mk index f5bb01049613..6e7633bfe015 100644 --- a/keyboards/kiserdesigns/madeline/rules.mk +++ b/keyboards/kiserdesigns/madeline/rules.mk @@ -1,7 +1 @@ -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output +# This file intentionally left blank From 7b411257a556feeaad0f200aa8eaa367b5c5510d Mon Sep 17 00:00:00 2001 From: NCKiser <37519411+NCKiser@users.noreply.github.com> Date: Tue, 29 Aug 2023 19:34:56 -0500 Subject: [PATCH 10/11] Update keyboards/kiserdesigns/madeline/keymaps/default/keymap.c Co-authored-by: Ryan --- keyboards/kiserdesigns/madeline/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c b/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c index c1af9a9f320b..09c9d3a2ff7c 100644 --- a/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c +++ b/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) - const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) } }; From 86656293726be0e0bc655f3189c8117ec78174f9 Mon Sep 17 00:00:00 2001 From: NCKiser Date: Tue, 29 Aug 2023 19:38:43 -0500 Subject: [PATCH 11/11] qmk format-json on info.json --- keyboards/kiserdesigns/madeline/info.json | 82 +++++++++++------------ 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/keyboards/kiserdesigns/madeline/info.json b/keyboards/kiserdesigns/madeline/info.json index 97e880d1c524..73d3f5ccff4a 100644 --- a/keyboards/kiserdesigns/madeline/info.json +++ b/keyboards/kiserdesigns/madeline/info.json @@ -1,13 +1,13 @@ { - "keyboard_name": "Madeline", "manufacturer": "rubybuilds", + "keyboard_name": "Madeline", "maintainer": "NCKiser", "bootloader": "rp2040", "diode_direction": "COL2ROW", "encoder": { "enabled": true, "rotary": [ - { "pin_a": "GP13", "pin_b": "GP15" } + {"pin_a": "GP13", "pin_b": "GP15"} ] }, "features": { @@ -19,8 +19,8 @@ "nkro": true }, "matrix_pins": { - "cols": [ "GP25", "GP26", "GP27", "GP28", "GP29", "GP9", "GP0", "GP1", "GP2", "GP3" ], - "rows": [ "GP5", "GP4", "GP12", "GP7" ] + "cols": ["GP25", "GP26", "GP27", "GP28", "GP29", "GP9", "GP0", "GP1", "GP2", "GP3"], + "rows": ["GP5", "GP4", "GP12", "GP7"] }, "processor": "RP2040", "qmk": { @@ -35,43 +35,43 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0, "matrix": [0,0]}, - {"x": 1, "y": 0, "matrix": [0,1]}, - {"x": 2, "y": 0, "matrix": [0,2]}, - {"x": 3, "y": 0, "matrix": [0,3]}, - {"x": 4, "y": 0, "matrix": [0,4]}, - {"x": 6.5, "y": 0, "matrix": [0,5]}, - {"x": 7.5, "y": 0, "matrix": [0,6]}, - {"x": 8.5, "y": 0, "matrix": [0,7]}, - {"x": 9.5, "y": 0, "matrix": [0,8]}, - {"x": 10.5, "y": 0, "w": 1.25, "matrix": [0,9]}, - {"x": 0, "y": 1, "w": 1.25, "matrix": [1,0]}, - {"x": 1.25, "y": 1, "matrix": [1,1]}, - {"x": 2.25, "y": 1, "matrix": [1,2]}, - {"x": 3.25, "y": 1, "matrix": [1,3]}, - {"x": 4.25, "y": 1, "matrix": [1,4]}, - {"x": 6.75, "y": 1, "matrix": [1,5]}, - {"x": 7.75, "y": 1, "matrix": [1,6]}, - {"x": 8.75, "y": 1, "matrix": [1,7]}, - {"x": 9.75, "y": 1, "matrix": [1,8]}, - {"x": 10.75, "y": 1, "matrix": [1,9]}, - {"x": 0, "y": 2, "w": 1.75, "matrix": [2,0]}, - {"x": 1.75, "y": 2, "matrix": [2,1]}, - {"x": 2.75, "y": 2, "matrix": [2,2]}, - {"x": 3.75, "y": 2, "matrix": [2,3]}, - {"x": 4.75, "y": 2, "matrix": [2,4]}, - {"x": 6.25, "y": 2, "matrix": [2,5]}, - {"x": 7.25, "y": 2, "matrix": [2,6]}, - {"x": 8.25, "y": 2, "matrix": [2,7]}, - {"x": 9.25, "y": 2, "matrix": [2,8]}, - {"x": 10.25, "y": 2, "w": 1.5, "matrix": [2,9]}, - {"x": 0, "y": 3, "matrix": [3,0]}, - {"x": 2.5, "y": 3, "matrix": [3,1]}, - {"x": 3.5, "y": 3, "w": 2.25, "matrix": [3,3]}, - {"x": 6.25, "y": 3, "w": 2, "matrix": [3,6]}, - {"x": 8.25, "y": 3, "matrix": [3,7]}, - {"x": 10.75, "y": 3, "matrix": [3,9]} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0, "w": 1.25}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 6.75, "y": 1}, + {"matrix": [1, 6], "x": 7.75, "y": 1}, + {"matrix": [1, 7], "x": 8.75, "y": 1}, + {"matrix": [1, 8], "x": 9.75, "y": 1}, + {"matrix": [1, 9], "x": 10.75, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 6.25, "y": 2}, + {"matrix": [2, 6], "x": 7.25, "y": 2}, + {"matrix": [2, 7], "x": 8.25, "y": 2}, + {"matrix": [2, 8], "x": 9.25, "y": 2}, + {"matrix": [2, 9], "x": 10.25, "y": 2, "w": 1.5}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.25}, + {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 10.75, "y": 3} ] } } -} +} \ No newline at end of file