Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
223a1c8b
Commit
223a1c8b
authored
Aug 22, 2015
by
aeprox
Browse files
Small change
parent
6cb90ea9
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/tsl2561/tsl2561.c
View file @
223a1c8b
...
@@ -65,6 +65,7 @@
...
@@ -65,6 +65,7 @@
*/
*/
/**************************************************************************/
/**************************************************************************/
#include "tsl2561.h"
#include "tsl2561.h"
static
const
uint32_t
tsl2561_i2c_id
=
0
;
static
const
uint32_t
tsl2561_i2c_id
=
0
;
static
bool
_tsl2561Initialised
=
0
;
static
bool
_tsl2561Initialised
=
0
;
static
tsl2561IntegrationTime_t
_tsl2561IntegrationTime
=
TSL2561_INTEGRATIONTIME_402MS
;
static
tsl2561IntegrationTime_t
_tsl2561IntegrationTime
=
TSL2561_INTEGRATIONTIME_402MS
;
...
@@ -212,13 +213,13 @@ tsl2561Error_t tsl2561GetLuminosity (uint16_t *broadband, uint16_t *ir)
...
@@ -212,13 +213,13 @@ tsl2561Error_t tsl2561GetLuminosity (uint16_t *broadband, uint16_t *ir)
switch
(
_tsl2561IntegrationTime
)
switch
(
_tsl2561IntegrationTime
)
{
{
case
TSL2561_INTEGRATIONTIME_13MS
:
case
TSL2561_INTEGRATIONTIME_13MS
:
systickDelay
(
14
);
os_delay_us
(
14000
);
//
systickDelay(14);
break
;
break
;
case
TSL2561_INTEGRATIONTIME_101MS
:
case
TSL2561_INTEGRATIONTIME_101MS
:
systickDelay
(
102
);
os_delay_us
(
102000
);
//
systickDelay(102);
break
;
break
;
default:
default:
systickDelay
(
400
);
os_delay_us
(
400000
);
//
systickDelay(400);
break
;
break
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment