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

AP_HAL_SITL: remove superfluous linefeed from panic strings

Browse Source 
panic adds this within the HAL layer.
This commit is contained in:
Peter Barker 2024-12-13 20:15:44 +11:00 committed by Peter Barker
parent dc2a5e02b6
commit 57ac1e5911
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_HAL_SITL/Scheduler.cpp
View File

@ -414,7 +414,7 @@ void Scheduler::check_thread_stacks(void)
const uint8_t ncheck = 8; const uint8_t ncheck = 8;
for (uint8_t i=0; i<ncheck; i++) { for (uint8_t i=0; i<ncheck; i++) {
if (p->stack_min[i] != stackfill) { if (p->stack_min[i] != stackfill) {
AP_HAL::panic("stack overflow in thread %s\n", p->name); AP_HAL::panic("stack overflow in thread %s", p->name);
} }
} }
} }

8
libraries/AP_HAL_SITL/Storage.cpp
View File

@ -279,7 +279,7 @@ static bool sitl_flash_write(uint32_t addr, const uint8_t *data, uint32_t length
} }
#if defined(HAL_FLASH_MIN_WRITE_SIZE) && HAL_FLASH_MIN_WRITE_SIZE == 32 #if defined(HAL_FLASH_MIN_WRITE_SIZE) && HAL_FLASH_MIN_WRITE_SIZE == 32
if ((length % HAL_FLASH_MIN_WRITE_SIZE) != 0 || (addr % HAL_FLASH_MIN_WRITE_SIZE) != 0) { if ((length % HAL_FLASH_MIN_WRITE_SIZE) != 0 || (addr % HAL_FLASH_MIN_WRITE_SIZE) != 0) {
AP_HAL::panic("Attempt to write flash at %u length %u\n", addr, length); AP_HAL::panic("Attempt to write flash at %u length %u", addr, length);
} }
// emulate H7 requirement that writes be to untouched bytes // emulate H7 requirement that writes be to untouched bytes
for (uint32_t i=0; i<length; i+= 32) { for (uint32_t i=0; i<length; i+= 32) {
@ -288,7 +288,7 @@ static bool sitl_flash_write(uint32_t addr, const uint8_t *data, uint32_t length
} }
for (uint32_t j=0; j<32; j++) { for (uint32_t j=0; j<32; j++) {
if (old[i+j] != 0xFF) { if (old[i+j] != 0xFF) {
AP_HAL::panic("Attempt to write modified flash at %u length %u\n", addr+i+j, length); AP_HAL::panic("Attempt to write modified flash at %u length %u", addr+i+j, length);
} }
} }
} }
@ -299,12 +299,12 @@ static bool sitl_flash_write(uint32_t addr, const uint8_t *data, uint32_t length
#if HAL_FLASH_ALLOW_UPDATE #if HAL_FLASH_ALLOW_UPDATE
// emulating flash that allows setting any bit from 1 to 0 // emulating flash that allows setting any bit from 1 to 0
if (data[i] & ~old[i]) { if (data[i] & ~old[i]) {
AP_HAL::panic("Attempt to set flash byte 0x%02x from 0x%02x at %u\n", data[i], old[i], addr+i); AP_HAL::panic("Attempt to set flash byte 0x%02x from 0x%02x at %u", data[i], old[i], addr+i);
} }
#else #else
// emulating flash that only allows update if whole byte is 0xFF // emulating flash that only allows update if whole byte is 0xFF
if (data[i] != old[i] && old[i] != 0xFF) { if (data[i] != old[i] && old[i] != 0xFF) {
AP_HAL::panic("Attempt to set flash byte 0x%02x from 0x%02x at %u\n", data[i], old[i], addr+i); AP_HAL::panic("Attempt to set flash byte 0x%02x from 0x%02x at %u", data[i], old[i], addr+i);
} }
#endif #endif
} }