From 928bbded6dd434d1b54190e4acd162428e412457 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Mon, 25 Jul 2022 18:40:14 -0700 Subject: [Keyboard] Fix compilation issues for Charybdis/Dilemma (#17791) * [Keyboard] Fix debug printing for Charybdis/Dilemma * Fix compliation issue for dilemma --- keyboards/bastardkb/charybdis/charybdis.c | 12 +++++++----- keyboards/bastardkb/dilemma/dilemma.c | 11 +++++++---- keyboards/bastardkb/dilemma/rules.mk | 2 ++ 3 files changed, 16 insertions(+), 9 deletions(-) (limited to 'keyboards/bastardkb') diff --git a/keyboards/bastardkb/charybdis/charybdis.c b/keyboards/bastardkb/charybdis/charybdis.c index d0619ef172..60bca936e7 100644 --- a/keyboards/bastardkb/charybdis/charybdis.c +++ b/keyboards/bastardkb/charybdis/charybdis.c @@ -243,10 +243,10 @@ static void debug_charybdis_config_to_console(charybdis_config_t* config) { dprintf("(charybdis) process_record_kb: config = {\n" "\traw = 0x%X,\n" "\t{\n" - "\t\tis_dragscroll_enabled=%b\n" - "\t\tis_sniping_enabled=%b\n" - "\t\tdefault_dpi=0x%X (%ld)\n" - "\t\tsniping_dpi=0x%X (%ld)\n" + "\t\tis_dragscroll_enabled=%u\n" + "\t\tis_sniping_enabled=%u\n" + "\t\tdefault_dpi=0x%X (%u)\n" + "\t\tsniping_dpi=0x%X (%u)\n" "\t}\n" "}\n", config->raw, config->is_dragscroll_enabled, config->is_sniping_enabled, config->pointer_default_dpi, get_pointer_default_dpi(config), config->pointer_sniping_dpi, get_pointer_sniping_dpi(config)); @@ -314,7 +314,9 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) { } # endif // !MOUSEKEY_ENABLE # endif // POINTING_DEVICE_ENABLE - debug_charybdis_config_to_console(&g_charybdis_config); + if ((keycode >= POINTER_DEFAULT_DPI_FORWARD && keycode < CHARYBDIS_SAFE_RANGE) || IS_MOUSEKEY(keycode)) { + debug_charybdis_config_to_console(&g_charybdis_config); + } return true; } diff --git a/keyboards/bastardkb/dilemma/dilemma.c b/keyboards/bastardkb/dilemma/dilemma.c index b4d3ba5de1..e710f3aab7 100644 --- a/keyboards/bastardkb/dilemma/dilemma.c +++ b/keyboards/bastardkb/dilemma/dilemma.c @@ -246,10 +246,10 @@ static void debug_dilemma_config_to_console(dilemma_config_t* config) { dprintf("(dilemma) process_record_kb: config = {\n" "\traw = 0x%X,\n" "\t{\n" - "\t\tis_dragscroll_enabled=%b\n" - "\t\tis_sniping_enabled=%b\n" - "\t\tdefault_dpi=0x%X (%ld)\n" - "\t\tsniping_dpi=0x%X (%ld)\n" + "\t\tis_dragscroll_enabled=%u\n" + "\t\tis_sniping_enabled=%u\n" + "\t\tdefault_dpi=0x%X (%u)\n" + "\t\tsniping_dpi=0x%X (%u)\n" "\t}\n" "}\n", config->raw, config->is_dragscroll_enabled, config->is_sniping_enabled, config->pointer_default_dpi, get_pointer_default_dpi(config), config->pointer_sniping_dpi, get_pointer_sniping_dpi(config)); @@ -308,6 +308,9 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) { # endif // !NO_DILEMMA_KEYCODES # endif // POINTING_DEVICE_ENABLE debug_dilemma_config_to_console(&g_dilemma_config); + if ((keycode >= POINTER_DEFAULT_DPI_FORWARD && keycode < DILEMMA_SAFE_RANGE) || IS_MOUSEKEY(keycode)) { + debug_dilemma_config_to_console(&g_dilemma_config); + } return true; } diff --git a/keyboards/bastardkb/dilemma/rules.mk b/keyboards/bastardkb/dilemma/rules.mk index 1a6fc9e72c..499eadfdfb 100644 --- a/keyboards/bastardkb/dilemma/rules.mk +++ b/keyboards/bastardkb/dilemma/rules.mk @@ -21,3 +21,5 @@ POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c SPLIT_KEYBOARD = yes LAYOUTS = split_3x5_2 + +DEFAULT_FOLDER = bastardkb/dilemma/splinky -- cgit v1.2.1