aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_HAL_SITL: create and use INTERNAL_ERROR macro so we get line numbers

Browse Source
This commit is contained in:
Peter Barker 2020-04-30 10:40:46 +10:00 committed by Peter Barker
parent 141d7fed48
commit 5f8a9d1e15
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/AP_HAL_SITL/HAL_SITL_Class.cpp
View File

@ -166,7 +166,7 @@ void HAL_SITL::run(int argc, char * const argv[], Callbacks* callbacks) const
analogin->init();
if (getenv("SITL_WATCHDOG_RESET")) {
AP::internalerror().error(AP_InternalError::error_t::watchdog_reset);
INTERNAL_ERROR(AP_InternalError::error_t::watchdog_reset);
if (watchdog_load((uint32_t *)&utilInstance.persistent_data, (sizeof(utilInstance.persistent_data)+3)/4)) {
uartA->printf("Loaded watchdog data");
utilInstance.last_persistent_data = utilInstance.persistent_data;
@ -190,11 +190,12 @@ void HAL_SITL::run(int argc, char * const argv[], Callbacks* callbacks) const
if (getenv("SITL_WATCHDOG_RESET")) {
const AP_HAL::Util::PersistentData &pd = util->persistent_data;
AP::logger().WriteCritical("WDOG", "TimeUS,Task,IErr,IErrCnt,MavMsg,MavCmd,SemLine", "QbIIHHH",
AP::logger().WriteCritical("WDOG", "TimeUS,Task,IErr,IErrCnt,IErrLn,MavMsg,MavCmd,SemLine", "QbIHHHHH",
AP_HAL::micros64(),
pd.scheduler_task,
pd.internal_errors,
pd.internal_error_count,
pd.internal_error_last_line,
pd.last_mavlink_msgid,
pd.last_mavlink_cmd,
pd.semaphore_line);