From 341a205bd7e5765e64a2e5f35ed2264b2cf9e6e2 Mon Sep 17 00:00:00 2001
From: George Baltz N3GB <GeoBaltz@gmail.com>
Date: Thu, 13 Jun 2024 15:17:29 -0400
Subject: [PATCH] Revert "Fix rotorez set_conf in both rotctl and rotctld --
 since it needs to be done after rot_open"

This reverts commit 1557ad70f752f7217c1eff963af1a1f3c4f96026.
---
 tests/rotctl.c  | 31 +------------------------------
 tests/rotctld.c | 32 +-------------------------------
 2 files changed, 2 insertions(+), 61 deletions(-)

diff --git a/tests/rotctl.c b/tests/rotctl.c
index 331af4c5f..767cb4eaa 100644
--- a/tests/rotctl.c
+++ b/tests/rotctl.c
@@ -341,8 +341,7 @@ int main(int argc, char *argv[])
 
     char *token = strtok(conf_parms, ",");
 
-    // ROTOREZ set_conf needs to be done after rot_open
-    while (token && my_rot->caps->rot_model != ROT_MODEL_ROTOREZ)
+    while (token)
     {
         char mytoken[100], myvalue[100];
         hamlib_token_t lookup;
@@ -407,34 +406,6 @@ int main(int argc, char *argv[])
         exit(2);
     }
 
-    // ROTOREZ set_conf needs to be done after rot_open
-    while (token && my_rot->caps->rot_model == ROT_MODEL_ROTOREZ)
-    {
-        char mytoken[100], myvalue[100];
-        hamlib_token_t lookup;
-        sscanf(token, "%99[^=]=%99s", mytoken, myvalue);
-        //printf("mytoken=%s,myvalue=%s\n",mytoken, myvalue);
-        lookup = rot_token_lookup(my_rot, mytoken);
-
-        if (lookup == 0)
-        {
-            rig_debug(RIG_DEBUG_ERR, "%s: no such token as '%s', use -L switch to see\n",
-                      __func__, mytoken);
-            token = strtok(NULL, ",");
-            continue;
-        }
-
-        retcode = rot_set_conf(my_rot, rot_token_lookup(my_rot, mytoken), myvalue);
-
-        if (retcode != RIG_OK)
-        {
-            fprintf(stderr, "Config parameter error: %s\n", rigerror(retcode));
-            exit(2);
-        }
-
-        token = strtok(NULL, ",");
-    }
-
     /*
      * Print out capabilities, and exits immediately as we may be interested
      * only in caps, and rig_open may fail.
diff --git a/tests/rotctld.c b/tests/rotctld.c
index 70ceca16c..0ec26c98f 100644
--- a/tests/rotctld.c
+++ b/tests/rotctld.c
@@ -347,8 +347,7 @@ int main(int argc, char *argv[])
 
     char *token = strtok(conf_parms, ",");
 
-    // ROTOREZ set_conf needs to be done after rot_open
-    while (token && my_rot->caps->rot_model != ROT_MODEL_ROTOREZ)
+    while (token)
     {
         char mytoken[100], myvalue[100];
         hamlib_token_t lookup;
@@ -418,35 +417,6 @@ int main(int argc, char *argv[])
         exit(2);
     }
 
-    // ROTOREZ set_conf needs to be done after rot_open
-    while (token && my_rot->caps->rot_model == ROT_MODEL_ROTOREZ)
-    {
-        char mytoken[100], myvalue[100];
-        hamlib_token_t lookup;
-        sscanf(token, "%99[^=]=%99s", mytoken, myvalue);
-        //printf("mytoken=%s,myvalue=%s\n",mytoken, myvalue);
-        lookup = rot_token_lookup(my_rot, mytoken);
-
-        if (lookup == 0)
-        {
-            rig_debug(RIG_DEBUG_ERR, "%s: no such token as '%s', use -L switch to see\n",
-                      __func__, mytoken);
-            token = strtok(NULL, ",");
-            continue;
-        }
-
-        retcode = rot_set_conf(my_rot, rot_token_lookup(my_rot, mytoken), myvalue);
-
-        if (retcode != RIG_OK)
-        {
-            fprintf(stderr, "Config parameter error: %s\n", rigerror(retcode));
-            exit(2);
-        }
-
-        token = strtok(NULL, ",");
-    }
-
-
     my_rot->state.az_offset = az_offset;
     my_rot->state.el_offset = el_offset;