ziggi/uvk5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: ziggi:main
Branches Tags
ziggi:main ziggi:stable
...
pull from: ziggi:stable
Branches Tags
ziggi:stable ziggi:main

1 Commits
main ... stable

Author SHA1 Message Date
Олег Бородин
c26412cbd3 Customization 2024-03-21 10:31:58 +02:00
2 changed files with 12 additions and 6 deletions
Expand all files Collapse all files

12
Makefile
View File

@@ -13,8 +13,8 @@ ENABLE_VOX ?= 1
ENABLE_ALARM ?= 0 ENABLE_ALARM ?= 0
ENABLE_TX1750 ?= 0 ENABLE_TX1750 ?= 0
ENABLE_PWRON_PASSWORD ?= 0 ENABLE_PWRON_PASSWORD ?= 0
ENABLE_DTMF_CALLING ?= 1 ENABLE_DTMF_CALLING ?= 0
ENABLE_FLASHLIGHT ?= 1 ENABLE_FLASHLIGHT ?= 0
# ---- CUSTOM MODS ---- # ---- CUSTOM MODS ----
ENABLE_BIG_FREQ ?= 1 ENABLE_BIG_FREQ ?= 1
@@ -26,7 +26,7 @@ ENABLE_TX_WHEN_AM ?= 0
ENABLE_F_CAL_MENU ?= 0 ENABLE_F_CAL_MENU ?= 0
ENABLE_CTCSS_TAIL_PHASE_SHIFT ?= 0 ENABLE_CTCSS_TAIL_PHASE_SHIFT ?= 0
ENABLE_BOOT_BEEPS ?= 0 ENABLE_BOOT_BEEPS ?= 0
ENABLE_SHOW_CHARGE_LEVEL ?= 0 ENABLE_SHOW_CHARGE_LEVEL ?= 1
ENABLE_REVERSE_BAT_SYMBOL ?= 0 ENABLE_REVERSE_BAT_SYMBOL ?= 0
ENABLE_NO_CODE_SCAN_TIMEOUT ?= 1 ENABLE_NO_CODE_SCAN_TIMEOUT ?= 1
ENABLE_AM_FIX ?= 1 ENABLE_AM_FIX ?= 1
@@ -430,10 +430,10 @@ endif
$(SIZE) $< $(SIZE) $<
debug: debug:
/opt/openocd/bin/openocd -c "bindto 0.0.0.0" -f interface/jlink.cfg -f dp32g030.cfg openocd -c "bindto 0.0.0.0" -f interface/jlink.cfg -f dp32g030.cfg
flash: flash:
/opt/openocd/bin/openocd -c "bindto 0.0.0.0" -f interface/jlink.cfg -f dp32g030.cfg -c "write_image firmware.bin 0; shutdown;" openocd -c "bindto 0.0.0.0" -f interface/jlink.cfg -f dp32g030.cfg -c "write_image firmware.bin 0; shutdown;"
version.o: .FORCE version.o: .FORCE
@@ -454,6 +454,8 @@ bsp/dp32g030/%.h: hardware/dp32g030/%.def
clean: clean:
$(RM) $(call FixPath, $(TARGET).bin $(TARGET).packed.bin $(TARGET) $(OBJS) $(DEPS)) $(RM) $(call FixPath, $(TARGET).bin $(TARGET).packed.bin $(TARGET) $(OBJS) $(DEPS))
$(RM) -f *~ */*~
doxygen: doxygen:
doxygen doxygen

6
app/menu.c
View File

@@ -1404,7 +1404,11 @@ static void MENU_Key_MENU(const bool bKeyPressed, const bool bKeyHeld)
if (UI_MENU_GetCurrentMenuId() != MENU_SCR) if (UI_MENU_GetCurrentMenuId() != MENU_SCR)
gAnotherVoiceID = MenuList[gMenuCursor].voice_id; gAnotherVoiceID = MenuList[gMenuCursor].voice_id;
#endif #endif
if (UI_MENU_GetCurrentMenuId() == MENU_ANI_ID || UI_MENU_GetCurrentMenuId() == MENU_UPCODE|| UI_MENU_GetCurrentMenuId() == MENU_DWCODE) if (
#ifdef ENABLE_DTMF_CALLING
UI_MENU_GetCurrentMenuId() == MENU_ANI_ID ||
#endif
UI_MENU_GetCurrentMenuId() == MENU_UPCODE|| UI_MENU_GetCurrentMenuId() == MENU_DWCODE)
return; return;
#if 1 #if 1
if (UI_MENU_GetCurrentMenuId() == MENU_DEL_CH || UI_MENU_GetCurrentMenuId() == MENU_MEM_NAME) if (UI_MENU_GetCurrentMenuId() == MENU_DEL_CH || UI_MENU_GetCurrentMenuId() == MENU_MEM_NAME)