Fixed key number offset bug added yesterday

pdrbsts · Oct 6, 2023 · 5397b3e · 5397b3e
1 parent 9a0a754
commit 5397b3e
Show file tree

Hide file tree

Showing 26 changed files with 1,750 additions and 33 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,12 @@
+FROM 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
+WORKDIR /app
+COPY . .
+
+RUN git submodule update --init --recursive
+#RUN make && cp firmware* compiled-firmware/
diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@ ENABLE_VOICE                  := 0
 ENABLE_VOX                    := 0
 ENABLE_ALARM                  := 0
 ENABLE_TX1750                 := 0
-ENABLE_PWRON_PASSWORD         := 1
+ENABLE_PWRON_PASSWORD         := 0
 ENABLE_BIG_FREQ               := 0
 ENABLE_SMALL_BOLD             := 1
 ENABLE_KEEP_MEM_NAME          := 1

diff --git a/README.md b/README.md
@@ -159,13 +159,13 @@ You may obtain a copy of the License at
 # Example changes/updates
 
 <p float="left">
-  <img src="/image1.png" width=300 />
-  <img src="/image2.png" width=300 />
-  <img src="/image3.png" width=300 />
+  <img src="/images/image1.png" width=300 />
+  <img src="/images/image2.png" width=300 />
+  <img src="/images/image3.png" width=300 />
 </p>
 
 Video showing the AM fix working ..
 
-<video src="/AM_fix.mp4"></video>
+<video src="/images/AM_fix.mp4"></video>
 
 <video src="https://github.com/OneOfEleven/uv-k5-firmware-custom/assets/51590168/2a3a9cdc-97da-4966-bf0d-1ce6ad09779c"></video>
diff --git a/app/action.c b/app/action.c
@@ -333,6 +333,7 @@ void ACTION_Handle(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 		if (Key == KEY_SIDE1 && !bKeyHeld && bKeyPressed)
 		{
 			gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
+
 			if (gDTMF_InputIndex > 0)
 			{
 				gDTMF_InputBox[--gDTMF_InputIndex] = '-';

diff --git a/app/app.c b/app/app.c
@@ -2256,14 +2256,16 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 					char Code;
 
 					if (Key == KEY_SIDE2)
-					{
+					{	// transmit 1750Hz tone
 						Code = 0xFE;
 					}
 					else
 					{
-						Code = DTMF_GetCharacter(Key);
+						Code = DTMF_GetCharacter(Key - KEY_0);
 						if (Code == 0xFF)
 							goto Skip;
+
+						// transmit DTMF keys
 					}
 
 					if (!bKeyPressed || bKeyHeld)

diff --git a/app/dtmf.c b/app/dtmf.c
@@ -390,8 +390,9 @@ void DTMF_Reply(void)
 
 		default:
 		case DTMF_REPLY_NONE:
-			if (gDTMF_CallState != DTMF_CALL_STATE_NONE        ||
-			    gCurrentVfo->DTMF_PTT_ID_TX_MODE == PTT_ID_OFF ||
+			if (gDTMF_CallState != DTMF_CALL_STATE_NONE           ||
+			    gCurrentVfo->DTMF_PTT_ID_TX_MODE == PTT_ID_APOLLO ||
+			    gCurrentVfo->DTMF_PTT_ID_TX_MODE == PTT_ID_OFF    ||
 			    gCurrentVfo->DTMF_PTT_ID_TX_MODE == PTT_ID_TX_DOWN)
 			{
 				gDTMF_ReplyState = DTMF_REPLY_NONE;

diff --git a/app/main.c b/app/main.c
@@ -34,6 +34,9 @@
 #include "settings.h"
 #include "ui/inputbox.h"
 #include "ui/ui.h"
+#ifdef ENABLE_SPECTRUM
+//	#include "app/spectrum.h"
+#endif
 
 void toggle_chan_scanlist(void)
 {	// toggle the selected channels scanlist setting