mckero/uv-k1-k5v3-firmware-custom
1
0 Fork 0
mirror of https://github.com/armel/uv-k1-k5v3-firmware-custom.git synced 2026-10-02 03:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #325 from mrkusypl/feature_update_v5_2

Browse Source 
Refactoring of beep handling (94 B)
This commit is contained in:
Armel FAUVEAU authored and GitHub committed 2026-05-02 00:41:31 +02:00
2 parents 6ae360d029 1e03dc4af0
commit 9a7b199bb9
7 files changed
+61 -118
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

App/app/app.c
+1 -1
View File
@@ -994,7 +994,7 @@ void APP_Update(void)
APP_EndTransmission();
AUDIO_PlayBeep(BEEP_880HZ_60MS_DOUBLE_BEEP);
AUDIO_PlayBeep(BEEP_880HZ_60MS_TRIPLE_BEEP);
RADIO_SetVfoState(VFO_STATE_TIMEOUT);
App/app/breakout.c
+2 -4
View File
@@ -70,11 +70,9 @@ void reset(void)
// PlayBeep
void playBeep(uint16_t tone)
{
BK4819_PlayTone(tone, true); // 500 Hz ON
AUDIO_AudioPathOn();
BK4819_ExitTxMute();
SYSTEM_DelayMs(100);
BK4819_EnterTxMute();
BK4819_PrepareToPlayTone(true);
BK4819_PlayToneRaw(tone, 100);
AUDIO_AudioPathOff();
}
App/audio.c
+29 -93
View File
@@ -33,31 +33,33 @@
#include "settings.h"
#include "ui/ui.h"
static const uint16_t BEEP_Classic_array[][3] = { /* Tone Duration Repeats */
[BEEP_NONE] = {0, 0, 0 },
[BEEP_1KHZ_60MS_OPTIONAL] = {1000, 60, 1 },
[BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL] = {500, 60, 2 },
#ifdef ENABLE_DTMF_CALLING
[BEEP_880HZ_200MS] = {880, 200, 1 },
[BEEP_880HZ_500MS] = {880, 500, 1 },
#endif
[BEEP_500HZ_60MS_DOUBLE_BEEP] = {500, 60, 2 },
#ifdef ENABLE_FEAT_F4HWN
[BEEP_400HZ_30MS] = {400, 30, 1 },
[BEEP_500HZ_30MS] = {500, 30, 1 },
[BEEP_600HZ_30MS] = {600, 30, 1 },
#endif
[BEEP_880HZ_60MS_TRIPLE_BEEP] = {880, 60, 3 }
};
BEEP_Type_t gBeepToPlay = BEEP_NONE;
static void AUDIO_PlayBeepPulse(void) {
BK4819_ExitTxMute();
SYSTEM_DelayMs(60);
BK4819_EnterTxMute();
SYSTEM_DelayMs(20);
}
void AUDIO_PlayBeep(BEEP_Type_t Beep)
{
if (Beep == BEEP_NONE)
return;
if (Beep != BEEP_880HZ_60MS_DOUBLE_BEEP &&
Beep != BEEP_500HZ_60MS_DOUBLE_BEEP &&
#ifdef ENABLE_DTMF_CALLING
Beep != BEEP_880HZ_200MS &&
Beep != BEEP_880HZ_500MS &&
#endif
#ifdef ENABLE_FEAT_F4HWN
Beep != BEEP_400HZ_30MS &&
Beep != BEEP_500HZ_30MS &&
Beep != BEEP_600HZ_30MS &&
#endif
!gEeprom.BEEP_CONTROL)
if ((Beep == BEEP_1KHZ_60MS_OPTIONAL ||
Beep == BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL) &&
!gEeprom.BEEP_CONTROL)
return;
if (gCurrentFunction == FUNCTION_RECEIVE)
@@ -66,6 +68,9 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
if (gCurrentFunction == FUNCTION_MONITOR)
return;
if (Beep >= ARRAY_SIZE(BEEP_Classic_array))
return;
#ifdef ENABLE_FMRADIO
if (gFmRadioMode)
BK1080_Mute(true);
@@ -80,40 +85,6 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
uint16_t ToneConfig = BK4819_ReadRegister(BK4819_REG_71);
uint16_t ToneFrequency;
switch (Beep)
{
default:
case BEEP_NONE:
ToneFrequency = 220;
break;
case BEEP_1KHZ_60MS_OPTIONAL:
ToneFrequency = 1000;
break;
case BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL:
case BEEP_500HZ_60MS_DOUBLE_BEEP:
ToneFrequency = 500;
break;
case BEEP_880HZ_60MS_DOUBLE_BEEP:
#ifndef ENABLE_FEAT_F4HWN
case BEEP_880HZ_200MS:
case BEEP_880HZ_500MS:
#endif
ToneFrequency = 880;
break;
#ifdef ENABLE_FEAT_F4HWN
case BEEP_400HZ_30MS:
ToneFrequency = 400;
break;
case BEEP_500HZ_30MS:
ToneFrequency = 500;
break;
case BEEP_600HZ_30MS:
ToneFrequency = 600;
break;
#endif
}
#ifdef ENABLE_FEAT_F4HWN
if(Beep == BEEP_400HZ_30MS || Beep == BEEP_500HZ_30MS || Beep == BEEP_600HZ_30MS)
{
@@ -121,7 +92,7 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
}
#endif
BK4819_PlayTone(ToneFrequency, true);
BK4819_PrepareToPlayTone(true);
SYSTEM_DelayMs(2);
@@ -129,45 +100,12 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
SYSTEM_DelayMs(60);
uint16_t Duration;
switch (Beep)
{
case BEEP_880HZ_60MS_DOUBLE_BEEP:
AUDIO_PlayBeepPulse();
[[fallthrough]];
case BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL:
case BEEP_500HZ_60MS_DOUBLE_BEEP:
AUDIO_PlayBeepPulse();
[[fallthrough]];
case BEEP_1KHZ_60MS_OPTIONAL:
BK4819_ExitTxMute();
Duration = 60;
break;
#ifdef ENABLE_FEAT_F4HWN
case BEEP_400HZ_30MS:
case BEEP_500HZ_30MS:
case BEEP_600HZ_30MS:
BK4819_ExitTxMute();
Duration = 30;
break;
#endif
#ifndef ENABLE_FEAT_F4HWN
case BEEP_880HZ_200MS:
BK4819_ExitTxMute();
Duration = 200;
break;
case BEEP_880HZ_500MS:
#endif
default:
BK4819_ExitTxMute();
Duration = 500;
break;
for (uint8_t i = 0; i < BEEP_Classic_array[Beep][BEEP_REPEATS]; i++) {
BK4819_PlayToneRaw( BEEP_Classic_array[Beep][BEEP_TONE],
BEEP_Classic_array[Beep][BEEP_DURATION]);
SYSTEM_DelayMs(20);
}
SYSTEM_DelayMs(Duration);
BK4819_EnterTxMute();
SYSTEM_DelayMs(20);
AUDIO_AudioPathOff();
SYSTEM_DelayMs(5);
@@ -182,7 +120,6 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
SYSTEM_DelayMs(10);
#endif
if (gEnableSpeaker)
AUDIO_AudioPathOn();
@@ -197,7 +134,6 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
#ifdef ENABLE_VOX
gVoxResumeCountdown = 80;
#endif
}
#ifdef ENABLE_VOICE
App/audio.h
+8 -1
View File
@@ -22,6 +22,13 @@
#include "driver/gpio.h"
enum {
BEEP_TONE = 0,
BEEP_DURATION,
BEEP_REPEATS
};
enum BEEP_Type_t
{
BEEP_NONE = 0,
@@ -37,7 +44,7 @@ enum BEEP_Type_t
BEEP_500HZ_30MS,
BEEP_600HZ_30MS,
#endif
BEEP_880HZ_60MS_DOUBLE_BEEP
BEEP_880HZ_60MS_TRIPLE_BEEP
};
typedef enum BEEP_Type_t BEEP_Type_t;
App/driver/backlight.c
+2 -2
View File
@@ -109,8 +109,8 @@ static void BACKLIGHT_Sound(void)
{
if (gEeprom.POWER_ON_DISPLAY_MODE == POWER_ON_DISPLAY_MODE_SOUND || gEeprom.POWER_ON_DISPLAY_MODE == POWER_ON_DISPLAY_MODE_ALL)
{
AUDIO_PlayBeep(BEEP_880HZ_60MS_DOUBLE_BEEP);
AUDIO_PlayBeep(BEEP_880HZ_60MS_DOUBLE_BEEP);
AUDIO_PlayBeep(BEEP_880HZ_60MS_TRIPLE_BEEP);
AUDIO_PlayBeep(BEEP_880HZ_60MS_TRIPLE_BEEP);
}
gK5startup = false;
App/driver/bk4819.h
+2
View File
@@ -105,7 +105,9 @@ void BK4819_SetCompander(const unsigned int mode);
void BK4819_DisableVox(void);
void BK4819_DisableDTMF(void);
void BK4819_EnableDTMF(void);
void BK4819_PrepareToPlayTone(bool bTuningGainSwitch);
void BK4819_PlayTone(uint16_t Frequency, bool bTuningGainSwitch);
void BK4819_PlayToneRaw(const unsigned int tone_Hz, const unsigned int delay);
void BK4819_PlaySingleTone(const unsigned int tone_Hz, const unsigned int delay, const unsigned int level, const bool play_speaker);
void BK4819_EnterTxMute(void);
void BK4819_ExitTxMute(void);
App/driver/bk4829.c
+17 -17
View File
@@ -1031,7 +1031,7 @@ void BK4819_EnableDTMF(void)
(15u << BK4819_REG_24_SHIFT_MAX_SYMBOLS)); // 0 ~ 15
}
void BK4819_PlayTone(uint16_t Frequency, bool bTuningGainSwitch)
void BK4819_PrepareToPlayTone(bool bTuningGainSwitch)
{
uint16_t ToneConfig = BK4819_REG_70_ENABLE_TONE1;
@@ -1046,10 +1046,23 @@ void BK4819_PlayTone(uint16_t Frequency, bool bTuningGainSwitch)
BK4819_WriteRegister(BK4819_REG_30, 0);
BK4819_WriteRegister(BK4819_REG_30, BK4819_REG_30_ENABLE_AF_DAC | BK4819_REG_30_ENABLE_DISC_MODE | BK4819_REG_30_ENABLE_TX_DSP);
}
void BK4819_PlayTone(uint16_t Frequency, bool bTuningGainSwitch)
{
BK4819_PrepareToPlayTone(bTuningGainSwitch);
BK4819_WriteRegister(BK4819_REG_71, scale_freq(Frequency));
}
void BK4819_PlayToneRaw(const unsigned int tone_Hz, const unsigned int delay) {
BK4819_WriteRegister(BK4819_REG_71, scale_freq(tone_Hz));
BK4819_ExitTxMute();
SYSTEM_DelayMs(delay);
BK4819_EnterTxMute();
}
// level 0 ~ 127
void BK4819_PlaySingleTone(const unsigned int tone_Hz, const unsigned int delay, const unsigned int level, const bool play_speaker)
{
@@ -1069,11 +1082,7 @@ void BK4819_PlaySingleTone(const unsigned int tone_Hz, const unsigned int delay,
BK4819_EnableTXLink();
SYSTEM_DelayMs(50);
BK4819_WriteRegister(BK4819_REG_71, scale_freq(tone_Hz));
BK4819_ExitTxMute();
SYSTEM_DelayMs(delay);
BK4819_EnterTxMute();
BK4819_PlayToneRaw(tone_Hz, delay);
if (play_speaker)
{
@@ -1767,17 +1776,8 @@ static void BK4819_PlayRogerNormal(void)
BK4819_EnableTXLink();
SYSTEM_DelayMs(50);
BK4819_WriteRegister(BK4819_REG_71, scale_freq(tone1_Hz));
BK4819_ExitTxMute();
SYSTEM_DelayMs(80);
BK4819_EnterTxMute();
BK4819_WriteRegister(BK4819_REG_71, scale_freq(tone2_Hz));
BK4819_ExitTxMute();
SYSTEM_DelayMs(80);
BK4819_EnterTxMute();
BK4819_PlayToneRaw(tone1_Hz, 80);
BK4819_PlayToneRaw(tone2_Hz, 80);
BK4819_WriteRegister(BK4819_REG_70, 0x0000);
BK4819_WriteRegister(BK4819_REG_30, 0xC1FE); // 1 1 0000 0 1 1111 1 1 1 0