From 034306db485ea0f4c14d94dbfcc0b2ca027b4518 Mon Sep 17 00:00:00 2001 From: Arceveti Date: Thu, 10 Aug 2023 21:45:27 -0700 Subject: [PATCH] Clean up settings defaults in INCLUDE_DEBUG_MAP ifderfs --- src/crash_screen/crash_main.c | 15 +++++++++++---- src/crash_screen/crash_main.h | 7 ------- src/crash_screen/crash_types.h | 5 +++++ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/crash_screen/crash_main.c b/src/crash_screen/crash_main.c index 918a3c6c2..2c5001376 100644 --- a/src/crash_screen/crash_main.c +++ b/src/crash_screen/crash_main.c @@ -44,29 +44,36 @@ const char* sValNames_branch_arrow[] = { #ifdef INCLUDE_DEBUG_MAP [DISASM_ARROW_MODE_FUNCTION ] = "FUNCTION", #endif - [DISASM_ARROW_MODE_OVERSCAN ] = "OVERSCAN", //! TODO: Implement this. + [DISASM_ARROW_MODE_OVERSCAN ] = "OVERSCAN", //! TODO: Implement this in page_disasm.c. }; #ifdef INCLUDE_DEBUG_MAP - #define DISASM_ARROW_MODE_DEFAULT DISASM_ARROW_MODE_FUNCTION + #define SHOW_FUNC_NAMES_DEFAULT TRUE + #define DISASM_ARROW_MODE_DEFAULT DISASM_ARROW_MODE_FUNCTION #else - #define DISASM_ARROW_MODE_DEFAULT DISASM_ARROW_MODE_SELECTION + #define SHOW_FUNC_NAMES_DEFAULT FALSE + #define DISASM_ARROW_MODE_DEFAULT DISASM_ARROW_MODE_SELECTION #endif -struct CSSettingsEntry gCSSettings[NUM_CS_OPTS] = { //! TODO: Callback functions. +struct CSSettingsEntry gCSSettings[NUM_CS_OPTS] = { //! TODO: Callback functions. //! TODO: Collapsible(?) page name non-setting entries (A+B to reset only that page to default) [CS_OPT_RESET_TO_DEFAULTS ] = { .name = "reset all to defaults", .valNames = &sValNames_bool, .val = FALSE, .defaultVal = FALSE, .lowerBound = FALSE, .upperBound = TRUE, }, + // GLOBAL: [CS_OPT_DRAW_SCREENSHOT ] = { .name = "Show screenshot background", .valNames = &sValNames_bool, .val = TRUE, .defaultVal = TRUE, .lowerBound = FALSE, .upperBound = TRUE, }, #ifdef INCLUDE_DEBUG_MAP [CS_OPT_FUNCTION_NAMES ] = { .name = "Print function names", .valNames = &sValNames_bool, .val = SHOW_FUNC_NAMES_DEFAULT, .defaultVal = SHOW_FUNC_NAMES_DEFAULT, .lowerBound = FALSE, .upperBound = TRUE, }, #endif + // CONTROLS: [CS_OPT_PRINT_SCROLL_SPEED] = { .name = "Print overscan scroll speed", .valNames = NULL, .val = 2, .defaultVal = 2, .lowerBound = 0, .upperBound = 5, }, [CS_OPT_CURSOR_WAIT_FRAMES] = { .name = "Hold in direction wait frames", .valNames = NULL, .val = 10, .defaultVal = 10, .lowerBound = 0, .upperBound = 1000, }, [CS_OPT_ANALOG_DEADZONE ] = { .name = "Analog deadzone", .valNames = NULL, .val = 60, .defaultVal = 60, .lowerBound = 0, .upperBound = 128, }, + // CONTEXT: #ifdef INCLUDE_DEBUG_MAP [CS_OPT_CONTEXT_PARSE_REG ] = { .name = "CONTEXT: Parse reg addr names", .valNames = &sValNames_bool, .val = FALSE, .defaultVal = FALSE, .lowerBound = FALSE, .upperBound = TRUE, }, #endif [CS_OPT_CONTEXT_FLOATS_FMT] = { .name = "CONTEXT: Floats print format", .valNames = &sValNames_print_num_fmt, .val = PRINT_NUM_FMT_DEC, .defaultVal = PRINT_NUM_FMT_DEC, .lowerBound = PRINT_NUM_FMT_HEX, .upperBound = PRINT_NUM_FMT_SCI, }, + // RAM VIEW: [CS_OPT_MEMORY_AS_ASCII ] = { .name = "RAM VIEW: As ascii", .valNames = &sValNames_bool, .val = TRUE, .defaultVal = TRUE, .lowerBound = FALSE, .upperBound = TRUE, }, + // DISASM: [CS_OPT_DISASM_BINARY ] = { .name = "DISASM: Unknown as binary", .valNames = &sValNames_bool, .val = FALSE, .defaultVal = FALSE, .lowerBound = FALSE, .upperBound = TRUE, }, [CS_OPT_DISASM_PSEUDOINSNS] = { .name = "DISASM: Pseudoinstructions", .valNames = &sValNames_bool, .val = TRUE, .defaultVal = TRUE, .lowerBound = FALSE, .upperBound = TRUE, }, [CS_OPT_DISASM_IMM_FMT ] = { .name = "DISASM: Immediates format", .valNames = &sValNames_print_num_fmt, .val = PRINT_NUM_FMT_HEX, .defaultVal = PRINT_NUM_FMT_HEX, .lowerBound = PRINT_NUM_FMT_HEX, .upperBound = PRINT_NUM_FMT_DEC, }, diff --git a/src/crash_screen/crash_main.h b/src/crash_screen/crash_main.h index 55edbfb20..a5ab3b3f4 100644 --- a/src/crash_screen/crash_main.h +++ b/src/crash_screen/crash_main.h @@ -13,13 +13,6 @@ #include "memory_read.h" -#ifdef INCLUDE_DEBUG_MAP - #define SHOW_FUNC_NAMES_DEFAULT TRUE -#else - #define SHOW_FUNC_NAMES_DEFAULT FALSE -#endif - - extern struct CSSettingsEntry gCSSettings[NUM_CS_OPTS]; extern struct CSPage gCSPages[NUM_PAGES]; diff --git a/src/crash_screen/crash_types.h b/src/crash_screen/crash_types.h index bab392011..df8b6388e 100644 --- a/src/crash_screen/crash_types.h +++ b/src/crash_screen/crash_types.h @@ -106,18 +106,23 @@ struct CSSettingsEntry { enum CSSettings { CS_OPT_RESET_TO_DEFAULTS, + // GLOBAL: CS_OPT_DRAW_SCREENSHOT, #ifdef INCLUDE_DEBUG_MAP CS_OPT_FUNCTION_NAMES, #endif + // CONTROLS: CS_OPT_PRINT_SCROLL_SPEED, CS_OPT_CURSOR_WAIT_FRAMES, CS_OPT_ANALOG_DEADZONE, + // CONTEXT: #ifdef INCLUDE_DEBUG_MAP CS_OPT_CONTEXT_PARSE_REG, #endif CS_OPT_CONTEXT_FLOATS_FMT, + // RAM VIEW: CS_OPT_MEMORY_AS_ASCII, + // DISASM: CS_OPT_DISASM_BINARY, CS_OPT_DISASM_PSEUDOINSNS, CS_OPT_DISASM_IMM_FMT,