diff options
Diffstat (limited to 'keyboards/lily58')
32 files changed, 48 insertions, 121 deletions
diff --git a/keyboards/lily58/config.h b/keyboards/lily58/config.h index a67e22b876..553b738b48 100644 --- a/keyboards/lily58/config.h +++ b/keyboards/lily58/config.h @@ -18,7 +18,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define DIODE_DIRECTION COL2ROW - // Use the lily version to get the Lily58 logo instead of the qmk logo #define OLED_FONT_H "lib/glcdfont_lily.c" diff --git a/keyboards/lily58/glow_enc/config.h b/keyboards/lily58/glow_enc/config.h index d89148dbbf..0f78f92d72 100644 --- a/keyboards/lily58/glow_enc/config.h +++ b/keyboards/lily58/glow_enc/config.h @@ -20,12 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } - -#define RGB_DI_PIN F4 - #define RGBLED_NUM 72 // Number of LEDs #define RGBLED_SPLIT { 36, 36 } diff --git a/keyboards/lily58/glow_enc/glow_enc.c b/keyboards/lily58/glow_enc/glow_enc.c deleted file mode 100644 index 57a0df93db..0000000000 --- a/keyboards/lily58/glow_enc/glow_enc.c +++ /dev/null @@ -1,16 +0,0 @@ -/* -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 <http://www.gnu.org/licenses/>. -*/ - -#include "lily58.h" - diff --git a/keyboards/lily58/glow_enc/glow_enc.h b/keyboards/lily58/glow_enc/glow_enc.h index f9cc1c26b8..2a81dc0027 100644 --- a/keyboards/lily58/glow_enc/glow_enc.h +++ b/keyboards/lily58/glow_enc/glow_enc.h @@ -16,8 +16,6 @@ #pragma once -#include "lily58.h" - #include "quantum.h" diff --git a/keyboards/lily58/glow_enc/info.json b/keyboards/lily58/glow_enc/info.json index bc2eae23da..3f3e9e8e94 100644 --- a/keyboards/lily58/glow_enc/info.json +++ b/keyboards/lily58/glow_enc/info.json @@ -8,12 +8,23 @@ "pid": "0x0059", "device_version": "1.0.0" }, + "features": { + "encoder": true, + "oled": true, + "rgblight": true + }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "D4"} ] }, "split": { + "enabled": true, "soft_serial_pin": "D2", "encoder": { "right": { @@ -23,6 +34,9 @@ } } }, + "ws2812": { + "pin": "F4" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/lily58/glow_enc/rules.mk b/keyboards/lily58/glow_enc/rules.mk index 3d80190eb2..4da205a168 100644 --- a/keyboards/lily58/glow_enc/rules.mk +++ b/keyboards/lily58/glow_enc/rules.mk @@ -1,8 +1 @@ -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 +LTO_ENABLE = yes diff --git a/keyboards/lily58/keymaps/hvp/config.h b/keyboards/lily58/keymaps/hvp/config.h index 5699395f73..ec0960470a 100644 --- a/keyboards/lily58/keymaps/hvp/config.h +++ b/keyboards/lily58/keymaps/hvp/config.h @@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define TAPPING_TERM 150 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #undef RGBLED_NUM #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/lily58/keymaps/muppetjones/config.h b/keyboards/lily58/keymaps/muppetjones/config.h index 283a4ed890..81bc728d5a 100644 --- a/keyboards/lily58/keymaps/muppetjones/config.h +++ b/keyboards/lily58/keymaps/muppetjones/config.h @@ -31,9 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // Change "hold" time (default is 200 ms) #define TAPPING_TERM 200 -// Prevent normal rollover on alphas from accidentally triggering mods. -#define IGNORE_MOD_TAP_INTERRUPT - // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. #define QUICK_TAP_TERM 0 diff --git a/keyboards/lily58/keymaps/muuko/config.h b/keyboards/lily58/keymaps/muuko/config.h index 377ee816fe..5d833d34d0 100644 --- a/keyboards/lily58/keymaps/muuko/config.h +++ b/keyboards/lily58/keymaps/muuko/config.h @@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define NO_MUSIC_MODE #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #ifdef TAPPING_TERM #undef TAPPING_TERM diff --git a/keyboards/lily58/keymaps/narze/config.h b/keyboards/lily58/keymaps/narze/config.h index a6fac1a58b..814338c18f 100644 --- a/keyboards/lily58/keymaps/narze/config.h +++ b/keyboards/lily58/keymaps/narze/config.h @@ -31,7 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define COMBO_TERM 20 #define COMBO_COUNT 3 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define QUICK_TAP_TERM 0 diff --git a/keyboards/lily58/keymaps/niolang/config.h b/keyboards/lily58/keymaps/niolang/config.h index 58ffd90e2f..dedefc2fcf 100644 --- a/keyboards/lily58/keymaps/niolang/config.h +++ b/keyboards/lily58/keymaps/niolang/config.h @@ -25,9 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT // #define EE_HANDS -/* Necessary because of use fo tap dance for รง (leads to un wanted modifications after typing c if not) */ -#define IGNORE_MOD_TAP_INTERRUPT - /* RGB light */ #ifdef RGBLIGHT_ENABLE #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/lily58/lib/host_led_state_reader.c b/keyboards/lily58/lib/host_led_state_reader.c index 6bdd4a5a9f..fbf9b99f70 100644 --- a/keyboards/lily58/lib/host_led_state_reader.c +++ b/keyboards/lily58/lib/host_led_state_reader.c @@ -1,7 +1,6 @@ #include <stdio.h> #include "led.h" #include "host.h" -#include "lily58.h" char host_led_state_str[24]; diff --git a/keyboards/lily58/lib/keylogger.c b/keyboards/lily58/lib/keylogger.c index 2fc3e663ec..0d17e654f4 100644 --- a/keyboards/lily58/lib/keylogger.c +++ b/keyboards/lily58/lib/keylogger.c @@ -1,6 +1,5 @@ #include <stdio.h> #include "action.h" -#include "lily58.h" char keylog_str[24] = {}; char keylogs_str[21] = {}; diff --git a/keyboards/lily58/lib/layer_state_reader.c b/keyboards/lily58/lib/layer_state_reader.c index 868d8e5cb4..ffc2c4e2c6 100644 --- a/keyboards/lily58/lib/layer_state_reader.c +++ b/keyboards/lily58/lib/layer_state_reader.c @@ -1,7 +1,5 @@ - -#include QMK_KEYBOARD_H +#include "quantum.h" #include <stdio.h> -#include "lily58.h" #define L_BASE 0 #define L_LOWER (1 << 1) diff --git a/keyboards/lily58/lib/logo_reader.c b/keyboards/lily58/lib/logo_reader.c index 9f8adb8466..039a538cc5 100644 --- a/keyboards/lily58/lib/logo_reader.c +++ b/keyboards/lily58/lib/logo_reader.c @@ -1,5 +1,3 @@ -#include "lily58.h" - const char *read_logo(void) { static char logo[] = { 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, diff --git a/keyboards/lily58/lib/mode_icon_reader.c b/keyboards/lily58/lib/mode_icon_reader.c index 27c6d92cd0..195ac71862 100644 --- a/keyboards/lily58/lib/mode_icon_reader.c +++ b/keyboards/lily58/lib/mode_icon_reader.c @@ -1,6 +1,5 @@ #include <stdio.h> #include <stdbool.h> -#include "lily58.h" char mode_icon[24]; diff --git a/keyboards/lily58/lib/rgb_state_reader.c b/keyboards/lily58/lib/rgb_state_reader.c index e0efe2e528..3d74fb45e4 100644 --- a/keyboards/lily58/lib/rgb_state_reader.c +++ b/keyboards/lily58/lib/rgb_state_reader.c @@ -1,6 +1,5 @@ #ifdef RGBLIGHT_ENABLE -#include QMK_KEYBOARD_H #include <stdio.h> extern rgblight_config_t rgblight_config; diff --git a/keyboards/lily58/lib/timelogger.c b/keyboards/lily58/lib/timelogger.c index b00c13cb0a..83fe9706dd 100644 --- a/keyboards/lily58/lib/timelogger.c +++ b/keyboards/lily58/lib/timelogger.c @@ -1,6 +1,5 @@ #include <stdio.h> #include "timer.h" -#include "lily58.h" char timelog_str[24] = {}; int last_time = 0; diff --git a/keyboards/lily58/light/config.h b/keyboards/lily58/light/config.h index 3a0780e0a6..91934e61c0 100644 --- a/keyboards/lily58/light/config.h +++ b/keyboards/lily58/light/config.h @@ -20,11 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } - -#define RGB_DI_PIN D3 #define RGBLED_SPLIT { 35, 35 } #define RGBLED_NUM 70 #define RGBLIGHT_SPLIT diff --git a/keyboards/lily58/light/info.json b/keyboards/lily58/light/info.json index 82e9affbd0..4db30403f7 100644 --- a/keyboards/lily58/light/info.json +++ b/keyboards/lily58/light/info.json @@ -8,12 +8,24 @@ "pid": "0x4C4C", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "encoder": true, + "oled": true, + "rgblight": true + }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F4", "pin_b": "F5"} ] }, "split": { + "enabled": true, "soft_serial_pin": "D2", "encoder": { "right": { @@ -23,6 +35,9 @@ } } }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/lily58/light/light.c b/keyboards/lily58/light/light.c deleted file mode 100644 index 57a0df93db..0000000000 --- a/keyboards/lily58/light/light.c +++ /dev/null @@ -1,16 +0,0 @@ -/* -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 <http://www.gnu.org/licenses/>. -*/ - -#include "lily58.h" - diff --git a/keyboards/lily58/light/light.h b/keyboards/lily58/light/light.h index 833ad13d00..5d873e04cc 100644 --- a/keyboards/lily58/light/light.h +++ b/keyboards/lily58/light/light.h @@ -1,7 +1,5 @@ #pragma once -#include "lily58.h" - #include "quantum.h" diff --git a/keyboards/lily58/light/rules.mk b/keyboards/lily58/light/rules.mk index d4957d98e4..4da205a168 100644 --- a/keyboards/lily58/light/rules.mk +++ b/keyboards/lily58/light/rules.mk @@ -1,3 +1 @@ -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 +LTO_ENABLE = yes diff --git a/keyboards/lily58/lily58.c b/keyboards/lily58/lily58.c deleted file mode 100644 index 6108d70b90..0000000000 --- a/keyboards/lily58/lily58.c +++ /dev/null @@ -1 +0,0 @@ -#include "lily58.h" diff --git a/keyboards/lily58/lily58.h b/keyboards/lily58/lily58.h deleted file mode 100644 index c082030032..0000000000 --- a/keyboards/lily58/lily58.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_lily58_rev1 - #include "rev1.h" -#elif KEYBOARD_lily58_light - #include "light.h" -#elif KEYBOARD_lily58_glow_enc - #include "glow_enc.h" -#endif diff --git a/keyboards/lily58/r2g/config.h b/keyboards/lily58/r2g/config.h index 9770e28a53..dc6cee3af7 100644 --- a/keyboards/lily58/r2g/config.h +++ b/keyboards/lily58/r2g/config.h @@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifdef RGB_MATRIX_ENABLE -# define RGB_DI_PIN D3 # define RGB_MATRIX_LED_COUNT 74 # define RGB_DISABLE_WHEN_USB_SUSPENDED # define RGB_MATRIX_LED_FLUSH_LIMIT 16 diff --git a/keyboards/lily58/r2g/info.json b/keyboards/lily58/r2g/info.json index 909cc78f18..a5041a62a5 100644 --- a/keyboards/lily58/r2g/info.json +++ b/keyboards/lily58/r2g/info.json @@ -24,6 +24,9 @@ "enabled": true, "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lily58/rev1/config.h b/keyboards/lily58/rev1/config.h index 1e6d2d08fc..8e94f9f62b 100644 --- a/keyboards/lily58/rev1/config.h +++ b/keyboards/lily58/rev1/config.h @@ -19,12 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } - /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 // Number of LEDs /* diff --git a/keyboards/lily58/rev1/info.json b/keyboards/lily58/rev1/info.json index 793386b664..4ce69ea5f5 100644 --- a/keyboards/lily58/rev1/info.json +++ b/keyboards/lily58/rev1/info.json @@ -8,9 +8,21 @@ "pid": "0xEB2D", "device_version": "1.0.0" }, + "features": { + "oled": true + }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/lily58/rev1/rev1.c b/keyboards/lily58/rev1/rev1.c deleted file mode 100644 index 6108d70b90..0000000000 --- a/keyboards/lily58/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "lily58.h" diff --git a/keyboards/lily58/rev1/rev1.h b/keyboards/lily58/rev1/rev1.h index aa9f5727c2..436f4e710e 100644 --- a/keyboards/lily58/rev1/rev1.h +++ b/keyboards/lily58/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "lily58.h" - #include "quantum.h" #ifdef RGBLIGHT_ENABLE @@ -9,14 +7,6 @@ #include "ws2812.h" #endif -#ifdef USE_I2C -#include <stddef.h> -#ifdef __AVR__ - #include <avr/io.h> - #include <avr/interrupt.h> -#endif -#endif - #ifndef FLIP_HALF #define LAYOUT( \ L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ diff --git a/keyboards/lily58/rules.mk b/keyboards/lily58/rules.mk index 2fca52967d..76ce166170 100644 --- a/keyboards/lily58/rules.mk +++ b/keyboards/lily58/rules.mk @@ -1,17 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -OLED_ENABLE = yes -OLED_DRIVER = SSD1306 # OLED display -SPLIT_KEYBOARD = yes +OLED_DRIVER = SSD1306 DEFAULT_FOLDER = lily58/rev1 |