Skip to content

Commit

Permalink
Add more sensor proc commands and screens
Browse files Browse the repository at this point in the history
  • Loading branch information
djdupre committed Mar 23, 2018
1 parent 367967e commit fc1a940
Show file tree
Hide file tree
Showing 8 changed files with 154 additions and 48 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
STATE OK 0
STATE WARN_LOWER 1
STATE ERR_LOWER 2
STATE WARN_UPPER 3
STATE ERR_UPPER 4
24 changes: 24 additions & 0 deletions COSMOS/flatsat/config/targets/ADCS_SENSORPROC/cmd_tlm/ss_cmd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,27 @@ COMMAND ADCS_SENSORPROC OVERRIDE_BUCK LITTLE_ENDIAN "Buck converter status overr
APPEND_PARAMETER ENABLE 8 UINT 0 1 0 "Override enable/disable"
STATE DISABLE 0
STATE ENABLE 1 HAZARDOUS "Warning! Bad buck converter status will be ignored."

COMMAND ADCS_SENSORPROC TEST_RESET LITTLE_ENDIAN "Direct RESET pin control"
# This must ALWAYS be the first entry in any command packet
<%= render "../../SYSTEM/cmd_tlm/_shared_cmd_header.txt", locals: { eid: 10, opc: 4 } %>

APPEND_PARAMETER ACTIVATE 8 UINT 0 1 0 "Activate/deactivate"
STATE DEACTIVATE 0
STATE ACTIVATE 1

COMMAND ADCS_SENSORPROC TEST_BUCK LITTLE_ENDIAN "Direct buck converter control"
# This must ALWAYS be the first entry in any command packet
<%= render "../../SYSTEM/cmd_tlm/_shared_cmd_header.txt", locals: { eid: 10, opc: 5 } %>

APPEND_PARAMETER ENABLE 8 UINT 0 1 0 "Enable/disable"
STATE DISABLE 0
STATE ENABLE 1

COMMAND ADCS_SENSORPROC TEST_GPS_SWITCH LITTLE_ENDIAN "Direct GPS switch control"
# This must ALWAYS be the first entry in any command packet
<%= render "../../SYSTEM/cmd_tlm/_shared_cmd_header.txt", locals: { eid: 10, opc: 6 } %>

APPEND_PARAMETER ENABLE 8 UINT 0 1 0 "Enable/disable"
STATE DISABLE 0
STATE ENABLE 1 HAZARDOUS "Warning! GPS will power on"
12 changes: 12 additions & 0 deletions COSMOS/flatsat/config/targets/ADCS_SENSORPROC/cmd_tlm/ss_tlm.txt
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,28 @@ TELEMETRY ADCS_SENSORPROC HWMONITOR BIG_ENDIAN "Hardware measurements"

APPEND_ITEM TEMP 32 FLOAT "Temperature" LITTLE_ENDIAN
UNITS Celcius C
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
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
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
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
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
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
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
SCREEN AUTO AUTO 1.0

TITLE "Manual GPS Power"

MATRIXBYCOLUMNS 4
LABEL "Buck converter"
VALUE ADCS_SENSORPROC GPSPOWER BUCK
BUTTON "Disable" "cmd('ADCS_SENSORPROC TEST_BUCK with ENABLE 0')"
BUTTON "Enable" "cmd('ADCS_SENSORPROC TEST_BUCK with ENABLE 1')"

LABEL "GPS switch"
VALUE ADCS_SENSORPROC GPSPOWER GPS
BUTTON "Disable" "cmd('ADCS_SENSORPROC TEST_GPS_SWITCH with ENABLE 0')"
BUTTON "Enable" "cmd('ADCS_SENSORPROC TEST_GPS_SWITCH with ENABLE 1')"

LABEL "RESET pin"
VALUE ADCS_SENSORPROC GPSPOWER RESET
BUTTON "Activate" "cmd('ADCS_SENSORPROC TEST_RESET with ACTIVATE 0')"
BUTTON "Deactivate" "cmd('ADCS_SENSORPROC TEST_RESET with ACTIVATE 1')"
END
16 changes: 0 additions & 16 deletions COSMOS/flatsat/config/targets/ADCS_SENSORPROC/screens/pos.txt

This file was deleted.

58 changes: 58 additions & 0 deletions COSMOS/flatsat/config/targets/ADCS_SENSORPROC/screens/sensors.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
SCREEN AUTO AUTO 1.0

HORIZONTALBOX

VERTICALBOX
SECTIONHEADER "GPS"

VALUE ADCS_SENSORPROC POSVEL POS_STATUS

HORIZONTALLINE

SECTIONHEADER "Time"
LABELVALUE ADCS_SENSORPROC POSVEL WEEK
LABELVALUE ADCS_SENSORPROC POSVEL MS

