X-Git-Url: https://defiant.homedns.org/gitweb/?p=ros_wild_thumper.git;a=blobdiff_plain;f=scripts%2Fsensor_board.py;h=e431b576a1569c34b4e3f178dd6b72e8fb91c2c8;hp=bddfb580ead0291735485386e601d5ff99e76909;hb=b301eb19e6487497a8bb946c538a25aa4ee28c1d;hpb=dad024ae410398fbf60b75619545e9ee4ab9dad3 diff --git a/scripts/sensor_board.py b/scripts/sensor_board.py index bddfb58..e431b57 100755 --- a/scripts/sensor_board.py +++ b/scripts/sensor_board.py @@ -11,8 +11,8 @@ from pyshared.humidity import * from wild_thumper.msg import Sensor # Board warming offset -TEMP_ERROR = -2 # -5 # degree celsius -PRESSURE_ERROR = -4.5 +TEMP_ERROR = 0 # -5 # degree celsius +PRESSURE_ERROR = -2.5 """ LDR: @@ -43,9 +43,13 @@ def get(addr=0x58): pressure_kpa = P = (pressure_v/5 + 0.04) / 0.004 + PRESSURE_ERROR # datasheet # fix temperature/humidity - temp_real = temp_mess + TEMP_ERROR - humidity_abs = calc_humidity_abs(temp_mess, humidity_mess) - humidity_real = calc_humidity_rel(temp_real, humidity_abs) + if TEMP_ERROR: + temp_real = temp_mess + TEMP_ERROR + humidity_abs = calc_humidity_abs(temp_mess, humidity_mess) + humidity_real = calc_humidity_rel(temp_real, humidity_abs) + else: + temp_real = temp_mess + humidity_real = humidity_mess return lux, temp_real, humidity_real, pressure_kpa, co