mirrors/uv-k5-firmware-custom
0
Fork 0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-06-19 14:48:03 +03:00
Code Issues Releases Activity

Renames, some code changes

Browse Source
This commit is contained in:
OneOfEleven
2023-10-18 11:31:30 +01:00
parent a60fc80296
commit bf7a837485
32 changed files with 408 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/action.c
View File

@ -283,10 +283,10 @@ void ACTION_Scan(bool bRestart)
#if defined(ENABLE_ALARM) && defined(ENABLE_TX1750)
g_alarm_state = b1750 ? ALARM_STATE_TX1750 : ALARM_STATE_TXALARM;
g_alarm_running_counter = 0;
g_alarm_running_counter_10ms = 0;
#elif defined(ENABLE_ALARM)
g_alarm_state = ALARM_STATE_TXALARM;
g_alarm_running_counter = 0;
g_alarm_running_counter_10ms = 0;
#else
g_alarm_state = ALARM_STATE_TX1750;
#endif

2
app/aircopy.c
View File

@ -649,7 +649,7 @@ static void AIRCOPY_Key_DIGITS(key_code_t Key, bool key_pressed, bool key_held)
Frequency = ((Frequency + (g_rx_vfo->step_freq / 2)) / g_rx_vfo->step_freq) * g_rx_vfo->step_freq;
g_aircopy_freq = Frequency;
#ifdef ENABLE_AIRCOPY_FREQ
#ifdef ENABLE_AIRCOPY_REMEMBER_FREQ
SETTINGS_SaveSettings(); // remeber the frequency for the next time
#endif

60
app/app.c
View File

