Skip to content

Commit

Permalink
Update formatting and add extractor configs
Browse files Browse the repository at this point in the history
  • Loading branch information
djdupre committed Mar 29, 2018
1 parent 7f0adbc commit 2d7daaf
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 9 deletions.
40 changes: 32 additions & 8 deletions COSMOS/flatsat/config/targets/ADCS_SENSORPROC/cmd_tlm/ss_tlm.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ TELEMETRY ADCS_SENSORPROC SUNSENSOR BIG_ENDIAN "Sun sensor angles"

APPEND_ITEM ALPHA 32 FLOAT "Alpha angle" LITTLE_ENDIAN
UNITS degrees deg
FORMAT_STRING "%0.4f"
APPEND_ITEM BETA 32 FLOAT "Beta angle" LITTLE_ENDIAN
UNITS degrees deg
FORMAT_STRING "%0.4f"
APPEND_ITEM STATUS 8 UINT "Sun sensor error code" LITTLE_ENDIAN
STATE OK 0 GREEN
STATE OUTFOV1 4 YELLOW
Expand Down Expand Up @@ -67,15 +69,15 @@ TELEMETRY ADCS_SENSORPROC RXSTATUS BIG_ENDIAN "Receiver status"
<%= render "../../SYSTEM/cmd_tlm/_shared_tlm_header.txt", locals: {id: 123} %>

APPEND_ITEM ERROR 32 UINT "Receiver error word" LITTLE_ENDIAN
FORMAT_STRING "0x%0x"
FORMAT_STRING "0x%08x"
APPEND_ITEM STATUS 32 UINT "Receiver status word" LITTLE_ENDIAN
FORMAT_STRING "0x%0x"
FORMAT_STRING "0x%08x"
APPEND_ITEM AUX1 32 UINT "Auxillary status word 1" LITTLE_ENDIAN
FORMAT_STRING "0x%0x"
FORMAT_STRING "0x%08x"
APPEND_ITEM AUX2 32 UINT "Auxillary status word 2" LITTLE_ENDIAN
FORMAT_STRING "0x%0x"
FORMAT_STRING "0x%08x"
APPEND_ITEM AUX3 32 UINT "Auxillary status word 3" LITTLE_ENDIAN
FORMAT_STRING "0x%0x"
FORMAT_STRING "0x%08x"

TELEMETRY ADCS_SENSORPROC POSVEL BIG_ENDIAN "Position and velocity with timestamp"
# This must ALWAYS be the first entry in any telemetry packet
Expand All @@ -87,26 +89,38 @@ TELEMETRY ADCS_SENSORPROC POSVEL BIG_ENDIAN "Position and velocity with timestam
STATE COLD_START 6 YELLOW
APPEND_ITEM POSX 64 FLOAT "Position X-coordinate" LITTLE_ENDIAN
UNITS meters m
FORMAT_STRING "%0.4f"
APPEND_ITEM POSY 64 FLOAT "Position Y-coordinate" LITTLE_ENDIAN
UNITS meters m
FORMAT_STRING "%0.4f"
APPEND_ITEM POSZ 64 FLOAT "Position Z-coordinate" LITTLE_ENDIAN
UNITS meters m
FORMAT_STRING "%0.4f"
APPEND_ITEM STDPOSX 32 FLOAT "Standard deviation of position X-coordinate" LITTLE_ENDIAN
FORMAT_STRING "%0.4f"
APPEND_ITEM STDPOSY 32 FLOAT "Standard deviation of position Y-coordinate" LITTLE_ENDIAN
FORMAT_STRING "%0.4f"
APPEND_ITEM STDPOSZ 32 FLOAT "Standard deviation of position Z-coordinate" LITTLE_ENDIAN
FORMAT_STRING "%0.4f"
APPEND_ITEM VEL_STATUS 32 UINT "Velocity solution status" LITTLE_ENDIAN
STATE SOL_COMPUTED 0 GREEN
STATE INSUFFICIENT_OBS 1 RED
STATE COLD_START 6 YELLOW
APPEND_ITEM VELX 64 FLOAT "Velocity X-coordinate" LITTLE_ENDIAN
UNITS meters_per_second mps
FORMAT_STRING "%0.4f"
APPEND_ITEM VELY 64 FLOAT "Velocity Y-coordinate" LITTLE_ENDIAN
UNITS meters_per_second mps
FORMAT_STRING "%0.4f"
APPEND_ITEM VELZ 64 FLOAT "Velocity Z-coordinate" LITTLE_ENDIAN
UNITS meters_per_second mps
FORMAT_STRING "%0.4f"
APPEND_ITEM STDVELX 32 FLOAT "Standard deviation of velocity X-coordinate" LITTLE_ENDIAN
FORMAT_STRING "%0.4f"
APPEND_ITEM STDVELY 32 FLOAT "Standard deviation of velocity Y-coordinate" LITTLE_ENDIAN
FORMAT_STRING "%0.4f"
APPEND_ITEM STDVELZ 32 FLOAT "Standard deviation of velocity Z-coordinate" LITTLE_ENDIAN
FORMAT_STRING "%0.4f"
APPEND_ITEM WEEK 16 UINT "GPS Reference Week, UTC." LITTLE_ENDIAN
UNITS weeks w
APPEND_ITEM MS 32 INT "Milliseconds into this reference week, UTC" LITTLE_ENDIAN
Expand All @@ -118,6 +132,7 @@ TELEMETRY ADCS_SENSORPROC TIME BIG_ENDIAN "Time of latest message"

