summaryrefslogtreecommitdiff
path: root/keyboards/redox/rev1
diff options
context:
space:
mode:
authorMattia Dal Ben <mattdibi@users.noreply.github.com>2018-10-27 18:40:28 +0200
committerDrashna Jaelre <drashna@live.com>2018-10-27 09:40:28 -0700
commit9ea01035202e0d9b43413537702ac77b4c32108c (patch)
treeb1aa46898c47b6bd994a2ca490512ff36d704802 /keyboards/redox/rev1
parent569545a78f24644b1b130369d53932f7f46a588a (diff)
Keyboard: Redox keymaps refactoring (#4258)
* Reconfigured keymap macro to resemble physical layout * Updated italian keymap * Added RGB controls * Updated default keymap * Updated german layout * Updated jeherve keymap * Changed include guards to pragmas * Changed include guards to pragmas in keymaps * Update readme * Fixed unused include * Fixed indentation
Diffstat (limited to 'keyboards/redox/rev1')
-rw-r--r--keyboards/redox/rev1/config.h5
-rw-r--r--keyboards/redox/rev1/rev1.h74
2 files changed, 22 insertions, 57 deletions
diff --git a/keyboards/redox/rev1/config.h b/keyboards/redox/rev1/config.h
index fe951f7226..f4ccbd2fd5 100644
--- a/keyboards/redox/rev1/config.h
+++ b/keyboards/redox/rev1/config.h
@@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef REV1_CONFIG_H
-#define REV1_CONFIG_H
+#pragma once
#include "config_common.h"
@@ -82,5 +81,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION
-
-#endif
diff --git a/keyboards/redox/rev1/rev1.h b/keyboards/redox/rev1/rev1.h
index be62247500..1bc1531eed 100644
--- a/keyboards/redox/rev1/rev1.h
+++ b/keyboards/redox/rev1/rev1.h
@@ -1,66 +1,34 @@
-#ifndef REV1_H
-#define REV1_H
+#pragma once
#include "../redox.h"
-//void promicro_bootloader_jmp(bool program);
#include "quantum.h"
#ifdef USE_I2C
#include <stddef.h>
#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
+ #include <avr/io.h>
+ #include <avr/interrupt.h>
#endif
#endif
-//void promicro_bootloader_jmp(bool program);
-
-#ifndef FLIP_HALF
-// Standard Keymap
-// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
- L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { L30, L31, L32, L33, L34, L35, L36 }, \
- { L40, L41, L42, L43, L44, L45, L46 }, \
- { R06, R05, R04, R03, R02, R01, R00 }, \
- { R16, R15, R14, R13, R12, R11, R10 }, \
- { R26, R25, R24, R23, R22, R21, R20 }, \
- { R36, R35, R34, R33, R32, R31, R30 }, \
- { R46, R45, R44, R43, R42, R41, R40 } \
- }
-#else
-// Keymap with right side flipped
-// (TRRS jack on both halves are to the right)
#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
- L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { L30, L31, L32, L33, L34, L35, L36 }, \
- { L40, L41, L42, L43, L44, L45, L46 }, \
- { R00, R01, R02, R03, R04, R05, R06 }, \
- { R10, R11, R12, R13, R14, R15, R16 }, \
- { R20, R21, R22, R23, R24, R25, R26 }, \
- { R30, R31, R32, R33, R34, R35, R36 }, \
- { R40, R41, R42, R43, R44, R45, R46 } \
- }
-#endif
-
-#endif
+ k00, k01, k02, k03, k04, k05, k08, k09, k10, k11, k12, k13, \
+ k14, k15, k16, k17, k18, k19, k06, k07, k22, k23, k24, k25, k26, k27, \
+ k28, k29, k30, k31, k32, k33, k20, k21, k36, k37, k38, k39, k40, k41, \
+ k42, k43, k44, k45, k46, k47, k34, k48, k49, k35, k50, k51, k52, k53, k54, k55, \
+ k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 \
+) \
+{ \
+ { k00, k01, k02, k03, k04, k05, k06 }, \
+ { k14, k15, k16, k17, k18, k19, k20 }, \
+ { k28, k29, k30, k31, k32, k33, k34 }, \
+ { k42, k43, k44, k45, k46, k47, k48 }, \
+ { k56, k57, k58, k59, k60, k61, k62 }, \
+ { k13, k12, k11, k10, k09, k08, k07 }, \
+ { k27, k26, k25, k24, k23, k22, k21 }, \
+ { k41, k40, k39, k38, k37, k36, k35 }, \
+ { k55, k54, k53, k52, k51, k50, k49 }, \
+ { k69, k68, k67, k66, k65, k64, k63 } \
+}