summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-08-16 10:18:27 +0000
committerQMK Bot <hello@qmk.fm>2021-08-16 10:18:27 +0000
commit4818debcd05819de774000bb641fea8baa49b787 (patch)
treedb61c33948a1226a4c477bbc695977bbd0bab031
parent6c662a600cde0b835dab78b9ead95a7d7be1b74c (diff)
parent0c6155ec42dd7ae00d2229962fe9dfc8adab7a4d (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/pimentoso/touhoupad/info.json16
-rw-r--r--keyboards/pimentoso/touhoupad/keymaps/default/keymap.c12
-rw-r--r--keyboards/pimentoso/touhoupad/touhoupad.h9
3 files changed, 32 insertions, 5 deletions
diff --git a/keyboards/pimentoso/touhoupad/info.json b/keyboards/pimentoso/touhoupad/info.json
index 71698cee9e..1299dd4673 100644
--- a/keyboards/pimentoso/touhoupad/info.json
+++ b/keyboards/pimentoso/touhoupad/info.json
@@ -6,7 +6,21 @@
"height": 4,
"layouts": {
"LAYOUT": {
- "layout": [{"label":"esc", "x":5.25, "y":0}, {"label":"enter", "x":6.25, "y":0}, {"label":"slow", "x":0, "y":1}, {"label":"fire", "x":1, "y":1}, {"label":"rapid", "x":2, "y":1}, {"label":"up", "x":6.25, "y":1.75}, {"label":"left", "x":5.25, "y":2.75}, {"label":"down", "x":6.25, "y":2.75}, {"label":"right", "x":7.25, "y":2.75}, {"label":"bomb", "x":3.25, "y":3}]
+ "layout": [
+ {"label":"esc", "x":5.25, "y":0},
+ {"label":"enter", "x":6.25, "y":0},
+
+ {"label":"slow", "x":0, "y":1},
+ {"label":"fire", "x":1, "y":1},
+ {"label":"rapid", "x":2, "y":1},
+
+ {"label":"up", "x":6.25, "y":1.75},
+ {"label":"left", "x":5.25, "y":2.75},
+ {"label":"down", "x":6.25, "y":2.75},
+ {"label":"right", "x":7.25, "y":2.75},
+
+ {"label":"bomb", "x":3.25, "y":3}
+ ]
}
}
}
diff --git a/keyboards/pimentoso/touhoupad/keymaps/default/keymap.c b/keyboards/pimentoso/touhoupad/keymaps/default/keymap.c
index 0d10055110..f47380e4dc 100644
--- a/keyboards/pimentoso/touhoupad/keymaps/default/keymap.c
+++ b/keyboards/pimentoso/touhoupad/keymaps/default/keymap.c
@@ -17,9 +17,17 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT( /* Base */
- KC_LSFT, KC_Z, KC_C, KC_X, KC_LEFT, KC_DOWN, KC_RIGHT, KC_UP, KC_ENT, LT(1, KC_ESC)
+ LT(1,KC_ESC), KC_ENT,
+ KC_LSFT, KC_Z, KC_C,
+ KC_UP,
+ KC_LEFT, KC_DOWN, KC_RGHT,
+ KC_X
),
LAYOUT( /* RGB controls */
- KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG, RGB_VAD, RGB_MOD, RGB_VAI, KC_NO, KC_NO
+ KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_NO,
+ RGB_VAI,
+ RGB_TOG, RGB_VAD, RGB_MOD,
+ KC_NO
)
};
diff --git a/keyboards/pimentoso/touhoupad/touhoupad.h b/keyboards/pimentoso/touhoupad/touhoupad.h
index 5a5f233e36..8c7bfc36e1 100644
--- a/keyboards/pimentoso/touhoupad/touhoupad.h
+++ b/keyboards/pimentoso/touhoupad/touhoupad.h
@@ -17,7 +17,12 @@
#include "quantum.h"
-#define LAYOUT(k00, k01, k02, k03, k04, k05, k06, k07, k08, k09) \
-{ \
+#define LAYOUT( \
+ k09, k08, \
+ k00, k01, k02, \
+ k07, \
+ k04, k05, k06, \
+ k03 \
+) { \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 } \
}