mirrors/uv-k5-firmware-custom
0
Fork 0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-04-28 22:31:25 +03:00
Code Issues Releases Activity

Restore wideband weak signal bandwidth (squelch more sensitive), added 5 sec BKLT

Browse Source
This commit is contained in:
OneOfEleven 2023-09-21 12:06:31 +01:00
parent 653a00b89d
commit b02d46f66a
13 changed files with 194 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/app.c
View File

@ -1848,7 +1848,7 @@ void APP_TimeSlice500ms(void)
if (gBacklightCountdown > 0) if (gBacklightCountdown > 0)
if (gScreenToDisplay != DISPLAY_MENU || gMenuCursor != MENU_ABR) // don't turn off backlight if user is in backlight menu option if (gScreenToDisplay != DISPLAY_MENU || gMenuCursor != MENU_ABR) // don't turn off backlight if user is in backlight menu option
if (--gBacklightCountdown == 0) if (--gBacklightCountdown == 0)
if (gEeprom.BACKLIGHT < 5) if (gEeprom.BACKLIGHT < (ARRAY_SIZE(gSubMenu_BACKLIGHT) - 1))
GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); // turn backlight off GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); // turn backlight off
#ifdef ENABLE_AIRCOPY #ifdef ENABLE_AIRCOPY
@ -1961,7 +1961,7 @@ void APP_TimeSlice500ms(void)
ST7565_Configure_GPIO_B11(); ST7565_Configure_GPIO_B11();
//if (gEeprom.BACKLIGHT < 5) //if (gEeprom.BACKLIGHT < (ARRAY_SIZE(gSubMenu_BACKLIGHT) - 1))
GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); // turn the backlight off GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); // turn the backlight off
} }
#ifdef ENABLE_VOICE #ifdef ENABLE_VOICE
@ -2092,7 +2092,6 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
{ {
bool bFlag = false; bool bFlag = false;
// const bool backlight_was_on = (gBacklightCountdown > 0 || gEeprom.BACKLIGHT >= 5);
const bool backlight_was_on = GPIO_CheckBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); const bool backlight_was_on = GPIO_CheckBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT);
if (Key == KEY_EXIT && !backlight_was_on && gEeprom.BACKLIGHT > 0) if (Key == KEY_EXIT && !backlight_was_on && gEeprom.BACKLIGHT > 0)

13
app/main.c
View File

