MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Swap reading y and z values (#2133)" (#2135) 

This reverts commit 92b6bad1e4.
This commit is contained in:
Marcel Stör 2017-10-15 23:03:45 +02:00 committed by GitHub
parent 92b6bad1e4
commit 443e821952
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/modules/hmc5883l.c
View File

@ -44,6 +44,7 @@ static int hmc5883_setup(lua_State* L) {
if ((devid_a != 0x48) || (devid_b != 0x34) || (devid_c != 0x33)) { if ((devid_a != 0x48) || (devid_b != 0x34) || (devid_c != 0x33)) {
return luaL_error(L, "device not found"); return luaL_error(L, "device not found");
} }
// 8 sample average, 15 Hz update rate, normal measurement // 8 sample average, 15 Hz update rate, normal measurement
w8u(hmc5883_i2c_id, 0x00, 0x70); w8u(hmc5883_i2c_id, 0x00, 0x70);
@ -57,6 +58,7 @@ static int hmc5883_setup(lua_State* L) {
} }
static int hmc5883_init(lua_State* L) { static int hmc5883_init(lua_State* L) {
uint32_t sda; uint32_t sda;
uint32_t scl; uint32_t scl;
@ -94,8 +96,8 @@ static int hmc5883_read(lua_State* L) {
platform_i2c_send_stop(hmc5883_i2c_id); platform_i2c_send_stop(hmc5883_i2c_id);
x = (int16_t) ((data[0] << 8) | data[1]); x = (int16_t) ((data[0] << 8) | data[1]);
z = (int16_t) ((data[2] << 8) | data[3]); y = (int16_t) ((data[2] << 8) | data[3]);
y = (int16_t) ((data[4] << 8) | data[5]); z = (int16_t) ((data[4] << 8) | data[5]);
lua_pushinteger(L, x); lua_pushinteger(L, x);
lua_pushinteger(L, y); lua_pushinteger(L, y);