NASA Docket No. GSC-19,200-1, and identified as "cFS Draco"

Batch update of latest cFS software release

Author: jphickey

GroundSystem.py

@@ -24,6 +24,7 @@
 import os
 import signal
 import pathlib
+import getpass
 
 from PyQt5.QtWidgets import QApplication, QMainWindow, QMessageBox
 
@@ -163,7 +164,7 @@ def set_cmd_offsets(self):
     def save_offsets(self):
         offsets = bytes((self.sb_tlm_offset.value(), self.sb_cmd_offset_pri.value(),
                          self.sb_cmd_offset_sec.value()))
-        with open("/tmp/OffsetData", "wb") as f:
+        with open(f"/tmp/OffsetData-{getpass.getuser()}", "wb") as f:
             f.write(offsets)
 
     # Update the combo box list in gui

RoutingService.py

@@ -25,8 +25,10 @@
 import zmq
 from PyQt5.QtCore import QThread, pyqtSignal
 
+import getpass
+
 # Receive port where the CFS TO_Lab app sends the telemetry packets
-udp_recv_port = 1235
+udp_recv_port = 2234
 
 
 #
@@ -51,7 +53,7 @@ def __init__(self):
         # Init zeroMQ
         self.context = zmq.Context()
         self.publisher = self.context.socket(zmq.PUB)
-        self.publisher.bind("ipc:///tmp/GroundSystem")
+        self.publisher.bind(f"ipc:///tmp/GroundSystem-{getpass.getuser()}")
 
     # Run thread
     def run(self):

Subsystems/Commands-Telemetry.md

@@ -3,8 +3,9 @@
 ## Telemetry ( tlmGUI/ directory ):
 Telemetry is sent from the running cFE/CFS as CCSDS telemetry packets encapsulated in 
 UDP/IP packets. The `enable telemetry` command tells the TO_LAB application to start 
-sending packets to a UDP port on the `localhost` or a specified IP. By default, the TO_LAB application
-listens to UDP port 1234 for commands, and sends telemetry to the tlmGUI at UDP port 1235.
+sending packets to a UDP port on the `localhost` or a specified IP.
+By default, the cFS listens to UDP port 1234 for commands,
+and sends telemetry to the tlmGUI at UDP port 2234.
 
 Start the telemetry system using the Ground System's main window.
 

Subsystems/cmdGui/MiniCmdUtil.py

@@ -23,6 +23,7 @@
 import socket
 from collections import namedtuple
 
+import getpass
 
 class MiniCmdUtil:
     # Class objects
@@ -61,7 +62,7 @@ def __init__(self,
         self.parameters = parameters
         self.payload = bytearray()
         self.packet = bytearray()
-        with open("/tmp/OffsetData", "r+b") as f:
+        with open(f"/tmp/OffsetData-{getpass.getuser()}", "r+b") as f:
             self.mm = mmap.mmap(f.fileno(), 0, prot=mmap.PROT_READ)
 
         self.cmd_offset_pri = 0

Subsystems/tlmGUI/EventMessage.py

@@ -61,6 +61,8 @@
 
 from UiEventmessagedialog import UiEventmessagedialog
 
+import getpass
+
 ROOTDIR = Path(sys.argv[0]).resolve().parent
 
 
@@ -77,7 +79,7 @@ def __init__(self, aid):
             4: "CRITICAL"
         }
 
-        with open("/tmp/OffsetData", "r+b") as f:
+        with open(f"/tmp/OffsetData-{getpass.getuser()}", "r+b") as f:
             self.mm = mmap.mmap(f.fileno(), 0, prot=mmap.PROT_READ)
 
     def init_em_tlm_receiver(self, subscr):
@@ -141,7 +143,7 @@ def __init__(self, subscr, aid):
         # Init zeroMQ
         self.context = zmq.Context()
         self.subscriber = self.context.socket(zmq.SUB)
-        self.subscriber.connect("ipc:///tmp/GroundSystem")
+        self.subscriber.connect(f"ipc:///tmp/GroundSystem-{getpass.getuser()}")
         subscription_string = f"{subscr}.Spacecraft1.TelemetryPackets.{app_id}"
         self.subscriber.setsockopt_string(zmq.SUBSCRIBE, subscription_string)
 

Subsystems/tlmGUI/GenericTelemetry.py

