Added support for compression

install-client.sh

@@ -1,3 +1,5 @@
+sudo systemctl stop yags
+
 apt update
 apt upgrade -y
 
@@ -14,7 +16,7 @@ git clone https://github.com/nanomsg/nng.git
 cd nng
 mkdir build && cd build
 cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr ..
-make -j4
+make
 make install
 cd ../..
 rm -rf nng
@@ -24,7 +26,7 @@ git clone https://github.com/altillimity/satdump.git
 cd satdump
 mkdir build && cd build
 cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=OFF -DCMAKE_INSTALL_PREFIX=/usr ..
-make -j`nproc`
+make
 
 make install
 
@@ -63,3 +65,14 @@ ldconfig
 
 cd ../..
 rm -rf SDRPlusPlus
+
+## install YAGS client
+cd station
+
+sudo make install
+
+#sudo chmod -R 777 /YAGS/records/
+#sudo chmod -R 777 /YAGS/artefacts/
+
+sudo systemctl enable yags
+sudo systemctl start yags

station/Makefile

@@ -1,5 +1,7 @@
 install:
 	apt install -f libopenblas-dev
+	apt install -f imagemagick
+
 	pip3 install matplotlib
 	pip3 install numpy
 	pip3 install pyorbital
@@ -11,8 +13,18 @@ install:
 	cp tools/cw_morse.py /usr/local/bin/
 	chmod +x /usr/local/bin/cw_morse.py
 
+	useradd yags || echo "user yags already exists SKIP"
+	mkdir /home/yags/ || echo "home for user yags already exists SKIP"
+	adduser yags dialout || echo "user yags already in dialout SKIP"
+	adduser yags plugdev || echo "user yags already in plugdev SKIP"
+
 	rm -rf /YAGS
 	mkdir /YAGS
 	sudo cp -r * /YAGS/
 	cp -f yags.service /etc/systemd/system/
-        systemctl daemon-reload
+
+	chown -R yags:yags /YAGS/
+	chown -R yags:yags /home/yags/
+
+	systemctl daemon-reload
+

station/config.py

@@ -1,5 +1,24 @@
+##
+# Config of upstream YAGS server
+#
 masterUrl      = "http://10.0.0.8"
 apiKey         = "d0ec2b81-601b-481a-bde9-4e6699fd9297"
+
+##
+# Intervals for pulling (getting from YAGS server) and palning
+#
 pullInterval   = 120  # in sec
 planInterval   = 1200 # in sec
-MaxUploadChunk = 5000000 # in bytes
+
+##
+# Chunk upload config
+#
+MaxUploadChunk = 5000000 # in bytes
+
+##
+# Compression
+#
+# compress convert all png to jpg and compress all .s8 to .tar.xz
+#
+compress       = True # compress artifacts
+compressJpgQ   = 70 # quality of compresses JPG

station/puller.py

@@ -63,7 +63,11 @@ def setDecoding(observation):
 def setSuccess(observation):
     apiSend("/api/observation/success", {"id": observation})
 
-def read_in_chunks(file_object, chunk_size=5000000):
+def read_in_chunks(file_object, chunk_size=None):
+
+    if chunk_size is None:
+        chunk_size = config.MaxUploadChunk
+
     while True:
         data = file_object.read(chunk_size)
         if not data:

station/recorder.py

@@ -98,6 +98,15 @@ class recorder(threading.Thread):
 
         puller.setSuccess(self.job["id"])
 
+        # compress artifacts
+        if config.compress:
+            logger.debug("Compressing artifacts")
+
+            os.system("find " + adir + " -name '*.png' -exec mogrify -format jpg -quality " + str(config.compressJpgQ) + " {} +")
+            os.system(f"rm -f {adir}/*.png")
+            os.system(f"tar -czvf {adir}/baseband.tar.gz {adir}/*.s8")
+            os.system(f"rm -f {adir}/*.s8")
+
         logger.debug("Starting upload of artifacts")
 
         if not puller.setArtefacts(adir, self.job["id"]):

station/rotator.py

@@ -3,6 +3,8 @@ from pyorbital.orbital import Orbital
 from datetime import datetime, timedelta
 import time
 
+from loguru import logger
+
 class rotator(threading.Thread):
     def __init__(self, driver, job, station):
         threading.Thread.__init__(self)
@@ -12,7 +14,7 @@ class rotator(threading.Thread):
         self.killed = False
  
     def run(self):
-        print("[INFO] Starting rotator service")
+        logger.debug("Starting rotator service")
 
         self.driver.reset()
         time.sleep(30)
@@ -29,7 +31,7 @@ class rotator(threading.Thread):
             )
             az, el = round(az), round(el)
             
-            print(f"[INFO] rotator az: {az}, el: {el}")
+            logger.debug(f"rotator for {self.job} az: {az}, el: {el}")
 
             self.driver.set_azel(az, el)
             

station/tools/baseband_spectogram.py

@@ -29,6 +29,8 @@ if __name__ == '__main__':
     Fc            = args.centralFreq
     num_rows      = len(data) // fft_size // sampleSize
 
+    num_samples   = len(data) // sampleSize
+
     # ok compute how many data to one row
     num_rows_real = 1024
     if num_rows < num_rows_real:
@@ -43,7 +45,9 @@ if __name__ == '__main__':
         subdata = subdata[1::2] + 1j * subdata[0::2] # convert to complex
         DC_PART += np.sum(subdata)
 
-    DC_PART /= num_rows * fft_size
+    DC_PART /= num_samples
+
+    print(f"DC part is {DC_PART}")
 
     abstract_rows_per_row = int(num_rows / num_rows_real)
     
@@ -74,4 +78,4 @@ if __name__ == '__main__':
     plt.imshow(spectrogram, cmap=plt.get_cmap('winter'), aspect='auto', extent = [sample_rate/-2/1e6 + Fc/1e6, sample_rate/2/1e6 + Fc/1e6, 0, len(data)/sample_rate], vmin=0, vmax=np.max(spectrogram))
     plt.xlabel("Frequency [MHz]")
     plt.ylabel("Time [s]")
-    plt.savefig(args.output_file) 
+    plt.savefig(args.output_file) 

station/yags.service

@@ -3,6 +3,8 @@ Description=YAGS ground station client
 After=syslog.target network.target
 
 [Service]
+User=yags
+Group=yags
 WorkingDirectory=/YAGS/
 ExecStart=/usr/bin/python3 main.py