diff --git a/.github/workflows/arduino.yml b/.github/workflows/arduino.yml index e1598bd5..8f2901b3 100644 --- a/.github/workflows/arduino.yml +++ b/.github/workflows/arduino.yml @@ -30,5 +30,5 @@ 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 verbose: true diff --git a/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/radio/RadioAudioService.java b/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/radio/RadioAudioService.java index 089dc26c..d2816817 100644 --- a/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/radio/RadioAudioService.java +++ b/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/radio/RadioAudioService.java @@ -182,8 +182,8 @@ public class RadioAudioService extends Service { private static final float UHF_MIN_FREQ = 400.0f; // DRA818U lower limit, in MHz private static float min70cmTxFreq = 420.0f; // US 70cm band lower limit, in MHz (will be overwritten by user setting) - private static float max70cmTxFreq = 450.0f; // US 70cm band upper limit, in MHz (will be overwritten by user setting) - private static final float UHF_MAX_FREQ = 470.0f; // DRA818U upper limit, in MHz + private static float max70cmTxFreq = 480.0f; // US 70cm band upper limit, in MHz (will be overwritten by user setting) + private static final float UHF_MAX_FREQ = 480.0f; // DRA818U upper limit, in MHz private String activeFrequencyStr = null; private int squelch = 0; diff --git a/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/ui/SettingsActivity.java b/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/ui/SettingsActivity.java index c0fd8f11..ade12884 100644 --- a/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/ui/SettingsActivity.java +++ b/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/ui/SettingsActivity.java @@ -143,6 +143,7 @@ private void populateMaxFrequencies() { List max70cmFreqs = new ArrayList(); max70cmFreqs.add("450MHz"); max70cmFreqs.add("440MHz"); + max70cmFreqs.add("480MHz"); ArrayAdapter arrayAdapter2 = new ArrayAdapter(this, R.layout.dropdown_item, max70cmFreqs); max70cmFreqTextView.setAdapter(arrayAdapter2); diff --git a/microcontroller-src/kv4p_ht_esp32_wroom_32/kv4p_ht_esp32_wroom_32.ino b/microcontroller-src/kv4p_ht_esp32_wroom_32/kv4p_ht_esp32_wroom_32.ino index f4d645da..0ca1e5c2 100644 --- a/microcontroller-src/kv4p_ht_esp32_wroom_32/kv4p_ht_esp32_wroom_32.ino +++ b/microcontroller-src/kv4p_ht_esp32_wroom_32/kv4p_ht_esp32_wroom_32.ino @@ -309,9 +309,9 @@ void loop() { paramBytesMissing--; } if (paramsStr.charAt(0) == 'v') { - dra = new DRA818(&Serial2, DRA818_VHF); + dra = new DRA818(&Serial2, SA818_VHF); } else if (paramsStr.charAt(0) == 'u') { - dra = new DRA818(&Serial2, DRA818_UHF); + dra = new DRA818(&Serial2, SA818_UHF); } else { // Unexpected. } diff --git a/microcontroller-src/platformio.ini b/microcontroller-src/platformio.ini index 2cc824d1..e3d9120c 100644 --- a/microcontroller-src/platformio.ini +++ b/microcontroller-src/platformio.ini @@ -21,5 +21,5 @@ build_flags = -DARDUINO_EVENT_RUNNING_CORE=0 lib_deps = ; fatpat/DRA818@^1.0.1 - https://github.com/fatpat/arduino-dra818.git#v1.0.1 ; v1.0.1 is the latest release, but has not been pushed to registry. Update later + https://github.com/fatpat/arduino-dra818.git plerup/EspSoftwareSerial@^8.2.0 \ No newline at end of file