mirrors/kamilsss655
1
0
Fork 0
mirror of https://github.com/kamilsss655/uv-k5-firmware-custom synced 2024-11-21 17:57:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed boot beep compile problem

Browse Source
This commit is contained in:
OneOfEleven 2023-09-18 11:54:42 +01:00
parent 784a4dd79f
commit ed33d14c0f
12 changed files with 35 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -16,7 +16,7 @@ ENABLE_WIDE_RX := 1
ENABLE_TX_WHEN_AM := 0
ENABLE_CTCSS_TAIL_PHASE_SHIFT := 1
ENABLE_MAIN_KEY_HOLD := 1
ENABLE_BOOT_BEEPS := 1
ENABLE_BOOT_BEEPS := 0
ENABLE_DTMF_DECODER := 1
ENABLE_COMPANDER := 1
#ENABLE_SINGLE_VFO_CHAN := 1

6
app/app.c
View File

@ -1200,10 +1200,8 @@ void APP_CheckKeys(void)
// scan the hardware keys
Key = KEYBOARD_Poll();
#ifdef ENABLE_BOOT_BEEPS
if (Key != KEY_INVALID)
boot_counter_10ms = 0; // cancel bbot beeps if any key pressed
#endif
if (Key != KEY_INVALID)
boot_counter_10ms = 0; // cancel bbot beeps if any key pressed
if (gKeyReading0 != Key)
{ // new key pressed

38
bitmaps.c
View File

@ -212,7 +212,7 @@ const uint8_t BITMAP_VOX[18] =
0b00011000,
0b00100000,
0b01111111,
0b00000000,
0b01100011,
0b00010100,
@ -298,7 +298,7 @@ const uint8_t BITMAP_TDR2[12] =
0b00001001,
0b00001001,
0b00000001,
0b00000000,
0b01111111,
0b00000010,
@ -325,25 +325,25 @@ const uint8_t BITMAP_TDR2[12] =
0b01001001,
0b00110001
};
#else
const uint8_t BITMAP_SC[12] =
{ // "SC"
0b00000000,
0b01000110,
0b01001001,
0b01001001,
0b01001001,
0b00110001,
0b00000000,
0b00111110,
0b01000001,
0b01000001,
0b01000001,
0b00100010
};
#endif
const uint8_t BITMAP_SC[12] =
{ // "SC"
0b00000000,
0b01000110,
0b01001001,
0b01001001,
0b01001001,
0b00110001,
0b00000000,
0b00111110,
0b01000001,
0b01000001,
0b01000001,
0b00100010
};
const uint8_t BITMAP_Antenna[5] =
{
0b00000011,

4
bitmaps.h
View File

@ -39,10 +39,10 @@ extern const uint8_t BITMAP_TDR2[12];
#ifdef ENABLE_NOAA
extern const uint8_t BITMAP_NOAA[12];
#else
extern const uint8_t BITMAP_SC[12];
#endif
extern const uint8_t BITMAP_SC[12];
extern const uint8_t BITMAP_Antenna[5];
extern const uint8_t BITMAP_AntennaLevel1[3];
extern const uint8_t BITMAP_AntennaLevel2[3];

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.

4
main.c
View File

@ -97,9 +97,7 @@ void Main(void)
gMenuListCount = 0;
#ifdef ENABLE_BOOT_BEEPS
boot_counter_10ms = 250; // 2.5 sec
#endif
boot_counter_10ms = 250; // 2.5 sec
if (!gChargingWithTypeC && !gBatteryDisplayLevel)
{

4
misc.c
View File

@ -198,9 +198,7 @@ volatile bool gFlagTailNoteEliminationComplete;
volatile bool gScheduleFM;
#endif
#ifdef ENABLE_BOOT_BEEPS
volatile uint8_t boot_counter_10ms;
#endif
volatile uint8_t boot_counter_10ms;
uint16_t gCurrentRSSI;

4
misc.h
View File

@ -255,9 +255,7 @@ extern volatile bool gFlagTailNoteEliminationComplete;
#endif
extern uint16_t gCurrentRSSI;
extern uint8_t gIsLocked;
#ifdef ENABLE_BOOT_BEEPS
extern volatile uint8_t boot_counter_10ms;
#endif
extern volatile uint8_t boot_counter_10ms;
void NUMBER_Get(char *pDigits, uint32_t *pInteger);
void NUMBER_ToDigits(uint32_t Value, char *pDigits);

4
scheduler.c
View File

@ -104,7 +104,5 @@ void SystickHandler(void)
DECREMENT(gVoxStopCountdown_10ms);
#ifdef ENABLE_BOOT_BEEPS
DECREMENT(boot_counter_10ms);
#endif
DECREMENT(boot_counter_10ms);
}

14
ui/status.c
View File

@ -42,14 +42,14 @@ void UI_DisplayStatus(const bool test_display)
#ifdef ENABLE_NOAA
if (gIsNoaaMode || test_display)
memmove(gStatusLine + 7, BITMAP_NOAA, sizeof(BITMAP_NOAA));
#else
if (gScanState != SCAN_OFF ||
gCssScanMode != CSS_SCAN_MODE_OFF ||
gScanCssState != SCAN_CSS_STATE_OFF ||
gScreenToDisplay == DISPLAY_SCANNER ||
test_display)
memmove(gStatusLine + 7, BITMAP_SC, sizeof(BITMAP_SC));
else
#endif
if (gScanState != SCAN_OFF ||
gCssScanMode != CSS_SCAN_MODE_OFF ||
gScanCssState != SCAN_CSS_STATE_OFF ||
gScreenToDisplay == DISPLAY_SCANNER ||
test_display)
memmove(gStatusLine + 7, BITMAP_SC, sizeof(BITMAP_SC));
#ifdef ENABLE_FMRADIO
if (gSetting_KILLED)