aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaoki Katahira <kata0510.com@gmail.com>2020-08-25 01:08:35 +0900
committerGitHub <noreply@github.com>2020-08-24 09:08:35 -0700
commit958e3f85cb91b152c9e22de52a4a5113603d669d (patch)
treeae9f1f22263020889d63bd3f345cf95492552c44
parentb139d34924499e69746307e618afaaa7cf5ab549 (diff)
downloadqmk_firmware-958e3f85cb91b152c9e22de52a4a5113603d669d.tar.gz
qmk_firmware-958e3f85cb91b152c9e22de52a4a5113603d669d.zip
Update Lily58 Keymaps and VendorID (#9979)
* Update keymaps and venderID * update config.h * Update keyboards/lily58/keymaps/yuchi/keymap.c
Diffstat
-rw-r--r--keyboards/lily58/keymaps/default/config.h2
-rw-r--r--keyboards/lily58/keymaps/default/keymap.c74
-rw-r--r--keyboards/lily58/keymaps/default/rules.mk2
-rw-r--r--keyboards/lily58/keymaps/yuchi/config.h20
-rw-r--r--keyboards/lily58/keymaps/yuchi/keymap.c114
-rw-r--r--keyboards/lily58/keymaps/yuchi/rules.mk3
-rw-r--r--keyboards/lily58/rev1/config.h6
-rw-r--r--keyboards/lily58/rev1/info.json2
8 files changed, 46 insertions, 177 deletions
diff --git a/keyboards/lily58/keymaps/default/config.h b/keyboards/lily58/keymaps/default/config.h
index 6b9e52c05..4f155d3af 100644
--- a/keyboards/lily58/keymaps/default/config.h
+++ b/keyboards/lily58/keymaps/default/config.h
@@ -28,6 +28,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
28// #define MASTER_RIGHT 28// #define MASTER_RIGHT
29// #define EE_HANDS 29// #define EE_HANDS
30 30
31// #define SSD1306OLED
32
31#define USE_SERIAL_PD2 33#define USE_SERIAL_PD2
32 34
33#define TAPPING_FORCE_HOLD 35#define TAPPING_FORCE_HOLD
diff --git a/keyboards/lily58/keymaps/default/keymap.c b/keyboards/lily58/keymaps/default/keymap.c
index f0fbaa8b0..52d401c5c 100644
--- a/keyboards/lily58/keymaps/default/keymap.c
+++ b/keyboards/lily58/keymaps/default/keymap.c
@@ -8,26 +8,15 @@
8 #include "ssd1306.h" 8 #include "ssd1306.h"
9#endif 9#endif
10 10
11#ifdef RGBLIGHT_ENABLE
12//Following line allows macro to read current RGB settings
13extern rgblight_config_t rgblight_config;
14#endif
15
16extern uint8_t is_master; 11extern uint8_t is_master;
17 12
18#define _QWERTY 0 13enum layer_number {
19#define _LOWER 1 14 _QWERTY = 0,
20#define _RAISE 2 15 _LOWER,
21#define _ADJUST 3 16 _RAISE,
22 17 _ADJUST,
23enum custom_keycodes {
24 QWERTY = SAFE_RANGE,
25 LOWER,
26 RAISE,
27 ADJUST,
28}; 18};
29 19
30
31const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
32 21
33/* QWERTY 22/* QWERTY
@@ -50,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
50 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, \ 39 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, \
51 KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ 40 KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
52 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ 41 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
53 KC_LALT, KC_LGUI,LOWER, KC_SPC, KC_ENT, RAISE, KC_BSPC, KC_RGUI \ 42 KC_LALT, KC_LGUI, MO(_LOWER), KC_SPC, KC_ENT, MO(_RAISE), KC_BSPC, KC_RGUI \
54), 43),
55/* LOWER 44/* LOWER
56 * ,-----------------------------------------. ,-----------------------------------------. 45 * ,-----------------------------------------. ,-----------------------------------------.
@@ -112,14 +101,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
112 [_ADJUST] = LAYOUT( \ 101 [_ADJUST] = LAYOUT( \
113 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 102 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
114 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 103 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
115 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \ 104 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
116 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,\ 105 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
117 _______, _______, _______, _______, _______, _______, _______, _______ \ 106 _______, _______, _______, _______, _______, _______, _______, _______ \
118 ) 107 )
119}; 108};
120 109
121int RGB_current_mode;
122
123// Setting ADJUST layer RGB back to default 110// Setting ADJUST layer RGB back to default
124void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) { 111void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
125 if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) { 112 if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
@@ -129,12 +116,6 @@ void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
129 } 116 }
130} 117}
131 118
132void matrix_init_user(void) {
133 #ifdef RGBLIGHT_ENABLE
134 RGB_current_mode = rgblight_config.mode;
135 #endif
136}
137
138//SSD1306 OLED update loop, make sure to enable OLED_DRIVER_ENABLE=yes in rules.mk 119//SSD1306 OLED update loop, make sure to enable OLED_DRIVER_ENABLE=yes in rules.mk
139#ifdef OLED_DRIVER_ENABLE 120#ifdef OLED_DRIVER_ENABLE
140 121
@@ -178,42 +159,5 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
178#endif 159#endif
179 // set_timelog(); 160 // set_timelog();
180 } 161 }
181
182 switch (keycode) {
183 case QWERTY:
184 if (record->event.pressed) {
185 set_single_persistent_default_layer(_QWERTY);
186 }
187 return false;
188 break;
189 case LOWER:
190 if (record->event.pressed) {
191 layer_on(_LOWER);
192 update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
193 } else {
194 layer_off(_LOWER);
195 update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
196 }
197 return false;
198 break;
199 case RAISE:
200 if (record->event.pressed) {
201 layer_on(_RAISE);
202 update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
203 } else {
204 layer_off(_RAISE);
205 update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
206 }
207 return false;
208 break;
209 case ADJUST:
210 if (record->event.pressed) {
211 layer_on(_ADJUST);
212 } else {
213 layer_off(_ADJUST);
214 }
215 return false;
216 break;
217 }
218 return true; 162 return true;
219} 163} \ No newline at end of file
diff --git a/keyboards/lily58/keymaps/default/rules.mk b/keyboards/lily58/keymaps/default/rules.mk
index a5b6303a1..ea94a9708 100644
--- a/keyboards/lily58/keymaps/default/rules.mk
+++ b/keyboards/lily58/keymaps/default/rules.mk
@@ -13,7 +13,7 @@ MIDI_ENABLE = no # MIDI controls
13AUDIO_ENABLE = no # Audio output on port C6 13AUDIO_ENABLE = no # Audio output on port C6
14UNICODE_ENABLE = no # Unicode 14UNICODE_ENABLE = no # Unicode
15BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID 15BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
16RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. 16RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
17SWAP_HANDS_ENABLE = no # Enable one-hand typing 17SWAP_HANDS_ENABLE = no # Enable one-hand typing
18OLED_DRIVER_ENABLE= yes # OLED display 18OLED_DRIVER_ENABLE= yes # OLED display
19 19
diff --git a/keyboards/lily58/keymaps/yuchi/config.h b/keyboards/lily58/keymaps/yuchi/config.h
index 58bbdc5e9..130b5642e 100644
--- a/keyboards/lily58/keymaps/yuchi/config.h
+++ b/keyboards/lily58/keymaps/yuchi/config.h
@@ -28,25 +28,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
28// #define MASTER_RIGHT 28// #define MASTER_RIGHT
29// #define EE_HANDS 29// #define EE_HANDS
30 30
31#define SSD1306OLED 31//#define OLED_DRIVER
32 32
33#define USE_SERIAL_PD2 33#define USE_SERIAL_PD2
34 34
35#define TAPPING_FORCE_HOLD 35#define TAPPING_FORCE_HOLD
36#define TAPPING_TERM 100 36#define TAPPING_TERM 100 \ No newline at end of file
37
38#undef RGBLED_NUM
39#define RGBLIGHT_ANIMATIONS
40#define RGBLED_NUM 27
41#define RGBLIGHT_LIMIT_VAL 120
42#define RGBLIGHT_HUE_STEP 10
43#define RGBLIGHT_SAT_STEP 17
44#define RGBLIGHT_VAL_STEP 17
45
46// Underglow
47/*
48#undef RGBLED_NUM
49#define RGBLED_NUM 14 // Number of LEDs
50#define RGBLIGHT_ANIMATIONS
51#define RGBLIGHT_SLEEP
52*/ \ No newline at end of file
diff --git a/keyboards/lily58/keymaps/yuchi/keymap.c b/keyboards/lily58/keymaps/yuchi/keymap.c
index d258fbcbc..37230696f 100644
--- a/keyboards/lily58/keymaps/yuchi/keymap.c
+++ b/keyboards/lily58/keymaps/yuchi/keymap.c
@@ -8,26 +8,13 @@
8 #include "ssd1306.h" 8 #include "ssd1306.h"
9#endif 9#endif
10 10
11
12extern keymap_config_t keymap_config;
13
14#ifdef RGBLIGHT_ENABLE
15//Following line allows macro to read current RGB settings
16extern rgblight_config_t rgblight_config;
17#endif
18
19extern uint8_t is_master; 11extern uint8_t is_master;
20 12
21#define _QWERTY 0 13enum layer_number {
22#define _LOWER 1 14 _QWERTY = 0,
23#define _RAISE 2 15 _LOWER,
24#define _ADJUST 16 16 _RAISE,
25 17 _ADJUST,
26enum custom_keycodes {
27 QWERTY = SAFE_RANGE,
28 LOWER,
29 RAISE,
30 ADJUST,
31}; 18};
32 19
33 20
@@ -53,17 +40,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
53 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, \ 40 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, \
54 KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ 41 KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
55 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ 42 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
56 LOWER,KC_LGUI, KC_LALT, KC_SPC, KC_ENT, KC_BSPC, KC_RGUI, RAISE \ 43 MO(_LOWER),KC_LGUI, KC_LALT, LT(_LOWER,KC_SPC), LT(_RAISE,KC_ENT), KC_BSPC, KC_RGUI, MO(_RAISE) \
57), 44),
58/* LOWER 45/* LOWER
59 * ,-----------------------------------------. ,-----------------------------------------. 46 * ,-----------------------------------------. ,-----------------------------------------.
60 * | | | | | | | | | | | | | | 47 * | | | | | | | | | | | | | |
61 * |------+------+------+------+------+------| |------+------+------+------+------+------| 48 * |------+------+------+------+------+------| |------+------+------+------+------+------|
62 * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | 49 * | | ! | @ | # | $ | % | | ^ | & | * | ( | ) | |
63 * |------+------+------+------+------+------| |------+------+------+------+------+------| 50 * |------+------+------+------+------+------| |------+------+------+------+------+------|
64 * | ~ | ! | @ | # | $ | % |-------. ,-------| ^ | & | * | ( | ) | - | 51 * | | 1 | 2 | 3 | 4 | 5 |-------. ,-------| 6 | 7 | 8 | 9 | 0 | |
65 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| 52 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
66 * | | | | | | |-------| |-------| | _ | + | { | } | | | 53 * | | | | | | |-------| |-------| | | ` | + | { | } | |
67 * `-----------------------------------------/ / \ \-----------------------------------------' 54 * `-----------------------------------------/ / \ \-----------------------------------------'
68 * |LOWER | LGUI | Alt | /Space / \Enter \ |BackSP| RGUI |RAISE | 55 * |LOWER | LGUI | Alt | /Space / \Enter \ |BackSP| RGUI |RAISE |
69 * | | | |/ / \ \ | | | | 56 * | | | |/ / \ \ | | | |
@@ -71,20 +58,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
71 */ 58 */
72[_LOWER] = LAYOUT( \ 59[_LOWER] = LAYOUT( \
73 _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, _______, _______,\ 60 _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, _______, _______,\
74 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ 61 _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
75 _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILD, \ 62 _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \
76 _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ 63 _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE, KC_GRAVE, KC_PLUS, KC_LCBR, KC_RCBR, _______, \
77 _______, _______, _______, _______, _______, _______, _______, _______\ 64 _______, _______, _______, _______, _______, _______, _______, _______\
78), 65),
79/* RAISE 66/* RAISE
80 * ,-----------------------------------------. ,-----------------------------------------. 67 * ,-----------------------------------------. ,-----------------------------------------.
81 * | | | | | | | | | | | | | | 68 * | | | | | | | | | | | | | |
82 * |------+------+------+------+------+------| |------+------+------+------+------+------| 69 * |------+------+------+------+------+------| |------+------+------+------+------+------|
83 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | 70 * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 |
84 * |------+------+------+------+------+------| |------+------+------+------+------+------| 71 * |------+------+------+------+------+------| |------+------+------+------+------+------|
85 * | F1 | F2 | F3 | F4 | F5 | F6 |-------. ,-------| | Left | Down | Up |Right | | 72 * | | | | | | |-------. ,-------| | Left | Down | Up |Right | |
86 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| 73 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
87 * | F7 | F8 | F9 | F10 | F11 | F12 |-------| |-------| + | - | = | [ | ] | \ | 74 * | | | | | | |-------| |-------| + | = | [ | ] | \ | |
88 * `-----------------------------------------/ / \ \-----------------------------------------' 75 * `-----------------------------------------/ / \ \-----------------------------------------'
89 * |LOWER | LGUI | Alt | /Space / \Enter \ |BackSP| RGUI |RAISE | 76 * |LOWER | LGUI | Alt | /Space / \Enter \ |BackSP| RGUI |RAISE |
90 * | | | |/ / \ \ | | | | 77 * | | | |/ / \ \ | | | |
@@ -93,9 +80,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
93 80
94[_RAISE] = LAYOUT( \ 81[_RAISE] = LAYOUT( \
95 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ 82 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
96 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ 83 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \
97 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, \ 84 _______, _______, _______, _______, _______, _______, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, \
98 KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PLUS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ 85 _______, _______, _______, _______, _______, _______, _______, _______, KC_PLUS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, \
99 _______, _______, _______, _______, _______, _______, _______, _______ \ 86 _______, _______, _______, _______, _______, _______, _______, _______ \
100), 87),
101 88
@@ -105,9 +92,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
105 * |------+------+------+------+------+------| |------+------+------+------+------+------| 92 * |------+------+------+------+------+------| |------+------+------+------+------+------|
106 * | | | | | | | | | | | | | | 93 * | | | | | | | | | | | | | |
107 * |------+------+------+------+------+------| |------+------+------+------+------+------| 94 * |------+------+------+------+------+------| |------+------+------+------+------+------|
108 * | | | | | | |-------. ,-------| | |RGB ON| HUE+ | SAT+ | VAL+ | 95 * | | | | | | |-------. ,-------| | | | | | |
109 * |------+------+------+------+------+------| | | |------+------+------+------+------+------| 96 * |------+------+------+------+------+------| | | |------+------+------+------+------+------|
110 * | | | | | | |-------| |-------| | | MODE | HUE- | SAT- | VAL- | 97 * | | | | | | |-------| |-------| | | | | | |
111 * `-----------------------------------------/ / \ \-----------------------------------------' 98 * `-----------------------------------------/ / \ \-----------------------------------------'
112 * |LOWER | LGUI | Alt | /Space / \Enter \ |BackSP| RGUI |RAISE | 99 * |LOWER | LGUI | Alt | /Space / \Enter \ |BackSP| RGUI |RAISE |
113 * | | | |/ / \ \ | | | | 100 * | | | |/ / \ \ | | | |
@@ -116,13 +103,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
116 [_ADJUST] = LAYOUT( \ 103 [_ADJUST] = LAYOUT( \
117 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 104 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
118 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 105 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
119 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \ 106 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
120 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,\ 107 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
121 _______, _______, _______, _______, _______, _______, _______, _______ \ 108 _______, _______, _______, _______, _______, _______, _______, _______ \
122 ) 109 )
123}; 110};
124 111
125int RGB_current_mode;
126 112
127// Setting ADJUST layer RGB back to default 113// Setting ADJUST layer RGB back to default
128void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) { 114void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
@@ -133,12 +119,6 @@ void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
133 } 119 }
134} 120}
135 121
136void matrix_init_user(void) {
137 #ifdef RGBLIGHT_ENABLE
138 RGB_current_mode = rgblight_config.mode;
139 #endif
140}
141
142//SSD1306 OLED update loop, make sure to enable OLED_DRIVER_ENABLE=yes in rules.mk 122//SSD1306 OLED update loop, make sure to enable OLED_DRIVER_ENABLE=yes in rules.mk
143#ifdef OLED_DRIVER_ENABLE 123#ifdef OLED_DRIVER_ENABLE
144 124
@@ -148,7 +128,7 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
148 return rotation; 128 return rotation;
149} 129}
150 130
151// When add source files to SRC in rules.mk, you can use functions. 131// When you add source files to SRC in rules.mk, you can use functions.
152const char *read_layer_state(void); 132const char *read_layer_state(void);
153const char *read_logo(void); 133const char *read_logo(void);
154void set_keylog(uint16_t keycode, keyrecord_t *record); 134void set_keylog(uint16_t keycode, keyrecord_t *record);
@@ -160,12 +140,8 @@ const char *read_keylogs(void);
160// void set_timelog(void); 140// void set_timelog(void);
161// const char *read_timelog(void); 141// const char *read_timelog(void);
162 142
163void matrix_scan_user(void) { 143void oled_task_user(void) {
164 iota_gfx_task(); 144 if (is_keyboard_master()) {
165}
166
167void matrix_render_user(struct CharacterMatrix *matrix) {
168 if (is_master) {
169 // If you want to change the display of OLED, you need to change here 145 // If you want to change the display of OLED, you need to change here
170 oled_write_ln(read_layer_state(), false); 146 oled_write_ln(read_layer_state(), false);
171 oled_write_ln(read_keylog(), false); 147 oled_write_ln(read_keylog(), false);
@@ -177,8 +153,7 @@ void matrix_render_user(struct CharacterMatrix *matrix) {
177 oled_write(read_logo(), false); 153 oled_write(read_logo(), false);
178 } 154 }
179} 155}
180 156#endif // OLED_DRIVER_ENABLE
181#endif//SSD1306OLED
182 157
183bool process_record_user(uint16_t keycode, keyrecord_t *record) { 158bool process_record_user(uint16_t keycode, keyrecord_t *record) {
184 if (record->event.pressed) { 159 if (record->event.pressed) {
@@ -187,42 +162,5 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
187#endif 162#endif
188 // set_timelog(); 163 // set_timelog();
189 } 164 }
190
191 switch (keycode) {
192 case QWERTY:
193 if (record->event.pressed) {
194 set_single_persistent_default_layer(_QWERTY);
195 }
196 return false;
197 break;
198 case LOWER:
199 if (record->event.pressed) {
200 layer_on(_LOWER);
201 update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
202 } else {
203 layer_off(_LOWER);
204 update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
205 }
206 return false;
207 break;
208 case RAISE:
209 if (record->event.pressed) {
210 layer_on(_RAISE);
211 update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
212 } else {
213 layer_off(_RAISE);
214 update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
215 }
216 return false;
217 break;
218 case ADJUST:
219 if (record->event.pressed) {
220 layer_on(_ADJUST);
221 } else {
222 layer_off(_ADJUST);
223 }
224 return false;
225 break;
226 }
227 return true; 165 return true;
228} 166}
diff --git a/keyboards/lily58/keymaps/yuchi/rules.mk b/keyboards/lily58/keymaps/yuchi/rules.mk
index 0db9ac50f..45bf4cfc3 100644
--- a/keyboards/lily58/keymaps/yuchi/rules.mk
+++ b/keyboards/lily58/keymaps/yuchi/rules.mk
@@ -13,8 +13,9 @@ MIDI_ENABLE = no # MIDI controls
13AUDIO_ENABLE = no # Audio output on port C6 13AUDIO_ENABLE = no # Audio output on port C6
14UNICODE_ENABLE = no # Unicode 14UNICODE_ENABLE = no # Unicode
15BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID 15BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
16RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. 16RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
17SWAP_HANDS_ENABLE = no # Enable one-hand typing 17SWAP_HANDS_ENABLE = no # Enable one-hand typing
18OLED_DRIVER_ENABLE= yes # OLED display
18 19
19# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 20# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
20SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 21SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
diff --git a/keyboards/lily58/rev1/config.h b/keyboards/lily58/rev1/config.h
index adcf11b52..4443f03c4 100644
--- a/keyboards/lily58/rev1/config.h
+++ b/keyboards/lily58/rev1/config.h
@@ -20,10 +20,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
20#pragma once 20#pragma once
21 21
22/* USB Device descriptor parameter */ 22/* USB Device descriptor parameter */
23#define VENDOR_ID 0xFC51 23#define VENDOR_ID 0x04D8
24#define PRODUCT_ID 0x0058 24#define PRODUCT_ID 0xEB2D
25#define DEVICE_VER 0x0100 25#define DEVICE_VER 0x0100
26#define MANUFACTURER F_YUUCHI 26#define MANUFACTURER liliums
27#define PRODUCT Lily58 27#define PRODUCT Lily58
28#define DESCRIPTION Lily58 is 6×4+5keys column-staggered split keyboard. 28#define DESCRIPTION Lily58 is 6×4+5keys column-staggered split keyboard.
29 29
diff --git a/keyboards/lily58/rev1/info.json b/keyboards/lily58/rev1/info.json
index 4a3568c3e..dcafc96fa 100644
--- a/keyboards/lily58/rev1/info.json
+++ b/keyboards/lily58/rev1/info.json
@@ -1,7 +1,7 @@
1{ 1{
2 "keyboard_name": "Lily58", 2 "keyboard_name": "Lily58",
3 "url": "", 3 "url": "",
4 "maintainer": "F_YUUCHI", 4 "maintainer": "liliums",
5 "width": 16.5, 5 "width": 16.5,
6 "height": 5.25, 6 "height": 5.25,
7 "layouts": { 7 "layouts": {
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-03 16:30:40 +0000