#170 Fix APID in demo

BallAerospace · Jul 17, 2015 · 5d519e5 · 5d519e5
1 parent e7d098e
commit 5d519e5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/demo/config/targets/INST/cmd_tlm/_ccsds_tlm.txt b/demo/config/targets/INST/cmd_tlm/_ccsds_tlm.txt
@@ -5,7 +5,7 @@
   APPEND_ITEM CCSDSSHF      1 UINT   "CCSDS secondary header flag"
     STATE FALSE 0
     STATE TRUE 1
-  APPEND_ID_ITEM CCSDSAPID 11 UINT 1 "CCSDS application process id"
+  APPEND_ID_ITEM CCSDSAPID 11 UINT <%= apid %> "CCSDS application process id"
   APPEND_ITEM CCSDSSEQFLAGS 2 UINT   "CCSDS sequence flags"
     STATE FIRST 1
     STATE CONT 0

diff --git a/demo/config/targets/INST/cmd_tlm/inst_tlm.txt b/demo/config/targets/INST/cmd_tlm/inst_tlm.txt
@@ -1,5 +1,5 @@
 TELEMETRY INST HEALTH_STATUS BIG_ENDIAN "Health and status from the instrument"
-  <%= render "_ccsds_tlm.txt" %>
+  <%= render "_ccsds_tlm.txt", locals: {apid: 1} %>
   APPEND_ITEM COLLECTS         16 UINT     "Number of collects"
   APPEND_ITEM TEMP1            16 UINT     "Temperature #1"
     POLY_READ_CONVERSION  -100.0 0.00305
@@ -70,7 +70,7 @@ TELEMETRY INST HEALTH_STATUS BIG_ENDIAN "Health and status from the instrument"
 
 TELEMETRY INST ADCS BIG_ENDIAN "Position and attitude data"
   META TYPE 'struct adcs'
-  <%= render "_ccsds_tlm.txt" %>
+  <%= render "_ccsds_tlm.txt", locals: {apid: 2} %>
   ITEM POSX             128 32 FLOAT "Position X"
     UNITS METERS M
   ITEM POSY             160 32 FLOAT "Position Y"
@@ -115,7 +115,7 @@ TELEMETRY INST ADCS BIG_ENDIAN "Position and attitude data"
     READ_CONVERSION unix_time_formatted_conversion.rb TIMESEC TIMEUS
 
 TELEMETRY INST PARAMS BIG_ENDIAN "Params set by SETPARAMS command"
-  <%= render "_ccsds_tlm.txt" %>
+  <%= render "_ccsds_tlm.txt", locals: {apid: 3} %>
   # Old deprecated MACRO syntax:
   #MACRO_APPEND_START 5 1
   #  APPEND_ITEM Value 16 UINT "Value setting"
@@ -137,7 +137,7 @@ TELEMETRY INST PARAMS BIG_ENDIAN "Params set by SETPARAMS command"
     READ_CONVERSION unix_time_formatted_conversion.rb TIMESEC TIMEUS
 
 TELEMETRY INST IMAGE BIG_ENDIAN "Packet with image data"
-  <%= render "_ccsds_tlm.txt" %>
+  <%= render "_ccsds_tlm.txt", locals: {apid: 4} %>
   ITEM IMAGE            128 800 BLOCK   "10x10 Image Data"
   ITEM TIMESECONDS 0 0 DERIVED "Derived floating-point time since epoch in seconds"
     READ_CONVERSION unix_time_seconds_conversion.rb TIMESEC TIMEUS
@@ -146,7 +146,7 @@ TELEMETRY INST IMAGE BIG_ENDIAN "Packet with image data"
     READ_CONVERSION unix_time_formatted_conversion.rb TIMESEC TIMEUS
 
 TELEMETRY INST MECH BIG_ENDIAN "Mechanism status"
-  <%= render "_ccsds_tlm.txt" %>
+  <%= render "_ccsds_tlm.txt", locals: {apid: 5} %>
   APPEND_ITEM SLRPNL1       32 FLOAT    "Solar panel 1 angle"
     UNITS DEGREES DEG
   APPEND_ITEM SLRPNL2       32 FLOAT    "Solar panel 2 angle"