openc3-cosmos-fakesat 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd88a75c9aa156cb6e05a202dfd19702011ce0560a0e3a3b735f139e59201640
-  data.tar.gz: '02296f9cca7eac3096a77ead5686c05c020ee9f501bd5cf1f39ab2ce933fdf4e'
+  metadata.gz: 1f938742e67ba7f611f52a9bcc2e24e50a0e7261cb1e1d2eaab90c38e7fc40b9
+  data.tar.gz: 03262b85722bcfd4f32617313e3ece64962a8e4ff40615a5da6b07610081bff9
 SHA512:
-  metadata.gz: 9102e103026a35fa823debe388a1c388278d2ebd7106d17ab549c465458c875eac061d7195ca0b4130a46e92fb46c05dc5db3222d05daf0244e081e030d8a9a7
-  data.tar.gz: 8802de3fd28eb3ae8f3aa6094831b3954e484ee6b508112aa6dc48e8316939c5f360b9e64811b1e38fa8166912db9281d9c4c5b5477638d4acde7882602340da
+  metadata.gz: bd7ef9d409e51cccdb0803b66b08e93598c2492e8c44082670d3b13ec779f3839e2c44ad8cd8ffa320e22f9da602b47f135241e7562db2799d2cb4a632d7b6ae
+  data.tar.gz: 896eea191c1cac0f72f247f2b542e5ff1c3d32d9ad1563ae3fa80344078887982b1b545f3028fb5cb76329ba910bc426801be35b0b6eac85756d5c47c8ed0d33

data/targets/FAKESAT/cmd_tlm/_ccsds_cmd.txt

@@ -6,4 +6,3 @@
   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 %> COLLECT BIG_ENDIAN "Starts a collect on the <%= target_name %> target"
+COMMAND <%= target_name %> NOOP BIG_ENDIAN "NOOP"
   <%= render "_ccsds_cmd.txt", locals: {id: 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: 2} %>
   PARAMETER    TYPE           64  16  UINT MIN MAX 0 "Collect type"
     REQUIRED
     STATE NORMAL  0
@@ -12,10 +16,12 @@ COMMAND <%= target_name %> COLLECT BIG_ENDIAN "Starts a collect on the <%= targe
 
 COMMAND <%= target_name %> ABORT BIG_ENDIAN "Aborts a collect on the <%= target_name %> instrument"
   <%= render "_ccsds_cmd.txt", locals: {id: 2} %>
+  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} %>
+  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} %>

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
@@ -255,7 +258,7 @@ module OpenC3
           reject_cmd("Invalid Solar Array Number: #{num}")
         end
 
-      when 'SLRPNLRESET'
+      when 'SLRPNLSTOW'
         num = packet.read('NUM')
         case num
         when 1
@@ -376,10 +379,6 @@ module OpenC3
         else
           reject_cmd("Invalid ADCS Control: #{state}")
         end
-
-      when 'IMAGER_STATE'
-
-
       end
     end
 
@@ -501,8 +500,8 @@ module OpenC3
           if @heater1_state == 'ON'
             @heater1_pwr = 300
             @temp1 += 0.5
-            if @temp1 > 100.0
-              @temp1 = 100.0
+            if @temp1 > 50.0
+              @temp1 = 50.0
             end
           else
             @heater1_pwr = 0

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,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: openc3-cosmos-fakesat
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Ryan Melton
 - Jason Thomas
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-09 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:
@@ -49,7 +49,7 @@ licenses:
 - AGPL-3.0-only
 - Nonstandard
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -64,8 +64,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: OpenC3 cosmos-fakesat plugin
 test_files: []