summaryrefslogtreecommitdiff
path: root/keyboards/lily58
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/lily58')
-rw-r--r--keyboards/lily58/config.h2
-rw-r--r--keyboards/lily58/glow_enc/config.h4
-rw-r--r--keyboards/lily58/glow_enc/glow_enc.c16
-rw-r--r--keyboards/lily58/glow_enc/glow_enc.h2
-rw-r--r--keyboards/lily58/glow_enc/info.json5
-rw-r--r--keyboards/lily58/lib/host_led_state_reader.c1
-rw-r--r--keyboards/lily58/lib/keylogger.c1
-rw-r--r--keyboards/lily58/lib/layer_state_reader.c4
-rw-r--r--keyboards/lily58/lib/logo_reader.c2
-rw-r--r--keyboards/lily58/lib/mode_icon_reader.c1
-rw-r--r--keyboards/lily58/lib/rgb_state_reader.c1
-rw-r--r--keyboards/lily58/lib/timelogger.c1
-rw-r--r--keyboards/lily58/light/config.h4
-rw-r--r--keyboards/lily58/light/info.json5
-rw-r--r--keyboards/lily58/light/light.c16
-rw-r--r--keyboards/lily58/light/light.h2
-rw-r--r--keyboards/lily58/lily58.c1
-rw-r--r--keyboards/lily58/lily58.h9
-rw-r--r--keyboards/lily58/rev1/config.h4
-rw-r--r--keyboards/lily58/rev1/info.json5
-rw-r--r--keyboards/lily58/rev1/rev1.c1
-rw-r--r--keyboards/lily58/rev1/rev1.h10
22 files changed, 16 insertions, 81 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..70ab0030c4 100644
--- a/keyboards/lily58/glow_enc/config.h
+++ b/keyboards/lily58/glow_enc/config.h
@@ -20,10 +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
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..01bd6835ff 100644
--- a/keyboards/lily58/glow_enc/info.json
+++ b/keyboards/lily58/glow_enc/info.json
@@ -8,6 +8,11 @@
"pid": "0x0059",
"device_version": "1.0.0"
},
+ "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"}
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..08ee5dcd82 100644
--- a/keyboards/lily58/light/config.h
+++ b/keyboards/lily58/light/config.h
@@ -20,10 +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
diff --git a/keyboards/lily58/light/info.json b/keyboards/lily58/light/info.json
index 82e9affbd0..0ab0bd68d2 100644
--- a/keyboards/lily58/light/info.json
+++ b/keyboards/lily58/light/info.json
@@ -8,6 +8,11 @@
"pid": "0x4C4C",
"device_version": "1.0.0"
},
+ "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"}
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/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/rev1/config.h b/keyboards/lily58/rev1/config.h
index 1e6d2d08fc..8417a2ee2a 100644
--- a/keyboards/lily58/rev1/config.h
+++ b/keyboards/lily58/rev1/config.h
@@ -19,10 +19,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 }
-
/* 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..373fd0c5c8 100644
--- a/keyboards/lily58/rev1/info.json
+++ b/keyboards/lily58/rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0xEB2D",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D2"
},
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, \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 20:09:50 +0000