diff --git a/keyboards/keebfront/vanguard65/info.json b/keyboards/keebfront/vanguard65/info.json index cabcc24c3e8..5bedd469ab0 100644 --- a/keyboards/keebfront/vanguard65/info.json +++ b/keyboards/keebfront/vanguard65/info.json @@ -10,82 +10,108 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "matrix_pins": { + "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"], + "rows": ["F4", "F1", "F7", "F6", "F5"] + }, + "encoder": { + "enabled": true, + "rotary": [ + { + "pin_a": "E6", + "pin_b": "D4" + } + ] + }, + "rgblight": { + "led_count": 36, + "pin": "C7" + "val_step": 12, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + } + }, "layouts": { "LAYOUT": { "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": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 0}, - - {"x": 0, "y": 1, "w": 1.5}, - {"x": 1.5, "y": 1}, - {"x": 2.5, "y": 1}, - {"x": 3.5, "y": 1}, - {"x": 4.5, "y": 1}, - {"x": 5.5, "y": 1}, - {"x": 6.5, "y": 1}, - {"x": 7.5, "y": 1}, - {"x": 8.5, "y": 1}, - {"x": 9.5, "y": 1}, - {"x": 10.5, "y": 1}, - {"x": 11.5, "y": 1}, - {"x": 12.5, "y": 1}, - {"x": 13.5, "y": 1, "w": 1.5}, - {"x": 15, "y": 1}, - - {"x": 0, "y": 2, "w": 1.75}, - {"x": 1.75, "y": 2}, - {"x": 2.75, "y": 2}, - {"x": 3.75, "y": 2}, - {"x": 4.75, "y": 2}, - {"x": 5.75, "y": 2}, - {"x": 6.75, "y": 2}, - {"x": 7.75, "y": 2}, - {"x": 8.75, "y": 2}, - {"x": 9.75, "y": 2}, - {"x": 10.75, "y": 2}, - {"x": 11.75, "y": 2}, - {"x": 12.75, "y": 2, "w": 2.25}, - {"x": 15, "y": 2}, - - {"x": 0, "y": 3, "w": 1.25}, - {"x": 1.25, "y": 3}, - {"x": 2.25, "y": 3}, - {"x": 3.25, "y": 3}, - {"x": 4.25, "y": 3}, - {"x": 5.25, "y": 3}, - {"x": 6.25, "y": 3}, - {"x": 7.25, "y": 3}, - {"x": 8.25, "y": 3}, - {"x": 9.25, "y": 3}, - {"x": 10.25, "y": 3}, - {"x": 11.25, "y": 3}, - {"x": 12.25, "y": 3, "w": 1.75}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, - - {"x": 0, "y": 4, "w": 1.25}, - {"x": 1.25, "y": 4, "w": 1.25}, - {"x": 2.5, "y": 4, "w": 1.25}, - {"x": 3.75, "y": 4, "w": 6.25}, - {"x": 10, "y": 4, "w": 1.25}, - {"x": 11.25, "y": 4, "w": 1.25}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, - {"x": 15, "y": 4} + { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, + { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, + { "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, + { "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, + { "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, + { "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, + { "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, + { "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, + { "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, + { "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, + { "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, + { "label": "K0B", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, + { "label": "K0C", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, + { "label": "K0D", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 }, + { "label": "K0E", "matrix": [0, 14], "w": 1, "x": 14, "y": 0 }, + { "label": "K10", "matrix": [1, 0], "w": 1, "x": 15, "y": 0 }, + { "label": "K11", "matrix": [1, 1], "w": 1.5, "x": 0, "y": 1 }, + { "label": "K12", "matrix": [1, 2], "w": 1, "x": 1.5, "y": 1 }, + { "label": "K13", "matrix": [1, 3], "w": 1, "x": 2.5, "y": 1 }, + { "label": "K14", "matrix": [1, 4], "w": 1, "x": 3.5, "y": 1 }, + { "label": "K15", "matrix": [1, 5], "w": 1, "x": 4.5, "y": 1 }, + { "label": "K16", "matrix": [1, 6], "w": 1, "x": 5.5, "y": 1 }, + { "label": "K17", "matrix": [1, 7], "w": 1, "x": 6.5, "y": 1 }, + { "label": "K18", "matrix": [1, 8], "w": 1, "x": 7.5, "y": 1 }, + { "label": "K19", "matrix": [1, 9], "w": 1, "x": 8.5, "y": 1 }, + { "label": "K1A", "matrix": [1, 10], "w": 1, "x": 9.5, "y": 1 }, + { "label": "K1B", "matrix": [1, 11], "w": 1, "x": 10.5, "y": 1 }, + { "label": "K1C", "matrix": [1, 12], "w": 1, "x": 11.5, "y": 1 }, + { "label": "K1D", "matrix": [1, 13], "w": 1, "x": 12.5, "y": 1 }, + { "label": "K1E", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 }, + { "label": "K20", "matrix": [2, 0], "w": 1, "x": 15, "y": 1 }, + { "label": "K21", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 2 }, + { "label": "K22", "matrix": [2, 2], "w": 1, "x": 1.75, "y": 2 }, + { "label": "K23", "matrix": [2, 3], "w": 1, "x": 2.75, "y": 2 }, + { "label": "K24", "matrix": [2, 4], "w": 1, "x": 3.75, "y": 2 }, + { "label": "K25", "matrix": [2, 5], "w": 1, "x": 4.75, "y": 2 }, + { "label": "K26", "matrix": [2, 6], "w": 1, "x": 5.75, "y": 2 }, + { "label": "K27", "matrix": [2, 7], "w": 1, "x": 6.75, "y": 2 }, + { "label": "K28", "matrix": [2, 8], "w": 1, "x": 7.75, "y": 2 }, + { "label": "K29", "matrix": [2, 9], "w": 1, "x": 8.75, "y": 2 }, + { "label": "K2A", "matrix": [2, 10], "w": 1, "x": 9.75, "y": 2 }, + { "label": "K2B", "matrix": [2, 11], "w": 1, "x": 10.75, "y": 2 }, + { "label": "K2C", "matrix": [2, 12], "w": 1, "x": 11.75, "y": 2 }, + { "label": "K2D", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, + { "label": "K2E", "matrix": [2, 14], "w": 1, "x": 15, "y": 2 }, + { "label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, + { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 }, + { "label": "K32", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, + { "label": "K33", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, + { "label": "K34", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, + { "label": "K35", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, + { "label": "K36", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, + { "label": "K37", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, + { "label": "K38", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 }, + { "label": "K39", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 }, + { "label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 }, + { "label": "K3B", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 }, + { "label": "K3C", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 }, + { "label": "K3D", "matrix": [3, 13], "w": 1, "x": 14, "y": 3 }, + { "label": "K3E", "matrix": [3, 14], "w": 1, "x": 15, "y": 3 }, + { "label": "K40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, + { "label": "K41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, + { "label": "K42", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, + { "label": "K46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 }, + { "label": "K4A", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 }, + { "label": "K4B", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 }, + { "label": "K4C", "matrix": [4, 12], "w": 1, "x": 13, "y": 4 }, + { "label": "K4D", "matrix": [4, 13], "w": 1, "x": 14, "y": 4 }, + { "label": "K4E", "matrix": [4, 14], "w": 1, "x": 15, "y": 4 } ] } } diff --git a/keyboards/keebfront/vanguard65/vanguard65.c b/keyboards/keebfront/vanguard65/vanguard65.c index 1736421dd22..4767d0c30bd 100644 --- a/keyboards/keebfront/vanguard65/vanguard65.c +++ b/keyboards/keebfront/vanguard65/vanguard65.c @@ -11,16 +11,18 @@ 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 . */ -#include "vanguard65.h" +#include "quantum.h" -#ifdef ENCODER_ENABLE +#if defined(ENCODER_ENABLE) && !defined(ENCODER_MAP_ENABLE) bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - return true; + if (!encoder_update_user(index, clockwise)) { return false; } + if (index == 0) { + if (clockwise) { + tap_code_delay(KC_VOLU, 10); + } else { + tap_code_delay(KC_VOLD, 10); + } + } + return true; } -#endif \ No newline at end of file +#endif