From e6fd3b3dca206bf61b84e563cb1f2384eef43d04 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Mon, 22 Jul 2019 14:26:16 -0400 Subject: [PATCH] changed order of current and bus reading to match old code --- afsk/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index 7e20c097..7ec2d60f 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -466,9 +466,9 @@ int get_tlm(int tlm[][5]) { printf("Read sensor[%d] ", count); #endif setCalibration_16V_400mA(sensor[count]); - voltsShunt[count] = getShuntVoltage_mV(sensor[count])/1000; - voltsBus[count] = getBusVoltage_V(sensor[count]); current[count] = getCurrent_mA(sensor[count]); + voltsBus[count] = getBusVoltage_V(sensor[count]); + voltsShunt[count] = getShuntVoltage_mV(sensor[count])/1000; power[count] = getPower_mW(sensor[count]); } else @@ -489,9 +489,9 @@ int get_tlm(int tlm[][5]) { printf("Read sensor[%d] ", BUS); #endif setCalibration_16V_2A(sensor[BUS]); - voltsShunt[BUS] = getShuntVoltage_mV(sensor[BUS])/1000; - voltsBus[BUS] = getBusVoltage_V(sensor[BUS]); current[BUS] = getCurrent_mA(sensor[BUS]); // * 4; + voltsBus[BUS] = getBusVoltage_V(sensor[BUS]); + voltsShunt[BUS] = getShuntVoltage_mV(sensor[BUS])/1000; power[BUS] = getPower_mW(sensor[BUS]); // *2; } else