diff options
Diffstat (limited to 'keyboards/evolv')
-rw-r--r-- | keyboards/evolv/config.h | 5 | ||||
-rw-r--r-- | keyboards/evolv/evolv.c | 10 | ||||
-rw-r--r-- | keyboards/evolv/info.json | 395 |
3 files changed, 220 insertions, 190 deletions
diff --git a/keyboards/evolv/config.h b/keyboards/evolv/config.h index c76fc98986..62e21e0caa 100644 --- a/keyboards/evolv/config.h +++ b/keyboards/evolv/config.h @@ -17,16 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { A6, A5, A4, A3, A2, A1, A0, C14, F0, C15, B9, B8, B7, B6, B5, B4} -#define MATRIX_ROW_PINS { B10, B11, A7, B0, B1, B2} -#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 -#define RGB_DI_PIN B15 #define RGBLED_NUM 16 #define RGBLIGHT_LIMIT_VAL 200 #define RGBLIGHT_SLEEP diff --git a/keyboards/evolv/evolv.c b/keyboards/evolv/evolv.c index 3f27628946..54f92c9dbc 100644 --- a/keyboards/evolv/evolv.c +++ b/keyboards/evolv/evolv.c @@ -16,13 +16,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "evolv.h" - -#ifndef MEDIA_KEY_DELAY -# define MEDIA_KEY_DELAY 100 -#endif - -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) return false; - tap_code_delay(clockwise ? KC_VOLU : KC_VOLD, MEDIA_KEY_DELAY); - return true; -} diff --git a/keyboards/evolv/info.json b/keyboards/evolv/info.json index 76b428b1cd..097dfb43cb 100644 --- a/keyboards/evolv/info.json +++ b/keyboards/evolv/info.json @@ -8,194 +8,239 @@ "pid": "0x0E75", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A6", "A5", "A4", "A3", "A2", "A1", "A0", "C14", "F0", "C15", "B9", "B8", "B7", "B6", "B5", "B4"], + "rows": ["B10", "B11", "A7", "B0", "B1", "B2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B3", "pin_b": "A15", "resolution": 2} ] }, + "ws2812": { + "pin": "B15" + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { "LAYOUT_evolv_ansi": { "layout": [ - {"label":"Esc", "x":0, "y":0.25}, - {"label":"F1", "x":1.25, "y":0.25}, - {"label":"F2", "x":2.25, "y":0.25}, - {"label":"F3", "x":3.25, "y":0.25}, - {"label":"F4", "x":4.25, "y":0.25}, - {"label":"F5", "x":5.5, "y":0.25}, - {"label":"F6", "x":6.5, "y":0.25}, - {"label":"F7", "x":7.5, "y":0.25}, - {"label":"F8", "x":8.5, "y":0.25}, - {"label":"F9", "x":9.75, "y":0.25}, - {"label":"F10", "x":10.75, "y":0.25}, - {"label":"F11", "x":11.75, "y":0.25}, - {"label":"F12", "x":12.75, "y":0.25}, - {"label":"F13", "x":14, "y":0.25}, - {"label":"~", "x":0, "y":1.5}, - {"label":"!", "x":1, "y":1.5}, - {"label":"@", "x":2, "y":1.5}, - {"label":"#", "x":3, "y":1.5}, - {"label":"$", "x":4, "y":1.5}, - {"label":"%", "x":5, "y":1.5}, - {"label":"^", "x":6, "y":1.5}, - {"label":"&", "x":7, "y":1.5}, - {"label":"*", "x":8, "y":1.5}, - {"label":"(", "x":9, "y":1.5}, - {"label":")", "x":10, "y":1.5}, - {"label":"_", "x":11, "y":1.5}, - {"label":"+", "x":12, "y":1.5}, - {"label":"LBksp", "x":13, "y":1.5}, - {"label":"RBksp", "x":14, "y":1.5}, - {"label":"Del", "x":15.25, "y":1.5}, - {"label":"VolUp", "x":17.75, "y":1.5}, - {"label":"Tab", "x":0, "y":2.5, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.5}, - {"label":"W", "x":2.5, "y":2.5}, - {"label":"E", "x":3.5, "y":2.5}, - {"label":"R", "x":4.5, "y":2.5}, - {"label":"T", "x":5.5, "y":2.5}, - {"label":"Y", "x":6.5, "y":2.5}, - {"label":"U", "x":7.5, "y":2.5}, - {"label":"I", "x":8.5, "y":2.5}, - {"label":"O", "x":9.5, "y":2.5}, - {"label":"P", "x":10.5, "y":2.5}, - {"label":"{", "x":11.5, "y":2.5}, - {"label":"}", "x":12.5, "y":2.5}, - {"label":"|", "x":13.5, "y":2.5, "w":1.5}, - {"label":"Page Up", "x":15.25, "y":2.5}, - {"label":"Prev", "x":16.75, "y":2.5}, - {"label":"Play", "x":17.75, "y":2.5}, - {"label":"Next", "x":18.75, "y":2.5}, - {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, - {"label":"A", "x":1.75, "y":3.5}, - {"label":"S", "x":2.75, "y":3.5}, - {"label":"D", "x":3.75, "y":3.5}, - {"label":"F", "x":4.75, "y":3.5}, - {"label":"G", "x":5.75, "y":3.5}, - {"label":"H", "x":6.75, "y":3.5}, - {"label":"J", "x":7.75, "y":3.5}, - {"label":"K", "x":8.75, "y":3.5}, - {"label":"L", "x":9.75, "y":3.5}, - {"label":":", "x":10.75, "y":3.5}, - {"label":"\"", "x":11.75, "y":3.5}, - {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, - {"label":"Page Down", "x":15.25, "y":3.5}, - {"label":"VolDn", "x":17.75, "y":3.5}, - {"label":"Shift", "x":0, "y":4.5, "w":2.25}, - {"label":"Z", "x":2.25, "y":4.5}, - {"label":"X", "x":3.25, "y":4.5}, - {"label":"C", "x":4.25, "y":4.5}, - {"label":"V", "x":5.25, "y":4.5}, - {"label":"B", "x":6.25, "y":4.5}, - {"label":"N", "x":7.25, "y":4.5}, - {"label":"M", "x":8.25, "y":4.5}, - {"label":"<", "x":9.25, "y":4.5}, - {"label":">", "x":10.25, "y":4.5}, - {"label":"?", "x":11.25, "y":4.5}, - {"label":"Shift", "x":12.25, "y":4.5, "w":1.5}, - {"label":"\u2191", "x":14, "y":4.75}, - {"label":"Fn", "x":15.25, "y":4.5}, - {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, - {"label":"Win", "x":1.5, "y":5.5}, - {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, - {"x":4, "y":5.5, "w":6.25}, - {"label":"Win", "x":10.25, "y":5.5, "w":1.25}, - {"label":"Alt", "x":11.5, "y":5.5, "w":1.25}, - {"label":"\u2190", "x":13, "y":5.75}, - {"label":"\u2193", "x":14, "y":5.75}, - {"label":"\u2192", "x":15, "y":5.75}] + {"x":0, "y":0}, + + {"x":1.25, "y":0}, + {"x":2.25, "y":0}, + {"x":3.25, "y":0}, + {"x":4.25, "y":0}, + + {"x":5.5, "y":0}, + {"x":6.5, "y":0}, + {"x":7.5, "y":0}, + {"x":8.5, "y":0}, + + {"x":9.75, "y":0}, + {"x":10.75, "y":0}, + {"x":11.75, "y":0}, + {"x":12.75, "y":0}, + + {"x":14, "y":0}, + + {"x":0, "y":1.25}, + {"x":1, "y":1.25}, + {"x":2, "y":1.25}, + {"x":3, "y":1.25}, + {"x":4, "y":1.25}, + {"x":5, "y":1.25}, + {"x":6, "y":1.25}, + {"x":7, "y":1.25}, + {"x":8, "y":1.25}, + {"x":9, "y":1.25}, + {"x":10, "y":1.25}, + {"x":11, "y":1.25}, + {"x":12, "y":1.25}, + {"x":13, "y":1.25}, + {"x":14, "y":1.25}, + + {"x":15.25, "y":1.25}, + + {"x":17.75, "y":1.25}, + + {"x":0, "y":2.25, "w":1.5}, + {"x":1.5, "y":2.25}, + {"x":2.5, "y":2.25}, + {"x":3.5, "y":2.25}, + {"x":4.5, "y":2.25}, + {"x":5.5, "y":2.25}, + {"x":6.5, "y":2.25}, + {"x":7.5, "y":2.25}, + {"x":8.5, "y":2.25}, + {"x":9.5, "y":2.25}, + {"x":10.5, "y":2.25}, + {"x":11.5, "y":2.25}, + {"x":12.5, "y":2.25}, + {"x":13.5, "y":2.25, "w":1.5}, + + {"x":15.25, "y":2.25}, + + {"x":16.75, "y":2.25}, + {"x":17.75, "y":2.25}, + {"x":18.75, "y":2.25}, + + {"x":0, "y":3.25, "w":1.75}, + {"x":1.75, "y":3.25}, + {"x":2.75, "y":3.25}, + {"x":3.75, "y":3.25}, + {"x":4.75, "y":3.25}, + {"x":5.75, "y":3.25}, + {"x":6.75, "y":3.25}, + {"x":7.75, "y":3.25}, + {"x":8.75, "y":3.25}, + {"x":9.75, "y":3.25}, + {"x":10.75, "y":3.25}, + {"x":11.75, "y":3.25}, + {"x":12.75, "y":3.25, "w":2.25}, + + {"x":15.25, "y":3.25}, + + {"x":17.75, "y":3.25}, + + {"x":0, "y":4.25, "w":2.25}, + {"x":2.25, "y":4.25}, + {"x":3.25, "y":4.25}, + {"x":4.25, "y":4.25}, + {"x":5.25, "y":4.25}, + {"x":6.25, "y":4.25}, + {"x":7.25, "y":4.25}, + {"x":8.25, "y":4.25}, + {"x":9.25, "y":4.25}, + {"x":10.25, "y":4.25}, + {"x":11.25, "y":4.25}, + {"x":12.25, "y":4.25, "w":1.5}, + + {"x":14, "y":4.5}, + + {"x":15.25, "y":4.25}, + + {"x":0, "y":5.25, "w":1.5}, + {"x":1.5, "y":5.25}, + {"x":2.5, "y":5.25, "w":1.5}, + {"x":4, "y":5.25, "w":6.25}, + {"x":10.25, "y":5.25, "w":1.25}, + {"x":11.5, "y":5.25, "w":1.25}, + + {"x":13, "y":5.5}, + {"x":14, "y":5.5}, + {"x":15, "y":5.5} + ] }, "LAYOUT_evolv_iso": { "layout": [ - {"label":"Esc", "x":0, "y":0.25}, - {"label":"F1", "x":1.25, "y":0.25}, - {"label":"F2", "x":2.25, "y":0.25}, - {"label":"F3", "x":3.25, "y":0.25}, - {"label":"F4", "x":4.25, "y":0.25}, - {"label":"F5", "x":5.5, "y":0.25}, - {"label":"F6", "x":6.5, "y":0.25}, - {"label":"F7", "x":7.5, "y":0.25}, - {"label":"F8", "x":8.5, "y":0.25}, - {"label":"F9", "x":9.75, "y":0.25}, - {"label":"F10", "x":10.75, "y":0.25}, - {"label":"F11", "x":11.75, "y":0.25}, - {"label":"F12", "x":12.75, "y":0.25}, - {"label":"F13", "x":14, "y":0.25}, - {"label":"~", "x":0, "y":1.5}, - {"label":"!", "x":1, "y":1.5}, - {"label":"@", "x":2, "y":1.5}, - {"label":"#", "x":3, "y":1.5}, - {"label":"$", "x":4, "y":1.5}, - {"label":"%", "x":5, "y":1.5}, - {"label":"^", "x":6, "y":1.5}, - {"label":"&", "x":7, "y":1.5}, - {"label":"*", "x":8, "y":1.5}, - {"label":"(", "x":9, "y":1.5}, - {"label":")", "x":10, "y":1.5}, - {"label":"_", "x":11, "y":1.5}, - {"label":"+", "x":12, "y":1.5}, - {"label":"LBksp", "x":13, "y":1.5}, - {"label":"RBksp", "x":14, "y":1.5}, - {"label":"Del", "x":15.25, "y":1.5}, - {"label":"VolUp", "x":17.75, "y":1.5}, - {"label":"Tab", "x":0, "y":2.5, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.5}, - {"label":"W", "x":2.5, "y":2.5}, - {"label":"E", "x":3.5, "y":2.5}, - {"label":"R", "x":4.5, "y":2.5}, - {"label":"T", "x":5.5, "y":2.5}, - {"label":"Y", "x":6.5, "y":2.5}, - {"label":"U", "x":7.5, "y":2.5}, - {"label":"I", "x":8.5, "y":2.5}, - {"label":"O", "x":9.5, "y":2.5}, - {"label":"P", "x":10.5, "y":2.5}, - {"label":"{", "x":11.5, "y":2.5}, - {"label":"}", "x":12.5, "y":2.5}, - {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, - {"label":"Page Up", "x":15.25, "y":2.5}, - {"label":"Prev", "x":16.75, "y":2.5}, - {"label":"Play", "x":17.75, "y":2.5}, - {"label":"Next", "x":18.75, "y":2.5}, - {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, - {"label":"A", "x":1.75, "y":3.5}, - {"label":"S", "x":2.75, "y":3.5}, - {"label":"D", "x":3.75, "y":3.5}, - {"label":"F", "x":4.75, "y":3.5}, - {"label":"G", "x":5.75, "y":3.5}, - {"label":"H", "x":6.75, "y":3.5}, - {"label":"J", "x":7.75, "y":3.5}, - {"label":"K", "x":8.75, "y":3.5}, - {"label":"L", "x":9.75, "y":3.5}, - {"label":":", "x":10.75, "y":3.5}, - {"label":"\"", "x":11.75, "y":3.5}, - {"label":"~", "x":12.75, "y":3.5}, - {"label":"Page Down", "x":15.25, "y":3.5}, - {"label":"VolDn", "x":17.75, "y":3.5}, - {"label":"Shift", "x":0, "y":4.5, "w":1.25}, - {"label":"|", "x":1.25, "y":4.5}, - {"label":"Z", "x":2.25, "y":4.5}, - {"label":"X", "x":3.25, "y":4.5}, - {"label":"C", "x":4.25, "y":4.5}, - {"label":"V", "x":5.25, "y":4.5}, - {"label":"B", "x":6.25, "y":4.5}, - {"label":"N", "x":7.25, "y":4.5}, - {"label":"M", "x":8.25, "y":4.5}, - {"label":"<", "x":9.25, "y":4.5}, - {"label":">", "x":10.25, "y":4.5}, - {"label":"?", "x":11.25, "y":4.5}, - {"label":"Shift", "x":12.25, "y":4.5, "w":1.5}, - {"label":"\u2191", "x":14, "y":4.75}, - {"label":"Fn", "x":15.25, "y":4.5}, - {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, - {"label":"Win", "x":1.5, "y":5.5}, - {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, - {"x":4, "y":5.5, "w":6.25}, - {"label":"Win", "x":10.25, "y":5.5, "w":1.25}, - {"label":"Alt", "x":11.5, "y":5.5, "w":1.25}, - {"label":"\u2190", "x":13, "y":5.75}, - {"label":"\u2193", "x":14, "y":5.75}, - {"label":"\u2192", "x":15, "y":5.75}] + {"x":0, "y":0}, + + {"x":1.25, "y":0}, + {"x":2.25, "y":0}, + {"x":3.25, "y":0}, + {"x":4.25, "y":0}, + + {"x":5.5, "y":0}, + {"x":6.5, "y":0}, + {"x":7.5, "y":0}, + {"x":8.5, "y":0}, + + {"x":9.75, "y":0}, + {"x":10.75, "y":0}, + {"x":11.75, "y":0}, + {"x":12.75, "y":0}, + + {"x":14, "y":0}, + + {"x":0, "y":1.25}, + {"x":1, "y":1.25}, + {"x":2, "y":1.25}, + {"x":3, "y":1.25}, + {"x":4, "y":1.25}, + {"x":5, "y":1.25}, + {"x":6, "y":1.25}, + {"x":7, "y":1.25}, + {"x":8, "y":1.25}, + {"x":9, "y":1.25}, + {"x":10, "y":1.25}, + {"x":11, "y":1.25}, + {"x":12, "y":1.25}, + {"x":13, "y":1.25}, + {"x":14, "y":1.25}, + + {"x":15.25, "y":1.25}, + + {"x":17.75, "y":1.25}, + + {"x":0, "y":2.25, "w":1.5}, + {"x":1.5, "y":2.25}, + {"x":2.5, "y":2.25}, + {"x":3.5, "y":2.25}, + {"x":4.5, "y":2.25}, + {"x":5.5, "y":2.25}, + {"x":6.5, "y":2.25}, + {"x":7.5, "y":2.25}, + {"x":8.5, "y":2.25}, + {"x":9.5, "y":2.25}, + {"x":10.5, "y":2.25}, + {"x":11.5, "y":2.25}, + {"x":12.5, "y":2.25}, + {"x":13.75, "y":2.25, "w":1.25, "h":2}, + + {"x":15.25, "y":2.25}, + + {"x":16.75, "y":2.25}, + {"x":17.75, "y":2.25}, + {"x":18.75, "y":2.25}, + + {"x":0, "y":3.25, "w":1.75}, + {"x":1.75, "y":3.25}, + {"x":2.75, "y":3.25}, + {"x":3.75, "y":3.25}, + {"x":4.75, "y":3.25}, + {"x":5.75, "y":3.25}, + {"x":6.75, "y":3.25}, + {"x":7.75, "y":3.25}, + {"x":8.75, "y":3.25}, + {"x":9.75, "y":3.25}, + {"x":10.75, "y":3.25}, + {"x":11.75, "y":3.25}, + {"x":12.75, "y":3.25}, + {"x":15.25, "y":3.25}, + + {"x":17.75, "y":3.25}, + + {"x":0, "y":4.25, "w":1.25}, + {"x":1.25, "y":4.25}, + {"x":2.25, "y":4.25}, + {"x":3.25, "y":4.25}, + {"x":4.25, "y":4.25}, + {"x":5.25, "y":4.25}, + {"x":6.25, "y":4.25}, + {"x":7.25, "y":4.25}, + {"x":8.25, "y":4.25}, + {"x":9.25, "y":4.25}, + {"x":10.25, "y":4.25}, + {"x":11.25, "y":4.25}, + {"x":12.25, "y":4.25, "w":1.5}, + + {"x":14, "y":4.5}, + + {"x":15.25, "y":4.25}, + + {"x":0, "y":5.25, "w":1.5}, + {"x":1.5, "y":5.25}, + {"x":2.5, "y":5.25, "w":1.5}, + {"x":4, "y":5.25, "w":6.25}, + {"x":10.25, "y":5.25, "w":1.25}, + {"x":11.5, "y":5.25, "w":1.25}, + + {"x":13, "y":5.5}, + {"x":14, "y":5.5}, + {"x":15, "y":5.5} + ] } } } |