@@ -31,6 +31,8 @@
 
 from UiGenerictelemetrydialog import UiGenerictelemetrydialog
 
+import getpass
+
 # ../cFS/tools/cFS-GroundSystem/Subsystems/tlmGUI
 ROOTDIR = Path(sys.argv[0]).resolve().parent
 
@@ -42,7 +44,7 @@ class SubsystemTelemetry(QDialog, UiGenerictelemetrydialog):
     def __init__(self):
         super().__init__()
         self.setupUi(self)
-        with open("/tmp/OffsetData", "r+b") as f:
+        with open(f"/tmp/OffsetData-{getpass.getuser()}", "r+b") as f:
             self.mm = mmap.mmap(f.fileno(), 0, prot=mmap.PROT_READ)
 
     #
@@ -131,7 +133,7 @@ def __init__(self, subscr):
         # Init zeroMQ
         context = zmq.Context()
         self.subscriber = context.socket(zmq.SUB)
-        self.subscriber.connect("ipc:///tmp/GroundSystem")
+        self.subscriber.connect(f"ipc:///tmp/GroundSystem-{getpass.getuser()}")
         my_tlm_pg_apid = subscr.split(".", 1)
         my_subscription = f"GroundSystem.Spacecraft1.TelemetryPackets.{my_tlm_pg_apid[1]}"
         self.subscriber.setsockopt_string(zmq.SUBSCRIBE, my_subscription)

Subsystems/tlmGUI/TelemetrySystem.py

@@ -33,6 +33,8 @@
 
 from UiTelemetrysystemdialog import UiTelemetrysystemdialog
 
+import getpass
+
 ROOTDIR = Path(sys.argv[0]).resolve().parent
 
 
@@ -151,7 +153,7 @@ def __init__(self, subscr):
         # Init zeroMQ
         context = zmq.Context()
         self.subscriber = context.socket(zmq.SUB)
-        self.subscriber.connect("ipc:///tmp/GroundSystem")
+        self.subscriber.connect(f"ipc:///tmp/GroundSystem-{getpass.getuser()}")
         self.subscriber.setsockopt_string(zmq.SUBSCRIBE, subscr)
 
     def run(self):

Subsystems/tlmGUI/sample-app-hk-tlm.txt

@@ -0,0 +1,21 @@
+# 
+# sample-app-hk-tlm.txt
+# 
+# This file should have the following comma delimited fields:
+#   1. Data item description
+#   2. Offset of data item in packet
+#   3. Length of data item
+#   4. Python data type of item ( using python struct library )
+#   5. Display type of item ( Currently Dec, Hex, Str, Enm ) 
+#   6. Display string for enumerated value 0 ( or NULL if none ) 
+#   7. Display string for enumerated value 1 ( or NULL if none ) 
+#   8. Display string for enumerated value 2 ( or NULL if none ) 
+#   9. Display string for enumerated value 3 ( or NULL if none ) 
+# 
+#  Note(1): A line that begins with # is a comment
+#  Note(2): Remove any blank lines from the end of the file
+#
+Command Counter,     12,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Error Counter,   13,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+Spare1,            14,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+Spare2,            15,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  

Subsystems/tlmGUI/telemetry-pages.txt

@@ -28,3 +28,4 @@ SB OneSub Tlm,             GenericTelemetry.py,     0x80E,   cfe-sb-onesub-tlm.t
 ES Shell Tlm,              GenericTelemetry.py,     0x80F,   cfe-es-shell-tlm.txt
 ES MEMSTATS Tlm,           GenericTelemetry.py,     0x810,   cfe-es-memstats-tlm.txt
 ES BlockStats Tlm 1,       GenericTelemetry.py,     0x810,   cfe-es-blockstats_1-tlm.txt
+Sample App HK Tlm,         GenericTelemetry.py,     0x883,   sample-app-hk-tlm.txt

TlmMQRecv.py

@@ -19,6 +19,7 @@
 #
 
 import zmq
+import getpass
 
 
 #
@@ -30,7 +31,7 @@ def main():
     # Prepare our context and publisher
     context = zmq.Context()
     subscriber = context.socket(zmq.SUB)
-    subscriber.connect("ipc:///tmp/GroundSystem")
+    subscriber.connect(f"ipc:///tmp/GroundSystem-{getpass.getuser()}")
     subscriber.setsockopt(zmq.SUBSCRIBE, b"GroundSystem")
 
     while True: