Mirrors_Framework/ardupilot
1
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot.git synced 2026-02-08 05:55:24 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

AP_Scripting: cleanup debug option handling

Browse Source
This commit is contained in:
Andrew Tridgell
2024-03-13 17:36:57 +11:00
parent 79b596d229
commit 66752996e4
4 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/AP_Scripting/lua_scripts.cpp
View File

@@ -40,7 +40,7 @@ uint32_t lua_scripts::loaded_checksum;
uint32_t lua_scripts::running_checksum;
HAL_Semaphore lua_scripts::crc_sem;
lua_scripts::lua_scripts(const AP_Int32 &vm_steps, const AP_Int32 &heap_size, const AP_Int8 &debug_options)
lua_scripts::lua_scripts(const AP_Int32 &vm_steps, const AP_Int32 &heap_size, AP_Int8 &debug_options)
: _vm_steps(vm_steps),
_debug_options(debug_options)
{
@@ -129,14 +129,14 @@ int lua_scripts::atpanic(lua_State *L) {
// helper for print and log of runtime stats
void lua_scripts::update_stats(const char *name, uint32_t run_time, int total_mem, int run_mem)
{
if ((_debug_options.get() & uint8_t(DebugLevel::RUNTIME_MSG)) != 0) {
if (option_is_set(AP_Scripting::DebugOption::RUNTIME_MSG)) {
GCS_SEND_TEXT(MAV_SEVERITY_DEBUG, "Lua: Time: %u Mem: %d + %d",
(unsigned int)run_time,
(int)total_mem,
(int)run_mem);
}
#if HAL_LOGGING_ENABLED
if ((_debug_options.get() & uint8_t(DebugLevel::LOG_RUNTIME)) != 0) {
if (option_is_set(AP_Scripting::DebugOption::LOG_RUNTIME)) {
struct log_Scripting pkt {
LOG_PACKET_HEADER_INIT(LOG_SCRIPTING_MSG),
time_us : AP_HAL::micros64(),
@@ -295,7 +295,7 @@ void lua_scripts::load_all_scripts_in_dir(lua_State *L, const char *dirname) {
reschedule_script(script);
#if HAL_LOGGER_FILE_CONTENTS_ENABLED
if ((_debug_options.get() & uint8_t(DebugLevel::SUPPRESS_SCRIPT_LOG)) == 0) {
if (!option_is_set(AP_Scripting::DebugOption::SUPPRESS_SCRIPT_LOG)) {
AP::logger().log_file_content(filename);
}
#endif
@@ -564,7 +564,7 @@ void lua_scripts::run(void) {
hal.scheduler->delay(scripts->next_run_ms - now_ms);
}
if ((_debug_options.get() & uint8_t(DebugLevel::RUNTIME_MSG)) != 0) {
if (option_is_set(AP_Scripting::DebugOption::RUNTIME_MSG)) {
GCS_SEND_TEXT(MAV_SEVERITY_DEBUG, "Lua: Running %s", scripts->name);
}
// take a copy of the script name for the purposes of
@@ -600,7 +600,7 @@ void lua_scripts::run(void) {
lua_gc(L, LUA_GCCOLLECT, 0);
} else {
if ((_debug_options.get() & uint8_t(DebugLevel::NO_SCRIPTS_TO_RUN)) != 0) {
if (option_is_set(AP_Scripting::DebugOption::NO_SCRIPTS_TO_RUN)) {
GCS_SEND_TEXT(MAV_SEVERITY_DEBUG, "Lua: No scripts to run");
}
hal.scheduler->delay(1000);