Merge pull request #517 from armel/feature_update_v4

Feature update v4

Author: armel

.gitignore

@@ -9,3 +9,6 @@ compile_commands.json
 .vscode
 /docs
 k5_eeprom.raw
+f4hwn
+f4hwn.*
+!archive/f4hwn*

Dockerfile

@@ -1,11 +1,24 @@
-ARG BUILDPLATFORM
-FROM --platform=${BUILDPLATFORM} archlinux:latest
-RUN pacman -Syyu base-devel --noconfirm
-RUN pacman -Syyu arm-none-eabi-gcc --noconfirm
-RUN pacman -Syyu arm-none-eabi-newlib --noconfirm
-RUN pacman -Syyu git --noconfirm
-RUN pacman -Syyu python-pip --noconfirm
-RUN pacman -Syyu python-crcmod --noconfirm
+# syntax=docker/dockerfile:1.6
+
+# Parametric Alpine tag. Override at build time with:
+#   docker build --build-arg ALPINE_TAG=3.21 -t uvk5 .
+# Examples: 3.22, 3.21, 3.19, edge
+ARG ALPINE_TAG=3.21
+FROM alpine:${ALPINE_TAG}
+
+# Toolchain and utilities needed to build the firmware
+RUN apk add --no-cache \
+      bash \
+      build-base \
+      gcc-arm-none-eabi \
+      newlib-arm-none-eabi \
+      python3 \
+      py3-crcmod \
+      py3-pip \
+      git
+
+# Project workspace
 WORKDIR /app
+
+# Copy sources into the image (the script mounts the repo and runs builds)
 COPY . .
-RUN git submodule update --init --recursive

Makefile

@@ -79,6 +79,7 @@ ENABLE_CLANG                    ?= 0
 ENABLE_SWD                      ?= 0
 ENABLE_OVERLAY                  ?= 0
 ENABLE_LTO                      ?= 1
+ENABLE_EXPERIMENTAL_CLFAGS      ?= 1
 
 #############################################################
 
@@ -246,7 +247,7 @@ ifeq ($(ENABLE_FEAT_F4HWN),1)
 	VERSION_STRING_1 ?= v0.22
 
 	AUTHOR_STRING_2 ?= F4HWN
-	VERSION_STRING_2 ?= v4.2
+	VERSION_STRING_2 ?= v4.3
 
 	EDITION_STRING ?= Custom
 
@@ -290,6 +291,10 @@ else
 	CFLAGS += -Oz -Wall -Werror -mcpu=cortex-m0 -fno-builtin -fshort-enums -fno-delete-null-pointer-checks -std=c2x -MMD
 endif
 
+ifeq ($(ENABLE_EXPERIMENTAL_CLFAGS),1)
+	CFLAGS += -funroll-loops -ffat-lto-objects
+endif
+
 ifeq ($(ENABLE_LTO),1)
 	CFLAGS += -flto=auto
 else

README.md

@@ -26,7 +26,7 @@ Anyway, have fun.
 
 # Donations
 
