openc3-cosmos-fakesat 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a6393c32c78795e6970af3e40e8a59f21609e63c60d5d25f4869aaa9d2195e4
-  data.tar.gz: eac436c65ccec26ab75026c0227f1199094355dbc9057afdc5a82ec94d82e7b8
+  metadata.gz: edf9d18fef465eeb3a361be176d323f4691306c07b1eac20b715b81a93f2a4c9
+  data.tar.gz: 6eb6612a570a07a664cde168039d796cddb52d0c2d74285c41997e35420bc014
 SHA512:
-  metadata.gz: fdf53ff5a9d5df8160268c2e3a9ab359193cbcf4f42d87e902a02e4ad73922cc8208df84b77dff13f3b70a4fa497a09143ac9f2995141b0ea5c533a3095f4ef4
-  data.tar.gz: d2c28ad6fbe4a1c029d829432b1fc905f1bda6646a918bda50c8c82e5b87f7bce45c5a616603842666c0cee542400e15ea22faf12e94ed300615373e1721b2e8
+  metadata.gz: 7886e6fedaf6e649cf6e67193676ba1e1dae73d2e7cfd556d6ae84c3939efe3380f1620d0396b39ee61eed1efc70f84fe8987ab5b552ba5c285d0a46c2bf140d
+  data.tar.gz: ba32f846ab61946cece53323f632a84c116c4de459b907ccb970a3d6ac840951afe5e19ab614ebce2e34680611eb635a49e17acf70db86189dcb4bbb61933e1a

data/targets/FAKESAT/cmd_tlm/_ccsds_cmd.txt

@@ -1,9 +1,8 @@
   PARAMETER    CCSDSVER        0   3  UINT  0     0   0 "CCSDS primary header version number"
   PARAMETER    CCSDSTYPE       3   1  UINT  1     1   1 "CCSDS primary header packet type"
   PARAMETER    CCSDSSHF        4   1  UINT  0     0   0 "CCSDS primary header secondary header flag"
-  ID_PARAMETER CCSDSAPID       5  11  UINT  0  2047 999 "CCSDS primary header application id"
+  ID_PARAMETER CCSDSAPID       5  11  UINT  0  2047 <%= apid %> "CCSDS primary header application id"
   PARAMETER    CCSDSSEQFLAGS  16   2  UINT  3     3   3 "CCSDS primary header sequence flags"
   PARAMETER    CCSDSSEQCNT    18  14  UINT  0 16383   0 "CCSDS primary header sequence count"
     OVERFLOW TRUNCATE
   PARAMETER    CCSDSLENGTH    32  16  UINT MIN MAX 12 "CCSDS primary header packet length"
-  ID_PARAMETER PKTID          48  16  UINT MIN MAX <%= id %> "Packet id"

data/targets/FAKESAT/cmd_tlm/_ccsds_tlm.txt

@@ -15,5 +15,4 @@
     OVERFLOW TRUNCATE
   APPEND_ITEM CCSDSLENGTH  16 UINT   "CCSDS packet data length"
   APPEND_ITEM TIMESEC      32 UINT   "Seconds since epoch (January 1st, 1970, midnight)"
-  APPEND_ITEM TIMEUS       32 UINT   "Microseconds of second"
-  APPEND_ID_ITEM PKTID     16 UINT 1 "Packet id (The combination of CCSDS_APID and PACKET_ID identify the packet)"
+  APPEND_ITEM TIMEUS       32 UINT   "Microseconds of second"

data/targets/FAKESAT/cmd_tlm/cmds.txt

@@ -1,5 +1,9 @@
+COMMAND <%= target_name %> NOOP BIG_ENDIAN "NOOP"
+  <%= render "_ccsds_cmd.txt", locals: {apid: 1} %>
+  APPEND_PARAMETER IGNORE 8 UINT MIN MAX 0 "Ignored item"
+
 COMMAND <%= target_name %> COLLECT BIG_ENDIAN "Starts a collect on the <%= target_name %> target"
-  <%= render "_ccsds_cmd.txt", locals: {id: 1} %>
+  <%= render "_ccsds_cmd.txt", locals: {apid: 2} %>
   PARAMETER    TYPE           64  16  UINT MIN MAX 0 "Collect type"
     REQUIRED
     STATE NORMAL  0
@@ -11,14 +15,16 @@ COMMAND <%= target_name %> COLLECT BIG_ENDIAN "Starts a collect on the <%= targe
     UNITS Celsius C
 
 COMMAND <%= target_name %> ABORT BIG_ENDIAN "Aborts a collect on the <%= target_name %> instrument"
-  <%= render "_ccsds_cmd.txt", locals: {id: 2} %>
+  <%= render "_ccsds_cmd.txt", locals: {apid: 3} %>
+  APPEND_PARAMETER IGNORE 8 UINT MIN MAX 0 "Ignored item"
 
 COMMAND <%= target_name %> CLEAR BIG_ENDIAN "Clears counters on the <%= target_name %> instrument"
   HAZARDOUS "Clearing counters may lose valuable information."
-  <%= render "_ccsds_cmd.txt", locals: {id: 3} %>
+  <%= render "_ccsds_cmd.txt", locals: {apid: 4} %>
+  APPEND_PARAMETER IGNORE 8 UINT MIN MAX 0 "Ignored item"
 
 COMMAND <%= target_name %> SET_MODE BIG_ENDIAN "Change spacecraft mode"