APPEND_ITEM OFFSET 64 FLOAT "Combined offset between GPS reference time and UTC" LITTLE_ENDIAN
UNITS seconds s
FORMAT_STRING "%0.4f"
APPEND_ITEM MS 32 INT "Milliseconds into this reference week, UTC" LITTLE_ENDIAN
UNITS milliseconds ms
APPEND_ITEM WEEK 16 UINT "GPS Reference Week, UTC" LITTLE_ENDIAN
Expand All @@ -138,36 +153,45 @@ TELEMETRY ADCS_SENSORPROC HWMONITOR BIG_ENDIAN "Hardware measurements"

APPEND_ITEM TEMP 32 FLOAT "Temperature" LITTLE_ENDIAN
UNITS Celcius C
FORMAT_STRING "%0.4f"
APPEND_ITEM TEMP_S 8 UINT "Temperature status" LITTLE_ENDIAN
<%= render "_sp_states.txt" %>
APPEND_ITEM ANTCUR 32 FLOAT "Antenna current" LITTLE_ENDIAN
UNITS Amps A
FORMAT_STRING "%0.4f"
APPEND_ITEM ANTCUR_S 8 UINT "Antenna current status" LITTLE_ENDIAN
<%= render "_sp_states.txt" %>
APPEND_ITEM SUPVOLT 32 FLOAT "Supply voltage" LITTLE_ENDIAN
UNITS Volts V
FORMAT_STRING "%0.4f"
APPEND_ITEM SUPVOLT_S 8 UINT "Supply voltage status" LITTLE_ENDIAN
<%= render "_sp_states.txt" %>
APPEND_ITEM ANTVOLT 32 FLOAT "Antenna voltage" LITTLE_ENDIAN
UNITS Volts V
FORMAT_STRING "%0.4f"
APPEND_ITEM ANTVOLT_S 8 UINT "Antenna voltage status" LITTLE_ENDIAN
<%= render "_sp_states.txt" %>
APPEND_ITEM DIGCOREVOLT 32 FLOAT "Digital core voltage" LITTLE_ENDIAN
UNITS Volts V
FORMAT_STRING "%0.4f"
APPEND_ITEM DIGCOREVOLT_S 8 UINT "Digital core voltage status" LITTLE_ENDIAN
<%= render "_sp_states.txt" %>
APPEND_ITEM TEMP2 32 FLOAT "Secondary temperature" LITTLE_ENDIAN
UNITS Celcius C
FORMAT_STRING "%0.4f"
APPEND_ITEM TEMP2_S 8 UINT "Secondary temp. status" LITTLE_ENDIAN
<%= render "_sp_states.txt" %>

