Skip to content

Commit

Permalink
Merge pull request #173 from BallAerospace/support_cmd_tlm_partials
Browse files Browse the repository at this point in the history 
Add support for cmd/tlm partials #170
  • Loading branch information
@jmthomas
jmthomas committed Jul 17, 2015
2 parents 41bdeec + 383571f commit e7d098e
Show file tree
Hide file tree
Showing 25 changed files with 243 additions and 507 deletions.
9 changes: 9 additions & 0 deletions demo/config/targets/INST/cmd_tlm/_ccsds_cmd.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
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"
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 0 65535 12 "CCSDS primary header packet length"
ID_PARAMETER PKTID 48 16 UINT 0 65535 <%= id %> "Packet id"
19 changes: 19 additions & 0 deletions demo/config/targets/INST/cmd_tlm/_ccsds_tlm.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
APPEND_ITEM CCSDSVER 3 UINT "CCSDS packet version number (See CCSDS 133.0-B-1)"
APPEND_ITEM CCSDSTYPE 1 UINT "CCSDS packet type (command or telemetry)"
STATE TLM 0
STATE CMD 1
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_ITEM CCSDSSEQFLAGS 2 UINT "CCSDS sequence flags"
STATE FIRST 1
STATE CONT 0
STATE LAST 2
STATE NOGROUP 3
APPEND_ITEM CCSDSSEQCNT 14 UINT "CCSDS packet sequence count"
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)"
103 changes: 19 additions & 84 deletions demo/config/targets/INST/cmd_tlm/inst_cmds.txt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
COMMAND INST COLLECT BIG_ENDIAN "Starts a collect on the instrument"
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"
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 0 65535 12 "CCSDS primary header packet length"
ID_PARAMETER PKTID 48 16 UINT 0 65535 1 "Packet id"
<%= render "_ccsds_cmd.txt", locals: {id: 1} %>
PARAMETER TYPE 64 16 UINT 0 65535 0 "Collect type"
REQUIRED
STATE NORMAL 0
Expand All @@ -19,103 +11,46 @@ COMMAND INST COLLECT BIG_ENDIAN "Starts a collect on the instrument"
UNITS Celcius C

COMMAND INST ABORT BIG_ENDIAN "Aborts a collect on the instrument"
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"
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 0 65535 1 "CCSDS primary header packet length"
ID_PARAMETER PKTID 48 16 UINT 0 65535 2 "Packet id"
<%= render "_ccsds_cmd.txt", locals: {id: 2} %>

COMMAND INST CLEAR BIG_ENDIAN "Clears counters on the instrument"
HAZARDOUS "Clearing counters may lose valuable information."
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"
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 0 65535 1 "CCSDS primary header packet length"
ID_PARAMETER PKTID 48 16 UINT 0 65535 3 "Packet id"
<%= render "_ccsds_cmd.txt", locals: {id: 3} %>

COMMAND INST SETPARAMS BIG_ENDIAN "Sets numbered parameters"
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"
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 0 65535 11 "CCSDS primary header packet length"
ID_PARAMETER PKTID 48 16 UINT 0 65535 4 "Packet id"
MACRO_APPEND_START 1 5
APPEND_PARAMETER VALUE 16 UINT 0 5 0 "A value setting"
MACRO_APPEND_END
<%= render "_ccsds_cmd.txt", locals: {id: 4} %>
# Old deprecated MACRO syntax:
# MACRO_APPEND_START 1 5
# APPEND_PARAMETER VALUE 16 UINT 0 5 0 "A value setting"
# MACRO_APPEND_END

# New more flexible ERB syntax:
<% (1..5).each do |i| %>
APPEND_PARAMETER VALUE<%= i %> 16 UINT 0 5 0 "Value <%= i %> setting"
<% end %>

SELECT_PARAMETER VALUE5
POLY_WRITE_CONVERSION 0 2

COMMAND INST ASCIICMD BIG_ENDIAN "Enumerated ASCII command"
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"
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 0 65535 257 "CCSDS primary header packet length"
ID_PARAMETER PKTID 48 16 UINT 0 65535 5 "Packet id"
<%= render "_ccsds_cmd.txt", locals: {id: 5} %>
PARAMETER STRING 64 2048 STRING "NOOP" "Enumerated string parameter"
STATE "NOOP" "NOOP"
STATE "ARM LASER" "ARM LASER" HAZARDOUS "Arming the laser poses an eye safety hazard."
STATE "FIRE LASER" "FIRE LASER" HAZARDOUS "WARNING Laser will be fired!"

COMMAND INST FLTCMD BIG_ENDIAN "Command with float parameters"
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"
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 0 65535 13 "CCSDS primary header packet length"
ID_PARAMETER PKTID 48 16 UINT 0 65535 6 "Packet id"
<%= render "_ccsds_cmd.txt", locals: {id: 6} %>
PARAMETER FLOAT32 64 32 FLOAT MIN_FLOAT32 MAX_FLOAT32 0.0 "Float32 parameter"
PARAMETER FLOAT64 96 64 FLOAT MIN_FLOAT64 MAX_FLOAT64 0.0 "Float64 parameter"

COMMAND INST ARYCMD BIG_ENDIAN "Command with array parameter"
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"
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 0 65535 81 "CCSDS primary header packet length"
ID_PARAMETER PKTID 48 16 UINT 0 65535 6 "Packet id"
<%= render "_ccsds_cmd.txt", locals: {id: 7} %>
ARRAY_PARAMETER ARRAY 64 32 UINT -8 "Array parameter"
PARAMETER CRC -8 8 UINT 0 255 0 "CRC"

COMMAND INST SLRPNLDEPLOY BIG_ENDIAN "Deploy solar array panels"
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"
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 0 65535 1 "CCSDS primary header packet length"
ID_PARAMETER PKTID 48 16 UINT 0 65535 8 "Packet id"
<%= render "_ccsds_cmd.txt", locals: {id: 8} %>

COMMAND INST SLRPNLRESET BIG_ENDIAN "Reset solar array panels"
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"
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 0 65535 1 "CCSDS primary header packet length"
ID_PARAMETER PKTID 48 16 UINT 0 65535 9 "Packet id"
<%= render "_ccsds_cmd.txt", locals: {id: 9} %>
Loading

0 comments on commit e7d098e

Please sign in to comment.