From 69281226506cc8a4cb66866f06cf2464d6cf21fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=81=8F?= Date: Mon, 11 Jan 2021 15:42:25 +0300 Subject: FL-53: new NFC worker, A/B/F/V poll and display. (#283) * GUI: view. Flooper-blooper fix compilation error. * GUI: view and viewdispatcher bones * GUI: view implementation, view models, view dispatcher * GUI: view navigation, model refinement. Power: use view, view dispatcher. * HAL Flash: proper page write. Dolphin: views. Power: views * Dolphin: transition idle scree to Views * Dolphin: input events on stats view. Format sources. * HAL: flash erase. Dolphin: permanent state storage. * Dolphin: first start welcome. HAL: flash operation status, errata 2.2.9 crutch. * NFC: rewrite worker * NFC: add support for B,F,V. * NFC: replace rfal irq hanlder with realtime thread, more details about cards. * Bootloader: LSE and RTS shenanigans, LED control, morse code for LSE failure error. * F4: stop in Error_Handler * BLE: handle working FUS, but empty radio stack. * HAL: alive FUS is now sufficient for flash controller access * Dolphin: update model after state load * NFC: detect navigation * RFAL: use osPriorityISR for isr thread * NFC: emulation * Bootloader: rollback incorrectly merged rename * Dolphin: rollback incorrectly merged changes * RFAL: remove volatile from thread attr * RFAL: do not call platform ErrorHandler, error codes is enough * NFC: improved error handling * Format sources * NFC: reset detect view model on start * Format sources * update codeowners * NFC: hide last info if no card detected --- applications/dolphin/dolphin.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'applications/dolphin') diff --git a/applications/dolphin/dolphin.c b/applications/dolphin/dolphin.c index 8506c12a..619c5fc2 100644 --- a/applications/dolphin/dolphin.c +++ b/applications/dolphin/dolphin.c @@ -92,11 +92,6 @@ Dolphin* dolphin_alloc() { view_set_context(dolphin->idle_view_stats, dolphin); view_allocate_model( dolphin->idle_view_stats, ViewModelTypeLockFree, sizeof(DolphinViewIdleStatsModel)); - with_view_model( - dolphin->idle_view_stats, (DolphinViewIdleStatsModel * model) { - model->icounter = dolphin_state_get_icounter(dolphin->state); - model->butthurt = dolphin_state_get_butthurt(dolphin->state); - }); view_set_draw_callback(dolphin->idle_view_stats, dolphin_view_idle_stats_draw); view_set_input_callback(dolphin->idle_view_stats, dolphin_view_idle_stats_input); view_set_previous_callback(dolphin->idle_view_stats, dolphin_view_idle_back); @@ -137,6 +132,11 @@ void dolphin_task() { } else { view_dispatcher_switch_to_view(dolphin->idle_view_dispatcher, DolphinViewFirstStart); } + with_view_model( + dolphin->idle_view_stats, (DolphinViewIdleStatsModel * model) { + model->icounter = dolphin_state_get_icounter(dolphin->state); + model->butthurt = dolphin_state_get_butthurt(dolphin->state); + }); if(!furi_create("dolphin", dolphin)) { printf("[dolphin_task] cannot create the dolphin record\n"); -- cgit v1.2.3