diff --git a/app.c b/app.c index 49e1399..e6aeab6 100644 --- a/app.c +++ b/app.c @@ -20,7 +20,7 @@ static void FUN_00005144(void) { - if (g_200003B0 != 1) { + if (g_SquelchLost != 1) { return; } if (gCurrentStep == 0) { diff --git a/functions.c b/functions.c index 61ab881..bfd2995 100644 --- a/functions.c +++ b/functions.c @@ -54,7 +54,7 @@ void FUNCTION_Init(void) g_CDCSS_Lost = false; g_CTCSS_Lost = false; g_VOX_Lost = false; - g_200003B0 = 0; + g_SquelchLost = false; g_20000342 = 0; gSystickFlag10 = false; g_20000375 = 0; diff --git a/gui.c b/gui.c index 57d7575..461cb80 100644 --- a/gui.c +++ b/gui.c @@ -172,6 +172,7 @@ GUI_DisplayType_t gScreenToDisplay; uint8_t g_200003C6; volatile uint8_t gCurrentStep; volatile int8_t g_20000390; +GUI_DisplayType_t gRequestDisplayScreen; uint8_t g_200003BA; uint8_t g_200003BB; uint8_t gWasFKeyPressed; diff --git a/gui.h b/gui.h index 9e277ca..6f22b3d 100644 --- a/gui.h +++ b/gui.h @@ -95,6 +95,7 @@ extern GUI_DisplayType_t gScreenToDisplay; extern uint8_t g_200003C6; extern volatile uint8_t gCurrentStep; extern volatile int8_t g_20000390; +extern GUI_DisplayType_t gRequestDisplayScreen; extern uint8_t g_200003BA; extern uint8_t g_200003BB; extern uint8_t gWasFKeyPressed; diff --git a/misc.c b/misc.c index c6691e2..cfabc49 100644 --- a/misc.c +++ b/misc.c @@ -76,10 +76,11 @@ bool g_20000394; uint8_t gKeypadLocked; uint8_t g_200003AA; bool g_CDCSS_Lost; +uint8_t gCDCSSCodeReceived; bool g_CTCSS_Lost; bool g_CxCSS_TAIL_Found; bool g_VOX_Lost; -uint8_t g_200003B0; +bool g_SquelchLost; uint8_t gFlashLightState; uint8_t g_200003B3; uint16_t g_200003B6; diff --git a/misc.h b/misc.h index 89ddc47..a5fd52b 100644 --- a/misc.h +++ b/misc.h @@ -85,10 +85,11 @@ extern bool g_20000394; extern uint8_t gKeypadLocked; extern uint8_t g_200003AA; extern bool g_CDCSS_Lost; +extern uint8_t gCDCSSCodeReceived; extern bool g_CTCSS_Lost; extern bool g_CxCSS_TAIL_Found; extern bool g_VOX_Lost; -extern uint8_t g_200003B0; +extern bool g_SquelchLost; extern uint8_t gFlashLightState; extern uint16_t g_200003B6; extern uint16_t g_200003B8;