From f6a67c10bd0fe59d0b468ba870bb511d9787a34c Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sat, 11 Sep 2021 23:21:28 -0700 Subject: [PATCH] [Keyboard] Fix Redox Media compilation errors (#14345) Co-authored-by: Ryan --- keyboards/redox/keymaps/media_ch/rules.mk | 2 -- keyboards/redox/media/rules.mk | 0 .../{redox/media => redox_media}/config.h | 0 .../keymaps/default}/config.h | 0 .../keymaps/default}/keymap.c | 17 ----------- .../keymaps/default}/readme.md | 0 .../{redox/media => redox_media}/readme.md | 2 +- .../media.c => redox_media/redox_media.c} | 22 ++++++++++++++- .../media.h => redox_media/redox_media.h} | 2 +- keyboards/redox_media/rules.mk | 28 +++++++++++++++++++ 10 files changed, 51 insertions(+), 22 deletions(-) delete mode 100644 keyboards/redox/keymaps/media_ch/rules.mk delete mode 100644 keyboards/redox/media/rules.mk rename keyboards/{redox/media => redox_media}/config.h (100%) rename keyboards/{redox/keymaps/media_ch => redox_media/keymaps/default}/config.h (100%) rename keyboards/{redox/keymaps/media_ch => redox_media/keymaps/default}/keymap.c (95%) rename keyboards/{redox/keymaps/media_ch => redox_media/keymaps/default}/readme.md (100%) rename keyboards/{redox/media => redox_media}/readme.md (98%) rename keyboards/{redox/media/media.c => redox_media/redox_media.c} (56%) rename keyboards/{redox/media/media.h => redox_media/redox_media.h} (99%) create mode 100644 keyboards/redox_media/rules.mk diff --git a/keyboards/redox/keymaps/media_ch/rules.mk b/keyboards/redox/keymaps/media_ch/rules.mk deleted file mode 100644 index cf544bacba3..00000000000 --- a/keyboards/redox/keymaps/media_ch/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -RGBLIGHT_ENABLE = no -ENCODER_ENABLE = yes diff --git a/keyboards/redox/media/rules.mk b/keyboards/redox/media/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/redox/media/config.h b/keyboards/redox_media/config.h similarity index 100% rename from keyboards/redox/media/config.h rename to keyboards/redox_media/config.h diff --git a/keyboards/redox/keymaps/media_ch/config.h b/keyboards/redox_media/keymaps/default/config.h similarity index 100% rename from keyboards/redox/keymaps/media_ch/config.h rename to keyboards/redox_media/keymaps/default/config.h diff --git a/keyboards/redox/keymaps/media_ch/keymap.c b/keyboards/redox_media/keymaps/default/keymap.c similarity index 95% rename from keyboards/redox/keymaps/media_ch/keymap.c rename to keyboards/redox_media/keymaps/default/keymap.c index c3b8efb7430..a8b479159f0 100644 --- a/keyboards/redox/keymaps/media_ch/keymap.c +++ b/keyboards/redox_media/keymaps/default/keymap.c @@ -67,20 +67,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { /* First encoder */ - if (clockwise) { - tap_code(KC_VOLD); - } else { - tap_code(KC_VOLU); - } - } else if (index == 1) { /* Second encoder */ - if (clockwise) { - tap_code(KC_WH_D); - } else { - tap_code(KC_WH_U); - } - } - return false; -} diff --git a/keyboards/redox/keymaps/media_ch/readme.md b/keyboards/redox_media/keymaps/default/readme.md similarity index 100% rename from keyboards/redox/keymaps/media_ch/readme.md rename to keyboards/redox_media/keymaps/default/readme.md diff --git a/keyboards/redox/media/readme.md b/keyboards/redox_media/readme.md similarity index 98% rename from keyboards/redox/media/readme.md rename to keyboards/redox_media/readme.md index 1391feb9080..511c6044516 100644 --- a/keyboards/redox/media/readme.md +++ b/keyboards/redox_media/readme.md @@ -26,7 +26,7 @@ Obviously start by [installing QMK](https://docs.qmk.fm/#/getting_started_build_ - Before flashing the firmware you should make sure that it compiles. Thus assuring that your QMK setup works fine and the keyboard and keymap files are correct: ``` -qmk compile -kb redox/media -km media_ch +qmk compile -kb redox_media -km default ``` The generated `.hex` file is output to the QMK root. diff --git a/keyboards/redox/media/media.c b/keyboards/redox_media/redox_media.c similarity index 56% rename from keyboards/redox/media/media.c rename to keyboards/redox_media/redox_media.c index 94fddb83e4f..ca5a70dd490 100644 --- a/keyboards/redox/media/media.c +++ b/keyboards/redox_media/redox_media.c @@ -15,4 +15,24 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "redox.h" +#include "redox_media.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_VOLD); + } else { + tap_code(KC_VOLU); + } + } else if (index == 1) { /* Second encoder */ + if (clockwise) { + tap_code(KC_WH_D); + } else { + tap_code(KC_WH_U); + } + } + return true; +} diff --git a/keyboards/redox/media/media.h b/keyboards/redox_media/redox_media.h similarity index 99% rename from keyboards/redox/media/media.h rename to keyboards/redox_media/redox_media.h index c2cbc10b476..6188aa9a107 100644 --- a/keyboards/redox/media/media.h +++ b/keyboards/redox_media/redox_media.h @@ -17,10 +17,10 @@ along with this program. If not, see . #pragma once -#include "redox.h" #include "quantum.h" // rows are doubled +// clang-format off #define LAYOUT( \ R5C6, R11C6, R11C5, \ R0C0, R0C1, R0C2, R0C3, R0C4, R0C5, R6C5, R6C4, R6C3, R6C2, R6C1, R6C0, \ diff --git a/keyboards/redox_media/rules.mk b/keyboards/redox_media/rules.mk new file mode 100644 index 00000000000..9186485523e --- /dev/null +++ b/keyboards/redox_media/rules.mk @@ -0,0 +1,28 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = caterina + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +ENCODER_ENABLE = yes +SPLIT_KEYBOARD = yes + +# Disable unsupported hardware +AUDIO_SUPPORTED = no +BACKLIGHT_SUPPORTED = no +RGBLIGHT_SUPPORTED = no