Skip to content
Snippets Groups Projects
Commit cec06f6b authored by Oleg Hahm's avatar Oleg Hahm
Browse files

* resolved conflict

parent 88d3421e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 5 deletions
drivers/include/sht11.h
+ 0
− 5
View file @ cec06f6b
...@@ -50,17 +50,12 @@ and the mailinglist (subscription via web site) ...@@ -50,17 +50,12 @@ and the mailinglist (subscription via web site)
#define SHT11_MEASURE_HUMI (0x05) //000 0010 1 #define SHT11_MEASURE_HUMI (0x05) //000 0010 1
#define SHT11_RESET (0x1E) //000 1111 0 #define SHT11_RESET (0x1E) //000 1111 0
<<<<<<< HEAD
/* time to wait after toggling the data line */ /* time to wait after toggling the data line */
#define SHT11_DATA_WAIT (HWTIMER_TICKS(5)) #define SHT11_DATA_WAIT (HWTIMER_TICKS(5))
/* time to wait after toggling the clock line */ /* time to wait after toggling the clock line */
#define SHT11_CLK_WAIT (HWTIMER_TICKS(1)) #define SHT11_CLK_WAIT (HWTIMER_TICKS(1))
/* set measurement timeout to 1 second */ /* 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) #define SHT11_MEASURE_TIMEOUT (1000)
/** /**
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment