Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Scripting: bindings: logger: support more formats

Browse Source
This commit is contained in:
Iampete1 2022-12-27 01:31:48 +00:00 committed by Andrew Tridgell
parent 3d9794a503
commit f0c1673b62
1 changed files with 53 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
libraries/AP_Scripting/lua_bindings.cpp
View File

@ -191,19 +191,55 @@ int AP_Logger_Write(lua_State *L) {
uint8_t index = have_units ? i-5 : i-3; uint8_t index = have_units ? i-5 : i-3;
uint8_t arg_index = i + arg_offset; uint8_t arg_index = i + arg_offset;
switch(fmt_cat[index]) { switch(fmt_cat[index]) {
// logger varable types not available to scripting // logger variable types not available to scripting
// 'b': int8_t
// 'h': int16_t
// 'c': int16_t
// 'd': double // 'd': double
// 'H': uint16_t
// 'C': uint16_t
// 'Q': uint64_t // 'Q': uint64_t
// 'q': int64_t // 'q': int64_t
// 'a': arrays // 'a': arrays
case 'i': case 'b': { // int8_t
case 'L': int isnum;
case 'e': { const lua_Integer tmp1 = lua_tointegerx(L, arg_index, &isnum);
if (!isnum || (tmp1 < INT8_MIN) || (tmp1 > INT8_MAX)) {
luaM_free(L, buffer);
luaL_argerror(L, arg_index, "argument out of range");
// no return
}
int8_t tmp = static_cast<int8_t>(tmp1);
memcpy(&buffer[offset], &tmp, sizeof(int8_t));
offset += sizeof(int8_t);
break;
}
case 'h': // int16_t
case 'c': { // int16_t * 100
int isnum;
const lua_Integer tmp1 = lua_tointegerx(L, arg_index, &isnum);
if (!isnum || (tmp1 < INT16_MIN) || (tmp1 > INT16_MAX)) {
luaM_free(L, buffer);
luaL_argerror(L, arg_index, "argument out of range");
// no return
}
int16_t tmp = static_cast<int16_t>(tmp1);
memcpy(&buffer[offset], &tmp, sizeof(int16_t));
offset += sizeof(int16_t);
break;
}
case 'H': // uint16_t
case 'C': { // uint16_t * 100
int isnum;
const lua_Integer tmp1 = lua_tointegerx(L, arg_index, &isnum);
if (!isnum || (tmp1 < 0) || (tmp1 > UINT16_MAX)) {
luaM_free(L, buffer);
luaL_argerror(L, arg_index, "argument out of range");
// no return
}
uint16_t tmp = static_cast<uint16_t>(tmp1);
memcpy(&buffer[offset], &tmp, sizeof(uint16_t));
offset += sizeof(uint16_t);
break;
}
case 'i': // int32_t
case 'L': // int32_t (lat/long)
case 'e': { // int32_t * 100
int isnum; int isnum;
const lua_Integer tmp1 = lua_tointegerx(L, arg_index, &isnum); const lua_Integer tmp1 = lua_tointegerx(L, arg_index, &isnum);
if (!isnum) { if (!isnum) {
@ -216,7 +252,7 @@ int AP_Logger_Write(lua_State *L) {
offset += sizeof(int32_t); offset += sizeof(int32_t);
break; break;
} }
case 'f': { case 'f': { // float
int isnum; int isnum;
const lua_Number tmp1 = lua_tonumberx(L, arg_index, &isnum); const lua_Number tmp1 = lua_tonumberx(L, arg_index, &isnum);
if (!isnum) { if (!isnum) {
@ -229,12 +265,12 @@ int AP_Logger_Write(lua_State *L) {
offset += sizeof(float); offset += sizeof(float);
break; break;
} }
case 'n': { case 'n': { // char[4]
charlen = 4; charlen = 4;
break; break;
} }
case 'M': case 'M': // uint8_t (flight mode)
case 'B': { case 'B': { // uint8_t
int isnum; int isnum;
const lua_Integer tmp1 = lua_tointegerx(L, arg_index, &isnum); const lua_Integer tmp1 = lua_tointegerx(L, arg_index, &isnum);
if (!isnum || (tmp1 < 0) || (tmp1 > UINT8_MAX)) { if (!isnum || (tmp1 < 0) || (tmp1 > UINT8_MAX)) {
@ -247,8 +283,8 @@ int AP_Logger_Write(lua_State *L) {
offset += sizeof(uint8_t); offset += sizeof(uint8_t);
break; break;
} }
case 'I': case 'I': // uint32_t
case 'E': { case 'E': { // uint32_t * 100
uint32_t tmp; uint32_t tmp;
void * ud = luaL_testudata(L, arg_index, "uint32_t"); void * ud = luaL_testudata(L, arg_index, "uint32_t");
if (ud != nullptr) { if (ud != nullptr) {
@ -272,11 +308,11 @@ int AP_Logger_Write(lua_State *L) {
offset += sizeof(uint32_t); offset += sizeof(uint32_t);
break; break;
} }
case 'N': { case 'N': { // char[16]
charlen = 16; charlen = 16;
break; break;
} }
case 'Z': { case 'Z': { // char[64]
charlen = 64; charlen = 64;
break; break;
} }