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

HAL_ChibiOS: mention of HAL_CRASH_DUMP_FLASHPAGE not required

This commit is contained in:
bugobliterator 2021-11-26 10:20:14 +05:30 committed by Andrew Tridgell
parent 878940292d
commit 4efe75683a
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/AP_HAL_ChibiOS/Util.cpp
View File

@ -699,20 +699,20 @@ void Util::log_stack_info(void)
#endif
}
#if defined(HAL_CRASH_DUMP_FLASHPAGE) && !defined(HAL_BOOTLOADER_BUILD)
#if !defined(HAL_BOOTLOADER_BUILD)
size_t Util::last_crash_dump_size() const
{
#if HAL_GCS_ENABLED
#if HAL_GCS_ENABLED && HAL_CRASHDUMP_ENABLE
// get dump size
uint32_t size = stm32_crash_dump_size();
char* dump_start = (char*)stm32_flash_getpageaddr(HAL_CRASH_DUMP_FLASHPAGE);
char* dump_start = (char*)stm32_crash_dump_addr();
if (!(dump_start[0] == 0x63 && dump_start[1] == 0x43)) {
// there's no valid Crash Dump
return 0;
}
if (size == 0xFFFFFFFF) {
GCS_SEND_TEXT(MAV_SEVERITY_ERROR, "Crash Dump incomplete, dumping what we got!");
size = stm32_flash_getpagesize(HAL_CRASH_DUMP_FLASHPAGE);
size = stm32_crash_dump_max_size();
}
return size;
#endif
@ -721,13 +721,17 @@ size_t Util::last_crash_dump_size() const
void* Util::last_crash_dump_ptr() const
{
#if HAL_GCS_ENABLED && HAL_CRASHDUMP_ENABLE
if (last_crash_dump_size() == 0) {
GCS_SEND_TEXT(MAV_SEVERITY_INFO, "No Crash Detected!");
return nullptr;
}
return (void*)stm32_flash_getpageaddr(HAL_CRASH_DUMP_FLASHPAGE);
return (void*)stm32_crash_dump_addr();
#else
return nullptr;
#endif
}
#endif // HAL_CRASH_DUMP_FLASHPAGE
#endif // HAL_BOOTLOADER_BUILD
// set armed state
void Util::set_soft_armed(const bool b)

2
libraries/AP_HAL_ChibiOS/Util.h
View File

@ -139,7 +139,7 @@ private:
// log info on stack usage
void log_stack_info(void) override;
#if defined(HAL_CRASH_DUMP_FLASHPAGE) && !defined(HAL_BOOTLOADER_BUILD)
#if !defined(HAL_BOOTLOADER_BUILD)
// get last crash dump
size_t last_crash_dump_size() const override;
void* last_crash_dump_ptr() const override;