[paparazzi-commits] [4391]

[antoine drouin]

Revision: 4391
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4391
Author:   poine
Date:     2009-12-24 04:04:12 +0000 (Thu, 24 Dec 2009)
Log Message:
-----------


Modified Paths:
--------------
    paparazzi4/trunk/hw/booz/baro_amp.sce

Modified: paparazzi4/trunk/hw/booz/baro_amp.sce
===================================================================
--- paparazzi4/trunk/hw/booz/baro_amp.sce       2009-12-23 23:39:42 UTC (rev 
4390)
+++ paparazzi4/trunk/hw/booz/baro_amp.sce       2009-12-24 04:04:12 UTC (rev 
4391)
@@ -1,18 +1,38 @@
 clear();
 
+// anton : 3.5855 -> 950m
+
 //
 // baro sensitivity 45.9mV/kPa  [\xA0]
 // baro range 15-115 kPa
+// offset 0.2V at 15kPa
 //
+// v_sensor_volt = 0.2 + (p_pascal-15000)*45.9e-6
+//
 
+
+function [v] = sensor_of_pressure(p)
+  sensor_sensitivity = 45.9e-6 ; // V/Pa
+  v = 0.2 + (p-15000)*45.9e-6;
+endfunction
+
+
 //
 // amplifier parameters
 //
-R10 = 27e3;
-R5  = 390;
-R6  = 12e3;
-R20 = 560;
-R21 = 680;
+if 1
+  R10 = 27e3;
+  R5  = 390;
+  R6  = 12e3;
+  R20 = 560;
+  R21 = 680;
+else
+  R10 = 27e3;
+  R5  = 390;
+  R6  = 12e3;
+  R20 = 359;
+  R21 = 680;
+end
 
 function [vo] = amplify(vi, off1)
   vo = zeros(1:length(vi));
@@ -47,17 +67,16 @@
 endfunction
 
 
-sensor_sensitivity = 45.9e-6 ;                        // V/Pa
-
-alt_range = 0:11000;
+alt_range = -1000:11000;
 pressure_range = zeros(1,length(alt_range));
+sensor_output =  zeros(1,length(alt_range));
 for i=1:length(alt_range)
   pressure_range(i) = pressure_of_alt(alt_range(i));
+  sensor_output(i) = sensor_of_pressure(pressure_range(i));
 end
-sensor_output = pressure_range*sensor_sensitivity;
 
 
-vi = 3.6:0.001:4.5;
+vi = 3.1:0.001:4.7;
 
 clf();
 subplot(3,1,1);
@@ -96,11 +115,12 @@
 
 
 k = find(sensor_output < max_sensor_out);
+min_alt = alt_range(k(1))
+k = find(sensor_output < min_sensor_out);
 max_alt = alt_range(k(1))
-k = find(sensor_output < min_sensor_out);
-min_alt = alt_range(k(1))
 
 
 
 gain = 1 + R10/R6 + R10/R5 + R10/(R20+R21)
 
+offset_gain = R10/(R20+R21)
\ No newline at end of file