KB8PMY
/
CubeSatSim
mirror of https://github.com/alanbjohnston/CubeSatSim.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #401 from alanbjohnston/master-commands-fix

Browse Source 
Fix 4 bit command count in FSK, BPSK
revert-402-pi-sensors-auto
Alan Johnston 4 weeks ago committed by GitHub
parent 6d5e4c5d06 86db53eb13
commit 527839956a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File

2
main.c
Unescape View File

@ -1601,6 +1601,8 @@ void get_tlm_fox() {
encodeA(b, 51 + head_offset, status); encodeA(b, 51 + head_offset, status);
encodeB(b, 52 + head_offset, rxAntennaDeployed + txAntennaDeployed * 2 + c2cStatus * 4); encodeB(b, 52 + head_offset, rxAntennaDeployed + txAntennaDeployed * 2 + c2cStatus * 4);
encodeA(b, 53 + head_offset, groundCommandCount);
if (mode == BPSK) { if (mode == BPSK) {
encodeA(b_max, 51 + head_offset, status); encodeA(b_max, 51 + head_offset, status);
encodeA(b_min, 51 + head_offset, status); encodeA(b_min, 51 + head_offset, status);

35
spacecraft/FoxTelem_1.13i/CubeSatSim_PSK_rttelemetry.csv
Unescape View File

@ -1,4 +1,4 @@
61,TYPE,FIELD,BITS,UNIT,CONVERSION,MODULE,MODULE_NUM,MODULE_LINE,LINE_TYPE,SHORT_NAME,DESCRIPTION 62,TYPE,FIELD,BITS,UNIT,CONVERSION,MODULE,MODULE_NUM,MODULE_LINE,LINE_TYPE,SHORT_NAME,DESCRIPTION
0,realTime,Sensor 2,12,integer,1,Experiments,6,8,3,Sensor 2,STEM Payload Extra Sensor 2 0,realTime,Sensor 2,12,integer,1,Experiments,6,8,3,Sensor 2,STEM Payload Extra Sensor 2
1,realTime,Sensor 3,12,integer,1,Experiments,6,9,3,Sensor 3,STEM Payload Extra Sensor 3 1,realTime,Sensor 3,12,integer,1,Experiments,6,9,3,Sensor 3,STEM Payload Extra Sensor 3
2,realTime,BATT_V,12,V,cubesatsim_voltage|FLOAT2,Battery,4,1,3,Battery Voltage,INA219 Battery Voltage 2,realTime,BATT_V,12,V,cubesatsim_voltage|FLOAT2,Battery,4,1,3,Battery Voltage,INA219 Battery Voltage
@ -41,22 +41,23 @@
39,realTime,I2CBus1Failure,1,-,17,Computer Hardware,2,2,0,I2C Bus 1,I2C bus 1 failure indicator 39,realTime,I2CBus1Failure,1,-,17,Computer Hardware,2,2,0,I2C Bus 1,I2C bus 1 failure indicator
40,realTime,I2CBus3Failure,1,-,17,Computer Hardware,2,3,0,I2C Bus 3,I2C bus 3 failure indicator 40,realTime,I2CBus3Failure,1,-,17,Computer Hardware,2,3,0,I2C Bus 3,I2C bus 3 failure indicator
41,realTime,CameraFailure,1,-,17,Computer Hardware,2,4,0,Camera,Camera failure indicator 41,realTime,CameraFailure,1,-,17,Computer Hardware,2,4,0,Camera,Camera failure indicator
42,realTime,GroundCommands,4,-,1,Computer Software,3,3,0,Ground Commands,Number of ground commands received 42,realTime,GroundCommands,4,-,1,NONE,0,0,0,Ground Commands,Number of ground commands received
43,realTime,RxAntenna,1,-,16,Radio,1,3,0,RX Antenna,Receive antenna status 43,realTime,RxAntenna,1,-,16,Radio,1,3,0,RX Antenna,Receive antenna status
44,realTime,TxAntenna,1,-,16,Radio,1,2,0,TX Antenna,Transmit antenna status 44,realTime,TxAntenna,1,-,16,Radio,1,2,0,TX Antenna,Transmit antenna status
45,realTime,C2CStatus,2,-,COMMAND_STATUS,Computer Software,3,5,0,Command Control, Command & Control Status 45,realTime,C2CStatus,2,-,COMMAND_STATUS,Computer Software,3,5,0,Command Control, Command & Control Status
46,realTime,ICR3VProt,12,V,43,NONE,7,2,3,3V Prot,ICR 3V Proteted 46,realTime,GroundCommands2,10,-,1,Computer Software,3,3,0,Ground Commands,Number of ground commands received
47,realTime,ICR2dot5V,12,V,43,NONE,7,3,3,2.5V,ICR 2.5V 47,realTime,ICR3VProt,12,V,43,NONE,7,2,3,3V Prot,ICR 3V Proteted
48,realTime,ICR2dot5VProt,12,V,43,NONE,7,4,3,2.5V Prot,ICR 2.5V Protected 48,realTime,ICR2dot5V,12,V,43,NONE,7,3,3,2.5V,ICR 2.5V
49,realTime,rf6,12,-,0,NONE,0,0,0,None,None 49,realTime,ICR2dot5VProt,12,V,43,NONE,7,4,3,2.5V Prot,ICR 2.5V Protected
50,realTime,rf7,12,-,0,NONE,0,0,0,None,None 50,realTime,rf6,12,-,0,NONE,0,0,0,None,None
51,realTime,MuxTest,12,V,43,NONE,7,5,3,Sensor Power,Sensor Power Voltage at the ICR 51,realTime,rf7,12,-,0,NONE,0,0,0,None,None
52,realTime,LtVGACtl,12,V,42,NONE,1,4,3,VGA Control,Control Voltage to the Variable Gain Amplifier (VGA) 52,realTime,MuxTest,12,V,43,NONE,7,5,3,Sensor Power,Sensor Power Voltage at the ICR
53,realTime,pad,4,-,34,NONE,0,0,0,None,Unused 53,realTime,LtVGACtl,12,V,42,NONE,1,4,3,VGA Control,Control Voltage to the Variable Gain Amplifier (VGA)
54,realTime,IHUdiagData,32,-,18,NONE,3,2,0,Diagnostic Info,Diagnostic Data on IHU Performance 54,realTime,pad,4,-,34,NONE,0,0,0,None,Unused
55,realTime,pad1,1,-,0,NONE,0,0,0,NONE,Filler 55,realTime,IHUdiagData,32,-,18,NONE,3,2,0,Diagnostic Info,Diagnostic Data on IHU Performance
56,realTime,wodSize,8,000s,36,NONE,3,3,0,WOD Stored,Number of WOD data payloads kept for each of Science and Housekeeping. In hundreds 56,realTime,pad1,1,-,0,NONE,0,0,0,NONE,Filler
57,realTime,swCmds,32,-,35,NONE,7,6,0,Diagnostic,ICR Diagnostic information 57,realTime,wodSize,8,000s,36,NONE,3,3,0,WOD Stored,Number of WOD data payloads kept for each of Science and Housekeeping. In hundreds
58,realTime,hwCmdCnt,6,-,1,NONE,7,7,0,HW Command Count,Number of hardware commands since last reset 58,realTime,swCmds,32,-,35,NONE,7,6,0,Diagnostic,ICR Diagnostic information
59,realTime,swCmdCnt,6,-,1,NONE,7,8,0,SW Command Count,Number of software commands since last reset 59,realTime,hwCmdCnt,6,-,1,NONE,7,7,0,HW Command Count,Number of hardware commands since last reset
60,realTime,pad2,27,-,0,NONE,0,0,0,NONE,Filler 60,realTime,swCmdCnt,6,-,1,NONE,7,8,0,SW Command Count,Number of software commands since last reset
61,realTime,pad2,17,-,0,NONE,0,0,0,NONE,Filler

1 61 62 TYPE FIELD BITS UNIT CONVERSION MODULE MODULE_NUM MODULE_LINE LINE_TYPE SHORT_NAME DESCRIPTION
2 0 realTime Sensor 2 12 integer 1 Experiments 6 8 3 Sensor 2 STEM Payload Extra Sensor 2
3 1 realTime Sensor 3 12 integer 1 Experiments 6 9 3 Sensor 3 STEM Payload Extra Sensor 3
4 2 realTime BATT_V 12 V cubesatsim_voltage|FLOAT2 Battery 4 1 3 Battery Voltage INA219 Battery Voltage
41 39 realTime I2CBus1Failure 1 - 17 Computer Hardware 2 2 0 I2C Bus 1 I2C bus 1 failure indicator
42 40 realTime I2CBus3Failure 1 - 17 Computer Hardware 2 3 0 I2C Bus 3 I2C bus 3 failure indicator
43 41 realTime CameraFailure 1 - 17 Computer Hardware 2 4 0 Camera Camera failure indicator
44 42 realTime GroundCommands 4 - 1 Computer Software NONE 3 0 3 0 0 Ground Commands Number of ground commands received
45 43 realTime RxAntenna 1 - 16 Radio 1 3 0 RX Antenna Receive antenna status
46 44 realTime TxAntenna 1 - 16 Radio 1 2 0 TX Antenna Transmit antenna status
47 45 realTime C2CStatus 2 - COMMAND_STATUS Computer Software 3 5 0 Command Control Command & Control Status
48 46 realTime ICR3VProt GroundCommands2 12 10 V - 43 1 NONE Computer Software 7 3 2 3 3 0 3V Prot Ground Commands ICR 3V Proteted Number of ground commands received
49 47 realTime ICR2dot5V ICR3VProt 12 V 43 NONE 7 3 2 3 2.5V 3V Prot ICR 2.5V ICR 3V Proteted
50 48 realTime ICR2dot5VProt ICR2dot5V 12 V 43 NONE 7 4 3 3 2.5V Prot 2.5V ICR 2.5V Protected ICR 2.5V
51 49 realTime rf6 ICR2dot5VProt 12 - V 0 43 NONE 0 7 0 4 0 3 None 2.5V Prot None ICR 2.5V Protected
52 50 realTime rf7 rf6 12 - 0 NONE 0 0 0 None None
53 51 realTime MuxTest rf7 12 V - 43 0 NONE 7 0 5 0 3 0 Sensor Power None Sensor Power Voltage at the ICR None
54 52 realTime LtVGACtl MuxTest 12 V 42 43 NONE 1 7 4 5 3 VGA Control Sensor Power Control Voltage to the Variable Gain Amplifier (VGA) Sensor Power Voltage at the ICR
55 53 realTime pad LtVGACtl 4 12 - V 34 42 NONE 0 1 0 4 0 3 None VGA Control Unused Control Voltage to the Variable Gain Amplifier (VGA)
56 54 realTime IHUdiagData pad 32 4 - 18 34 NONE 3 0 2 0 0 Diagnostic Info None Diagnostic Data on IHU Performance Unused
57 55 realTime pad1 IHUdiagData 1 32 - 0 18 NONE 0 3 0 2 0 NONE Diagnostic Info Filler Diagnostic Data on IHU Performance
58 56 realTime wodSize pad1 8 1 000s - 36 0 NONE 3 0 3 0 0 WOD Stored NONE Number of WOD data payloads kept for each of Science and Housekeeping. In hundreds Filler
59 57 realTime swCmds wodSize 32 8 - 000s 35 36 NONE 7 3 6 3 0 Diagnostic WOD Stored ICR Diagnostic information Number of WOD data payloads kept for each of Science and Housekeeping. In hundreds
60 58 realTime hwCmdCnt swCmds 6 32 - 1 35 NONE 7 7 6 0 HW Command Count Diagnostic Number of hardware commands since last reset ICR Diagnostic information
61 59 realTime swCmdCnt hwCmdCnt 6 - 1 NONE 7 8 7 0 SW Command Count HW Command Count Number of software commands since last reset Number of hardware commands since last reset
62 60 realTime pad2 swCmdCnt 27 6 - 0 1 NONE 0 7 0 8 0 NONE SW Command Count Filler Number of software commands since last reset
63 61 realTime pad2 17 - 0 NONE 0 0 0 NONE Filler

7
spacecraft/FoxTelem_1.13i/CubeSatSim_rttelemetry.csv
Unescape View File

@ -1,4 +1,4 @@
47,TYPE,FIELD,BITS,UNIT,CONVERSION,MODULE,MODULE_NUM,MODULE_LINE,LINE_TYPE,SHORT_NAME,DESCRIPTION 48,TYPE,FIELD,BITS,UNIT,CONVERSION,MODULE,MODULE_NUM,MODULE_LINE,LINE_TYPE,SHORT_NAME,DESCRIPTION
0,RT,Sensor 2,12,integer,1,Experiments,6,8,3,Sensor 2,STEM Payload Extra Sensor 2 0,RT,Sensor 2,12,integer,1,Experiments,6,8,3,Sensor 2,STEM Payload Extra Sensor 2
1,RT,Sensor 3,12,integer,1,Experiments,6,9,3,Sensor 3,STEM Payload Extra Sensor 3 1,RT,Sensor 3,12,integer,1,Experiments,6,9,3,Sensor 3,STEM Payload Extra Sensor 3
2,RT,BATT_V,12,V,cubesatsim_voltage|FLOAT2,Battery,4,1,3,Battery Voltage,INA219 Battery Voltage 2,RT,BATT_V,12,V,cubesatsim_voltage|FLOAT2,Battery,4,1,3,Battery Voltage,INA219 Battery Voltage
@ -41,8 +41,9 @@
39,RT,I2CBus1Failure,1,-,17,Computer Hardware,2,2,0,I2C Bus 1,I2C bus 1 failure indicator 39,RT,I2CBus1Failure,1,-,17,Computer Hardware,2,2,0,I2C Bus 1,I2C bus 1 failure indicator
40,RT,I2CBus3Failure,1,-,17,Computer Hardware,2,3,0,I2C Bus 3,I2C bus 3 failure indicator 40,RT,I2CBus3Failure,1,-,17,Computer Hardware,2,3,0,I2C Bus 3,I2C bus 3 failure indicator
41,RT,CameraFailure,1,-,17,Computer Hardware,2,4,0,Camera,Camera failure indicator 41,RT,CameraFailure,1,-,17,Computer Hardware,2,4,0,Camera,Camera failure indicator
42,RT,GroundCommands,4,-,1,Computer Software,3,3,0,Ground Commands,Number of ground commands received 42,RT,GroundCommands,4,-,1,NONE,0,0,0,Ground Commands,Number of ground commands received
43,RT,RXAntenna,1,-,16,Radio,1,3,0,RX Antenna,Receive antenna status 43,RT,RXAntenna,1,-,16,Radio,1,3,0,RX Antenna,Receive antenna status
44,RT,TXAntenna,1,-,16,Radio,1,2,0,TX Antenna,Transmit antenna status 44,RT,TXAntenna,1,-,16,Radio,1,2,0,TX Antenna,Transmit antenna status
45,RT,C2CStatus,2,-,COMMAND_STATUS,Computer Software,3,5,0,Command Control, Command & Control Status 45,RT,C2CStatus,2,-,COMMAND_STATUS,Computer Software,3,5,0,Command Control, Command & Control Status
46,RT,Pad,56,-,0,NONE,0,0,0,NONE,NONE 46,RT,GroundCommands2,10,-,1,Computer Software,3,3,0,Ground Commands,Number of ground commands received
47,RT,Pad,46,-,0,NONE,0,0,0,NONE,NONE

1 47 48 TYPE FIELD BITS UNIT CONVERSION MODULE MODULE_NUM MODULE_LINE LINE_TYPE SHORT_NAME DESCRIPTION
2 0 RT Sensor 2 12 integer 1 Experiments 6 8 3 Sensor 2 STEM Payload Extra Sensor 2
3 1 RT Sensor 3 12 integer 1 Experiments 6 9 3 Sensor 3 STEM Payload Extra Sensor 3
4 2 RT BATT_V 12 V cubesatsim_voltage|FLOAT2 Battery 4 1 3 Battery Voltage INA219 Battery Voltage
41 39 RT I2CBus1Failure 1 - 17 Computer Hardware 2 2 0 I2C Bus 1 I2C bus 1 failure indicator
42 40 RT I2CBus3Failure 1 - 17 Computer Hardware 2 3 0 I2C Bus 3 I2C bus 3 failure indicator
43 41 RT CameraFailure 1 - 17 Computer Hardware 2 4 0 Camera Camera failure indicator
44 42 RT GroundCommands 4 - 1 Computer Software NONE 3 0 3 0 0 Ground Commands Number of ground commands received
45 43 RT RXAntenna 1 - 16 Radio 1 3 0 RX Antenna Receive antenna status
46 44 RT TXAntenna 1 - 16 Radio 1 2 0 TX Antenna Transmit antenna status
47 45 RT C2CStatus 2 - COMMAND_STATUS Computer Software 3 5 0 Command Control Command & Control Status
48 46 RT Pad GroundCommands2 56 10 - 0 1 NONE Computer Software 0 3 0 3 0 NONE Ground Commands NONE Number of ground commands received
49 47 RT Pad 46 - 0 NONE 0 0 0 NONE NONE

4
spacecraft/FoxTelem_1.13i/README.md
Unescape View File

@ -1,7 +1,7 @@
These files update the spacecraft files in FoxTelem version 1.13i or later and fix a bug in the payload altitude sensor display. These files update the spacecraft files in FoxTelem version 1.13i or later and fix a bug in the payload altitude sensor display.
You can download them as a zip file: [foxtelem_spacecraft_files.zip](https://github.com/user-attachments/files/23217474/foxtelem_spacecraft_files.zip) You can download them as a zip file: [foxtelem_spacecraft_files.zip](https://github.com/user-attachments/files/23393444/foxtelem_spacecraft_files.zip)
Extract (unzip foxtelem_spacecraft_files) and copy into FoxTelem spacecraft folder, replacing existing files. Extract (unzip foxtelem_spacecraft_files.zip) and copy into FoxTelem spacecraft folder, replacing existing files.
Next time you run FoxTelem, the CubeSatSim-FSK and CubeSatSim-BPSK spacecraft will be automatically updated. Next time you run FoxTelem, the CubeSatSim-FSK and CubeSatSim-BPSK spacecraft will be automatically updated.

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.