|
|
|
|
@ -497,12 +497,12 @@ int get_tlm(int tlm[][5]) {
|
|
|
|
|
// tlm[2][C] = (int)((time(NULL) - timestamp) / 15) % 100;
|
|
|
|
|
// tlm[2][D] = (int)(50.5 + strtof(ina219[SENSOR_45 + CURRENTV], NULL)/10.0) % 100; // NiMH Battery current
|
|
|
|
|
|
|
|
|
|
tlm[2][D] = (int) (99.5 - current[BATT]/10) % 100;
|
|
|
|
|
tlm[2][D] = (int) (99.5 - current[BAT]/10) % 100;
|
|
|
|
|
|
|
|
|
|
// tlm[3][A] = abs((int)((strtof(ina219[SENSOR_45 + VOLTAGE], NULL) * 10) - 65.5) % 100);
|
|
|
|
|
// tlm[3][B] = (int)(strtof(ina219[SENSOR_4A + VOLTAGE], NULL) * 10.0) % 100; // 5V supply to Pi
|
|
|
|
|
|
|
|
|
|
tlm[3][A] = abs((int)(voltBus[BATT] * 10) - 65.5) % 100)
|
|
|
|
|
tlm[3][A] = abs((int)(voltBus[BAT] * 10) - 65.5) % 100)
|
|
|
|
|
tlm[3][B] = (int)(voltBus[BUS] * 10.0) % 100;
|
|
|
|
|
|
|
|
|
|
if (tempSensor != -1) {
|
|
|
|
|
|