Merge remote-tracking branch 'upstream/main' into kv4p-207-from-203

Author: dkaukov

.github/workflows/arduino.yml

@@ -30,5 +30,6 @@ jobs:
           libraries: |
             - name: EspSoftwareSerial
               version: 8.1.0
-            - source-url: https://github.com/fatpat/arduino-dra818/archive/refs/tags/v1.0.1.zip
+            - source-url: https://github.com/fatpat/arduino-dra818.git
+              version: 89582e3ef7bf3f31f1af149e32cec16c4b9e4cf2
           verbose: true

android-src/KV4PHT/.idea/deploymentTargetDropDown.xml

@@ -10,8 +10,8 @@ android {
         applicationId "com.vagell.kv4pht"
         minSdk 26
         targetSdk 34
-        versionCode 35
-        versionName "1.7.1"
+        versionCode 36
+        versionName "1.7.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

android-src/KV4PHT/app/build.gradle

@@ -18,11 +18,11 @@ public class FirmwareUtils {
     private static int progressPercent = 0;
 
     // Whenever there is new firmware, put the files in res/raw, and update these constants.
-    public static final int PACKAGED_FIRMWARE_VER = 11;
-    private static final int FIRMWARE_FILE_1_ID = R.raw.v11_kv4p_ht_esp32_wroom_32_ino_bootloader;
-    private static final int FIRMWARE_FILE_2_ID = R.raw.v11_kv4p_ht_esp32_wroom_32_ino_partitions;
+    public static final int PACKAGED_FIRMWARE_VER = 12;
+    private static final int FIRMWARE_FILE_1_ID = R.raw.v12_kv4p_ht_esp32_wroom_32_ino_bootloader;
+    private static final int FIRMWARE_FILE_2_ID = R.raw.v12_kv4p_ht_esp32_wroom_32_ino_partitions;
     private static final int FIRMWARE_FILE_3_ID = R.raw.boot_app0; // This one never changes, it's the Arduino ESP32 bootloader
-    private static final int FIRMWARE_FILE_4_ID = R.raw.v11_kv4p_ht_esp32_wroom_32_ino;
+    private static final int FIRMWARE_FILE_4_ID = R.raw.v12_kv4p_ht_esp32_wroom_32_ino;
 
     public FirmwareUtils() {
     }

android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/firmware/FirmwareUtils.java

@@ -9,7 +9,7 @@ public class ESP32DataStreamParser {
 
     private int matchedDelimiterTokens = 0;
     private byte command;
-    private byte commandParamLen;
+    private int commandParamLen;
     private final ByteArrayOutputStream commandParams = new ByteArrayOutputStream();
     private final ByteArrayOutputStream lookaheadBuffer = new ByteArrayOutputStream();
 
@@ -35,12 +35,10 @@ public byte[] extractAudioAndHandleCommands(byte[] newData) {
                 // Log.d("DEBUG", "command: " + command);
                 matchedDelimiterTokens++;
             } else if (matchedDelimiterTokens == COMMAND_DELIMITER.length + 1) {
-                commandParamLen = b;
+                commandParamLen = b & 0xFF;
                 commandParams.reset();
                 matchedDelimiterTokens++;
-
                 if (commandParamLen == 0) { // If this command has no params...
-                    lookaheadBuffer.reset();
                     onCommand.accept(command, commandParams.toByteArray());
                     resetParser(audioOut);
                 }

android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/radio/ESP32DataStreamParser.java

@@ -122,7 +122,7 @@ public class RadioAudioService extends Service {
     private int mode = MODE_STARTUP;
     private int messageNumber = 0;
 
-    public static final byte SILENT_BYTE = -128;
+    public static final byte SILENT_BYTE = 0;
 
     // Callbacks to the Activity that started us
     private RadioAudioServiceCallbacks callbacks = null;
@@ -151,9 +151,14 @@ public class RadioAudioService extends Service {
 
     // Delimiter must match ESP32 code
     static final byte[] COMMAND_DELIMITER = new byte[] {(byte)0xDE, (byte)0xAD, (byte)0xBE, (byte)0xEF, (byte)0xDE, (byte)0xAD, (byte)0xBE, (byte)0xEF};
-    private static final byte COMMAND_SMETER_REPORT = 0x53; // Ascii "S"
-    private static final byte COMMAND_PHYS_PTT_DOWN = 0x44; // Ascii "D"
-    private static final byte COMMAND_PHYS_PTT_UP = 0x55;   // Ascii "U"
+    private static final byte COMMAND_SMETER_REPORT  = 0x53; // Ascii "S"
+    private static final byte COMMAND_PHYS_PTT_DOWN  = 0x44; // Ascii "D"
+    private static final byte COMMAND_PHYS_PTT_UP    = 0x55;   // Ascii "U"
+    private static final byte COMMAND_DEBUG_INFO     = 0x01;
+    private static final byte COMMAND_DEBUG_ERROR    = 0x02;
+    private static final byte COMMAND_DEBUG_WARN     = 0x03;
+    private static final byte COMMAND_DEBUG_DEBUG    = 0x04;
+    private static final byte COMMAND_DEBUG_TRACE    = 0x05;
 
     private final ESP32DataStreamParser esp32DataStreamParser = new ESP32DataStreamParser(this::handleParsedCommand);
 
@@ -602,8 +607,10 @@ public void tuneToFreq(String frequencyStr, int squelchLevel, boolean forceTune)
 
         try {
             Float freq = Float.parseFloat(makeSafeHamFreq(activeFrequencyStr));
-            Float offsetMaxFreq = maxHamFreq - (bandwidth.equals("W") ? 0.025f : 0.0125f);
-            if (freq < minHamFreq|| freq > offsetMaxFreq) {
+            Float halfBandwidth = (bandwidth.equals("Wide") ? 0.025f : 0.0125f) / 2;
+            Float offsetMaxFreq = maxHamFreq - halfBandwidth;
+            Float offsetMinFreq = minHamFreq + halfBandwidth;
+            if (freq < offsetMinFreq || freq > offsetMaxFreq) {
                 txAllowed = false;
             } else {
                 txAllowed = true;
@@ -693,8 +700,10 @@ public void tuneToMemory(ChannelMemory memory, int squelchLevel, boolean forceTu
 
         try {
             Float txFreq = Float.parseFloat(getTxFreq(memory.frequency, memory.offset, memory.offsetKhz));
-            Float offsetMaxFreq = maxHamFreq - (bandwidth.equals("W") ? 0.025f : 0.0125f);
-            if (txFreq < minHamFreq || txFreq > offsetMaxFreq) {
+            Float halfBandwidth = (bandwidth.equals("Wide") ? 0.025f : 0.0125f) / 2;
+            Float offsetMaxFreq = maxHamFreq - halfBandwidth;
+            Float offsetMinFreq = minHamFreq + halfBandwidth;
+            if (txFreq < offsetMinFreq || txFreq > offsetMaxFreq) {
                 txAllowed = false;
             } else {
                 txAllowed = true;
@@ -945,8 +954,8 @@ public void onRunError(Exception e) {
             }
         });
         usbIoManager.setWriteBufferSize(90000); // Must be large enough that ESP32 can take its time accepting our bytes without overrun.
-        usbIoManager.setReadBufferSize(1024/4); // Must not be 0 (infinite) or it may block on read() until a write() occurs.
-        usbIoManager.setReadBufferCount(16*4);
+        usbIoManager.setReadBufferSize(1024); // Must not be 0 (infinite) or it may block on read() until a write() occurs.
+        usbIoManager.setReadBufferCount(16*2);
         usbIoManager.start();
         checkedFirmwareVersion = false;
 
@@ -1097,8 +1106,14 @@ public void nextScan() {
         do {
             ChannelMemory candidate = channelMemories.get(nextIndex);
 
-            // If not marked as skipped, we tune to it and return.
-            if (!candidate.skipDuringScan) {
+            // If not marked as skipped, and it's in the active band, we tune to it and return.
+            float memoryFreqFloat = 0.0f;
+            try {
+                memoryFreqFloat = Float.parseFloat(candidate.frequency);
+            } catch (Exception e) {
+                Log.d("DEBUG", "Memory with id " + candidate.memoryId + " had invalid frequency.");
+            }
+            if (!candidate.skipDuringScan && memoryFreqFloat >= minRadioFreq && memoryFreqFloat <= maxRadioFreq) {
                 // Reset silence since we found an active memory.
                 consecutiveSilenceBytes = 0;
 
@@ -1434,6 +1449,16 @@ private void handleParsedCommand(byte cmd, byte[] param) {
                 endPtt();
                 callbacks.forcedPttEnd();
             }
+        } else if (cmd == COMMAND_DEBUG_INFO) {
+            Log.i("firmware", new String(param));
+        } else if (cmd == COMMAND_DEBUG_DEBUG) {
+            Log.d("firmware", new String(param));
+        } else if (cmd == COMMAND_DEBUG_ERROR) {
+            Log.e("firmware", new String(param));
+        } else if (cmd == COMMAND_DEBUG_WARN) {
+            Log.w("firmware", new String(param));
+        } else if (cmd == COMMAND_DEBUG_TRACE) {
+            Log.v("firmware", new String(param));
         } else {
             Log.d("DEBUG", "Unknown cmd received from ESP32: 0x" + Integer.toHexString(cmd & 0xFF) +
                     " paramLen=" + param.length);

android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/radio/RadioAudioService.java

@@ -78,7 +78,7 @@
         android:fontFamily="@font/jost"
         android:text="Keep your phone screen on, this app open, and don’t unplug your kv4p HT until flashing is done.\n
 \n
-This usually takes 5-10 minutes."
+This usually takes about 30 seconds."
         android:textColor="@color/primary_deselected"
         android:textSize="20dp"
         android:visibility="gone"/>