aboutsummaryrefslogtreecommitdiff
path: root/keyboards/redox
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2021-09-11 23:21:28 -0700
committerGitHub <noreply@github.com>2021-09-11 23:21:28 -0700
commitf6a67c10bd0fe59d0b468ba870bb511d9787a34c (patch)
tree2c15f6dfbbc06498d04b81cb8ab5cfcb8b8102ce /keyboards/redox
parent5af17997359d91ee0a7340d1e17514fe8c8a46f1 (diff)
downloadqmk_firmware-f6a67c10bd0fe59d0b468ba870bb511d9787a34c.tar.gz
qmk_firmware-f6a67c10bd0fe59d0b468ba870bb511d9787a34c.zip
[Keyboard] Fix Redox Media compilation errors (#14345)
Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'keyboards/redox')
-rw-r--r--keyboards/redox/keymaps/media_ch/config.h26
-rw-r--r--keyboards/redox/keymaps/media_ch/keymap.c86
-rw-r--r--keyboards/redox/keymaps/media_ch/readme.md6
-rw-r--r--keyboards/redox/keymaps/media_ch/rules.mk2
-rw-r--r--keyboards/redox/media/config.h60
-rw-r--r--keyboards/redox/media/media.c18
-rw-r--r--keyboards/redox/media/media.h46
-rw-r--r--keyboards/redox/media/readme.md57
-rw-r--r--keyboards/redox/media/rules.mk0
9 files changed, 0 insertions, 301 deletions
diff --git a/keyboards/redox/keymaps/media_ch/config.h b/keyboards/redox/keymaps/media_ch/config.h
deleted file mode 100644
index 5da1f9060..000000000
--- a/keyboards/redox/keymaps/media_ch/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
1/*
2Copyright 2021 Shiftux <shiftux@gmail.com>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20/* Use I2C or Serial, not both */
21#define USE_SERIAL
22// #define USE_I2C
23
24/* Select hand configuration */
25// #define MASTER_LEFT
26#define EE_HANDS \ No newline at end of file
diff --git a/keyboards/redox/keymaps/media_ch/keymap.c b/keyboards/redox/keymaps/media_ch/keymap.c
deleted file mode 100644
index c3b8efb74..000000000
--- a/keyboards/redox/keymaps/media_ch/keymap.c
+++ /dev/null
@@ -1,86 +0,0 @@
1/*
2Copyright 2021 Shiftux <shiftux@gmail.com>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#include QMK_KEYBOARD_H
19
20enum layers {
21 _QWERTZ, // standard layer
22 _SYMB, // symbols layer
23};
24
25enum custom_keycodes {
26 QWERTZ = SAFE_RANGE,
27 SYMB,
28};
29
30// Shortcut to make keymap more readable
31#define KC_BKSL KC_BSLASH
32#define SYM_L MO(_SYMB)
33
34const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
35
36 [_QWERTZ] = LAYOUT(
37 // ┌────────┐ ┌────────┬────────┐
38 KC_MUTE, KC_MPLY, KC_MNXT,
39 //┌────────┬────────┬────────┬───┼────┬───┼────┬────────┐ ┌──┼─────┬──┼─────┬──┼─────┬────────┬────────┬────────┐
40 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
41 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
42 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_NUBS, KC_MINS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,
43 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
44 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_EQL, KC_RBRC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
45 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
46 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_PGDN, KC_PGUP, KC_HOME, KC_END, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
47 //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
48 KC_LCTL, SYM_L, KC_LALT, KC_GRV, KC_DEL, KC_LGUI, KC_SPC, KC_ENT, KC_SPC, KC_RALT, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT
49 //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
50 ),
51
52
53 [_SYMB] = LAYOUT(
54 // ┌────────┐ ┌────────┬────────┐
55 KC_MPRV, XXXXXXX, XXXXXXX,
56 //┌────────┬────────┬────────┬───┼────┬───┼────┬────────┐ ┌──┼─────┬──┼─────┬──┼─────┬────────┬────────┬────────┐
57 RESET ,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5, KC_F6 ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F10 ,KC_F11 ,
58 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
59 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_F12 , XXXXXXX ,XXXXXXX ,XXXXXXX, KC_UP ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
60 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
61 XXXXXXX ,XXXXXXX ,KC_BSLS ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT ,XXXXXXX ,XXXXXXX ,
62 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
63 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX, XXXXXXX ,XXXXXXX ,KC_TILD ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
64 //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
65 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX , XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX , XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
66 //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
67 )
68
69};
70
71bool encoder_update_user(uint8_t index, bool clockwise) {
72 if (index == 0) { /* First encoder */
73 if (clockwise) {
74 tap_code(KC_VOLD);
75 } else {
76 tap_code(KC_VOLU);
77 }
78 } else if (index == 1) { /* Second encoder */
79 if (clockwise) {
80 tap_code(KC_WH_D);
81 } else {
82 tap_code(KC_WH_U);
83 }
84 }
85 return false;
86}
diff --git a/keyboards/redox/keymaps/media_ch/readme.md b/keyboards/redox/keymaps/media_ch/readme.md
deleted file mode 100644
index 53a080fd5..000000000
--- a/keyboards/redox/keymaps/media_ch/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
1# German keymap for Redox-media
2
3A layout for the Redox MEDIA revision.
4The layout acommodates the German umlauts and the punctuation symbols
5at their usual positions relative to the other alphabetic characters.
6Apart from that it stays close to the default english Redox layout.
diff --git a/keyboards/redox/keymaps/media_ch/rules.mk b/keyboards/redox/keymaps/media_ch/rules.mk
deleted file mode 100644
index cf544bacb..000000000
--- a/keyboards/redox/keymaps/media_ch/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
1RGBLIGHT_ENABLE = no
2ENCODER_ENABLE = yes
diff --git a/keyboards/redox/media/config.h b/keyboards/redox/media/config.h
deleted file mode 100644
index 70fb2aa16..000000000
--- a/keyboards/redox/media/config.h
+++ /dev/null
@@ -1,60 +0,0 @@
1/*
2Copyright 2021 Shiftux <shiftux@gmail.com>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "config_common.h"
21
22/* USB Device descriptor parameter */
23#define VENDOR_ID 0xFEED
24#define PRODUCT_ID 0x0000
25#define DEVICE_VER 0x0100
26#define MANUFACTURER shiftux
27#define PRODUCT The Redox Keyboard
28
29/* key matrix size */
30// Rows are doubled-up
31#define MATRIX_ROWS 12
32#define MATRIX_COLS 7
33
34// wiring of each half
35#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
36#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6, D1 }
37
38/* COL2ROW or ROW2COL */
39#define DIODE_DIRECTION COL2ROW
40
41/* define if matrix has ghost */
42//#define MATRIX_HAS_GHOST
43
44/* number of backlight levels */
45// #define BACKLIGHT_LEVELS 3
46
47/* Set 0 if debouncing isn't needed */
48#define DEBOUNCE 5
49
50/* serial.c configuration for split keyboard */
51#define SOFT_SERIAL_PIN D0
52
53/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
54#define LOCKING_SUPPORT_ENABLE
55/* Locking resynchronize hack */
56#define LOCKING_RESYNC_ENABLE
57
58#define ENCODERS_PAD_A { F4 }
59#define ENCODERS_PAD_B { F5 }
60#define ENCODER_RESOLUTION 4 \ No newline at end of file
diff --git a/keyboards/redox/media/media.c b/keyboards/redox/media/media.c
deleted file mode 100644
index 94fddb83e..000000000
--- a/keyboards/redox/media/media.c
+++ /dev/null
@@ -1,18 +0,0 @@
1/*
2Copyright 2021 Shiftux <shiftux@gmail.com>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#include "redox.h"
diff --git a/keyboards/redox/media/media.h b/keyboards/redox/media/media.h
deleted file mode 100644
index c2cbc10b4..000000000
--- a/keyboards/redox/media/media.h
+++ /dev/null
@@ -1,46 +0,0 @@
1/*
2Copyright 2021 Shiftux <shiftux@gmail.com>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "redox.h"
21#include "quantum.h"
22
23// rows are doubled
24#define LAYOUT( \
25 R5C6, R11C6, R11C5, \
26 R0C0, R0C1, R0C2, R0C3, R0C4, R0C5, R6C5, R6C4, R6C3, R6C2, R6C1, R6C0, \
27 R1C0, R1C1, R1C2, R1C3, R1C4, R1C5, R0C6, R6C6, R7C5, R7C4, R7C3, R7C2, R7C1, R7C0, \
28 R2C0, R2C1, R2C2, R2C3, R2C4, R2C5, R1C6, R7C6, R8C5, R8C4, R8C3, R8C2, R8C1, R8C0, \
29 R3C0, R3C1, R3C2, R3C3, R3C4, R3C5, R2C6, R3C6, R9C6, R8C6, R9C5, R9C4, R9C3, R9C2, R9C1, R9C0, \
30 R4C0, R4C1, R4C2, R4C3, R4C4, R4C5, R4C6, R10C6, R10C5, R10C4, R10C3, R10C2, R10C1, R10C0 \
31) \
32{ \
33 { R0C0, R0C1, R0C2, R0C3, R0C4, R0C5, R0C6 }, \
34 { R1C0, R1C1, R1C2, R1C3, R1C4, R1C5, R1C6 }, \
35 { R2C0, R2C1, R2C2, R2C3, R2C4, R2C5, R2C6 }, \
36 { R3C0, R3C1, R3C2, R3C3, R3C4, R3C5, R3C6 }, \
37 { R4C0, R4C1, R4C2, R4C3, R4C4, R4C5, R4C6 }, \
38 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, R5C6 }, \
39\
40 { R6C0, R6C1, R6C2, R6C3, R6C4, R6C5, R6C6 }, \
41 { R7C0, R7C1, R7C2, R7C3, R7C4, R7C5, R7C6 }, \
42 { R8C0, R8C1, R8C2, R8C3, R8C4, R8C5, R8C6 }, \
43 { R9C0, R9C1, R9C2, R9C3, R9C4, R9C5, R9C6 }, \
44 { R10C0, R10C1, R10C2, R10C3, R10C4, R10C5, R10C6 }, \
45 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, R11C5, R11C6 } \
46}
diff --git a/keyboards/redox/media/readme.md b/keyboards/redox/media/readme.md
deleted file mode 100644
index 1391feb90..000000000
--- a/keyboards/redox/media/readme.md
+++ /dev/null
@@ -1,57 +0,0 @@
1# The Redox Media Keyboard
2
3I've taken the Redox keyboard and modified the SCAD files as well as the QMK layout to include media and scroll features:
4- 3 Media buttons
5 - Play / Pause button
6 - Next track
7 - Mute (previous track on secondary layout)
8- Volume knob
9- Scroll wheel on the keyboard
10
11For an in-depth report see [my page](https://shiftux.org/making_projects/keyboard.html) and a [video](https://youtu.be/Cwkf7HFcUkY) about the build process, design, printing, programing and assembly.
12
13## IMAGE
14
15### The build
16I've used 2 [Sparkfun Pro Micros (5V)](https://www.sparkfun.com/products/12640) and a single hand master setup providing power and serial connection via a TRS jack.
17
18### The pro micro and how to flash it
19To try out your pro micro and setup your environment to flash such a device I recommend following [this guide](https://learn.sparkfun.com/tutorials/pro-micro--fio-v3-hookup-guide/all). It will take you through the install and setup and provides a first easy to flash program so you can test your setup quickly.
20
21Whenever you can't program one of the pro micros or the USB-COM port is not found on your computer, it most probably means that is is not in "bootloader mode". What you want to do is connect the GND and RST pin twice to reset the device and put it into bootloader mode (details [here](https://learn.sparkfun.com/tutorials/pro-micro--fio-v3-hookup-guide/troubleshooting-and-faq#ts-serial)).
22
23### Compiling and flashing
24
25Obviously start by [installing QMK](https://docs.qmk.fm/#/getting_started_build_tools?id=set-up-your-environment).
26
27- 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:
28```
29qmk compile -kb redox/media -km media_ch
30```
31The generated `.hex` file is output to the QMK root.
32
33Once you are comfortable flashing your Pro Micros and your setup works continue with the following steps:
34
35- I've had the most success with using the `EE_HANDS` setting and flashing the EEPROM to the left and right halves of the keyboard respectively. To do this start with flashing the EEPROM of the 2 pro micros separately by setting the bootloader flag in the flash command (the pro micro uses the avrdude bootloader):
36```
37qmk flash -kb redox/media -km media_ch -bl avrdude-split-left
38qmk flash -kb redox/media -km media_ch -bl avrdude-split-right
39```
40Note that you need to reset the pro micro to set it to bootloader mode before you can flash it: connect GND to RST twice in quick succession (750ms), then you have 8 seconds to upload the new eep file.
41
42### Adapting the keyboard layout
43
44Copy the `keymaps/media_ch` folder to `keymaps/media_<your-layout>` and adapt the `keymap.c` file in there.
45
46I recommend testing the key codes with the [QMK tester](https://config.qmk.fm/#/test) and then adapting the `keymap.c` file accordingly.
47
48Finally compile your new layout from the QMK root with:
49```
50qmk compile -kb redox/media -km media_<your-layout>
51```
52and proceed to flashing it equivalent to the above instructions.
53
54### CAD files and additional resources
55See [here](https://shiftux.org/making_projects/keyboard.html) for a detailed build description and video.
56
57You can find the CAD and SCAD files, I created here: https://github.com/shiftux/redox-media-keyboard
diff --git a/keyboards/redox/media/rules.mk b/keyboards/redox/media/rules.mk
deleted file mode 100644
index e69de29bb..000000000
--- a/keyboards/redox/media/rules.mk
+++ /dev/null
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-02 07:23:04 +0000