diff options
Diffstat (limited to 'keyboards/keystonecaps/gameroyadvance')
-rw-r--r-- | keyboards/keystonecaps/gameroyadvance/config.h | 12 | ||||
-rw-r--r-- | keyboards/keystonecaps/gameroyadvance/gameroyadvance.c | 28 | ||||
-rw-r--r-- | keyboards/keystonecaps/gameroyadvance/info.json | 415 |
3 files changed, 213 insertions, 242 deletions
diff --git a/keyboards/keystonecaps/gameroyadvance/config.h b/keyboards/keystonecaps/gameroyadvance/config.h index 75b25e02c3..20abd283ee 100644 --- a/keyboards/keystonecaps/gameroyadvance/config.h +++ b/keyboards/keystonecaps/gameroyadvance/config.h @@ -17,16 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3 } -#define MATRIX_COL_PINS { D4, D0, D1, C6, D7, E6, F4, B2, B6 } -#define MATRIX_ROW_PINS_RIGHT { D7, E6, B4, B5, B6 } -#define MATRIX_COL_PINS_RIGHT { C6, D4, D0, D1, B1, F7, F4, F5, F6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE @@ -34,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN C7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -49,4 +38,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/keystonecaps/gameroyadvance/gameroyadvance.c b/keyboards/keystonecaps/gameroyadvance/gameroyadvance.c index 797f4dba76..70c49ce118 100644 --- a/keyboards/keystonecaps/gameroyadvance/gameroyadvance.c +++ b/keyboards/keystonecaps/gameroyadvance/gameroyadvance.c @@ -16,31 +16,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "gameroyadvance.h" - - - -#ifdef ENCODER_ENABLE - -bool encoder_update_kb(uint8_t index, bool clockwise) { - - if (!encoder_update_user(index, clockwise)) { return false; } - - if (index == 0) { - - if (clockwise) { - - tap_code_delay(KC_VOLU, 10); - - } else { - - tap_code_delay(KC_VOLD, 10); - - } - - } - - return true; - -} - -#endif diff --git a/keyboards/keystonecaps/gameroyadvance/info.json b/keyboards/keystonecaps/gameroyadvance/info.json index 7a968deded..8307f061da 100644 --- a/keyboards/keystonecaps/gameroyadvance/info.json +++ b/keyboards/keystonecaps/gameroyadvance/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "D0", "D1", "C6", "D7", "E6", "F4", "B2", "B6"], + "rows": ["F5", "F6", "F7", "B1", "B3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "B4"} @@ -21,6 +26,12 @@ {"pin_a": "B3", "pin_b": "B2"} ] } + }, + "matrix_pins": { + "right": { + "cols": ["C6", "D4", "D0", "D1", "B1", "F7", "F4", "F5", "F6"], + "rows": ["D7", "E6", "B4", "B5", "B6"] + } } }, "processor": "atmega32u4", @@ -28,211 +39,211 @@ "layouts": { "LAYOUT": { "layout": [ - { "x": 1, "y": 0 }, - { "x": 2, "y": 0 }, - { "x": 3, "y": 0 }, - { "x": 4, "y": 0 }, - { "x": 5, "y": 0 }, - { "x": 6, "y": 0 }, - { "x": 7, "y": 0 }, - - { "x": 13.75, "y": 0 }, - { "x": 14.75, "y": 0 }, - { "x": 15.75, "y": 0 }, - { "x": 16.75, "y": 0 }, - { "x": 17.75, "y": 0 }, - { "x": 18.75, "y": 0 }, - { "x": 19.75, "y": 0, "w": 2 }, - - { "x": 0.5, "y": 1, "w": 1.5 }, - { "x": 2, "y": 1 }, - { "x": 3, "y": 1 }, - { "x": 4, "y": 1 }, - { "x": 5, "y": 1 }, - { "x": 6, "y": 1 }, - { "x": 7, "y": 1 }, - - { "x": 8.25, "y": 1 }, - { "x": 9.25, "y": 1 }, - - { "x": 11, "y": 1 }, - { "x": 12, "y": 1 }, - - { "x": 13.75, "y": 1 }, - { "x": 14.75, "y": 1 }, - { "x": 15.75, "y": 1 }, - { "x": 16.75, "y": 1 }, - { "x": 17.75, "y": 1 }, - { "x": 18.75, "y": 1 }, - { "x": 19.75, "y": 1 }, - { "x": 20.75, "y": 1, "w": 1.5 }, - - { "x": 0.5, "y": 2, "w": 1.75 }, - { "x": 2.25, "y": 2 }, - { "x": 3.25, "y": 2 }, - { "x": 4.25, "y": 2 }, - { "x": 5.25, "y": 2 }, - { "x": 6.25, "y": 2 }, - - { "x": 8.25, "y": 2 }, - { "x": 9.25, "y": 2 }, - - { "x": 11, "y": 2 }, - { "x": 12, "y": 2 }, - - { "x": 14, "y": 2 }, - { "x": 15, "y": 2 }, - { "x": 16, "y": 2 }, - { "x": 17, "y": 2 }, - { "x": 18, "y": 2 }, - { "x": 19, "y": 2 }, - { "x": 20, "y": 2, "w": 2.25 }, - - { "x": 0.5, "y": 3, "w": 2.25 }, - { "x": 2.75, "y": 3 }, - { "x": 3.75, "y": 3 }, - { "x": 4.75, "y": 3 }, - { "x": 5.75, "y": 3 }, - { "x": 6.75, "y": 3 }, - - { "x": 8.25, "y": 3 }, - { "x": 9.25, "y": 3 }, - - { "x": 11, "y": 3 }, - { "x": 12, "y": 3 }, - - { "x": 13.5, "y": 3 }, - { "x": 14.5, "y": 3 }, - { "x": 15.5, "y": 3 }, - { "x": 16.5, "y": 3 }, - { "x": 17.5, "y": 3 }, - { "x": 18.5, "y": 3 }, - { "x": 19.5, "y": 3, "w": 2.75 }, - - { "x": 1, "y": 4, "w": 1.25 }, - { "x": 2.25, "y": 4, "w": 1.25 }, - { "x": 3.5, "y": 4, "w": 1.25 }, - { "x": 4.75, "y": 4, "w": 1.25 }, - - { "x": 7, "y": 4, "h": 1.5 }, - { "x": 8, "y": 4 }, - - { "x": 12.25, "y": 4 }, - { "x": 13.25, "y": 4, "h": 1.5 }, - - { "x": 16.75, "y": 4, "w": 1.25 }, - { "x": 18, "y": 4, "w": 1.25 }, - { "x": 19.25, "y": 4, "w": 1.25 }, - { "x": 20.5, "y": 4, "w": 1.25 }, - - { "x": 8, "y": 5, "h": 1.5 }, - { "x": 12.25, "y": 5, "h": 1.5 } + { "x": 0.5, "y": 0 }, + { "x": 1.5, "y": 0 }, + { "x": 2.5, "y": 0 }, + { "x": 3.5, "y": 0 }, + { "x": 4.5, "y": 0 }, + { "x": 5.5, "y": 0 }, + { "x": 6.5, "y": 0 }, + + { "x": 13.25, "y": 0 }, + { "x": 14.25, "y": 0 }, + { "x": 15.25, "y": 0 }, + { "x": 16.25, "y": 0 }, + { "x": 17.25, "y": 0 }, + { "x": 18.25, "y": 0 }, + { "x": 19.25, "y": 0, "w": 2 }, + + { "x": 0, "y": 1, "w": 1.5 }, + { "x": 1.5, "y": 1 }, + { "x": 2.5, "y": 1 }, + { "x": 3.5, "y": 1 }, + { "x": 4.5, "y": 1 }, + { "x": 5.5, "y": 1 }, + { "x": 6.5, "y": 1 }, + + { "x": 7.75, "y": 1 }, + { "x": 8.75, "y": 1 }, + + { "x": 10.5, "y": 1 }, + { "x": 11.5, "y": 1 }, + + { "x": 13.25, "y": 1 }, + { "x": 14.25, "y": 1 }, + { "x": 15.25, "y": 1 }, + { "x": 16.25, "y": 1 }, + { "x": 17.25, "y": 1 }, + { "x": 18.25, "y": 1 }, + { "x": 19.25, "y": 1 }, + { "x": 20.25, "y": 1, "w": 1.5 }, + + { "x": 0, "y": 2, "w": 1.75 }, + { "x": 1.75, "y": 2 }, + { "x": 2.75, "y": 2 }, + { "x": 3.75, "y": 2 }, + { "x": 4.75, "y": 2 }, + { "x": 5.75, "y": 2 }, + + { "x": 7.75, "y": 2 }, + { "x": 8.75, "y": 2 }, + + { "x": 10.5, "y": 2 }, + { "x": 11.5, "y": 2 }, + + { "x": 13.5, "y": 2 }, + { "x": 14.5, "y": 2 }, + { "x": 15.5, "y": 2 }, + { "x": 16.5, "y": 2 }, + { "x": 17.5, "y": 2 }, + { "x": 18.5, "y": 2 }, + { "x": 19.5, "y": 2, "w": 2.25 }, + + { "x": 0, "y": 3, "w": 2.25 }, + { "x": 2.25, "y": 3 }, + { "x": 3.25, "y": 3 }, + { "x": 4.25, "y": 3 }, + { "x": 5.25, "y": 3 }, + { "x": 6.25, "y": 3 }, + + { "x": 7.75, "y": 3 }, + { "x": 8.75, "y": 3 }, + + { "x": 10.5, "y": 3 }, + { "x": 11.5, "y": 3 }, + + { "x": 13, "y": 3 }, + { "x": 14, "y": 3 }, + { "x": 15, "y": 3 }, + { "x": 16, "y": 3 }, + { "x": 17, "y": 3 }, + { "x": 18, "y": 3 }, + { "x": 19, "y": 3, "w": 2.75 }, + + { "x": 0.5, "y": 4, "w": 1.25 }, + { "x": 1.75, "y": 4, "w": 1.25 }, + { "x": 3, "y": 4, "w": 1.25 }, + { "x": 4.25, "y": 4, "w": 1.25 }, + + { "x": 6.5, "y": 4, "h": 1.5 }, + { "x": 7.5, "y": 4 }, + + { "x": 11.75, "y": 4 }, + { "x": 12.75, "y": 4, "h": 1.5 }, + + { "x": 16.25, "y": 4, "w": 1.25 }, + { "x": 17.5, "y": 4, "w": 1.25 }, + { "x": 18.75, "y": 4, "w": 1.25 }, + { "x": 20, "y": 4, "w": 1.25 }, + + { "x": 7.5, "y": 5, "h": 1.5 }, + { "x": 11.75, "y": 5, "h": 1.5 } ] }, "LAYOUT_all": { "layout": [ - { "x": 1, "y": 0 }, - { "x": 2, "y": 0 }, - { "x": 3, "y": 0 }, - { "x": 4, "y": 0 }, - { "x": 5, "y": 0 }, - { "x": 6, "y": 0 }, - { "x": 7, "y": 0 }, - - { "x": 13.75, "y": 0 }, - { "x": 14.75, "y": 0 }, - { "x": 15.75, "y": 0 }, - { "x": 16.75, "y": 0 }, - { "x": 17.75, "y": 0 }, - { "x": 18.75, "y": 0 }, - { "x": 19.75, "y": 0 }, - { "x": 22.75, "y": 0, "w": 2 }, - { "x": 20.75, "y": 0 }, - - { "x": 0.5, "y": 1, "w": 1.5 }, - { "x": 2, "y": 1 }, - { "x": 3, "y": 1 }, - { "x": 4, "y": 1 }, - { "x": 5, "y": 1 }, - { "x": 6, "y": 1 }, - { "x": 7, "y": 1 }, - - { "x": 8.25, "y": 1 }, - { "x": 9.25, "y": 1 }, - - { "x": 11, "y": 1 }, - { "x": 12, "y": 1 }, - - { "x": 13.75, "y": 1 }, - { "x": 14.75, "y": 1 }, - { "x": 15.75, "y": 1 }, - { "x": 16.75, "y": 1 }, - { "x": 17.75, "y": 1 }, - { "x": 18.75, "y": 1 }, - { "x": 19.75, "y": 1 }, - { "x": 20.75, "y": 1, "w": 1.5 }, - - { "x": 0.5, "y": 2, "w": 1.75 }, - { "x": 2.25, "y": 2 }, - { "x": 3.25, "y": 2 }, - { "x": 4.25, "y": 2 }, - { "x": 5.25, "y": 2 }, - { "x": 6.25, "y": 2 }, - - { "x": 8.25, "y": 2 }, - { "x": 9.25, "y": 2 }, - - { "x": 11, "y": 2 }, - { "x": 12, "y": 2 }, - - { "x": 14, "y": 2 }, - { "x": 15, "y": 2 }, - { "x": 16, "y": 2 }, - { "x": 17, "y": 2 }, - { "x": 18, "y": 2 }, - { "x": 19, "y": 2 }, - { "x": 20, "y": 2, "w": 2.25 }, - - { "x": 0.5, "y": 3, "w": 1.75 }, - { "x": 1.75, "y": 3 }, - { "x": 2.75, "y": 3 }, - { "x": 3.75, "y": 3 }, - { "x": 4.75, "y": 3 }, - { "x": 5.75, "y": 3 }, - { "x": 6.75, "y": 3 }, - - { "x": 8.25, "y": 3 }, - { "x": 9.25, "y": 3 }, - - { "x": 11, "y": 3 }, - { "x": 12, "y": 3 }, - - { "x": 13.5, "y": 3 }, - { "x": 14.5, "y": 3 }, - { "x": 15.5, "y": 3 }, - { "x": 16.5, "y": 3 }, - { "x": 17.5, "y": 3 }, - { "x": 18.5, "y": 3 }, - { "x": 19.5, "y": 3, "w": 1.75 }, - { "x": 21.25, "y": 3 }, - - { "x": 1, "y": 4, "w": 1.25 }, - { "x": 2.25, "y": 4, "w": 1.25 }, - { "x": 3.5, "y": 4, "w": 1.25 }, - { "x": 4.75, "y": 4, "w": 1.25 }, - - { "x": 7, "y": 4, "h": 1.5 }, - { "x": 8, "y": 4 }, - - { "x": 12.25, "y": 4 }, - { "x": 13.25, "y": 4, "h": 1.5 }, - - { "x": 16.75, "y": 4, "w": 1.25 }, - { "x": 18, "y": 4, "w": 1.25 }, - { "x": 19.25, "y": 4, "w": 1.25 }, - { "x": 20.5, "y": 4, "w": 1.25 }, - - { "x": 8, "y": 5, "h": 1.5 }, - { "x": 12.25, "y": 5, "h": 1.5 } + { "x": 0.5, "y": 0 }, + { "x": 1.5, "y": 0 }, + { "x": 2.5, "y": 0 }, + { "x": 3.5, "y": 0 }, + { "x": 4.5, "y": 0 }, + { "x": 5.5, "y": 0 }, + { "x": 6.5, "y": 0 }, + + { "x": 13.25, "y": 0 }, + { "x": 14.25, "y": 0 }, + { "x": 15.25, "y": 0 }, + { "x": 16.25, "y": 0 }, + { "x": 17.25, "y": 0 }, + { "x": 18.25, "y": 0 }, + { "x": 19.25, "y": 0 }, + { "x": 22.25, "y": 0, "w": 2 }, + { "x": 20.25, "y": 0 }, + + { "x": 0, "y": 1, "w": 1.5 }, + { "x": 1.5, "y": 1 }, + { "x": 2.5, "y": 1 }, + { "x": 3.5, "y": 1 }, + { "x": 4.5, "y": 1 }, + { "x": 5.5, "y": 1 }, + { "x": 6.5, "y": 1 }, + + { "x": 7.75, "y": 1 }, + { "x": 8.75, "y": 1 }, + + { "x": 10.5, "y": 1 }, + { "x": 11.5, "y": 1 }, + + { "x": 13.25, "y": 1 }, + { "x": 14.25, "y": 1 }, + { "x": 15.25, "y": 1 }, + { "x": 16.25, "y": 1 }, + { "x": 17.25, "y": 1 }, + { "x": 18.25, "y": 1 }, + { "x": 19.25, "y": 1 }, + { "x": 20.25, "y": 1, "w": 1.5 }, + + { "x": 0, "y": 2, "w": 1.75 }, + { "x": 1.75, "y": 2 }, + { "x": 2.75, "y": 2 }, + { "x": 3.75, "y": 2 }, + { "x": 4.75, "y": 2 }, + { "x": 5.75, "y": 2 }, + + { "x": 7.75, "y": 2 }, + { "x": 8.75, "y": 2 }, + + { "x": 10.5, "y": 2 }, + { "x": 11.5, "y": 2 }, + + { "x": 13.5, "y": 2 }, + { "x": 14.5, "y": 2 }, + { "x": 15.5, "y": 2 }, + { "x": 16.5, "y": 2 }, + { "x": 17.5, "y": 2 }, + { "x": 18.5, "y": 2 }, + { "x": 19.5, "y": 2, "w": 2.25 }, + + { "x": 0, "y": 3, "w": 1.25 }, + { "x": 1.25, "y": 3 }, + { "x": 2.25, "y": 3 }, + { "x": 3.25, "y": 3 }, + { "x": 4.25, "y": 3 }, + { "x": 5.25, "y": 3 }, + { "x": 6.25, "y": 3 }, + + { "x": 7.75, "y": 3 }, + { "x": 8.75, "y": 3 }, + + { "x": 10.5, "y": 3 }, + { "x": 11.5, "y": 3 }, + + { "x": 13, "y": 3 }, + { "x": 14, "y": 3 }, + { "x": 15, "y": 3 }, + { "x": 16, "y": 3 }, + { "x": 17, "y": 3 }, + { "x": 18, "y": 3 }, + { "x": 19, "y": 3, "w": 1.75 }, + { "x": 20.75, "y": 3 }, + + { "x": 0.5, "y": 4, "w": 1.25 }, + { "x": 1.75, "y": 4, "w": 1.25 }, + { "x": 3, "y": 4, "w": 1.25 }, + { "x": 4.25, "y": 4, "w": 1.25 }, + + { "x": 6.5, "y": 4, "h": 1.5 }, + { "x": 7.5, "y": 4 }, + + { "x": 11.75, "y": 4 }, + { "x": 12.75, "y": 4, "h": 1.5 }, + + { "x": 16.25, "y": 4, "w": 1.25 }, + { "x": 17.5, "y": 4, "w": 1.25 }, + { "x": 18.75, "y": 4, "w": 1.25 }, + { "x": 20, "y": 4, "w": 1.25 }, + + { "x": 7.5, "y": 5, "h": 1.5 }, + { "x": 11.75, "y": 5, "h": 1.5 } ] } } |