Fixed key number offset bug added yesterday

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] = '-';

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)

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;

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

app/spectrum.h

@@ -0,0 +1,171 @@
+/* Copyright 2023 fagci
+ * https://github.com/fagci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+#ifndef SPECTRUM_H
+#define SPECTRUM_H
+
+#include "../bitmaps.h"
+#include "../board.h"
+#include "../bsp/dp32g030/gpio.h"
+#include "../driver/bk4819-regs.h"
+#include "../driver/bk4819.h"
+#include "../driver/gpio.h"
+#include "../driver/keyboard.h"
+#include "../driver/st7565.h"
+#include "../driver/system.h"
+#include "../driver/systick.h"
+#include "../external/printf/printf.h"
+#include "../font.h"
+#include "../frequencies.h"
+#include "../helper/battery.h"
+#include "../misc.h"
+#include "../radio.h"
+#include "../settings.h"
+#include "../ui/helper.h"
+#include <stdbool.h>
+#include <stdint.h>
+#include <string.h>
+
+static const uint8_t DrawingEndY = 40;
+
+static const uint8_t U8RssiMap[] = {
+    121, 115, 109, 103, 97, 91, 85, 79, 73, 63,
+};
+
+static const uint16_t scanStepValues[] = {
+    1,   10,  50,  100,
+
+    250, 500, 625, 833, 1000, 1250, 2500, 10000,
+};
+
+static const uint16_t scanStepBWRegValues[] = {
+    //     RX  RXw TX  BW
+    // 0b0 000 000 001 01 1000
+    // 1
+    0b0000000001011000, // 6.25
+    // 10
+    0b0000000001011000, // 6.25
+    // 50
+    0b0000000001011000, // 6.25
+    // 100
+    0b0000000001011000, // 6.25
+    // 250
+    0b0000000001011000, // 6.25
+    // 500
+    0b0010010001011000, // 6.25
+    // 625
+    0b0100100001011000, // 6.25
+    // 833
+    0b0110110001001000, // 6.25
+    // 1000
+    0b0110110001001000, // 6.25
+    // 1250
+    0b0111111100001000, // 6.25
+    // 2500
+    0b0011011000101000, // 25
+    // 10000
+    0b0011011000101000, // 25
+};
+
+static const uint16_t listenBWRegValues[] = {
+    0b0011011000101000, // 25
+    0b0111111100001000, // 12.5
+    0b0100100001011000, // 6.25
+};
+
+typedef enum State {
+  SPECTRUM,
+  FREQ_INPUT,
+  STILL,
+} State;
+
+typedef enum StepsCount {
+  STEPS_128,
+  STEPS_64,
+  STEPS_32,
+  STEPS_16,
+} StepsCount;
+
+typedef enum ModulationType {
+  MOD_FM,
+  MOD_AM,
+  MOD_USB,
+} ModulationType;
+
+typedef enum ScanStep {
+  S_STEP_0_01kHz,
+  S_STEP_0_1kHz,
+  S_STEP_0_5kHz,
+  S_STEP_1_0kHz,
+
+  S_STEP_2_5kHz,
+  S_STEP_5_0kHz,
+  S_STEP_6_25kHz,
+  S_STEP_8_33kHz,
+  S_STEP_10_0kHz,
+  S_STEP_12_5kHz,
+  S_STEP_25_0kHz,
+  S_STEP_100_0kHz,
+} ScanStep;
+
+typedef struct SpectrumSettings {
+  uint32_t frequencyChangeStep;  
+  StepsCount stepsCount;
+  ScanStep scanStepIndex;
+  uint16_t scanDelay;
+  uint16_t rssiTriggerLevel;
+  BK4819_FilterBandwidth_t bw;
+  BK4819_FilterBandwidth_t listenBw;
+  int dbMin;
+  int dbMax;  
+  ModulationType modulationType;
+  bool backlightState;
+} SpectrumSettings;
+
+typedef struct KeyboardState {
+  KEY_Code_t current;
+  KEY_Code_t prev;
+  uint8_t counter;
+} KeyboardState;
+
+typedef struct ScanInfo {
+  uint16_t rssi, rssiMin, rssiMax;
+  uint8_t i, iPeak;
+  uint32_t f, fPeak;
+  uint16_t scanStep;
+  uint8_t measurementsCount;
+} ScanInfo;
+
+typedef struct RegisterSpec {
+  char *name;
+  uint8_t num;
+  uint8_t offset;
+  uint16_t maxValue;
+  uint16_t inc;
+} RegisterSpec;
+
+typedef struct PeakInfo {
+  uint16_t t;
+  uint16_t rssi;
+  uint32_t f;
+  uint8_t i;
+} PeakInfo;
+
+void APP_RunSpectrum(void);
+
+#endif /* ifndef SPECTRUM_H */
+
+// vim: ft=c