@ -176,9 +176,9 @@ static void processFKeyFunction(const KEY_Code_t Key, const bool beep)
gRequestSaveVFO = true; gRequestSaveVFO = true;
gVfoConfigureMode = VFO_CONFIGURE_RELOAD; gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
#else #else
#if 0
// toggle wide/narrow
// TODO: FIX ME .. not working for VFO, works for channel // TODO: FIX ME .. not working for VFO, works for channel
switch (gTxVfo->CHANNEL_BANDWIDTH) switch (gTxVfo->CHANNEL_BANDWIDTH)
{ {
case BANDWIDTH_WIDE: case BANDWIDTH_WIDE:
@ -194,7 +194,7 @@ static void processFKeyFunction(const KEY_Code_t Key, const bool beep)
gRequestSaveChannel = 2; gRequestSaveChannel = 2;
} }
else else
// if (IS_FREQ_CHANNEL(gTxVfo->CHANNEL_SAVE)) //if (IS_FREQ_CHANNEL(gTxVfo->CHANNEL_SAVE))
{ {
gRequestSaveVFO = true; gRequestSaveVFO = true;
gVfoConfigureMode = VFO_CONFIGURE_RELOAD; gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
@ -202,6 +202,13 @@ static void processFKeyFunction(const KEY_Code_t Key, const bool beep)
BK4819_SetFilterBandwidth(gTxVfo->CHANNEL_BANDWIDTH); BK4819_SetFilterBandwidth(gTxVfo->CHANNEL_BANDWIDTH);
gUpdateDisplay = true; gUpdateDisplay = true;
gRequestDisplayScreen = gScreenToDisplay; gRequestDisplayScreen = gScreenToDisplay;
#else
// toggle scanlist-1
gTxVfo->SCANLIST1_PARTICIPATION = gTxVfo->SCANLIST1_PARTICIPATION ? 0 : 1;
SETTINGS_UpdateChannel(gTxVfo->CHANNEL_SAVE, gTxVfo, true);
gVfoConfigureMode = VFO_CONFIGURE_1;
gFlagResetVfos = true;
#endif
#endif #endif
break; break;

2
app/menu.c
View File

@ -85,7 +85,7 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)
case MENU_ABR: case MENU_ABR:
*pMin = 0; *pMin = 0;
*pMax = ARRAY_SIZE(gSubMenu_BACK_LIGHT) - 1; *pMax = ARRAY_SIZE(gSubMenu_BACKLIGHT) - 1;
break; break;
case MENU_F_LOCK: case MENU_F_LOCK:

21
board.c
View File

@ -27,6 +27,7 @@
#include "bsp/dp32g030/saradc.h" #include "bsp/dp32g030/saradc.h"
#include "bsp/dp32g030/syscon.h" #include "bsp/dp32g030/syscon.h"
#include "driver/adc.h" #include "driver/adc.h"
//#include "driver/backlight.h"
#ifdef ENABLE_FMRADIO #ifdef ENABLE_FMRADIO
#include "driver/bk1080.h" #include "driver/bk1080.h"
#endif #endif
@ -44,10 +45,7 @@
#if defined(ENABLE_OVERLAY) #if defined(ENABLE_OVERLAY)
#include "sram-overlay.h" #include "sram-overlay.h"
#endif #endif
#include "ui/menu.h"
#ifndef ARRAY_SIZE
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
#endif
static const uint32_t gDefaultFrequencyTable[] = static const uint32_t gDefaultFrequencyTable[] =
{ {
@ -545,7 +543,7 @@ void BOARD_EEPROM_Init(void)
gEeprom.CROSS_BAND_RX_TX = (Data[2] < 3) ? Data[2] : CROSS_BAND_OFF; gEeprom.CROSS_BAND_RX_TX = (Data[2] < 3) ? Data[2] : CROSS_BAND_OFF;
gEeprom.BATTERY_SAVE = (Data[3] < 5) ? Data[3] : 4; gEeprom.BATTERY_SAVE = (Data[3] < 5) ? Data[3] : 4;
gEeprom.DUAL_WATCH = (Data[4] < 3) ? Data[4] : DUAL_WATCH_CHAN_A; gEeprom.DUAL_WATCH = (Data[4] < 3) ? Data[4] : DUAL_WATCH_CHAN_A;
gEeprom.BACKLIGHT = (Data[5] < 6) ? Data[5] : 4; gEeprom.BACKLIGHT = (Data[5] < ARRAY_SIZE(gSubMenu_BACKLIGHT)) ? Data[5] : 4;
gEeprom.TAIL_NOTE_ELIMINATION = (Data[6] < 2) ? Data[6] : false; gEeprom.TAIL_NOTE_ELIMINATION = (Data[6] < 2) ? Data[6] : false;
gEeprom.VFO_OPEN = (Data[7] < 2) ? Data[7] : true; gEeprom.VFO_OPEN = (Data[7] < 2) ? Data[7] : true;
@ -791,6 +789,19 @@ void BOARD_EEPROM_LoadMoreSettings(void)
} }
} }
uint32_t BOARD_fetchChannelFrequency(const int channel)
{
struct
{
uint32_t frequency;
uint32_t offset;
} __attribute__((packed)) info;
EEPROM_ReadBuffer(channel * 16, &info, sizeof(info));
return info.frequency;
}
void BOARD_fetchChannelName(char *s, const int channel) void BOARD_fetchChannelName(char *s, const int channel)
{ {
int i; int i;

1
board.h
View File

@ -27,6 +27,7 @@ void BOARD_ADC_GetBatteryInfo(uint16_t *pVoltage, uint16_t *pCurrent);
void BOARD_Init(void); void BOARD_Init(void);
void BOARD_EEPROM_Init(void); void BOARD_EEPROM_Init(void);
void BOARD_EEPROM_LoadMoreSettings(void); void BOARD_EEPROM_LoadMoreSettings(void);
uint32_t BOARD_fetchChannelFrequency(const int channel);
void BOARD_fetchChannelName(char *s, const int channel); void BOARD_fetchChannelName(char *s, const int channel);
void BOARD_FactoryReset(bool bIsAll); void BOARD_FactoryReset(bool bIsAll);

14
driver/backlight.c
View File

@ -33,21 +33,23 @@ void BACKLIGHT_TurnOn(void)
switch (gEeprom.BACKLIGHT) switch (gEeprom.BACKLIGHT)
{ {
default: default:
case 1: // 10 sec case 1: // 5 sec
gBacklightCountdown = 2 * 5;
break;
case 2: // 10 sec
gBacklightCountdown = 2 * 10; gBacklightCountdown = 2 * 10;
break; break;
case 2: // 20 sec case 3: // 20 sec
gBacklightCountdown = 2 * 20; gBacklightCountdown = 2 * 20;
break; break;
case 3: // 40 sec case 4: // 40 sec
gBacklightCountdown = 2 * 40; gBacklightCountdown = 2 * 40;
break; break;
case 4: // 80 sec case 5: // 80 sec
gBacklightCountdown = 2 * 80; gBacklightCountdown = 2 * 80;
break; break;
case 5: // always on case 6: // always on
gBacklightCountdown = 0; gBacklightCountdown = 0;
break; break;
} }
} }

4
driver/bk4819.c
View File

