[FL-2263] Flasher service & RAM exec (#1006)
* WIP on stripping fw * Compact FW build - use RAM_EXEC=1 COMPACT=1 DEBUG=0 * Fixed uninitialized storage struct; small fixes to compact fw * Flasher srv w/mocked flash ops * Fixed typos & accomodated FFF changes * Alternative fw startup branch * Working load & jmp to RAM fw * +manifest processing for stage loader; + crc verification for stage payload * Fixed questionable code & potential leaks * Lowered screen update rate; added radio stack update stubs; working dfu write * Console EP with manifest & stage validation * Added microtar lib; minor ui fixes for updater * Removed microtar * Removed mtar #2 * Added a better version of microtar * TAR archive api; LFS backup & restore core * Recursive backup/restore * LFS worker thread * Added system apps to loader - not visible in UI; full update process with restarts * Typo fix * Dropped BL & f6; tooling for updater WIP * Minor py fixes * Minor fixes to make it build after merge * Ported flash workaround from BL + fixed visuals * Minor cleanup * Chmod + loader app search fix * Python linter fix * Removed usb stuff & float read support for staged loader == -10% of binary size * Added backup/restore & update pb requests * Added stub impl to RPC for backup/restore/update commands * Reworked TAR to use borrowed Storage api; slightly reduced build size by removing `static string`; hidden update-related RPC behind defines * Moved backup&restore to storage * Fixed new message types * Backup/restore/update RPC impl * Moved furi_hal_crc to LL; minor fixes * CRC HAL rework to LL * Purging STM HAL * Brought back minimal DFU boot mode (no gui); additional crc state checks * Added splash screen, BROKEN usb function * Clock init rework WIP * Stripped graphics from DFU mode * Temp fix for unused static fun * WIP update picker - broken! * Fixed UI * Bumping version * Fixed RTC setup * Backup to update folder instead of ext root * Removed unused scenes & more usb remnants from staged loader * CI updates * Fixed update bundle name * Temporary restored USB handler * Attempt to prevent .text corruption * Comments on how I spent this Saturday * Added update file icon * Documentation updates * Moved common code to lib folder * Storage: more unit tests * Storage: blocking dir open, differentiate file and dir when freed. * Major refactoring; added input processing to updater to allow retrying on failures (not very useful prob). Added API for extraction of thread return value * Removed re-init check for manifest * Changed low-level path manipulation to toolbox/path.h; makefile cleanup; tiny fix in lint.py * Increased update worker stack size * Text fixes in backup CLI * Displaying number of update stages to run; removed timeout in handling errors * Bumping version * Added thread cleanup for spawner thread * Updated build targets to exclude firmware bundle from 'ALL' * Fixed makefile for update_package; skipping VCP init for update mode (ugly) * Switched github build from ALL to update_package * Added +x for dist_update.sh * Cli: add total heap size to "free" command * Moved (RAM) suffix to build version instead of git commit no. * DFU comment * Some fixes suggested by clang-tidy * Fixed recursive PREFIX macro * Makefile: gather all new rules in updater namespace. FuriHal: rename bootloader to boot, isr safe delays * Github: correct build target name in firmware build * FuriHal: move target switch to boot * Makefile: fix firmware flash * Furi, FuriHal: move kernel start to furi, early init * Drop bootloader related stuff * Drop cube. Drop bootloader linker script. * Renamed update_hl, moved constants to #defines * Moved update-related boot mode to separate bitfield * Reworked updater cli to single entry point; fixed crash on tar cleanup * Added Python replacement for dist shell scripts * Linter fixes for dist.py +x * Fixes for environment suffix * Dropped bash scripts * Added dirty build flag to version structure & interfaces * Version string escapes * Fixed flag logic in dist.py; added support for App instances being imported and not terminating the whole program * Fixed fw address in ReadMe.md * Rpc: fix crash on double screen start * Return back original boot behavior and fix jump to system bootloader * Cleanup code, add error sequence for RTC * Update firmware readme * FuriHal: drop boot, restructure RTC registers usage and add header register check * Furi goes first * Toolchain: add ccache support * Renamed update bundle dir Co-authored-by: DrZlo13 <who.just.the.doctor@gmail.com> Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
hedger
GitHub
151
applications/updater/views/updater_main.c
Normal file
151
applications/updater/views/updater_main.c
Normal file
@@ -0,0 +1,151 @@
|
||||
#include <gui/gui_i.h>
|
||||
#include <gui/view.h>
|
||||
#include <gui/elements.h>
|
||||
#include <gui/canvas.h>
|
||||
#include <furi.h>
|
||||
#include <input/input.h>
|
||||
|
||||
#include "../updater_i.h"
|
||||
#include "updater_main.h"
|
||||
|
||||
struct UpdaterMainView {
|
||||
View* view;
|
||||
ViewDispatcher* view_dispatcher;
|
||||
FuriPubSubSubscription* subscription;
|
||||
void* context;
|
||||
};
|
||||
|
||||
static const uint8_t PROGRESS_RENDER_STEP = 3; /* percent, to limit rendering rate */
|
||||
|
||||
typedef struct {
|
||||
string_t status;
|
||||
uint8_t progress, rendered_progress;
|
||||
uint8_t idx_stage, total_stages;
|
||||
bool failed;
|
||||
} UpdaterProgressModel;
|
||||
|
||||
void updater_main_model_set_state(
|
||||
UpdaterMainView* main_view,
|
||||
const char* message,
|
||||
uint8_t progress,
|
||||
uint8_t idx_stage,
|
||||
uint8_t total_stages,
|
||||
bool failed) {
|
||||
with_view_model(
|
||||
main_view->view, (UpdaterProgressModel * model) {
|
||||
model->failed = failed;
|
||||
model->idx_stage = idx_stage;
|
||||
model->total_stages = total_stages;
|
||||
model->progress = progress;
|
||||
if(string_cmp_str(model->status, message)) {
|
||||
string_set(model->status, message);
|
||||
model->rendered_progress = progress;
|
||||
return true;
|
||||
}
|
||||
if((model->rendered_progress > progress) ||
|
||||
((progress - model->rendered_progress) > PROGRESS_RENDER_STEP)) {
|
||||
model->rendered_progress = progress;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
});
|
||||
}
|
||||
|
||||
View* updater_main_get_view(UpdaterMainView* main_view) {
|
||||
furi_assert(main_view);
|
||||
return main_view->view;
|
||||
}
|
||||
|
||||
bool updater_main_input(InputEvent* event, void* context) {
|
||||
furi_assert(event);
|
||||
furi_assert(context);
|
||||
|
||||
UpdaterMainView* main_view = context;
|
||||
if(!main_view->view_dispatcher) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if(event->type != InputTypeShort) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if(event->key == InputKeyOk) {
|
||||
view_dispatcher_send_custom_event(
|
||||
main_view->view_dispatcher, UpdaterCustomEventRetryUpdate);
|
||||
} else if(event->key == InputKeyBack) {
|
||||
view_dispatcher_send_custom_event(
|
||||
main_view->view_dispatcher, UpdaterCustomEventCancelUpdate);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static void updater_main_draw_callback(Canvas* canvas, void* _model) {
|
||||
UpdaterProgressModel* model = _model;
|
||||
|
||||
canvas_set_font(canvas, FontPrimary);
|
||||
|
||||
uint16_t y_offset = model->failed ? 5 : 13;
|
||||
string_t status_text;
|
||||
if(!model->failed && (model->idx_stage != 0) && (model->idx_stage <= model->total_stages)) {
|
||||
string_init_printf(
|
||||
status_text,
|
||||
"[%d/%d] %s",
|
||||
model->idx_stage,
|
||||
model->total_stages,
|
||||
string_get_cstr(model->status));
|
||||
} else {
|
||||
string_init_set(status_text, model->status);
|
||||
}
|
||||
canvas_draw_str_aligned(
|
||||
canvas, 128 / 2, y_offset, AlignCenter, AlignTop, string_get_cstr(status_text));
|
||||
string_clear(status_text);
|
||||
if(model->failed) {
|
||||
canvas_set_font(canvas, FontSecondary);
|
||||
canvas_draw_str_aligned(
|
||||
canvas, 128 / 2, 20, AlignCenter, AlignTop, "[OK] to retry, [Back] to abort");
|
||||
}
|
||||
elements_progress_bar(canvas, 14, 35, 100, (float)model->progress / 100);
|
||||
}
|
||||
|
||||
UpdaterMainView* updater_main_alloc() {
|
||||
UpdaterMainView* main_view = malloc(sizeof(UpdaterMainView));
|
||||
|
||||
main_view->view = view_alloc();
|
||||
view_allocate_model(main_view->view, ViewModelTypeLocking, sizeof(UpdaterProgressModel));
|
||||
|
||||
with_view_model(
|
||||
main_view->view, (UpdaterProgressModel * model) {
|
||||
string_init_set(model->status, "Waiting for storage");
|
||||
return true;
|
||||
});
|
||||
|
||||
view_set_context(main_view->view, main_view);
|
||||
view_set_input_callback(main_view->view, updater_main_input);
|
||||
view_set_draw_callback(main_view->view, updater_main_draw_callback);
|
||||
|
||||
return main_view;
|
||||
}
|
||||
|
||||
void updater_main_free(UpdaterMainView* main_view) {
|
||||
furi_assert(main_view);
|
||||
with_view_model(
|
||||
main_view->view, (UpdaterProgressModel * model) {
|
||||
string_clear(model->status);
|
||||
return false;
|
||||
});
|
||||
view_free(main_view->view);
|
||||
free(main_view);
|
||||
}
|
||||
|
||||
void updater_main_set_storage_pubsub(UpdaterMainView* main_view, FuriPubSubSubscription* sub) {
|
||||
main_view->subscription = sub;
|
||||
}
|
||||
|
||||
FuriPubSubSubscription* updater_main_get_storage_pubsub(UpdaterMainView* main_view) {
|
||||
return main_view->subscription;
|
||||
}
|
||||
|
||||
void updater_main_set_view_dispatcher(UpdaterMainView* main_view, ViewDispatcher* view_dispatcher) {
|
||||
main_view->view_dispatcher = view_dispatcher;
|
||||
}
|
||||
28
applications/updater/views/updater_main.h
Normal file
28
applications/updater/views/updater_main.h
Normal file
@@ -0,0 +1,28 @@
|
||||
#pragma once
|
||||
|
||||
#include <gui/view.h>
|
||||
|
||||
typedef struct UpdaterMainView UpdaterMainView;
|
||||
typedef struct FuriPubSubSubscription FuriPubSubSubscription;
|
||||
typedef struct ViewDispatcher ViewDispatcher;
|
||||
typedef void (*UpdaterMainInputCallback)(InputType type, void* context);
|
||||
|
||||
View* updater_main_get_view(UpdaterMainView* main_view);
|
||||
|
||||
UpdaterMainView* updater_main_alloc();
|
||||
|
||||
void updater_main_free(UpdaterMainView* main_view);
|
||||
|
||||
void updater_main_model_set_state(
|
||||
UpdaterMainView* main_view,
|
||||
const char* message,
|
||||
uint8_t progress,
|
||||
uint8_t idx_stage,
|
||||
uint8_t total_stages,
|
||||
bool failed);
|
||||
|
||||
void updater_main_set_storage_pubsub(UpdaterMainView* main_view, FuriPubSubSubscription* sub);
|
||||
|
||||
FuriPubSubSubscription* updater_main_get_storage_pubsub(UpdaterMainView* main_view);
|
||||
|
||||
void updater_main_set_view_dispatcher(UpdaterMainView* main_view, ViewDispatcher* view_dispatcher);
|
||||
Reference in New Issue
Block a user