enhancements

sstjohn · May 18, 2022 · afedb9d · afedb9d
1 parent dfa9138
commit afedb9d
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 24 deletions.
diff --git a/qinj/qinj.cpp b/qinj/qinj.cpp
@@ -1,4 +1,7 @@
+#include <cstdlib>
 #include <QThread>
+#include <QString>
+#include <QScreen>
 #include <QApplication>
 #include <QLabel>
 #include "qinj.h"
@@ -16,18 +19,39 @@ Injection::Injection(QObject *parent) : QObject(parent)
 	this->threadMovedConnection = connect(QThread::currentThread(),
 		SIGNAL(injectionThreadMoved(QThread *)),
 		this,
-		SLOT(onInjectionThreadMoved(QThread *))
+		SLOT(injectionThreadMoved(QThread *))
 	);
 }
 
-void Injection::onInjectionThreadMoved(QThread *newThread)
+const char *Injection::getTestText()
+{
+	const char *retVal = std::getenv("QINJ_TEXT");
+	if (!retVal)
+		retVal = "TEST";
+	return retVal;
+}
+
+bool Injection::screenshotRequested(QString filename)
+{
+	QScreen *screen = QApplication::primaryScreen();
+	if (!screen)
+		return false;
+
+	QPixmap pixmap = screen->grabWindow(0);
+	if (!pixmap)
+		return false;
+
+	return pixmap.save(filename);
+}
+
+void Injection::injectionThreadMoved(QThread *newThread)
 {
 	QWidget *topLevelWidget = QApplication::topLevelWidgets().back();
 	this->setParent(topLevelWidget);
 
 	this->lblTxf = topLevelWidget->findChild<QLabel *>("labelFullbandTxe");
 	if (this->lblTxf) {
-		this->lblTxf->setText("TEST");
+		this->lblTxf->setText(this->getTestText());
 		this->lblTxf->show();
 	}
 
@@ -69,9 +93,12 @@ void initialize()
 {
 	if (!__initialized) {
 		__initialized = true;
+		bool iPythonWanted = NULL != std::getenv("QINJ_CONSOLE");
 		injectionThread = new InjectionThread();
 		injectionThread->start();
-		iPythonThread = new IPythonThread();
-		iPythonThread->start();
+		if(iPythonWanted) {
+			iPythonThread = new IPythonThread();
+			iPythonThread->start();
+		}
 	}
 }
diff --git a/qinj/qinj.h b/qinj/qinj.h
@@ -3,6 +3,8 @@
 
 #include <QTimer>
 #include <QThread>
+#include <QString>
+#include <QScreen>
 #include <QLabel>
 #include <QApplication>
 
@@ -31,12 +33,14 @@ class Injection : public QObject
 	QMetaObject::Connection threadMovedConnection;
 	QLabel *lblTxf = 0;
 	QTimer *tmrTestFlash = 0;
+	const char *getTestText();
 
 public: 
         Injection(QObject *parent = 0);
 
 public Q_SLOTS:
-	void onInjectionThreadMoved(QThread *newThread);
+	void injectionThreadMoved(QThread *newThread);
 	void testFlashTimerExpired();
+	bool screenshotRequested(QString);
 };
 #endif
diff --git a/spotter-loop.py b/spotter-loop.py
@@ -24,6 +24,7 @@
 from queue import Queue
 import os
 from random import choice
+from subprocess import Popen
 import sys
 from threading import Thread
 from time import sleep
@@ -40,50 +41,41 @@
 BANDS = {
   "160": {
      "frequency": 1836600,
-     "enabled": True
   },
   "80": {
      "frequency": 3568600,
-     "enabled": True
   },
   "60": {
      "frequency": 5287200,
-     "enabled": True
   },
   "40": {
      "frequency": 7038600,
-     "enabled": True
   },
   "30": {
      "frequency": 10138700,
-     "enabled": True
   },
   "20": {
      "frequency": 14095600,
-     "enabled": True
   },
   "17": {
      "frequency": 18104600,
-     "enabled": True
   },
   "15": {
      "frequency": 21094600,
-     "enabled": True
   },
   "12": {
      "frequency": 24924600,
-     "enabled": True
   },
   "10": {
      "frequency": 28124600,
-     "enabled": True
   },
   "6": {
      "frequency": 50293000,
-     "enabled": True
   }
 }
 