SECTIONHEADER "Position"
LABELVALUEDESC ADCS_SENSORPROC POSVEL POSX "X"
LABELVALUEDESC ADCS_SENSORPROC POSVEL POSY "Y"
LABELVALUEDESC ADCS_SENSORPROC POSVEL POSZ "Z"

SECTIONHEADER "Velocity"
LABELVALUEDESC ADCS_SENSORPROC POSVEL VELX "X"
LABELVALUEDESC ADCS_SENSORPROC POSVEL VELY "Y"
LABELVALUEDESC ADCS_SENSORPROC POSVEL VELZ "Z"
END


VERTICALBOX
SECTIONHEADER "Sun sensor"

LABELVALUEDESC ADCS_SENSORPROC SUNSENSOR STATUS
LABELFORMATVALUE ADCS_SENSORPROC SUNSENSOR ALPHA "%.2f" FORMATTED
LABELFORMATVALUE ADCS_SENSORPROC SUNSENSOR BETA "%.2f" FORMATTED

CANVAS 241 241
CANVASLABEL 120 20 "B 60"
CANVASLABEL 120 240 "B -60"
CANVASLABEL 0 120 "A -60"
CANVASLABEL 190 120 "A 60"
CANVASLINE 0 0 240 0
CANVASLINE 240 0 240 240
CANVASLINE 240 240 0 240
CANVASLINE 0 240 0 0
CANVASLINE 119 1 119 239 gray
CANVASLINE 1 119 239 119 gray
CANVASDOT 'tlm_variable("ADCS_SENSORPROC SUNSENSOR ALPHA", :RAW) * 2 + 120' 'tlm_variable("ADCS_SENSORPROC SUNSENSOR BETA", :RAW) * -2 + 120' red 5
END
END


VERTICALBOX
SECTIONHEADER "Photodiodes"
LABELVALUE ADCS_SENSORPROC PHOTODIODE CENTER
LABELVALUE ADCS_SENSORPROC PHOTODIODE LEFT
LABELVALUE ADCS_SENSORPROC PHOTODIODE CENTER
END

END
39 changes: 35 additions & 4 deletions COSMOS/flatsat/config/targets/ADCS_SENSORPROC/screens/status.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,39 @@ SCREEN AUTO AUTO 1.0

TITLE "Status"

VERTICALBOX
SECTIONHEADER "Information"
LABELVALUE ADCS_SENSORPROC STATUS VALUE
LABELVALUE ADCS_SENSORPROC STATUS BOOL
SECTIONHEADER "Board"
LABELVALUE ADCS_SENSORPROC HEALTH OMS
LABELVALUE ADCS_SENSORPROC HEALTH RESETCOUNT
LABELVALUEDESC ADCS_SENSORPROC GPSPOWER STATE
BUTTON "Disable GPS" "cmd('ADCS_SENSORPROC GPS_ENABLE with ENABLE 0')"
BUTTON "Enable GPS" "cmd('ADCS_SENSORPROC GPS_ENABLE with ENABLE 1')"

SECTIONHEADER "Receiver"
LABELVALUEDESC ADCS_SENSORPROC RXSTATUS ERROR
LABELVALUEDESC ADCS_SENSORPROC RXSTATUS STATUS
LABELVALUEDESC ADCS_SENSORPROC RXSTATUS AUX1
LABELVALUEDESC ADCS_SENSORPROC RXSTATUS AUX2
LABELVALUEDESC ADCS_SENSORPROC RXSTATUS AUX3

SECTIONHEADER "Hardware monitor"
LABELVALUEDESC ADCS_SENSORPROC HEALTH INTTEMP "MSP temp"

MATRIXBYCOLUMNS 2
LABELVALUEDESC ADCS_SENSORPROC HWMONITOR TEMP "GPS temp"
VALUE ADCS_SENSORPROC HWMONITOR TEMP_S

LABELVALUEDESC ADCS_SENSORPROC HWMONITOR TEMP2 "GPS temp 2"
VALUE ADCS_SENSORPROC HWMONITOR TEMP2_S

LABELVALUEDESC ADCS_SENSORPROC HWMONITOR SUPVOLT
VALUE ADCS_SENSORPROC HWMONITOR SUPVOLT_S

LABELVALUEDESC ADCS_SENSORPROC HWMONITOR ANTCUR
VALUE ADCS_SENSORPROC HWMONITOR ANTCUR_S

LABELVALUEDESC ADCS_SENSORPROC HWMONITOR ANTVOLT
VALUE ADCS_SENSORPROC HWMONITOR ANTVOLT_S

LABELVALUEDESC ADCS_SENSORPROC HWMONITOR DIGCOREVOLT
VALUE ADCS_SENSORPROC HWMONITOR DIGCOREVOLT_S
END

This file was deleted.

0 comments on commit fc1a940

Please sign in to comment.