furi_check - a new way to asserting (#204)
* hal-related task_is_isr_context function * furi_check implementation * change application to use furi_check * add second level of assertion * add TODO about ISR context * Applications: refactor furi_check and furi_assert. * Apploader: propwer widget usage. Menu: check on furi resource request. * refactor furi_check Co-authored-by: Aleksandr Kutuzov <aku@plooks.com> Co-authored-by: coreglitch <mail@s3f.ru>
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
#include "menu_event.h"
|
||||
|
||||
#include <cmsis_os.h>
|
||||
#include <assert.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <flipper.h>
|
||||
#include <flipper_v2.h>
|
||||
|
||||
#define MENU_MESSAGE_MQUEUE_SIZE 8
|
||||
|
||||
@@ -25,30 +25,28 @@ MenuEvent* menu_event_alloc() {
|
||||
MenuEvent* menu_event = furi_alloc(sizeof(MenuEvent));
|
||||
|
||||
menu_event->mqueue = osMessageQueueNew(MENU_MESSAGE_MQUEUE_SIZE, sizeof(MenuMessage), NULL);
|
||||
assert(menu_event->mqueue);
|
||||
furi_check(menu_event->mqueue);
|
||||
|
||||
menu_event->timeout_timer =
|
||||
osTimerNew(MenuEventimeout_callback, osTimerOnce, menu_event, NULL);
|
||||
assert(menu_event->timeout_timer);
|
||||
furi_check(menu_event->timeout_timer);
|
||||
|
||||
return menu_event;
|
||||
}
|
||||
|
||||
void menu_event_free(MenuEvent* menu_event) {
|
||||
osStatus_t status;
|
||||
assert(menu_event);
|
||||
status = osMessageQueueDelete(menu_event->mqueue);
|
||||
assert(status == osOK);
|
||||
furi_assert(menu_event);
|
||||
furi_check(osMessageQueueDelete(menu_event->mqueue) == osOK);
|
||||
free(menu_event);
|
||||
}
|
||||
|
||||
void menu_event_activity_notify(MenuEvent* menu_event) {
|
||||
assert(menu_event);
|
||||
furi_assert(menu_event);
|
||||
osTimerStart(menu_event->timeout_timer, 60000U); // 1m timeout, return to main
|
||||
}
|
||||
|
||||
MenuMessage menu_event_next(MenuEvent* menu_event) {
|
||||
assert(menu_event);
|
||||
furi_assert(menu_event);
|
||||
MenuMessage message;
|
||||
while(osMessageQueueGet(menu_event->mqueue, &message, NULL, osWaitForever) != osOK) {
|
||||
};
|
||||
|
Reference in New Issue
Block a user