-  <%= render "_ccsds_cmd.txt", locals: {id: 4} %>
+  <%= render "_ccsds_cmd.txt", locals: {apid: 5} %>
   APPEND_PARAMETER MODE 8 UINT 0 2 0 "Desired Mode"
     REQUIRED
     STATE SAFE 0
@@ -26,44 +32,44 @@ COMMAND <%= target_name %> SET_MODE BIG_ENDIAN "Change spacecraft mode"
     STATE OPERATE 2
 
 COMMAND <%= target_name %> SLRPNLDEPLOY BIG_ENDIAN "Deploy solar array panel"
-  <%= render "_ccsds_cmd.txt", locals: {id: 5} %>
+  <%= render "_ccsds_cmd.txt", locals: {apid: 6} %>
   APPEND_PARAMETER NUM 8 UINT 1 2 1 "Solar Array Number"
 
 COMMAND <%= target_name %> SLRPNLSTOW BIG_ENDIAN "Stow solar array panel"
-  <%= render "_ccsds_cmd.txt", locals: {id: 6} %>
+  <%= render "_ccsds_cmd.txt", locals: {apid: 7} %>
   APPEND_PARAMETER NUM 8 UINT 1 2 1 "Solar Array Number"
 
 COMMAND <%= target_name %> SLRPNLANG BIG_ENDIAN "Set Solar Array Panel Angle"
-  <%= render "_ccsds_cmd.txt", locals: {id: 7} %>
+  <%= render "_ccsds_cmd.txt", locals: {apid: 8} %>
   APPEND_PARAMETER NUM 8 UINT 1 2 1 "Solar Array Number"
   APPEND_PARAMETER ANG 32 FLOAT 0 360 0 "Solar Array Angle"
     UNITS DEGREES DEG
 
 COMMAND <%= target_name %> TABLE_LOAD BIG_ENDIAN "Load table"
-  <%= render "_ccsds_cmd.txt", locals: {id: 8} %>
+  <%= render "_ccsds_cmd.txt", locals: {apid: 9} %>
   APPEND_PARAMETER DATA 80 BLOCK "" "Table data"
 
 COMMAND <%= target_name %> HTR_CTRL BIG_ENDIAN "Heater Control ON/OFF"
-  <%= render "_ccsds_cmd.txt", locals: {id: 9} %>
+  <%= render "_ccsds_cmd.txt", locals: {apid: 10} %>
   APPEND_PARAMETER NUM 8 UINT 1 2 1 "Heater Number"
   APPEND_PARAMETER STATE 8 UINT 0 1 0 "Desired State"
     STATE OFF 0 HAZARDOUS
     STATE ON 1
 
 COMMAND <%= target_name %> HTR_STATE BIG_ENDIAN "Heater State ON/OFF"
-  <%= render "_ccsds_cmd.txt", locals: {id: 10} %>
+  <%= render "_ccsds_cmd.txt", locals: {apid: 11} %>
   APPEND_PARAMETER NUM 8 UINT 1 2 1 "Heater Number"
   APPEND_PARAMETER STATE 8 UINT 0 1 0 "Desired State"
     STATE OFF 0
     STATE ON 1
 
 COMMAND <%= target_name %> HTR_SETPT BIG_ENDIAN "Heater Setpoint"
-  <%= render "_ccsds_cmd.txt", locals: {id: 11} %>
+  <%= render "_ccsds_cmd.txt", locals: {apid: 12} %>
   APPEND_PARAMETER NUM 8 UINT 1 2 1 "Heater Number"
   APPEND_PARAMETER SETPT 32 FLOAT -100 100 0 "Setpoint"
 
 COMMAND <%= target_name %> ADCS_CTRL BIG_ENDIAN "ADCS Control of Solar Panel Angle ON/OFF"
-  <%= render "_ccsds_cmd.txt", locals: {id: 12} %>
+  <%= render "_ccsds_cmd.txt", locals: {apid: 13} %>
   APPEND_PARAMETER STATE 8 UINT 0 1 0 "Desired State"
     STATE OFF 0 HAZARDOUS
     STATE ON 1

data/targets/FAKESAT/lib/sim_sat.rb

@@ -197,6 +197,9 @@ module OpenC3
       name = packet.packet_name.upcase
 
       case name
+      when 'NOOP'
+        accept_cmd()
+
       when 'COLLECT'
         if @mode == 'OPERATE'
           @collects += 1

data/targets/FAKESAT/target.txt

@@ -8,7 +8,7 @@ IGNORE_PARAMETER CCSDSAPID
 IGNORE_PARAMETER CCSDSSEQFLAGS
 IGNORE_PARAMETER CCSDSSEQCNT
 IGNORE_PARAMETER CCSDSLENGTH
-IGNORE_PARAMETER PKTID
+IGNORE_PARAMETER IGNORE
 
 # Ignored Items
 IGNORE_ITEM CCSDSVER
@@ -23,7 +23,6 @@ IGNORE_ITEM PACKET_TIMESECONDS
 IGNORE_ITEM RECEIVED_TIMESECONDS
 IGNORE_ITEM TIMESEC
 IGNORE_ITEM TIMEUS
-IGNORE_ITEM PKTID
 
 # Explicitly define command and telemetry files
 # If not given then all the files in cmd/tlm will be processed in

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openc3-cosmos-fakesat
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-16 00:00:00.000000000 Z
+date: 2023-01-18 00:00:00.000000000 Z
 dependencies: []
 description: "    cosmos-fakesat plugin facilitating COSMOS user training\n"
 email: