diff options
Diffstat (limited to 'keyboards/kingly_keys')
31 files changed, 561 insertions, 617 deletions
diff --git a/keyboards/kingly_keys/ave/config.h b/keyboards/kingly_keys/ave/config.h index fadfdae715..af9ffae03d 100644 --- a/keyboards/kingly_keys/ave/config.h +++ b/keyboards/kingly_keys/ave/config.h @@ -17,13 +17,6 @@ #pragma once -#define MATRIX_ROW_PINS { B3, F4, F7, F6, F5 } -#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN B7 #if defined(RGBLIGHT_ENABLE) # define RGBLED_NUM 2 # define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kingly_keys/ave/ortho/info.json b/keyboards/kingly_keys/ave/ortho/info.json index cdd3f41835..0de5b82bdd 100644 --- a/keyboards/kingly_keys/ave/ortho/info.json +++ b/keyboards/kingly_keys/ave/ortho/info.json @@ -8,186 +8,206 @@ "pid": "0x1225", "device_version": "0.1.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["B3", "F4", "F7", "F6", "F5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B1"} ] }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_all": { "layout": [ - {"label":"k001", "x":0.00, "y":0.00}, - {"label":"k002", "x":1.50, "y":0.00}, - {"label":"k011", "x":10.5, "y":0.00}, - {"label":"k012", "x":11.5, "y":0.00}, - {"label":"k013", "x":12.5, "y":0.00}, - {"label":"k101", "x":0.00, "y":1.50}, - {"label":"k102", "x":1.50, "y":1.50}, - {"label":"k103", "x":2.50, "y":1.50}, - {"label":"k104", "x":3.50, "y":1.50}, - {"label":"k105", "x":4.50, "y":1.50}, - {"label":"k106", "x":5.50, "y":1.50}, - {"label":"k107", "x":6.50, "y":1.50}, - {"label":"k108", "x":7.50, "y":1.50}, - {"label":"k109", "x":8.50, "y":1.50}, - {"label":"k110", "x":9.50, "y":1.50}, - {"label":"k111", "x":10.5, "y":1.50}, - {"label":"k112", "x":11.5, "y":1.50}, - {"label":"k113", "x":12.5, "y":1.50}, - {"label":"k201", "x":0.00, "y":2.50}, - {"label":"k202", "x":1.50, "y":2.50}, - {"label":"k203", "x":2.50, "y":2.50}, - {"label":"k204", "x":3.50, "y":2.50}, - {"label":"k205", "x":4.50, "y":2.50}, - {"label":"k206", "x":5.50, "y":2.50}, - {"label":"k207", "x":6.50, "y":2.50}, - {"label":"k208", "x":7.50, "y":2.50}, - {"label":"k209", "x":8.50, "y":2.50}, - {"label":"k210", "x":9.50, "y":2.50}, - {"label":"k211", "x":10.5, "y":2.50}, - {"label":"k212", "x":11.5, "y":2.50}, - {"label":"k213", "x":12.5, "y":2.50}, - {"label":"k301", "x":0.00, "y":3.50}, - {"label":"k302", "x":1.50, "y":3.50}, - {"label":"k303", "x":2.50, "y":3.50}, - {"label":"k304", "x":3.50, "y":3.50}, - {"label":"k305", "x":4.50, "y":3.50}, - {"label":"k306", "x":5.50, "y":3.50}, - {"label":"k307", "x":6.50, "y":3.50}, - {"label":"k308", "x":7.50, "y":3.50}, - {"label":"k309", "x":8.50, "y":3.50}, - {"label":"k310", "x":9.50, "y":3.50}, - {"label":"k311", "x":10.5, "y":3.50}, - {"label":"k312", "x":11.5, "y":3.50}, - {"label":"k313", "x":12.5, "y":3.50}, - {"label":"k401", "x":0.00, "y":4.50}, - {"label":"k402", "x":1.50, "y":4.50}, - {"label":"k403", "x":2.50, "y":4.50}, - {"label":"k404", "x":3.50, "y":4.50}, - {"label":"k405", "x":4.50, "y":4.50}, - {"label":"k406", "x":5.50, "y":4.50}, - {"label":"k407", "x":6.50, "y":4.50}, - {"label":"k408", "x":7.50, "y":4.50}, - {"label":"k409", "x":8.50, "y":4.50}, - {"label":"k410", "x":9.50, "y":4.50}, - {"label":"k411", "x":10.5, "y":4.50}, - {"label":"k412", "x":11.5, "y":4.50}, - {"label":"k413", "x":12.5, "y":4.50} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1.5}, + {"matrix": [1, 2], "x": 2.5, "y": 1.5}, + {"matrix": [1, 3], "x": 3.5, "y": 1.5}, + {"matrix": [1, 4], "x": 4.5, "y": 1.5}, + {"matrix": [1, 5], "x": 5.5, "y": 1.5}, + {"matrix": [1, 6], "x": 6.5, "y": 1.5}, + {"matrix": [1, 7], "x": 7.5, "y": 1.5}, + {"matrix": [1, 8], "x": 8.5, "y": 1.5}, + {"matrix": [1, 9], "x": 9.5, "y": 1.5}, + {"matrix": [1, 10], "x": 10.5, "y": 1.5}, + {"matrix": [1, 11], "x": 11.5, "y": 1.5}, + {"matrix": [1, 12], "x": 12.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3.5}, + {"matrix": [3, 3], "x": 3.5, "y": 3.5}, + {"matrix": [3, 4], "x": 4.5, "y": 3.5}, + {"matrix": [3, 5], "x": 5.5, "y": 3.5}, + {"matrix": [3, 6], "x": 6.5, "y": 3.5}, + {"matrix": [3, 7], "x": 7.5, "y": 3.5}, + {"matrix": [3, 8], "x": 8.5, "y": 3.5}, + {"matrix": [3, 9], "x": 9.5, "y": 3.5}, + {"matrix": [3, 10], "x": 10.5, "y": 3.5}, + {"matrix": [3, 11], "x": 11.5, "y": 3.5}, + {"matrix": [3, 12], "x": 12.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4.5}, + {"matrix": [4, 3], "x": 3.5, "y": 4.5}, + {"matrix": [4, 4], "x": 4.5, "y": 4.5}, + {"matrix": [4, 5], "x": 5.5, "y": 4.5}, + {"matrix": [4, 6], "x": 6.5, "y": 4.5}, + {"matrix": [4, 7], "x": 7.5, "y": 4.5}, + {"matrix": [4, 8], "x": 8.5, "y": 4.5}, + {"matrix": [4, 9], "x": 9.5, "y": 4.5}, + {"matrix": [4, 10], "x": 10.5, "y": 4.5}, + {"matrix": [4, 11], "x": 11.5, "y": 4.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4.5} ] }, "LAYOUT_ortho_2x2u": { "layout": [ - {"label":"k001", "x":0.00, "y":0.00}, - {"label":"k002", "x":1.50, "y":0.00}, - {"label":"k011", "x":10.5, "y":0.00}, - {"label":"k012", "x":11.5, "y":0.00}, - {"label":"k013", "x":12.5, "y":0.00}, - {"label":"k101", "x":0.00, "y":1.50}, - {"label":"k102", "x":1.50, "y":1.50}, - {"label":"k103", "x":2.50, "y":1.50}, - {"label":"k104", "x":3.50, "y":1.50}, - {"label":"k105", "x":4.50, "y":1.50}, - {"label":"k106", "x":5.50, "y":1.50}, - {"label":"k107", "x":6.50, "y":1.50}, - {"label":"k108", "x":7.50, "y":1.50}, - {"label":"k109", "x":8.50, "y":1.50}, - {"label":"k110", "x":9.50, "y":1.50}, - {"label":"k111", "x":10.5, "y":1.50}, - {"label":"k112", "x":11.5, "y":1.50}, - {"label":"k113", "x":12.5, "y":1.50}, - {"label":"k201", "x":0.00, "y":2.50}, - {"label":"k202", "x":1.50, "y":2.50}, - {"label":"k203", "x":2.50, "y":2.50}, - {"label":"k204", "x":3.50, "y":2.50}, - {"label":"k205", "x":4.50, "y":2.50}, - {"label":"k206", "x":5.50, "y":2.50}, - {"label":"k207", "x":6.50, "y":2.50}, - {"label":"k208", "x":7.50, "y":2.50}, - {"label":"k209", "x":8.50, "y":2.50}, - {"label":"k210", "x":9.50, "y":2.50}, - {"label":"k211", "x":10.5, "y":2.50}, - {"label":"k212", "x":11.5, "y":2.50}, - {"label":"k213", "x":12.5, "y":2.50}, - {"label":"k301", "x":0.00, "y":3.50}, - {"label":"k302", "x":1.50, "y":3.50}, - {"label":"k303", "x":2.50, "y":3.50}, - {"label":"k304", "x":3.50, "y":3.50}, - {"label":"k305", "x":4.50, "y":3.50}, - {"label":"k306", "x":5.50, "y":3.50}, - {"label":"k307", "x":6.50, "y":3.50}, - {"label":"k308", "x":7.50, "y":3.50}, - {"label":"k309", "x":8.50, "y":3.50}, - {"label":"k310", "x":9.50, "y":3.50}, - {"label":"k311", "x":10.5, "y":3.50}, - {"label":"k312", "x":11.5, "y":3.50}, - {"label":"k313", "x":12.5, "y":3.50}, - {"label":"k401", "x":0.00, "y":4.50}, - {"label":"k402", "x":1.50, "y":4.50}, - {"label":"k403", "x":2.50, "y":4.50}, - {"label":"k404", "x":3.50, "y":4.50}, - {"label":"k405", "x":4.50, "y":4.50}, - {"label":"k406", "x":5.50, "y":4.50, "w":2.00}, - {"label":"k409", "x":7.50, "y":4.50, "w":2.00}, - {"label":"k410", "x":9.50, "y":4.50}, - {"label":"k411", "x":10.5, "y":4.50}, - {"label":"k412", "x":11.5, "y":4.50}, - {"label":"k413", "x":12.5, "y":4.50} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1.5}, + {"matrix": [1, 2], "x": 2.5, "y": 1.5}, + {"matrix": [1, 3], "x": 3.5, "y": 1.5}, + {"matrix": [1, 4], "x": 4.5, "y": 1.5}, + {"matrix": [1, 5], "x": 5.5, "y": 1.5}, + {"matrix": [1, 6], "x": 6.5, "y": 1.5}, + {"matrix": [1, 7], "x": 7.5, "y": 1.5}, + {"matrix": [1, 8], "x": 8.5, "y": 1.5}, + {"matrix": [1, 9], "x": 9.5, "y": 1.5}, + {"matrix": [1, 10], "x": 10.5, "y": 1.5}, + {"matrix": [1, 11], "x": 11.5, "y": 1.5}, + {"matrix": [1, 12], "x": 12.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3.5}, + {"matrix": [3, 3], "x": 3.5, "y": 3.5}, + {"matrix": [3, 4], "x": 4.5, "y": 3.5}, + {"matrix": [3, 5], "x": 5.5, "y": 3.5}, + {"matrix": [3, 6], "x": 6.5, "y": 3.5}, + {"matrix": [3, 7], "x": 7.5, "y": 3.5}, + {"matrix": [3, 8], "x": 8.5, "y": 3.5}, + {"matrix": [3, 9], "x": 9.5, "y": 3.5}, + {"matrix": [3, 10], "x": 10.5, "y": 3.5}, + {"matrix": [3, 11], "x": 11.5, "y": 3.5}, + {"matrix": [3, 12], "x": 12.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4.5}, + {"matrix": [4, 3], "x": 3.5, "y": 4.5}, + {"matrix": [4, 4], "x": 4.5, "y": 4.5}, + {"matrix": [4, 5], "x": 5.5, "y": 4.5, "w": 2}, + {"matrix": [4, 8], "x": 7.5, "y": 4.5, "w": 2}, + {"matrix": [4, 9], "x": 9.5, "y": 4.5}, + {"matrix": [4, 10], "x": 10.5, "y": 4.5}, + {"matrix": [4, 11], "x": 11.5, "y": 4.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4.5} ] }, "LAYOUT_ortho_big_boy": { "layout": [ - {"label":"k001", "x":0.00, "y":0.00}, - {"label":"k002", "x":1.50, "y":0.00}, - {"label":"k011", "x":10.5, "y":0.00}, - {"label":"k012", "x":11.5, "y":0.00}, - {"label":"k013", "x":12.5, "y":0.00}, - {"label":"k101", "x":0.00, "y":1.50}, - {"label":"k102", "x":1.50, "y":1.50}, - {"label":"k103", "x":2.50, "y":1.50}, - {"label":"k104", "x":3.50, "y":1.50}, - {"label":"k105", "x":4.50, "y":1.50}, - {"label":"k106", "x":5.50, "y":1.50}, - {"label":"k107", "x":6.50, "y":1.50}, - {"label":"k108", "x":7.50, "y":1.50}, - {"label":"k109", "x":8.50, "y":1.50}, - {"label":"k110", "x":9.50, "y":1.50}, - {"label":"k111", "x":10.5, "y":1.50}, - {"label":"k112", "x":11.5, "y":1.50}, - {"label":"k113", "x":12.5, "y":1.50}, - {"label":"k201", "x":0.00, "y":2.50}, - {"label":"k202", "x":1.50, "y":2.50}, - {"label":"k203", "x":2.50, "y":2.50}, - {"label":"k204", "x":3.50, "y":2.50}, - {"label":"k205", "x":4.50, "y":2.50}, - {"label":"k206", "x":5.50, "y":2.50}, - {"label":"k207", "x":6.50, "y":2.50}, - {"label":"k208", "x":7.50, "y":2.50}, - {"label":"k209", "x":8.50, "y":2.50}, - {"label":"k210", "x":9.50, "y":2.50}, - {"label":"k211", "x":10.5, "y":2.50}, - {"label":"k212", "x":11.5, "y":2.50}, - {"label":"k213", "x":12.5, "y":2.50}, - {"label":"k301", "x":0.00, "y":3.50}, - {"label":"k302", "x":1.50, "y":3.50}, - {"label":"k303", "x":2.50, "y":3.50}, - {"label":"k304", "x":3.50, "y":3.50}, - {"label":"k305", "x":4.50, "y":3.50}, - {"label":"k306", "x":5.50, "y":3.50}, - {"label":"k307", "x":6.50, "y":3.50}, - {"label":"k308", "x":7.50, "y":3.50}, - {"label":"k309", "x":8.50, "y":3.50}, - {"label":"k310", "x":9.50, "y":3.50}, - {"label":"k311", "x":10.5, "y":3.50}, - {"label":"k312", "x":11.5, "y":3.50}, - {"label":"k313", "x":12.5, "y":3.50}, - {"label":"k401", "x":0.00, "y":4.50}, - {"label":"k402", "x":1.50, "y":4.50}, - {"label":"k403", "x":2.50, "y":4.50, "w":1.50}, - {"label":"k404", "x":4.00, "y":4.50, "w":7.00}, - {"label":"k405", "x":11.0, "y":4.50, "w":1.50}, - {"label":"k413", "x":12.5, "y":4.50} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1.5}, + {"matrix": [1, 2], "x": 2.5, "y": 1.5}, + {"matrix": [1, 3], "x": 3.5, "y": 1.5}, + {"matrix": [1, 4], "x": 4.5, "y": 1.5}, + {"matrix": [1, 5], "x": 5.5, "y": 1.5}, + {"matrix": [1, 6], "x": 6.5, "y": 1.5}, + {"matrix": [1, 7], "x": 7.5, "y": 1.5}, + {"matrix": [1, 8], "x": 8.5, "y": 1.5}, + {"matrix": [1, 9], "x": 9.5, "y": 1.5}, + {"matrix": [1, 10], "x": 10.5, "y": 1.5}, + {"matrix": [1, 11], "x": 11.5, "y": 1.5}, + {"matrix": [1, 12], "x": 12.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3.5}, + {"matrix": [3, 3], "x": 3.5, "y": 3.5}, + {"matrix": [3, 4], "x": 4.5, "y": 3.5}, + {"matrix": [3, 5], "x": 5.5, "y": 3.5}, + {"matrix": [3, 6], "x": 6.5, "y": 3.5}, + {"matrix": [3, 7], "x": 7.5, "y": 3.5}, + {"matrix": [3, 8], "x": 8.5, "y": 3.5}, + {"matrix": [3, 9], "x": 9.5, "y": 3.5}, + {"matrix": [3, 10], "x": 10.5, "y": 3.5}, + {"matrix": [3, 11], "x": 11.5, "y": 3.5}, + {"matrix": [3, 12], "x": 12.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4.5, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4.5, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4.5} ] } } diff --git a/keyboards/kingly_keys/ave/ortho/ortho.c b/keyboards/kingly_keys/ave/ortho/ortho.c deleted file mode 100644 index 4fb95e7684..0000000000 --- a/keyboards/kingly_keys/ave/ortho/ortho.c +++ /dev/null @@ -1,18 +0,0 @@ - /* - Copyright 2020 Garret Gartner - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "ortho.h" diff --git a/keyboards/kingly_keys/ave/ortho/ortho.h b/keyboards/kingly_keys/ave/ortho/ortho.h deleted file mode 100644 index 12cdede536..0000000000 --- a/keyboards/kingly_keys/ave/ortho/ortho.h +++ /dev/null @@ -1,67 +0,0 @@ - /* - Copyright 2020 Garret Gartner - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#include "quantum.h" - -#define XXXX KC_NO - -#define LAYOUT_ortho_all( \ - k001, k002, k011, k012, k013, \ - k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, \ - k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, \ - k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, \ - k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413 \ -) \ -{ \ - { k001, k002, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, k011, k012, k013 }, \ - { k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113 }, \ - { k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213 }, \ - { k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313 }, \ - { k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413 } \ -} - -#define LAYOUT_ortho_2x2u( \ - k001, k002, k011, k012, k013, \ - k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, \ - k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, \ - k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, \ - k401, k402, k403, k404, k405, k406, k409, k410, k411, k412, k413 \ -) \ -{ \ - { k001, k002, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, k011, k012, k013 }, \ - { k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113 }, \ - { k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213 }, \ - { k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313 }, \ - { k401, k402, k403, k404, k405, k406, XXXX, XXXX, k409, k410, k411, k412, k413 } \ -} - -#define LAYOUT_ortho_big_boy( \ - k001, k002, k011, k012, k013, \ - k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, \ - k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, \ - k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, \ - k401, k402, k403, k407, k412, k413 \ -) \ -{ \ - { k001, k002, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, k011, k012, k013 }, \ - { k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113 }, \ - { k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213 }, \ - { k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313 }, \ - { k401, k402, k403, XXXX, XXXX, XXXX, k407, XXXX, XXXX, XXXX, XXXX, k412, k413 } \ -} diff --git a/keyboards/kingly_keys/ave/staggered/info.json b/keyboards/kingly_keys/ave/staggered/info.json index 2e9c83df4c..b975a4aa68 100644 --- a/keyboards/kingly_keys/ave/staggered/info.json +++ b/keyboards/kingly_keys/ave/staggered/info.json @@ -8,120 +8,128 @@ "pid": "0x1225", "device_version": "0.1.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["B3", "F4", "F7", "F6", "F5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B1"} ] }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT_staggered": { "layout": [ - {"label":"k001", "x":0.00, "y":0.00}, - {"label":"k002", "x":1.50, "y":0.00}, - {"label":"k011", "x":10.5, "y":0.00}, - {"label":"k012", "x":11.5, "y":0.00}, - {"label":"k013", "x":12.5, "y":0.00}, - {"label":"k101", "x":0.00, "y":1.50}, - {"label":"k102", "x":1.50, "y":1.50}, - {"label":"k103", "x":2.50, "y":1.50}, - {"label":"k104", "x":3.50, "y":1.50}, - {"label":"k105", "x":4.50, "y":1.50}, - {"label":"k106", "x":5.50, "y":1.50}, - {"label":"k107", "x":6.50, "y":1.50}, - {"label":"k108", "x":7.50, "y":1.50}, - {"label":"k109", "x":8.50, "y":1.50}, - {"label":"k110", "x":9.50, "y":1.50}, - {"label":"k111", "x":10.5, "y":1.50}, - {"label":"k112", "x":11.5, "y":1.50}, - {"label":"k113", "x":12.5, "y":1.50}, - {"label":"k201", "x":0.00, "y":2.50}, - {"label":"k202", "x":1.50, "y":2.50, "w":1.25}, - {"label":"k203", "x":2.75, "y":2.50}, - {"label":"k204", "x":3.75, "y":2.50}, - {"label":"k205", "x":4.75, "y":2.50}, - {"label":"k206", "x":5.75, "y":2.50}, - {"label":"k207", "x":6.75, "y":2.50}, - {"label":"k208", "x":7.75, "y":2.50}, - {"label":"k209", "x":8.75, "y":2.50}, - {"label":"k210", "x":9.75, "y":2.50}, + {"label":"k001", "x":0, "y":0}, + {"label":"k002", "x":1.5, "y":0}, + {"label":"k011", "x":10.5, "y":0}, + {"label":"k012", "x":11.5, "y":0}, + {"label":"k013", "x":12.5, "y":0}, + {"label":"k101", "x":0, "y":1.5}, + {"label":"k102", "x":1.5, "y":1.5}, + {"label":"k103", "x":2.5, "y":1.5}, + {"label":"k104", "x":3.5, "y":1.5}, + {"label":"k105", "x":4.5, "y":1.5}, + {"label":"k106", "x":5.5, "y":1.5}, + {"label":"k107", "x":6.5, "y":1.5}, + {"label":"k108", "x":7.5, "y":1.5}, + {"label":"k109", "x":8.5, "y":1.5}, + {"label":"k110", "x":9.5, "y":1.5}, + {"label":"k111", "x":10.5, "y":1.5}, + {"label":"k112", "x":11.5, "y":1.5}, + {"label":"k113", "x":12.5, "y":1.5}, + {"label":"k201", "x":0, "y":2.5}, + {"label":"k202", "x":1.5, "y":2.5, "w":1.25}, + {"label":"k203", "x":2.75, "y":2.5}, + {"label":"k204", "x":3.75, "y":2.5}, + {"label":"k205", "x":4.75, "y":2.5}, + {"label":"k206", "x":5.75, "y":2.5}, + {"label":"k207", "x":6.75, "y":2.5}, + {"label":"k208", "x":7.75, "y":2.5}, + {"label":"k209", "x":8.75, "y":2.5}, + {"label":"k210", "x":9.75, "y":2.5}, {"label":"k211", "x":10.75, "y":2.5}, {"label":"k213", "x":11.75, "y":2.5, "w":1.75}, - {"label":"k301", "x":0.00, "y":3.50}, - {"label":"k302", "x":1.50, "y":3.50, "w":1.75}, - {"label":"k303", "x":3.25, "y":3.50}, - {"label":"k304", "x":4.25, "y":3.50}, - {"label":"k305", "x":5.25, "y":3.50}, - {"label":"k306", "x":6.25, "y":3.50}, - {"label":"k307", "x":7.25, "y":3.50}, - {"label":"k308", "x":8.25, "y":3.50}, - {"label":"k309", "x":9.25, "y":3.50}, - {"label":"k310", "x":10.25, "y":3.50}, - {"label":"k312", "x":11.25, "y":3.50}, - {"label":"k313", "x":12.25, "y":3.50, "w":1.25}, - {"label":"k401", "x":0.00, "y":4.50}, - {"label":"k402", "x":1.50, "y":4.50, "w":1.25}, - {"label":"k403", "x":2.75, "y":4.50}, - {"label":"k404", "x":3.75, "y":4.50, "w":1.25}, - {"label":"k406", "x":5.00, "y":4.50, "w":2.75}, - {"label":"k408", "x":7.75, "y":4.50, "w":2.25}, - {"label":"k411", "x":10.0, "y":4.50, "w":1.25}, - {"label":"k412", "x":11.25, "y":4.50}, - {"label":"k413", "x":12.25, "y":4.50, "w":1.25} + {"label":"k301", "x":0, "y":3.5}, + {"label":"k302", "x":1.5, "y":3.5, "w":1.75}, + {"label":"k303", "x":3.25, "y":3.5}, + {"label":"k304", "x":4.25, "y":3.5}, + {"label":"k305", "x":5.25, "y":3.5}, + {"label":"k306", "x":6.25, "y":3.5}, + {"label":"k307", "x":7.25, "y":3.5}, + {"label":"k308", "x":8.25, "y":3.5}, + {"label":"k309", "x":9.25, "y":3.5}, + {"label":"k310", "x":10.25, "y":3.5}, + {"label":"k312", "x":11.25, "y":3.5}, + {"label":"k313", "x":12.25, "y":3.5, "w":1.25}, + {"label":"k401", "x":0, "y":4.5}, + {"label":"k402", "x":1.5, "y":4.5, "w":1.25}, + {"label":"k403", "x":2.75, "y":4.5}, + {"label":"k404", "x":3.75, "y":4.5, "w":1.25}, + {"label":"k406", "x":5, "y":4.5, "w":2.75}, + {"label":"k408", "x":7.75, "y":4.5, "w":2.25}, + {"label":"k411", "x":10, "y":4.5, "w":1.25}, + {"label":"k412", "x":11.25, "y":4.5}, + {"label":"k413", "x":12.25, "y":4.5, "w":1.25} ] }, "LAYOUT_staggered_big_boy": { "layout": [ - {"label":"k001", "x":0.00, "y":0.00}, - {"label":"k002", "x":1.50, "y":0.00}, - {"label":"k011", "x":10.5, "y":0.00}, - {"label":"k012", "x":11.5, "y":0.00}, - {"label":"k013", "x":12.5, "y":0.00}, - {"label":"k101", "x":0.00, "y":1.50}, - {"label":"k102", "x":1.50, "y":1.50}, - {"label":"k103", "x":2.50, "y":1.50}, - {"label":"k104", "x":3.50, "y":1.50}, - {"label":"k105", "x":4.50, "y":1.50}, - {"label":"k106", "x":5.50, "y":1.50}, - {"label":"k107", "x":6.50, "y":1.50}, - {"label":"k108", "x":7.50, "y":1.50}, - {"label":"k109", "x":8.50, "y":1.50}, - {"label":"k110", "x":9.50, "y":1.50}, - {"label":"k111", "x":10.5, "y":1.50}, - {"label":"k112", "x":11.5, "y":1.50}, - {"label":"k113", "x":12.5, "y":1.50}, - {"label":"k201", "x":0.00, "y":2.50}, - {"label":"k202", "x":1.50, "y":2.50, "w":1.25}, - {"label":"k203", "x":2.75, "y":2.50}, - {"label":"k204", "x":3.75, "y":2.50}, - {"label":"k205", "x":4.75, "y":2.50}, - {"label":"k206", "x":5.75, "y":2.50}, - {"label":"k207", "x":6.75, "y":2.50}, - {"label":"k208", "x":7.75, "y":2.50}, - {"label":"k209", "x":8.75, "y":2.50}, - {"label":"k210", "x":9.75, "y":2.50}, + {"label":"k001", "x":0, "y":0}, + {"label":"k002", "x":1.5, "y":0}, + {"label":"k011", "x":10.5, "y":0}, + {"label":"k012", "x":11.5, "y":0}, + {"label":"k013", "x":12.5, "y":0}, + {"label":"k101", "x":0, "y":1.5}, + {"label":"k102", "x":1.5, "y":1.5}, + {"label":"k103", "x":2.5, "y":1.5}, + {"label":"k104", "x":3.5, "y":1.5}, + {"label":"k105", "x":4.5, "y":1.5}, + {"label":"k106", "x":5.5, "y":1.5}, + {"label":"k107", "x":6.5, "y":1.5}, + {"label":"k108", "x":7.5, "y":1.5}, + {"label":"k109", "x":8.5, "y":1.5}, + {"label":"k110", "x":9.5, "y":1.5}, + {"label":"k111", "x":10.5, "y":1.5}, + {"label":"k112", "x":11.5, "y":1.5}, + {"label":"k113", "x":12.5, "y":1.5}, + {"label":"k201", "x":0, "y":2.5}, + {"label":"k202", "x":1.5, "y":2.5, "w":1.25}, + {"label":"k203", "x":2.75, "y":2.5}, + {"label":"k204", "x":3.75, "y":2.5}, + {"label":"k205", "x":4.75, "y":2.5}, + {"label":"k206", "x":5.75, "y":2.5}, + {"label":"k207", "x":6.75, "y":2.5}, + {"label":"k208", "x":7.75, "y":2.5}, + {"label":"k209", "x":8.75, "y":2.5}, + {"label":"k210", "x":9.75, "y":2.5}, {"label":"k211", "x":10.75, "y":2.5}, {"label":"k213", "x":11.75, "y":2.5, "w":1.75}, - {"label":"k301", "x":0.00, "y":3.50}, - {"label":"k302", "x":1.50, "y":3.50, "w":1.75}, - {"label":"k303", "x":3.25, "y":3.50}, - {"label":"k304", "x":4.25, "y":3.50}, - {"label":"k305", "x":5.25, "y":3.50}, - {"label":"k306", "x":6.25, "y":3.50}, - {"label":"k307", "x":7.25, "y":3.50}, - {"label":"k308", "x":8.25, "y":3.50}, - {"label":"k309", "x":9.25, "y":3.50}, - {"label":"k310", "x":10.25, "y":3.50}, - {"label":"k312", "x":11.25, "y":3.50}, - {"label":"k313", "x":12.25, "y":3.50, "w":1.25}, - {"label":"k401", "x":0.00, "y":4.50}, - {"label":"k402", "x":1.50, "y":4.50, "w":1.25}, - {"label":"k403", "x":2.75, "y":4.50}, - {"label":"k406", "x":3.75, "y":4.50, "w":6.25}, - {"label":"k411", "x":10.0, "y":4.50, "w":1.25}, - {"label":"k412", "x":11.25, "y":4.50}, - {"label":"k413", "x":12.25, "y":4.50, "w":1.25} + {"label":"k301", "x":0, "y":3.5}, + {"label":"k302", "x":1.5, "y":3.5, "w":1.75}, + {"label":"k303", "x":3.25, "y":3.5}, + {"label":"k304", "x":4.25, "y":3.5}, + {"label":"k305", "x":5.25, "y":3.5}, + {"label":"k306", "x":6.25, "y":3.5}, + {"label":"k307", "x":7.25, "y":3.5}, + {"label":"k308", "x":8.25, "y":3.5}, + {"label":"k309", "x":9.25, "y":3.5}, + {"label":"k310", "x":10.25, "y":3.5}, + {"label":"k312", "x":11.25, "y":3.5}, + {"label":"k313", "x":12.25, "y":3.5, "w":1.25}, + {"label":"k401", "x":0, "y":4.5}, + {"label":"k402", "x":1.5, "y":4.5, "w":1.25}, + {"label":"k403", "x":2.75, "y":4.5}, + {"label":"k406", "x":3.75, "y":4.5, "w":6.25}, + {"label":"k411", "x":10, "y":4.5, "w":1.25}, + {"label":"k412", "x":11.25, "y":4.5}, + {"label":"k413", "x":12.25, "y":4.5, "w":1.25} ] } } diff --git a/keyboards/kingly_keys/ave/staggered/staggered.c b/keyboards/kingly_keys/ave/staggered/staggered.c deleted file mode 100644 index 4aa0d45ea3..0000000000 --- a/keyboards/kingly_keys/ave/staggered/staggered.c +++ /dev/null @@ -1,18 +0,0 @@ - /* - Copyright 2020 Garret Gartner - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "staggered.h" diff --git a/keyboards/kingly_keys/little_foot/config.h b/keyboards/kingly_keys/little_foot/config.h index 4f79c077e1..719f192955 100644 --- a/keyboards/kingly_keys/little_foot/config.h +++ b/keyboards/kingly_keys/little_foot/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F6, B6, B2, B3, B1 } -#define MATRIX_COL_PINS { F5, F7, B5, B4, E6, D7, C6, D4, D0, D1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define FORCE_NKRO /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ @@ -33,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN F4 #define RGBLED_NUM 10 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kingly_keys/little_foot/info.json b/keyboards/kingly_keys/little_foot/info.json index e306ed38a2..c3cde9243f 100644 --- a/keyboards/kingly_keys/little_foot/info.json +++ b/keyboards/kingly_keys/little_foot/info.json @@ -8,14 +8,117 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F4" + }, + "matrix_pins": { + "cols": ["F5", "F7", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], + "rows": ["F6", "B6", "B2", "B3", "B1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT_split_space_base": { - "layout": [{"x":0, "y":0}, {"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":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"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, "y":1}, {"x":9, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":1.5, "y":4, "w":1.5}, {"x":3, "y":4, "w":2}, {"x":5, "y":4, "w":2}, {"x":7, "y":4, "w":1.5}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 3, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 5, "y": 4, "w": 2}, + {"matrix": [4, 8], "x": 7, "y": 4, "w": 1.5} + ] }, "LAYOUT_big_space_base": { - "layout": [{"x":0, "y":0}, {"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":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"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, "y":1}, {"x":9, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":1.5, "y":4, "w":7}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + + {"matrix": [4, 5], "x": 1.5, "y": 4, "w": 7} + ] } } } diff --git a/keyboards/kingly_keys/little_foot/little_foot.c b/keyboards/kingly_keys/little_foot/little_foot.c deleted file mode 100644 index 5513b113a0..0000000000 --- a/keyboards/kingly_keys/little_foot/little_foot.c +++ /dev/null @@ -1 +0,0 @@ -#include "little_foot.h" diff --git a/keyboards/kingly_keys/little_foot/little_foot.h b/keyboards/kingly_keys/little_foot/little_foot.h deleted file mode 100644 index 860eaeb8f0..0000000000 --- a/keyboards/kingly_keys/little_foot/little_foot.h +++ /dev/null @@ -1,35 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_split_space_base( \ - k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, \ - k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, \ - k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, \ - k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, \ - k42, k46, k47, k49 \ -) \ -{ \ - { k01, k02, k03, k04, k05, k06, k07, k08, k09, k010 }, \ - { k11, k12, k13, k14, k15, k16, k17, k18, k19, k110 }, \ - { k21, k22, k23, k24, k25, k26, k27, k28, k29, k210 }, \ - { k31, k32, k33, k34, k35, k36, k37, k38, k39, k310 }, \ - { XXX, k42, XXX, XXX, XXX, k46, k47, XXX, k49, XXX } \ -} - -#define LAYOUT_big_space_base( \ - k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, \ - k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, \ - k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, \ - k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, \ - k46 \ -) \ -{ \ - { k01, k02, k03, k04, k05, k06, k07, k08, k09, k010 }, \ - { k11, k12, k13, k14, k15, k16, k17, k18, k19, k110 }, \ - { k21, k22, k23, k24, k25, k26, k27, k28, k29, k210 }, \ - { k31, k32, k33, k34, k35, k36, k37, k38, k39, k310 }, \ - { XXX, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX } \ -} diff --git a/keyboards/kingly_keys/romac/config.h b/keyboards/kingly_keys/romac/config.h index e81c5f4913..0f5a7a6d7f 100644 --- a/keyboards/kingly_keys/romac/config.h +++ b/keyboards/kingly_keys/romac/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F7, B1, B3 } - -/* 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 diff --git a/keyboards/kingly_keys/romac/info.json b/keyboards/kingly_keys/romac/info.json index 1f8b3f4871..236cc335a2 100644 --- a/keyboards/kingly_keys/romac/info.json +++ b/keyboards/kingly_keys/romac/info.json @@ -8,11 +8,32 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "B1", "B3"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3} + ] } } } diff --git a/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h b/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h index 41bba326c4..c2bd34ed27 100644 --- a/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h +++ b/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h @@ -1,8 +1,7 @@ #undef RGBLED_NUM #define RGBLED_NUM 16 -#define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN +#define WS2812_DI_PIN F4 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 @@ -16,4 +15,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/kingly_keys/romac/romac.c b/keyboards/kingly_keys/romac/romac.c deleted file mode 100644 index 24f4c16333..0000000000 --- a/keyboards/kingly_keys/romac/romac.c +++ /dev/null @@ -1 +0,0 @@ -#include "romac.h" diff --git a/keyboards/kingly_keys/romac/romac.h b/keyboards/kingly_keys/romac/romac.h deleted file mode 100644 index e6fb9694d2..0000000000 --- a/keyboards/kingly_keys/romac/romac.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, \ - K10, K11, K12, \ - K20, K21, K22, \ - K30, K31, K32 \ -) \ -{ \ - { K00, K01, K02 }, \ - { K10, K11, K12 }, \ - { K20, K21, K22 }, \ - { K30, K31, K32 } \ -} diff --git a/keyboards/kingly_keys/romac_plus/config.h b/keyboards/kingly_keys/romac_plus/config.h index 8392caa689..2d715dbe51 100644 --- a/keyboards/kingly_keys/romac_plus/config.h +++ b/keyboards/kingly_keys/romac_plus/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { C6, D4, D2, D3 } -#define MATRIX_COL_PINS { F6, F5, F4 } - -/* 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 @@ -15,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN F7 #define RGBLED_NUM 4 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kingly_keys/romac_plus/info.json b/keyboards/kingly_keys/romac_plus/info.json index a93fa6496b..96c097db5f 100644 --- a/keyboards/kingly_keys/romac_plus/info.json +++ b/keyboards/kingly_keys/romac_plus/info.json @@ -8,16 +8,40 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4"], + "rows": ["C6", "D4", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B3", "pin_b": "B2"} ] }, + "ws2812": { + "pin": "F7" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3} + ] } } } diff --git a/keyboards/kingly_keys/romac_plus/romac_plus.c b/keyboards/kingly_keys/romac_plus/romac_plus.c deleted file mode 100644 index 1e95f36c78..0000000000 --- a/keyboards/kingly_keys/romac_plus/romac_plus.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "romac_plus.h" -
\ No newline at end of file diff --git a/keyboards/kingly_keys/romac_plus/romac_plus.h b/keyboards/kingly_keys/romac_plus/romac_plus.h deleted file mode 100644 index e6fb9694d2..0000000000 --- a/keyboards/kingly_keys/romac_plus/romac_plus.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, \ - K10, K11, K12, \ - K20, K21, K22, \ - K30, K31, K32 \ -) \ -{ \ - { K00, K01, K02 }, \ - { K10, K11, K12 }, \ - { K20, K21, K22 }, \ - { K30, K31, K32 } \ -} diff --git a/keyboards/kingly_keys/ropro/config.h b/keyboards/kingly_keys/ropro/config.h index d1e5d91340..3dba502238 100644 --- a/keyboards/kingly_keys/ropro/config.h +++ b/keyboards/kingly_keys/ropro/config.h @@ -16,22 +16,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>.#pragma once */ - /* key matrix pins */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, F1, NO_PIN } -#define MATRIX_COL_PINS { F0, D1, D0, D4, C6, D7, E6, B4, B5, B3, B2, B6, D2, C7 } - - /* 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 /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED --- DIN Pin Routed to VIA on main PCB marked "RGB" */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 18 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kingly_keys/ropro/info.json b/keyboards/kingly_keys/ropro/info.json index b2d3cf21e5..ad77ae5608 100644 --- a/keyboards/kingly_keys/ropro/info.json +++ b/keyboards/kingly_keys/ropro/info.json @@ -8,16 +8,106 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B3", "B2", "B6", "D2", "C7"], + "rows": ["F4", "F5", "F6", "F7", "B1", "F1", null] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B7", "pin_b": "D5"} ] }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"Esc", "x":1, "y":1}, {"label":"1", "x":2, "y":1}, {"label":"2", "x":3, "y":1}, {"label":"3", "x":4, "y":1}, {"label":"4", "x":5, "y":1}, {"label":"5", "x":6, "y":1}, {"label":"6;", "x":7, "y":1}, {"label":"7", "x":8, "y":1}, {"label":"8", "x":9, "y":1}, {"label":"9", "x":10, "y":1}, {"label":"0", "x":11, "y":1}, {"label":"-", "x":12, "y":1}, {"label":"CAPS", "x":0, "y":2}, {"label":"Tab", "x":1, "y":2}, {"label":"Q", "x":2, "y":2}, {"label":"W", "x":3, "y":2}, {"label":"E", "x":4, "y":2}, {"label":"R", "x":5, "y":2}, {"label":"T", "x":6, "y":2}, {"label":"Y", "x":7, "y":2}, {"label":"U", "x":8, "y":2}, {"label":"I", "x":9, "y":2}, {"label":"O", "x":10, "y":2}, {"label":"P", "x":11, "y":2}, {"label":"Bksp", "x":12, "y":2}, {"label":"PgUp", "x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"A", "x":2, "y":3}, {"label":"S", "x":3, "y":3}, {"label":"D", "x":4, "y":3}, {"label":"F", "x":5, "y":3}, {"label":"G", "x":6, "y":3}, {"label":"H;", "x":7, "y":3}, {"label":"J", "x":8, "y":3}, {"label":"K", "x":9, "y":3}, {"label":"L", "x":10, "y":3}, {"label":";", "x":11, "y":3}, {"label":"'", "x":12, "y":3}, {"label":"Home", "x":0, "y":4}, {"label":"Shift", "x":1, "y":4}, {"label":"Z", "x":2, "y":4}, {"label":"X", "x":3, "y":4}, {"label":"C", "x":4, "y":4}, {"label":"V", "x":5, "y":4}, {"label":"B", "x":6, "y":4}, {"label":"N", "x":7, "y":4}, {"label":"M", "x":8, "y":4}, {"label":",", "x":9, "y":4}, {"label":".", "x":10, "y":4}, {"label":"/", "x":11, "y":4}, {"label":"Enter", "x":12, "y":4}, {"label":"PgDn", "x":0, "y":5}, {"label":"Del", "x":1, "y":5}, {"label":"Ctrl", "x":2, "y":5}, {"label":"GUI", "x":3, "y":5}, {"label":"Alt", "x":4, "y":5}, {"label":"Lower", "x":5, "y":5}, {"x":6, "y":5}, {"x":7, "y":5}, {"label":"End", "x":8, "y":5}, {"label":"Left", "x":9, "y":5}, {"label":"Down", "x":10, "y":5}, {"label":"Up", "x":11, "y":5}, {"label":"Right", "x":12, "y":5}] + "layout": [ + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + + {"matrix": [2, 13], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5}, + {"matrix": [5, 1], "x": 1, "y": 5}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 3], "x": 3, "y": 5}, + {"matrix": [5, 4], "x": 4, "y": 5}, + {"matrix": [5, 5], "x": 5, "y": 5}, + {"matrix": [5, 6], "x": 6, "y": 5}, + {"matrix": [5, 7], "x": 7, "y": 5}, + {"matrix": [5, 8], "x": 8, "y": 5}, + {"matrix": [5, 9], "x": 9, "y": 5}, + {"matrix": [5, 10], "x": 10, "y": 5}, + {"matrix": [5, 11], "x": 11, "y": 5}, + {"matrix": [5, 12], "x": 12, "y": 5} + ] } } } diff --git a/keyboards/kingly_keys/ropro/ropro.c b/keyboards/kingly_keys/ropro/ropro.c deleted file mode 100644 index ccb1ed0dff..0000000000 --- a/keyboards/kingly_keys/ropro/ropro.c +++ /dev/null @@ -1 +0,0 @@ -#include "ropro.h" diff --git a/keyboards/kingly_keys/ropro/ropro.h b/keyboards/kingly_keys/ropro/ropro.h deleted file mode 100644 index cb635cff39..0000000000 --- a/keyboards/kingly_keys/ropro/ropro.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2019 Garret G. (TheRoyalSweatshirt) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - * Note: Matrix is a little wacky with the rotary encoder click mapping being - * on the opposite side of the board. Remember to pay attention to - * the 13th column where the lone key mapped for rotary encoder click (K132). -*/ - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K10, K20, K30, K40, K50, K60, K70, K80, K90, K100, K110, K120, \ - K11, K21, K31, K41, K51, K61, K71, K81, K91, K101, K111, K121, \ - K132, K12, K22, K32, K42, K52, K62, K72, K82, K92, K102, K112, K122, \ - K03, K13, K23, K33, K43, K53, K63, K73, K83, K93, K103, K113, K123, \ - K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, K104, K114, K124, \ - K05, K15, K25, K35, K45, K55, K65, K75, K85, K95, K105, K115, K125 \ -) { \ - { KC_NO, K10, K20, K30, K40, K50, K60, K70, K80, K90, K100, K110, K120, KC_NO }, \ - { KC_NO, K11, K21, K31, K41, K51, K61, K71, K81, K91, K101, K111, K121, KC_NO }, \ - { KC_NO, K12, K22, K32, K42, K52, K62, K72, K82, K92, K102, K112, K122, K132 }, \ - { K03, K13, K23, K33, K43, K53, K63, K73, K83, K93, K103, K113, K123, KC_NO }, \ - { K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, K104, K114, K124, KC_NO }, \ - { K05, K15, K25, K35, K45, K55, K65, K75, K85, K95, K105, K115, K125, KC_NO } \ -} diff --git a/keyboards/kingly_keys/smd_milk/config.h b/keyboards/kingly_keys/smd_milk/config.h index 2b4eecd70c..3982ef54e6 100644 --- a/keyboards/kingly_keys/smd_milk/config.h +++ b/keyboards/kingly_keys/smd_milk/config.h @@ -15,13 +15,6 @@ */ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { C5, D2 } -#define MATRIX_COL_PINS { D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - #define FORCE_NKRO /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ @@ -31,7 +24,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN B3 #define RGBLED_NUM 4 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kingly_keys/smd_milk/info.json b/keyboards/kingly_keys/smd_milk/info.json index f6bbca9289..2fee4b2603 100644 --- a/keyboards/kingly_keys/smd_milk/info.json +++ b/keyboards/kingly_keys/smd_milk/info.json @@ -8,11 +8,22 @@ "pid": "0xB195", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B3" + }, + "matrix_pins": { + "cols": ["D3"], + "rows": ["C5", "D2"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [ {"x": 0, "y": 0 }, {"x": 0, "y": 1 }] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1} + ] } } } diff --git a/keyboards/kingly_keys/smd_milk/smd_milk.c b/keyboards/kingly_keys/smd_milk/smd_milk.c deleted file mode 100644 index 95fa50e029..0000000000 --- a/keyboards/kingly_keys/smd_milk/smd_milk.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Sebastian Williams - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -#include "smd_milk.h" diff --git a/keyboards/kingly_keys/smd_milk/smd_milk.h b/keyboards/kingly_keys/smd_milk/smd_milk.h deleted file mode 100644 index 8f294817f9..0000000000 --- a/keyboards/kingly_keys/smd_milk/smd_milk.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2019 Sebastian Williams - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, \ - K01 \ -) { \ - { K00 }, \ - { K01 } \ -} diff --git a/keyboards/kingly_keys/soap/config.h b/keyboards/kingly_keys/soap/config.h index 3127ee9411..682f1a7531 100644 --- a/keyboards/kingly_keys/soap/config.h +++ b/keyboards/kingly_keys/soap/config.h @@ -14,21 +14,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>.#pragma once */ - /* key matrix pins */ -#define MATRIX_ROW_PINS { C7, C6 } -#define MATRIX_COL_PINS { F4, F1, F0, D5 } - - /* 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 /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED --- DIN Pin Routed to VIA on main PCB marked "RGB" */ -#define RGB_DI_PIN B6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kingly_keys/soap/info.json b/keyboards/kingly_keys/soap/info.json index b910faac32..b10260aa0b 100644 --- a/keyboards/kingly_keys/soap/info.json +++ b/keyboards/kingly_keys/soap/info.json @@ -8,6 +8,14 @@ "pid": "0x0003", "device_version": "0.0.4" }, + "ws2812": { + "pin": "B6" + }, + "matrix_pins": { + "cols": ["F4", "F1", "F0", "D5"], + "rows": ["C7", "C6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D6", "pin_b": "D7"} @@ -17,7 +25,17 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":4, "y":0}, {"label":"K10", "x":0, "y":1}, {"label":"K11", "x":1, "y":1}, {"label":"K12", "x":2, "y":1}, {"label":"K13", "x":4, "y":1}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 4, "y": 1} + ] } } } diff --git a/keyboards/kingly_keys/soap/soap.c b/keyboards/kingly_keys/soap/soap.c deleted file mode 100644 index a467c54b74..0000000000 --- a/keyboards/kingly_keys/soap/soap.c +++ /dev/null @@ -1 +0,0 @@ -#include "soap.h" diff --git a/keyboards/kingly_keys/soap/soap.h b/keyboards/kingly_keys/soap/soap.h deleted file mode 100644 index 8d5eba3ad2..0000000000 --- a/keyboards/kingly_keys/soap/soap.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2019 Garret G. (TheRoyalSweatshirt) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - * Note: Matrix is a little wacky with the rotary encoder click mapping being - * on the opposite side of the board. Remember to pay attention to - * the 13th column where the lone key mapped for rotary encoder click (K132). -*/ - -#pragma once - -#include "quantum.h" - - -#define LAYOUT( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 } \ -} |