diff options
Diffstat (limited to 'keyboards/kingly_keys')
25 files changed, 310 insertions, 436 deletions
diff --git a/keyboards/kingly_keys/ave/config.h b/keyboards/kingly_keys/ave/config.h index fadfdae715..22a7e65e04 100644 --- a/keyboards/kingly_keys/ave/config.h +++ b/keyboards/kingly_keys/ave/config.h @@ -17,12 +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 diff --git a/keyboards/kingly_keys/ave/ortho/info.json b/keyboards/kingly_keys/ave/ortho/info.json index cdd3f41835..6950a84a44 100644 --- a/keyboards/kingly_keys/ave/ortho/info.json +++ b/keyboards/kingly_keys/ave/ortho/info.json @@ -8,6 +8,11 @@ "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"} @@ -18,176 +23,188 @@ "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..4b2c92fd86 100644 --- a/keyboards/kingly_keys/ave/staggered/info.json +++ b/keyboards/kingly_keys/ave/staggered/info.json @@ -8,6 +8,11 @@ "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"} @@ -18,110 +23,110 @@ "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..dea4456dd4 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 */ diff --git a/keyboards/kingly_keys/little_foot/info.json b/keyboards/kingly_keys/little_foot/info.json index e306ed38a2..d2206c066c 100644 --- a/keyboards/kingly_keys/little_foot/info.json +++ b/keyboards/kingly_keys/little_foot/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "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": { 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/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..668b4d2f0b 100644 --- a/keyboards/kingly_keys/romac/info.json +++ b/keyboards/kingly_keys/romac/info.json @@ -8,6 +8,11 @@ "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": { diff --git a/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h b/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h index 41bba326c4..a8da1ae072 100644 --- a/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h +++ b/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h @@ -2,7 +2,6 @@ #define RGBLED_NUM 16 #define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN #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_plus/config.h b/keyboards/kingly_keys/romac_plus/config.h index 8392caa689..21095a7358 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 diff --git a/keyboards/kingly_keys/romac_plus/info.json b/keyboards/kingly_keys/romac_plus/info.json index a93fa6496b..5976a3ff86 100644 --- a/keyboards/kingly_keys/romac_plus/info.json +++ b/keyboards/kingly_keys/romac_plus/info.json @@ -8,6 +8,11 @@ "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"} 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/ropro/config.h b/keyboards/kingly_keys/ropro/config.h index d1e5d91340..67ac57d54c 100644 --- a/keyboards/kingly_keys/ropro/config.h +++ b/keyboards/kingly_keys/ropro/config.h @@ -16,13 +16,6 @@ * 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 diff --git a/keyboards/kingly_keys/ropro/info.json b/keyboards/kingly_keys/ropro/info.json index b2d3cf21e5..2afcd7dc59 100644 --- a/keyboards/kingly_keys/ropro/info.json +++ b/keyboards/kingly_keys/ropro/info.json @@ -8,6 +8,11 @@ "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"} 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/smd_milk/config.h b/keyboards/kingly_keys/smd_milk/config.h index 2b4eecd70c..ada89746af 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 */ diff --git a/keyboards/kingly_keys/smd_milk/info.json b/keyboards/kingly_keys/smd_milk/info.json index f6bbca9289..8aa1f12dbf 100644 --- a/keyboards/kingly_keys/smd_milk/info.json +++ b/keyboards/kingly_keys/smd_milk/info.json @@ -8,6 +8,11 @@ "pid": "0xB195", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3"], + "rows": ["C5", "D2"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { 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/soap/config.h b/keyboards/kingly_keys/soap/config.h index 3127ee9411..ef8911b082 100644 --- a/keyboards/kingly_keys/soap/config.h +++ b/keyboards/kingly_keys/soap/config.h @@ -14,13 +14,6 @@ * 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 diff --git a/keyboards/kingly_keys/soap/info.json b/keyboards/kingly_keys/soap/info.json index b910faac32..16f229f043 100644 --- a/keyboards/kingly_keys/soap/info.json +++ b/keyboards/kingly_keys/soap/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.4" }, + "matrix_pins": { + "cols": ["F4", "F1", "F0", "D5"], + "rows": ["C7", "C6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D6", "pin_b": "D7"} 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" |