From 3d17ecbddeb66ac265c1789ec586f19d53950a82 Mon Sep 17 00:00:00 2001 From: Vladimir Lyashenko Date: Fri, 28 Jan 2022 18:04:55 +0200 Subject: [PATCH 1/5] add support for lily58 encoders (one per size) and rgb-light. The pcb and details here https://github.com/orvisevans/Lily58-Glow-Enc --- keyboards/lily58/lily58.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/lily58/lily58.h b/keyboards/lily58/lily58.h index 4f6f262bbc59..eb5c02ed28e3 100644 --- a/keyboards/lily58/lily58.h +++ b/keyboards/lily58/lily58.h @@ -4,4 +4,6 @@ #include "rev1.h" #elif KEYBOARD_lily58_light #include "light.h" +#elif KEYBOARD_lily58_glowEnc + #include "glowEnc.h" #endif From d94f17cb7242bf5a1597ea96804dfeccf620a05f Mon Sep 17 00:00:00 2001 From: Vladimir Lyashenko Date: Fri, 28 Jan 2022 18:05:48 +0200 Subject: [PATCH 2/5] add support for lily58 encoders (one per size) and rgb-light. The pcb and details here https://github.com/orvisevans/Lily58-Glow-Enc --- keyboards/lily58/glowEnc/config.h | 56 ++++++++++++++++++++++++++++++ keyboards/lily58/glowEnc/glowEnc.c | 16 +++++++++ keyboards/lily58/glowEnc/glowEnc.h | 50 ++++++++++++++++++++++++++ keyboards/lily58/glowEnc/info.json | 16 +++++++++ keyboards/lily58/glowEnc/rules.mk | 8 +++++ 5 files changed, 146 insertions(+) create mode 100644 keyboards/lily58/glowEnc/config.h create mode 100644 keyboards/lily58/glowEnc/glowEnc.c create mode 100644 keyboards/lily58/glowEnc/glowEnc.h create mode 100644 keyboards/lily58/glowEnc/info.json create mode 100644 keyboards/lily58/glowEnc/rules.mk diff --git a/keyboards/lily58/glowEnc/config.h b/keyboards/lily58/glowEnc/config.h new file mode 100644 index 000000000000..3581be816cdb --- /dev/null +++ b/keyboards/lily58/glowEnc/config.h @@ -0,0 +1,56 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert +Copyright 2017 F_YUUCHI +Copyright 2020 Ben Roesner (keycapsss.com) + +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 . +*/ + +#pragma once + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFC51 +#define PRODUCT_ID 0x0059 +#define DEVICE_VER 0x0100 +#define MANUFACTURER ORVISEVANS+ +#define PRODUCT Lily58GlowEnc +#define DESCRIPTION Lily58 is 6×4+5keys column-staggered split keyboard with glowing keys and encoders. + +/* key matrix size */ +// Rows are doubled-up +#define MATRIX_ROWS 10 +#define MATRIX_COLS 6 + +// wiring of each half +#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } +#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +#define SOFT_SERIAL_PIN D2 + +#define RGB_DI_PIN F4 + +#define RGBLED_NUM 72 // Number of LEDs + +#define RGBLED_SPLIT { 36, 36 } +#define RGBLIGHT_SPLIT +#define RGBLIGHT_LIMIT_VAL 120 + +#define ENCODERS_PAD_A { F5 } +#define ENCODERS_PAD_B { D4 } +#define ENCODERS_PAD_A_RIGHT { D4 } +#define ENCODERS_PAD_B_RIGHT { F5 } diff --git a/keyboards/lily58/glowEnc/glowEnc.c b/keyboards/lily58/glowEnc/glowEnc.c new file mode 100644 index 000000000000..57a0df93dbe4 --- /dev/null +++ b/keyboards/lily58/glowEnc/glowEnc.c @@ -0,0 +1,16 @@ +/* +Copyright 2020 Ben Roesner (keycapsss.com) +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 . +*/ + +#include "lily58.h" + diff --git a/keyboards/lily58/glowEnc/glowEnc.h b/keyboards/lily58/glowEnc/glowEnc.h new file mode 100644 index 000000000000..833ad13d0034 --- /dev/null +++ b/keyboards/lily58/glowEnc/glowEnc.h @@ -0,0 +1,50 @@ +#pragma once + +#include "lily58.h" + +#include "quantum.h" + + +#ifndef FLIP_HALF +#define LAYOUT( \ + L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ + L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ + L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ + L30, L31, L32, L33, L34, L35, L45, R40, R30, R31, R32, R33, R34, R35, \ + L41, L42, L43, L44, R41, R42, R43, R44 \ + ) \ + { \ + { L00, L01, L02, L03, L04, L05 }, \ + { L10, L11, L12, L13, L14, L15 }, \ + { L20, L21, L22, L23, L24, L25 }, \ + { L30, L31, L32, L33, L34, L35 }, \ + { KC_NO, L41, L42, L43, L44, L45 }, \ + { R05, R04, R03, R02, R01, R00 }, \ + { R15, R14, R13, R12, R11, R10 }, \ + { R25, R24, R23, R22, R21, R20 }, \ + { R35, R34, R33, R32, R31, R30 }, \ + { KC_NO, R44, R43, R42, R41, R40 } \ + } +#else +// Keymap with right side flipped +// (TRRS jack on both halves are to the right) +#define LAYOUT( \ + L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ + L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ + L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ + L30, L31, L32, L33, L34, L35, L45, R30, R31, R32, R33, R34, R35, R45, \ + L41, L42, L43, L44, R41, R42, R43, R44 \ + ) \ + { \ + { L00, L01, L02, L03, L04, L05 }, \ + { L10, L11, L12, L13, L14, L15 }, \ + { L20, L21, L22, L23, L24, L25 }, \ + { L30, L31, L32, L33, L34, L35 }, \ + { KC_NO, L41, L42, L43, L44, L45 }, \ + { R00, R01, R02, R03, R04, R05 }, \ + { R10, R11, R12, R13, R14, R15 }, \ + { R20, R21, R22, R23, R24, R25 }, \ + { R30, R31, R32, R33, R34, R35 }, \ + { KC_NO, R41, R42, R43, R44, R45 } \ + } +#endif diff --git a/keyboards/lily58/glowEnc/info.json b/keyboards/lily58/glowEnc/info.json new file mode 100644 index 000000000000..503cdaae1298 --- /dev/null +++ b/keyboards/lily58/glowEnc/info.json @@ -0,0 +1,16 @@ +{ + "keyboard_name": "Lily58", + "url": "https://keycapsss.com", + "maintainer": "BenRoe", + "layouts": { + "LAYOUT": { + "layout": [ + {"x":0, "y":0.5}, {"x":1, "y":0.375}, {"x":2, "y":0.125}, {"x":3, "y":0}, {"x":4, "y":0.125}, {"x":5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.5}, + {"x":0, "y":1.5}, {"x":1, "y":1.375}, {"x":2, "y":1.125}, {"x":3, "y":1}, {"x":4, "y":1.125}, {"x":5, "y":1.25}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.5}, + {"x":0, "y":2.5}, {"x":1, "y":2.375}, {"x":2, "y":2.125}, {"x":3, "y":2}, {"x":4, "y":2.125}, {"x":5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.5}, + {"x":0, "y":3.5}, {"x":1, "y":3.375}, {"x":2, "y":3.125}, {"x":3, "y":3}, {"x":4, "y":3.125}, {"x":5, "y":3.25}, {"x":6, "y":2.75}, {"x":9.5, "y":2.75}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.5}, + {"x":2.5, "y":4.125}, {"x":3.5, "y":4.15}, {"x":4.5, "y":4.25}, {"x":6, "y":4.25, "h":1.5}, {"x":9.5, "y":4.25, "h":1.5}, {"x":11, "y":4.25}, {"x":12, "y":4.15}, {"x":13, "y":4.15} + ] + } + } +} diff --git a/keyboards/lily58/glowEnc/rules.mk b/keyboards/lily58/glowEnc/rules.mk new file mode 100644 index 000000000000..3d80190eb2a6 --- /dev/null +++ b/keyboards/lily58/glowEnc/rules.mk @@ -0,0 +1,8 @@ +ENCODER_ENABLE = yes # ENables the use of one or more encoders +RGBLIGHT_ENABLE = yes # Enable keyboard RGB light +LTO_ENABLE = yes # significantly reduce the compiled size, but disable the legacy TMK Macros and Functions features +BOOTMAGIC_ENABLE = no +RGB_MATRIX_ENABLE = no # Per key rgb leds + +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend \ No newline at end of file From a920213a3ffc63bf9d6496f86b0b167e5ef04a49 Mon Sep 17 00:00:00 2001 From: Liashenko Vladymyr Date: Fri, 28 Jan 2022 22:15:56 +0200 Subject: [PATCH 3/5] Update keyboards/lily58/glowEnc/config.h Co-authored-by: Drashna Jaelre --- keyboards/lily58/glowEnc/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/lily58/glowEnc/config.h b/keyboards/lily58/glowEnc/config.h index 3581be816cdb..5e51acea2509 100644 --- a/keyboards/lily58/glowEnc/config.h +++ b/keyboards/lily58/glowEnc/config.h @@ -26,7 +26,6 @@ along with this program. If not, see . #define DEVICE_VER 0x0100 #define MANUFACTURER ORVISEVANS+ #define PRODUCT Lily58GlowEnc -#define DESCRIPTION Lily58 is 6×4+5keys column-staggered split keyboard with glowing keys and encoders. /* key matrix size */ // Rows are doubled-up From 5b62e9cac5d176b04cf779d8733eba74cdea2f8f Mon Sep 17 00:00:00 2001 From: Vladimir Lyashenko Date: Fri, 28 Jan 2022 22:23:57 +0200 Subject: [PATCH 4/5] add GPL License to growEnc.h --- keyboards/lily58/glowEnc/glowEnc.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/keyboards/lily58/glowEnc/glowEnc.h b/keyboards/lily58/glowEnc/glowEnc.h index 833ad13d0034..f9cc1c26b83a 100644 --- a/keyboards/lily58/glowEnc/glowEnc.h +++ b/keyboards/lily58/glowEnc/glowEnc.h @@ -1,3 +1,19 @@ +/* Copyright 2022 Liashenko Volodymyr (@LVladymyr) + * + * 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 . +*/ + #pragma once #include "lily58.h" From aebf9489b44db6c3c8be545a65d1af8b07f25552 Mon Sep 17 00:00:00 2001 From: Vladimir Lyashenko Date: Fri, 28 Jan 2022 22:38:48 +0200 Subject: [PATCH 5/5] rename folder according to requirement to lower case --- keyboards/lily58/{glowEnc => glow_enc}/config.h | 0 keyboards/lily58/{glowEnc/glowEnc.c => glow_enc/glow_enc.c} | 0 keyboards/lily58/{glowEnc/glowEnc.h => glow_enc/glow_enc.h} | 0 keyboards/lily58/{glowEnc => glow_enc}/info.json | 0 keyboards/lily58/{glowEnc => glow_enc}/rules.mk | 0 keyboards/lily58/lily58.h | 4 ++-- 6 files changed, 2 insertions(+), 2 deletions(-) rename keyboards/lily58/{glowEnc => glow_enc}/config.h (100%) rename keyboards/lily58/{glowEnc/glowEnc.c => glow_enc/glow_enc.c} (100%) rename keyboards/lily58/{glowEnc/glowEnc.h => glow_enc/glow_enc.h} (100%) rename keyboards/lily58/{glowEnc => glow_enc}/info.json (100%) rename keyboards/lily58/{glowEnc => glow_enc}/rules.mk (100%) diff --git a/keyboards/lily58/glowEnc/config.h b/keyboards/lily58/glow_enc/config.h similarity index 100% rename from keyboards/lily58/glowEnc/config.h rename to keyboards/lily58/glow_enc/config.h diff --git a/keyboards/lily58/glowEnc/glowEnc.c b/keyboards/lily58/glow_enc/glow_enc.c similarity index 100% rename from keyboards/lily58/glowEnc/glowEnc.c rename to keyboards/lily58/glow_enc/glow_enc.c diff --git a/keyboards/lily58/glowEnc/glowEnc.h b/keyboards/lily58/glow_enc/glow_enc.h similarity index 100% rename from keyboards/lily58/glowEnc/glowEnc.h rename to keyboards/lily58/glow_enc/glow_enc.h diff --git a/keyboards/lily58/glowEnc/info.json b/keyboards/lily58/glow_enc/info.json similarity index 100% rename from keyboards/lily58/glowEnc/info.json rename to keyboards/lily58/glow_enc/info.json diff --git a/keyboards/lily58/glowEnc/rules.mk b/keyboards/lily58/glow_enc/rules.mk similarity index 100% rename from keyboards/lily58/glowEnc/rules.mk rename to keyboards/lily58/glow_enc/rules.mk diff --git a/keyboards/lily58/lily58.h b/keyboards/lily58/lily58.h index eb5c02ed28e3..c08203003243 100644 --- a/keyboards/lily58/lily58.h +++ b/keyboards/lily58/lily58.h @@ -4,6 +4,6 @@ #include "rev1.h" #elif KEYBOARD_lily58_light #include "light.h" -#elif KEYBOARD_lily58_glowEnc - #include "glowEnc.h" +#elif KEYBOARD_lily58_glow_enc + #include "glow_enc.h" #endif