Commit fd93a09a authored by aeprox's avatar aeprox
Browse files

Code formatting fixes

parent 0caf745d
...@@ -93,7 +93,6 @@ COMPONENTS_eagle.app.v6 = \ ...@@ -93,7 +93,6 @@ COMPONENTS_eagle.app.v6 = \
dhtlib/libdhtlib.a \ dhtlib/libdhtlib.a \
tsl2561/tsl2561lib.a \ tsl2561/tsl2561lib.a \
modules/libmodules.a modules/libmodules.a
LINKFLAGS_eagle.app.v6 = \ LINKFLAGS_eagle.app.v6 = \
-L../lib \ -L../lib \
......
...@@ -257,5 +257,6 @@ ...@@ -257,5 +257,6 @@
ROM_MODULES_RTCFIFO \ ROM_MODULES_RTCFIFO \
ROM_MODULES_SNTP \ ROM_MODULES_SNTP \
ROM_MODULES_BMP085 \ ROM_MODULES_BMP085 \
ROM_MODULES_TSL2561 ROM_MODULES_TSL2561
#endif #endif
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* tsl2561.c * tsl2561.c
* *
* Created on: Aug 21, 2015 * Created on: Aug 21, 2015
* Author: Michael Lucas (Aeprox @github) * Author: Michael Lucas (Aeprox @github)
*/ */
#include "lualib.h" #include "lualib.h"
#include "lauxlib.h" #include "lauxlib.h"
...@@ -14,70 +14,69 @@ ...@@ -14,70 +14,69 @@
static uint16_t ch0; static uint16_t ch0;
static uint16_t ch1; static uint16_t ch1;
/* /*
* Lua: error = tsl2561.init(sdapin, sclpin) * Lua: error = tsl2561.init(sdapin, sclpin)
*/ */
static int ICACHE_FLASH_ATTR tsl2561_init(lua_State* L) { static int ICACHE_FLASH_ATTR tsl2561_init(lua_State* L) {
uint32_t sda; uint32_t sda;
uint32_t scl; uint32_t scl;
if (!lua_isnumber(L, 1) || !lua_isnumber(L, 2)) { if (!lua_isnumber(L, 1) || !lua_isnumber(L, 2)) {
return luaL_error(L, "wrong arg range"); return luaL_error(L, "wrong arg range");
} }
sda = luaL_checkinteger(L, 1); sda = luaL_checkinteger(L, 1);
scl = luaL_checkinteger(L, 2); scl = luaL_checkinteger(L, 2);
if (scl == 0 || sda == 0) { if (scl == 0 || sda == 0) {
return luaL_error(L, "no i2c for D0"); return luaL_error(L, "no i2c for D0");
} }
uint8_t error = tsl2561Init(sda,scl); uint8_t error = tsl2561Init(sda, scl);
lua_pushnumber( L, error ); lua_pushnumber(L, error);
return 1; return 1;
} }
/* /*
* Lua: error = tsl2561.settiming(integration, gain) * Lua: error = tsl2561.settiming(integration, gain)
*/ */
static int ICACHE_FLASH_ATTR tsl2561_lua_settiming(lua_State* L) { static int ICACHE_FLASH_ATTR tsl2561_lua_settiming(lua_State* L) {
// check variables // check variables
if (!lua_isnumber(L, 1) || !lua_isnumber(L, 2)) { if (!lua_isnumber(L, 1) || !lua_isnumber(L, 2)) {
return luaL_error(L, "wrong arg range"); return luaL_error(L, "wrong arg range");
} }
uint8_t integration = luaL_checkinteger(L, 1); uint8_t integration = luaL_checkinteger(L, 1);
if(!((integration == TSL2561_INTEGRATIONTIME_13MS) ||(integration == TSL2561_INTEGRATIONTIME_101MS) || (integration == TSL2561_INTEGRATIONTIME_402MS))){ if (!((integration == TSL2561_INTEGRATIONTIME_13MS) || (integration == TSL2561_INTEGRATIONTIME_101MS) || (integration == TSL2561_INTEGRATIONTIME_402MS))) {
return luaL_error(L, "wrong range for arg integration"); return luaL_error(L, "wrong range for arg integration");
} }
uint8_t gain = luaL_checkinteger(L, 2); uint8_t gain = luaL_checkinteger(L, 2);
if (!((gain == TSL2561_GAIN_16X) || (gain == TSL2561_GAIN_1X))){ if (!((gain == TSL2561_GAIN_16X) || (gain == TSL2561_GAIN_1X))) {
return luaL_error(L, "wrong range for arg gain"); return luaL_error(L, "wrong range for arg gain");
} }
lua_pushnumber( L, tsl2561SetTiming(integration, gain) ); lua_pushnumber(L, tsl2561SetTiming(integration, gain));
return 1; return 1;
} }
/* /*
* Lua: lux, error = tsl2561.getlux() * Lua: lux, error = tsl2561.getlux()
*/ */
static int ICACHE_FLASH_ATTR tsl2561_lua_calclux(lua_State* L) { static int ICACHE_FLASH_ATTR tsl2561_lua_calclux(lua_State* L) {
uint8_t error = tsl2561GetLuminosity(&ch0,&ch1); uint8_t error = tsl2561GetLuminosity(&ch0, &ch1);
if (error){ if (error) {
lua_pushnumber(L, 0); lua_pushnumber(L, 0);
lua_pushnumber(L, error); lua_pushnumber(L, error);
} } else {
else{ lua_pushnumber(L, tsl2561CalculateLux(ch0, ch1));
lua_pushnumber(L, tsl2561CalculateLux(ch0,ch1));
lua_pushnumber(L, error); lua_pushnumber(L, error);
} }
return 2; return 2;
} }
/* /*
* Lua: tsl2561.getrawchannels() * Lua: tsl2561.getrawchannels()
*/ */
static int ICACHE_FLASH_ATTR tsl2561_lua_getchannels(lua_State* L) { static int ICACHE_FLASH_ATTR tsl2561_lua_getchannels(lua_State* L) {
uint8_t error = tsl2561GetLuminosity(&ch0,&ch1); uint8_t error = tsl2561GetLuminosity(&ch0, &ch1);
lua_pushnumber( L, ch0 ); lua_pushnumber(L, ch0);
lua_pushnumber( L, ch1 ); lua_pushnumber(L, ch1);
lua_pushnumber( L, error ); lua_pushnumber(L, error);
return 3; return 3;
} }
...@@ -86,27 +85,27 @@ static int ICACHE_FLASH_ATTR tsl2561_lua_getchannels(lua_State* L) { ...@@ -86,27 +85,27 @@ static int ICACHE_FLASH_ATTR tsl2561_lua_getchannels(lua_State* L) {
#include "lrodefs.h" #include "lrodefs.h"
const LUA_REG_TYPE tsl2561_map[] = const LUA_REG_TYPE tsl2561_map[] =
{ {
{ LSTRKEY( "settiming" ), LFUNCVAL( tsl2561_lua_settiming)}, { LSTRKEY( "settiming" ), LFUNCVAL( tsl2561_lua_settiming)},
{ LSTRKEY( "getlux" ), LFUNCVAL( tsl2561_lua_calclux )}, { LSTRKEY( "getlux" ), LFUNCVAL( tsl2561_lua_calclux )},
{ LSTRKEY( "getrawchannels" ), LFUNCVAL( tsl2561_lua_getchannels )}, { LSTRKEY( "getrawchannels" ), LFUNCVAL( tsl2561_lua_getchannels )},
{ LSTRKEY( "init" ), LFUNCVAL( tsl2561_init )}, { LSTRKEY( "init" ), LFUNCVAL( tsl2561_init )},
{ LSTRKEY( "TSL2561_OK" ), LNUMVAL( TSL2561_ERROR_OK ) }, { LSTRKEY( "TSL2561_OK" ), LNUMVAL( TSL2561_ERROR_OK )},
{ LSTRKEY( "TSL2561_ERROR_I2CINIT" ), LNUMVAL( TSL2561_ERROR_I2CINIT ) }, { LSTRKEY( "TSL2561_ERROR_I2CINIT" ), LNUMVAL( TSL2561_ERROR_I2CINIT )},
{ LSTRKEY( "TSL2561_ERROR_I2CBUSY" ), LNUMVAL( TSL2561_ERROR_I2CBUSY ) }, { LSTRKEY( "TSL2561_ERROR_I2CBUSY" ), LNUMVAL( TSL2561_ERROR_I2CBUSY )},
{ LSTRKEY( "TSL2561_ERROR_NOINIT" ), LNUMVAL( TSL2561_ERROR_NOINIT ) }, { LSTRKEY( "TSL2561_ERROR_NOINIT" ), LNUMVAL( TSL2561_ERROR_NOINIT )},
{ LSTRKEY( "TSL2561_ERROR_LAST" ), LNUMVAL( TSL2561_ERROR_LAST ) }, { LSTRKEY( "TSL2561_ERROR_LAST" ), LNUMVAL( TSL2561_ERROR_LAST )},
{ LSTRKEY( "INTEGRATIONTIME_13MS" ), LNUMVAL( TSL2561_INTEGRATIONTIME_13MS ) }, { LSTRKEY( "INTEGRATIONTIME_13MS" ), LNUMVAL( TSL2561_INTEGRATIONTIME_13MS )},
{ LSTRKEY( "INTEGRATIONTIME_101MS" ), LNUMVAL( TSL2561_INTEGRATIONTIME_101MS ) }, { LSTRKEY( "INTEGRATIONTIME_101MS" ), LNUMVAL( TSL2561_INTEGRATIONTIME_101MS )},
{ LSTRKEY( "INTEGRATIONTIME_402MS" ), LNUMVAL( TSL2561_INTEGRATIONTIME_402MS ) }, { LSTRKEY( "INTEGRATIONTIME_402MS" ), LNUMVAL( TSL2561_INTEGRATIONTIME_402MS )},
{ LSTRKEY( "GAIN_1X" ), LNUMVAL( TSL2561_GAIN_1X ) }, { LSTRKEY( "GAIN_1X" ), LNUMVAL( TSL2561_GAIN_1X )},
{ LSTRKEY( "GAIN_16X" ), LNUMVAL( TSL2561_GAIN_16X ) }, { LSTRKEY( "GAIN_16X" ), LNUMVAL( TSL2561_GAIN_16X )},
{ LNILKEY, LNILVAL} { LNILKEY, LNILVAL}
}; };
LUALIB_API int luaopen_tsl2561(lua_State *L) { LUALIB_API int luaopen_tsl2561(lua_State *L) {
LREGISTER(L, "tsl2561", tsl2561_map); LREGISTER(L, "tsl2561", tsl2561_map);
return 1; return 1;
} }
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment