tgrosinger/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fl16: cleanup

Browse Source 
Signed-off-by: Daniel Schaefer <dhs@frame.work>
This commit is contained in:
Daniel Schaefer 2023-11-30 09:09:33 +08:00
parent d3bbd0beef
commit 05798c19c1
5 changed files with 33 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
keyboards/framework/factory.c
View File

@ -66,21 +66,9 @@ void handle_factory_command(uint8_t *data) {
break;
case f_bios_mode:
if (command_data[0] == 0x01) {
bios_mode = true;
// Red
#if defined(RGB_MATRIX_ENABLE)
rgb_matrix_sethsv_noeeprom(0, 0xFF, 0xFF);
rgb_matrix_mode_noeeprom(1);
#endif
writePin(GP24, 1);
set_bios_mode(true);
} else {
// White
#if defined(RGB_MATRIX_ENABLE)
rgb_matrix_sethsv_noeeprom(0, 0, 0xFF);
rgb_matrix_mode_noeeprom(1);
#endif
//bios_mode = false;
writePin(GP24, 0);
set_bios_mode(false);
}
break;
case f_factory_mode:

36
keyboards/framework/framework.c
View File

@ -67,6 +67,27 @@ void suspend_wakeup_init_kb(void) {
// If in BIOS mode, no matter what the keys have been remapped to, always send them as the F keys
bool bios_mode = true;
void set_bios_mode(bool val) {
bios_mode = val;
#ifdef BIOS_HOTKEY_DEBUG
if (bios_mode) {
// Red
#if defined(RGB_MATRIX_ENABLE)
rgb_matrix_sethsv_noeeprom(0, 0xFF, 0xFF);
rgb_matrix_mode_noeeprom(1);
#endif
writePin(GP24, 1);
} else {
// White
#if defined(RGB_MATRIX_ENABLE)
rgb_matrix_sethsv_noeeprom(0, 0, 0xFF);
rgb_matrix_mode_noeeprom(1);
#endif
writePin(GP24, 0);
}
#endif
}
bool handle_bios_hotkeys(uint16_t keycode, keyrecord_t *record) {
// Not in bios mode, no special handling, handle as normal
if (!bios_mode)
@ -176,11 +197,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
process_record_user(keycode, record);
os_variant_t os = detected_host_os();
#if defined(RGB_MATRIX_ENABLE)
//rgb_matrix_mode_noeeprom(1);
#endif
bios_mode = true;
writePin(GP24, 0);
set_bios_mode(true);
//#if defined(RGB_MATRIX_ENABLE)
// switch (os) {
// case OS_UNSURE:
@ -217,19 +234,16 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
case OS_UNSURE:
break;
case OS_LINUX:
bios_mode = false;
writePin(GP24, 1);
set_bios_mode(false);
break;
case OS_WINDOWS:
bios_mode = false;
writePin(GP24, 1);
set_bios_mode(false);
break;
case OS_MACOS:
break;
case OS_UEFI:
case OS_IOS:
bios_mode = true;
writePin(GP24, 0);
set_bios_mode(true);
// works on M1 mac
break;
}

6
keyboards/framework/framework.h
View File

@ -25,6 +25,12 @@ enum framework_keycodes {
extern bool bios_mode;
// Uncomment this to show hotkey mode with capslock LED and backlight
// hotkey mode on: capslock ON, RGB red
// hotkey mode off: capslock OFF, RGB white
//#define BIOS_HOTKEY_DEBUG
void set_bios_mode(bool val);
#define SLEEP_GPIO GP0
#define MUX_ENABLE_GPIO GP4
#define BOOT_DONE_GPIO GP5

20
keyboards/framework/matrix.c
View File

@ -313,26 +313,10 @@ bool handle_idle(void) {
return false;
}
#ifdef RGB_MATRIX_ENABLE
static bool rgb_init = false;
static uint16_t rgb_init_timer = 0;
#endif
/**
* Overriding behavior of matrix_scan from quantum/matrix.c
*/
bool matrix_scan_custom(matrix_row_t current_matrix[]) {
#ifdef RGB_MATRIX_ENABLE
if (!rgb_init) {
if (!bios_mode) {
//if (rgb_init_timer > 0 && TIMER_DIFF_16(timer_read(), rgb_init_timer) >= 10000) {
//if (rgb_init_timer > 0 && TIMER_DIFF_16(timer_read(), rgb_init_timer) >= 100) {
//if (!bios_mode || rgb_init_timer > 0 && TIMER_DIFF_16(timer_read(), rgb_init_timer) >= 10000) {
//rgb_matrix_init();
rgb_init = true;
}
}
#endif
bool changed = false;
adc10ksample_t voltages[MATRIX_ROWS][MATRIX_COLS] = {};
@ -452,8 +436,4 @@ void matrix_init_custom(void) {
// Set unused pins to input to avoid interfering. They're hooked up to rows 5 and 6
setPinInput(GP6);
setPinInput(GP7);
#ifdef RGB_MATRIX_ENABLE
rgb_init_timer = timer_read();
#endif
}

4
quantum/os_detection.c
View File

@ -54,10 +54,6 @@ void make_guess(void) {
//if (setups_data.count < 3 && setups_data.cnt_zoid != 0) {
// return;
//}
//if (setups_data.cnt_zoid == 0) {
// detected_os = OS_UEFI;
// return;
//}
if (setups_data.cnt_zoid == 0) {
detected_os = OS_UEFI;
return;