rest of sensors

afsk/telem.c

@@ -152,7 +152,7 @@ struct SensorConfig config_sensor(char *bus, int address,  int milliAmps) {
     //#ifdef DEBUG_LOGGING
 //	printf("Sensor %s %x configuration: %d %d %d %d %d\n", bus, address, data.fd,
 //	       data.config, data.calValue, data.currentDivider, data.powerMultiplier); 
-	printf("Sensor %s %x | ", bus, address); 
+//	printf("Sensor %s %x | ", bus, address); 
     //#endif	
     return data;
 }
@@ -252,42 +252,49 @@ int main(int argc, char *argv[]) {
 //	        PLUS_X, readingV.voltage, readingV.current, readingV.power);
 	        PLUS_X, reading[PLUS_X].voltage, reading[PLUS_X].current, reading[PLUS_X].power);
 	
-  sensorV  = config_sensor("/dev/i2c-1", 0x41, 400);
-  readingV = read_sensor_data(sensorV);
+//  sensorV  = config_sensor("/dev/i2c-1", 0x41, 400);
+//  readingV = read_sensor_data(sensorV);
   printf("+Y  | sensor[%d] % 4.2fV % 6.1fmA  % 6.1fmW \n", 
-	        PLUS_Y, readingV.voltage, readingV.current, readingV.power);
+//	        PLUS_Y, readingV.voltage, readingV.current, readingV.power);
+	        PLUS_Y, reading[PLUS_Y].voltage, reading[PLUS_Y].current, reading[PLUS_Y].power);
 	
-  sensorV  = config_sensor("/dev/i2c-0", 0x40, 400);
-  readingV = read_sensor_data(sensorV);
+  //sensorV  = config_sensor("/dev/i2c-0", 0x40, 400);
+  //readingV = read_sensor_data(sensorV);
   printf("+Z  | sensor[%d] % 4.2fV % 6.1fmA  % 6.1fmW \n", 
-	        PLUS_Z, readingV.voltage, readingV.current, readingV.power);
+//	        PLUS_Z, readingV.voltage, readingV.current, readingV.power);
+	        PLUS_Z, reading[PLUS_Z].voltage, reading[PLUS_Z].current, reading[PLUS_Z].power);
 	
-  sensorV = config_sensor("/dev/i2c-0", 0x41, 400);
-  readingV = read_sensor_data(sensorV);
+//  sensorV = config_sensor("/dev/i2c-0", 0x41, 400);
+//  readingV = read_sensor_data(sensorV);
   printf("-X  | sensor[%d] % 4.2fV % 6.1fmA  % 6.1fmW \n", 
-	        MINUS_X, readingV.voltage, readingV.current, readingV.power);
+//	        MINUS_X, readingV.voltage, readingV.current, readingV.power);
+	        MINUS_X, reading[MINUS_X].voltage, reading[MINUS_X].current, reading[MINUS_X].power);
 		
-  sensorV = config_sensor("/dev/i2c-0", 0x44, 400);
-  readingV = read_sensor_data(sensorV);
+//  sensorV = config_sensor("/dev/i2c-0", 0x44, 400);
+//  readingV = read_sensor_data(sensorV);
   printf("-Y  | sensor[%d] % 4.2fV % 6.1fmA  % 6.1fmW \n", 
-	        MINUS_Y, readingV.voltage, readingV.current, readingV.power);
+//	        MINUS_Y, readingV.voltage, readingV.current, readingV.power);
+	        MINUS_Y, reading[MINUS_Y].voltage, reading[MINUS_Y].current, reading[MINUS_Y].power);
 		
-  sensorV = config_sensor("/dev/i2c-0", 0x45, 400); 
-  readingV = read_sensor_data(sensorV);
+//sensorV = config_sensor("/dev/i2c-0", 0x45, 400); 
+//  readingV = read_sensor_data(sensorV);
   printf("-Z  | sensor[%d] % 4.2fV % 6.1fmA  % 6.1fmW \n", 
-	        MINUS_Z, readingV.voltage, readingV.current, readingV.power);
+//	        MINUS_Z, readingV.voltage, readingV.current, readingV.power);
+	        MINUS_Z, reading[MINUS_Z].voltage, reading[MINUS_Z].current, reading[MINUS_Z].power);
 
-		
-  sensorV     = config_sensor("/dev/i2c-1", 0x45, 400);
-  readingV = read_sensor_data(sensorV);
+//  sensorV     = config_sensor("/dev/i2c-1", 0x45, 400);
+//  readingV = read_sensor_data(sensorV);
   printf("Bat | sensor[%d] % 4.2fV % 6.1fmA  % 6.1fmW \n", 
-	        BAT, readingV.voltage, readingV.current, readingV.power);
+//	        BAT, readingV.voltage, readingV.current, readingV.power);
+	        BAT, reading[BAT].voltage, reading[BAT].current, reading[BAT].power);
 		
-  sensorV     = config_sensor("/dev/i2c-1", 0x44, 400);
-  readingV = read_sensor_data(sensorV);
+ // sensorV     = config_sensor("/dev/i2c-1", 0x44, 400);
+ // readingV = read_sensor_data(sensorV);
   printf("Bus | sensor[%d] % 4.2fV % 6.1fmA  % 6.1fmW \n", 
-	        BUS, readingV.voltage, readingV.current, readingV.power);
-/*	
+//	        BUS, readingV.voltage, readingV.current, readingV.power);
+	        BUS, reading[BUS].voltage, reading[BUS].current, reading[BUS].power);
+
+ /*	
   sensorV = config_sensor("/dev/i2c-3", 0x48, 0);
   if (sensorV.fd != OFF) {
     int tempValue = wiringPiI2CReadReg16(sensorV.fd, 0);