tweaks

Author: dkaukov

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

@@ -483,6 +483,8 @@ public void setChannelMemories(LiveData<List<ChannelMemory>> channelMemoriesLive
     public interface RadioAudioServiceCallbacks {
         public void radioMissing();
         public void radioConnected();
+        public void hideSnackbar();
+        public void radioModuleHandshake();
         public void radioModuleNotFound();
         public void audioTrackCreated();
         public void packetReceived(APRSPacket aprsPacket);
@@ -729,13 +731,13 @@ private String getTxFreq(String txFreq, int offset, int khz) {
         if (offset == ChannelMemory.OFFSET_NONE) {
             return txFreq;
         } else {
-            Float freqFloat = Float.parseFloat(txFreq);
+            float freqFloat = Float.parseFloat(txFreq);
             if (offset == ChannelMemory.OFFSET_UP) {
                 freqFloat += 0f + (khz / 1000f);
             } else if (offset == ChannelMemory.OFFSET_DOWN){
                 freqFloat -= 0f + (khz / 1000f);
             }
-            return makeSafeHamFreq(freqFloat.toString());
+            return makeSafeHamFreq(Float.toString(freqFloat));
         }
     }
 
@@ -866,6 +868,9 @@ private void findESP32Device() {
             }
         } else {
             Log.d("DEBUG", "Found ESP32.");
+            if (callbacks != null) {
+                callbacks.hideSnackbar();
+            }
             setupSerialConnection();
         }
     }
@@ -1030,7 +1035,7 @@ private void checkFirmwareVersion() {
                 callbacks.missingFirmware();
                 setMode(MODE_BAD_FIRMWARE);
             }
-        }, 6000);
+        }, 30000);
     }
 
     private void initAfterESP32Connected() {
@@ -1461,6 +1466,9 @@ private void handleParsedCommand(byte cmd, byte[] param) {
         } else if (cmd == COMMAND_HELLO) {
             gotHello = true;
             audioTrack.stop();
+            if (callbacks != null) {
+                callbacks.radioModuleHandshake();
+            }
             restartAudioPrebuffer();
             checkFirmwareVersion();
         } else {

android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/ui/MainActivity.java

@@ -324,6 +324,13 @@ public void radioMissing() {
 
                 @Override
                 public void radioConnected() {
+                    hideSnackbar();
+                    applySettings();
+                    findViewById(R.id.pttButton).setClickable(true);
+                }
+
+                @Override
+                public void hideSnackbar() {
                     if (usbSnackbar != null) {
                         usbSnackbar.dismiss();
                         usbSnackbar = null;
@@ -336,8 +343,12 @@ public void radioConnected() {
                         radioModuleNotFoundSnackbar.dismiss();
                         radioModuleNotFoundSnackbar = null;
                     }
-                    applySettings();
-                    findViewById(R.id.pttButton).setClickable(true);
+
+                }
+
+                @Override
+                public void radioModuleHandshake() {
+                    showHandshakeSnackbar();
                 }
 
                 @Override
@@ -1726,6 +1737,21 @@ private void showUSBSnackbar() {
         usbSnackbar.show();
     }
 
+    private void showHandshakeSnackbar() {
+        CharSequence snackbarMsg = "kv4p HT radio handshake.";
+        usbSnackbar = Snackbar.make(this, findViewById(R.id.mainTopLevelLayout), snackbarMsg, Snackbar.LENGTH_INDEFINITE)
+            .setBackgroundTint(Color.rgb(20, 140, 0)).setActionTextColor(Color.WHITE).setTextColor(Color.WHITE)
+            .setAnchorView(findViewById(R.id.bottomNavigationView));
+
+        // Make the text of the snackbar larger.
+        TextView snackbarActionTextView = (TextView) usbSnackbar.getView().findViewById(com.google.android.material.R.id.snackbar_action);
+        snackbarActionTextView.setTextSize(20);
+        TextView snackbarTextView = (TextView) usbSnackbar.getView().findViewById(com.google.android.material.R.id.snackbar_text);
+        snackbarTextView.setTextSize(20);
+
+        usbSnackbar.show();
+    }
+
     private void showRadioModuleNotFoundSnackbar() {
         CharSequence snackbarMsg = "Radio module not responding to ESP32, check PCB solder joints";
         radioModuleNotFoundSnackbar = Snackbar.make(this, findViewById(R.id.mainTopLevelLayout), snackbarMsg, Snackbar.LENGTH_INDEFINITE)

microcontroller-src/kv4p_ht_esp32_wroom_32/kv4p_ht_esp32_wroom_32.ino

@@ -315,7 +315,7 @@ void loop() {
             while (result != 1) {
               result = dra->handshake();  // Wait for module to start up
               // Serial.println("handshake: " + String(result));
-
+              esp_task_wdt_reset();
               if ((micros() - waitStart) > 2000000) {  // Give the radio module 2 seconds max before giving up on it
                 radioModuleStatus = RADIO_MODULE_NOT_FOUND;
                 break;