j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

SHT3x driver - minor correction

Browse source 
- number of ticks for measurement duration takes now into account
  portTICK_PERIOD_MS
This commit is contained in:
Gunar Schorcht 2017-10-14 18:30:12 +02:00
parent 344c8759f9
commit e8abd2db87
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
extras/sht3x/sht3x.c
View file

@ -67,8 +67,14 @@ const uint16_t SHT3x_MEASURE_CMD[6][3] = { {0x2c06,0x2c0d,0x2c10}, // [SINGLE
{0x2236,0x2220,0x222b}, // [PERIODIC_05][H,M,L]
{0x2234,0x2322,0x2329}, // [PERIODIC_05][H,M,L]
{0x2737,0x2721,0x272a} }; // [PERIODIC_05][H,M,L]
const int32_t SHT3x_MEASURE_DURATION[3] = {3,2,2}; // tick counts [High, Medium, Low]
#define max(a,b) (a) > (b) ? a : b
// tick counts [High, Medium, Low]
// minimum is one tick if portTICK_PERIOD_MS is greater than 20 or 30 ms
const int32_t SHT3x_MEASURE_DURATION[3] = { max(30/portTICK_PERIOD_MS,1),
max(20/portTICK_PERIOD_MS,1),
max(20/portTICK_PERIOD_MS,1) };
#ifdef SHT3x_DEBUG
#define debug(s, f, ...) printf("%s %s: " s "\n", "SHT3x", f, ## __VA_ARGS__)
@ -100,6 +106,8 @@ bool sht3x_init_driver()
sht3x_sensor_t* sht3x_init_sensor(uint8_t bus, uint8_t addr)
{
printf("%d %d %d\n", SHT3x_MEASURE_DURATION[0], SHT3x_MEASURE_DURATION[1], SHT3x_MEASURE_DURATION[2]);
sht3x_sensor_t* dev;
if ((dev = malloc (sizeof(sht3x_sensor_t))) == NULL)