From f618709d61fd5ada4822af1bd9eeb4f01ff53db5 Mon Sep 17 00:00:00 2001
From: c vw <dl1ycf@darc.de>
Date: Wed, 21 Aug 2024 10:01:37 +0200
Subject: [PATCH] Cherry-picked from master.

---
 src/radio.c  | 11 +++++------
 src/rigctl.c |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/radio.c b/src/radio.c
index 39e7afd2..fa669899 100644
--- a/src/radio.c
+++ b/src/radio.c
@@ -1043,7 +1043,8 @@ void radio_start_radio() {
 
   for (int id = 0; id < MAX_SERIAL; id++) {
     //
-    // Apply some default values
+    // Apply some default values. The name ttyACMx is suitable for
+    // USB-serial adapters on Linux
     //
     SerialPorts[id].enable = 0;
     SerialPorts[id].andromeda = 0;
@@ -1052,17 +1053,15 @@ void radio_start_radio() {
     snprintf(SerialPorts[id].port, sizeof(SerialPorts[id].port), "/dev/ttyACM%d", id);
   }
   //
-  // If the controller is G2_V2, enable first serial port for the
-  // built-in ANDROMEDA-type panel on /dev/ttyAMA3. This will not be done
-  // if compiled without GPIO support but then you can fill  in by hand
-  // in the rigctl menu.
+  // If the controller is G2_V2, enable last serial port for the
+  // built-in ANDROMEDA-type panel on /dev/ttyAMA1.
   //
   if (controller == G2_V2) {
     SerialPorts[MAX_SERIAL-1].enable = 1;
     SerialPorts[MAX_SERIAL-1].andromeda = 1;
     SerialPorts[MAX_SERIAL-1].baud = B9600;
     SerialPorts[MAX_SERIAL-1].autoreporting = 0;
-    snprintf(SerialPorts[MAX_SERIAL-1].port, sizeof(SerialPorts[MAX_SERIAL-1].port), "/dev/ttyAMA3");
+    snprintf(SerialPorts[MAX_SERIAL-1].port, sizeof(SerialPorts[MAX_SERIAL-1].port), "/dev/ttyAMA1");
   }
 
   protocol = radio->protocol;
diff --git a/src/rigctl.c b/src/rigctl.c
index 45076021..0268a9da 100644
--- a/src/rigctl.c
+++ b/src/rigctl.c
@@ -3262,7 +3262,7 @@ gboolean parse_extended_cmd (const char *command, CLIENT *client) {
           steps *= andromeda_vfo_speedup[31];
         }
 
-        vfo_id_step(active_receiver->id, -steps);
+        schedule_action(VFO, RELATIVE, -steps);
       }
 
       break;
@@ -4101,7 +4101,7 @@ gboolean parse_extended_cmd (const char *command, CLIENT *client) {
           steps *= andromeda_vfo_speedup[31];
         }
 
-        vfo_id_step(active_receiver->id, steps);
+        schedule_action(VFO, RELATIVE, steps);
       }
 
       break;