mohr/obsw
1
0
Fork 0
forked from ROMEO/obsw
Code Pull Requests 1 Actions Releases 4 Activity

handling failed freeRTOS assertion as panic

Browse Source
This commit is contained in:
Ulrich Mohr 2024-06-25 13:19:31 +02:00
parent c9a81c025f
commit a7336c7f75
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mission/main.c
View File

@ -241,6 +241,7 @@ void vApplicationMallocFailedHook(void) {
timers, and semaphores. The size of the FreeRTOS heap is set by the timers, and semaphores. The size of the FreeRTOS heap is set by the
configTOTAL_HEAP_SIZE configuration constant in FreeRTOSConfig.h. */ configTOTAL_HEAP_SIZE configuration constant in FreeRTOSConfig.h. */
taskDISABLE_INTERRUPTS(); taskDISABLE_INTERRUPTS();
//TODO panic
for (;;) for (;;)
; ;
} }
@ -254,6 +255,7 @@ void vApplicationStackOverflowHook(TaskHandle_t pxTask, char *pcTaskName) {
configCHECK_FOR_STACK_OVERFLOW is defined to 1 or 2. This hook configCHECK_FOR_STACK_OVERFLOW is defined to 1 or 2. This hook
function is called if a stack overflow is detected. */ function is called if a stack overflow is detected. */
taskDISABLE_INTERRUPTS(); taskDISABLE_INTERRUPTS();
//TODO panic
for (;;) for (;;)
; ;
} }
@ -277,7 +279,14 @@ void vApplicationIdleHook(void) {
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
void rust_assert_called(const char *pcFile, unsigned long ulLine);
void vAssertCalled(const char *pcFile, unsigned long ulLine) { void vAssertCalled(const char *pcFile, unsigned long ulLine) {
rust_assert_called(pcFile, ulLine);
volatile unsigned long ul = 0; volatile unsigned long ul = 0;
(void)pcFile; (void)pcFile;

23
mission_rust/src/lib.rs
View File

@ -21,8 +21,10 @@ fn panic(panic: &PanicInfo<'_>) -> ! {
osal::stop_it(); osal::stop_it();
} }
// TODO: Make this unicode-safe // TODO: Make this unicode-safe
sif!("In Task \""); sifln!("");
sif!("in task \"");
unsafe { unsafe {
//TODO is from_ptr safe enough?
let task_name = core::ffi::CStr::from_ptr(osal::get_task_name()); let task_name = core::ffi::CStr::from_ptr(osal::get_task_name());
let task_name_utf8 = core::str::from_utf8(task_name.to_bytes()); let task_name_utf8 = core::str::from_utf8(task_name.to_bytes());
match task_name_utf8 { match task_name_utf8 {
@ -41,6 +43,25 @@ fn panic(panic: &PanicInfo<'_>) -> ! {
loop {} loop {}
} }
#[no_mangle]
extern "C" fn rust_assert_called(ptr: *const core::ffi::c_char, line: core::ffi::c_ulong) {
let file_name = unsafe {
//TODO is from_ptr safe enough?
let file_name = core::ffi::CStr::from_ptr(ptr);
let file_name_utf8 = core::str::from_utf8(file_name.to_bytes());
match file_name_utf8 {
Ok(string) => {
string
}
Err(_) => {
"Schei<EFBFBD> Encoding"
}
}
};
panic!("assertion failed at {file_name}:{}", line);
}
#[no_mangle] #[no_mangle]
extern "C" fn rust_main() { extern "C" fn rust_main() {
sifln!("Rust startup 🚀"); sifln!("Rust startup 🚀");