diff --git a/Makefile b/Makefile index 26bfaff..c4abdb1 100644 --- a/Makefile +++ b/Makefile @@ -4,13 +4,15 @@ # 1 = enable # ENABLE_SWD := 0 -ENABLE_OVERLAY := 1 +ENABLE_OVERLAY := 0 +ENABLE_LTO := 1 ENABLE_UART := 1 ENABLE_AIRCOPY := 0 ENABLE_FMRADIO := 0 ENABLE_NOAA := 0 ENABLE_VOICE := 0 ENABLE_ALARM := 0 +ENABLE_TX1750 := 0 ENABLE_BIG_FREQ := 1 ENABLE_SMALL_BOLD := 1 ENABLE_KEEP_MEM_NAME := 1 @@ -19,22 +21,28 @@ ENABLE_TX_WHEN_AM := 0 ENABLE_CTCSS_TAIL_PHASE_SHIFT := 1 ENABLE_MAIN_KEY_HOLD := 1 ENABLE_BOOT_BEEPS := 0 -ENABLE_COMPANDER := 1 +ENABLE_COMPANDER := 0 ENABLE_SHOW_CHARGE_LEVEL := 1 ENABLE_REVERSE_BAT_SYMBOL := 1 -ENABLE_NO_SCAN_TIMEOUT := 1 +ENABLE_CODE_SCAN_TIMEOUT := 0 ENABLE_AM_FIX := 1 ENABLE_AM_FIX_SHOW_DATA := 1 ENABLE_SQUELCH_LOWER := 1 ENABLE_RSSI_BAR := 1 -ENABLE_AUDIO_BAR := 1 +ENABLE_AUDIO_BAR := 0 ENABLE_SPECTRUM := 1 -#ENABLE_COPY_CHAN_TO_VFO := 1 -#ENABLE_SINGLE_VFO_CHAN := 1 -#ENABLE_BAND_SCOPE := 1 +#ENABLE_COPY_CHAN_TO_VFO := 1 +#ENABLE_SINGLE_VFO_CHAN := 1 +#ENABLE_BAND_SCOPE := 1 + +############################################################# TARGET = firmware +ifeq ($(ENABLE_LTO),1) + ENABLE_OVERLAY := 0 +endif + BSP_DEFINITIONS := $(wildcard hardware/*/*.def) BSP_HEADERS := $(patsubst hardware/%,bsp/%,$(BSP_DEFINITIONS)) BSP_HEADERS := $(patsubst %.def,%.h,$(BSP_HEADERS)) @@ -158,6 +166,11 @@ CFLAGS = -Os -Wall -Werror -mcpu=cortex-m0 -fno-builtin -fshort-enums -fno-delet #CFLAGS = -Os -Wall -Werror -mcpu=cortex-m0 -fno-builtin -fshort-enums -fno-delete-null-pointer-checks -std=gnu99 -MMD #CFLAGS = -Os -Wall -Werror -mcpu=cortex-m0 -fno-builtin -fshort-enums -fno-delete-null-pointer-checks -std=gnu11 -MMD +ifeq ($(ENABLE_LTO),1) +# CFLAGS += -flto + CFLAGS += -flto=2 +endif + CFLAGS += -DPRINTF_INCLUDE_CONFIG_H CFLAGS += -DGIT_HASH=\"$(GIT_HASH)\" @@ -167,15 +180,15 @@ endif ifeq ($(ENABLE_SWD),1) CFLAGS += -DENABLE_SWD endif +ifeq ($(ENABLE_OVERLAY),1) + CFLAGS += -DENABLE_OVERLAY +endif ifeq ($(ENABLE_AIRCOPY),1) CFLAGS += -DENABLE_AIRCOPY endif ifeq ($(ENABLE_FMRADIO),1) CFLAGS += -DENABLE_FMRADIO endif -ifeq ($(ENABLE_OVERLAY),1) - CFLAGS += -DENABLE_OVERLAY -endif ifeq ($(ENABLE_UART),1) CFLAGS += -DENABLE_UART endif @@ -194,6 +207,9 @@ endif ifeq ($(ENABLE_ALARM),1) CFLAGS += -DENABLE_ALARM endif +ifeq ($(ENABLE_TX1750),1) + CFLAGS += -DENABLE_TX1750 +endif ifeq ($(ENABLE_KEEP_MEM_NAME),1) CFLAGS += -DKEEP_MEM_NAME endif @@ -221,8 +237,8 @@ endif ifeq ($(ENABLE_REVERSE_BAT_SYMBOL),1) CFLAGS += -DENABLE_REVERSE_BAT_SYMBOL endif -ifeq ($(ENABLE_NO_SCAN_TIMEOUT),1) - CFLAGS += -DENABLE_NO_SCAN_TIMEOUT +ifeq ($(ENABLE_CODE_SCAN_TIMEOUT),1) + CFLAGS += -DENABLE_CODE_SCAN_TIMEOUT endif ifeq ($(ENABLE_AM_FIX),1) CFLAGS += -DENABLE_AM_FIX diff --git a/README.md b/README.md index 8ea39d8..c88fc61 100644 --- a/README.md +++ b/README.md @@ -52,13 +52,15 @@ You'll find the options at the top of "Makefile" ('0' = disable, '1' = enable) . ``` ENABLE_SWD := 0 only needed if using CPU's SWD port (debugging/programming) -ENABLE_OVERLAY := 1 cpu FLASH stuff +ENABLE_OVERLAY := 0 cpu FLASH stuff +ENABLE_LTO := 0 **experimental, reduces size of compiled firmware but might break EEPROM reads - DISABLE overlay if you enable this ENABLE_UART := 1 without this you can't configure radio via PC ENABLE_AIRCOPY := 0 easier to just enter frequency ENABLE_FMRADIO := 1 WBFM VHF band 2 RX ENABLE_NOAA := 0 everything NOAA ENABLE_VOICE := 0 want to hear voices ? ENABLE_ALARM := 0 TX alarms +ENABLE_1750HZ := 0 side key 1750Hz TX tone ENABLE_BIG_FREQ := 0 big font frequencies ENABLE_SMALL_BOLD := 1 bold channel name/no. (when name + freq channel display mode) ENABLE_KEEP_MEM_NAME := 1 maintain channel name when (re)saving memory channel @@ -70,7 +72,7 @@ ENABLE_BOOT_BEEPS := 0 give user audio feedback on volume knob ENABLE_COMPANDER := 1 compander option (per channel) ENABLE_SHOW_CHARGE_LEVEL := 0 show the charge level when the radio is on charge ENABLE_REVERSE_BAT_SYMBOL := 1 mirror the battery symbol on the status bar (+ pole on the right) -ENABLE_NO_SCAN_TIMEOUT := 1 remove the 32 sec timeout from the CTCSS/DCS scan (press exit butt to end scan) +ENABLE_CODE_SCAN_TIMEOUT := 0 enable/disable 32-sec CTCSS/DCS scan timeout (press exit butt to end scan if disabled) ENABLE_AM_FIX := 1 dynamically adjust the front end gains when in AM mode to helo prevent AM demodulator saturation - ignore the on-screen RSSI (for now) ENABLE_AM_FIX_SHOW_DATA := 1 show debug data for the AM fix ENABLE_SQUELCH_LOWER := 1 squelch settings more sensitive - plan to let user adjust it in the menu diff --git a/am_fix.c b/am_fix.c index d182b3c..ad8ef0a 100644 --- a/am_fix.c +++ b/am_fix.c @@ -438,7 +438,7 @@ const uint8_t orig_pga = 6; // -3dB } } - if (diff_dB >= -4) // 4dB hysterisis (help reduce gain hunting) + if (diff_dB >= -6) // 6dB hysterisis (help reduce gain hunting) hold_counter[vfo] = 30; // 300ms hold if (hold_counter[vfo] == 0) diff --git a/app/action.c b/app/action.c index 5acb8c5..3fa0ca5 100644 --- a/app/action.c +++ b/app/action.c @@ -235,17 +235,27 @@ void ACTION_Vox(void) gUpdateStatus = true; } -#ifdef ENABLE_ALARM +#if defined(ENABLE_ALARM) || defined(ENABLE_TX1750) static void ACTION_AlarmOr1750(bool b1750) { - gInputBoxIndex = 0; - gAlarmState = b1750 ? ALARM_STATE_TX1750 : ALARM_STATE_TXALARM; - gAlarmRunningCounter = 0; - gFlagPrepareTX = true; + gInputBoxIndex = 0; + + #if defined(ENABLE_ALARM) && defined(ENABLE_TX1750) + gAlarmState = b1750 ? ALARM_STATE_TX1750 : ALARM_STATE_TXALARM; + gAlarmRunningCounter = 0; + #elif defined(ENABLE_ALARM) + gAlarmState = ALARM_STATE_TXALARM; + gAlarmRunningCounter = 0; + #else + gAlarmState = ALARM_STATE_TX1750; + #endif + + gFlagPrepareTX = true; gRequestDisplayScreen = DISPLAY_MAIN; } #endif + #ifdef ENABLE_FMRADIO void ACTION_FM(void) { @@ -368,7 +378,7 @@ void ACTION_Handle(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) break; #endif case ACTION_OPT_1750: - #ifdef ENABLE_ALARM + #ifdef ENABLE_TX1750 ACTION_AlarmOr1750(true); #endif break; diff --git a/app/app.c b/app/app.c index 152f66a..38556e0 100644 --- a/app/app.c +++ b/app/app.c @@ -1832,7 +1832,7 @@ void APP_TimeSlice500ms(void) } else #endif - #ifdef ENABLE_NO_SCAN_TIMEOUT + #ifndef ENABLE_CODE_SCAN_TIMEOUT if (gScreenToDisplay != DISPLAY_SCANNER) #endif GUI_SelectNextDisplay(DISPLAY_MAIN); @@ -1918,7 +1918,7 @@ void APP_TimeSlice500ms(void) { gScanProgressIndicator++; - #ifndef ENABLE_NO_SCAN_TIMEOUT + #ifdef ENABLE_CODE_SCAN_TIMEOUT if (gScanProgressIndicator > 32) { if (gScanCssState == SCAN_CSS_STATE_SCANNING && !gScanSingleFrequency) @@ -1968,7 +1968,7 @@ void APP_TimeSlice500ms(void) } } -#ifdef ENABLE_ALARM +#if defined(ENABLE_ALARM) || defined(ENABLE_TX1750) static void ALARM_Off(void) { gAlarmState = ALARM_STATE_OFF; @@ -2181,15 +2181,12 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) gUpdateStatus = true; } - if (gF_LOCK && (Key == KEY_PTT || Key == KEY_SIDE2 || Key == KEY_SIDE1)) - return; - if (!bFlag) { if (gCurrentFunction == FUNCTION_TRANSMIT) { // transmitting - #ifdef ENABLE_ALARM + #if defined(ENABLE_ALARM) || defined(ENABLE_TX1750) if (gAlarmState == ALARM_STATE_OFF) #endif { @@ -2245,7 +2242,7 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) } } } - #ifdef ENABLE_ALARM + #if defined(ENABLE_ALARM) || defined(ENABLE_TX1750) else if (!bKeyHeld && bKeyPressed) { @@ -2437,8 +2434,8 @@ Skip: if (gFlagRefreshSetting) { - MENU_ShowCurrentSetting(); gFlagRefreshSetting = false; + MENU_ShowCurrentSetting(); } if (gFlagStartScan) diff --git a/app/dtmf.c b/app/dtmf.c index 9e2f334..cff402d 100644 --- a/app/dtmf.c +++ b/app/dtmf.c @@ -362,9 +362,6 @@ void DTMF_Reply(void) switch (gDTMF_ReplyState) { - case DTMF_REPLY_NONE: - return; - case DTMF_REPLY_ANI: if (gDTMF_CallMode == DTMF_CALL_MODE_DTMF) { @@ -387,7 +384,10 @@ void DTMF_Reply(void) break; default: - if (gDTMF_CallState != DTMF_CALL_STATE_NONE || (gCurrentVfo->DTMF_PTT_ID_TX_MODE != PTT_ID_BOT && gCurrentVfo->DTMF_PTT_ID_TX_MODE != PTT_ID_BOTH)) + case DTMF_REPLY_NONE: + if (gDTMF_CallState != DTMF_CALL_STATE_NONE || + gCurrentVfo->DTMF_PTT_ID_TX_MODE == PTT_ID_OFF || + gCurrentVfo->DTMF_PTT_ID_TX_MODE == PTT_ID_BOT) { gDTMF_ReplyState = DTMF_REPLY_NONE; return; diff --git a/app/main.c b/app/main.c index b3a9325..bc0fcb0 100644 --- a/app/main.c +++ b/app/main.c @@ -602,8 +602,11 @@ static void MAIN_Key_MENU(const bool bKeyPressed, const bool bKeyHeld) if (bFlag) { - gFlagRefreshSetting = true; + gFlagRefreshSetting = true; + gFlagBackupSetting = true; + gRequestDisplayScreen = DISPLAY_MENU; + #ifdef ENABLE_VOICE gAnotherVoiceID = VOICE_ID_MENU; #endif @@ -735,7 +738,7 @@ static void MAIN_Key_UP_DOWN(bool bKeyPressed, bool bKeyHeld, int8_t Direction) { // step/down in frequency const uint32_t frequency = APP_SetFrequencyByStep(gTxVfo, Direction); - if (RX_FREQUENCY_Check(frequency) < 0) + if (RX_freq_check(frequency) < 0) { // frequency not allowed gBeepToPlay = BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL; return; diff --git a/app/menu.c b/app/menu.c index 9a7511a..d6fd68f 100644 --- a/app/menu.c +++ b/app/menu.c @@ -47,6 +47,27 @@ #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) #endif +void writeXtalFreqCal(const int32_t value) +{ + struct + { + int16_t BK4819_XtalFreqLow; + uint16_t EEPROM_1F8A; + uint16_t EEPROM_1F8C; + uint8_t VOLUME_GAIN; + uint8_t DAC_GAIN; + } __attribute__((packed)) Misc; + + gEeprom.BK4819_XTAL_FREQ_LOW = value; + BK4819_WriteRegister(BK4819_REG_3B, 22656 + gEeprom.BK4819_XTAL_FREQ_LOW); + + // radio 1 .. 04 00 46 00 50 00 2C 0E + // radio 2 .. 05 00 46 00 50 00 2C 0E + EEPROM_ReadBuffer(0x1F88, &Misc, 8); + Misc.BK4819_XtalFreqLow = gEeprom.BK4819_XTAL_FREQ_LOW; + EEPROM_WriteBuffer(0x1F88, &Misc); +} + void MENU_StartCssScan(int8_t Direction) { gCssScanMode = CSS_SCAN_MODE_SCANNING; @@ -299,6 +320,11 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax) *pMax = +50; break; + case MENU_BATCAL: + *pMin = 1760; // 0 + *pMax = 2000; // 2300 + break; + default: return -1; } @@ -552,7 +578,7 @@ void MENU_AcceptSetting(void) gSetting_mic_bar = gSubMenuSelection; break; #endif - + #ifdef ENABLE_COMPANDER case MENU_COMPAND: gTxVfo->Compander = gSubMenuSelection; @@ -711,25 +737,14 @@ void MENU_AcceptSetting(void) break; case MENU_F_CALI: - gEeprom.BK4819_XTAL_FREQ_LOW = gSubMenuSelection; - BK4819_WriteRegister(BK4819_REG_3B, 22656 + gEeprom.BK4819_XTAL_FREQ_LOW); - { - struct - { - int16_t BK4819_XtalFreqLow; - uint16_t EEPROM_1F8A; - uint16_t EEPROM_1F8C; - uint8_t VOLUME_GAIN; - uint8_t DAC_GAIN; - } __attribute__((packed)) Misc; - - // radio 1 .. 04 00 46 00 50 00 2C 0E - // radio 2 .. 05 00 46 00 50 00 2C 0E - EEPROM_ReadBuffer(0x1F88, &Misc, 8); - Misc.BK4819_XtalFreqLow = gEeprom.BK4819_XTAL_FREQ_LOW; - EEPROM_WriteBuffer(0x1F88, &Misc); - } + if (gF_LOCK) + writeXtalFreqCal(gSubMenuSelection); return; + + case MENU_BATCAL: + gBatteryCalibration[3] = gSubMenuSelection; + EEPROM_WriteBuffer(0x1F40, gBatteryCalibration); + break; } gRequestSaveSettings = true; @@ -956,7 +971,7 @@ void MENU_ShowCurrentSetting(void) gSubMenuSelection = gSetting_mic_bar; break; #endif - + #ifdef ENABLE_COMPANDER case MENU_COMPAND: gSubMenuSelection = gTxVfo->Compander; @@ -1042,7 +1057,7 @@ void MENU_ShowCurrentSetting(void) gSubMenuSelection = gSetting_AM_fix; break; #endif - + #ifdef ENABLE_AM_FIX_TEST1 case MENU_AM_FIX_TEST1: gSubMenuSelection = gSetting_AM_fix_test1; @@ -1094,6 +1109,19 @@ void MENU_ShowCurrentSetting(void) case MENU_F_CALI: gSubMenuSelection = gEeprom.BK4819_XTAL_FREQ_LOW; break; + + case MENU_BATCAL: + gSubMenuSelection = gBatteryCalibration[3]; + break; + + default: + return; + } + +// if (gFlagBackupSetting) + { // save a copy incase the user wants to back out +// gFlagBackupSetting = false; + gSubMenuSelection_original = gSubMenuSelection; } } @@ -1143,11 +1171,12 @@ static void MENU_Key_0_to_9(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) gInputBoxIndex = 0; Value = (gInputBox[0] * 10) + gInputBox[1]; - + if (Value > 0 && Value <= gMenuListCount) { gMenuCursor = Value - 1; gFlagRefreshSetting = true; + gFlagBackupSetting = true; return; } @@ -1156,13 +1185,14 @@ static void MENU_Key_0_to_9(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) gInputBox[0] = gInputBox[1]; gInputBoxIndex = 1; - + case 1: Value = gInputBox[0]; if (Value > 0 && Value <= gMenuListCount) { gMenuCursor = Value - 1; gFlagRefreshSetting = true; + gFlagBackupSetting = true; return; } break; @@ -1271,6 +1301,17 @@ static void MENU_Key_EXIT(bool bKeyPressed, bool bKeyHeld) { if (gIsInSubMenu) { + // *********************** + // restore original value + + if (gMenuCursor == MENU_F_CALI) + { +// if (gF_LOCK) +// writeXtalFreqCal(gSubMenuSelection_original); + } + + // *********************** + if (gInputBoxIndex == 0 || gMenuCursor != MENU_OFFSET) { gAskForConfirmation = 0; @@ -1285,6 +1326,8 @@ static void MENU_Key_EXIT(bool bKeyPressed, bool bKeyHeld) else gInputBox[--gInputBoxIndex] = 10; + // *********************** + gRequestDisplayScreen = DISPLAY_MENU; return; } @@ -1294,7 +1337,7 @@ static void MENU_Key_EXIT(bool bKeyPressed, bool bKeyHeld) #endif gRequestDisplayScreen = DISPLAY_MAIN; - + if (gEeprom.BACKLIGHT == 0) { gBacklightCountdown = 0; @@ -1338,13 +1381,13 @@ static void MENU_Key_MENU(const bool bKeyPressed, const bool bKeyHeld) gAskForConfirmation = 0; gIsInSubMenu = true; - + // if (gMenuCursor != MENU_D_LIST) { gInputBoxIndex = 0; edit_index = -1; } - + return; } @@ -1570,8 +1613,11 @@ static void MENU_Key_UP_DOWN(bool bKeyPressed, bool bKeyHeld, int8_t Direction) if (!gIsInSubMenu) { - gMenuCursor = NUMBER_AddWithWraparound(gMenuCursor, -Direction, 0, gMenuListCount - 1); - gFlagRefreshSetting = true; + gMenuCursor = NUMBER_AddWithWraparound(gMenuCursor, -Direction, 0, gMenuListCount - 1); + + gFlagRefreshSetting = true; + gFlagBackupSetting = true; + gRequestDisplayScreen = DISPLAY_MENU; if (gMenuCursor != MENU_ABR && gEeprom.BACKLIGHT == 0) @@ -1579,7 +1625,7 @@ static void MENU_Key_UP_DOWN(bool bKeyPressed, bool bKeyHeld, int8_t Direction) gBacklightCountdown = 0; GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); // turn the backlight OFF } - + return; } @@ -1615,7 +1661,7 @@ static void MENU_Key_UP_DOWN(bool bKeyPressed, bool bKeyHeld, int8_t Direction) bCheckScanList = true; break; - default: + default: MENU_ClampSelection(Direction); gRequestDisplayScreen = DISPLAY_MENU; return; diff --git a/app/scanner.c b/app/scanner.c index 4002e38..d4038b0 100644 --- a/app/scanner.c +++ b/app/scanner.c @@ -224,7 +224,7 @@ static void SCANNER_Key_MENU(bool bKeyPressed, bool bKeyHeld) case 2: if (!gScanSingleFrequency) { - RADIO_InitInfo(gTxVfo, gTxVfo->CHANNEL_SAVE, FREQUENCY_GetBand(gScanFrequency), gScanFrequency); + RADIO_InitInfo(gTxVfo, gTxVfo->CHANNEL_SAVE, gScanFrequency); if (gScanUseCssResult) { @@ -367,7 +367,7 @@ void SCANNER_Start(void) BackupStep = gRxVfo->STEP_SETTING; BackupFrequency = gRxVfo->StepFrequency; - RADIO_InitInfo(gRxVfo, gRxVfo->CHANNEL_SAVE, gRxVfo->Band, gRxVfo->pRX->Frequency); + RADIO_InitInfo(gRxVfo, gRxVfo->CHANNEL_SAVE, gRxVfo->pRX->Frequency); gRxVfo->STEP_SETTING = BackupStep; gRxVfo->StepFrequency = BackupFrequency; diff --git a/bitmaps.c b/bitmaps.c index 0e20602..3f5a105 100644 --- a/bitmaps.c +++ b/bitmaps.c @@ -324,7 +324,7 @@ const uint8_t BITMAP_AntennaLevel6[3] = 0b00000000 }; -const uint8_t BITMAP_CurrentIndicator[8] = +const uint8_t BITMAP_MARKER[8] = { 0b11111111, 0b11111111, diff --git a/bitmaps.h b/bitmaps.h index 7e3163e..96b984a 100644 --- a/bitmaps.h +++ b/bitmaps.h @@ -52,7 +52,7 @@ extern const uint8_t BITMAP_AntennaLevel4[3]; extern const uint8_t BITMAP_AntennaLevel5[3]; extern const uint8_t BITMAP_AntennaLevel6[3]; -extern const uint8_t BITMAP_CurrentIndicator[8]; +extern const uint8_t BITMAP_MARKER[8]; extern const uint8_t BITMAP_VFO_Default[8]; extern const uint8_t BITMAP_VFO_NotDefault[8]; diff --git a/board.c b/board.c index 288214f..2b5f729 100644 --- a/board.c +++ b/board.c @@ -861,7 +861,7 @@ void BOARD_FactoryReset(bool bIsAll) if (bIsAll) { - RADIO_InitInfo(gRxVfo, FREQ_CHANNEL_FIRST + BAND6_400MHz, BAND6_400MHz, 43350000); + RADIO_InitInfo(gRxVfo, FREQ_CHANNEL_FIRST + BAND6_400MHz, 43350000); // set the first few memory channels for (i = 0; i < ARRAY_SIZE(gDefaultFrequencyTable); i++) diff --git a/dcs.c b/dcs.c index 4d93c9a..4615dc5 100644 --- a/dcs.c +++ b/dcs.c @@ -91,7 +91,7 @@ uint8_t DCS_GetCdcssCode(uint32_t Code) return 0xFF; } -uint8_t DCS_GetCtcssCode(uint16_t Code) +uint8_t DCS_GetCtcssCode(int Code) { unsigned int i; uint8_t Result = 0xFF; diff --git a/dcs.h b/dcs.h index b8dfdc0..873ddb6 100644 --- a/dcs.h +++ b/dcs.h @@ -39,7 +39,7 @@ extern const uint16_t DCS_Options[104]; uint32_t DCS_GetGolayCodeWord(DCS_CodeType_t CodeType, uint8_t Option); uint8_t DCS_GetCdcssCode(uint32_t Code); -uint8_t DCS_GetCtcssCode(uint16_t Code); +uint8_t DCS_GetCtcssCode(int Code); #endif diff --git a/driver/bk4819.c b/driver/bk4819.c index 49ac4dc..384da6d 100644 --- a/driver/bk4819.c +++ b/driver/bk4819.c @@ -465,7 +465,7 @@ void BK4819_SetCTCSSFrequency(uint32_t FreqControlWord) // freq(Hz) * 20.64888 for XTAL 13M/26M or // freq(Hz) * 20.97152 for XTAL 12.8M/19.2M/25.6M/38.4M // - BK4819_WriteRegister(BK4819_REG_07, BK4819_REG_07_MODE_CTC1 | (((FreqControlWord * 2064888u) + 500000u) / 1000000u)); // with rounding + BK4819_WriteRegister(BK4819_REG_07, BK4819_REG_07_MODE_CTC1 | (((FreqControlWord * 206488u) + 50000u) / 100000u)); // with rounding } // freq_10Hz is CTCSS Hz * 10 diff --git a/driver/keyboard.c b/driver/keyboard.c index 6f5f0d9..7ce7ee1 100644 --- a/driver/keyboard.c +++ b/driver/keyboard.c @@ -19,180 +19,122 @@ #include "driver/gpio.h" #include "driver/keyboard.h" #include "driver/systick.h" +#include "driver/i2c.h" +#include "misc.h" KEY_Code_t gKeyReading0 = KEY_INVALID; KEY_Code_t gKeyReading1 = KEY_INVALID; uint16_t gDebounceCounter; bool gWasFKeyPressed; +static const struct { + // Using a 16 bit pre-calculated shift and invert is cheaper + // than using 8 bit and doing shift and invert in code. + uint16_t set_to_zero_mask; + + //We are very fortunate. + //The key and pin defines fit together in a single u8, + //making this very efficient + struct { + uint8_t key : 5; //Key 23 is highest + uint8_t pin : 3; //Pin 6 is highest + } pins[4]; +} keyboard[5] = { + /* Zero row */ + { + //Set to zero to handle special case of nothing pulled down. + .set_to_zero_mask = ~(0), + .pins = { + { .key = KEY_SIDE1, .pin = GPIOA_PIN_KEYBOARD_0}, + { .key = KEY_SIDE2, .pin = GPIOA_PIN_KEYBOARD_1}, + /* Duplicate to fill the array with valid values */ + { .key = KEY_SIDE2, .pin = GPIOA_PIN_KEYBOARD_1}, + { .key = KEY_SIDE2, .pin = GPIOA_PIN_KEYBOARD_1}, + } + }, + /* First row */ + { + .set_to_zero_mask = ~(1 << GPIOA_PIN_KEYBOARD_4), + .pins = { + { .key = KEY_MENU, .pin = GPIOA_PIN_KEYBOARD_0}, + { .key = KEY_1, .pin = GPIOA_PIN_KEYBOARD_1}, + { .key = KEY_4, .pin = GPIOA_PIN_KEYBOARD_2}, + { .key = KEY_7, .pin = GPIOA_PIN_KEYBOARD_3}, + } + }, + /* Second row */ + { + .set_to_zero_mask = ~(1 << GPIOA_PIN_KEYBOARD_5), + .pins = { + { .key = KEY_UP, .pin = GPIOA_PIN_KEYBOARD_0}, + { .key = KEY_2 , .pin = GPIOA_PIN_KEYBOARD_1}, + { .key = KEY_5 , .pin = GPIOA_PIN_KEYBOARD_2}, + { .key = KEY_8 , .pin = GPIOA_PIN_KEYBOARD_3}, + } + }, + /* Third row */ + { + .set_to_zero_mask = ~(1 << GPIOA_PIN_KEYBOARD_6), + .pins = { + { .key = KEY_DOWN, .pin = GPIOA_PIN_KEYBOARD_0}, + { .key = KEY_3 , .pin = GPIOA_PIN_KEYBOARD_1}, + { .key = KEY_6 , .pin = GPIOA_PIN_KEYBOARD_2}, + { .key = KEY_9 , .pin = GPIOA_PIN_KEYBOARD_3}, + } + }, + /* Fourth row */ + { + .set_to_zero_mask = ~(1 << GPIOA_PIN_KEYBOARD_7), + .pins = { + { .key = KEY_EXIT, .pin = GPIOA_PIN_KEYBOARD_0}, + { .key = KEY_STAR, .pin = GPIOA_PIN_KEYBOARD_1}, + { .key = KEY_0 , .pin = GPIOA_PIN_KEYBOARD_2}, + { .key = KEY_F , .pin = GPIOA_PIN_KEYBOARD_3}, + } + }, +}; + KEY_Code_t KEYBOARD_Poll(void) { KEY_Code_t Key = KEY_INVALID; - GPIO_SetBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_4); - GPIO_SetBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_5); - GPIO_SetBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_6); - GPIO_SetBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_7); - - SYSTICK_DelayUs(1); +// if (!GPIO_CheckBit(&GPIOC->DATA, GPIOC_PIN_PTT)) +// return KEY_PTT; + // ***************** - // Keys connected to gnd + for(int j = 0; j < ARRAY_SIZE(keyboard); j++) { + //Set all high + GPIOA->DATA |= 1 << GPIOA_PIN_KEYBOARD_4 | + 1 << GPIOA_PIN_KEYBOARD_5 | + 1 << GPIOA_PIN_KEYBOARD_6 | + 1 << GPIOA_PIN_KEYBOARD_7 ; + //Clear the pin we are selecting + GPIOA->DATA &= keyboard[j].set_to_zero_mask; - if (!GPIO_CheckBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_0)) - { - Key = KEY_SIDE1; - goto Bye; - } + //Wait for the pins to stabilize. 1 works for me. + SYSTICK_DelayUs(2); - if (!GPIO_CheckBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_1)) - { - Key = KEY_SIDE2; - goto Bye; - } + // Read all 4 GPIO pins at once + uint16_t reg = GPIOA->DATA; + for(int i = 0; i < ARRAY_SIZE(keyboard[j].pins); i++) + { + uint16_t mask = 1 << keyboard[j].pins[i].pin; + if(! (reg & mask)) { + Key = keyboard[j].pins[i].key; + break; + } + } - // Original doesn't do PTT + if (Key != KEY_INVALID) + break; + } - // ***************** - // First row + //Create I2C stop condition. Since we might have toggled I2C pins. + //This leaves GPIOA_PIN_KEYBOARD_4 and GPIOA_PIN_KEYBOARD_5 high + I2C_Stop(); - GPIO_ClearBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_4); - SYSTICK_DelayUs(1); - - if (!GPIO_CheckBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_0)) - { - Key = KEY_MENU; - goto Bye; - } - - if (!GPIO_CheckBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_1)) - { - Key = KEY_1; - goto Bye; - } - - if (!GPIO_CheckBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_2)) - { - Key = KEY_4; - goto Bye; - } - - if (!GPIO_CheckBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_3)) - { - Key = KEY_7; - goto Bye; - } - - // ***************** - // Second row - - GPIO_ClearBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_5); - SYSTICK_DelayUs(1); - - GPIO_SetBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_4); - SYSTICK_DelayUs(1); - - if (!GPIO_CheckBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_0)) - { - Key = KEY_UP; - goto Bye; - } - - if (!GPIO_CheckBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_1)) - { - Key = KEY_2; - goto Bye; - } - - if (!GPIO_CheckBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_2)) - { - Key = KEY_5; - goto Bye; - } - - if (!GPIO_CheckBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_3)) - { - Key = KEY_8; - goto Bye; - } - - // ***************** - // Third row - - GPIO_ClearBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_4); - SYSTICK_DelayUs(1); - - GPIO_SetBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_5); - SYSTICK_DelayUs(1); - - GPIO_SetBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_4); - SYSTICK_DelayUs(1); - - GPIO_ClearBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_6); - SYSTICK_DelayUs(1); - - if (!GPIO_CheckBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_0)) - { - Key = KEY_DOWN; - goto Bye; - } - - if (!GPIO_CheckBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_1)) - { - Key = KEY_3; - goto Bye; - } - - if (!GPIO_CheckBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_2)) - { - Key = KEY_6; - goto Bye; - } - - if (!GPIO_CheckBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_3)) - { - Key = KEY_9; - goto Bye; - } - - // ***************** - // Fourth row - - GPIO_ClearBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_7); - SYSTICK_DelayUs(1); - - GPIO_SetBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_6); - SYSTICK_DelayUs(1); - - if (!GPIO_CheckBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_0)) - { - Key = KEY_EXIT; - goto Bye; - } - - if (!GPIO_CheckBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_1)) - { - Key = KEY_STAR; - goto Bye; - } - - if (!GPIO_CheckBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_2)) - { - Key = KEY_0; - goto Bye; - } - - if (!GPIO_CheckBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_3)) - { - Key = KEY_F; - goto Bye; - } - - // ***************** - -Bye: - GPIO_SetBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_4); - GPIO_SetBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_5); + // Reset VOICE pins GPIO_ClearBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_6); GPIO_SetBit(&GPIOA->DATA, GPIOA_PIN_KEYBOARD_7); diff --git a/firmware.bin b/firmware.bin new file mode 100644 index 0000000..566104c Binary files /dev/null and b/firmware.bin differ diff --git a/firmware.packed.bin b/firmware.packed.bin new file mode 100644 index 0000000..e5fbb58 Binary files /dev/null and b/firmware.packed.bin differ diff --git a/frequencies.c b/frequencies.c index 57460c1..404a664 100644 --- a/frequencies.c +++ b/frequencies.c @@ -157,7 +157,7 @@ uint32_t FREQUENCY_FloorToStep(uint32_t Upper, uint32_t Step, uint32_t Lower) return Lower + (Step * Index); } /* -int TX_FREQUENCY_Check(VFO_Info_t *pInfo) +int TX_freq_check(VFO_Info_t *pInfo) { // return '0' if TX frequency is allowed // otherwise return '-1' @@ -168,7 +168,7 @@ int TX_FREQUENCY_Check(VFO_Info_t *pInfo) return -1; #endif */ -int TX_FREQUENCY_Check(const uint32_t Frequency) +int TX_freq_check(const uint32_t Frequency) { // return '0' if TX frequency is allowed // otherwise return '-1' @@ -205,6 +205,8 @@ int TX_FREQUENCY_Check(const uint32_t Frequency) case F_LOCK_CE: if (Frequency >= 14400000 && Frequency < 14600000) return 0; + if (Frequency >= 43000000 && Frequency < 44000000) + return 0; break; case F_LOCK_GB: @@ -233,7 +235,7 @@ int TX_FREQUENCY_Check(const uint32_t Frequency) return -1; } -int RX_FREQUENCY_Check(const uint32_t Frequency) +int RX_freq_check(const uint32_t Frequency) { // return '0' if RX frequency is allowed // otherwise return '-1' diff --git a/frequencies.h b/frequencies.h index 168936f..7202518 100644 --- a/frequencies.h +++ b/frequencies.h @@ -55,9 +55,9 @@ FREQUENCY_Band_t FREQUENCY_GetBand(uint32_t Frequency); uint8_t FREQUENCY_CalculateOutputPower(uint8_t TxpLow, uint8_t TxpMid, uint8_t TxpHigh, int32_t LowerLimit, int32_t Middle, int32_t UpperLimit, int32_t Frequency); uint32_t FREQUENCY_FloorToStep(uint32_t Upper, uint32_t Step, uint32_t Lower); -//int TX_FREQUENCY_Check(VFO_Info_t *pInfo); -int TX_FREQUENCY_Check(const uint32_t Frequency); -int RX_FREQUENCY_Check(const uint32_t Frequency); +//int TX_freq_check(VFO_Info_t *pInfo); +int TX_freq_check(const uint32_t Frequency); +int RX_freq_check(const uint32_t Frequency); #endif diff --git a/functions.c b/functions.c index 5394fde..389018d 100644 --- a/functions.c +++ b/functions.c @@ -192,18 +192,27 @@ void FUNCTION_Select(FUNCTION_Type_t Function) DTMF_Reply(); - #ifdef ENABLE_ALARM + #if defined(ENABLE_ALARM) || defined(ENABLE_TX1750) if (gAlarmState != ALARM_STATE_OFF) { - BK4819_TransmitTone(true, (gAlarmState == ALARM_STATE_TX1750) ? 1750 : 500); + #ifdef ENABLE_TX1750 + if (gAlarmState == ALARM_STATE_TX1750) + BK4819_TransmitTone(true, 1750); + #endif + #ifdef ENABLE_ALARM + if (gAlarmState == ALARM_STATE_TXALARM) + BK4819_TransmitTone(true, 500); + #endif SYSTEM_DelayMs(2); GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH); - gAlarmToneCounter = 0; - gEnableSpeaker = true; + #ifdef ENABLE_ALARM + gAlarmToneCounter = 0; + #endif + gEnableSpeaker = true; break; } #endif - + if (gCurrentVfo->SCRAMBLING_TYPE > 0 && gSetting_ScrambleEnable) BK4819_EnableScramble(gCurrentVfo->SCRAMBLING_TYPE - 1); else diff --git a/helper/battery.c b/helper/battery.c index 84ae055..77bce6a 100644 --- a/helper/battery.c +++ b/helper/battery.c @@ -66,21 +66,20 @@ Volts Percent Volts Percent Volts Percent Volts Percent 7.96478 75 7.72911 48 7.51285 21 7.95983 74 7.72097 47 7.49832 20 */ -uint8_t BATTERY_VoltsToPercent(uint16_t voltage_10mV) +unsigned int BATTERY_VoltsToPercent(const unsigned int voltage_10mV) { - if(voltage_10mV>814) - return 100; - else if(voltage_10mV>756) - return 132*voltage_10mV/100-974; - else if(voltage_10mV>729) - return 63*voltage_10mV/100-452; - else if(voltage_10mV>600) - return 52*voltage_10mV/1000-31; - else - return 0; + if (voltage_10mV > 814) + return 100; + if (voltage_10mV > 756) + return ((132ul * voltage_10mV) / 100) - 974u; + if (voltage_10mV > 729) + return ((63ul * voltage_10mV) / 100) - 452u; + if (voltage_10mV > 600) + return ((52ul * voltage_10mV) / 1000) - 31u; + return 0; } -void BATTERY_GetReadings(bool bDisplayBatteryLevel) +void BATTERY_GetReadings(const bool bDisplayBatteryLevel) { const uint8_t PreviousBatteryLevel = gBatteryDisplayLevel; const uint16_t Voltage = (gBatteryVoltages[0] + gBatteryVoltages[1] + gBatteryVoltages[2] + gBatteryVoltages[3]) / 4; diff --git a/helper/battery.h b/helper/battery.h index 08a013a..336207c 100644 --- a/helper/battery.h +++ b/helper/battery.h @@ -33,8 +33,8 @@ extern uint16_t gBatteryCheckCounter; extern volatile uint16_t gPowerSave_10ms; -uint8_t BATTERY_VoltsToPercent(uint16_t voltage_10mV); -void BATTERY_GetReadings(bool bDisplayBatteryLevel); +unsigned int BATTERY_VoltsToPercent(const unsigned int voltage_10mV); +void BATTERY_GetReadings(const bool bDisplayBatteryLevel); #endif diff --git a/helper/boot.c b/helper/boot.c index 651d0c2..981910b 100644 --- a/helper/boot.c +++ b/helper/boot.c @@ -39,15 +39,16 @@ BOOT_Mode_t BOOT_GetMode(void) for (i = 0; i < 2; i++) { if (GPIO_CheckBit(&GPIOC->DATA, GPIOC_PIN_PTT)) - return BOOT_MODE_NORMAL; + return BOOT_MODE_NORMAL; // PTT not pressed Keys[i] = KEYBOARD_Poll(); SYSTEM_DelayMs(20); } if (Keys[0] == Keys[1]) { - gKeyReading0 = Keys[0]; - gKeyReading1 = Keys[0]; + gKeyReading0 = Keys[0]; + gKeyReading1 = Keys[0]; + gDebounceCounter = 2; if (Keys[0] == KEY_SIDE1) @@ -66,16 +67,7 @@ void BOOT_ProcessMode(BOOT_Mode_t Mode) { if (Mode == BOOT_MODE_F_LOCK) { - // enable all the menu items - gMenuListCount = 0; -// while (MenuList[gMenuListCount].name != NULL) - while (MenuList[gMenuListCount].name[0] != '\0') - gMenuListCount++; - - gMenuCursor = MENU_350TX; - gSubMenuSelection = gSetting_350TX; GUI_SelectNextDisplay(DISPLAY_MENU); - gF_LOCK = true; } #ifdef ENABLE_AIRCOPY else @@ -86,15 +78,15 @@ void BOOT_ProcessMode(BOOT_Mode_t Mode) gEeprom.VOX_SWITCH = false; gEeprom.CROSS_BAND_RX_TX = CROSS_BAND_OFF; gEeprom.AUTO_KEYPAD_LOCK = false; - gEeprom.KEY_1_SHORT_PRESS_ACTION = 0; - gEeprom.KEY_1_LONG_PRESS_ACTION = 0; - gEeprom.KEY_2_SHORT_PRESS_ACTION = 0; - gEeprom.KEY_2_LONG_PRESS_ACTION = 0; + gEeprom.KEY_1_SHORT_PRESS_ACTION = ACTION_OPT_NONE; + gEeprom.KEY_1_LONG_PRESS_ACTION = ACTION_OPT_NONE; + gEeprom.KEY_2_SHORT_PRESS_ACTION = ACTION_OPT_NONE; + gEeprom.KEY_2_LONG_PRESS_ACTION = ACTION_OPT_NONE; - RADIO_InitInfo(gRxVfo, FREQ_CHANNEL_LAST - 1, 5, 41002500); + RADIO_InitInfo(gRxVfo, FREQ_CHANNEL_LAST - 1, 41002500); - gRxVfo->CHANNEL_BANDWIDTH = BANDWIDTH_NARROW; - gRxVfo->OUTPUT_POWER = 0; + gRxVfo->CHANNEL_BANDWIDTH = BANDWIDTH_WIDE; + gRxVfo->OUTPUT_POWER = OUTPUT_POWER_LOW; RADIO_ConfigureSquelchAndOutputPower(gRxVfo); @@ -105,6 +97,7 @@ void BOOT_ProcessMode(BOOT_Mode_t Mode) BK4819_ResetFSK(); gAircopyState = AIRCOPY_READY; + GUI_SelectNextDisplay(DISPLAY_AIRCOPY); } #endif diff --git a/main.c b/main.c index c1dc33e..9f1c9d6 100644 --- a/main.c +++ b/main.c @@ -50,6 +50,7 @@ void _putchar(char c) void Main(void) { unsigned int i; + BOOT_Mode_t BootMode; // Enable clock gating of blocks we need SYSCON_DEV_CLK_GATE = 0 @@ -67,7 +68,7 @@ void Main(void) UART_Init(); boot_counter_10ms = 250; // 2.5 sec - + UART_Send(UART_Version, strlen(UART_Version)); // Not implementing authentic device checks @@ -101,12 +102,36 @@ void Main(void) AM_fix_init(); #endif - // count the number of menu list items + BootMode = BOOT_GetMode(); + + // count the number of menu items gMenuListCount = 0; while (MenuList[gMenuListCount].name[0] != '\0') gMenuListCount++; - gMenuListCount -= 8; // disable the last 'n' items + if (BootMode == BOOT_MODE_F_LOCK) + gF_LOCK = true; // flag to say use the hidden menu items + else + gMenuListCount -= 9; // hide the last few menu items + + // wait for user to release all butts before moving on + if (!GPIO_CheckBit(&GPIOC->DATA, GPIOC_PIN_PTT) || + KEYBOARD_Poll() != KEY_INVALID || + BootMode != BOOT_MODE_NORMAL) + { // keys are pressed + UI_DisplayReleaseKeys(); + BACKLIGHT_TurnOn(); + i = 0; + while (i < 50) // 500ms + { + i = (GPIO_CheckBit(&GPIOC->DATA, GPIOC_PIN_PTT) && KEYBOARD_Poll() == KEY_INVALID) ? i + 1 : 0; + SYSTEM_DelayMs(10); + } + gKeyReading0 = KEY_INVALID; + gKeyReading1 = KEY_INVALID; + gDebounceCounter = 0; + } + if (!gChargingWithTypeC && !gBatteryDisplayLevel) { FUNCTION_Select(FUNCTION_POWER_SAVE); @@ -120,9 +145,8 @@ void Main(void) } else { - BOOT_Mode_t BootMode; - UI_DisplayWelcome(); + BACKLIGHT_TurnOn(); if (gEeprom.POWER_ON_DISPLAY_MODE != POWER_ON_DISPLAY_MODE_NONE) @@ -131,7 +155,7 @@ void Main(void) { if (KEYBOARD_Poll() != KEY_INVALID) { // halt boot beeps - boot_counter_10ms = 0; + boot_counter_10ms = 0; break; } #ifdef ENABLE_BOOT_BEEPS @@ -141,8 +165,6 @@ void Main(void) } } - BootMode = BOOT_GetMode(); - if (gEeprom.POWER_ON_PASSWORD < 1000000) { bIsInLockScreen = true; @@ -179,6 +201,8 @@ void Main(void) #ifdef ENABLE_NOAA RADIO_ConfigureNOAA(); #endif + + // ****************** } while (1) diff --git a/misc.c b/misc.c index 3b129ac..8380729 100644 --- a/misc.c +++ b/misc.c @@ -63,6 +63,9 @@ const uint16_t NOAA_countdown_10ms = 5000 / 10; // 5 seconds const uint16_t NOAA_countdown_2_10ms = 500 / 10; // 500ms const uint16_t NOAA_countdown_3_10ms = 200 / 10; // 200ms +//const uint16_t gMax_bat_v = 840; // 8.4V +//const uint16_t gMin_bat_v = 660; // 6.6V + const uint32_t gDefaultAesKey[4] = {0x4AA5CC60, 0x0312CC5F, 0xFFD2DABB, 0x6BBA7F92}; const uint8_t gMicGain_dB2[5] = {3, 8, 16, 24, 31}; @@ -146,7 +149,7 @@ uint8_t gReducedService; uint8_t gBatteryVoltageIndex; CssScanMode_t gCssScanMode; bool gUpdateRSSI; -#ifdef ENABLE_ALARM +#if defined(ENABLE_ALARM) || defined(ENABLE_TX1750) AlarmState_t gAlarmState; #endif uint8_t gVoltageMenuCountdown; @@ -163,8 +166,11 @@ bool gRequestSaveSettings; bool gRequestSaveFM; #endif bool gFlagPrepareTX; + bool gFlagAcceptSetting; bool gFlagRefreshSetting; +bool gFlagBackupSetting; + bool gFlagSaveVfo; bool gFlagSaveSettings; bool gFlagSaveChannel; @@ -190,7 +196,7 @@ uint8_t gRestoreMrChannel; uint8_t gCurrentScanList; uint8_t gPreviousMrChannel; uint32_t gRestoreFrequency; -uint8_t gRxVfoIsActive; +bool gRxVfoIsActive; #ifdef ENABLE_ALARM uint8_t gAlarmToneCounter; uint16_t gAlarmRunningCounter; @@ -213,7 +219,9 @@ uint8_t gNeverUsed; #endif bool gUpdateDisplay; -bool gF_LOCK; + +bool gF_LOCK = false; + uint8_t gShowChPrefix; volatile bool gNextTimeslice; diff --git a/misc.h b/misc.h index bee352d..2494a2b 100644 --- a/misc.h +++ b/misc.h @@ -128,6 +128,9 @@ extern const uint16_t scan_pause_delay_in_2_10ms; extern const uint16_t scan_pause_delay_in_3_10ms; extern const uint16_t scan_pause_delay_in_4_10ms; +//extern const uint16_t gMax_bat_v; +//extern const uint16_t gMin_bat_v; + extern const uint8_t gMicGain_dB2[5]; extern bool gSetting_350TX; @@ -227,8 +230,11 @@ extern bool gRequestSaveSettings; #endif extern uint8_t gKeypadLocked; extern bool gFlagPrepareTX; -extern bool gFlagAcceptSetting; -extern bool gFlagRefreshSetting; + +extern bool gFlagAcceptSetting; // accept menu setting +extern bool gFlagRefreshSetting; // refresh menu display +extern bool gFlagBackupSetting; // save a copy of the current menu setting + extern bool gFlagSaveVfo; extern bool gFlagSaveSettings; extern bool gFlagSaveChannel; @@ -254,7 +260,7 @@ extern uint8_t gRestoreMrChannel; extern uint8_t gCurrentScanList; extern uint8_t gPreviousMrChannel; extern uint32_t gRestoreFrequency; -extern uint8_t gRxVfoIsActive; +extern bool gRxVfoIsActive; extern uint8_t gAlarmToneCounter; extern uint16_t gAlarmRunningCounter; extern bool gKeyBeingHeld; @@ -274,10 +280,10 @@ extern uint8_t gNeverUsed; #endif extern volatile bool gNextTimeslice; extern bool gUpdateDisplay; +extern bool gF_LOCK; #ifdef ENABLE_FMRADIO extern uint8_t gFM_ChannelPosition; #endif -extern bool gF_LOCK; extern uint8_t gShowChPrefix; extern volatile uint8_t gFoundCDCSSCountdown_10ms; extern volatile uint8_t gFoundCTCSSCountdown_10ms; diff --git a/radio.c b/radio.c index 175807b..5a5bbe2 100644 --- a/radio.c +++ b/radio.c @@ -114,25 +114,24 @@ uint8_t RADIO_FindNextChannel(uint8_t Channel, int8_t Direction, bool bCheckScan return 0xFF; } -void RADIO_InitInfo(VFO_Info_t *pInfo, uint8_t ChannelSave, uint8_t Band, uint32_t Frequency) +void RADIO_InitInfo(VFO_Info_t *pInfo, const uint8_t ChannelSave, const uint32_t Frequency) { memset(pInfo, 0, sizeof(*pInfo)); - pInfo->Band = Band; - pInfo->SCANLIST1_PARTICIPATION = true; - pInfo->SCANLIST2_PARTICIPATION = true; - pInfo->STEP_SETTING = STEP_12_5kHz; - pInfo->StepFrequency = 2500; - pInfo->CHANNEL_SAVE = ChannelSave; - pInfo->FrequencyReverse = false; - pInfo->OUTPUT_POWER = OUTPUT_POWER_LOW; - pInfo->freq_config_RX.Frequency = Frequency; - pInfo->freq_config_TX.Frequency = Frequency; - pInfo->pRX = &pInfo->freq_config_RX; - pInfo->pTX = &pInfo->freq_config_TX; - pInfo->TX_OFFSET_FREQUENCY = 1000000; + pInfo->Band = FREQUENCY_GetBand(Frequency); + pInfo->SCANLIST1_PARTICIPATION = true; + pInfo->SCANLIST2_PARTICIPATION = true; + pInfo->STEP_SETTING = STEP_12_5kHz; + pInfo->StepFrequency = 2500; + pInfo->CHANNEL_SAVE = ChannelSave; + pInfo->FrequencyReverse = false; + pInfo->OUTPUT_POWER = OUTPUT_POWER_LOW; + pInfo->freq_config_RX.Frequency = Frequency; + pInfo->freq_config_TX.Frequency = Frequency; + pInfo->pRX = &pInfo->freq_config_RX; + pInfo->pTX = &pInfo->freq_config_TX; #ifdef ENABLE_COMPANDER - pInfo->Compander = 0; // off + pInfo->Compander = 0; // off #endif if (ChannelSave == (FREQ_CHANNEL_FIRST + BAND2_108MHz)) @@ -167,7 +166,7 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure #ifdef ENABLE_NOAA if (Channel >= NOAA_CHANNEL_FIRST) { - RADIO_InitInfo(pRadio, gEeprom.ScreenChannel[VFO], 2, NoaaFrequencyTable[Channel - NOAA_CHANNEL_FIRST]); + RADIO_InitInfo(pRadio, gEeprom.ScreenChannel[VFO], NoaaFrequencyTable[Channel - NOAA_CHANNEL_FIRST]); if (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF) return; @@ -211,7 +210,7 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure Index = Channel - FREQ_CHANNEL_FIRST; - RADIO_InitInfo(pRadio, Channel, Index, LowerLimitFrequencyBandTable[Index]); + RADIO_InitInfo(pRadio, Channel, LowerLimitFrequencyBandTable[Index]); return; } @@ -893,8 +892,9 @@ void RADIO_SetVfoState(VfoState_t State) } else { - const uint8_t Channel = (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF) ? gEeprom.RX_CHANNEL : gEeprom.TX_CHANNEL; - VfoState[Channel] = State; + unsigned int chan = (gEeprom.DUAL_WATCH != DUAL_WATCH_OFF && gRxVfoIsActive) ? (gEeprom.RX_CHANNEL + 1) & 1 : gEeprom.RX_CHANNEL; // 1of11 + chan = (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF) ? gEeprom.TX_CHANNEL : chan; + VfoState[chan] = State; } #ifdef ENABLE_FMRADIO @@ -916,7 +916,7 @@ void RADIO_PrepareTX(void) gScheduleDualWatch = false; if (!gRxVfoIsActive) - { + { // use the TX vfo gEeprom.RX_CHANNEL = gEeprom.TX_CHANNEL; gRxVfo = &gEeprom.VfoInfo[gEeprom.TX_CHANNEL]; gRxVfoIsActive = true; @@ -929,10 +929,16 @@ void RADIO_PrepareTX(void) RADIO_SelectCurrentVfo(); - #ifdef ENABLE_ALARM + #if defined(ENABLE_ALARM) && defined(ENABLE_TX1750) if (gAlarmState == ALARM_STATE_OFF || gAlarmState == ALARM_STATE_TX1750 || (gAlarmState == ALARM_STATE_ALARM && gEeprom.ALARM_MODE == ALARM_MODE_TONE)) + #elif defined(ENABLE_ALARM) + if (gAlarmState == ALARM_STATE_OFF || + (gAlarmState == ALARM_STATE_ALARM && gEeprom.ALARM_MODE == ALARM_MODE_TONE)) + #elif defined(ENABLE_TX1750) + if (gAlarmState == ALARM_STATE_OFF || + gAlarmState == ALARM_STATE_TX1750) #endif { #ifndef ENABLE_TX_WHEN_AM @@ -947,8 +953,8 @@ void RADIO_PrepareTX(void) State = VFO_STATE_TX_DISABLE; } else - //if (TX_FREQUENCY_Check(gCurrentVfo->pTX->Frequency) == 0 || gCurrentVfo->CHANNEL_SAVE <= FREQ_CHANNEL_LAST) - if (TX_FREQUENCY_Check(gCurrentVfo->pTX->Frequency) == 0) + //if (TX_freq_check(gCurrentVfo->pTX->Frequency) == 0 || gCurrentVfo->CHANNEL_SAVE <= FREQ_CHANNEL_LAST) + if (TX_freq_check(gCurrentVfo->pTX->Frequency) == 0) { // TX frequency is allowed if (gCurrentVfo->BUSY_CHANNEL_LOCK && gCurrentFunction == FUNCTION_RECEIVE) State = VFO_STATE_BUSY; // busy RX'ing a station @@ -967,7 +973,7 @@ void RADIO_PrepareTX(void) if (State != VFO_STATE_NORMAL) { // TX not allowed RADIO_SetVfoState(State); - #ifdef ENABLE_ALARM + #if defined(ENABLE_ALARM) || defined(ENABLE_TX1750) gAlarmState = ALARM_STATE_OFF; #endif gDTMF_ReplyState = DTMF_REPLY_NONE; @@ -995,15 +1001,18 @@ void RADIO_PrepareTX(void) FUNCTION_Select(FUNCTION_TRANSMIT); gTxTimerCountdown_500ms = 0; // no timeout - #ifdef ENABLE_ALARM + + #if defined(ENABLE_ALARM) || defined(ENABLE_TX1750) if (gAlarmState == ALARM_STATE_OFF) #endif { - if (gEeprom.TX_TIMEOUT_TIMER == 1) + if (gEeprom.TX_TIMEOUT_TIMER == 0) gTxTimerCountdown_500ms = 60; // 30 sec else - if (gEeprom.TX_TIMEOUT_TIMER >= 2) - gTxTimerCountdown_500ms = (gEeprom.TX_TIMEOUT_TIMER - 1) * 120; // minutes + if (gEeprom.TX_TIMEOUT_TIMER < (ARRAY_SIZE(gSubMenu_TOT) - 1)) + gTxTimerCountdown_500ms = 120 * gEeprom.TX_TIMEOUT_TIMER; // minutes + else + gTxTimerCountdown_500ms = 120 * 15; // 15 minutes } gTxTimeoutReached = false; @@ -1051,8 +1060,9 @@ void RADIO_SendEndOfTransmission(void) if (gEeprom.ROGER == ROGER_MODE_MDC) BK4819_PlayRogerMDC(); - if (gDTMF_CallState == DTMF_CALL_STATE_NONE && (gCurrentVfo->DTMF_PTT_ID_TX_MODE == PTT_ID_EOT || gCurrentVfo->DTMF_PTT_ID_TX_MODE == PTT_ID_BOTH)) - { + if (gDTMF_CallState == DTMF_CALL_STATE_NONE && + (gCurrentVfo->DTMF_PTT_ID_TX_MODE == PTT_ID_EOT || gCurrentVfo->DTMF_PTT_ID_TX_MODE == PTT_ID_BOTH)) + { // end-of-tx if (gEeprom.DTMF_SIDE_TONE) { GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH); diff --git a/radio.h b/radio.h index 1b85136..ecfe98a 100644 --- a/radio.h +++ b/radio.h @@ -159,7 +159,7 @@ extern VfoState_t VfoState[2]; bool RADIO_CheckValidChannel(uint16_t ChNum, bool bCheckScanList, uint8_t RadioNum); uint8_t RADIO_FindNextChannel(uint8_t ChNum, int8_t Direction, bool bCheckScanList, uint8_t RadioNum); -void RADIO_InitInfo(VFO_Info_t *pInfo, uint8_t ChannelSave, uint8_t ChIndex, uint32_t Frequency); +void RADIO_InitInfo(VFO_Info_t *pInfo, const uint8_t ChannelSave, const uint32_t Frequency); void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure); void RADIO_ConfigureSquelchAndOutputPower(VFO_Info_t *pInfo); void RADIO_ApplyOffset(VFO_Info_t *pInfo); diff --git a/settings.c b/settings.c index 649eca4..a38fa49 100644 --- a/settings.c +++ b/settings.c @@ -121,7 +121,7 @@ void SETTINGS_SaveSettings(void) EEPROM_WriteBuffer(0x0EA0, State); #endif - #ifdef ENABLE_ALARM + #if defined(ENABLE_ALARM) || defined(ENABLE_TX1750) State[0] = gEeprom.ALARM_MODE; #else State[0] = false; diff --git a/settings.h b/settings.h index 3b94b8c..47dcdb3 100644 --- a/settings.h +++ b/settings.h @@ -176,7 +176,7 @@ typedef struct { #endif bool AUTO_KEYPAD_LOCK; - #ifdef ENABLE_ALARM + #if defined(ENABLE_ALARM) || defined(ENABLE_TX1750) ALARM_Mode_t ALARM_MODE; #endif POWER_OnDisplayMode_t POWER_ON_DISPLAY_MODE; diff --git a/ui/main.c b/ui/main.c index 32f9df1..1493566 100644 --- a/ui/main.c +++ b/ui/main.c @@ -96,18 +96,18 @@ bool center_line_is_free = true; #endif - uint8_t *pLine = gFrameBuffer[line]; + uint8_t *p_line = gFrameBuffer[line]; - memset(pLine, 0, LCD_WIDTH); + memset(p_line, 0, LCD_WIDTH); #if 1 // solid bar for (i = 0; i < bar_width; i++) - pLine[bar_x + i] = (i > len) ? ((i & 1) == 0) ? 0x41 : 0x00 : ((i & 1) == 0) ? 0x7f : 0x3e; + p_line[bar_x + i] = (i > len) ? ((i & 1) == 0) ? 0x41 : 0x00 : ((i & 1) == 0) ? 0x7f : 0x3e; #else // knuled bar for (i = 0; i < bar_width; i += 2) - pLine[bar_x + i] = (i <= len) ? 0x7f : 0x41; + p_line[bar_x + i] = (i <= len) ? 0x7f : 0x41; #endif if (gCurrentFunction == FUNCTION_TRANSMIT) @@ -124,6 +124,7 @@ bool center_line_is_free = true; const int16_t s9_dBm = s0_dBm + (6 * 9); // S9 .. 6dB/S-Point const int16_t bar_max_dBm = s9_dBm + 30; // S9+30dB +// const int16_t bar_min_dBm = s0_dBm + (6 * 0); // S0 const int16_t bar_min_dBm = s0_dBm + (6 * 4); // S4 // ************ @@ -138,7 +139,7 @@ bool center_line_is_free = true; const unsigned int len = ((clamped_dBm - bar_min_dBm) * bar_width) / bar_range_dB; const unsigned int line = 3; - uint8_t *pLine = gFrameBuffer[line]; + uint8_t *p_line = gFrameBuffer[line]; char s[16]; unsigned int i; @@ -149,12 +150,12 @@ bool center_line_is_free = true; return; // display is in use if (now) - memset(pLine, 0, LCD_WIDTH); + memset(p_line, 0, LCD_WIDTH); if (rssi_dBm >= (s9_dBm + 6)) { // S9+XXdB, 1dB increment - const char *fmt[] = {"%-4d +%u ", "%-4d +%u "}; - const unsigned int dB = rssi_dBm - s9_dBm; + const char *fmt[] = {"%-4d +%u ", "%-4d +%2u "}; + const unsigned int dB = ((rssi_dBm - s9_dBm) <= 99) ? rssi_dBm - s9_dBm : 99; sprintf(s, (dB < 10) ? fmt[0] : fmt[1], rssi_dBm, dB); } else @@ -167,11 +168,11 @@ bool center_line_is_free = true; #if 1 // solid bar for (i = 0; i < bar_width; i++) - pLine[bar_x + i] = (i > len) ? ((i & 1) == 0) ? 0x41 : 0x00 : ((i & 1) == 0) ? 0x7f : 0x3e; + p_line[bar_x + i] = (i > len) ? ((i & 1) == 0) ? 0x41 : 0x00 : ((i & 1) == 0) ? 0x7f : 0x3e; #else // knuled bar for (i = 0; i < bar_width; i += 2) - pLine[bar_x + i] = (i <= len) ? 0x7f : 0x41; + p_line[bar_x + i] = (i <= len) ? 0x7f : 0x41; #endif if (now) @@ -186,24 +187,18 @@ void UI_UpdateRSSI(const int16_t rssi, const int vfo) if (!center_line_is_free) return; - const bool rx = (gCurrentFunction == FUNCTION_RECEIVE || - gCurrentFunction == FUNCTION_MONITOR || - gCurrentFunction == FUNCTION_INCOMING); - - #if defined(ENABLE_AM_FIX) && defined(ENABLE_AM_FIX_SHOW_DATA) - if (gEeprom.VfoInfo[gEeprom.RX_CHANNEL].AM_mode && gSetting_AM_fix) - { // AM test data is currently being shown - } - else - #endif - if (rx) - UI_DisplayRSSIBar(rssi, true); - + if (gCurrentFunction == FUNCTION_RECEIVE || + gCurrentFunction == FUNCTION_MONITOR || + gCurrentFunction == FUNCTION_INCOMING) + { + UI_DisplayRSSIBar(rssi, true); + } + #else // const int16_t dBm = (rssi / 2) - 160; const uint8_t Line = (vfo == 0) ? 3 : 7; - uint8_t *pLine = gFrameBuffer[Line - 1]; + uint8_t *p_line = gFrameBuffer[Line - 1]; // TODO: sort out all 8 values from the eeprom @@ -258,31 +253,31 @@ void UI_UpdateRSSI(const int16_t rssi, const int vfo) if (gCurrentFunction == FUNCTION_TRANSMIT || gScreenToDisplay != DISPLAY_MAIN) return; // display is in use - pLine = gFrameBuffer[Line - 1]; + p_line = gFrameBuffer[Line - 1]; - memset(pLine, 0, 23); + memset(p_line, 0, 23); if (rssi_level > 0) { //if (rssi_level >= 1) - memmove(pLine, BITMAP_Antenna, 5); + memmove(p_line, BITMAP_Antenna, 5); if (rssi_level >= 2) - memmove(pLine + 5, BITMAP_AntennaLevel1, sizeof(BITMAP_AntennaLevel1)); + memmove(p_line + 5, BITMAP_AntennaLevel1, sizeof(BITMAP_AntennaLevel1)); if (rssi_level >= 3) - memmove(pLine + 8, BITMAP_AntennaLevel2, sizeof(BITMAP_AntennaLevel2)); + memmove(p_line + 8, BITMAP_AntennaLevel2, sizeof(BITMAP_AntennaLevel2)); if (rssi_level >= 4) - memmove(pLine + 11, BITMAP_AntennaLevel3, sizeof(BITMAP_AntennaLevel3)); + memmove(p_line + 11, BITMAP_AntennaLevel3, sizeof(BITMAP_AntennaLevel3)); if (rssi_level >= 5) - memmove(pLine + 14, BITMAP_AntennaLevel4, sizeof(BITMAP_AntennaLevel4)); + memmove(p_line + 14, BITMAP_AntennaLevel4, sizeof(BITMAP_AntennaLevel4)); if (rssi_level >= 6) - memmove(pLine + 17, BITMAP_AntennaLevel5, sizeof(BITMAP_AntennaLevel5)); + memmove(p_line + 17, BITMAP_AntennaLevel5, sizeof(BITMAP_AntennaLevel5)); if (rssi_level >= 7) - memmove(pLine + 20, BITMAP_AntennaLevel6, sizeof(BITMAP_AntennaLevel6)); + memmove(p_line + 20, BITMAP_AntennaLevel6, sizeof(BITMAP_AntennaLevel6)); } else - pLine = NULL; + p_line = NULL; - ST7565_DrawLine(0, Line, 23, pLine); + ST7565_DrawLine(0, Line, 23, p_line); #endif } @@ -290,9 +285,12 @@ void UI_UpdateRSSI(const int16_t rssi, const int vfo) void UI_DisplayMain(void) { - char String[16]; - unsigned int vfo_num; + const unsigned int line0 = 0; // text screen line + const unsigned int line1 = 4; + char String[16]; + unsigned int vfo_num; + // true if the center screen line is available to use center_line_is_free = true; // #ifdef SINGLE_VFO_CHAN @@ -301,6 +299,7 @@ void UI_DisplayMain(void) const bool single_vfo = false; // #endif + // clear the screen memset(gFrameBuffer, 0, sizeof(gFrameBuffer)); if (gEeprom.KEY_LOCK && gKeypadLocked > 0) @@ -313,25 +312,28 @@ void UI_DisplayMain(void) for (vfo_num = 0; vfo_num < 2; vfo_num++) { - uint8_t Channel = gEeprom.TX_CHANNEL; - bool bIsSameVfo = !!(Channel == vfo_num); - uint8_t Line = (vfo_num == 0) ? 0 : 4; - uint8_t *pLine0 = gFrameBuffer[Line + 0]; - uint8_t *pLine1 = gFrameBuffer[Line + 1]; + const unsigned int line = (vfo_num == 0) ? line0 : line1; + uint8_t channel = gEeprom.TX_CHANNEL; +// uint8_t tx_channel = (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF) ? gEeprom.RX_CHANNEL : gEeprom.TX_CHANNEL; + const bool same_vfo = (channel == vfo_num) ? true : false; + uint8_t *p_line0 = gFrameBuffer[line + 0]; + uint8_t *p_line1 = gFrameBuffer[line + 1]; + uint32_t duff_beer = 0; + uint8_t state; if (single_vfo) { // we're in single VFO mode - screen is dedicated to just one VFO - if (!bIsSameVfo) + if (!same_vfo) continue; // skip the unused vfo } if (gEeprom.DUAL_WATCH != DUAL_WATCH_OFF && gRxVfoIsActive) - Channel = gEeprom.RX_CHANNEL; // we're currently monitoring the other VFO + channel = gEeprom.RX_CHANNEL; // we're currently monitoring the other VFO - if (Channel != vfo_num) + if (channel != vfo_num) { if (gDTMF_CallState != DTMF_CALL_STATE_NONE || gDTMF_IsTx || gDTMF_InputMode) { // show DTMF stuff @@ -382,24 +384,22 @@ void UI_DisplayMain(void) } // highlight the selected/used VFO with a marker - if (!single_vfo && bIsSameVfo) - memmove(pLine0 + 0, BITMAP_VFO_Default, sizeof(BITMAP_VFO_Default)); + if (!single_vfo && same_vfo) + memmove(p_line0 + 0, BITMAP_VFO_Default, sizeof(BITMAP_VFO_Default)); else if (gEeprom.CROSS_BAND_RX_TX != CROSS_BAND_OFF) - memmove(pLine0 + 0, BITMAP_VFO_NotDefault, sizeof(BITMAP_VFO_NotDefault)); + memmove(p_line0 + 0, BITMAP_VFO_NotDefault, sizeof(BITMAP_VFO_NotDefault)); } else if (!single_vfo) { // highlight the selected/used VFO with a marker - if (bIsSameVfo) - memmove(pLine0 + 0, BITMAP_VFO_Default, sizeof(BITMAP_VFO_Default)); + if (same_vfo) + memmove(p_line0 + 0, BITMAP_VFO_Default, sizeof(BITMAP_VFO_Default)); else //if (gEeprom.CROSS_BAND_RX_TX != CROSS_BAND_OFF) - memmove(pLine0 + 0, BITMAP_VFO_NotDefault, sizeof(BITMAP_VFO_NotDefault)); + memmove(p_line0 + 0, BITMAP_VFO_NotDefault, sizeof(BITMAP_VFO_NotDefault)); } - uint32_t duff_beer = 0; - if (gCurrentFunction == FUNCTION_TRANSMIT) { // transmitting @@ -409,11 +409,11 @@ void UI_DisplayMain(void) else #endif { - Channel = (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF) ? gEeprom.RX_CHANNEL : gEeprom.TX_CHANNEL; - if (Channel == vfo_num) + channel = (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF) ? gEeprom.RX_CHANNEL : gEeprom.TX_CHANNEL; + if (channel == vfo_num) { // show the TX symbol duff_beer = 1; - UI_PrintStringSmall("TX", 14, 0, Line); + UI_PrintStringSmall("TX", 14, 0, line); } } } @@ -421,7 +421,7 @@ void UI_DisplayMain(void) { // receiving .. show the RX symbol duff_beer = 2; if ((gCurrentFunction == FUNCTION_RECEIVE || gCurrentFunction == FUNCTION_MONITOR) && gEeprom.RX_CHANNEL == vfo_num) - UI_PrintStringSmall("RX", 14, 0, Line); + UI_PrintStringSmall("RX", 14, 0, line); } if (IS_MR_CHANNEL(gEeprom.ScreenChannel[vfo_num])) @@ -431,9 +431,9 @@ void UI_DisplayMain(void) if (!inputting) NUMBER_ToDigits(gEeprom.ScreenChannel[vfo_num] + 1, String); // show the memory channel number else - memmove(String + 5, gInputBox, 3); // show the input text - UI_PrintStringSmall("M", x, 0, Line + 1); - UI_DisplaySmallDigits(3, String + 5, x + 7, Line + 1, inputting); + memmove(String + 5, gInputBox, 3); // show the input text + UI_PrintStringSmall("M", x, 0, line + 1); + UI_DisplaySmallDigits(3, String + 5, x + 7, line + 1, inputting); } else if (IS_FREQ_CHANNEL(gEeprom.ScreenChannel[vfo_num])) @@ -442,7 +442,7 @@ void UI_DisplayMain(void) const unsigned int x = 2; // was 14 // sprintf(String, "FB%u", 1 + gEeprom.ScreenChannel[vfo_num] - FREQ_CHANNEL_FIRST); sprintf(String, "VFO%u", 1 + gEeprom.ScreenChannel[vfo_num] - FREQ_CHANNEL_FIRST); - UI_PrintStringSmall(String, x, 0, Line + 1); + UI_PrintStringSmall(String, x, 0, line + 1); } #ifdef ENABLE_NOAA else @@ -455,40 +455,33 @@ void UI_DisplayMain(void) { // user entering channel number sprintf(String, "N%u%u", '0' + gInputBox[0], '0' + gInputBox[1]); } - UI_PrintStringSmall(String, 7, 0, Line + 1); + UI_PrintStringSmall(String, 7, 0, line + 1); } #endif // ************ - uint8_t State = VfoState[vfo_num]; + state = VfoState[vfo_num]; #ifdef ENABLE_ALARM if (gCurrentFunction == FUNCTION_TRANSMIT && gAlarmState == ALARM_STATE_ALARM) { - Channel = (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF) ? gEeprom.RX_CHANNEL : gEeprom.TX_CHANNEL; - if (Channel == vfo_num) - State = VFO_STATE_ALARM; + channel = (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF) ? gEeprom.RX_CHANNEL : gEeprom.TX_CHANNEL; + if (channel == vfo_num) + state = VFO_STATE_ALARM; } #endif - if (State != VFO_STATE_NORMAL) + if (state != VFO_STATE_NORMAL) { const char *state_list[] = {"", "BUSY", "BAT LOW", "TX DISABLE", "TIMEOUT", "ALARM", "VOLT HIGH"}; - if (State >= 0 && State < ARRAY_SIZE(state_list)) - { - UI_PrintString(state_list[State], 31, 0, Line, 8); - } - //else - //{ - // sprintf(String, "State %u ?", State); - // UI_PrintString(String, 31, 0, Line, 8); - //} + if (state >= 0 && state < ARRAY_SIZE(state_list)) + UI_PrintString(state_list[state], 31, 0, line, 8); } else if (gInputBoxIndex > 0 && IS_FREQ_CHANNEL(gEeprom.ScreenChannel[vfo_num]) && gEeprom.TX_CHANNEL == vfo_num) { // user entering a frequency - UI_DisplayFrequency(gInputBox, 32, Line, true, false); + UI_DisplayFrequency(gInputBox, 32, line, true, false); center_line_is_free = false; } @@ -497,8 +490,8 @@ void UI_DisplayMain(void) uint32_t frequency = gEeprom.VfoInfo[vfo_num].pRX->Frequency; if (gCurrentFunction == FUNCTION_TRANSMIT) { // transmitting - Channel = (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF) ? gEeprom.RX_CHANNEL : gEeprom.TX_CHANNEL; - if (Channel == vfo_num) + channel = (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF) ? gEeprom.RX_CHANNEL : gEeprom.TX_CHANNEL; + if (channel == vfo_num) frequency = gEeprom.VfoInfo[vfo_num].pTX->Frequency; } @@ -508,13 +501,13 @@ void UI_DisplayMain(void) // show the channel symbols const uint8_t attributes = gMR_ChannelAttributes[gEeprom.ScreenChannel[vfo_num]]; if (attributes & MR_CH_SCANLIST1) - memmove(pLine0 + 113, BITMAP_ScanList1, sizeof(BITMAP_ScanList1)); + memmove(p_line0 + 113, BITMAP_ScanList1, sizeof(BITMAP_ScanList1)); if (attributes & MR_CH_SCANLIST2) - memmove(pLine0 + 120, BITMAP_ScanList2, sizeof(BITMAP_ScanList2)); + memmove(p_line0 + 120, BITMAP_ScanList2, sizeof(BITMAP_ScanList2)); #ifndef ENABLE_BIG_FREQ #ifdef ENABLE_COMPANDER if ((attributes & MR_CH_COMPAND) > 0) - memmove(pLine0 + 120 + LCD_WIDTH, BITMAP_compand, sizeof(BITMAP_compand)); + memmove(p_line0 + 120 + LCD_WIDTH, BITMAP_compand, sizeof(BITMAP_compand)); #endif #endif @@ -524,19 +517,19 @@ void UI_DisplayMain(void) #ifdef ENABLE_BIG_FREQ NUMBER_ToDigits(frequency, String); // show the main large frequency digits - UI_DisplayFrequency(String, 32, Line, false, false); + UI_DisplayFrequency(String, 32, line, false, false); // show the remaining 2 small frequency digits - UI_DisplaySmallDigits(2, String + 6, 113, Line + 1, true); + UI_DisplaySmallDigits(2, String + 6, 113, line + 1, true); #else // show the frequency in the main font sprintf(String, "%03u.%05u", frequency / 100000, frequency % 100000); - UI_PrintString(String, 32, 0, Line, 8); + UI_PrintString(String, 32, 0, line, 8); #endif break; case MDF_CHANNEL: // show the channel number sprintf(String, "CH-%03u", gEeprom.ScreenChannel[vfo_num] + 1); - UI_PrintString(String, 32, 0, Line, 8); + UI_PrintString(String, 32, 0, line, 8); break; case MDF_NAME: // show the channel name @@ -550,19 +543,19 @@ void UI_DisplayMain(void) if (gEeprom.CHANNEL_DISPLAY_MODE == MDF_NAME) { - UI_PrintString(String, 32, 0, Line, 8); + UI_PrintString(String, 32, 0, line, 8); } else { #ifdef ENABLE_SMALL_BOLD - UI_PrintStringSmallBold(String, 32 + 4, 0, Line); + UI_PrintStringSmallBold(String, 32 + 4, 0, line); #else - UI_PrintStringSmall(String, 32 + 4, 0, Line); + UI_PrintStringSmall(String, 32 + 4, 0, line); #endif // show the channel frequency below the channel number/name sprintf(String, "%03u.%05u", frequency / 100000, frequency % 100000); - UI_PrintStringSmall(String, 32 + 4, 0, Line + 1); + UI_PrintStringSmall(String, 32 + 4, 0, line + 1); } break; @@ -573,13 +566,13 @@ void UI_DisplayMain(void) #ifdef ENABLE_BIG_FREQ NUMBER_ToDigits(frequency, String); // 8 digits // show the main large frequency digits - UI_DisplayFrequency(String, 32, Line, false, false); + UI_DisplayFrequency(String, 32, line, false, false); // show the remaining 2 small frequency digits - UI_DisplaySmallDigits(2, String + 6, 113, Line + 1, true); + UI_DisplaySmallDigits(2, String + 6, 113, line + 1, true); #else // show the frequency in the main font sprintf(String, "%03u.%05u", frequency / 100000, frequency % 100000); - UI_PrintString(String, 32, 0, Line, 8); + UI_PrintString(String, 32, 0, line, 8); #endif #ifdef ENABLE_COMPANDER @@ -587,9 +580,9 @@ void UI_DisplayMain(void) const uint8_t attributes = gMR_ChannelAttributes[gEeprom.ScreenChannel[vfo_num]]; if ((attributes & MR_CH_COMPAND) > 0) #ifdef ENABLE_BIG_FREQ - memmove(pLine0 + 120, BITMAP_compand, sizeof(BITMAP_compand)); + memmove(p_line0 + 120, BITMAP_compand, sizeof(BITMAP_compand)); #else - memmove(pLine0 + 120 + LCD_WIDTH, BITMAP_compand, sizeof(BITMAP_compand)); + memmove(p_line0 + 120 + LCD_WIDTH, BITMAP_compand, sizeof(BITMAP_compand)); #endif #endif } @@ -621,20 +614,20 @@ void UI_DisplayMain(void) if (Level >= 1) { - uint8_t *pLine = pLine1 + LCD_WIDTH; - memmove(pLine + 0, BITMAP_Antenna, sizeof(BITMAP_Antenna)); + uint8_t *p_line = p_line1 + LCD_WIDTH; + memmove(p_line + 0, BITMAP_Antenna, sizeof(BITMAP_Antenna)); if (Level >= 2) - memmove(pLine + 5, BITMAP_AntennaLevel1, sizeof(BITMAP_AntennaLevel1)); + memmove(p_line + 5, BITMAP_AntennaLevel1, sizeof(BITMAP_AntennaLevel1)); if (Level >= 3) - memmove(pLine + 8, BITMAP_AntennaLevel2, sizeof(BITMAP_AntennaLevel2)); + memmove(p_line + 8, BITMAP_AntennaLevel2, sizeof(BITMAP_AntennaLevel2)); if (Level >= 4) - memmove(pLine + 11, BITMAP_AntennaLevel3, sizeof(BITMAP_AntennaLevel3)); + memmove(p_line + 11, BITMAP_AntennaLevel3, sizeof(BITMAP_AntennaLevel3)); if (Level >= 5) - memmove(pLine + 14, BITMAP_AntennaLevel4, sizeof(BITMAP_AntennaLevel4)); + memmove(p_line + 14, BITMAP_AntennaLevel4, sizeof(BITMAP_AntennaLevel4)); if (Level >= 6) - memmove(pLine + 17, BITMAP_AntennaLevel5, sizeof(BITMAP_AntennaLevel5)); + memmove(p_line + 17, BITMAP_AntennaLevel5, sizeof(BITMAP_AntennaLevel5)); if (Level >= 7) - memmove(pLine + 20, BITMAP_AntennaLevel6, sizeof(BITMAP_AntennaLevel6)); + memmove(p_line + 20, BITMAP_AntennaLevel6, sizeof(BITMAP_AntennaLevel6)); } } @@ -653,15 +646,15 @@ void UI_DisplayMain(void) if (code_type >= 0 && code_type < ARRAY_SIZE(code_list)) strcpy(String, code_list[code_type]); } - UI_PrintStringSmall(String, LCD_WIDTH + 24, 0, Line + 1); + UI_PrintStringSmall(String, LCD_WIDTH + 24, 0, line + 1); - if (State != VFO_STATE_TX_DISABLE) + if (state == VFO_STATE_NORMAL || state == VFO_STATE_ALARM) { // show the TX power const char pwr_list[] = "LMH"; const unsigned int i = gEeprom.VfoInfo[vfo_num].OUTPUT_POWER; String[0] = (i >= 0 && i < ARRAY_SIZE(pwr_list)) ? pwr_list[i] : '\0'; String[1] = '\0'; - UI_PrintStringSmall(String, LCD_WIDTH + 46, 0, Line + 1); + UI_PrintStringSmall(String, LCD_WIDTH + 46, 0, line + 1); } if (gEeprom.VfoInfo[vfo_num].freq_config_RX.Frequency != gEeprom.VfoInfo[vfo_num].freq_config_TX.Frequency) @@ -670,12 +663,12 @@ void UI_DisplayMain(void) const unsigned int i = gEeprom.VfoInfo[vfo_num].TX_OFFSET_FREQUENCY_DIRECTION; String[0] = (i < sizeof(dir_list)) ? dir_list[i] : '?'; String[1] = '\0'; - UI_PrintStringSmall(String, LCD_WIDTH + 54, 0, Line + 1); + UI_PrintStringSmall(String, LCD_WIDTH + 54, 0, line + 1); } // show the TX/RX reverse symbol if (gEeprom.VfoInfo[vfo_num].FrequencyReverse) - UI_PrintStringSmall("R", LCD_WIDTH + 62, 0, Line + 1); + UI_PrintStringSmall("R", LCD_WIDTH + 62, 0, line + 1); { // show the narrow band symbol String[0] = '\0'; @@ -684,16 +677,16 @@ void UI_DisplayMain(void) String[0] = 'N'; String[1] = '\0'; } - UI_PrintStringSmall(String, LCD_WIDTH + 70, 0, Line + 1); + UI_PrintStringSmall(String, LCD_WIDTH + 70, 0, line + 1); } // show the DTMF decoding symbol if (gEeprom.VfoInfo[vfo_num].DTMF_DECODING_ENABLE || gSetting_KILLED) - UI_PrintStringSmall("DTMF", LCD_WIDTH + 78, 0, Line + 1); + UI_PrintStringSmall("DTMF", LCD_WIDTH + 78, 0, line + 1); // show the audio scramble symbol if (gEeprom.VfoInfo[vfo_num].SCRAMBLING_TYPE > 0 && gSetting_ScrambleEnable) - UI_PrintStringSmall("SCR", LCD_WIDTH + 106, 0, Line + 1); + UI_PrintStringSmall("SCR", LCD_WIDTH + 106, 0, line + 1); } if (center_line_is_free) @@ -705,7 +698,10 @@ void UI_DisplayMain(void) #ifdef ENABLE_AUDIO_BAR if (gSetting_mic_bar && gCurrentFunction == FUNCTION_TRANSMIT) + { UI_DisplayAudioBar(); + center_line_is_free = false; + } else #endif @@ -714,16 +710,20 @@ void UI_DisplayMain(void) { AM_fix_print_data(gEeprom.RX_CHANNEL, String); UI_PrintStringSmall(String, 2, 0, 3); + center_line_is_free = false; } else #endif #ifdef ENABLE_RSSI_BAR if (rx) + { UI_DisplayRSSIBar(gCurrentRSSI[gEeprom.RX_CHANNEL], false); + center_line_is_free = false; + } else #endif - + if (rx || gCurrentFunction == FUNCTION_FOREGROUND || gCurrentFunction == FUNCTION_POWER_SAVE) { #if 1 @@ -734,6 +734,7 @@ void UI_DisplayMain(void) strcpy(String, "DTMF "); strcat(String, gDTMF_RX_live + idx); UI_PrintStringSmall(String, 2, 0, 3); + center_line_is_free = false; } #else if (gSetting_live_DTMF_decoder && gDTMF_RX_index > 0) @@ -743,6 +744,7 @@ void UI_DisplayMain(void) strcpy(String, "DTMF "); strcat(String, gDTMF_RX + idx); UI_PrintStringSmall(String, 2, 0, 3); + center_line_is_free = false; } #endif @@ -750,9 +752,11 @@ void UI_DisplayMain(void) else if (gChargingWithTypeC) { // charging .. show the battery state - const uint16_t percent = BATTERY_VoltsToPercent(gBatteryVoltageAverage); - sprintf(String, "Charge %u.%02uV %u%%", gBatteryVoltageAverage / 100, gBatteryVoltageAverage % 100, percent); - UI_PrintStringSmall(String, 2, 0, 3); + sprintf(String, "Charge %u.%02uV %u%%", + gBatteryVoltageAverage / 100, gBatteryVoltageAverage % 100, + BATTERY_VoltsToPercent(gBatteryVoltageAverage)); + UI_PrintStringSmall(String, 2, 0, 3); + center_line_is_free = false; } #endif } diff --git a/ui/menu.c b/ui/menu.c index 3c6dc47..834c317 100644 --- a/ui/menu.c +++ b/ui/menu.c @@ -91,11 +91,11 @@ const t_menu_item MenuList[] = {"ANI-ID", VOICE_ID_ANI_CODE, MENU_ANI_ID }, {"UPCODE", VOICE_ID_INVALID, MENU_UPCODE }, {"DWCODE", VOICE_ID_INVALID, MENU_DWCODE }, + {"PTT-ID", VOICE_ID_INVALID, MENU_PTT_ID }, {"D-ST", VOICE_ID_INVALID, MENU_D_ST }, {"D-RSP", VOICE_ID_INVALID, MENU_D_RSP }, {"D-HOLD", VOICE_ID_INVALID, MENU_D_HOLD }, {"D-PRE", VOICE_ID_INVALID, MENU_D_PRE }, - {"PTT-ID", VOICE_ID_INVALID, MENU_PTT_ID }, {"D-DCD", VOICE_ID_INVALID, MENU_D_DCD }, {"D-LIST", VOICE_ID_INVALID, MENU_D_LIST }, {"D-LIVE", VOICE_ID_INVALID, MENU_D_LIVE_DEC }, // live DTMF decoder @@ -127,6 +127,7 @@ const t_menu_item MenuList[] = {"TX-EN", VOICE_ID_INVALID, MENU_TX_EN }, // enable TX {"F-CALI", VOICE_ID_INVALID, MENU_F_CALI }, // reference xtal calibration + {"BATCAL", VOICE_ID_INVALID, MENU_BATCAL }, // battery voltage calibration {"", VOICE_ID_INVALID, 0xff } // end of list - DO NOT delete or move this this }; @@ -168,7 +169,6 @@ const char gSubMenu_SAVE[5][4] = const char gSubMenu_TOT[11][7] = { - "OFF", "30 sec", "1 min", "2 min", @@ -178,21 +178,22 @@ const char gSubMenu_TOT[11][7] = "6 min", "7 min", "8 min", - "9 min" + "9 min", + "15 min" }; -const char gSubMenu_CHAN[3][7] = +const char gSubMenu_CHAN[3][10] = { "OFF", - "CHAN A", - "CHAN B" + "UPPER\nVFO", + "LOWER\nVFO" }; -const char gSubMenu_XB[3][7] = +const char gSubMenu_XB[3][10] = { - "SAME", - "CHAN A", - "CHAN B" + "MAIN\nVFO", + "UPPER\nVFO", + "LOWER\nVFO" }; #ifdef ENABLE_VOICE @@ -204,19 +205,22 @@ const char gSubMenu_XB[3][7] = }; #endif -const char gSubMenu_SC_REV[3][3] = +const char gSubMenu_SC_REV[3][13] = { - "TO", - "CO", - "SE" +// "TIME\nOPER", +// "CARRIER\nOPER", +// "SEARCH\nOPER" + "TIME", + "CARRIER", + "SEARCH" }; -const char gSubMenu_MDF[4][8] = +const char gSubMenu_MDF[4][15] = { "FREQ", - "CHAN", + "CHANNEL\nNUMBER", "NAME", - "NAM+FRE" + "NAME\n+\nFREQ" }; #ifdef ENABLE_ALARM @@ -235,19 +239,19 @@ const char gSubMenu_D_RSP[4][6] = "BOTH" }; -const char gSubMenu_PTT_ID[4][5] = +const char gSubMenu_PTT_ID[4][7] = { "OFF", - "BOT", - "EOT", + "KEY UP", + "KEY DN", "BOTH" }; -const char gSubMenu_PONMSG[4][5] = +const char gSubMenu_PONMSG[4][8] = { "FULL", - "MSG", - "VOL", + "MESSAGE", + "VOLTAGE", "NONE" }; @@ -332,9 +336,10 @@ bool gIsInSubMenu; uint8_t gMenuCursor; int8_t gMenuScrollDirection; int32_t gSubMenuSelection; +int32_t gSubMenuSelection_original = 0; // copy of the original value // edit box -char edit_original[17]; // a copy of the text before editing so that we can easily test for changes/difference +char edit_original[17] = {0}; // a copy of the text before editing so that we can easily test for changes/difference char edit[17]; int edit_index; @@ -344,34 +349,89 @@ void UI_DisplayMenu(void) const unsigned int menu_item_x1 = (8 * menu_list_width) + 2; const unsigned int menu_item_x2 = LCD_WIDTH - 1; unsigned int i; - char String[16]; + char String[64]; char Contact[16]; + // clear the screen memset(gFrameBuffer, 0, sizeof(gFrameBuffer)); - for (i = 0; i < 3; i++) - if (gMenuCursor > 0 || i > 0) - if ((gMenuListCount - 1) != gMenuCursor || i != 2) - UI_PrintString(MenuList[gMenuCursor + i - 1].name, 0, 0, i * 2, 8); + // draw the left menu list + #if 0 - // invert the menu list text pixels - for (i = 0; i < (8 * menu_list_width); i++) + for (i = 0; i < 3; i++) + if (gMenuCursor > 0 || i > 0) + if ((gMenuListCount - 1) != gMenuCursor || i != 2) + UI_PrintString(MenuList[gMenuCursor + i - 1].name, 0, 0, i * 2, 8); + + // invert the current menu list item text pixels + for (i = 0; i < (8 * menu_list_width); i++) + { + gFrameBuffer[2][i] ^= 0xFF; + gFrameBuffer[3][i] ^= 0xFF; + } + + // draw vertical separating dotted line + for (i = 0; i < 7; i++) + gFrameBuffer[i][(8 * menu_list_width) + 1] = 0xAA; + + // draw the little triangle marker if we're in the sub-menu + if (gIsInSubMenu) + memmove(gFrameBuffer[0] + (8 * menu_list_width) + 1, BITMAP_CurrentIndicator, sizeof(BITMAP_CurrentIndicator)); + + // draw the menu index number/count + sprintf(String, "%2u.%u", 1 + gMenuCursor, gMenuListCount); + UI_PrintStringSmall(String, 2, 0, 6); + + #else { - gFrameBuffer[2][i] ^= 0xFF; - gFrameBuffer[3][i] ^= 0xFF; + const int menu_index = gMenuCursor; // current selected menu item + i = 1; + + if (!gIsInSubMenu) + { + while (i < 2) + { // leading menu items + const int k = menu_index + i - 2; + if (k < 0) + UI_PrintStringSmall(MenuList[gMenuListCount + k].name, 0, 0, i); // wrap-a-round + else + if (k >= 0 && k < (int)gMenuListCount) + UI_PrintStringSmall(MenuList[k].name, 0, 0, i); + i++; + } + + // current menu item + if (menu_index >= 0 && menu_index < (int)gMenuListCount) + UI_PrintString(MenuList[menu_index].name, 0, 0, 2, 8); + i++; + + while (i < 4) + { // trailing menu item + const int k = menu_index + i - 2; + if (k >= 0 && k < (int)gMenuListCount) + UI_PrintStringSmall(MenuList[k].name, 0, 0, 1 + i); + else + if (k >= (int)gMenuListCount) + UI_PrintStringSmall(MenuList[gMenuListCount - k].name, 0, 0, 1 + i); // wrap-a-round + i++; + } + + // draw the menu index number/count + sprintf(String, "%2u.%u", 1 + gMenuCursor, gMenuListCount); + UI_PrintStringSmall(String, 2, 0, 6); + } + else + if (menu_index >= 0 && menu_index < (int)gMenuListCount) + { // current menu item + strcpy(String, MenuList[menu_index].name); +// strcat(String, ":"); + UI_PrintString(String, 0, 0, 0, 8); +// UI_PrintStringSmall(String, 0, 0, 0); + } } + #endif - // draw vertical separating dotted line - for (i = 0; i < 7; i++) - gFrameBuffer[i][(8 * menu_list_width) + 1] = 0xAA; - - // draw the menu index number/count - sprintf(String, "%2u.%u", 1 + gMenuCursor, gMenuListCount); - UI_PrintStringSmall(String, 8, 0, 6); - - // draw the little marker - if (gIsInSubMenu) - memmove(gFrameBuffer[0] + (8 * menu_list_width) + 1, BITMAP_CurrentIndicator, sizeof(BITMAP_CurrentIndicator)); + // ************** memset(String, 0, sizeof(String)); @@ -673,29 +733,9 @@ void UI_DisplayMenu(void) break; case MENU_VOL: - - // 1st text line - sprintf(String, "%u.%02uV", gBatteryVoltageAverage / 100, gBatteryVoltageAverage % 100); - UI_PrintString(String, menu_item_x1, menu_item_x2, 1, 8); - - { // 2nd text line .. percentage - UI_PrintString(String, menu_item_x1, menu_item_x2, 1, 8); - const uint16_t percent = BATTERY_VoltsToPercent(gBatteryVoltageAverage); - sprintf(String, "%u%%", percent); - UI_PrintString(String, menu_item_x1, menu_item_x2, 3, 8); - #if 0 - sprintf(String, "Curr %u", gBatteryCurrent); // needs scaling into mA - UI_PrintString(String, menu_item_x1, menu_item_x2, 5, 8); - #endif - } - - if(gF_LOCK){ - gBatteryCalibration[3] = gSubMenuSelection; - sprintf(String, "%u", gSubMenuSelection); - UI_PrintString(String, menu_item_x1, menu_item_x2, 5, 8); - } - - already_printed = true; + sprintf(String, "%u.%02uV\n%u%%", + gBatteryVoltageAverage / 100, gBatteryVoltageAverage % 100, + BATTERY_VoltsToPercent(gBatteryVoltageAverage)); break; case MENU_RESET: @@ -708,26 +748,72 @@ void UI_DisplayMenu(void) case MENU_F_CALI: { - const uint32_t value = 22656 + gSubMenuSelection; + const uint32_t value = 22656 + gSubMenuSelection; + const uint32_t xtal_Hz = (0x4f0000u + value) * 5; + //gEeprom.BK4819_XTAL_FREQ_LOW = gSubMenuSelection; // already set when the user was adjusting the value BK4819_WriteRegister(BK4819_REG_3B, value); - sprintf(String, "%d", gSubMenuSelection); - UI_PrintString(String, menu_item_x1, menu_item_x2, 0, 8); - - const uint32_t xtal_Hz = (0x4f0000u + value) * 5; - sprintf(String, "%u.%06u", xtal_Hz / 1000000, xtal_Hz % 1000000); - UI_PrintString(String, menu_item_x1, menu_item_x2, 2, 8); - - UI_PrintString("MHz", menu_item_x1, menu_item_x2, 4, 8); - - already_printed = true; + sprintf(String, "%d\n%u.%06u\nMHz", + gSubMenuSelection, + xtal_Hz / 1000000, xtal_Hz % 1000000); } break; + + case MENU_BATCAL: + { + const uint16_t vol = (uint32_t)gBatteryVoltageAverage * gBatteryCalibration[3] / gSubMenuSelection; + sprintf(String, "%u.%02uV\n%u", vol / 100, vol % 100, gSubMenuSelection); + break; + } } if (!already_printed) - UI_PrintString(String, menu_item_x1, menu_item_x2, 2, 8); + { + unsigned int y; + unsigned int k = 0; + unsigned int lines = 1; + unsigned int len = strlen(String); + bool small = false; + + if (len > 0) + { + // count number of lines + for (i = 0; i < len; i++) + { + if (String[i] == '\n' && i < (len - 1)) + { + lines++; + String[i] = 0; + } + } + + if (lines > 3) + { // use small text + small = true; + if (lines > 7) + lines = 7; + } + + // move the 1st line up + if (small) + y = 3 - ((lines + 0) / 2); + else + y = 2 - ((lines + 0) / 2); + + for (i = 0; i < len && lines > 0; lines--) + { + if (small) + UI_PrintStringSmall(String + k, menu_item_x1, menu_item_x2, y); + else + UI_PrintString(String + k, menu_item_x1, menu_item_x2, y, 8); + while (i < len && String[i] >= 32) + i++; + k = ++i; + y += small ? 1 : 2; + } + } + } if (gMenuCursor == MENU_SLIST1 || gMenuCursor == MENU_SLIST2) { diff --git a/ui/menu.h b/ui/menu.h index 1356510..156c72d 100644 --- a/ui/menu.h +++ b/ui/menu.h @@ -79,11 +79,11 @@ enum MENU_ANI_ID, MENU_UPCODE, MENU_DWCODE, + MENU_PTT_ID, MENU_D_ST, MENU_D_RSP, MENU_D_HOLD, MENU_D_PRE, - MENU_PTT_ID, MENU_D_DCD, MENU_D_LIST, MENU_D_LIVE_DEC, @@ -113,7 +113,8 @@ enum MENU_SCREN, MENU_TX_EN, // enable TX - MENU_F_CALI // reference xtal calibration + MENU_F_CALI, // reference xtal calibration + MENU_BATCAL // battery voltage calibration }; extern const t_menu_item MenuList[]; @@ -124,19 +125,19 @@ extern const char gSubMenu_W_N[2][7]; extern const char gSubMenu_OFF_ON[2][4]; extern const char gSubMenu_SAVE[5][4]; extern const char gSubMenu_TOT[11][7]; -extern const char gSubMenu_CHAN[3][7]; -extern const char gSubMenu_XB[3][7]; +extern const char gSubMenu_CHAN[3][10]; +extern const char gSubMenu_XB[3][10]; #ifdef ENABLE_VOICE extern const char gSubMenu_VOICE[3][4]; #endif -extern const char gSubMenu_SC_REV[3][3]; -extern const char gSubMenu_MDF[4][8]; +extern const char gSubMenu_SC_REV[3][13]; +extern const char gSubMenu_MDF[4][15]; #ifdef ENABLE_ALARM extern const char gSubMenu_AL_MOD[2][5]; #endif extern const char gSubMenu_D_RSP[4][6]; -extern const char gSubMenu_PTT_ID[4][5]; -extern const char gSubMenu_PONMSG[4][5]; +extern const char gSubMenu_PTT_ID[4][7]; +extern const char gSubMenu_PONMSG[4][8]; extern const char gSubMenu_ROGER[3][6]; extern const char gSubMenu_RESET[2][4]; extern const char gSubMenu_F_LOCK[6][4]; @@ -156,6 +157,7 @@ extern bool gIsInSubMenu; extern uint8_t gMenuCursor; extern int8_t gMenuScrollDirection; extern int32_t gSubMenuSelection; +extern int32_t gSubMenuSelection_original; extern char edit_original[17]; extern char edit[17]; diff --git a/ui/status.c b/ui/status.c index 60b802b..34c887c 100644 --- a/ui/status.c +++ b/ui/status.c @@ -169,8 +169,7 @@ void UI_DisplayStatus(const bool test_display) case 2: // percentage { - const uint16_t percent = BATTERY_VoltsToPercent(gBatteryVoltageAverage); - sprintf(s, "%u%%", percent); + sprintf(s, "%u%%", BATTERY_VoltsToPercent(gBatteryVoltageAverage)); space_needed = (7 * strlen(s)); if (x2 >= (x1 + space_needed)) UI_PrintStringSmallBuffer(s, line + x2 - space_needed); diff --git a/ui/ui.c b/ui/ui.c index db1142e..750a7ca 100644 --- a/ui/ui.c +++ b/ui/ui.c @@ -91,7 +91,6 @@ void GUI_SelectNextDisplay(GUI_DisplayType_t Display) gAskForConfirmation = 0; gDTMF_InputMode = false; gDTMF_InputIndex = 0; - gF_LOCK = false; gAskToSave = false; gAskToDelete = false; diff --git a/ui/welcome.c b/ui/welcome.c index 1d418bc..db8fb73 100644 --- a/ui/welcome.c +++ b/ui/welcome.c @@ -27,6 +27,18 @@ #include "ui/status.h" #include "version.h" +void UI_DisplayReleaseKeys(void) +{ + memset(gStatusLine, 0, sizeof(gStatusLine)); + memset(gFrameBuffer, 0, sizeof(gFrameBuffer)); + + UI_PrintString("RELEASE", 0, 127, 1, 10); + UI_PrintString("ALL KEYS", 0, 127, 3, 10); + + ST7565_BlitStatusLine(); // blank status line + ST7565_BlitFullScreen(); +} + void UI_DisplayWelcome(void) { char WelcomeString0[16]; diff --git a/ui/welcome.h b/ui/welcome.h index 1f7c6dd..b21a85e 100644 --- a/ui/welcome.h +++ b/ui/welcome.h @@ -17,6 +17,7 @@ #ifndef UI_WELCOME_H #define UI_WELCOME_H +void UI_DisplayReleaseKeys(void); void UI_DisplayWelcome(void); #endif diff --git a/version.c b/version.c index 4f407bf..5ba1320 100644 --- a/version.c +++ b/version.c @@ -4,7 +4,7 @@ #ifdef GIT_HASH #define VER GIT_HASH #else - #define VER "230929" + #define VER "231002" #endif #ifndef ONE_OF_ELEVEN_VER