Skip to content

Deprecate init() in favor of setup(), removing inherent i2c configuration: adxl345, am2320, bme280, bmp085, hmc5883l, l3g4200d #1887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 21, 2017
Merged

Deprecate init() in favor of setup(), removing inherent i2c configuration: adxl345, am2320, bme280, bmp085, hmc5883l, l3g4200d #1887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 22 additions & 13 deletions app/modules/adxl345.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
static const uint32_t adxl345_i2c_id = 0;
static const uint8_t adxl345_i2c_addr = 0x53;

static uint8_t ICACHE_FLASH_ATTR r8u(uint32_t id, uint8_t reg) {
static uint8_t r8u(uint32_t id, uint8_t reg) {
uint8_t ret;

platform_i2c_send_start(id);
Expand All @@ -26,19 +26,9 @@ static uint8_t ICACHE_FLASH_ATTR r8u(uint32_t id, uint8_t reg) {
return ret;
}

static int ICACHE_FLASH_ATTR adxl345_init(lua_State* L) {

uint32_t sda;
uint32_t scl;
static int adxl345_setup(lua_State* L) {
uint8_t devid;

sda = luaL_checkinteger(L, 1);
scl = luaL_checkinteger(L, 2);

luaL_argcheck(L, sda > 0 && scl > 0, 1, "no i2c for D0");

platform_i2c_setup(adxl345_i2c_id, sda, scl, PLATFORM_I2C_SPEED_SLOW);

devid = r8u(adxl345_i2c_id, 0x00);

if (devid != 229) {
Expand All @@ -55,7 +45,24 @@ static int ICACHE_FLASH_ATTR adxl345_init(lua_State* L) {
return 0;
}

static int ICACHE_FLASH_ATTR adxl345_read(lua_State* L) {
static int adxl345_init(lua_State* L) {

uint32_t sda;
uint32_t scl;

platform_print_deprecation_note("adxl345.init() is replaced by adxl345.setup()", "in the next version");

sda = luaL_checkinteger(L, 1);
scl = luaL_checkinteger(L, 2);

luaL_argcheck(L, sda > 0 && scl > 0, 1, "no i2c for D0");

platform_i2c_setup(adxl345_i2c_id, sda, scl, PLATFORM_I2C_SPEED_SLOW);

return adxl345_setup(L);
}

static int adxl345_read(lua_State* L) {

uint8_t data[6];
int x,y,z;
Expand Down Expand Up @@ -88,6 +95,8 @@ static int ICACHE_FLASH_ATTR adxl345_read(lua_State* L) {

static const LUA_REG_TYPE adxl345_map[] = {
{ LSTRKEY( "read" ), LFUNCVAL( adxl345_read )},
{ LSTRKEY( "setup" ), LFUNCVAL( adxl345_setup )},
/// init() is deprecated
{ LSTRKEY( "init" ), LFUNCVAL( adxl345_init )},
{ LNILKEY, LNILVAL}
};
Expand Down
38 changes: 24 additions & 14 deletions app/modules/am2320.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,8 @@ static int _read(uint32_t id, void *buf, uint8_t len, uint8_t off)
return 0;
}

static int am2320_init(lua_State* L)
static int am2320_setup(lua_State* L)
{
uint32_t sda;
uint32_t scl;
int ret;
struct {
uint8_t cmd;
Expand All @@ -97,6 +95,24 @@ static int am2320_init(lua_State* L)
uint32_t id;
} nfo;

os_delay_us(1500); // give some time to settle things down
ret = _read(am2320_i2c_id, &nfo, sizeof(nfo)-2, 0x08);
if(ret)
return luaL_error(L, "transmission error");

lua_pushinteger(L, ntohs(nfo.model));
lua_pushinteger(L, nfo.version);
lua_pushinteger(L, ntohl(nfo.id));
return 3;
}

static int am2320_init(lua_State* L)
{
uint32_t sda;
uint32_t scl;

platform_print_deprecation_note("am2320.init() is replaced by am2320.setup()", "in the next version");

if (!lua_isnumber(L, 1) || !lua_isnumber(L, 2)) {
return luaL_error(L, "wrong arg range");
}
Expand All @@ -110,15 +126,7 @@ static int am2320_init(lua_State* L)

platform_i2c_setup(am2320_i2c_id, sda, scl, PLATFORM_I2C_SPEED_SLOW);

os_delay_us(1500); // give some time to settle things down
ret = _read(am2320_i2c_id, &nfo, sizeof(nfo)-2, 0x08);
if(ret)
return luaL_error(L, "transmission error");

lua_pushinteger(L, ntohs(nfo.model));
lua_pushinteger(L, nfo.version);
lua_pushinteger(L, ntohl(nfo.id));
return 3;
return am2320_setup(L);
}

static int am2320_read(lua_State* L)
Expand All @@ -145,8 +153,10 @@ static int am2320_read(lua_State* L)
}

static const LUA_REG_TYPE am2320_map[] = {
{ LSTRKEY( "read" ), LFUNCVAL( am2320_read )},
{ LSTRKEY( "init" ), LFUNCVAL( am2320_init )},
{ LSTRKEY( "read" ), LFUNCVAL( am2320_read )},
{ LSTRKEY( "setup" ), LFUNCVAL( am2320_setup )},
// init() is deprecated
{ LSTRKEY( "init" ), LFUNCVAL( am2320_init )},
{ LNILKEY, LNILVAL}
};

Expand Down
54 changes: 35 additions & 19 deletions app/modules/bme280.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,35 +227,25 @@ static double bme280_qfe2qnh(int32_t qfe, int32_t h) {
return qnh;
}

static int bme280_lua_init(lua_State* L) {
uint8_t sda;
uint8_t scl;
static int bme280_lua_setup(lua_State* L) {
uint8_t config;
uint8_t ack;
uint8_t full_init;

uint8_t const bit3 = 0b111;
uint8_t const bit2 = 0b11;

if (!lua_isnumber(L, 1) || !lua_isnumber(L, 2)) {
return luaL_error(L, "wrong arg range");
}
sda = luaL_checkinteger(L, 1);
scl = luaL_checkinteger(L, 2);

bme280_mode = (!lua_isnumber(L, 6)?BME280_NORMAL_MODE:(luaL_checkinteger(L, 6)&bit2)) // 6-th parameter: power mode
| ((!lua_isnumber(L, 4)?BME280_OVERSAMP_16X:(luaL_checkinteger(L, 4)&bit3)) << 2) // 4-th parameter: pressure oversampling
| ((!lua_isnumber(L, 3)?BME280_OVERSAMP_16X:(luaL_checkinteger(L, 3)&bit3)) << 5); // 3-rd parameter: temperature oversampling
bme280_mode = (!lua_isnumber(L, 4)?BME280_NORMAL_MODE:(luaL_checkinteger(L, 4)&bit2)) // 4-th parameter: power mode
| ((!lua_isnumber(L, 2)?BME280_OVERSAMP_16X:(luaL_checkinteger(L, 2)&bit3)) << 2) // 2-nd parameter: pressure oversampling
| ((!lua_isnumber(L, 1)?BME280_OVERSAMP_16X:(luaL_checkinteger(L, 1)&bit3)) << 5); // 1-st parameter: temperature oversampling

bme280_ossh = (!lua_isnumber(L, 5))?BME280_OVERSAMP_16X:(luaL_checkinteger(L, 5)&bit3); // 5-th parameter: humidity oversampling
bme280_ossh = (!lua_isnumber(L, 3))?BME280_OVERSAMP_16X:(luaL_checkinteger(L, 3)&bit3); // 3-rd parameter: humidity oversampling

config = ((!lua_isnumber(L, 7)?BME280_STANDBY_TIME_20_MS:(luaL_checkinteger(L, 7)&bit3))<< 5) // 7-th parameter: inactive duration in normal mode
| ((!lua_isnumber(L, 8)?BME280_FILTER_COEFF_16:(luaL_checkinteger(L, 8)&bit3)) << 2); // 8-th parameter: IIR filter
full_init = !lua_isnumber(L, 9)?1:lua_tointeger(L, 9); // 9-th parameter: init the chip too
config = ((!lua_isnumber(L, 5)?BME280_STANDBY_TIME_20_MS:(luaL_checkinteger(L, 5)&bit3))<< 5) // 5-th parameter: inactive duration in normal mode
| ((!lua_isnumber(L, 6)?BME280_FILTER_COEFF_16:(luaL_checkinteger(L, 6)&bit3)) << 2); // 6-th parameter: IIR filter
full_init = !lua_isnumber(L, 7)?1:lua_tointeger(L, 7); // 7-th parameter: init the chip too
NODE_DBG("mode: %x\nhumidity oss: %x\nconfig: %x\n", bme280_mode, bme280_ossh, config);

platform_i2c_setup(bme280_i2c_id, sda, scl, PLATFORM_I2C_SPEED_SLOW);

bme280_i2c_addr = BME280_I2C_ADDRESS1;
platform_i2c_send_start(bme280_i2c_id);
ack = platform_i2c_send_address(bme280_i2c_id, bme280_i2c_addr, PLATFORM_I2C_DIRECTION_TRANSMITTER);
Expand Down Expand Up @@ -324,6 +314,30 @@ static int bme280_lua_init(lua_State* L) {
return 1;
}

static int bme280_lua_init(lua_State* L) {
uint8_t sda;
uint8_t scl;
uint8_t config;
uint8_t ack;
uint8_t full_init;

platform_print_deprecation_note("bme280.init() is replaced by bme280.setup()", "in the next version");

if (!lua_isnumber(L, 1) || !lua_isnumber(L, 2)) {
return luaL_error(L, "wrong arg range");
}
sda = luaL_checkinteger(L, 1);
scl = luaL_checkinteger(L, 2);

platform_i2c_setup(bme280_i2c_id, sda, scl, PLATFORM_I2C_SPEED_SLOW);

// remove sda and scl parameters from stack
lua_remove(L, 1);
lua_remove(L, 1);

return bme280_lua_setup(L);
}

static void bme280_readoutdone (void *arg)
{
NODE_DBG("timer out\n");
Expand Down Expand Up @@ -481,7 +495,9 @@ static int bme280_lua_dewpoint(lua_State* L) {
}

static const LUA_REG_TYPE bme280_map[] = {
// init() is deprecated
{ LSTRKEY( "init" ), LFUNCVAL(bme280_lua_init)},
{ LSTRKEY( "setup" ), LFUNCVAL(bme280_lua_setup)},
{ LSTRKEY( "temp" ), LFUNCVAL(bme280_lua_temp)},
{ LSTRKEY( "baro" ), LFUNCVAL(bme280_lua_baro)},
{ LSTRKEY( "humi" ), LFUNCVAL(bme280_lua_humi)},
Expand Down
54 changes: 32 additions & 22 deletions app/modules/bmp085.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ static struct {
int16_t MD;
} bmp085_data;

static uint8_t ICACHE_FLASH_ATTR r8u(uint32_t id, uint8_t reg) {
static uint8_t r8u(uint32_t id, uint8_t reg) {
uint8_t ret;

platform_i2c_send_start(id);
Expand All @@ -35,20 +35,40 @@ static uint8_t ICACHE_FLASH_ATTR r8u(uint32_t id, uint8_t reg) {
return ret;
}

static uint16_t ICACHE_FLASH_ATTR r16u(uint32_t id, uint8_t reg) {
static uint16_t r16u(uint32_t id, uint8_t reg) {
uint8_t high = r8u(id, reg);
uint8_t low = r8u(id, reg + 1);
return (high << 8) | low;
}

static int16_t ICACHE_FLASH_ATTR r16(uint32_t id, uint8_t reg) {
static int16_t r16(uint32_t id, uint8_t reg) {
return (int16_t) r16u(id, reg);
}

static int ICACHE_FLASH_ATTR bmp085_init(lua_State* L) {
static int bmp085_setup(lua_State* L) {
(void)L;

bmp085_data.AC1 = r16(bmp085_i2c_id, 0xAA);
bmp085_data.AC2 = r16(bmp085_i2c_id, 0xAC);
bmp085_data.AC3 = r16(bmp085_i2c_id, 0xAE);
bmp085_data.AC4 = r16u(bmp085_i2c_id, 0xB0);
bmp085_data.AC5 = r16u(bmp085_i2c_id, 0xB2);
bmp085_data.AC6 = r16u(bmp085_i2c_id, 0xB4);
bmp085_data.B1 = r16(bmp085_i2c_id, 0xB6);
bmp085_data.B2 = r16(bmp085_i2c_id, 0xB8);
bmp085_data.MB = r16(bmp085_i2c_id, 0xBA);
bmp085_data.MC = r16(bmp085_i2c_id, 0xBC);
bmp085_data.MD = r16(bmp085_i2c_id, 0xBE);

return 0;
}

static int bmp085_init(lua_State* L) {
uint32_t sda;
uint32_t scl;

platform_print_deprecation_note("bmp085.init() is replaced by bmp085.setup()", "in the next version");

if (!lua_isnumber(L, 1) || !lua_isnumber(L, 2)) {
return luaL_error(L, "wrong arg range");
}
Expand All @@ -62,19 +82,7 @@ static int ICACHE_FLASH_ATTR bmp085_init(lua_State* L) {

platform_i2c_setup(bmp085_i2c_id, sda, scl, PLATFORM_I2C_SPEED_SLOW);

bmp085_data.AC1 = r16(bmp085_i2c_id, 0xAA);
bmp085_data.AC2 = r16(bmp085_i2c_id, 0xAC);
bmp085_data.AC3 = r16(bmp085_i2c_id, 0xAE);
bmp085_data.AC4 = r16u(bmp085_i2c_id, 0xB0);
bmp085_data.AC5 = r16u(bmp085_i2c_id, 0xB2);
bmp085_data.AC6 = r16u(bmp085_i2c_id, 0xB4);
bmp085_data.B1 = r16(bmp085_i2c_id, 0xB6);
bmp085_data.B2 = r16(bmp085_i2c_id, 0xB8);
bmp085_data.MB = r16(bmp085_i2c_id, 0xBA);
bmp085_data.MC = r16(bmp085_i2c_id, 0xBC);
bmp085_data.MD = r16(bmp085_i2c_id, 0xBE);

return 0;
return bmp085_setup(L);
}

static uint32_t bmp085_temperature_raw_b5(void) {
Expand All @@ -96,16 +104,16 @@ static uint32_t bmp085_temperature_raw_b5(void) {
return X1 + X2;
}

static int16_t ICACHE_FLASH_ATTR bmp085_temperature(void) {
static int16_t bmp085_temperature(void) {
return (bmp085_temperature_raw_b5() + 8) >> 4;
}

static int ICACHE_FLASH_ATTR bmp085_lua_temperature(lua_State* L) {
static int bmp085_lua_temperature(lua_State* L) {
lua_pushinteger(L, bmp085_temperature());
return 1;
}

static int32_t ICACHE_FLASH_ATTR bmp085_pressure_raw(int oss) {
static int32_t bmp085_pressure_raw(int oss) {
int32_t p;
int32_t p1, p2, p3;

Expand All @@ -132,7 +140,7 @@ static int32_t ICACHE_FLASH_ATTR bmp085_pressure_raw(int oss) {
return p;
}

static int ICACHE_FLASH_ATTR bmp085_lua_pressure_raw(lua_State* L) {
static int bmp085_lua_pressure_raw(lua_State* L) {
uint8_t oss = 0;
int32_t p;

Expand All @@ -148,7 +156,7 @@ static int ICACHE_FLASH_ATTR bmp085_lua_pressure_raw(lua_State* L) {
return 1;
}

static int ICACHE_FLASH_ATTR bmp085_lua_pressure(lua_State* L) {
static int bmp085_lua_pressure(lua_State* L) {
uint8_t oss = 0;
int32_t p;
int32_t X1, X2, X3, B3, B4, B5, B6, B7;
Expand Down Expand Up @@ -187,6 +195,8 @@ static const LUA_REG_TYPE bmp085_map[] = {
{ LSTRKEY( "temperature" ), LFUNCVAL( bmp085_lua_temperature )},
{ LSTRKEY( "pressure" ), LFUNCVAL( bmp085_lua_pressure )},
{ LSTRKEY( "pressure_raw" ), LFUNCVAL( bmp085_lua_pressure_raw )},
{ LSTRKEY( "setup" ), LFUNCVAL( bmp085_setup )},
// init() is deprecated
{ LSTRKEY( "init" ), LFUNCVAL( bmp085_init )},
{ LNILKEY, LNILVAL}
};
Expand Down
Loading