From 5fe2730c265d62954d9c8748b4026f0b6c41d00e Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 14:17:15 +0000 Subject: [PATCH 01/48] Tapedeck Intial Firmware --- keyboards/tapedeck/config.h | 53 +++++++++ keyboards/tapedeck/info.json | 9 ++ keyboards/tapedeck/keymaps/default/keymap.c | 116 ++++++++++++++++++++ keyboards/tapedeck/readme.md | 17 +++ keyboards/tapedeck/rules.mk | 34 ++++++ keyboards/tapedeck/tapedeck.c | 1 + keyboards/tapedeck/tapedeck.h | 13 +++ 7 files changed, 243 insertions(+) create mode 100644 keyboards/tapedeck/config.h create mode 100644 keyboards/tapedeck/info.json create mode 100644 keyboards/tapedeck/keymaps/default/keymap.c create mode 100644 keyboards/tapedeck/readme.md create mode 100644 keyboards/tapedeck/rules.mk create mode 100644 keyboards/tapedeck/tapedeck.c create mode 100644 keyboards/tapedeck/tapedeck.h diff --git a/keyboards/tapedeck/config.h b/keyboards/tapedeck/config.h new file mode 100644 index 000000000000..608655a2d215 --- /dev/null +++ b/keyboards/tapedeck/config.h @@ -0,0 +1,53 @@ +/* +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" + +/* Matrix size */ +#define MATRIX_ROWS 3 +#define MATRIX_COLS 5 + +/* Pin-out */ +#define MATRIX_ROW_PINS { B2, B3, B1 } +#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 } +#define QMK_LED B0 + +#define QMK_ESC_OUTPUT B2 +#define QMK_ESC_INPUT B5 + +/* ROW2COL */ +#define DIODE_DIRECTION ROW2COL + +/* RGB */ +#define RGB_DI_PIN B6 +#define RGBLED_NUM 3 +#define RGBLIGHT_EFFECT_STATIC_LIGHT +#define RGBLIGHT_EFFECT_RGB_TEST +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_KNIGHT +#define RGBLIGHT_HUE_STEP 10 +#define RGBLIGHT_SAT_STEP 17 +#define RGBLIGHT_LIMIT_VAL 225 + +/* Rotary Encoder*/ +#define ENCODERS_PAD_A { F4, F6 } +#define ENCODERS_PAD_B { F5, F7 } +#define ENCODER_RESOLUTION 4 + +/* SLIDER */ +#define POT_ENABLE + diff --git a/keyboards/tapedeck/info.json b/keyboards/tapedeck/info.json new file mode 100644 index 000000000000..7d0f7096403a --- /dev/null +++ b/keyboards/tapedeck/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "Tapedeck", + "manufacturer": "Gowla", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "1.0.0" + }, +} \ No newline at end of file diff --git a/keyboards/tapedeck/keymaps/default/keymap.c b/keyboards/tapedeck/keymaps/default/keymap.c new file mode 100644 index 000000000000..70474400c11e --- /dev/null +++ b/keyboards/tapedeck/keymaps/default/keymap.c @@ -0,0 +1,116 @@ +/* Copyright 2021 Gowla + * + * 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 +#include "print.h" + +#define BASE 0 + +#ifdef POT_ENABLE + #include "analog.h" +#endif + +int16_t pot_val = 0; +int16_t prev_val = 0; +int16_t val = 0; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [BASE] = LAYOUT( + KC_ESC, KC_MNXT, KC_MPLY, KC_MNXT, KC_MPLY, + RGB_MODE_RAINBOW, RGB_MODE_RGBTEST, RGB_M_K, RGB_TOG, KC_MPLY, + KC_F1, KC_F2, KC_F3, KC_F14 + ) +}; + +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (index == 0) { /* First encoder */ + if (clockwise) { + tap_code(KC_WH_U); + } else { + tap_code(KC_WH_D); + } + } else if (index == 1) { /* Second encoder */ + if (clockwise) { + tap_code(KC_BRIU); + } else { + tap_code(KC_BRID); + } + } + + return false; +}; + +void matrix_init_user(void) { +#ifdef POT_ENABLE + analogReference(ADC_REF_POWER); +#endif +} + +uint8_t divisor = 0; + +long map(long x, long in_min, long in_max, long out_min, long out_max) +{ + return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min; +} + +void slider(void) { + if (divisor++) { // only run the slider function 1/256 times it's called + return; + } + + pot_val = analogReadPin(D4); + val = map(pot_val, 0, 1023, 1, 50); + + if (( val > (prev_val + 1)) && val != prev_val){ + int i; + for (i = prev_val; i < val; i++ ) + {tap_code(KC_VOLU);} + } + if ((val < (prev_val - 1)) && val != prev_val){ + int i; + for (i = val; i < prev_val; i++ ) + {tap_code(KC_VOLD);} + } + prev_val = val; +} + +void matrix_scan_user(void) { +#ifdef POT_ENABLE + slider(); +#endif +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + // If console is enabled, it will print the matrix position and status of each key pressed + #ifdef CONSOLE_ENABLE + uprintf("KL: kc: 0x%04X, col: %u, row: %u, pressed: %b, time: %u, interrupt: %b, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count); + #endif + return true; +} + +#ifdef RGBLIGHT_ENABLE +void keyboard_post_init_user(void) { + // led hue, sat, val, led + rgblight_sethsv_range(HSV_GREEN, 0, 2); + rgblight_sethsv_noeeprom(HSV_GREEN); +} +#endif + + + + + + diff --git a/keyboards/tapedeck/readme.md b/keyboards/tapedeck/readme.md new file mode 100644 index 000000000000..85d3f391705f --- /dev/null +++ b/keyboards/tapedeck/readme.md @@ -0,0 +1,17 @@ +# Gowla Tapedeck + +

+ +

