summaryrefslogtreecommitdiff
path: root/keyboards/kinesis/alvicstep
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2021-09-01 19:03:14 +1000
committerGitHub <noreply@github.com>2021-09-01 19:03:14 +1000
commit41c50bb653b840c595fb31541729d892f68666e6 (patch)
treeba05c7c9654f7be1104b20f3195dd2cf288e004e /keyboards/kinesis/alvicstep
parent971d36bb9ea37962c57733e5f7c0c24e5a6cebeb (diff)
Change keyboard level include guards to `pragma once` (#14248)
* Change keyboard level include guards to `pragma once` And clean up a lot of layout macros * Oops * Remove dangling endif
Diffstat (limited to 'keyboards/kinesis/alvicstep')
-rw-r--r--keyboards/kinesis/alvicstep/alvicstep.h135
-rw-r--r--keyboards/kinesis/alvicstep/config.h6
2 files changed, 66 insertions, 75 deletions
diff --git a/keyboards/kinesis/alvicstep/alvicstep.h b/keyboards/kinesis/alvicstep/alvicstep.h
index 169012faf5..053698770a 100644
--- a/keyboards/kinesis/alvicstep/alvicstep.h
+++ b/keyboards/kinesis/alvicstep/alvicstep.h
@@ -1,80 +1,77 @@
-#ifndef KINESIS_ALVICSTEP_H
-#define KINESIS_ALVICSTEP_H
+#pragma once
#include "../kinesis.h"
#define ___ KC_NO
-#define LAYOUT( \
- k02, k22, k12, k01, k21, k11, k00, k20, k10, \
- k80, k70, k60, k50, k40, k30, \
- k81, k71, k61, k51, k41, k31, \
- k82, k72, k62, k52, k42, k32, \
- k83, k73, k63, k53, k43, k33, \
- k74, k64, k54, k34, \
- k36, k35, \
- k55, \
- k56, k46, k75, \
- \
- k03, k23, k13, k04, k24, k14, k05, k85, k84, \
- k94, kA4, kB4, kD4, kE4, kF4, \
- k95, kA5, kB5, kD5, kE5, kF5, \
- k96, kA6, kB6, kD6, kE6, kF6, \
- k97, kA7, kB7, kD7, kE7, kF7, \
- k93, kB3, kD3, kE3, \
- k47, k66, \
- k67, \
- k87, k76, k86 \
-) { \
- { k00, k01, k02, k03, k04, k05, ___, ___ }, \
- { k10, k11, k12, k13, k14, ___, ___, ___ }, \
- { k20, k21, k22, k23, k24, ___, ___, ___ }, \
- { k30, k31, k32, k33, k34, k35, k36, ___ }, \
- { k40, k41, k42, k43, ___, ___, k46, k47 }, \
- { k50, k51, k52, k53, k54, k55, k56, ___ }, \
- { k60, k61, k62, k63, k64, ___, k66, k67 }, \
- { k70, k71, k72, k73, k74, k75, k76, ___ }, \
- { k80, k81, k82, k83, k84, k85, k86, k87 }, \
- { ___, ___, ___, k93, k94, k95, k96, k97 }, \
- { ___, ___, ___, ___, kA4, kA5, kA6, kA7 }, \
- { ___, ___, ___, kB3, kB4, kB5, kB6, kB7 }, \
- { ___, ___, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, kD3, kD4, kD5, kD6, kD7 }, \
- { ___, ___, ___, kE3, kE4, kE5, kE6, kE7 }, \
- { ___, ___, ___, ___, kF4, kF5, kF6, kF7 } \
+#define LAYOUT( \
+ k02, k22, k12, k01, k21, k11, k00, k20, k10, \
+ k80, k70, k60, k50, k40, k30, \
+ k81, k71, k61, k51, k41, k31, \
+ k82, k72, k62, k52, k42, k32, \
+ k83, k73, k63, k53, k43, k33, \
+ k74, k64, k54, k34, \
+ k36, k35, \
+ k55, \
+ k56, k46, k75, \
+\
+ k03, k23, k13, k04, k24, k14, k05, k85, k84, \
+ k94, kA4, kB4, kD4, kE4, kF4, \
+ k95, kA5, kB5, kD5, kE5, kF5, \
+ k96, kA6, kB6, kD6, kE6, kF6, \
+ k97, kA7, kB7, kD7, kE7, kF7, \
+ k93, kB3, kD3, kE3, \
+ k47, k66, \
+ k67, \
+ k87, k76, k86 \
+) { \
+ { k00, k01, k02, k03, k04, k05, ___, ___ }, \
+ { k10, k11, k12, k13, k14, ___, ___, ___ }, \
+ { k20, k21, k22, k23, k24, ___, ___, ___ }, \
+ { k30, k31, k32, k33, k34, k35, k36, ___ }, \
+ { k40, k41, k42, k43, ___, ___, k46, k47 }, \
+ { k50, k51, k52, k53, k54, k55, k56, ___ }, \
+ { k60, k61, k62, k63, k64, ___, k66, k67 }, \
+ { k70, k71, k72, k73, k74, k75, k76, ___ }, \
+ { k80, k81, k82, k83, k84, k85, k86, k87 }, \
+ { ___, ___, ___, k93, k94, k95, k96, k97 }, \
+ { ___, ___, ___, ___, kA4, kA5, kA6, kA7 }, \
+ { ___, ___, ___, kB3, kB4, kB5, kB6, kB7 }, \
+ { ___, ___, ___, ___, ___, ___, ___, ___ }, \
+ { ___, ___, ___, kD3, kD4, kD5, kD6, kD7 }, \
+ { ___, ___, ___, kE3, kE4, kE5, kE6, kE7 }, \
+ { ___, ___, ___, ___, kF4, kF5, kF6, kF7 } \
}
-/* ---------------- LEFT HAND ----------------- ---------------- RIGHT HAND ---------------- */
-#define LAYOUT_pretty( \
- k02, k22, k12, k01, k21, k11, k00, k20, k10, k03, k23, k13, k04, k24, k14, k05, k85, k84, \
- k80, k70, k60, k50, k40, k30, k94, kA4, kB4, kD4, kE4, kF4, \
- k81, k71, k61, k51, k41, k31, k95, kA5, kB5, kD5, kE5, kF5, \
- k82, k72, k62, k52, k42, k32, k96, kA6, kB6, kD6, kE6, kF6, \
- k83, k73, k63, k53, k43, k33, k97, kA7, kB7, kD7, kE7, kF7, \
- k74, k64, k54, k34, k93, kB3, kD3, kE3, \
- k36, k35, k47, k66, \
- k55, k67, \
- k56, k46, k75, k87, k76, k86 \
-) { \
- { k00, k01, k02, k03, k04, k05, ___, ___ }, \
- { k10, k11, k12, k13, k14, ___, ___, ___ }, \
- { k20, k21, k22, k23, k24, ___, ___, ___ }, \
- { k30, k31, k32, k33, k34, k35, k36, ___ }, \
- { k40, k41, k42, k43, ___, ___, k46, k47 }, \
- { k50, k51, k52, k53, k54, k55, k56, ___ }, \
- { k60, k61, k62, k63, k64, ___, k66, k67 }, \
- { k70, k71, k72, k73, k74, k75, k76, ___ }, \
- { k80, k81, k82, k83, k84, k85, k86, k87 }, \
- { ___, ___, ___, k93, k94, k95, k96, k97 }, \
- { ___, ___, ___, ___, kA4, kA5, kA6, kA7 }, \
- { ___, ___, ___, kB3, kB4, kB5, kB6, kB7 }, \
- { ___, ___, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, kD3, kD4, kD5, kD6, kD7 }, \
- { ___, ___, ___, kE3, kE4, kE5, kE6, kE7 }, \
- { ___, ___, ___, ___, kF4, kF5, kF6, kF7 } \
+#define LAYOUT_pretty( \
+ k02, k22, k12, k01, k21, k11, k00, k20, k10, k03, k23, k13, k04, k24, k14, k05, k85, k84, \
+ k80, k70, k60, k50, k40, k30, k94, kA4, kB4, kD4, kE4, kF4, \
+ k81, k71, k61, k51, k41, k31, k95, kA5, kB5, kD5, kE5, kF5, \
+ k82, k72, k62, k52, k42, k32, k96, kA6, kB6, kD6, kE6, kF6, \
+ k83, k73, k63, k53, k43, k33, k97, kA7, kB7, kD7, kE7, kF7, \
+ k74, k64, k54, k34, k93, kB3, kD3, kE3, \
+ k36, k35, k47, k66, \
+ k55, k67, \
+ k56, k46, k75, k87, k76, k86 \
+) { \
+ { k00, k01, k02, k03, k04, k05, ___, ___ }, \
+ { k10, k11, k12, k13, k14, ___, ___, ___ }, \
+ { k20, k21, k22, k23, k24, ___, ___, ___ }, \
+ { k30, k31, k32, k33, k34, k35, k36, ___ }, \
+ { k40, k41, k42, k43, ___, ___, k46, k47 }, \
+ { k50, k51, k52, k53, k54, k55, k56, ___ }, \
+ { k60, k61, k62, k63, k64, ___, k66, k67 }, \
+ { k70, k71, k72, k73, k74, k75, k76, ___ }, \
+ { k80, k81, k82, k83, k84, k85, k86, k87 }, \
+ { ___, ___, ___, k93, k94, k95, k96, k97 }, \
+ { ___, ___, ___, ___, kA4, kA5, kA6, kA7 }, \
+ { ___, ___, ___, kB3, kB4, kB5, kB6, kB7 }, \
+ { ___, ___, ___, ___, ___, ___, ___, ___ }, \
+ { ___, ___, ___, kD3, kD4, kD5, kD6, kD7 }, \
+ { ___, ___, ___, kE3, kE4, kE5, kE6, kE7 }, \
+ { ___, ___, ___, ___, kF4, kF5, kF6, kF7 } \
}
-
/*
Row pin configuration
@@ -97,5 +94,3 @@
PB6 col6 | | | | LCtrl | Delete | Bksp | RCtrl | Enter | Space | H | J | K | | L | ;: | '"
PB7 col7 | | | | | RGUI | | PageUp | | PageDn | N | M | ,< | | .> | /? | RShift
*/
-
-#endif
diff --git a/keyboards/kinesis/alvicstep/config.h b/keyboards/kinesis/alvicstep/config.h
index 02c7725cec..8a656264ee 100644
--- a/keyboards/kinesis/alvicstep/config.h
+++ b/keyboards/kinesis/alvicstep/config.h
@@ -1,5 +1,4 @@
-#ifndef ALVICSTEP_CONFIG_H
-#define ALVICSTEP_CONFIG_H
+#pragma once
#include "../config.h"
#include "config_common.h"
@@ -31,6 +30,3 @@
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
-
-
-#endif