@ -394,7 +394,7 @@ Skip:
case END_OF_RX_MODE_TTE:
if (g_eeprom.tail_note_elimination)
{
GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_SPEAKER);
g_tail_tone_elimination_count_down_10ms = 20;
g_flag_tail_tone_elimination_complete = false;
@ -464,8 +464,7 @@ void APP_start_listening(function_type_t Function, const bool reset_am_fix)
// clear the other vfo's rssi level (to hide the antenna symbol)
g_vfo_rssi_bar_level[(chan + 1) & 1u] = 0;
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_SPEAKER);
g_enable_speaker = true;
if (g_scan_state_dir != SCAN_STATE_DIR_OFF)
@ -512,7 +511,7 @@ void APP_start_listening(function_type_t Function, const bool reset_am_fix)
g_update_status = true;
}
#ifdef ENABLE_AM_FIX
{ // RF RX front end gain
@ -970,7 +969,7 @@ void APP_process_radio_interrupts(void)
void APP_end_tx(void)
{ // back to RX mode
RADIO_SendEndOfTransmission();
RADIO_tx_eot();
if (g_current_vfo->p_tx->code_type != CODE_TYPE_NONE)
{ // CTCSS/DCS is enabled
@ -1632,7 +1631,7 @@ void APP_time_slice_10ms(void)
if (g_current_function == FUNCTION_TRANSMIT)
{ // transmitting
#ifdef ENABLE_AUDIO_BAR
#ifdef ENABLE_TX_AUDIO_BAR
if (g_setting_mic_bar && (g_flash_light_blink_counter % (150 / 10)) == 0) // once every 150ms
UI_DisplayAudioBar(true);
#endif
@ -1666,24 +1665,25 @@ void APP_time_slice_10ms(void)
{
#ifdef ENABLE_ALARM
if (g_alarm_state == ALARM_STATE_TXALARM || g_alarm_state == ALARM_STATE_ALARM)
{
{ // TX alarm tone
uint16_t Tone;
g_alarm_running_counter++;
g_alarm_tone_counter++;
g_alarm_running_counter_10ms++;
Tone = 500 + (g_alarm_tone_counter * 25);
if (Tone > 1500)
// loop alarm tone frequency 300Hz ~ 1500Hz ~ 300Hz
Tone = 300 + (g_alarm_tone_counter_10ms++ * 50);
if (Tone >= ((1500 * 2) - 300))
{
Tone = 500;
g_alarm_tone_counter = 0;
Tone = 300;
g_alarm_tone_counter_10ms = 0;
}
BK4819_SetScrambleFrequencyControlWord(Tone);
BK4819_SetScrambleFrequencyControlWord((Tone <= 1500) ? Tone : (1500 * 2) - Tone);
if (g_eeprom.alarm_mode == ALARM_MODE_TONE && g_alarm_running_counter == 512)
if (g_eeprom.alarm_mode == ALARM_MODE_TONE && g_alarm_running_counter_10ms == 512)
{
g_alarm_running_counter = 0;
g_alarm_running_counter_10ms = 0;
if (g_alarm_state == ALARM_STATE_TXALARM)
{
@ -1706,10 +1706,10 @@ void APP_time_slice_10ms(void)
RADIO_enableTX(false);
BK4819_TransmitTone(true, 500);
SYSTEM_DelayMs(2);
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_SPEAKER);
g_enable_speaker = true;
g_alarm_tone_counter = 0;
g_alarm_tone_counter_10ms = 0;
}
}
}
@ -2022,7 +2022,7 @@ void APP_time_slice_500ms(void)
if (g_dtmf_rx_live_timeout > 0)
{
#ifdef ENABLE_RSSI_BAR
#ifdef ENABLE_RX_SIGNAL_BAR
if (center_line == CENTER_LINE_DTMF_DEC ||
center_line == CENTER_LINE_NONE) // wait till the center line is free for us to use before timing out
#endif
@ -2277,13 +2277,13 @@ void APP_time_slice_500ms(void)
if (g_dtmf_decode_ring_count_down_500ms > 0)
{ // make "ring-ring" sound
g_dtmf_decode_ring_count_down_500ms--;
#ifdef ENABLE_DTMF_CALL_FLASH_LIGHT
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_FLASHLIGHT); // light on
#endif
AUDIO_PlayBeep(BEEP_880HZ_200MS);
#ifdef ENABLE_DTMF_CALL_FLASH_LIGHT
GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_FLASHLIGHT); // light off
#endif
@ -2324,7 +2324,7 @@ void APP_time_slice_500ms(void)
}
}
#ifdef ENABLE_SHOW_TX_TIMEOUT
#ifdef ENABLE_TX_TIMEOUT_BAR
if (g_current_function == FUNCTION_TRANSMIT && (g_tx_timer_count_down_500ms & 1))
UI_DisplayTXCountdown(true);
#endif
@ -2333,21 +2333,21 @@ void APP_time_slice_500ms(void)
#if defined(ENABLE_ALARM) || defined(ENABLE_TX1750)
static void APP_alarm_off(void)
{
g_alarm_state = ALARM_STATE_OFF;
GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_SPEAKER);
g_enable_speaker = false;
if (g_eeprom.alarm_mode == ALARM_MODE_TONE)
{
RADIO_SendEndOfTransmission();
RADIO_tx_eot();
RADIO_EnableCxCSS();
}
#ifdef ENABLE_VOX
g_vox_resume_count_down = 80;
#endif
g_alarm_state = ALARM_STATE_OFF;
SYSTEM_DelayMs(5);
RADIO_setup_registers(true);
@ -2608,7 +2608,7 @@ static void APP_process_key(const key_code_t Key, const bool key_pressed, const
{
if (!key_pressed)
{
GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_SPEAKER);
g_enable_speaker = false;
@ -2624,7 +2624,7 @@ static void APP_process_key(const key_code_t Key, const bool key_pressed, const
{
if (g_eeprom.dtmf_side_tone)
{ // user will here the DTMF tones in speaker
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_SPEAKER);
g_enable_speaker = true;
}

12
app/dtmf.c
View File

@ -389,7 +389,7 @@ void DTMF_HandleRequest(void)
}
}
void DTMF_Reply(void)
bool DTMF_Reply(void)
{
uint16_t Delay;
char String[20];
@ -426,7 +426,7 @@ void DTMF_Reply(void)
g_current_vfo->dtmf_ptt_id_tx_mode == PTT_ID_TX_DOWN)
{
g_dtmf_reply_state = DTMF_REPLY_NONE;
return;
return false;
}
// send TX-UP DTMF
@ -437,13 +437,13 @@ void DTMF_Reply(void)
g_dtmf_reply_state = DTMF_REPLY_NONE;
if (pString == NULL)
return;
return false;
Delay = (g_eeprom.dtmf_preload_time < 200) ? 200 : g_eeprom.dtmf_preload_time;
if (g_eeprom.dtmf_side_tone)
{ // the user will also hear the transmitted tones
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_SPEAKER);
g_enable_speaker = true;
}
@ -459,9 +459,11 @@ void DTMF_Reply(void)
g_eeprom.dtmf_code_persist_time,
g_eeprom.dtmf_code_interval_time);
GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_SPEAKER);
g_enable_speaker = false;
BK4819_ExitDTMF_TX(false);
return true;
}

2
app/dtmf.h
View File

@ -104,6 +104,6 @@ dtmf_call_mode_t DTMF_CheckGroupCall(const char *pDTMF, const unsigned int size)
void DTMF_clear_input_box(void);
void DTMF_Append(const char vode);
void DTMF_HandleRequest(void);
void DTMF_Reply(void);
bool DTMF_Reply(void);
#endif

10
app/fm.c
View File

@ -99,7 +99,7 @@ void FM_TurnOff(void)
g_fm_scan_state = FM_SCAN_OFF;
g_fm_restore_count_down_10ms = 0;
GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_SPEAKER);
g_enable_speaker = false;
@ -122,7 +122,7 @@ void FM_EraseChannels(void)
void FM_Tune(uint16_t Frequency, int8_t Step, bool flag)
{
GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_SPEAKER);
g_enable_speaker = false;
@ -169,7 +169,7 @@ void FM_PlayAndUpdate(void)
g_schedule_fm = false;
g_ask_to_save = false;
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_SPEAKER);
g_enable_speaker = true;
}
@ -659,7 +659,7 @@ void FM_Play(void)
if (!g_eeprom.fm_is_channel_mode)
g_eeprom.fm_selected_frequency = g_eeprom.fm_frequency_playing;
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_SPEAKER);
g_enable_speaker = true;
GUI_SelectNextDisplay(DISPLAY_FM);
@ -693,7 +693,7 @@ void FM_Start(void)
BK1080_Init(g_eeprom.fm_frequency_playing, true);
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_SPEAKER);
g_enable_speaker = true;
g_update_status = true;

