spacelab-ufsc · mgm8 · May 19, 2024 · May 18, 2024 · May 18, 2024 · May 18, 2024
diff --git a/README.md b/README.md
@@ -35,26 +35,25 @@ SpaceLab Packet Decoder is a software to decode audio records from the satellite
 Until now, this program supports the satellites below:
 
 * FloripaSat-1 (launched in December 2019)
-* FloripaSat-2 (to be launched on 2022)
+* GOLDS-UFSC (to be launched on 2025)
 * Aldebaran-1 (to be launched on TBC)
+* Catarina-A1 (to be launched on 2025)
 
 ## Dependencies
 
 * python (>= 3)
 * gi
 * scipy
-* pyzmq
 * matplotlib
-* gnuradio
 * pyngham
 
 ### Installation on Ubuntu
 
-```sudo apt install python3 python3-gi python3-scipy python3-zmq python3-matplotlib gnuradio```
+```sudo apt install python3 python3-gi python3-scipy python3-matplotlib```
 
 ### Installation on Fedora
 
-```sudo dnf install python3 python3-gobject python3-scipy python3-zmq python3-matplotlib gnuradio```
+```sudo dnf install python3 python3-gobject python3-scipy python3-matplotlib```
 
 ## Building and Installing
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -18,11 +18,11 @@
 # -- Project information -----------------------------------------------------
 
 project = 'spacelab-decoder'
-copyright = '2021, Universidade Federal de Santa Catarina'
+copyright = 'The SpaceLab-Decoder Contributors'
 author = 'Gabriel Mariano Marcelino'
 
 # The full version, including alpha/beta/rc tags
-release = "0.3"
+release = "0.4"
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/docs/img/main-window.png b/docs/img/main-window.png
diff --git a/docs/index.rst b/docs/index.rst
@@ -14,8 +14,5 @@ Overview
    :maxdepth: 3
 
    overview
-   installation
-   telecommands_decoding
    logfile
    packaging
-   implementation
diff --git a/docs/logfile.rst b/docs/logfile.rst
@@ -4,12 +4,9 @@ Logging System
 
 The Logging System of the Spacelab Decoder shows the events performed in the software - such as when a telecommand was decoded - and their respective date and time. 
 
-
 Operation
 #########
 
 The logfile is automatically generated inside a default folder in the user home page in the archives called "spacelab_decoder", but in the preferences of the software the user can choose in which folder to save the file.
 
 The generated archive is a .csv file displaying date and time on one column and the event on the other one. The event can be a successfull decoding, an error or even the software startup. 
-
-
diff --git a/docs/packaging.rst b/docs/packaging.rst
@@ -21,9 +21,9 @@ To generate an RPM package, follow the instructions below:
 ::
 
     %define name spacelab_decoder
-    %define version 0.3.0
-    %define unmangled_version 0.3.0
-    %define unmangled_version 0.3.0
+    %define version 0.4.0
+    %define unmangled_version 0.4.0
+    %define unmangled_version 0.4.0
     %define release 1
 
     %global debug_package %{nil}

diff --git a/docs/telecommands_decoding.rst b/docs/telecommands_decoding.rst
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,4 @@
 PyGObject
 scipy
-pyzmq
 matplotlib
 pyngham
diff --git a/setup.cfg b/setup.cfg
@@ -1,4 +1,4 @@
 [bdist_rpm]
 packager = Gabriel Mariano Marcelino <gabriel.mm8@gmail.com>
 force_arch = x86_64
-requires = python3, python3-gobject, python3-scipy, python3-zmq, python3-matplotlib, gnuradio
+requires = python3, python3-gobject, python3-scipy, python3-matplotlib
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 #
 #  setup.py
 #  
-#  Copyright (C) 2021, Universidade Federal de Santa Catarina
+#  Copyright The SpaceLab-Decoder Contributors.
 #  
 #  This file is part of SpaceLab-Decoder.
 #
@@ -66,7 +66,7 @@
         ],
     download_url                    = "https://github.com/spacelab-ufsc/spacelab-decoder/releases",
     packages                        = setuptools.find_packages(),
-    install_requires                = ['gi','scipy','pyzmq','matplotlib','pyngham'],
+    install_requires                = ['gi','scipy','matplotlib','pyngham'],
     entry_points                    = {
         'gui_scripts': [
             'spacelab-decoder = spacelab_decoder.__main__:main'
@@ -78,8 +78,10 @@
         ('share/spacelab_decoder/', ['spacelab_decoder/data/ui/spacelab_decoder.glade']),
         ('share/spacelab_decoder/', ['spacelab_decoder/data/img/spacelab-logo-full-400x200.png']),
         ('share/spacelab_decoder/', ['spacelab_decoder/data/satellites/floripasat-1.json']),
-        ('share/spacelab_decoder/', ['spacelab_decoder/data/satellites/floripasat-2.json']),
+        ('share/spacelab_decoder/', ['spacelab_decoder/data/satellites/golds-ufsc.json']),
         ('share/spacelab_decoder/', ['spacelab_decoder/data/satellites/aldebaran-1.json']),
+        ('share/spacelab_decoder/', ['spacelab_decoder/data/satellites/spacelab-transmitter.json']),
+        ('share/spacelab_decoder/', ['spacelab_decoder/data/satellites/catarina-a1.json']),
         ],
     cmdclass                        = {'build_sphinx': BuildDoc},
 )
diff --git a/spacelab_decoder/data/satellites/aldebaran-1.json b/spacelab_decoder/data/satellites/aldebaran-1.json
@@ -3,6 +3,9 @@
     "links": [
         {
             "name": "Beacon",
+            "baudrate": 1200,
+            "sync_word": [93, 230, 42, 126],
+            "protocol": "NGHam",
             "types": [
                 {
                     "name": "OBDH",