Moved SPLIT_KEYBOARD setting from rules to .json

This commit is contained in:
Ryan Neff 2023-11-29 16:06:40 -08:00
parent 161b8f5c8d
commit e479049283
4 changed files with 98 additions and 71 deletions

View File

@ -116,6 +116,7 @@
] ]
}, },
"split": { "split": {
"enabled": true,
"encoder": { "encoder": {
"right": { "right": {
"rotary": [ "rotary": [

View File

@ -220,6 +220,15 @@
return OLED_ROTATION_90; return OLED_ROTATION_90;
} }
} }
static void render_qmk_logo(void) {
static const char PROGMEM qmk_logo[] = {
0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0
};
oled_write_P(qmk_logo, false);
}
static void render_logo(void) { static void render_logo(void) {
// @todo - should we split this into a seperate file? kb16 has a good example. // @todo - should we split this into a seperate file? kb16 has a good example.
static const char PROGMEM sofle_pico_logo[] = { static const char PROGMEM sofle_pico_logo[] = {
@ -326,7 +335,11 @@
static bool finished_logo = false; static bool finished_logo = false;
if ((timer_elapsed(startup_timer) < OLED_LOGO_TIMEOUT) && !finished_logo) { if ((timer_elapsed(startup_timer) < OLED_LOGO_TIMEOUT) && !finished_logo) {
// Display the logo for 5 seconds on boot. // Display the logo for 5 seconds on boot.
if (is_keyboard_master()) {
render_logo(); render_logo();
} else {
render_qmk_logo();
}
} else { } else {
// Display the current keyboard state. // Display the current keyboard state.
if (!finished_logo) { if (!finished_logo) {

View File

@ -0,0 +1,15 @@
// Copyright 2022 Dane Skalski (@Daneski13)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
/* Default Bootmagic lite */
// Top left for left side is default in core
// Top right for right side
#ifndef BOOTMAGIC_LITE_ROW_RIGHT
# define BOOTMAGIC_LITE_ROW_RIGHT 5
#endif
#ifndef BOOTMAGIC_LITE_COLUMN_RIGHT
# define BOOTMAGIC_LITE_COLUMN_RIGHT 0
#endif

View File

@ -1,4 +1,2 @@
# Split Keyboard Stuff
SPLIT_KEYBOARD = yes
SERIAL_DRIVER = vendor SERIAL_DRIVER = vendor
# @todo: Move to json # @todo: Move to json