diff --git a/main.c b/main.c index fd07adaa..679a7073 100644 --- a/main.c +++ b/main.c @@ -1588,10 +1588,10 @@ void get_tlm_fox() { encodeA(b_max, 42 + head_offset, (int)(sensor_max[GYRO_Y] + 0.5) + 2048); encodeB(b_max, 43 + head_offset, (int)(sensor_max[GYRO_Z] + 0.5) + 2048); - encodeA(b_max, 48 + head_offset, (int)(sensor_max[GPS1] * 10 + 0.5) + 2048); - encodeB(b_max, 49 + head_offset, (int)(sensor_max[GPS2] * 10 + 0.5) + 2048); + encodeA(b_max, 48 + head_offset, (int)(sensor_max[DTEMP] * 10 + 0.5) + 2048); + encodeB(b_max, 49 + head_offset, (int)(sensor_max[XS1] * 10 + 0.5) + 2048); encodeB(b_max, 10 + head_offset, (int)(sensor_max[TEMP] * 10 + 0.5)); - encodeA(b_max, 45 + head_offset, (int)(sensor_max[XS1] * 10 + 0.5)); + encodeA(b_max, 45 + head_offset, (int)(sensor_max[XS2] * 10 + 0.5)); } else { @@ -1644,7 +1644,7 @@ void get_tlm_fox() { encodeA(b_min, 48 + head_offset, (int)(sensor_min[DTEMP] * 10 + 0.5) + 2048); encodeB(b_min, 49 + head_offset, (int)(sensor_min[XS1] * 10 + 0.5) + 2048); 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[XS2] * 10 + 0.5)); } else { @@ -1679,8 +1679,8 @@ void get_tlm_fox() { encodeA(b, 45 + head_offset, (int)(sensor[HUMI] * 10 + 0.5)); // in place of sensor1 encodeB(b, 46 + head_offset, PSUCurrent); - encodeA(b, 48 + head_offset, (int)(sensor[GPS1] * 10 + 0.5) + 2048); - encodeB(b, 49 + head_offset, (int)(sensor[GPS2] * 10 + 0.5) + 2048); + encodeA(b, 48 + head_offset, (int)(sensor[DTEMP] * 10 + 0.5) + 2048); + encodeB(b, 49 + head_offset, (int)(sensor[XS1] * 10 + 0.5) + 2048); FILE * command_count_file = fopen("/home/pi/CubeSatSim/command_count.txt", "r"); if (command_count_file != NULL) {