Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Scripting: resolve gcs::send_text compiler warning

This commit is contained in:
Randy Mackay 2019-07-27 11:10:26 +09:00
parent adcf9c4fa4
commit 0e9688a4e1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_Scripting/lua_scripts.cpp
View File

@ -188,7 +188,7 @@ void lua_scripts::run_next_script(lua_State *L) {
if(lua_pcall(L, 0, LUA_MULTRET, 0)) { if(lua_pcall(L, 0, LUA_MULTRET, 0)) {
if (overtime) { if (overtime) {
// script has consumed an excessive amount of CPU time // script has consumed an excessive amount of CPU time
gcs().send_text(MAV_SEVERITY_CRITICAL, "Lua: %s exceeded time limit (%d)", script->name, vm_steps); gcs().send_text(MAV_SEVERITY_CRITICAL, "Lua: %s exceeded time limit (%d)", script->name, (int)vm_steps);
remove_script(L, script); remove_script(L, script);
} else { } else {
gcs().send_text(MAV_SEVERITY_INFO, "Lua: %s", lua_tostring(L, -1)); gcs().send_text(MAV_SEVERITY_INFO, "Lua: %s", lua_tostring(L, -1));
@ -385,15 +385,15 @@ void lua_scripts::run(void) {
gcs().send_text(MAV_SEVERITY_DEBUG, "Lua: Running %s", scripts->name); gcs().send_text(MAV_SEVERITY_DEBUG, "Lua: Running %s", scripts->name);
} }
const uint32_t startMem = lua_gc(L, LUA_GCCOUNT, 0) * 1024 + lua_gc(L, LUA_GCCOUNTB, 0); const int startMem = lua_gc(L, LUA_GCCOUNT, 0) * 1024 + lua_gc(L, LUA_GCCOUNTB, 0);
const uint32_t loadEnd = AP_HAL::micros(); const uint32_t loadEnd = AP_HAL::micros();
run_next_script(L); run_next_script(L);
const uint32_t runEnd = AP_HAL::micros(); const uint32_t runEnd = AP_HAL::micros();
const uint32_t endMem = lua_gc(L, LUA_GCCOUNT, 0) * 1024 + lua_gc(L, LUA_GCCOUNTB, 0); const int endMem = lua_gc(L, LUA_GCCOUNT, 0) * 1024 + lua_gc(L, LUA_GCCOUNTB, 0);
if (_debug_level > 1) { if (_debug_level > 1) {
gcs().send_text(MAV_SEVERITY_DEBUG, "Lua: Time: %d Mem: %d", runEnd - loadEnd, endMem - startMem); gcs().send_text(MAV_SEVERITY_DEBUG, "Lua: Time: %u Mem: %d", (unsigned int)(runEnd - loadEnd), (int)(endMem - startMem));
} }
} else { } else {