TELEMETRY ADCS_SENSORPROC SATVIS2 BIG_ENDIAN "Satellite visibility"
# This must ALWAYS be the first entry in any telemetry packet
<%= render "../../SYSTEM/cmd_tlm/_shared_tlm_header.txt", locals: {id: 127} %>

APPEND_ITEM NUM_GPS 32 UINT "Number of visible GPS satellites." LITTLE_ENDIAN
APPEND_ITEM NUM_GLONASS 32 UINT "Number of visible GLONASS satellites." LITTLE_ENDIAN
APPEND_ITEM NUM_SBAS 32 UINT "Number of visible SBAS satellites." LITTLE_ENDIAN
APPEND_ITEM NUM_GPS 8 UINT "Number of visible GPS satellites." LITTLE_ENDIAN
APPEND_ITEM NUM_GLONASS 8 UINT "Number of visible GLONASS satellites." LITTLE_ENDIAN
APPEND_ITEM NUM_SBAS 8 UINT "Number of visible SBAS satellites." LITTLE_ENDIAN
APPEND_ITEM NUM_GALILEO 8 UINT "Number of visible Galileo satellites." LITTLE_ENDIAN
APPEND_ITEM NUM_BEIDOU 8 UINT "Number of visible BeiDou satellites." LITTLE_ENDIAN
APPEND_ITEM NUM_QZSS 8 UINT "Number of visible QZSS satellites." LITTLE_ENDIAN

TELEMETRY ADCS_SENSORPROC RANGE BIG_ENDIAN "Range"
# This must ALWAYS be the first entry in any telemetry packet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ SCREEN AUTO AUTO 1.0
SECTIONHEADER "Photodiodes"
LABELVALUE ADCS_SENSORPROC PHOTODIODE CENTER
LABELVALUE ADCS_SENSORPROC PHOTODIODE LEFT
LABELVALUE ADCS_SENSORPROC PHOTODIODE CENTER
LABELVALUE ADCS_SENSORPROC PHOTODIODE RIGHT
END

END
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
ITEM ADCS_SENSORPROC HWMONITOR RECEIVED_TIMESECONDS
ITEM ADCS_SENSORPROC HWMONITOR TEMP
ITEM ADCS_SENSORPROC HWMONITOR TEMP2
ITEM ADCS_SENSORPROC HWMONITOR SUPVOLT
ITEM ADCS_SENSORPROC HWMONITOR ANTCUR
ITEM ADCS_SENSORPROC HWMONITOR ANTVOLT
ITEM ADCS_SENSORPROC HWMONITOR DIGCOREVOLT
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ITEM ADCS_SENSORPROC PHOTODIODE RECEIVED_TIMESECONDS
ITEM ADCS_SENSORPROC PHOTODIODE CENTER
ITEM ADCS_SENSORPROC PHOTODIODE LEFT
ITEM ADCS_SENSORPROC PHOTODIODE RIGHT
ITEM ADCS_SENSORPROC HEALTH RECEIVED_TIMEFORMATTED
ITEM ADCS_SENSORPROC HEALTH INTTEMP
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ITEM ADCS_SENSORPROC HEALTH RECEIVED_TIMESECONDS
ITEM ADCS_SENSORPROC HEALTH INTTEMP
ITEM ADCS_SENSORPROC SUNSENSOR RECEIVED_TIMESECONDS
ITEM ADCS_SENSORPROC SUNSENSOR STATUS
ITEM ADCS_SENSORPROC SUNSENSOR ALPHA
ITEM ADCS_SENSORPROC SUNSENSOR BETA

0 comments on commit 2d7daaf

Please sign in to comment.