@ -561,7 +561,7 @@ void BK4819_SetFilterBandwidth(BK4819_FilterBandwidth_t Bandwidth)
BK4819_WriteRegister(BK4819_REG_43, BK4819_WriteRegister(BK4819_REG_43,
(0u << 15) | // 0 (0u << 15) | // 0
(3u << 12) | // 3 RF filter bandwidth (3u << 12) | // 3 RF filter bandwidth
(3u << 9) | // 0 RF filter bandwidth when signal is weak (0u << 9) | // 0 RF filter bandwidth when signal is weak
(0u << 6) | // 0 AFTxLPF2 filter Band Width (0u << 6) | // 0 AFTxLPF2 filter Band Width
(2u << 4) | // 2 BW Mode Selection (2u << 4) | // 2 BW Mode Selection
(1u << 3) | // 1 (1u << 3) | // 1
@ -574,7 +574,7 @@ void BK4819_SetFilterBandwidth(BK4819_FilterBandwidth_t Bandwidth)
BK4819_WriteRegister(BK4819_REG_43, // 0x4048); // 0 100 000 001 00 1 0 00 BK4819_WriteRegister(BK4819_REG_43, // 0x4048); // 0 100 000 001 00 1 0 00
(0u << 15) | // 0 (0u << 15) | // 0
(3u << 12) | // 4 RF filter bandwidth (3u << 12) | // 4 RF filter bandwidth
(3u << 9) | // 0 RF filter bandwidth when signal is weak (0u << 9) | // 0 RF filter bandwidth when signal is weak
(1u << 6) | // 1 AFTxLPF2 filter Band Width (1u << 6) | // 1 AFTxLPF2 filter Band Width
(0u << 4) | // 0 BW Mode Selection (0u << 4) | // 0 BW Mode Selection
(1u << 3) | // 1 (1u << 3) | // 1

BIN
firmware
View File

Binary file not shown.

BIN
firmware.bin
View File

Binary file not shown.

BIN
firmware.packed.bin
View File

Binary file not shown.

2
main.c
View File

@ -116,7 +116,7 @@ void Main(void)
{ {
FUNCTION_Select(FUNCTION_POWER_SAVE); FUNCTION_Select(FUNCTION_POWER_SAVE);
if (gEeprom.BACKLIGHT < 5) if (gEeprom.BACKLIGHT < (ARRAY_SIZE(gSubMenu_BACKLIGHT) - 1))
GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); // turn the backlight OFF GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); // turn the backlight OFF
else else
GPIO_SetBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); // turn the backlight ON GPIO_SetBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); // turn the backlight ON

239
ui/menu.c
View File

@ -35,93 +35,91 @@
#include "ui/menu.h" #include "ui/menu.h"
#include "ui/ui.h" #include "ui/ui.h"
#ifndef ARRAY_SIZE
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
#endif
const t_menu_item MenuList[] = const t_menu_item MenuList[] =
{ {
{"SQL", 0, VOICE_ID_SQUELCH }, // name, hidden, voice ID, menu ID
{"STEP", 0, VOICE_ID_FREQUENCY_STEP },
{"T-PWR", 0, VOICE_ID_POWER }, // was "TXP" {"SQL", 0, VOICE_ID_SQUELCH, MENU_SQL },
{"R-DCS", 0, VOICE_ID_DCS }, // was "R_DCS" {"STEP", 0, VOICE_ID_FREQUENCY_STEP, MENU_STEP },
{"R-CTCS", 0, VOICE_ID_CTCSS }, // was "R_CTCS" {"T-PWR", 0, VOICE_ID_POWER, MENU_TXP }, // was "TXP"
{"T-DCS", 0, VOICE_ID_DCS }, // was "T_DCS" {"R-DCS", 0, VOICE_ID_DCS, MENU_R_DCS }, // was "R_DCS"
{"T-CTCS", 0, VOICE_ID_CTCSS }, // was "T_CTCS" {"R-CTCS", 0, VOICE_ID_CTCSS, MENU_R_CTCS }, // was "R_CTCS"
{"T-DIR", 0, VOICE_ID_TX_OFFSET_FREQUENCY_DIRECTION}, // was "SFT_D" {"T-DCS", 0, VOICE_ID_DCS, MENU_T_DCS }, // was "T_DCS"
{"T-OFFS", 0, VOICE_ID_TX_OFFSET_FREQUENCY }, // was "OFFSET" {"T-CTCS", 0, VOICE_ID_CTCSS, MENU_T_CTCS }, // was "T_CTCS"
{"T-VFO", 0, VOICE_ID_INVALID }, // was "WX" {"T-DIR", 0, VOICE_ID_TX_OFFSET_FREQUENCY_DIRECTION, MENU_SFT_D }, // was "SFT_D"
{"T-TOUT", 0, VOICE_ID_TRANSMIT_OVER_TIME }, // was "TOT" {"T-OFFS", 0, VOICE_ID_TX_OFFSET_FREQUENCY, MENU_OFFSET }, // was "OFFSET"
{"W/N", 0, VOICE_ID_CHANNEL_BANDWIDTH }, {"T-VFO", 0, VOICE_ID_INVALID, MENU_XB }, // was "WX"
{"SCRAM", 0, VOICE_ID_SCRAMBLER_ON }, // was "SCR" {"T-TOUT", 0, VOICE_ID_TRANSMIT_OVER_TIME, MENU_TOT }, // was "TOT"
{"BUSYCL", 0, VOICE_ID_BUSY_LOCKOUT }, // was "BCL" {"W/N", 0, VOICE_ID_CHANNEL_BANDWIDTH, MENU_W_N },
{"CH-SAV", 0, VOICE_ID_MEMORY_CHANNEL }, // was "MEM-CH" {"SCRAM", 0, VOICE_ID_SCRAMBLER_ON, MENU_SCR }, // was "SCR"
{"CH-DEL", 0, VOICE_ID_DELETE_CHANNEL }, // was "DEL-CH" {"BUSYCL", 0, VOICE_ID_BUSY_LOCKOUT, MENU_BCL }, // was "BCL"
{"CH-NAM", 0, VOICE_ID_INVALID }, {"CH-SAV", 0, VOICE_ID_MEMORY_CHANNEL, MENU_MEM_CH }, // was "MEM-CH"
{"CH-DIS", 0, VOICE_ID_INVALID }, // was "MDF" {"CH-DEL", 0, VOICE_ID_DELETE_CHANNEL, MENU_DEL_CH }, // was "DEL-CH"
{"BATSAV", 0, VOICE_ID_SAVE_MODE }, // was "SAVE" {"CH-NAM", 0, VOICE_ID_INVALID, MENU_MEM_NAME },
{"VOX", 0, VOICE_ID_VOX }, {"CH-DIS", 0, VOICE_ID_INVALID, MENU_MDF }, // was "MDF"
{"BACKLT", 0, VOICE_ID_INVALID }, // was "ABR" {"BATSAV", 0, VOICE_ID_SAVE_MODE, MENU_SAVE }, // was "SAVE"
{"DUALRX", 0, VOICE_ID_DUAL_STANDBY }, // was "TDR" {"VOX", 0, VOICE_ID_VOX, MENU_VOX },
{"BEEP", 0, VOICE_ID_BEEP_PROMPT }, {"BACKLT", 0, VOICE_ID_INVALID, MENU_ABR }, // was "ABR"
{"DUALRX", 0, VOICE_ID_DUAL_STANDBY, MENU_TDR }, // was "TDR"
{"BEEP", 0, VOICE_ID_BEEP_PROMPT, MENU_BEEP },
#ifdef ENABLE_VOICE #ifdef ENABLE_VOICE
{"VOICE", 0, VOICE_ID_VOICE_PROMPT }, {"VOICE", 0, VOICE_ID_VOICE_PROMPT, MENU_VOICE },
#endif #endif
{"SC-REV", 0, VOICE_ID_INVALID }, {"SC-REV", 0, VOICE_ID_INVALID, MENU_SC_REV },
{"KEYLOC", 0, VOICE_ID_INVALID }, // was "AUTOLk" {"KEYLOC", 0, VOICE_ID_INVALID, MENU_AUTOLK }, // was "AUTOLk"
{"S-ADD1", 0, VOICE_ID_INVALID }, {"S-ADD1", 0, VOICE_ID_INVALID, MENU_S_ADD1 },
{"S-ADD2", 0, VOICE_ID_INVALID }, {"S-ADD2", 0, VOICE_ID_INVALID, MENU_S_ADD2 },
{"STE", 0, VOICE_ID_INVALID }, {"STE", 0, VOICE_ID_INVALID, MENU_STE },
{"RP-STE", 0, VOICE_ID_INVALID }, {"RP-STE", 0, VOICE_ID_INVALID, MENU_RP_STE },
{"MIC", 0, VOICE_ID_INVALID }, {"MIC", 0, VOICE_ID_INVALID, MENU_MIC },
#ifdef ENABLE_AUDIO_BAR #ifdef ENABLE_AUDIO_BAR
{"MICBAR", 0, VOICE_ID_INVALID }, {"MICBAR", 0, VOICE_ID_INVALID, MENU_MIC_BAR },
#endif #endif
#ifdef ENABLE_COMPANDER #ifdef ENABLE_COMPANDER
{"COMPND", 0, VOICE_ID_INVALID }, {"COMPND", 0, VOICE_ID_INVALID, MENU_COMPAND },
#endif #endif
{"1-CALL", 0, VOICE_ID_INVALID }, {"1-CALL", 0, VOICE_ID_INVALID, MENU_1_CALL },
{"SLIST", 0, VOICE_ID_INVALID }, {"SLIST", 0, VOICE_ID_INVALID, MENU_S_LIST },
{"SLIST1", 0, VOICE_ID_INVALID }, {"SLIST1", 0, VOICE_ID_INVALID, MENU_SLIST1 },
{"SLIST2", 0, VOICE_ID_INVALID }, {"SLIST2", 0, VOICE_ID_INVALID, MENU_SLIST2 },
#ifdef ENABLE_ALARM #ifdef ENABLE_ALARM
"AL-MOD", 0, VOICE_ID_INVALID }, "AL-MOD", 0, VOICE_ID_INVALID, MENU_AL_MOD },
#endif #endif
{"ANI-ID", 0, VOICE_ID_ANI_CODE }, {"ANI-ID", 0, VOICE_ID_ANI_CODE, MENU_ANI_ID },
{"UPCODE", 0, VOICE_ID_INVALID }, {"UPCODE", 0, VOICE_ID_INVALID, MENU_UPCODE },
{"DWCODE", 0, VOICE_ID_INVALID }, {"DWCODE", 0, VOICE_ID_INVALID, MENU_DWCODE },
{"D-ST", 0, VOICE_ID_INVALID }, {"D-ST", 0, VOICE_ID_INVALID, MENU_D_ST },
{"D-RSP", 0, VOICE_ID_INVALID }, {"D-RSP", 0, VOICE_ID_INVALID, MENU_D_RSP },
{"D-HOLD", 0, VOICE_ID_INVALID }, {"D-HOLD", 0, VOICE_ID_INVALID, MENU_D_HOLD },
{"D-PRE", 0, VOICE_ID_INVALID }, {"D-PRE", 0, VOICE_ID_INVALID, MENU_D_PRE },
{"PTT-ID", 0, VOICE_ID_INVALID }, {"PTT-ID", 0, VOICE_ID_INVALID, MENU_PTT_ID },
{"D-DCD", 0, VOICE_ID_INVALID }, {"D-DCD", 0, VOICE_ID_INVALID, MENU_D_DCD },
{"D-LIST", 0, VOICE_ID_INVALID }, {"D-LIST", 0, VOICE_ID_INVALID, MENU_D_LIST },
{"D-LIVE", 0, VOICE_ID_INVALID }, // live DTMF decoder {"D-LIVE", 0, VOICE_ID_INVALID, MENU_D_LIVE_DEC }, // live DTMF decoder
{"PONMSG", 0, VOICE_ID_INVALID }, {"PONMSG", 0, VOICE_ID_INVALID, MENU_PONMSG },
{"ROGER", 0, VOICE_ID_INVALID }, {"ROGER", 0, VOICE_ID_INVALID, MENU_ROGER },
{"BATVOL", 0, VOICE_ID_INVALID }, // was "VOL" {"BATVOL", 0, VOICE_ID_INVALID, MENU_VOL }, // was "VOL"
{"BATTXT", 0, VOICE_ID_INVALID }, {"BATTXT", 0, VOICE_ID_INVALID, MENU_BAT_TXT },
{"MODE", 0, VOICE_ID_INVALID }, // was "AM" {"MODE", 0, VOICE_ID_INVALID, MENU_AM }, // was "AM"
#ifdef ENABLE_NOAA #ifdef ENABLE_NOAA
{"NOAA-S", 0, VOICE_ID_INVALID }, {"NOAA-S", 0, VOICE_ID_INVALID, MENU_NOAA_S },
#endif #endif
{"RESET", 0, VOICE_ID_INITIALISATION }, // might be better to move this to the hidden menu items ? {"RESET", 0, VOICE_ID_INITIALISATION, MENU_RESET }, // might be better to move this to the hidden menu items ?
// hidden menu items from here on // hidden menu items from here on (center param set to '1')
// enabled if pressing both the PTT and upper side button at power-on // enabled if pressing both the PTT and upper side button at power-on
{"F-LOCK", 1, VOICE_ID_INVALID }, {"F-LOCK", 1, VOICE_ID_INVALID, MENU_F_LOCK },
{"TX-200", 1, VOICE_ID_INVALID }, // was "200TX" {"TX-200", 1, VOICE_ID_INVALID, MENU_200TX }, // was "200TX"
{"TX-350", 1, VOICE_ID_INVALID }, // was "350TX" {"TX-350", 1, VOICE_ID_INVALID, MENU_350TX }, // was "350TX"
{"TX-500", 1, VOICE_ID_INVALID }, // was "500TX" {"TX-500", 1, VOICE_ID_INVALID, MENU_500TX }, // was "500TX"
{"350-EN", 1, VOICE_ID_INVALID }, // was "350EN" {"350-EN", 1, VOICE_ID_INVALID, MENU_350EN }, // was "350EN"
{"SCR-EN", 1, VOICE_ID_INVALID }, // was "SCREN" {"SCR-EN", 1, VOICE_ID_INVALID, MENU_SCREN }, // was "SCREN"
{"TX-EN", 1, VOICE_ID_INVALID }, // enable TX {"TX-EN", 1, VOICE_ID_INVALID, MENU_TX_EN }, // enable TX
{"F-CALI", 1, VOICE_ID_INVALID }, // reference xtal calibration {"F-CALI", 1, VOICE_ID_INVALID, MENU_F_CALI }, // reference xtal calibration
{"", 0, VOICE_ID_INVALID } // end of list - DO NOT delete this {"", 1, VOICE_ID_INVALID, 0xff } // end of list - DO NOT delete or move this this
}; };
const char gSubMenu_TXP[3][5] = const char gSubMenu_TXP[3][5] =
@ -245,9 +243,10 @@ const char gSubMenu_F_LOCK[6][4] =
"438" "438"
}; };
const char gSubMenu_BACK_LIGHT[6][7] = const char gSubMenu_BACKLIGHT[7][7] =
{ {
"OFF", "OFF",
"5 sec",
"10 sec", "10 sec",
"20 sec", "20 sec",
"40 sec", "40 sec",
@ -284,6 +283,9 @@ int edit_index;
void UI_DisplayMenu(void) void UI_DisplayMenu(void)
{ {
const unsigned int menu_list_width = 6; // max no. of characters on the menu list (left side)
const unsigned int menu_item_x1 = (8 * menu_list_width) + 2;
const unsigned int menu_item_x2 = LCD_WIDTH - 1;
unsigned int i; unsigned int i;
char String[16]; char String[16];
char Contact[16]; char Contact[16];
@ -295,16 +297,16 @@ void UI_DisplayMenu(void)
if ((gMenuListCount - 1) != gMenuCursor || i != 2) if ((gMenuListCount - 1) != gMenuCursor || i != 2)
UI_PrintString(MenuList[gMenuCursor + i - 1].name, 0, 0, i * 2, 8); UI_PrintString(MenuList[gMenuCursor + i - 1].name, 0, 0, i * 2, 8);
// invert the pixels // invert the menu list text pixels
for (i = 0; i < 48; i++) for (i = 0; i < (8 * menu_list_width); i++)
{ {
gFrameBuffer[2][i] ^= 0xFF; gFrameBuffer[2][i] ^= 0xFF;
gFrameBuffer[3][i] ^= 0xFF; gFrameBuffer[3][i] ^= 0xFF;
} }
// draw vertical separating dotted line // draw vertical separating dotted line
for (i = 0; i < 6; i++) for (i = 0; i < 7; i++)
gFrameBuffer[i][49] = 0xAA; gFrameBuffer[i][(8 * menu_list_width) + 1] = 0xAA;
// draw the menu index number/count // draw the menu index number/count
sprintf(String, "%2u.%u", 1 + gMenuCursor, gMenuListCount); sprintf(String, "%2u.%u", 1 + gMenuCursor, gMenuListCount);
@ -312,7 +314,7 @@ void UI_DisplayMenu(void)
// draw the little marker // draw the little marker
if (gIsInSubMenu) if (gIsInSubMenu)
memmove(gFrameBuffer[0] + 50, BITMAP_CurrentIndicator, sizeof(BITMAP_CurrentIndicator)); memmove(gFrameBuffer[0] + (8 * menu_list_width) + 1, BITMAP_CurrentIndicator, sizeof(BITMAP_CurrentIndicator));
memset(String, 0, sizeof(String)); memset(String, 0, sizeof(String));
@ -372,7 +374,7 @@ void UI_DisplayMenu(void)
if (!gIsInSubMenu || gInputBoxIndex == 0) if (!gIsInSubMenu || gInputBoxIndex == 0)
{ {
sprintf(String, "%d.%05u", gSubMenuSelection / 100000, abs(gSubMenuSelection) % 100000); sprintf(String, "%d.%05u", gSubMenuSelection / 100000, abs(gSubMenuSelection) % 100000);
UI_PrintString(String, 50, 127, 1, 8); UI_PrintString(String, menu_item_x1, menu_item_x2, 1, 8);
} }
else else
{ {
@ -386,10 +388,10 @@ void UI_DisplayMenu(void)
String[ 9] = 0; String[ 9] = 0;
String[10] = 0; String[10] = 0;
String[11] = 0; String[11] = 0;
UI_PrintString(String, 50, 127, 1, 8); UI_PrintString(String, menu_item_x1, menu_item_x2, 1, 8);
} }
UI_PrintString("MHz", 50, 127, 3, 8); UI_PrintString("MHz", menu_item_x1, menu_item_x2, 3, 8);
already_printed = true; already_printed = true;
break; break;
@ -407,7 +409,7 @@ void UI_DisplayMenu(void)
break; break;
case MENU_ABR: case MENU_ABR:
strcpy(String, gSubMenu_BACK_LIGHT[gSubMenuSelection]); strcpy(String, gSubMenu_BACKLIGHT[gSubMenuSelection]);
break; break;
case MENU_AM: case MENU_AM:
@ -451,20 +453,14 @@ void UI_DisplayMenu(void)
const bool valid = RADIO_CheckValidChannel(gSubMenuSelection, false, 0); const bool valid = RADIO_CheckValidChannel(gSubMenuSelection, false, 0);
UI_GenerateChannelStringEx(String, valid, gSubMenuSelection); UI_GenerateChannelStringEx(String, valid, gSubMenuSelection);
UI_PrintString(String, 50, 127, 0, 8); UI_PrintString(String, menu_item_x1, menu_item_x2, 0, 8);
if (valid && !gAskForConfirmation) if (valid && !gAskForConfirmation)
{ // show the frequency so that the user knows the channels frequency { // show the frequency so that the user knows the channels frequency
struct const uint32_t frequency = BOARD_fetchChannelFrequency(gSubMenuSelection);
{ sprintf(String, "%u.%05u", frequency / 100000, frequency % 100000);
uint32_t Frequency; UI_PrintString(String, menu_item_x1, menu_item_x2, 4, 8);
uint32_t Offset; // UI_PrintStringSmall(String, menu_item_x1, menu_item_x2, 5);
} __attribute__((packed)) Info;
EEPROM_ReadBuffer(gSubMenuSelection * 16, &Info, sizeof(Info));
sprintf(String, "%03u.%05u", Info.Frequency / 100000, Info.Frequency % 100000);
// UI_PrintStringSmall(String, 50, 127, 5);
UI_PrintString(String, 50, 127, 4, 8);
} }
already_printed = true; already_printed = true;
@ -476,40 +472,35 @@ void UI_DisplayMenu(void)
const bool valid = RADIO_CheckValidChannel(gSubMenuSelection, false, 0); const bool valid = RADIO_CheckValidChannel(gSubMenuSelection, false, 0);
UI_GenerateChannelStringEx(String, valid, gSubMenuSelection); UI_GenerateChannelStringEx(String, valid, gSubMenuSelection);
UI_PrintString(String, 50, 127, 0, 8); UI_PrintString(String, menu_item_x1, menu_item_x2, 0, 8);
if (valid) if (valid)
{ {
struct const uint32_t frequency = BOARD_fetchChannelFrequency(gSubMenuSelection);
{
uint32_t Frequency;
uint32_t Offset;
} __attribute__((packed)) Info;
EEPROM_ReadBuffer(gSubMenuSelection * 16, &Info, sizeof(Info));
if (!gIsInSubMenu || edit_index < 0) if (!gIsInSubMenu || edit_index < 0)
{ // show the channel name { // show the channel name
BOARD_fetchChannelName(String, gSubMenuSelection); BOARD_fetchChannelName(String, gSubMenuSelection);
if (String[0] == 0) if (String[0] == 0)
strcpy(String, "--"); strcpy(String, "--");
UI_PrintString(String, 50, 127, 2, 8); UI_PrintString(String, menu_item_x1, menu_item_x2, 2, 8);
} }
else else
{ // show the channel name being edited { // show the channel name being edited
UI_PrintString(edit, 50, 0, 2, 8); UI_PrintString(edit, menu_item_x1, 0, 2, 8);
if (edit_index < 10) if (edit_index < 10)
UI_PrintString("^", 50 + (8 * edit_index), 0, 4, 8); // show the cursor UI_PrintString( "^", menu_item_x1 + (8 * edit_index), 0, 4, 8); // show the cursor
// UI_PrintStringSmall("^", 50 + (8 * edit_index), 0, 4); // UI_PrintStringSmall("^", menu_item_x1 + (8 * edit_index), 0, 4);
} }
if (!gAskForConfirmation) if (!gAskForConfirmation)
{ // show the frequency so that the user knows the channels frequency { // show the frequency so that the user knows the channels frequency
sprintf(String, "%03u.%05u", Info.Frequency / 100000, Info.Frequency % 100000); sprintf(String, "%u.%05u", frequency / 100000, frequency % 100000);
if (!gIsInSubMenu || edit_index < 0) if (!gIsInSubMenu || edit_index < 0)
UI_PrintString(String, 50, 127, 4, 8); UI_PrintString(String, menu_item_x1, menu_item_x2, 4, 8);
else else
UI_PrintString(String, 50, 127, 5, 8); UI_PrintString(String, menu_item_x1, menu_item_x2, 5, 8);
// UI_PrintStringSmall(String, 50, 127, 5); // UI_PrintStringSmall(String, menu_item_x1, menu_item_x2, 5);
} }
} }
@ -615,17 +606,17 @@ void UI_DisplayMenu(void)
case MENU_VOL: case MENU_VOL:
// 1st text line // 1st text line
sprintf(String, "%u.%02uV", gBatteryVoltageAverage / 100, gBatteryVoltageAverage % 100); sprintf(String, "%u.%02uV", gBatteryVoltageAverage / 100, gBatteryVoltageAverage % 100);
UI_PrintString(String, 50, 127, 1, 8); UI_PrintString(String, menu_item_x1, menu_item_x2, 1, 8);
{ // 2nd text line .. percentage { // 2nd text line .. percentage
UI_PrintString(String, 50, 127, 1, 8); UI_PrintString(String, menu_item_x1, menu_item_x2, 1, 8);
const uint16_t volts = (gBatteryVoltageAverage < gMin_bat_v) ? gMin_bat_v : gBatteryVoltageAverage; const uint16_t volts = (gBatteryVoltageAverage < gMin_bat_v) ? gMin_bat_v : gBatteryVoltageAverage;
const uint16_t percent = (100 * (volts - gMin_bat_v)) / (gMax_bat_v - gMin_bat_v); const uint16_t percent = (100 * (volts - gMin_bat_v)) / (gMax_bat_v - gMin_bat_v);
sprintf(String, "%u%%", percent); sprintf(String, "%u%%", percent);
UI_PrintString(String, 50, 127, 3, 8); UI_PrintString(String, menu_item_x1, menu_item_x2, 3, 8);
#if 0 #if 0
sprintf(String, "Curr %u", gBatteryCurrent); // needs scaling into mA sprintf(String, "Curr %u", gBatteryCurrent); // needs scaling into mA
UI_PrintString(String, 50, 127, 5, 8); UI_PrintString(String, menu_item_x1, menu_item_x2, 5, 8);
#endif #endif
} }
@ -647,13 +638,13 @@ void UI_DisplayMenu(void)
BK4819_WriteRegister(BK4819_REG_3B, value); BK4819_WriteRegister(BK4819_REG_3B, value);
sprintf(String, "%d", gSubMenuSelection); sprintf(String, "%d", gSubMenuSelection);
UI_PrintString(String, 50, 127, 0, 8); UI_PrintString(String, menu_item_x1, menu_item_x2, 0, 8);
const uint32_t xtal_Hz = (0x4f0000u + value) * 5; const uint32_t xtal_Hz = (0x4f0000u + value) * 5;
sprintf(String, "%u.%06u", xtal_Hz / 1000000, xtal_Hz % 1000000); sprintf(String, "%u.%06u", xtal_Hz / 1000000, xtal_Hz % 1000000);
UI_PrintString(String, 50, 127, 2, 8); UI_PrintString(String, menu_item_x1, menu_item_x2, 2, 8);
UI_PrintString("MHz", 50, 127, 4, 8); UI_PrintString("MHz", menu_item_x1, menu_item_x2, 4, 8);
already_printed = true; already_printed = true;
} }
@ -661,7 +652,7 @@ void UI_DisplayMenu(void)
} }
if (!already_printed) if (!already_printed)
UI_PrintString(String, 50, 127, 2, 8); UI_PrintString(String, menu_item_x1, menu_item_x2, 2, 8);
if (gMenuCursor == MENU_SLIST1 || gMenuCursor == MENU_SLIST2) if (gMenuCursor == MENU_SLIST1 || gMenuCursor == MENU_SLIST2)
{ {
@ -676,22 +667,22 @@ void UI_DisplayMenu(void)
// if (gSubMenuSelection == 0xFF || !gEeprom.SCAN_LIST_ENABLED[i]) // if (gSubMenuSelection == 0xFF || !gEeprom.SCAN_LIST_ENABLED[i])
if (gSubMenuSelection < 0 || !gEeprom.SCAN_LIST_ENABLED[i]) if (gSubMenuSelection < 0 || !gEeprom.SCAN_LIST_ENABLED[i])
{ {
UI_PrintString(String, 50, 127, 0, 8); UI_PrintString(String, menu_item_x1, menu_item_x2, 0, 8);
} }
else else
{ {
UI_PrintString(String, 50, 127, 0, 8); UI_PrintString(String, menu_item_x1, menu_item_x2, 0, 8);
if (IS_MR_CHANNEL(gEeprom.SCANLIST_PRIORITY_CH1[i])) if (IS_MR_CHANNEL(gEeprom.SCANLIST_PRIORITY_CH1[i]))
{ {
sprintf(String, "PRI1:%u", gEeprom.SCANLIST_PRIORITY_CH1[i] + 1); sprintf(String, "PRI1:%u", gEeprom.SCANLIST_PRIORITY_CH1[i] + 1);
UI_PrintString(String, 50, 127, 2, 8); UI_PrintString(String, menu_item_x1, menu_item_x2, 2, 8);
} }
if (IS_MR_CHANNEL(gEeprom.SCANLIST_PRIORITY_CH2[i])) if (IS_MR_CHANNEL(gEeprom.SCANLIST_PRIORITY_CH2[i]))
{ {
sprintf(String, "PRI2:%u", gEeprom.SCANLIST_PRIORITY_CH2[i] + 1); sprintf(String, "PRI2:%u", gEeprom.SCANLIST_PRIORITY_CH2[i] + 1);
UI_PrintString(String, 50, 127, 4, 8); UI_PrintString(String, menu_item_x1, menu_item_x2, 4, 8);
} }
} }
} }
@ -706,26 +697,26 @@ void UI_DisplayMenu(void)
BOARD_fetchChannelName(s, gSubMenuSelection); BOARD_fetchChannelName(s, gSubMenuSelection);
if (s[0] == 0) if (s[0] == 0)
strcpy(s, "--"); strcpy(s, "--");
UI_PrintString(s, 50, 127, 2, 8); UI_PrintString(s, menu_item_x1, menu_item_x2, 2, 8);
} }
if ((gMenuCursor == MENU_R_CTCS || gMenuCursor == MENU_R_DCS) && gCssScanMode != CSS_SCAN_MODE_OFF) if ((gMenuCursor == MENU_R_CTCS || gMenuCursor == MENU_R_DCS) && gCssScanMode != CSS_SCAN_MODE_OFF)
UI_PrintString("SCAN", 50, 127, 4, 8); UI_PrintString("SCAN", menu_item_x1, menu_item_x2, 4, 8);
if (gMenuCursor == MENU_UPCODE) if (gMenuCursor == MENU_UPCODE)
if (strlen(gEeprom.DTMF_UP_CODE) > 8) if (strlen(gEeprom.DTMF_UP_CODE) > 8)
UI_PrintString(gEeprom.DTMF_UP_CODE + 8, 50, 127, 4, 8); UI_PrintString(gEeprom.DTMF_UP_CODE + 8, menu_item_x1, menu_item_x2, 4, 8);
if (gMenuCursor == MENU_DWCODE) if (gMenuCursor == MENU_DWCODE)
if (strlen(gEeprom.DTMF_DOWN_CODE) > 8) if (strlen(gEeprom.DTMF_DOWN_CODE) > 8)
UI_PrintString(gEeprom.DTMF_DOWN_CODE + 8, 50, 127, 4, 8); UI_PrintString(gEeprom.DTMF_DOWN_CODE + 8, menu_item_x1, menu_item_x2, 4, 8);
if (gMenuCursor == MENU_D_LIST && gIsDtmfContactValid) if (gMenuCursor == MENU_D_LIST && gIsDtmfContactValid)
{ {
Contact[11] = 0; Contact[11] = 0;
memmove(&gDTMF_ID, Contact + 8, 4); memmove(&gDTMF_ID, Contact + 8, 4);
sprintf(String, "ID:%s", Contact + 8); sprintf(String, "ID:%s", Contact + 8);
UI_PrintString(String, 50, 127, 4, 8); UI_PrintString(String, menu_item_x1, menu_item_x2, 4, 8);
} }
if (gMenuCursor == MENU_R_CTCS || if (gMenuCursor == MENU_R_CTCS ||
@ -746,7 +737,7 @@ void UI_DisplayMenu(void)
gMenuCursor == MENU_DEL_CH) && gAskForConfirmation) gMenuCursor == MENU_DEL_CH) && gAskForConfirmation)
{ // display confirmation { // display confirmation
strcpy(String, (gAskForConfirmation == 1) ? "SURE?" : "WAIT!"); strcpy(String, (gAskForConfirmation == 1) ? "SURE?" : "WAIT!");
UI_PrintString(String, 50, 127, 5, 8); UI_PrintString(String, menu_item_x1, menu_item_x2, 5, 8);
} }
ST7565_BlitFullScreen(); ST7565_BlitFullScreen();

3
ui/menu.h
View File

@ -26,6 +26,7 @@ typedef struct {
const char name[7]; // menu display only has room for 6 characters const char name[7]; // menu display only has room for 6 characters
uint8_t hidden; uint8_t hidden;
VOICE_ID_t voice_id; VOICE_ID_t voice_id;
uint8_t menu_id;
} t_menu_item; } t_menu_item;
enum enum
@ -132,7 +133,7 @@ extern const char gSubMenu_PONMSG[4][5];
extern const char gSubMenu_ROGER[3][6]; extern const char gSubMenu_ROGER[3][6];
extern const char gSubMenu_RESET[2][4]; extern const char gSubMenu_RESET[2][4];
extern const char gSubMenu_F_LOCK[6][4]; extern const char gSubMenu_F_LOCK[6][4];
extern const char gSubMenu_BACK_LIGHT[6][7]; extern const char gSubMenu_BACKLIGHT[7][7];
#ifdef ENABLE_COMPANDER #ifdef ENABLE_COMPANDER
extern const char gSubMenu_Compand[4][6]; extern const char gSubMenu_Compand[4][6];
#endif #endif