wip

Author: df7cb

src/callinput.c

@@ -60,7 +60,6 @@
 #include "nicebox.h"		// Includes curses.h
 #include "note.h"
 #include "printcall.h"
-#include "qrb.h"
 #include "qtcvars.h"		// Includes globalvars.h
 #include "qtcwin.h"
 #include "rtty.h"
@@ -714,13 +713,6 @@ int callinput(void) {
 		break;
 	    }
 
-	    // Ctrl-D (^D), rotate antenna "d"irection.
-	    case CTRL_D: {
-		rotate_to_qrb();
-
-		break;
-	    }
-
 	    // Ctrl-F (^F), change frequency dialog.
 	    case CTRL_F: {
 		change_freq();

src/keyer.c

@@ -35,6 +35,7 @@
 #include "keystroke_names.h"
 #include "netkeyer.h"
 #include "nicebox.h"		// Includes curses.h
+#include "qrb.h"
 #include "sendbuf.h"
 #include "speedupndown.h"
 #include "stoptx.h"
@@ -163,6 +164,13 @@ int handle_common_key(int key) {
 	    break;
 	}
 
+	// Ctrl-D (^D), rotate antenna "d"irection.
+	case CTRL_D: {
+	    rotate_to_qrb();
+
+	    break;
+	}
+
 	// Alt-0 to Alt-9 (M-0...M-9), send CW/Digimode messages 15-24.
 	case 128+'0' ... 128+'9': {
 	    int index = key - (128 + '0') + CQ_TU_MSG + 1;

src/main.c

@@ -357,16 +357,13 @@ int rig_comm_error = 0;
 int rig_comm_success = 0;
 
 /*-------------------------------------rotctl-------------------------------*/
-bool rot_control = false;
-int myrot_model = 0;            /* unset */
+bool rot_control;
+int myrot_model;		/* unset */
 char rotconf[80];
 ROT *my_rot;			/* handle to rotator (instance) */
 pthread_mutex_t tlf_rot_mutex = PTHREAD_MUTEX_INITIALIZER;
-int rot_serial_rate = 2400;
+int rot_serial_rate;
 char *rotportname;
-int rotnumber = 0;
-int rot_comm_error = 0;
-int rot_comm_success = 0;
 
 /*----------------------------------fldigi---------------------------------*/
 char fldigi_url[50] = "http://localhost:7362/RPC2";
@@ -677,6 +674,11 @@ static void init_variables() {
     rig_mode_sync = true;
     use_bandoutput = false;
 
+    /* rotctl */
+    rot_control = false;
+    myrot_model = 0; /* unset */
+    rot_serial_rate = 2400;
+
     lan_active = false;
     thisnode = 'A';
     lan_port = 6788;
@@ -842,8 +844,8 @@ static void hamlib_rot_init() {
 	    endwin();
 	    exit(1);
 	}
-	trx_control = false;
-	trx_control_disabled = true;
+	rot_control = false;
+	rot_control_disabled = true;
 	showmsg("Disabling rotator control!");
 	sleep(1);
     }

src/qrb.c

@@ -22,7 +22,7 @@
 #include "err_utils.h"
 #include "getctydata.h"
 #include "globalvars.h"
-#include "startmsg.h"
+#include "showmsg.h"
 #include "qrb.h"
 
 static int parse_rotconf();
@@ -99,28 +99,63 @@ int init_tlf_rot(void) {
     return 0;
 }
 
+double get_rotator_bearing() {
+    int retcode;
+    azimuth_t azimuth;
+    elevation_t elevation; /* ignored */
+
+    if (! rot_control)
+        return 0.0;
+
+    pthread_mutex_lock(&tlf_rot_mutex);
+    retcode = rot_get_position(my_rot, &azimuth, &elevation);
+    pthread_mutex_unlock(&tlf_rot_mutex);
+
+    if (retcode != RIG_OK) {
+        TLF_LOG_WARN("Rotator get position error: %s", rigerror(retcode));
+    }
+
+    return azimuth;
+}
+
 void rotate_to_qrb() {
     double bearing;
     double range;
     int retcode;		/* generic return code from functions */
     int pfx_index = getctydata_pfx(current_qso.call);
-
     prefix_data *pfx = prefix_by_index(pfx_index);
 
-    if (pfx->dxcc_ctynr > 0) {
+    if (! rot_control)
+        return;
 
-	if (pfx_index != my.countrynr && 0 == get_qrb(&range, &bearing)) {
+    if (pfx->dxcc_ctynr <= 0)
+        return; /* unknown country */
+    if (pfx->dxcc_ctynr == my.countrynr)
+        return; /* rotating to own country does not make much sense */
 
-	    pthread_mutex_lock(&tlf_rot_mutex);
-	    retcode = rot_set_position(my_rot, bearing, 0.0); // azimuth, elevation
-	    pthread_mutex_unlock(&tlf_rot_mutex);
+    if (get_qrb(&range, &bearing) == RIG_OK) {
+        pthread_mutex_lock(&tlf_rot_mutex);
+        retcode = rot_set_position(my_rot, bearing, 0.0); // azimuth, elevation
+        pthread_mutex_unlock(&tlf_rot_mutex);
 
-	    if (retcode != RIG_OK) {
-		TLF_LOG_WARN("Problem with setting rotator position: %s", rigerror(retcode));
-	    } else {
-		showmsg("Rotator set position ok!");
-	    }
-	}
+        if (retcode != RIG_OK) {
+            TLF_LOG_WARN("Problem with setting rotator position: %s", rigerror(retcode));
+        }
+    }
+}
+
+void stop_rotator() {
+    int retcode;
+
+    if (! rot_control)
+        return;
+
+    pthread_mutex_lock(&tlf_rot_mutex);
+    retcode = rot_stop(my_rot);
+    pthread_mutex_unlock(&tlf_rot_mutex);
+
+    if (retcode != RIG_OK) {
+        TLF_LOG_WARN("Rotator stop error: %s", rigerror(retcode));
     }
 }
 

src/qrb.h

@@ -29,7 +29,9 @@ int get_qrb(double *range, double *bearing);
 bool get_qrb_for_locator(const char *locator, double *range, double *bearing);
 
 int init_tlf_rot(void);
+double get_rotator_bearing();
 void rotate_to_qrb();
+void stop_rotator();
 void close_tlf_rot(ROT *my_rot);
 
 #endif /* end of include guard: QRB_H */

src/stoptx.c

@@ -29,12 +29,15 @@
 #include "globalvars.h"
 #include "hamlib_keyer.h"
 #include "netkeyer.h"
+#include "qrb.h"
 #include "tlf.h"
 #include "tlf_curses.h"
 
 #include "fldigixmlrpc.h"
 
 int stoptx(void) {
+    /* whenever TX is stopped, stop rotator as well */
+    stop_rotator();
 
     if (digikeyer == FLDIGI && trxmode == DIGIMODE) {
 	fldigi_to_rx();

test/test_rules.c

@@ -1178,6 +1178,10 @@ or abort sending by pressing the
 key.
 .
 .TP
+.B Ctrl-D
+Rotate antenna towards the country of the current call ("direction"), if a rotator is configured.
+.
+.TP
 .B Ctrl-E
 End modem capture for RTTY mode in QTC window (started with
 .BR Ctrl-S ).