summaryrefslogtreecommitdiffstats
path: root/keyboards/blockey
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/blockey
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/blockey')
-rw-r--r--keyboards/blockey/blockey.h39
-rw-r--r--keyboards/blockey/config.h5
2 files changed, 19 insertions, 25 deletions
diff --git a/keyboards/blockey/blockey.h b/keyboards/blockey/blockey.h
index fa7624be76..7b007a2e97 100644
--- a/keyboards/blockey/blockey.h
+++ b/keyboards/blockey/blockey.h
@@ -13,8 +13,8 @@
* 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 BLOCKEY_H
-#define BLOCKEY_H
+
+#pragma once
#include "quantum.h"
@@ -26,23 +26,20 @@
// The first section contains all of the arguments
// The second converts the arguments into a two-dimensional array
#define LAYOUT( \
- k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, \
- k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, \
- k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, \
- k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, \
- k55, k56, k57, k58, k59, k60, k61, k62 \
-) \
-{ \
- { k01, k02, k03, k04, k05, k06, k07 }, \
- { k15, k16, k17, k18, k19, k20, k21 }, \
- { k29, k30, k31, k32, k33, k34, k35 }, \
- { k42, k43, k44, k45, k46, k47, k48 }, \
- { k55, k56, k57, k58, XXX, XXX, k59 }, \
- { k08, k09, k10, k11, k12, k13, k14 }, \
- { k22, k23, k24, k25, k26, k27, k28 }, \
- { k36, k37, k38, k39, k40, k41, XXX }, \
- { k49, k50, k51, k52, k53, k54, XXX }, \
- { XXX, XXX, XXX, k60, k61, k62, XXX }, \
+ k00, k01, k02, k03, k04, k05, k06, k50, k51, k52, k53, k54, k55, k56, \
+ k10, k11, k12, k13, k14, k15, k16, k60, k61, k62, k63, k64, k65, k66, \
+ k20, k21, k22, k23, k24, k25, k26, k70, k71, k72, k73, k74, k75, \
+ k30, k31, k32, k33, k34, k35, k36, k80, k81, k82, k83, k84, k85, \
+ k40, k41, k42, k43, k46, k93, k94, k95 \
+) { \
+ { k00, k01, k02, k03, k04, k05, k06 }, \
+ { k10, k11, k12, k13, k14, k15, k16 }, \
+ { k20, k21, k22, k23, k24, k25, k26 }, \
+ { k30, k31, k32, k33, k34, k35, k36 }, \
+ { k40, k41, k42, k43, XXX, XXX, k46 }, \
+ { k50, k51, k52, k53, k54, k55, k56 }, \
+ { k60, k61, k62, k63, k64, k65, k66 }, \
+ { k70, k71, k72, k73, k74, k75, XXX }, \
+ { k80, k81, k82, k83, k84, k85, XXX }, \
+ { XXX, XXX, XXX, k93, k94, k95, XXX } \
}
-
-#endif
diff --git a/keyboards/blockey/config.h b/keyboards/blockey/config.h
index c79c583982..4493dd0df7 100644
--- a/keyboards/blockey/config.h
+++ b/keyboards/blockey/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 CONFIG_H
-#define CONFIG_H
+#pragma once
#include "config_common.h"
@@ -161,5 +160,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