4 to 3, Humidity, Sensor 1 & 2

spacecraft/FoxTelem_11a/CubeSatSim_PSK_mintelemetry.csv

@@ -5,7 +5,7 @@
 3,MIN,SatelliteXAxisAcceleration,12,g,cubesatsim_acceleration|FLOAT2,NONE,7,4,3,Acceleration,Acceleration around X Axis
 4,MIN,SatelliteYAxisAcceleration,12,g,cubesatsim_acceleration|FLOAT2,NONE,8,4,3,Acceleration,Acceleration around Y Axis
 5,MIN,SatelliteZAxisAcceleration,12,g,cubesatsim_acceleration|FLOAT2,NONE,9,4,3,Acceleration,Acceleration around Z Axis
-6,MIN,battCurr,12,mA,cubesatsim_current,NONE,4,2,4,Current,Total Battery DC current
+6,MIN,battCurr,12,mA,cubesatsim_current,NONE,4,2,3,Current,Total Battery DC current
 7,MIN,Temperature,12,C,cubesatsim_temperature,NONE,6,2,3,Temp,STEM Payload Sensor Temperature
 8,MIN,posXv,12,V,cubesatsim_voltage|FLOAT2,NONE,7,1,3,Voltage,+X solar Panel voltage
 9,MIN,posYv,12,V,cubesatsim_voltage|FLOAT2,NONE,8,1,3,Voltage,+Y solar Panel voltage
@@ -13,15 +13,15 @@
 11,MIN,negXv,12,V,cubesatsim_voltage|FLOAT2,NONE,10,1,3,Voltage,-X solar Panel voltage
 12,MIN,negYv,12,V,cubesatsim_voltage|FLOAT2,NONE,11,1,3,Voltage,-Y solar Panel voltage
 13,MIN,negZv,12,V,cubesatsim_voltage|FLOAT2,NONE,12,1,3,Voltage,-Z solar Panel voltage
-14,MIN,posXi,12,mA,cubesatsim_current,NONE,7,2,4,Current,+X solar Panel current
-15,MIN,posYi,12,mA,cubesatsim_current,NONE,8,2,4,Current,+Y solar Panel current
-16,MIN,posZi,12,mA,cubesatsim_current,NONE,9,2,4,Current,+Z solar Panel current
-17,MIN,negXi,12,mA,cubesatsim_current,NONE,10,2,4,Current,-X solar Panel current
-18,MIN,negYi,12,mA,cubesatsim_current,NONE,11,2,4,Current,-Y solar Panel current
-19,MIN,negZi,12,mA,cubesatsim_current,NONE,12,2,4,Current,-Z solar Panel current
+14,MIN,posXi,12,mA,cubesatsim_current,NONE,7,2,3,Current,+X solar Panel current
+15,MIN,posYi,12,mA,cubesatsim_current,NONE,8,2,3,Current,+Y solar Panel current
+16,MIN,posZi,12,mA,cubesatsim_current,NONE,9,2,3,Current,+Z solar Panel current
+17,MIN,negXi,12,mA,cubesatsim_current,NONE,10,2,3,Current,-X solar Panel current
+18,MIN,negYi,12,mA,cubesatsim_current,NONE,11,2,3,Current,-Y solar Panel current
+19,MIN,negZi,12,mA,cubesatsim_current,NONE,12,2,3,Current,-Z solar Panel current
 20,MIN,PSUVoltage,12,V,cubesatsim_voltage|FLOAT2,NONE,5,1,3,Board Voltage,Power Supply Voltage
 21,MIN,spin,12,rpm,cubesatsim_rpm,NONE,3,1,3,Spacecraft Spin,Calculated spin rate using solar cells
-22,MIN,Pressure,12,bar,cubesatsim_pressure,NONE,6,3,3,Pressure,STEM Payload Sensor Pressure
+22,MIN,Pressure,12,hPa,cubesatsim_pressure,NONE,6,3,3,Pressure,STEM Payload Sensor Pressure
 23,MIN,Altitude,12,m,cubesatsim_altitude,NONE,6,4,3,Altitude,STEM Payload Sensor Altitude
 24,MIN,Resets,12,-,12,NONE,3,2,3,Reset Count, Software Reset Count
 25,MIN,rssi,12,dBm,cubesatsim_rssi|INT,NONE,1,1,3,RSSI,Received Signal Strength Indication
@@ -29,10 +29,10 @@
 27,MIN,SatelliteXAxisAngularVelocity,12,dps,cubesatsim_rotation,NONE,7,3,3,Rotation,Angular Veolcity around X Axis
 28,MIN,SatelliteYAxisAngularVelocity,12,dps,cubesatsim_rotation,NONE,8,3,3,Rotation,Angular Veolcity around Y Axis
 29,MIN,SatelliteZAxisAngularVelocity,12,dps,cubesatsim_rotation,NONE,9,3,3,Rotation,Angular Veolcity around Z Axis
-30,MIN,Sensor1,12,raw,cubesatsim_sensor1|INT,NONE,6,5,3,Sensor 1,STEM Payload Extra Sensor 1
+30,MIN,12,%,cubesatsim_temperature,Experiments,6,5,3,Humidity,Humidity
 31,MIN,PSUCurrent,12,mA,cubesatsim_current,NONE,5,2,3,Current,Power Supply DC Current
-32,MIN,Sensor2,12,signed raw,cubesatsim_sensor2|INT,NONE,6,6,3,Sensor 2,STEM Payload Extra Sensor 2
-33,MIN,Sensor3,12,signed raw,cubesatsim_sensor3|FLOAT2,NONE,6,7,3,Sensor 3,STEM Payload Extra Sensor 3
+32,MIN,Sensor1,12,signed raw,cubesatsim_sensor2|INT,NONE,6,6,3,Sensor 1,STEM Payload Extra Sensor 1
+33,MIN,Sensor2,12,signed raw,cubesatsim_sensor3|FLOAT2,NONE,6,7,3,Sensor 2,STEM Payload Extra Sensor 2
 34,MIN,ICR3VProt,12,V,43,NONE,7,2,3,3V Prot,ICR 3V Proteted
 35,MIN,ICR2dot5V,12,V,43,NONE,7,3,3,2.5V,ICR 2.5V
 36,MIN,ICR2dot5VProt,12,V,43,NONE,7,4,3,2.5V Prot,ICR 2.5V Protected