52
app/menu.c
View File

@ -145,7 +145,7 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)
case MENU_SCAN_HOLD:
*pMin = 2;
*pMax = 20;
*pMax = 20; // 10 seconds
break;
case MENU_CROSS_VFO:
@ -219,13 +219,15 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)
*pMax = ARRAY_SIZE(g_sub_menu_rx_tx) - 1;
break;
case MENU_CONTRAST:
// *pMin = 0;
// *pMax = 63;
*pMin = 26;
*pMax = 45;
break;
#ifdef ENABLE_CONTRAST
case MENU_CONTRAST:
//*pMin = 0;
//*pMax = 63;
*pMin = 26;
*pMax = 45;
break;
#endif
#ifdef ENABLE_AM_FIX_TEST1
case MENU_AM_FIX_TEST1:
*pMin = 0;
@ -236,10 +238,10 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)
#ifdef ENABLE_AM_FIX
case MENU_AM_FIX:
#endif
#ifdef ENABLE_AUDIO_BAR
#ifdef ENABLE_TX_AUDIO_BAR
case MENU_TX_BAR:
#endif
#ifdef ENABLE_RSSI_BAR
#ifdef ENABLE_RX_SIGNAL_BAR
case MENU_RX_BAR:
#endif
case MENU_BUSY_CHAN_LOCK:
@ -552,11 +554,13 @@ void MENU_AcceptSetting(void)
g_setting_backlight_on_tx_rx = g_sub_menu_selection;
break;
case MENU_CONTRAST:
g_setting_contrast = g_sub_menu_selection;
ST7565_SetContrast(g_setting_contrast);
break;
#ifdef ENABLE_CONTRAST
case MENU_CONTRAST:
g_setting_contrast = g_sub_menu_selection;
ST7565_SetContrast(g_setting_contrast);
break;
#endif
case MENU_DUAL_WATCH:
// g_eeprom.dual_watch = g_sub_menu_selection;
g_eeprom.dual_watch = (g_sub_menu_selection > 0) ? 1 + g_eeprom.tx_vfo : DUAL_WATCH_OFF;
@ -636,13 +640,13 @@ void MENU_AcceptSetting(void)
g_flag_reconfigure_vfos = true;
break;
#ifdef ENABLE_AUDIO_BAR
#ifdef ENABLE_TX_AUDIO_BAR
case MENU_TX_BAR:
g_setting_mic_bar = g_sub_menu_selection;
break;
#endif
#ifdef ENABLE_RSSI_BAR
#ifdef ENABLE_RX_SIGNAL_BAR
case MENU_RX_BAR:
g_setting_rssi_bar = g_sub_menu_selection;
break;
@ -1033,10 +1037,12 @@ void MENU_ShowCurrentSetting(void)
g_sub_menu_selection = g_setting_backlight_on_tx_rx;
break;
case MENU_CONTRAST:
g_sub_menu_selection = g_setting_contrast;
break;
#ifdef ENABLE_CONTRAST
case MENU_CONTRAST:
g_sub_menu_selection = g_setting_contrast;
break;
#endif
case MENU_DUAL_WATCH:
// g_sub_menu_selection = g_eeprom.dual_watch;
g_sub_menu_selection = (g_eeprom.dual_watch == DUAL_WATCH_OFF) ? 0 : 1;
@ -1096,13 +1102,13 @@ void MENU_ShowCurrentSetting(void)
g_sub_menu_selection = g_eeprom.mic_sensitivity;
break;
#ifdef ENABLE_AUDIO_BAR
#ifdef ENABLE_TX_AUDIO_BAR
case MENU_TX_BAR:
g_sub_menu_selection = g_setting_mic_bar;
break;
#endif
#ifdef ENABLE_RSSI_BAR
#ifdef ENABLE_RX_SIGNAL_BAR
case MENU_RX_BAR:
g_sub_menu_selection = g_setting_rssi_bar;
break;

6
app/spectrum.c
View File

@ -346,9 +346,9 @@ bool IsTXAllowed() { return g_setting_ALL_TX != 2; }
static void ToggleAudio(bool on) {
if (on) {
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_SPEAKER);
} else {
GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_SPEAKER);
}
}
@ -420,7 +420,7 @@ static void ToggleTX(bool on) {
}
else
{
RADIO_SendEndOfTransmission();
RADIO_tx_eot();
RADIO_EnableCxCSS();
BK4819_SetupPowerAmplifier(0, 0);