From 4b4947879c7f8be501b4392e5c1dd292f9944ed2 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 21 Jul 2019 04:41:03 -0400 Subject: [PATCH] switched to Adafruit I2C readings for all voltages and currents --- afsk/main.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index 4d9653f0..a86f7618 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -477,20 +477,33 @@ int get_tlm(int tlm[][5]) { count, voltsBus[BUS], voltsShunt[BUS], current[BUS], power[BUS]); #endif - tlm[1][A] = (int)(strtof(ina219[SENSOR_4A + CURRENTV], NULL) / 15 + 0.5) % 100; // Current of 5V supply to Pi - tlm[1][B] = (int) (99.5 - strtof(ina219[SENSOR_40 + CURRENTV], NULL)/10) % 100; // +X current [4] - tlm[1][C] = (int) (99.5 - x_current/10) % 100; // X- current [10] - tlm[1][D] = (int) (99.5 - strtof(ina219[SENSOR_41 + CURRENTV], NULL)/10) % 100; // +Y current [7] - - tlm[2][A] = (int) (99.5 - y_current/10) % 100; // -Y current [10] - tlm[2][B] = (int) (99.5 - strtof(ina219[SENSOR_44 + CURRENTV], NULL)/10) % 100; // +Z current [10] // was 70/2m transponder power, AO-7 didn't have a Z panel - tlm[2][C] = (int) (99.5 - z_current/10) % 100; // -Z current (was timestamp) +// tlm[1][A] = (int)(strtof(ina219[SENSOR_4A + CURRENTV], NULL) / 15 + 0.5) % 100; // Current of 5V supply to Pi +// tlm[1][B] = (int) (99.5 - strtof(ina219[SENSOR_40 + CURRENTV], NULL)/10) % 100; // +X current [4] +// tlm[1][C] = (int) (99.5 - x_current/10) % 100; // X- current [10] +// tlm[1][D] = (int) (99.5 - strtof(ina219[SENSOR_41 + CURRENTV], NULL)/10) % 100; // +Y current [7] + + tlm[1][A] = (int) (99.5 - current[BUS]/10) % 100; + tlm[1][B] = (int) (99.5 - current[PLUS_X]/10) % 100; + tlm[1][C] = (int) (99.5 - current[MINUS_X]/10) % 100; + tlm[1][D] = (int) (99.5 - current[PLUS_Y]/10) % 100; + tlm[2][A] = (int) (99.5 - current[MINUS_Y]/10) % 100; + tlm[2][B] = (int) (99.5 - current[PLUS_Z]/10) % 100; + tlm[2][C] = (int) (99.5 - current[MINUS_Z]/10) % 100; + +// tlm[2][A] = (int) (99.5 - y_current/10) % 100; // -Y current [10] +// tlm[2][B] = (int) (99.5 - strtof(ina219[SENSOR_44 + CURRENTV], NULL)/10) % 100; // +Z current [10] // was 70/2m transponder power, AO-7 didn't have a Z panel +// tlm[2][C] = (int) (99.5 - z_current/10) % 100; // -Z current (was timestamp) // 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)(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[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)((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][B] = (int)(voltBus[BUS] * 10.0) % 100; if (tempSensor != -1) { int tempValue = wiringPiI2CReadReg16(tempSensor, 0);