1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-19 22:35:12 +03:00

Refactored luaGetValue(), my previous fix was incorrect.

This commit is contained in:
Damjan Adamic 2014-04-21 20:47:38 +02:00
parent cfa25ab030
commit d9c1bf767f

View file

@ -102,36 +102,25 @@ static int luaGetValue(lua_State *L)
lua_pushnumber(L, double(frskyData.hub.baroAltitude)/100);
return 1;
}
else if (!strcmp(what, "latitude")) {
if (frskyData.hub.gpsFix)
else if (frskyData.hub.gpsFix) {
if (!strcmp(what, "latitude")) {
lua_pushnumber(L, gpsToDouble(frskyData.hub.gpsLatitudeNS=='S', frskyData.hub.gpsLatitude_bp, frskyData.hub.gpsLatitude_ap));
else
lua_pushnil(L);
return 1;
}
else if (!strcmp(what, "longitude")) {
if (frskyData.hub.gpsFix)
lua_pushnumber(L, gpsToDouble(frskyData.hub.gpsLongitudeEW=='W', frskyData.hub.gpsLongitude_bp, frskyData.hub.gpsLongitude_ap));
else
lua_pushnil(L);
return 1;
}
else if (!strcmp(what, "pilot latitude")) {
if (frskyData.hub.gpsFix)
lua_pushnumber(L, pilotLatitude);
else
lua_pushnil(L);
return 1;
}
else if (!strcmp(what, "pilot longitude")) {
if (frskyData.hub.gpsFix)
lua_pushnumber(L, pilotLongitude);
else
lua_pushnil(L);
return 1;
}
}
lua_pushnil(L);
}
return 0;
}