RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

* resolved conflict

Browse Source
This commit is contained in:
Oliver Hahm 2010-11-01 17:42:35 +01:00
parent 88d3421ee7
commit cec06f6b83
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/include/sht11.h
View File

@ -50,17 +50,12 @@ and the mailinglist (subscription via web site)
#define SHT11_MEASURE_HUMI (0x05) //000 0010 1
#define SHT11_RESET (0x1E) //000 1111 0
<<<<<<< HEAD
/* time to wait after toggling the data line */
#define SHT11_DATA_WAIT (HWTIMER_TICKS(5))
/* time to wait after toggling the clock line */
#define SHT11_CLK_WAIT (HWTIMER_TICKS(1))
/* set measurement timeout to 1 second */
=======
/**
* set measurement timeout to 1 second */
>>>>>>> fb40690... * removed old reference to clock module from rtc
#define SHT11_MEASURE_TIMEOUT (1000)
/**