Merge pull request #442 from drowe67/ms-freq-before-mode

Hamlib: Set mode before frequency.
drowe67 · Jun 18, 2023 · ee7a5b4 · ee7a5b4
2 parents 0d2aa64 + 3fb9509
commit ee7a5b4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 1 deletion.
diff --git a/USER_MANUAL.html b/USER_MANUAL.html
@@ -609,6 +609,7 @@ <h2 data-number="17.1" id="v1.8.12-tbd-2023"><span class="header-section-number"
 <li>Clear audio plots when recording or playback starts. (PR #439)</li>
 <li>Clear button now clears the callsign list. (PR #436)</li>
 <li>Fix bug causing the PTT button to stay red after the voice keyer finishes TX. (PR #440)</li>
+<li>Hamlib: set mode before frequency to avoid accidental offsetting. (PR #442)</li>
 </ul></li>
 <li>Build system:
 <ul>

diff --git a/USER_MANUAL.md b/USER_MANUAL.md
@@ -869,6 +869,7 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
     * Clear audio plots when recording or playback starts. (PR #439)
     * Clear button now clears the callsign list. (PR #436)
     * Fix bug causing the PTT button to stay red after the voice keyer finishes TX. (PR #440)
+    * Hamlib: set mode before frequency to avoid accidental offsetting. (PR #442)
 2. Build system:
     * Bump Codec2 version to v1.1.1. (PR #437)
 

diff --git a/USER_MANUAL.pdf b/USER_MANUAL.pdf
diff --git a/src/hamlib.cpp b/src/hamlib.cpp
@@ -375,8 +375,8 @@ void Hamlib::setFrequencyAndMode(uint64_t frequencyHz, bool analog)
     }
 
     vfo_t currVfo = getCurrentVfo_(); 
-    setFrequencyHelper_(currVfo, frequencyHz);
     setMode(analog);
+    setFrequencyHelper_(currVfo, frequencyHz);
 }
 
 void Hamlib::setModeHelper_(vfo_t currVfo, rmode_t mode)