+ +4x4 12 Key Macro Board with 60MM Slider, RGB and 2 X Rotary Encoders. For use with QMK, designed and sold by Gowla. + +* Keyboard Maintainer: [Gowla](https://github.com/SamGowland/) +* Hardware Supported: Pro Micro ATmega32U4, Cherry MX Switches, Alps 60MM Slider +* Hardware Availability: [Repo](https://github.com/SamGowland/Gowla-Macro-Boards) + +Make example for this keyboard (after setting up your build environment): + + make tapedeck/light: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/tapedeck/rules.mk b/keyboards/tapedeck/rules.mk new file mode 100644 index 000000000000..93082eea0962 --- /dev/null +++ b/keyboards/tapedeck/rules.mk @@ -0,0 +1,34 @@ +# 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 = qmk-dfu + +# Build Options +# change yes to no to disable +# +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +ENCODER_ENABLE = yes # Enable Rotary Encoder +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 = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # 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 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +SRC += analog.c +CONSOLE_ENABLE = yes +BOOTMAGIC_ENABLE = yes diff --git a/keyboards/tapedeck/tapedeck.c b/keyboards/tapedeck/tapedeck.c new file mode 100644 index 000000000000..5622911db1f1 --- /dev/null +++ b/keyboards/tapedeck/tapedeck.c @@ -0,0 +1 @@ +#include "tapedeck.h" diff --git a/keyboards/tapedeck/tapedeck.h b/keyboards/tapedeck/tapedeck.h new file mode 100644 index 000000000000..139c1000c54a --- /dev/null +++ b/keyboards/tapedeck/tapedeck.h @@ -0,0 +1,13 @@ +#pragma once + +#include "quantum.h" + +#define LAYOUT( \ + k00, k01, k02, k03, k04, \ + k10, k11, k12, k13, k14,\ + k20, k21, k22, k23 \ +) { \ + { k00, k01, k02, k03, k04, }, \ + { k10, k11, k12, k13, k14, }, \ + { k20, k21, k22, k23 } \ +} From b0a103e8c903a8fb6e6e8db03d24428ef0014b13 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 14:38:27 +0000 Subject: [PATCH 02/48] info json --- keyboards/tapedeck/info.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/keyboards/tapedeck/info.json b/keyboards/tapedeck/info.json index 7d0f7096403a..0c0c6c4580f9 100644 --- a/keyboards/tapedeck/info.json +++ b/keyboards/tapedeck/info.json @@ -1,9 +1,21 @@ { "keyboard_name": "Tapedeck", "manufacturer": "Gowla", + "maintainer": "Gowla", + "url": "https://github.com/SamGowland/Gowla-Macro-Boards" + "bootloader": "qmk-dfu", + "diode_direction": "ROW2COL", "usb": { "vid": "0xFEED", "pid": "0x0000", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B5, B4, E6, D7, C6"], + "rows": ["B2, B3, B1"] + }, + "layouts": { + "LAYOUT": { + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":5, "y":0.5}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":5, "y":1.75}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}] + } } \ No newline at end of file From bbdfc83d9005aca9f483a0317baacfd3972bd8c7 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 14:47:59 +0000 Subject: [PATCH 03/48] remove matrix in json --- keyboards/tapedeck/info.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/keyboards/tapedeck/info.json b/keyboards/tapedeck/info.json index 0c0c6c4580f9..2e7d85db5958 100644 --- a/keyboards/tapedeck/info.json +++ b/keyboards/tapedeck/info.json @@ -9,13 +9,10 @@ "vid": "0xFEED", "pid": "0x0000", "device_version": "1.0.0" - }, - "matrix_pins": { - "cols": ["B5, B4, E6, D7, C6"], - "rows": ["B2, B3, B1"] }, "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":5, "y":0.5}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":5, "y":1.75}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}] } + } } \ No newline at end of file From 44c0c3545b96c82c38f3b11b5a4f90cfe3f6a5bb Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 14:56:40 +0000 Subject: [PATCH 04/48] license header --- keyboards/tapedeck/keymaps/default/keymap.c | 2 +- keyboards/tapedeck/tapedeck.c | 16 ++++++++++++++++ keyboards/tapedeck/tapedeck.h | 16 ++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/keyboards/tapedeck/keymaps/default/keymap.c b/keyboards/tapedeck/keymaps/default/keymap.c index 70474400c11e..98ac41bacc9b 100644 --- a/keyboards/tapedeck/keymaps/default/keymap.c +++ b/keyboards/tapedeck/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2021 Gowla +/* Copyright 2023 Gowla * * 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 diff --git a/keyboards/tapedeck/tapedeck.c b/keyboards/tapedeck/tapedeck.c index 5622911db1f1..83c187a5e148 100644 --- a/keyboards/tapedeck/tapedeck.c +++ b/keyboards/tapedeck/tapedeck.c @@ -1 +1,17 @@ +/* Copyright 2023 Gowla + * + * 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 "tapedeck.h" diff --git a/keyboards/tapedeck/tapedeck.h b/keyboards/tapedeck/tapedeck.h index 139c1000c54a..2d1b39fc8d24 100644 --- a/keyboards/tapedeck/tapedeck.h +++ b/keyboards/tapedeck/tapedeck.h @@ -1,3 +1,19 @@ +/* Copyright 2023 Gowla + * + * 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 f8d93409b44b0a0f0896162a07915e952e25a374 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 16:21:59 +0000 Subject: [PATCH 05/48] Update keyboards/tapedeck/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/tapedeck/info.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/tapedeck/info.json b/keyboards/tapedeck/info.json index 2e7d85db5958..5efd2b7459fe 100644 --- a/keyboards/tapedeck/info.json +++ b/keyboards/tapedeck/info.json @@ -10,6 +10,8 @@ "pid": "0x0000", "device_version": "1.0.0" }, + "processor": "amtega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":5, "y":0.5}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":5, "y":1.75}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}] From 986d3dfe2c30d1526d8da15c10182563fac695d1 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 16:22:42 +0000 Subject: [PATCH 06/48] Update keyboards/tapedeck/rules.mk Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/tapedeck/rules.mk | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/keyboards/tapedeck/rules.mk b/keyboards/tapedeck/rules.mk index 93082eea0962..a9c44757d7e4 100644 --- a/keyboards/tapedeck/rules.mk +++ b/keyboards/tapedeck/rules.mk @@ -17,18 +17,9 @@ BOOTLOADER = qmk-dfu MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control ENCODER_ENABLE = yes # Enable Rotary Encoder -CONSOLE_ENABLE = no # Console for debug +CONSOLE_ENABLE = yes # 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 = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # 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 -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches SRC += analog.c -CONSOLE_ENABLE = yes BOOTMAGIC_ENABLE = yes From dabb858f3e6f1919a5a79c43bee7cb88cdd9a5c1 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 16:25:42 +0000 Subject: [PATCH 07/48] Update keyboards/tapedeck/config.h Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/tapedeck/config.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/keyboards/tapedeck/config.h b/keyboards/tapedeck/config.h index 608655a2d215..a7f655d15b45 100644 --- a/keyboards/tapedeck/config.h +++ b/keyboards/tapedeck/config.h @@ -15,12 +15,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" - -/* Matrix size */ -#define MATRIX_ROWS 3 -#define MATRIX_COLS 5 - /* Pin-out */ #define MATRIX_ROW_PINS { B2, B3, B1 } #define MATRIX_COL_PINS { B5, B4, E6, D7, C6 } From ae6d17ca73ab958ce83e0b84b4b1825588fc130e Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 16:26:06 +0000 Subject: [PATCH 08/48] Update keyboards/tapedeck/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/tapedeck/keymaps/default/keymap.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/keyboards/tapedeck/keymaps/default/keymap.c b/keyboards/tapedeck/keymaps/default/keymap.c index 98ac41bacc9b..ec3e38cc10e4 100644 --- a/keyboards/tapedeck/keymaps/default/keymap.c +++ b/keyboards/tapedeck/keymaps/default/keymap.c @@ -35,24 +35,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (index == 0) { /* First encoder */ - if (clockwise) { - tap_code(KC_WH_U); - } else { - tap_code(KC_WH_D); - } - } else if (index == 1) { /* Second encoder */ - if (clockwise) { - tap_code(KC_BRIU); - } else { - tap_code(KC_BRID); - } - } - - return false; -}; - void matrix_init_user(void) { #ifdef POT_ENABLE analogReference(ADC_REF_POWER); From 268b16692f91e66e0861fe97b6efc7baa16bcad1 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 16:26:34 +0000 Subject: [PATCH 09/48] Update keyboards/tapedeck/rules.mk Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/tapedeck/rules.mk | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/keyboards/tapedeck/rules.mk b/keyboards/tapedeck/rules.mk index a9c44757d7e4..42daf62616e6 100644 --- a/keyboards/tapedeck/rules.mk +++ b/keyboards/tapedeck/rules.mk @@ -1,16 +1,3 @@ -# 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 = qmk-dfu - # Build Options # change yes to no to disable # From 0ef8e4b029afa4495f4d54569cd41171dac20ad6 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 16:27:06 +0000 Subject: [PATCH 10/48] Update keyboards/tapedeck/tapedeck.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/tapedeck/tapedeck.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/keyboards/tapedeck/tapedeck.c b/keyboards/tapedeck/tapedeck.c index 83c187a5e148..bec34038bc09 100644 --- a/keyboards/tapedeck/tapedeck.c +++ b/keyboards/tapedeck/tapedeck.c @@ -14,4 +14,23 @@ * along with this program. If not, see . */ -#include "tapedeck.h" +#include "quantum.h" +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { + return false; + } + if (index == 0) { /* First encoder */ + if (clockwise) { + tap_code(KC_WH_U); + } else { + tap_code(KC_WH_D); + } + } else if (index == 1) { /* Second encoder */ + if (clockwise) { + tap_code(KC_BRIU); + } else { + tap_code(KC_BRID); + } + } + return true; +} From 46f10c22a488cd5008fabfac9ade06e23023114f Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 16:38:59 +0000 Subject: [PATCH 11/48] update to info.json --- keyboards/tapedeck/config.h | 27 -------- keyboards/tapedeck/info.json | 112 +++++++++++++++++++++++++++++++--- keyboards/tapedeck/tapedeck.h | 29 --------- 3 files changed, 102 insertions(+), 66 deletions(-) delete mode 100644 keyboards/tapedeck/tapedeck.h diff --git a/keyboards/tapedeck/config.h b/keyboards/tapedeck/config.h index a7f655d15b45..e56320307650 100644 --- a/keyboards/tapedeck/config.h +++ b/keyboards/tapedeck/config.h @@ -15,33 +15,6 @@ along with this program. If not, see . #pragma once -/* Pin-out */ -#define MATRIX_ROW_PINS { B2, B3, B1 } -#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 } -#define QMK_LED B0 - -#define QMK_ESC_OUTPUT B2 -#define QMK_ESC_INPUT B5 - -/* ROW2COL */ -#define DIODE_DIRECTION ROW2COL - -/* RGB */ -#define RGB_DI_PIN B6 -#define RGBLED_NUM 3 -#define RGBLIGHT_EFFECT_STATIC_LIGHT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_HUE_STEP 10 -#define RGBLIGHT_SAT_STEP 17 -#define RGBLIGHT_LIMIT_VAL 225 - -/* Rotary Encoder*/ -#define ENCODERS_PAD_A { F4, F6 } -#define ENCODERS_PAD_B { F5, F7 } -#define ENCODER_RESOLUTION 4 - /* SLIDER */ #define POT_ENABLE diff --git a/keyboards/tapedeck/info.json b/keyboards/tapedeck/info.json index 5efd2b7459fe..3f30cfa0076c 100644 --- a/keyboards/tapedeck/info.json +++ b/keyboards/tapedeck/info.json @@ -1,20 +1,112 @@ { - "keyboard_name": "Tapedeck", "manufacturer": "Gowla", - "maintainer": "Gowla", - "url": "https://github.com/SamGowland/Gowla-Macro-Boards" + "keyboard_name": "Tapedeck", + "maintainer": "Gowla", "bootloader": "qmk-dfu", + "config_h_features": { + "audio": false, + "backlight": false, + "bluetooth": false, + "bootmagic": true, + "command": false, + "console": true, + "encoder": true, + "extrakey": true, + "fauxclicky": false, + "midi": false, + "mousekey": false, + "nkro": true, + "rgblight": true, + "sleep_led": false + }, "diode_direction": "ROW2COL", + "encoder": { + "enabled": true, + "rotary": [ + { + "pin_a": "F4", + "pin_b": "F5", + "resolution": 4 + }, + { + "pin_a": "F6", + "pin_b": "F7", + "resolution": 4 + } + ] + }, + "features": { + "audio": false, + "backlight": false, + "bluetooth": false, + "bootmagic": true, + "command": false, + "console": true, + "encoder": true, + "extrakey": true, + "fauxclicky": false, + "midi": false, + "mousekey": false, + "nkro": true, + "rgblight": true, + "sleep_led": false + }, + "keyboard_folder": "tapedeck", + "keymaps": {}, + "matrix_pins": { + "cols": ["B5", "B4", "E6", "D7", "C6"], + "rows": ["B2", "B3", "B1"] + }, + "matrix_size": { + "cols": 5, + "rows": 3 + }, + "mouse_key": { + "enabled": false + }, + "parse_errors": [], + "parse_warnings": ["DIODE_DIRECTION in config.h is overwriting diode_direction in info.json"], + "platform": "unknown", + "processor": "atmega32u4", + "processor_type": "avr", + "protocol": "LUFA", + "qmk_lufa_bootloader": { + "esc_input": "B5", + "esc_output": "B2", + "led": "B0" + }, + "rgblight": { + "hue_steps": 10, + "led_count": 3, + "max_brightness": 225, + "pin": "B6", + "saturation_steps": 17 + }, + "url": "https://github.com/SamGowland/Gowla-Macro-Boards", "usb": { - "vid": "0xFEED", + "device_version": "1.0.0", "pid": "0x0000", - "device_version": "1.0.0" + "vid": "0xFEED" }, - "processor": "amtega32u4", - "bootloader": "qmk-dfu", - "layouts": { + "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":5, "y":0.5}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":5, "y":1.75}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}] + "c_macro": true, + "layout": [ + { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, + { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, + { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, + { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, + { "label": "k04", "matrix": [0, 4], "w": 1, "x": 5, "y": 0.5 }, + { "label": "k10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 }, + { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 }, + { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 }, + { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 }, + { "label": "k14", "matrix": [1, 4], "w": 1, "x": 5, "y": 1.75 }, + { "label": "k20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 }, + { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 }, + { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 }, + { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 } + ] } - } + } } \ No newline at end of file diff --git a/keyboards/tapedeck/tapedeck.h b/keyboards/tapedeck/tapedeck.h deleted file mode 100644 index 2d1b39fc8d24..000000000000 --- a/keyboards/tapedeck/tapedeck.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2023 Gowla - * - * 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( \ - k00, k01, k02, k03, k04, \ - k10, k11, k12, k13, k14,\ - k20, k21, k22, k23 \ -) { \ - { k00, k01, k02, k03, k04, }, \ - { k10, k11, k12, k13, k14, }, \ - { k20, k21, k22, k23 } \ -} From cb019f53a2a4e608bfd8e329b61076025c955092 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 16:47:12 +0000 Subject: [PATCH 12/48] rgb --- keyboards/tapedeck/info.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/keyboards/tapedeck/info.json b/keyboards/tapedeck/info.json index 3f30cfa0076c..0524d1a7f22b 100644 --- a/keyboards/tapedeck/info.json +++ b/keyboards/tapedeck/info.json @@ -80,7 +80,13 @@ "led_count": 3, "max_brightness": 225, "pin": "B6", - "saturation_steps": 17 + "saturation_steps": 17. + "animations": { + "knight": true, + "rainbow_swirl": true, + "rainbow_mood": true, + "rgb_test": true + } }, "url": "https://github.com/SamGowland/Gowla-Macro-Boards", "usb": { From cf54628c2f2a5e4ac1cb82a7a46da131703aff85 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 16:48:23 +0000 Subject: [PATCH 13/48] bad comma --- keyboards/tapedeck/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/tapedeck/info.json b/keyboards/tapedeck/info.json index 0524d1a7f22b..4cdba074e65f 100644 --- a/keyboards/tapedeck/info.json +++ b/keyboards/tapedeck/info.json @@ -80,7 +80,7 @@ "led_count": 3, "max_brightness": 225, "pin": "B6", - "saturation_steps": 17. + "saturation_steps": 17, "animations": { "knight": true, "rainbow_swirl": true, From 61c415e32c8379cc05e0c19af9a9749dc2a048a9 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 22:50:08 +0000 Subject: [PATCH 14/48] Update keyboards/tapedeck/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tapedeck/info.json | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/keyboards/tapedeck/info.json b/keyboards/tapedeck/info.json index 4cdba074e65f..c8a37d401ce6 100644 --- a/keyboards/tapedeck/info.json +++ b/keyboards/tapedeck/info.json @@ -2,23 +2,7 @@ "manufacturer": "Gowla", "keyboard_name": "Tapedeck", "maintainer": "Gowla", - "bootloader": "qmk-dfu", - "config_h_features": { - "audio": false, - "backlight": false, - "bluetooth": false, - "bootmagic": true, - "command": false, - "console": true, - "encoder": true, - "extrakey": true, - "fauxclicky": false, - "midi": false, - "mousekey": false, - "nkro": true, - "rgblight": true, - "sleep_led": false - }, + "development_board": "promicro", "diode_direction": "ROW2COL", "encoder": { "enabled": true, From 62b4f474366e17dae4b6477d43ab167ec32bde90 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 22:50:20 +0000 Subject: [PATCH 15/48] Update keyboards/tapedeck/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tapedeck/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/tapedeck/info.json b/keyboards/tapedeck/info.json index c8a37d401ce6..8530cab6128c 100644 --- a/keyboards/tapedeck/info.json +++ b/keyboards/tapedeck/info.json @@ -5,7 +5,6 @@ "development_board": "promicro", "diode_direction": "ROW2COL", "encoder": { - "enabled": true, "rotary": [ { "pin_a": "F4", From 907b3d8d92bdb1df5b3aa62526a1f749b9f5f68e Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 22:50:33 +0000 Subject: [PATCH 16/48] Update keyboards/tapedeck/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tapedeck/info.json | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/keyboards/tapedeck/info.json b/keyboards/tapedeck/info.json index 8530cab6128c..1ad7342074a9 100644 --- a/keyboards/tapedeck/info.json +++ b/keyboards/tapedeck/info.json @@ -19,23 +19,13 @@ ] }, "features": { - "audio": false, - "backlight": false, - "bluetooth": false, "bootmagic": true, - "command": false, - "console": true, "encoder": true, "extrakey": true, - "fauxclicky": false, - "midi": false, - "mousekey": false, + "mousekey": true, "nkro": true, "rgblight": true, - "sleep_led": false }, - "keyboard_folder": "tapedeck", - "keymaps": {}, "matrix_pins": { "cols": ["B5", "B4", "E6", "D7", "C6"], "rows": ["B2", "B3", "B1"] From 9c3a9c3dee0c030b5745a1201bce991cb6dab7cd Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 22:51:00 +0000 Subject: [PATCH 17/48] Update keyboards/tapedeck/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tapedeck/info.json | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/keyboards/tapedeck/info.json b/keyboards/tapedeck/info.json index 1ad7342074a9..55c36b9223b3 100644 --- a/keyboards/tapedeck/info.json +++ b/keyboards/tapedeck/info.json @@ -30,24 +30,6 @@ "cols": ["B5", "B4", "E6", "D7", "C6"], "rows": ["B2", "B3", "B1"] }, - "matrix_size": { - "cols": 5, - "rows": 3 - }, - "mouse_key": { - "enabled": false - }, - "parse_errors": [], - "parse_warnings": ["DIODE_DIRECTION in config.h is overwriting diode_direction in info.json"], - "platform": "unknown", - "processor": "atmega32u4", - "processor_type": "avr", - "protocol": "LUFA", - "qmk_lufa_bootloader": { - "esc_input": "B5", - "esc_output": "B2", - "led": "B0" - }, "rgblight": { "hue_steps": 10, "led_count": 3, From 083f2db88eb2a2570d6e6300fafa6ae401e5d5f4 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 22:51:30 +0000 Subject: [PATCH 18/48] Update keyboards/tapedeck/keymaps/default/keymap.c Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tapedeck/keymaps/default/keymap.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/keyboards/tapedeck/keymaps/default/keymap.c b/keyboards/tapedeck/keymaps/default/keymap.c index ec3e38cc10e4..1e6be40fe627 100644 --- a/keyboards/tapedeck/keymaps/default/keymap.c +++ b/keyboards/tapedeck/keymaps/default/keymap.c @@ -83,16 +83,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } -#ifdef RGBLIGHT_ENABLE -void keyboard_post_init_user(void) { - // led hue, sat, val, led - rgblight_sethsv_range(HSV_GREEN, 0, 2); - rgblight_sethsv_noeeprom(HSV_GREEN); -} -#endif - - - - - - From 13f312fee02ebb3d900e5c90fd0189e9bf39c844 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 22:51:49 +0000 Subject: [PATCH 19/48] Update keyboards/tapedeck/keymaps/default/keymap.c Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tapedeck/keymaps/default/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/tapedeck/keymaps/default/keymap.c b/keyboards/tapedeck/keymaps/default/keymap.c index 1e6be40fe627..c58c79ed8c42 100644 --- a/keyboards/tapedeck/keymaps/default/keymap.c +++ b/keyboards/tapedeck/keymaps/default/keymap.c @@ -29,9 +29,9 @@ int16_t val = 0; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [BASE] = LAYOUT( - KC_ESC, KC_MNXT, KC_MPLY, KC_MNXT, KC_MPLY, - RGB_MODE_RAINBOW, RGB_MODE_RGBTEST, RGB_M_K, RGB_TOG, KC_MPLY, - KC_F1, KC_F2, KC_F3, KC_F14 + KC_ESC, KC_MNXT, KC_MPLY, KC_MNXT, KC_MPLY, + RGB_MODE_RAINBOW, RGB_MODE_RGBTEST, RGB_M_K, RGB_TOG, KC_MPLY, + KC_F1, KC_F2, KC_F3, KC_F14 ) }; From f991ff6ae4d689e787960a8cbcf3dd9ed71e5691 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 22:52:05 +0000 Subject: [PATCH 20/48] Update keyboards/tapedeck/keymaps/default/keymap.c Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tapedeck/keymaps/default/keymap.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/keyboards/tapedeck/keymaps/default/keymap.c b/keyboards/tapedeck/keymaps/default/keymap.c index c58c79ed8c42..5247f83694dd 100644 --- a/keyboards/tapedeck/keymaps/default/keymap.c +++ b/keyboards/tapedeck/keymaps/default/keymap.c @@ -35,6 +35,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; +#ifdef ENCODER_MAP_ENABLE +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [BASE] = { ENCODER_CCW_CW(KC_WH_D, KC_WH_U), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } +}; +#endif + void matrix_init_user(void) { #ifdef POT_ENABLE analogReference(ADC_REF_POWER); From 83d888e15492b8fa12b84db56d8acaf3c91dadd9 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 22:52:18 +0000 Subject: [PATCH 21/48] Update keyboards/tapedeck/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tapedeck/info.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/tapedeck/info.json b/keyboards/tapedeck/info.json index 55c36b9223b3..2ad9fa340f88 100644 --- a/keyboards/tapedeck/info.json +++ b/keyboards/tapedeck/info.json @@ -31,11 +31,9 @@ "rows": ["B2", "B3", "B1"] }, "rgblight": { - "hue_steps": 10, "led_count": 3, "max_brightness": 225, "pin": "B6", - "saturation_steps": 17, "animations": { "knight": true, "rainbow_swirl": true, From 8ff164bea47161c705c9ddd021ed3e9c36f5a6e6 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 23:04:06 +0000 Subject: [PATCH 22/48] Update keyboards/tapedeck/readme.md Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tapedeck/readme.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/keyboards/tapedeck/readme.md b/keyboards/tapedeck/readme.md index 85d3f391705f..90432744f888 100644 --- a/keyboards/tapedeck/readme.md +++ b/keyboards/tapedeck/readme.md @@ -12,6 +12,10 @@ Make example for this keyboard (after setting up your build environment): - make tapedeck/light:default + make tapedeck:default + +Flashing example for this keyboard: + + make tapedeck: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). From de298db6d8f30f473a033d60a82fcd6a9326127c Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 23:04:52 +0000 Subject: [PATCH 23/48] Update keyboards/tapedeck/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tapedeck/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/tapedeck/info.json b/keyboards/tapedeck/info.json index 2ad9fa340f88..a8589d47219c 100644 --- a/keyboards/tapedeck/info.json +++ b/keyboards/tapedeck/info.json @@ -49,7 +49,6 @@ }, "layouts": { "LAYOUT": { - "c_macro": true, "layout": [ { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, From 8cac909842253258be8bdd29a63658d905e2abc4 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 23:05:09 +0000 Subject: [PATCH 24/48] Update keyboards/tapedeck/readme.md Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tapedeck/readme.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/keyboards/tapedeck/readme.md b/keyboards/tapedeck/readme.md index 90432744f888..23e0726403ce 100644 --- a/keyboards/tapedeck/readme.md +++ b/keyboards/tapedeck/readme.md @@ -19,3 +19,17 @@ Flashing example for this keyboard: make tapedeck: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 top-left key (underneath the Pro Micro) and plug in the keyboard. This will also clear EEPROM, so it is a good first step if the keyboard is misbehaving. +* **Physical reset**: Remove the back plate and short the `RST` and `GND` pins on the Pro Micro. +* **Keycode in layout**: There is no key mapped to `QK_BOOT` in the pre-created keymaps, but you may assign this key in any keymaps you create. + +As a Pro Micro-compatible board, the Gowla Tapedeck uses `caterina` as its bootloader by default. Many popular Pro Micro alternatives like the Elite-C, Bit-C, Sea-Micro, Puchi-C etc should be flashed with a different bootloader such as `atmel-dfu`. + +If the incorrect bootloader is specified, bootmagic reset and the `QK_BOOT` keycode will not work. + +To avoid this problem, set the correct bootloader in your custom keymap's `rules.mk` file before compiling, or flash using an appropriate target (e.g. `make tapedeck:default:dfu`). See [flashing instructions and bootloader information](https://docs.qmk.fm/#/flashing) for more details. From 49bee459aad849f01674629b8a2e39ef4bb94b0d Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 23:05:33 +0000 Subject: [PATCH 25/48] Update keyboards/tapedeck/rules.mk Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tapedeck/rules.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/keyboards/tapedeck/rules.mk b/keyboards/tapedeck/rules.mk index 42daf62616e6..2c2c1dfff0ea 100644 --- a/keyboards/tapedeck/rules.mk +++ b/keyboards/tapedeck/rules.mk @@ -1,12 +1,4 @@ # Build Options # change yes to no to disable # -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -ENCODER_ENABLE = yes # Enable Rotary Encoder -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow SRC += analog.c -BOOTMAGIC_ENABLE = yes From e344a4234216988450f8ebd274148909757506d1 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 23:05:58 +0000 Subject: [PATCH 26/48] Update keyboards/tapedeck/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tapedeck/info.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/keyboards/tapedeck/info.json b/keyboards/tapedeck/info.json index a8589d47219c..309378124404 100644 --- a/keyboards/tapedeck/info.json +++ b/keyboards/tapedeck/info.json @@ -50,20 +50,20 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "k04", "matrix": [0, 4], "w": 1, "x": 5, "y": 0.5 }, - { "label": "k10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 }, - { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 }, - { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 }, - { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 }, - { "label": "k14", "matrix": [1, 4], "w": 1, "x": 5, "y": 1.75 }, - { "label": "k20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 }, - { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 }, - { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 }, - { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 } + { "label": "k00", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "k01", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "k02", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "k03", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "k04", "matrix": [0, 4], "x": 5, "y": 0.5 }, + { "label": "k10", "matrix": [1, 0], "x": 0, "y": 1 }, + { "label": "k11", "matrix": [1, 1], "x": 1, "y": 1 }, + { "label": "k12", "matrix": [1, 2], "x": 2, "y": 1 }, + { "label": "k13", "matrix": [1, 3], "x": 3, "y": 1 }, + { "label": "k14", "matrix": [1, 4], "x": 5, "y": 1.75 }, + { "label": "k20", "matrix": [2, 0], "x": 0, "y": 2 }, + { "label": "k21", "matrix": [2, 1], "x": 1, "y": 2 }, + { "label": "k22", "matrix": [2, 2], "x": 2, "y": 2 }, + { "label": "k23", "matrix": [2, 3], "x": 3, "y": 2 } ] } } From c7b42092ecefd42199feccaee3c2294c4f9c4df3 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 23:06:22 +0000 Subject: [PATCH 27/48] Update keyboards/tapedeck/keymaps/default/keymap.c Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tapedeck/keymaps/default/keymap.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/keyboards/tapedeck/keymaps/default/keymap.c b/keyboards/tapedeck/keymaps/default/keymap.c index 5247f83694dd..42106db7c582 100644 --- a/keyboards/tapedeck/keymaps/default/keymap.c +++ b/keyboards/tapedeck/keymaps/default/keymap.c @@ -81,11 +81,4 @@ void matrix_scan_user(void) { #endif } -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - // If console is enabled, it will print the matrix position and status of each key pressed - #ifdef CONSOLE_ENABLE - uprintf("KL: kc: 0x%04X, col: %u, row: %u, pressed: %b, time: %u, interrupt: %b, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count); - #endif - return true; -} From 8c23edef5d01aeb30634553818125a5054c29b27 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 17 Mar 2023 23:26:15 +0000 Subject: [PATCH 28/48] volume in keyboard not keymap --- keyboards/tapedeck/config.h | 3 ++ keyboards/tapedeck/info.json | 1 + keyboards/tapedeck/keymaps/default/keymap.c | 46 ------------------- keyboards/tapedeck/tapedeck.c | 49 +++++++++++++++++++++ 4 files changed, 53 insertions(+), 46 deletions(-) diff --git a/keyboards/tapedeck/config.h b/keyboards/tapedeck/config.h index e56320307650..c98f3e4217f3 100644 --- a/keyboards/tapedeck/config.h +++ b/keyboards/tapedeck/config.h @@ -18,3 +18,6 @@ along with this program. If not, see . /* SLIDER */ #define POT_ENABLE +/* RGB Default */ +# define RGB_MATRIX_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD + diff --git a/keyboards/tapedeck/info.json b/keyboards/tapedeck/info.json index 309378124404..8449030d60a8 100644 --- a/keyboards/tapedeck/info.json +++ b/keyboards/tapedeck/info.json @@ -3,6 +3,7 @@ "keyboard_name": "Tapedeck", "maintainer": "Gowla", "development_board": "promicro", + "bootloader": "qmk-dfu", "diode_direction": "ROW2COL", "encoder": { "rotary": [ diff --git a/keyboards/tapedeck/keymaps/default/keymap.c b/keyboards/tapedeck/keymaps/default/keymap.c index 42106db7c582..b83561855daf 100644 --- a/keyboards/tapedeck/keymaps/default/keymap.c +++ b/keyboards/tapedeck/keymaps/default/keymap.c @@ -19,14 +19,6 @@ #define BASE 0 -#ifdef POT_ENABLE - #include "analog.h" -#endif - -int16_t pot_val = 0; -int16_t prev_val = 0; -int16_t val = 0; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [BASE] = LAYOUT( KC_ESC, KC_MNXT, KC_MPLY, KC_MNXT, KC_MPLY, @@ -41,44 +33,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { }; #endif -void matrix_init_user(void) { -#ifdef POT_ENABLE - analogReference(ADC_REF_POWER); -#endif -} - -uint8_t divisor = 0; -long map(long x, long in_min, long in_max, long out_min, long out_max) -{ - return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min; -} - -void slider(void) { - if (divisor++) { // only run the slider function 1/256 times it's called - return; - } - - pot_val = analogReadPin(D4); - val = map(pot_val, 0, 1023, 1, 50); - - if (( val > (prev_val + 1)) && val != prev_val){ - int i; - for (i = prev_val; i < val; i++ ) - {tap_code(KC_VOLU);} - } - if ((val < (prev_val - 1)) && val != prev_val){ - int i; - for (i = val; i < prev_val; i++ ) - {tap_code(KC_VOLD);} - } - prev_val = val; -} - -void matrix_scan_user(void) { -#ifdef POT_ENABLE - slider(); -#endif -} diff --git a/keyboards/tapedeck/tapedeck.c b/keyboards/tapedeck/tapedeck.c index bec34038bc09..2aa3987ac7a9 100644 --- a/keyboards/tapedeck/tapedeck.c +++ b/keyboards/tapedeck/tapedeck.c @@ -15,6 +15,15 @@ */ #include "quantum.h" + +#ifdef POT_ENABLE + #include "analog.h" +#endif + +int16_t pot_val = 0; +int16_t prev_val = 0; +int16_t val = 0; + bool encoder_update_kb(uint8_t index, bool clockwise) { if (!encoder_update_user(index, clockwise)) { return false; @@ -34,3 +43,43 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { } return true; } + +void matrix_init_kb(void) { +#ifdef POT_ENABLE + analogReference(ADC_REF_POWER); +#endif +} + +uint8_t divisor = 0; + +long map(long x, long in_min, long in_max, long out_min, long out_max) +{ + return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min; +} + +void slider(void) { + if (divisor++) { // only run the slider function 1/256 times it's called + return; + } + + pot_val = analogReadPin(D4); + val = map(pot_val, 0, 1023, 1, 50); + + if (( val > (prev_val + 1)) && val != prev_val){ + int i; + for (i = prev_val; i < val; i++ ) + {tap_code(KC_VOLU);} + } + if ((val < (prev_val - 1)) && val != prev_val){ + int i; + for (i = val; i < prev_val; i++ ) + {tap_code(KC_VOLD);} + } + prev_val = val; +} + +void matrix_scan_kb(void) { +#ifdef POT_ENABLE + slider(); +#endif +} From 8311b4dc228e59b055bc8d3c2f4bb76037f8bc07 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Sat, 18 Mar 2023 00:06:11 +0000 Subject: [PATCH 29/48] Update keyboards/tapedeck/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tapedeck/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/tapedeck/info.json b/keyboards/tapedeck/info.json index 8449030d60a8..309378124404 100644 --- a/keyboards/tapedeck/info.json +++ b/keyboards/tapedeck/info.json @@ -3,7 +3,6 @@ "keyboard_name": "Tapedeck", "maintainer": "Gowla", "development_board": "promicro", - "bootloader": "qmk-dfu", "diode_direction": "ROW2COL", "encoder": { "rotary": [ From d970bbe24637aa1442b248f23f6e19c5bcc89584 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Sat, 18 Mar 2023 00:15:29 +0000 Subject: [PATCH 30/48] markdown no html --- keyboards/tapedeck/readme.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/tapedeck/readme.md b/keyboards/tapedeck/readme.md index 23e0726403ce..57216b3349cd 100644 --- a/keyboards/tapedeck/readme.md +++ b/keyboards/tapedeck/readme.md @@ -1,8 +1,6 @@ # Gowla Tapedeck -

- -

+![Image of Tapedeck](https://i.ibb.co/R3JVMjM/tapedeck.jpg) 4x4 12 Key Macro Board with 60MM Slider, RGB and 2 X Rotary Encoders. For use with QMK, designed and sold by Gowla. From ec38f42b10476c25ad42e0fb3c816c200584a4c0 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Sun, 19 Mar 2023 21:02:02 +0000 Subject: [PATCH 31/48] Update keyboards/tapedeck/rules.mk Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/tapedeck/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/tapedeck/rules.mk b/keyboards/tapedeck/rules.mk index 2c2c1dfff0ea..3039719f6e61 100644 --- a/keyboards/tapedeck/rules.mk +++ b/keyboards/tapedeck/rules.mk @@ -1,4 +1,4 @@ # Build Options # change yes to no to disable # -SRC += analog.c +QUANTUM_LIB_SRC += analog.c From 359139c4ca8ef086f68bba6c76d810f1f9901c03 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Mon, 20 Mar 2023 13:47:51 +0000 Subject: [PATCH 32/48] Update keyboards/tapedeck/tapedeck.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/tapedeck/tapedeck.c | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/tapedeck/tapedeck.c b/keyboards/tapedeck/tapedeck.c index 2aa3987ac7a9..81e4ca6665a5 100644 --- a/keyboards/tapedeck/tapedeck.c +++ b/keyboards/tapedeck/tapedeck.c @@ -48,6 +48,7 @@ void matrix_init_kb(void) { #ifdef POT_ENABLE analogReference(ADC_REF_POWER); #endif + matrix_init_user(); } uint8_t divisor = 0; From 2ade9be9e583611ae3bac860877cc008aa6ed0a0 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Mon, 20 Mar 2023 13:48:05 +0000 Subject: [PATCH 33/48] Update keyboards/tapedeck/tapedeck.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/tapedeck/tapedeck.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/tapedeck/tapedeck.c b/keyboards/tapedeck/tapedeck.c index 81e4ca6665a5..97a874e4a03a 100644 --- a/keyboards/tapedeck/tapedeck.c +++ b/keyboards/tapedeck/tapedeck.c @@ -81,6 +81,7 @@ void slider(void) { void matrix_scan_kb(void) { #ifdef POT_ENABLE - slider(); + slider(); #endif + matrix_scan_user(); } From e2333f4f42738a9f786f091c3560f6447d2c8565 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Mon, 20 Mar 2023 13:56:08 +0000 Subject: [PATCH 34/48] enocder map enable --- keyboards/tapedeck/rules.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/tapedeck/rules.mk b/keyboards/tapedeck/rules.mk index 3039719f6e61..032359d105e5 100644 --- a/keyboards/tapedeck/rules.mk +++ b/keyboards/tapedeck/rules.mk @@ -2,3 +2,4 @@ # change yes to no to disable # QUANTUM_LIB_SRC += analog.c +ENCODER_MAP_ENABLE = yes From 45d39dc6ce4bf0a1e008f4f434930d9fa97e11b5 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Tue, 21 Mar 2023 12:02:43 +0000 Subject: [PATCH 35/48] brightness on second encoder by default --- keyboards/tapedeck/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/tapedeck/keymaps/default/keymap.c b/keyboards/tapedeck/keymaps/default/keymap.c index b83561855daf..06fd69321765 100644 --- a/keyboards/tapedeck/keymaps/default/keymap.c +++ b/keyboards/tapedeck/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #ifdef ENCODER_MAP_ENABLE const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [BASE] = { ENCODER_CCW_CW(KC_WH_D, KC_WH_U), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } + [BASE] = { ENCODER_CCW_CW(KC_WH_D, KC_WH_U), ENCODER_CCW_CW(KC_BRID, KC_BRIU) } }; #endif From d65f512285fda37f2e07776a999eee39bbff85ed Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Tue, 21 Mar 2023 12:28:16 +0000 Subject: [PATCH 36/48] Update keyboards/tapedeck/keymaps/default/keymap.c Co-authored-by: Ryan --- keyboards/tapedeck/keymaps/default/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/tapedeck/keymaps/default/keymap.c b/keyboards/tapedeck/keymaps/default/keymap.c index 06fd69321765..387fe1abd381 100644 --- a/keyboards/tapedeck/keymaps/default/keymap.c +++ b/keyboards/tapedeck/keymaps/default/keymap.c @@ -15,7 +15,6 @@ */ #include QMK_KEYBOARD_H -#include "print.h" #define BASE 0 From 161697c52174e8a98b1d73bbc06552d3b6229a20 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Tue, 21 Mar 2023 19:56:19 +0000 Subject: [PATCH 37/48] Update keyboards/tapedeck/tapedeck.c Co-authored-by: Drashna Jaelre --- keyboards/tapedeck/tapedeck.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/tapedeck/tapedeck.c b/keyboards/tapedeck/tapedeck.c index 97a874e4a03a..b2a545d48409 100644 --- a/keyboards/tapedeck/tapedeck.c +++ b/keyboards/tapedeck/tapedeck.c @@ -83,5 +83,4 @@ void matrix_scan_kb(void) { #ifdef POT_ENABLE slider(); #endif - matrix_scan_user(); } From 5fba777eb5b2bee92ae70f268e3beb8cb52fa5ce Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Tue, 21 Mar 2023 19:56:25 +0000 Subject: [PATCH 38/48] Update keyboards/tapedeck/tapedeck.c Co-authored-by: Drashna Jaelre --- keyboards/tapedeck/tapedeck.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/tapedeck/tapedeck.c b/keyboards/tapedeck/tapedeck.c index b2a545d48409..32ce13955a5d 100644 --- a/keyboards/tapedeck/tapedeck.c +++ b/keyboards/tapedeck/tapedeck.c @@ -79,7 +79,7 @@ void slider(void) { prev_val = val; } -void matrix_scan_kb(void) { +void housekeeping_task_kb(void) { #ifdef POT_ENABLE slider(); #endif From 445016fb0323a96fa68931180785062ad60347fc Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Tue, 21 Mar 2023 19:56:31 +0000 Subject: [PATCH 39/48] Update keyboards/tapedeck/tapedeck.c Co-authored-by: Drashna Jaelre --- keyboards/tapedeck/tapedeck.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/tapedeck/tapedeck.c b/keyboards/tapedeck/tapedeck.c index 32ce13955a5d..395e62f577dc 100644 --- a/keyboards/tapedeck/tapedeck.c +++ b/keyboards/tapedeck/tapedeck.c @@ -48,7 +48,7 @@ void matrix_init_kb(void) { #ifdef POT_ENABLE analogReference(ADC_REF_POWER); #endif - matrix_init_user(); + keyboard_post_init_user(); } uint8_t divisor = 0; From 2814ca361b2a75324f58e44370c567e2f0158b6e Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Tue, 21 Mar 2023 19:56:40 +0000 Subject: [PATCH 40/48] Update keyboards/tapedeck/tapedeck.c Co-authored-by: Drashna Jaelre --- keyboards/tapedeck/tapedeck.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/tapedeck/tapedeck.c b/keyboards/tapedeck/tapedeck.c index 395e62f577dc..7f5004747e7b 100644 --- a/keyboards/tapedeck/tapedeck.c +++ b/keyboards/tapedeck/tapedeck.c @@ -44,7 +44,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { return true; } -void matrix_init_kb(void) { +void keyboard_post_init_kb(void) { #ifdef POT_ENABLE analogReference(ADC_REF_POWER); #endif From 9b11d86786c060c61f10efc40bf629da26e49b34 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Thu, 23 Mar 2023 12:41:48 +0000 Subject: [PATCH 41/48] Update keyboards/tapedeck/info.json Co-authored-by: Joel Challis --- keyboards/tapedeck/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/tapedeck/info.json b/keyboards/tapedeck/info.json index 309378124404..b2458a28dc1d 100644 --- a/keyboards/tapedeck/info.json +++ b/keyboards/tapedeck/info.json @@ -8,8 +8,7 @@ "rotary": [ { "pin_a": "F4", - "pin_b": "F5", - "resolution": 4 + "pin_b": "F5" }, { "pin_a": "F6", From 5e26d20a00fdf6a2acdc368fe9d259c3ca305d5c Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Thu, 23 Mar 2023 12:41:57 +0000 Subject: [PATCH 42/48] Update keyboards/tapedeck/info.json Co-authored-by: Joel Challis --- keyboards/tapedeck/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/tapedeck/info.json b/keyboards/tapedeck/info.json index b2458a28dc1d..d23720ad20c2 100644 --- a/keyboards/tapedeck/info.json +++ b/keyboards/tapedeck/info.json @@ -12,8 +12,7 @@ }, { "pin_a": "F6", - "pin_b": "F7", - "resolution": 4 + "pin_b": "F7" } ] }, From d73755917092db06d8ca6563480885f0caeb2bdd Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Thu, 23 Mar 2023 12:42:05 +0000 Subject: [PATCH 43/48] Update keyboards/tapedeck/keymaps/default/keymap.c Co-authored-by: Joel Challis --- keyboards/tapedeck/keymaps/default/keymap.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/tapedeck/keymaps/default/keymap.c b/keyboards/tapedeck/keymaps/default/keymap.c index 387fe1abd381..ad8fe3731f8f 100644 --- a/keyboards/tapedeck/keymaps/default/keymap.c +++ b/keyboards/tapedeck/keymaps/default/keymap.c @@ -31,7 +31,3 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [BASE] = { ENCODER_CCW_CW(KC_WH_D, KC_WH_U), ENCODER_CCW_CW(KC_BRID, KC_BRIU) } }; #endif - - - - From 7fa53043775900d5dc810a5589407f0620ac6ac6 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Thu, 23 Mar 2023 12:54:16 +0000 Subject: [PATCH 44/48] encoder map enable move to keymaps --- keyboards/tapedeck/keymaps/rules.mk | 4 ++++ keyboards/tapedeck/rules.mk | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 keyboards/tapedeck/keymaps/rules.mk diff --git a/keyboards/tapedeck/keymaps/rules.mk b/keyboards/tapedeck/keymaps/rules.mk new file mode 100644 index 000000000000..20bd7170718d --- /dev/null +++ b/keyboards/tapedeck/keymaps/rules.mk @@ -0,0 +1,4 @@ +# Build Options +# change yes to no to disable +# +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/tapedeck/rules.mk b/keyboards/tapedeck/rules.mk index 032359d105e5..3039719f6e61 100644 --- a/keyboards/tapedeck/rules.mk +++ b/keyboards/tapedeck/rules.mk @@ -2,4 +2,3 @@ # change yes to no to disable # QUANTUM_LIB_SRC += analog.c -ENCODER_MAP_ENABLE = yes From 4c26317889166d0852d2fbf4471f9ef4446e7ce0 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 24 Mar 2023 16:45:47 +0000 Subject: [PATCH 45/48] Update keyboards/tapedeck/config.h Co-authored-by: Joel Challis --- keyboards/tapedeck/config.h | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/keyboards/tapedeck/config.h b/keyboards/tapedeck/config.h index c98f3e4217f3..6d9a8e19a62b 100644 --- a/keyboards/tapedeck/config.h +++ b/keyboards/tapedeck/config.h @@ -1,17 +1,18 @@ -/* -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 2023 Gowla + * + * 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 From cb661f837f3dec81516813cdf21ea0494d264b5d Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Fri, 24 Mar 2023 16:46:00 +0000 Subject: [PATCH 46/48] Update keyboards/tapedeck/info.json Co-authored-by: Joel Challis --- keyboards/tapedeck/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/tapedeck/info.json b/keyboards/tapedeck/info.json index d23720ad20c2..bc32e2b5ea9f 100644 --- a/keyboards/tapedeck/info.json +++ b/keyboards/tapedeck/info.json @@ -30,7 +30,6 @@ }, "rgblight": { "led_count": 3, - "max_brightness": 225, "pin": "B6", "animations": { "knight": true, From dee42a03eae557dc7bb50b988d7c75780f360a94 Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Sun, 26 Mar 2023 16:53:15 +0100 Subject: [PATCH 47/48] Only use the slider code if enabled. --- keyboards/tapedeck/tapedeck.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/keyboards/tapedeck/tapedeck.c b/keyboards/tapedeck/tapedeck.c index 7f5004747e7b..dba9fb59c961 100644 --- a/keyboards/tapedeck/tapedeck.c +++ b/keyboards/tapedeck/tapedeck.c @@ -20,10 +20,6 @@ #include "analog.h" #endif -int16_t pot_val = 0; -int16_t prev_val = 0; -int16_t val = 0; - bool encoder_update_kb(uint8_t index, bool clockwise) { if (!encoder_update_user(index, clockwise)) { return false; @@ -51,6 +47,10 @@ void keyboard_post_init_kb(void) { keyboard_post_init_user(); } +#ifdef POT_ENABLE +int16_t pot_val = 0; +int16_t prev_val = 0; +int16_t val = 0; uint8_t divisor = 0; long map(long x, long in_min, long in_max, long out_min, long out_max) @@ -64,7 +64,7 @@ void slider(void) { } pot_val = analogReadPin(D4); - val = map(pot_val, 0, 1023, 1, 50); + val = map(pot_val, 0, 1023, 1, 50); // Windows Specific if (( val > (prev_val + 1)) && val != prev_val){ int i; @@ -78,6 +78,7 @@ void slider(void) { } prev_val = val; } +#endif void housekeeping_task_kb(void) { #ifdef POT_ENABLE From d8a0cc59880a09dc37d15c6d06bce7d3c08b517c Mon Sep 17 00:00:00 2001 From: Sam Gowland <10119462+SamGowland@users.noreply.github.com> Date: Tue, 11 Apr 2023 18:23:28 +0100 Subject: [PATCH 48/48] move to correct folder --- keyboards/tapedeck/keymaps/{ => default}/rules.mk | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename keyboards/tapedeck/keymaps/{ => default}/rules.mk (100%) diff --git a/keyboards/tapedeck/keymaps/rules.mk b/keyboards/tapedeck/keymaps/default/rules.mk similarity index 100% rename from keyboards/tapedeck/keymaps/rules.mk rename to keyboards/tapedeck/keymaps/default/rules.mk