-Special thanks to Jean-Cyrille F6IWW (2 times), Fabrice 14RC123, David F4BPP, Olivier 14RC206, Frédéric F4ESO, Stéphane F5LGW, Jorge Ornelas (4 times), Laurent F4AXK, Christophe Morel, Clayton W0LED, Pierre Antoine F6FWB, Jean-Claude 14FRS3306, Thierry F4GVO, Eric F1NOU, PricelessToolkit, Ady M6NYJ, Tom McGovern (3 times), Joseph Roth, Pierre-Yves Colin, Frank DJ7FG, Marcel Testaz, Brian Frobisher, Yannick F4JFO, Paolo Bussola, Dirk DL8DF, Levente Szőke (2 times), Bernard-Michel Herrera, Jérôme Saintespes, Paul Davies, RS (3 times), Johan F4WAT, Robert Wörle, Rafael Sundorf, Paul Harker, Peter Fintl, Pascal F4ICR (2 times), Mike DL2MF, Eric KI1C (2 times), Phil G0ELM, Jérôme Lambert, Meinhard Frank Günther, Eliot Vedel, Alfonso EA7KDF, Jean-François F1EVM, Robert DC1RDB, Ian KE2CHJ, Daryl VK3AWA, Roberto Brunelli, Robert Boardman and Stephen Oliver for their [donations](https://www.paypal.com/paypalme/F4HWN). That’s so kind of them. Thanks so much 🙏🏻
+Special thanks to Jean-Cyrille F6IWW (2 times), Fabrice 14RC123, David F4BPP, Olivier 14RC206, Frédéric F4ESO, Stéphane F5LGW, Jorge Ornelas (4 times), Laurent F4AXK, Christophe Morel, Clayton W0LED, Pierre Antoine F6FWB, Jean-Claude 14FRS3306, Thierry F4GVO, Eric F1NOU, PricelessToolkit, Ady M6NYJ, Tom McGovern (4 times), Joseph Roth, Pierre-Yves Colin, Frank DJ7FG, Marcel Testaz, Brian Frobisher, Yannick F4JFO, Paolo Bussola, Dirk DL8DF, Levente Szőke (2 times), Bernard-Michel Herrera, Jérôme Saintespes, Paul Davies, RS (3 times), Johan F4WAT, Robert Wörle, Rafael Sundorf, Paul Harker, Peter Fintl, Pascal F4ICR (2 times), Mike DL2MF, Eric KI1C (2 times), Phil G0ELM, Jérôme Lambert, Meinhard Frank Günther, Eliot Vedel, Alfonso EA7KDF, Jean-François F1EVM, Robert DC1RDB, Ian KE2CHJ, Daryl VK3AWA, Roberto Brunelli, Robert Boardman, Stephen Oliver, Nicolas F4INE and William Bruno for their [donations](https://www.paypal.com/paypalme/F4HWN). That’s so kind of them. Thanks so much 🙏🏻
 
 ## Table of Contents
 

app/generic.c

@@ -39,78 +39,61 @@
 
 void GENERIC_Key_F(bool bKeyPressed, bool bKeyHeld)
 {
-    #ifdef ENABLE_F4HWN_FEAT_MENU_LOCK
-        if(gEeprom.MENU_LOCK == true)
-        {
-            if (bKeyHeld || !bKeyPressed) { // held or released
-                if (bKeyHeld || bKeyPressed) { // held or pressed (cannot be held and not pressed I guess, so it checks only if HELD?)
-                    if (!bKeyHeld) // won't ever pass
-                        return;
+    if (gInputBoxIndex > 0) {
+        if (!bKeyHeld && bKeyPressed) // short pressed
+            gBeepToPlay = BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL;
+        return;
+    }
 
-                    if (!bKeyPressed) // won't ever pass
-                        return;
+    if (bKeyHeld || !bKeyPressed) { // held or released
+        if (bKeyHeld || bKeyPressed) { // held or pressed (cannot be held and not pressed I guess, so it checks only if HELD?)
+            if (!bKeyHeld) // won't ever pass
+                return;
 
-                    COMMON_KeypadLockToggle();
-                }
-            }
-        }
-    #else
-        if (gInputBoxIndex > 0) {
-            if (!bKeyHeld && bKeyPressed) // short pressed
-                gBeepToPlay = BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL;
-            return;
+            if (!bKeyPressed) // won't ever pass
+                return;
+
+            COMMON_KeypadLockToggle();
         }
+        else { // released
+#ifdef ENABLE_FMRADIO
+            if ((gFmRadioMode || gScreenToDisplay != DISPLAY_MAIN) && gScreenToDisplay != DISPLAY_FM)
+                return;
+#else
+            if (gScreenToDisplay != DISPLAY_MAIN)
+                return;
+#endif
 
-        if (bKeyHeld || !bKeyPressed) { // held or released
-            if (bKeyHeld || bKeyPressed) { // held or pressed (cannot be held and not pressed I guess, so it checks only if HELD?)
-                if (!bKeyHeld) // won't ever pass
-                    return;
+            gWasFKeyPressed = !gWasFKeyPressed; // toggle F function
 
-                if (!bKeyPressed) // won't ever pass
-                    return;
+            if (gWasFKeyPressed)
+                gKeyInputCountdown = key_input_timeout_500ms;
 
-                COMMON_KeypadLockToggle();
-            }
-            else { // released
-    #ifdef ENABLE_FMRADIO
-                if ((gFmRadioMode || gScreenToDisplay != DISPLAY_MAIN) && gScreenToDisplay != DISPLAY_FM)
-                    return;
-    #else
-                if (gScreenToDisplay != DISPLAY_MAIN)
-                    return;
-    #endif
-
-                gWasFKeyPressed = !gWasFKeyPressed; // toggle F function
-
-                if (gWasFKeyPressed)
-                    gKeyInputCountdown = key_input_timeout_500ms;
-
-    #ifdef ENABLE_VOICE
-                if (!gWasFKeyPressed)
-                    gAnotherVoiceID = VOICE_ID_CANCEL;
-    #endif
-                gUpdateStatus = true;
-            }
+#ifdef ENABLE_VOICE
+            if (!gWasFKeyPressed)
+                gAnotherVoiceID = VOICE_ID_CANCEL;
+#endif
+            gUpdateStatus = true;
+        }
+    }
+    else { // short pressed
+#ifdef ENABLE_FMRADIO
+        if (gScreenToDisplay != DISPLAY_FM)
+#endif
+        {
+            gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
+            return;
         }
-        else { // short pressed
-    #ifdef ENABLE_FMRADIO
-            if (gScreenToDisplay != DISPLAY_FM)
-    #endif
-            {
-                gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
-                return;
-            }
 
-    #ifdef ENABLE_FMRADIO
-            if (gFM_ScanState == FM_SCAN_OFF) { // not scanning
-                gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
-                return;
-            }
-    #endif
-            gBeepToPlay     = BEEP_440HZ_500MS;
-            gPttWasReleased = true;
+#ifdef ENABLE_FMRADIO
+        if (gFM_ScanState == FM_SCAN_OFF) { // not scanning
+            gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
+            return;
         }
-    #endif
+#endif
+        gBeepToPlay     = BEEP_440HZ_500MS;
+        gPttWasReleased = true;
+    }
 }
 
 void GENERIC_Key_PTT(bool bKeyPressed)