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

Merge pull request #380 from alanbjohnston/master-latency

Browse Source 
Fix Sensor 1, 2, 3 Max Min bug
pull/381/head
Alan Johnston 5 months ago committed by GitHub
parent f23ca9db80 e048259ef4
commit 29f9b4d112
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File

13
main.c
Unescape View File

@ -1483,9 +1483,9 @@ void get_tlm_fox() {
encodeB(b_max, 10 + head_offset, (int)(sensor_max[TEMP] * 10 + 0.5)); encodeB(b_max, 10 + head_offset, (int)(sensor_max[TEMP] * 10 + 0.5));
encodeA(b_max, 45 + head_offset, (int)(sensor_max[HUMI] * 10 + 0.5)); encodeA(b_max, 45 + head_offset, (int)(sensor_max[HUMI] * 10 + 0.5));
encodeB(b_max, 49 + head_offset, (int)(sensor[XS1])); encodeB(b_max, 49 + head_offset, (int)(sensor_max[XS1]));
encodeA(b_max, 0 + head_offset, (int)(sensor[XS2])); encodeA(b_max, 0 + head_offset, (int)(sensor_max[XS2]));
encodeB(b_max, 1 + head_offset, (int)(sensor[XS3])); encodeB(b_max, 1 + head_offset, (int)(sensor_max[XS3]));
} }
else else
{ {
@ -1540,9 +1540,9 @@ void get_tlm_fox() {
encodeB(b_min, 10 + head_offset, (int)(sensor_min[TEMP] * 10 + 0.5)); encodeB(b_min, 10 + head_offset, (int)(sensor_min[TEMP] * 10 + 0.5));
encodeA(b_min, 45 + head_offset, (int)(sensor_min[HUMI] * 10 + 0.5)); encodeA(b_min, 45 + head_offset, (int)(sensor_min[HUMI] * 10 + 0.5));
encodeB(b_min, 49 + head_offset, (int)(sensor[XS1])); encodeB(b_min, 49 + head_offset, (int)(sensor_min[XS1]));
encodeA(b_min, 0 + head_offset, (int)(sensor[XS2])); encodeA(b_min, 0 + head_offset, (int)(sensor_min[XS2]));
encodeB(b_min, 1 + head_offset, (int)(sensor[XS3])); encodeB(b_min, 1 + head_offset, (int)(sensor_min[XS3]));
} }
else else
{ {
@ -2103,7 +2103,6 @@ int get_payload_serial(int debug_camera) {
jpeg_start = 0; jpeg_start = 0;
serialFlush (uart_fd); // flush serial buffer so latest payload is read serialFlush (uart_fd); // flush serial buffer so latest payload is read
// #ifdef GET_IMAGE_DEBUG // #ifdef GET_IMAGE_DEBUG
if (debug_camera) if (debug_camera)
printf("Received from Payload:\n"); printf("Received from Payload:\n");

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.