Merge branch 'halcyon' into halcyon-elora-rev2

This commit is contained in:
VeyPatch 2024-11-07 17:32:13 +01:00
commit 608f4a92e5
8 changed files with 59 additions and 140 deletions

View file

@ -248,7 +248,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
tap_code(KC_VOLD);
}
} else if (index == 1) {
// Page up/Page down
// Volume control
if (clockwise) {
tap_code(KC_VOLU);
} else {

View file

@ -20,60 +20,5 @@
[{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"} ,{"ccw": "KC_PGUP", "cw": "KC_PGDN"}],
[{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"} ,{"ccw": "KC_PGUP", "cw": "KC_PGDN"}],
[{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"} ,{"ccw": "KC_PGUP", "cw": "KC_PGDN"}]
],
"config": {
"rgb_matrix": {
"animations": {
"solid_color": true,
"alphas_mods": true,
"gradient_up_down": true,
"gradient_left_right": true,
"breathing": true,
"band_sat": true,
"band_val": true,
"band_pinwheel_sat": true,
"band_pinwheel_val": true,
"band_spiral_sat": true,
"band_spiral_val": true,
"cycle_all": true,
"cycle_left_right": true,
"cycle_up_down": true,
"cycle_out_in": true,
"cycle_out_in_dual": true,
"rainbow_moving_chevron": true,
"cycle_pinwheel": true,
"cycle_spiral": true,
"dual_beacon": true,
"rainbow_beacon": true,
"rainbow_pinwheels": true,
"flower_blooming": true,
"raindrops": true,
"jellybean_raindrops": true,
"hue_breathing": true,
"hue_pendulum": true,
"hue_wave": true,
"pixel_fractal": true,
"pixel_flow": true,
"pixel_rain": true,
"typing_heatmap": true,
"digital_rain": true,
"solid_reactive_simple": true,
"solid_reactive": true,
"solid_reactive_wide": true,
"solid_reactive_multiwide": true,
"solid_reactive_cross": true,
"solid_reactive_multicross": true,
"solid_reactive_nexus": true,
"solid_reactive_multinexus": true,
"splash": true,
"multisplash": true,
"solid_splash": true,
"solid_multisplash": true,
"starlight": true,
"starlight_dual_hue": true,
"starlight_dual_sat": true,
"riverflow": true
}
}
}
]
}

View file

@ -20,37 +20,37 @@
]
],
"keymap": [
[{"y":0.25,"x":3},"0,3",{"x":9},"5,3"],
[{"y":-0.75,"x":2},"0,4",{"x":1},"0,2",{"x":7},"5,2",{"x":1},"5,4"],
[{"y":-0.875,"x":5},"0,1",{"x":5},"5,1"],
[{"y":-0.625},"0,6","0,5",{"x":13},"5,5","5,6"],
[{"y":-0.75,"x":3},"1,3",{"x":9},"6,3"],
[{"y":-0.75,"x":2},"1,4",{"x":1},"1,2",{"x":7},"6,2",{"x":1},"6,4"],
[{"y":-0.875,"x":5},"1,1",{"x":5},"6,1"],
[{"y":-0.625},"1,6","1,5",{"x":13},"6,5","6,6"],
[{"y":-0.75,"x":3},"2,3",{"x":9},"7,3"],
[{"y":-0.75,"x":2},"2,4",{"x":1},"2,2",{"x":7},"7,2",{"x":1},"7,4"],
[{"y":-0.875,"x":5},"2,1",{"x":5},"7,1"],
[{"y":-0.625},"2,6","2,5",{"x":13},"7,5","7,6"],
[{"y":-0.5,"x":2.5},"3,4",{"x":10},"8,4"],
[{"y":1.5,"x":1,"d":true},"4,2\n\n\n1,0",{"x":2,"d":true},"0,0\n\n\n0,0\n\n\n\n\n\ne",{"d":true},"0,1\n\n\n0,0\n\n\n\n\n\ne",{"x":5.25,"d":true},"2,0\n\n\n2,0\n\n\n\n\n\ne",{"d":true},"2,1\n\n\n2,0\n\n\n\n\n\ne",{"x":1.75,"d":true},"9,2\n\n\n3,0"],
[{"d":true},"4,1\n\n\n1,0",{"x":-1,"d":true},"1,0\n\n\n1,0\n\n\n\n\n\ne",{"d":true},"4,0\n\n\n1,0",{"d":true},"4,3\n\n\n1,0",{"x":-1,"d":true},"1,1\n\n\n1,0\n\n\n\n\n\ne",{"x":1},"0,0\n\n\n0,1\n\n\n\n\n\ne","0,1\n\n\n0,1\n\n\n\n\n\ne",{"x":5.25},"2,0\n\n\n2,1\n\n\n\n\n\ne","2,1\n\n\n2,1\n\n\n\n\n\ne",{"x":0.75,"d":true},"9,1\n\n\n3,0",{"x":-1,"d":true},"3,0\n\n\n3,0\n\n\n\n\n\ne",{"d":true},"9,0\n\n\n3,0",{"d":true},"9,3\n\n\n3,0",{"x":-1,"d":true},"3,1\n\n\n3,0\n\n\n\n\n\ne"],
[{"x":1,"d":true},"4,4\n\n\n1,0",{"x":13,"d":true},"9,4\n\n\n3,0"],
[{"y":0.5,"x":1,"d":true},"4,2\n\n\n1,1",{"x":13,"d":true},"9,2\n\n\n3,1"],
["1,0\n\n\n1,1\n\n\n\n\n\ne",{"x":-1,"d":true},"4,1\n\n\n1,1","4,0\n\n\n1,1","1,1\n\n\n1,1\n\n\n\n\n\ne",{"x":-1,"d":true},"4,3\n\n\n1,1",{"x":11},"3,0\n\n\n3,1\n\n\n\n\n\ne",{"x":-1,"d":true},"9,1\n\n\n3,1","9,0\n\n\n3,1",{"d":true},"9,3\n\n\n3,1",{"x":-1},"3,1\n\n\n3,1\n\n\n\n\n\ne"],
[{"x":1,"d":true},"4,4\n\n\n1,1",{"x":13,"d":true},"9,4\n\n\n3,1"],
[{"rx":4,"ry":8.175,"y":-4.675,"x":-0.5},"3,2"],
[{"rx":13,"y":-4.675,"x":-0.5},"8,2"],
[{"r":15,"rx":4,"y":-4.675,"x":-0.5},"3,1"],
[{"r":30,"y":-2,"x":-0.5},"3,3"],
[{"x":-0.5},"3,5"],
[{"r":45,"y":-2,"x":-0.5},"2,0"],
[{"x":-0.5},"3,0"],
[{"r":-45,"rx":13,"y":-5.675,"x":-0.5},"7,0"],
[{"x":-0.5},"8,0"],
[{"r":-30,"y":-2,"x":-0.5},"8,3"],
[{"x":-0.5},"8,5"],
[{"r":-15,"y":-1,"x":-0.5},"8,1"]
[{"y":0.25,"x":3},"0,3",{"x":9},"5,3"],
[{"y":-0.75,"x":2},"0,4",{"x":1},"0,2",{"x":7},"5,2",{"x":1},"5,4"],
[{"y":-0.875,"x":5},"0,1",{"x":5},"5,1"],
[{"y":-0.625},"0,6","0,5",{"x":13},"5,5","5,6"],
[{"y":-0.75,"x":3},"1,3",{"x":9},"6,3"],
[{"y":-0.75,"x":2},"1,4",{"x":1},"1,2",{"x":7},"6,2",{"x":1},"6,4"],
[{"y":-0.875,"x":5},"1,1",{"x":5},"6,1"],
[{"y":-0.625},"1,6","1,5",{"x":13},"6,5","6,6"],
[{"y":-0.75,"x":3},"2,3",{"x":9},"7,3"],
[{"y":-0.75,"x":2},"2,4",{"x":1},"2,2",{"x":7},"7,2",{"x":1},"7,4"],
[{"y":-0.875,"x":5},"2,1",{"x":5},"7,1"],
[{"y":-0.625},"2,6","2,5",{"x":13},"7,5","7,6"],
[{"y":-0.5,"x":2.5},"3,4",{"x":10},"8,4"],
[{"rx":4,"ry":8.175,"y":-4.675,"x":-0.5},"3,2"],
[{"rx":10.5,"ry":4.1,"y":2.25,"x":-10.5,"d":true},"1,0\n\n\n1,0\n\n\n\n\n\ne",{"d":true},"4,2\n\n\n1,0",{"d":true},"1,1\n\n\n1,0\n\n\n\n\n\ne",{"x":1,"d":true},"0,0\n\n\n0,0\n\n\n\n\n\ne",{"d":true},"0,1\n\n\n0,0\n\n\n\n\n\ne",{"x":5.25,"d":true},"2,0\n\n\n2,0\n\n\n\n\n\ne",{"d":true},"2,1\n\n\n2,0\n\n\n\n\n\ne",{"x":0.75,"d":true},"3,0\n\n\n3,0\n\n\n\n\n\ne",{"d":true},"9,2\n\n\n3,0",{"d":true},"3,1\n\n\n3,0\n\n\n\n\n\ne"],
[{"x":-10.5,"d":true},"4,1\n\n\n1,0",{"d":true},"4,0\n\n\n1,0",{"d":true},"4,3\n\n\n1,0",{"x":1},"0,0\n\n\n0,1\n\n\n\n\n\ne","0,1\n\n\n0,1\n\n\n\n\n\ne",{"x":5.25},"2,0\n\n\n2,1\n\n\n\n\n\ne","2,1\n\n\n2,1\n\n\n\n\n\ne",{"x":0.75,"d":true},"9,1\n\n\n3,0",{"d":true},"9,0\n\n\n3,0",{"d":true},"9,3\n\n\n3,0"],
[{"x":-9.5,"d":true},"4,4\n\n\n1,0",{"x":13,"d":true},"9,4\n\n\n3,0"],
[{"y":0.5,"x":-10.5},"1,0\n\n\n1,1\n\n\n\n\n\ne",{"d":true},"4,2\n\n\n1,1","1,1\n\n\n1,1\n\n\n\n\n\ne",{"x":11},"3,0\n\n\n3,1\n\n\n\n\n\ne",{"d":true},"9,2\n\n\n3,1","3,1\n\n\n3,1\n\n\n\n\n\ne"],
[{"x":-10.5,"d":true},"4,1\n\n\n1,1","4,0\n\n\n1,1",{"d":true},"4,3\n\n\n1,1",{"x":11,"d":true},"9,1\n\n\n3,1","9,0\n\n\n3,1",{"d":true},"9,3\n\n\n3,1"],
[{"x":-9.5,"d":true},"4,4\n\n\n1,1",{"x":13,"d":true},"9,4\n\n\n3,1"],
[{"rx":13,"ry":8.175,"y":-4.675,"x":-0.5},"8,2"],
[{"r":15,"rx":4,"y":-4.675,"x":-0.5},"3,1"],
[{"r":30,"y":-2,"x":-0.5},"3,3"],
[{"x":-0.5},"3,5"],
[{"r":45,"y":-2,"x":-0.5},"2,0"],
[{"x":-0.5},"3,0"],
[{"r":-45,"rx":13,"y":-5.675,"x":-0.5},"7,0"],
[{"x":-0.5},"8,0"],
[{"r":-30,"y":-2,"x":-0.5},"8,3"],
[{"x":-0.5},"8,5"],
[{"r":-15,"y":-1,"x":-0.5},"8,1"]
]
}
}