From 9f997d799d7c132b5d7c0d18f85785bad5141595 Mon Sep 17 00:00:00 2001
From: George Baltz N3GB <GeoBaltz@gmail.com>
Date: Thu, 28 Mar 2024 16:26:21 -0400
Subject: [PATCH] Fix incorrect port read for elevation

Add missing port parameters for rotp2
Remove funky character(^B) from simrotorez.c so `file` and `more` think it
  is plain text.

Dunno if this works on the real H/W, but at least the simulator can get
  and set az/el position without errors.
---
 rotators/rotorez/rotorez.c |  2 +-
 simulators/simrotorez.c    |  2 +-
 src/rotator.c              | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/rotators/rotorez/rotorez.c b/rotators/rotorez/rotorez.c
index ec4e559ca..819675870 100644
--- a/rotators/rotorez/rotorez.c
+++ b/rotators/rotorez/rotorez.c
@@ -667,7 +667,7 @@ static int rotorez_rot_get_position(ROT *rot, azimuth_t *azimuth,
 
             //TODO: Should this be rotp or rotp2????
             //err = read_block(&rs->rotport, (unsigned char *) az, AZ_READ_LEN);
-            err = read_block(rotp, (unsigned char *) az, AZ_READ_LEN);
+            err = read_block(rotp2, (unsigned char *) az, AZ_READ_LEN);
 
             if (err != AZ_READ_LEN)
             {
diff --git a/simulators/simrotorez.c b/simulators/simrotorez.c
index aa1ebc6ea..95f21262f 100644
--- a/simulators/simrotorez.c
+++ b/simulators/simrotorez.c
@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
     int flag = 0;
 
     while (1)
-    {
+    {
         int bytes;
         if (!flag) bytes = getmyline(fd, buf);
         else bytes = getmyline(fd2, buf);
diff --git a/src/rotator.c b/src/rotator.c
index 166fe7a6a..5dd492b18 100644
--- a/src/rotator.c
+++ b/src/rotator.c
@@ -266,12 +266,12 @@ ROT *HAMLIB_API rot_init(rot_model_t rot_model)
     rotp2 = ROTPORT2(rot);
     
     rs->comm_state = 0;
-    rotp->type.rig = caps->port_type; /* default from caps */
+    rotp->type.rig = rotp2->type.rig = caps->port_type; /* default from caps */
 
-    rotp->write_delay = caps->write_delay;
-    rotp->post_write_delay = caps->post_write_delay;
-    rotp->timeout = caps->timeout;
-    rotp->retry = caps->retry;
+    rotp->write_delay = rotp2->write_delay = caps->write_delay;
+    rotp->post_write_delay = rotp2->post_write_delay = caps->post_write_delay;
+    rotp->timeout = rotp2->timeout = caps->timeout;
+    rotp->retry = rotp2->retry = caps->retry;
 
     switch (caps->port_type)
     {