added camera to telem

pull/72/head
alanbjohnston 5 years ago committed by GitHub
parent 9afe0f8057
commit 138c41f590
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -125,7 +125,7 @@ float latitude = 39.027702, longitude = -77.078064;
float lat_file, long_file;
float axis[3], angle[3], volts_max[3], amps_max[3], batt, speed, period, tempS, temp_max, temp_min;
int eclipse, i2c_bus0 = OFF, i2c_bus1 = OFF, i2c_bus3 = OFF, sim_mode = FALSE;
int eclipse, i2c_bus0 = OFF, i2c_bus1 = OFF, i2c_bus3 = OFF, camera = OFF, sim_mode = FALSE;
double eclipse_time;
int test_i2c_bus(int bus);
@ -405,9 +405,6 @@ else
i2c_bus0 = (test_i2c_bus(0) != -1) ? ON: OFF;
i2c_bus1 = (test_i2c_bus(1) != -1) ? ON: OFF;
i2c_bus3 = (test_i2c_bus(3) != -1) ? ON: OFF;
i2c_bus1 = ON; // testing
i2c_bus3 = ON;
#ifdef DEBUG_LOGGING
printf("INFO: I2C bus status 0: %d 1: %d 3: %d \n",i2c_bus0, i2c_bus1, i2c_bus3);
@ -1319,7 +1316,7 @@ if (payload == ON)
encodeA(b, 48 + head_offset, sensor2);
encodeB(b, 49 + head_offset, sensor3);
encodeA(b, 51 + head_offset, STEMBoardFailure + NormalModeFailure * 2 + (i2c_bus0 == OFF) * 16 + (i2c_bus1 == OFF) * 32 + (i2c_bus3 == OFF) * 64 + groundCommandCount * 256);
encodeA(b, 51 + head_offset, STEMBoardFailure + NormalModeFailure * 2 + (i2c_bus0 == OFF) * 16 + (i2c_bus1 == OFF) * 32 + (i2c_bus3 == OFF) * 64 + (camera == OFF) * 128 + groundCommandCount * 256);
encodeB(b, 52 + head_offset, rxAntennaDeployed + txAntennaDeployed* 2);
short int data10[headerLen + rsFrames * (rsFrameLen + parityLen)];

Loading…
Cancel
Save

Powered by TurnKey Linux.