+ALL_BAND_DEFAULTS = {'enabled': True}
+
 HOPPING_SCHEDULE = ["160", "80", "60", "40", "30", "20", "17", "15", "12", "10"] * 3
 
 DATA_DIR="/root"
@@ -107,6 +99,8 @@ def check_setup(retry=False):
         return False
     if os.path.exists(f"{DATA_DIR}/.spotter.conf"):
         user_conf = json.load(open(f"{DATA_DIR}/.spotter.conf", "r"))
+        if "ALL_BAND_DEFAULTS" in user_conf:
+            ALL_BAND_DEFAULTS.update(user_conf["ALL_BAND_DEFAULTS"])
     else:
         user_conf = {}
     for i in ("CALL", "GRID"):
@@ -133,21 +127,34 @@ def redirect_qt_app():
         os.mknod("/dev/ttyS2", tnt0_stat.st_mode, newdev)
 
         if os.path.exists("/etc/init.d/S99userappstart"):
-            os.system("/etc/init.d/S99userappstart restart")
+            os.system("/etc/init.d/S99userappstart stop")
         elif os.path.exists("/etc/init.d/S99-1-monit"):
-            os.system("monit restart x6100_ui_v100")
+            os.system("monit stop x6100_ui_v100")
         else:
             print("Don't know how to restart QT app.")
-        sleep(10)
+            exit(1)
+
+        sleep(1)    
+        ui_proc = Popen(["/usr/app_qt/x6100_ui_v100"], env=dict(os.environ, **{
+                "QINJ_TEXT": "WSPR",
+                "LD_PRELOAD": "libqinj.so.1.0.0"
+        }))
+        sleep(5)
 
         yield None
 
     finally:
+        ui_proc.terminate()
+        try:
+            ui_proc.wait(5)
+        except TimeoutError:
+            ui_proc.kill()
+
         os.rename("/dev/ttyS2.old", "/dev/ttyS2")
         if os.path.exists("/etc/init.d/S99userappstart"):
-            os.system("/etc/init.d/S99userappstart restart")
+            os.system("/etc/init.d/S99userappstart start")
         else:
-            os.system("monit restart x6100_ui_v100")
+            os.system("monit start x6100_ui_v100")
 
 
 @contextmanager
@@ -166,13 +173,22 @@ def get_rig():
 def hop_bands(rig):
     schedule_index = ceil(datetime.utcnow().minute / 2.0) % 30
     chosen_band = HOPPING_SCHEDULE[schedule_index]
-    if not BANDS[chosen_band]['enabled']:
+    band_params = dict(ALL_BAND_DEFAULTS, **BANDS[chosen_band])
+    if not band_params['enabled']:
         chosen_band = choice(list(filter(lambda b: BANDS[b]["enabled"], BANDS)))
 
     print(f"hopping to {chosen_band}m band ({BANDS[chosen_band]['frequency']}c)")
 
     rig.set_mode(4, 700)
     rig.set_freq(Hamlib.RIG_VFO_A, BANDS[chosen_band]["frequency"])
+    rig.set_level("AF", 0.0)
+    rig.set_level("AGC", 2)
+    rig.set_level("ATT", 1 if band_params.get("attenuator") else 0)
+    rig.set_level("PREAMP", 10 if band_params.get("preamp") else 0)
+    rig.set_level("RF", (1 + band_params.get("gain", 50)) / 100)
+
+
+
 
 
 def decode_thread_main(recordings_queue):
@@ -190,7 +206,7 @@ def upload_spots(recording=None, spotfile="wspr_spots.txt"):
         print("no spots")
         return True
     files = {'allmept': open(f"{DATA_DIR}/{spotfile}", 'r')}
-    params = {'call': CALL, 'grid': GRID, 'version': 'x6w-0.2.1'}
+    params = {'call': CALL, 'grid': GRID, 'version': 'x6w-0.7.1'}
     response = None
     try:
         response = requests.post('http://wsprnet.org/post', files=files, params=params)