Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-28 09:58:23 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

Allow other sensors to be used for HIH humidity sensor temperature

Browse Source 
compensation.
This commit is contained in:
Martin Mueller
2011-07-22 18:32:24 +02:00
parent e8249cda13
commit 88ff740f9e
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/modules/meteo/humid_dpicco.h
+2
View File
@@ -10,6 +10,8 @@
#define DPICCO_TEMP_RANGE 165.0 #define DPICCO_TEMP_RANGE 165.0
#define DPICCO_TEMP_OFFS -40.0 #define DPICCO_TEMP_OFFS -40.0
extern float dpicco_temp;
extern void dpicco_init( void ); extern void dpicco_init( void );
extern void dpicco_periodic( void ); extern void dpicco_periodic( void );
extern void dpicco_event( void ); extern void dpicco_event( void );
sw/airborne/modules/meteo/humid_hih.c
+9 -3
View File
@@ -31,6 +31,8 @@
#include <std.h> #include <std.h>
#include "modules/meteo/humid_hih.h" #include "modules/meteo/humid_hih.h"
#include "modules/meteo/temp_tmp102.h" #include "modules/meteo/temp_tmp102.h"
#include "modules/meteo/humid_dpicco.h"
#include "modules/meteo/humid_sht.h"
#include "mcu_periph/adc.h" #include "mcu_periph/adc.h"
#include "mcu_periph/uart.h" #include "mcu_periph/uart.h"
#include "messages.h" #include "messages.h"
@@ -58,8 +60,12 @@ void humid_hih_init( void ) {
} }
void humid_hih_periodic( void ) { void humid_hih_periodic( void ) {
float fvout; float fvout, fhih_temp;
/* get temperature from external source */
fhih_temp = ftempsht;
/****************************************/
adc_humid_hih = buf_humid_hih.sum / buf_humid_hih.av_nb_sample; adc_humid_hih = buf_humid_hih.sum / buf_humid_hih.av_nb_sample;
/* 36k/68k voltage divider, 3.3V full sweep, 10 bits adc */ /* 36k/68k voltage divider, 3.3V full sweep, 10 bits adc */
@@ -69,8 +75,8 @@ void humid_hih_periodic( void ) {
fhih_humid = ((fvout / 5.0)-0.16)/0.0062; fhih_humid = ((fvout / 5.0)-0.16)/0.0062;
/* temperature compensation */ /* temperature compensation */
fhih_humid = fhih_humid/(1.0546 - (0.00216 * ftmp_temperature)); fhih_humid = fhih_humid/(1.0546 - (0.00216 * fhih_temp));
DOWNLINK_SEND_HIH_STATUS(DefaultChannel, &adc_humid_hih, &fhih_humid, &ftmp_temperature); DOWNLINK_SEND_HIH_STATUS(DefaultChannel, &adc_humid_hih, &fhih_humid, &fhih_temp);
} }