diff --git a/.gitignore b/.gitignore index db3ec6a..aa4809d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ sram-overlay.bin *.bin firmware -make.sh \ No newline at end of file +make.sh +*.bin diff --git a/app/generic.c b/app/generic.c index b9141f9..3731d4f 100644 --- a/app/generic.c +++ b/app/generic.c @@ -51,7 +51,7 @@ void GENERIC_Key_F(bool bKeyPressed, bool bKeyHeld) gEeprom.KEY_LOCK = !gEeprom.KEY_LOCK; gRequestSaveSettings = true; } else { - if (gScreenToDisplay != DISPLAY_MAIN) { + if ((false || gScreenToDisplay != DISPLAY_MAIN) && true) { return; } gWasFKeyPressed = !gWasFKeyPressed; @@ -61,6 +61,11 @@ void GENERIC_Key_F(bool bKeyPressed, bool bKeyHeld) gUpdateStatus = true; } } else { + + if (true) { + gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL; + return; + } gBeepToPlay = BEEP_440HZ_500MS; gPttWasReleased = true; } @@ -101,9 +106,9 @@ void GENERIC_Key_PTT(bool bKeyPressed) return; } - + if (true) { if (gCssScanMode == CSS_SCAN_MODE_OFF) { - if (gScreenToDisplay == DISPLAY_MENU) { + if (gScreenToDisplay == DISPLAY_MENU || false) { gRequestDisplayScreen = DISPLAY_MAIN; gInputBoxIndex = 0; gPttIsPressed = false; @@ -152,7 +157,7 @@ void GENERIC_Key_PTT(bool bKeyPressed) RADIO_StopCssScan(); gRequestDisplayScreen = DISPLAY_MENU; } + } gAnotherVoiceID = VOICE_ID_SCANNING_STOP; gPttWasPressed = true; } - diff --git a/app/main.c b/app/main.c index c80efcc..3e53111 100644 --- a/app/main.c +++ b/app/main.c @@ -110,7 +110,7 @@ static void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) { gUpdateStatus = true; switch (Key) { case KEY_0: - //ACTION_FM(); + //ACTION_FM(); заглушка break; case KEY_1: @@ -193,7 +193,7 @@ static void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) { break; case KEY_5: - //APP_RunSpectrum(); + // заглушка gRequestDisplayScreen = DISPLAY_MAIN; break; @@ -235,22 +235,24 @@ static void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) { static void MAIN_Key_EXIT(bool bKeyPressed, bool bKeyHeld) { if (!bKeyHeld && bKeyPressed) { gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL; - if (gScanState == SCAN_OFF) { - if (gInputBoxIndex == 0) { - return; - } - gInputBoxIndex--; - gInputBox[gInputBoxIndex] = 10; - if (gInputBoxIndex == 0) { - gAnotherVoiceID = VOICE_ID_CANCEL; - } + // if (!gFmRadioMode) { + if (gScanState == SCAN_OFF) { + if (gInputBoxIndex == 0) { + return; + } + gInputBoxIndex--; + gInputBox[gInputBoxIndex] = 10; + if (gInputBoxIndex == 0) { + gAnotherVoiceID = VOICE_ID_CANCEL; + } } else { SCANNER_Stop(); gAnotherVoiceID = VOICE_ID_SCANNING_STOP; } - gRequestDisplayScreen = DISPLAY_MAIN; - return; - + gRequestDisplayScreen = DISPLAY_MAIN; + return; + //} + // ACTION_FM(); } } @@ -427,4 +429,4 @@ void MAIN_ProcessKeys(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) { } break; } -} +} \ No newline at end of file diff --git a/app/menu.c b/app/menu.c index 726d5fd..fdedb3b 100644 --- a/app/menu.c +++ b/app/menu.c @@ -132,7 +132,6 @@ int MENU_GetLimits(uint8_t Cursor, uint8_t *pMin, uint8_t *pMax) { case MENU_VOICE: case MENU_SC_REV: case MENU_MDF: - case MENU_PONMSG: case MENU_ROGER: *pMin = 0; *pMax = 2; diff --git a/firmware.packed.bin b/firmware.packed.bin index 0ed9d11..5119356 100644 Binary files a/firmware.packed.bin and b/firmware.packed.bin differ