[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:
30
applications/updater/scenes/updater_scene.c
Normal file
30
applications/updater/scenes/updater_scene.c
Normal file
@@ -0,0 +1,30 @@
|
||||
#include "updater_scene.h"
|
||||
|
||||
// Generate scene on_enter handlers array
|
||||
#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_enter,
|
||||
void (*const updater_on_enter_handlers[])(void*) = {
|
||||
#include "updater_scene_config.h"
|
||||
};
|
||||
#undef ADD_SCENE
|
||||
|
||||
// Generate scene on_event handlers array
|
||||
#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_event,
|
||||
bool (*const updater_on_event_handlers[])(void* context, SceneManagerEvent event) = {
|
||||
#include "updater_scene_config.h"
|
||||
};
|
||||
#undef ADD_SCENE
|
||||
|
||||
// Generate scene on_exit handlers array
|
||||
#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_exit,
|
||||
void (*const updater_on_exit_handlers[])(void* context) = {
|
||||
#include "updater_scene_config.h"
|
||||
};
|
||||
#undef ADD_SCENE
|
||||
|
||||
// Initialize scene handlers configuration structure
|
||||
const SceneManagerHandlers updater_scene_handlers = {
|
||||
.on_enter_handlers = updater_on_enter_handlers,
|
||||
.on_event_handlers = updater_on_event_handlers,
|
||||
.on_exit_handlers = updater_on_exit_handlers,
|
||||
.scene_num = UpdaterSceneNum,
|
||||
};
|
29
applications/updater/scenes/updater_scene.h
Normal file
29
applications/updater/scenes/updater_scene.h
Normal file
@@ -0,0 +1,29 @@
|
||||
#pragma once
|
||||
|
||||
#include <gui/scene_manager.h>
|
||||
|
||||
// Generate scene id and total number
|
||||
#define ADD_SCENE(prefix, name, id) UpdaterScene##id,
|
||||
typedef enum {
|
||||
#include "updater_scene_config.h"
|
||||
UpdaterSceneNum,
|
||||
} UpdaterScene;
|
||||
#undef ADD_SCENE
|
||||
|
||||
extern const SceneManagerHandlers updater_scene_handlers;
|
||||
|
||||
// Generate scene on_enter handlers declaration
|
||||
#define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_enter(void*);
|
||||
#include "updater_scene_config.h"
|
||||
#undef ADD_SCENE
|
||||
|
||||
// Generate scene on_event handlers declaration
|
||||
#define ADD_SCENE(prefix, name, id) \
|
||||
bool prefix##_scene_##name##_on_event(void* context, SceneManagerEvent event);
|
||||
#include "updater_scene_config.h"
|
||||
#undef ADD_SCENE
|
||||
|
||||
// Generate scene on_exit handlers declaration
|
||||
#define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_exit(void* context);
|
||||
#include "updater_scene_config.h"
|
||||
#undef ADD_SCENE
|
5
applications/updater/scenes/updater_scene_config.h
Normal file
5
applications/updater/scenes/updater_scene_config.h
Normal file
@@ -0,0 +1,5 @@
|
||||
ADD_SCENE(updater, main, Main)
|
||||
#ifndef FURI_RAM_EXEC
|
||||
ADD_SCENE(updater, loadcfg, LoadCfg)
|
||||
ADD_SCENE(updater, error, Error)
|
||||
#endif
|
65
applications/updater/scenes/updater_scene_error.c
Normal file
65
applications/updater/scenes/updater_scene_error.c
Normal file
@@ -0,0 +1,65 @@
|
||||
#include "updater/updater_i.h"
|
||||
#include "updater_scene.h"
|
||||
#include <update_util/update_operation.h>
|
||||
|
||||
void updater_scene_error_callback(GuiButtonType result, InputType type, void* context) {
|
||||
furi_assert(context);
|
||||
Updater* updater = context;
|
||||
if(type != InputTypeShort) {
|
||||
return;
|
||||
}
|
||||
|
||||
if(result == GuiButtonTypeLeft) {
|
||||
view_dispatcher_send_custom_event(
|
||||
updater->view_dispatcher, UpdaterCustomEventCancelUpdate);
|
||||
}
|
||||
}
|
||||
|
||||
void updater_scene_error_on_enter(void* context) {
|
||||
Updater* updater = (Updater*)context;
|
||||
|
||||
widget_add_button_element(
|
||||
updater->widget, GuiButtonTypeLeft, "Exit", updater_scene_error_callback, updater);
|
||||
|
||||
widget_add_string_multiline_element(
|
||||
updater->widget, 64, 13, AlignCenter, AlignCenter, FontPrimary, "Error");
|
||||
|
||||
widget_add_string_multiline_element(
|
||||
updater->widget,
|
||||
64,
|
||||
33,
|
||||
AlignCenter,
|
||||
AlignCenter,
|
||||
FontPrimary,
|
||||
update_operation_describe_preparation_result(updater->preparation_result));
|
||||
|
||||
view_dispatcher_switch_to_view(updater->view_dispatcher, UpdaterViewWidget);
|
||||
}
|
||||
|
||||
bool updater_scene_error_on_event(void* context, SceneManagerEvent event) {
|
||||
Updater* updater = (Updater*)context;
|
||||
bool consumed = false;
|
||||
|
||||
if(event.type == SceneManagerEventTypeBack) {
|
||||
view_dispatcher_stop(updater->view_dispatcher);
|
||||
consumed = true;
|
||||
} else if(event.type == SceneManagerEventTypeCustom) {
|
||||
switch(event.event) {
|
||||
case UpdaterCustomEventCancelUpdate:
|
||||
view_dispatcher_stop(updater->view_dispatcher);
|
||||
consumed = true;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return consumed;
|
||||
}
|
||||
|
||||
void updater_scene_error_on_exit(void* context) {
|
||||
Updater* updater = (Updater*)context;
|
||||
|
||||
widget_reset(updater->widget);
|
||||
free(updater->pending_update);
|
||||
}
|
105
applications/updater/scenes/updater_scene_loadcfg.c
Normal file
105
applications/updater/scenes/updater_scene_loadcfg.c
Normal file
@@ -0,0 +1,105 @@
|
||||
#include "updater/updater_i.h"
|
||||
#include "updater_scene.h"
|
||||
|
||||
#include <update_util/update_operation.h>
|
||||
#include <furi_hal.h>
|
||||
|
||||
void updater_scene_loadcfg_apply_callback(GuiButtonType result, InputType type, void* context) {
|
||||
furi_assert(context);
|
||||
Updater* updater = context;
|
||||
if(type != InputTypeShort) {
|
||||
return;
|
||||
}
|
||||
|
||||
if(result == GuiButtonTypeRight) {
|
||||
view_dispatcher_send_custom_event(updater->view_dispatcher, UpdaterCustomEventStartUpdate);
|
||||
} else if(result == GuiButtonTypeLeft) {
|
||||
view_dispatcher_send_custom_event(
|
||||
updater->view_dispatcher, UpdaterCustomEventCancelUpdate);
|
||||
}
|
||||
}
|
||||
|
||||
void updater_scene_loadcfg_on_enter(void* context) {
|
||||
Updater* updater = (Updater*)context;
|
||||
UpdaterManifestProcessingState* pending_upd = updater->pending_update =
|
||||
malloc(sizeof(UpdaterManifestProcessingState));
|
||||
pending_upd->manifest = update_manifest_alloc();
|
||||
|
||||
if(update_manifest_init(pending_upd->manifest, string_get_cstr(updater->startup_arg))) {
|
||||
widget_add_string_element(
|
||||
updater->widget, 64, 12, AlignCenter, AlignCenter, FontPrimary, "Update");
|
||||
|
||||
widget_add_string_multiline_element(
|
||||
updater->widget,
|
||||
64,
|
||||
32,
|
||||
AlignCenter,
|
||||
AlignCenter,
|
||||
FontSecondary,
|
||||
string_get_cstr(pending_upd->manifest->version));
|
||||
|
||||
widget_add_button_element(
|
||||
updater->widget,
|
||||
GuiButtonTypeRight,
|
||||
"Install",
|
||||
updater_scene_loadcfg_apply_callback,
|
||||
updater);
|
||||
} else {
|
||||
widget_add_string_element(
|
||||
updater->widget, 64, 24, AlignCenter, AlignCenter, FontPrimary, "Invalid manifest");
|
||||
}
|
||||
|
||||
widget_add_button_element(
|
||||
updater->widget,
|
||||
GuiButtonTypeLeft,
|
||||
"Cancel",
|
||||
updater_scene_loadcfg_apply_callback,
|
||||
updater);
|
||||
|
||||
view_dispatcher_switch_to_view(updater->view_dispatcher, UpdaterViewWidget);
|
||||
}
|
||||
|
||||
bool updater_scene_loadcfg_on_event(void* context, SceneManagerEvent event) {
|
||||
Updater* updater = (Updater*)context;
|
||||
bool consumed = false;
|
||||
|
||||
if(event.type == SceneManagerEventTypeBack) {
|
||||
view_dispatcher_stop(updater->view_dispatcher);
|
||||
consumed = true;
|
||||
} else if(event.type == SceneManagerEventTypeCustom) {
|
||||
switch(event.event) {
|
||||
case UpdaterCustomEventStartUpdate:
|
||||
updater->preparation_result =
|
||||
update_operation_prepare(string_get_cstr(updater->startup_arg));
|
||||
if(updater->preparation_result == UpdatePrepareResultOK) {
|
||||
furi_hal_power_reset();
|
||||
} else {
|
||||
#ifndef FURI_RAM_EXEC
|
||||
scene_manager_next_scene(updater->scene_manager, UpdaterSceneError);
|
||||
#endif
|
||||
}
|
||||
consumed = true;
|
||||
break;
|
||||
case UpdaterCustomEventCancelUpdate:
|
||||
view_dispatcher_stop(updater->view_dispatcher);
|
||||
consumed = true;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return consumed;
|
||||
}
|
||||
|
||||
void updater_scene_loadcfg_on_exit(void* context) {
|
||||
Updater* updater = (Updater*)context;
|
||||
|
||||
if(updater->pending_update) {
|
||||
update_manifest_free(updater->pending_update->manifest);
|
||||
string_clear(updater->pending_update->message);
|
||||
}
|
||||
|
||||
widget_reset(updater->widget);
|
||||
free(updater->pending_update);
|
||||
}
|
106
applications/updater/scenes/updater_scene_main.c
Normal file
106
applications/updater/scenes/updater_scene_main.c
Normal file
@@ -0,0 +1,106 @@
|
||||
#include <furi.h>
|
||||
#include <furi_hal.h>
|
||||
#include <applications.h>
|
||||
#include <storage/storage.h>
|
||||
|
||||
#include "updater/updater_i.h"
|
||||
#include "updater/views/updater_main.h"
|
||||
#include "updater_scene.h"
|
||||
|
||||
static void sd_mount_callback(const void* message, void* context) {
|
||||
Updater* updater = context;
|
||||
const StorageEvent* new_event = message;
|
||||
|
||||
switch(new_event->type) {
|
||||
case StorageEventTypeCardMount:
|
||||
view_dispatcher_send_custom_event(updater->view_dispatcher, UpdaterCustomEventStartUpdate);
|
||||
break;
|
||||
case StorageEventTypeCardUnmount:
|
||||
view_dispatcher_send_custom_event(updater->view_dispatcher, UpdaterCustomEventSdUnmounted);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void updater_scene_main_on_enter(void* context) {
|
||||
Updater* updater = (Updater*)context;
|
||||
UpdaterMainView* main_view = updater->main_view;
|
||||
|
||||
FuriPubSubSubscription* sub =
|
||||
furi_pubsub_subscribe(storage_get_pubsub(updater->storage), &sd_mount_callback, updater);
|
||||
updater_main_set_storage_pubsub(main_view, sub);
|
||||
|
||||
/* FIXME: there's a misbehavior in storage subsystem. If we produce heavy load on it before it
|
||||
* fires an SD card event, it'll never do that until the load is lifted. Meanwhile SD card icon
|
||||
* will be missing from UI, however, /ext will be fully operational. So, until it's fixed, this
|
||||
* should remain commented out. */
|
||||
// If (somehow) we started after SD card is mounted, initiate update immediately
|
||||
//if(storage_sd_status(updater->storage) == FSE_OK) {
|
||||
// view_dispatcher_send_custom_event(updater->view_dispatcher, UpdaterCustomEventStartUpdate);
|
||||
//}
|
||||
|
||||
updater_main_set_view_dispatcher(main_view, updater->view_dispatcher);
|
||||
view_dispatcher_switch_to_view(updater->view_dispatcher, UpdaterViewMain);
|
||||
}
|
||||
|
||||
static void updater_scene_restart_to_postupdate() {
|
||||
furi_hal_rtc_set_boot_mode(FuriHalRtcBootModePostUpdate);
|
||||
furi_hal_power_reset();
|
||||
}
|
||||
|
||||
bool updater_scene_main_on_event(void* context, SceneManagerEvent event) {
|
||||
Updater* updater = (Updater*)context;
|
||||
bool consumed = false;
|
||||
|
||||
if(event.type == SceneManagerEventTypeTick) {
|
||||
if(!update_task_is_running(updater->update_task)) {
|
||||
if(updater->idle_ticks++ >= (UPDATE_DELAY_OPERATION_ERROR / UPDATER_APP_TICK)) {
|
||||
updater_scene_restart_to_postupdate();
|
||||
}
|
||||
} else {
|
||||
updater->idle_ticks = 0;
|
||||
}
|
||||
} else if(event.type == SceneManagerEventTypeCustom) {
|
||||
switch(event.event) {
|
||||
case UpdaterCustomEventStartUpdate:
|
||||
if(!update_task_is_running(updater->update_task) &&
|
||||
update_task_init(updater->update_task)) {
|
||||
update_task_start(updater->update_task);
|
||||
}
|
||||
consumed = true;
|
||||
break;
|
||||
|
||||
case UpdaterCustomEventRetryUpdate:
|
||||
if(!update_task_is_running(updater->update_task) &&
|
||||
(update_task_get_state(updater->update_task)->stage != UpdateTaskStageComplete))
|
||||
update_task_start(updater->update_task);
|
||||
consumed = true;
|
||||
break;
|
||||
|
||||
case UpdaterCustomEventCancelUpdate:
|
||||
if(!update_task_is_running(updater->update_task)) {
|
||||
updater_scene_restart_to_postupdate();
|
||||
}
|
||||
consumed = true;
|
||||
break;
|
||||
|
||||
case UpdaterCustomEventSdUnmounted:
|
||||
// TODO: error out, stop worker (it's probably dead actually)
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return consumed;
|
||||
}
|
||||
|
||||
void updater_scene_main_on_exit(void* context) {
|
||||
Updater* updater = (Updater*)context;
|
||||
|
||||
furi_pubsub_unsubscribe(
|
||||
storage_get_pubsub(updater->storage), updater_main_get_storage_pubsub(updater->main_view));
|
||||
|
||||
scene_manager_set_scene_state(updater->scene_manager, UpdaterSceneMain, 0);
|
||||
}
|
Reference in New Issue
Block a user