From c209ec56fc0b5efe6c91d44a8663206b15f15b09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=81=8F?= Date: Fri, 15 Apr 2022 19:31:25 +0300 Subject: [PATCH 1/3] Release Candidate Bug Fixes and Improvements (#1121) * Notification: use all input for backlight, otherwise it is causing issues on repeat. Dolphin: rework debug tools. * Notification: remove unused variable * Applications: fix incorrect count in system apps list * SubGhz: fix memory leak in settings * SubGhz: fix incorrect frequency in newly created keys * Loader: make cli command parallel safe --- applications/applications.c | 16 +++---- .../desktop/scenes/desktop_scene_debug.c | 4 +- .../desktop/views/desktop_view_debug.c | 14 ++++-- applications/dolphin/helpers/dolphin_deed.h | 5 ++- applications/dolphin/helpers/dolphin_state.c | 17 +++++++ applications/loader/loader.c | 9 +++- applications/notification/notification_app.c | 5 +-- .../subghz/scenes/subghz_scene_read_raw.c | 3 +- .../subghz/scenes/subghz_scene_receiver.c | 3 +- .../scenes/subghz_scene_receiver_config.c | 12 ++--- .../subghz/scenes/subghz_scene_set_type.c | 4 +- applications/subghz/subghz.c | 3 +- applications/subghz/subghz_i.c | 2 +- applications/subghz/subghz_setting.c | 44 +++++++++++-------- applications/subghz/subghz_setting.h | 9 ++++ 15 files changed, 92 insertions(+), 58 deletions(-) diff --git a/applications/applications.c b/applications/applications.c index d5e7efd79..aba50fee7 100644 --- a/applications/applications.c +++ b/applications/applications.c @@ -131,7 +131,7 @@ const FlipperApplication FLIPPER_SERVICES[] = { #endif }; -const size_t FLIPPER_SERVICES_COUNT = sizeof(FLIPPER_SERVICES) / sizeof(FlipperApplication); +const size_t FLIPPER_SERVICES_COUNT = COUNT_OF(FLIPPER_SERVICES); const FlipperApplication FLIPPER_SYSTEM_APPS[] = { #ifdef APP_UPDATER @@ -142,7 +142,7 @@ const FlipperApplication FLIPPER_SYSTEM_APPS[] = { #endif }; -const size_t FLIPPER_SYSTEM_APPS_COUNT = sizeof(FLIPPER_SERVICES) / sizeof(FlipperApplication); +const size_t FLIPPER_SYSTEM_APPS_COUNT = COUNT_OF(FLIPPER_SYSTEM_APPS); // Main menu APP const FlipperApplication FLIPPER_APPS[] = { @@ -181,7 +181,7 @@ const FlipperApplication FLIPPER_APPS[] = { }; -const size_t FLIPPER_APPS_COUNT = sizeof(FLIPPER_APPS) / sizeof(FlipperApplication); +const size_t FLIPPER_APPS_COUNT = COUNT_OF(FLIPPER_APPS); // On system start hooks const FlipperOnStartHook FLIPPER_ON_SYSTEM_START[] = { @@ -228,8 +228,7 @@ const FlipperOnStartHook FLIPPER_ON_SYSTEM_START[] = { #endif }; -const size_t FLIPPER_ON_SYSTEM_START_COUNT = - sizeof(FLIPPER_ON_SYSTEM_START) / sizeof(FlipperOnStartHook); +const size_t FLIPPER_ON_SYSTEM_START_COUNT = COUNT_OF(FLIPPER_ON_SYSTEM_START); // Plugin menu const FlipperApplication FLIPPER_PLUGINS[] = { @@ -246,7 +245,7 @@ const FlipperApplication FLIPPER_PLUGINS[] = { #endif }; -const size_t FLIPPER_PLUGINS_COUNT = sizeof(FLIPPER_PLUGINS) / sizeof(FlipperApplication); +const size_t FLIPPER_PLUGINS_COUNT = COUNT_OF(FLIPPER_PLUGINS); // Plugin menu const FlipperApplication FLIPPER_DEBUG_APPS[] = { @@ -307,7 +306,7 @@ const FlipperApplication FLIPPER_DEBUG_APPS[] = { #endif }; -const size_t FLIPPER_DEBUG_APPS_COUNT = sizeof(FLIPPER_DEBUG_APPS) / sizeof(FlipperApplication); +const size_t FLIPPER_DEBUG_APPS_COUNT = COUNT_OF(FLIPPER_DEBUG_APPS); #ifdef APP_ARCHIVE const FlipperApplication FLIPPER_ARCHIVE = @@ -352,5 +351,4 @@ const FlipperApplication FLIPPER_SETTINGS_APPS[] = { #endif }; -const size_t FLIPPER_SETTINGS_APPS_COUNT = - sizeof(FLIPPER_SETTINGS_APPS) / sizeof(FlipperApplication); \ No newline at end of file +const size_t FLIPPER_SETTINGS_APPS_COUNT = COUNT_OF(FLIPPER_SETTINGS_APPS); diff --git a/applications/desktop/scenes/desktop_scene_debug.c b/applications/desktop/scenes/desktop_scene_debug.c index 99fcad87e..4945f7ace 100644 --- a/applications/desktop/scenes/desktop_scene_debug.c +++ b/applications/desktop/scenes/desktop_scene_debug.c @@ -34,13 +34,13 @@ bool desktop_scene_debug_on_event(void* context, SceneManagerEvent event) { break; case DesktopDebugEventDeed: - dolphin_deed(dolphin, DolphinDeedIbuttonEmulate); + dolphin_deed(dolphin, DolphinDeedTestRight); desktop_debug_get_dolphin_data(desktop->debug_view); consumed = true; break; case DesktopDebugEventWrongDeed: - dolphin_deed(dolphin, DolphinDeedIbuttonRead); + dolphin_deed(dolphin, DolphinDeedTestLeft); desktop_debug_get_dolphin_data(desktop->debug_view); consumed = true; break; diff --git a/applications/desktop/views/desktop_view_debug.c b/applications/desktop/views/desktop_view_debug.c index 75a9bab1a..6ac62b49b 100644 --- a/applications/desktop/views/desktop_view_debug.c +++ b/applications/desktop/views/desktop_view_debug.c @@ -111,7 +111,10 @@ bool desktop_debug_input(InputEvent* event, void* context) { DesktopDebugView* debug_view = context; - if(event->type != InputTypeShort) return false; + if(event->type != InputTypeShort && event->type != InputTypeRepeat) { + return false; + } + DesktopViewStatsScreens current = 0; with_view_model( debug_view->view, (DesktopDebugViewModel * model) { @@ -125,11 +128,16 @@ bool desktop_debug_input(InputEvent* event, void* context) { return true; }); + size_t count = (event->type == InputTypeRepeat) ? 10 : 1; if(current == DesktopViewStatsMeta) { if(event->key == InputKeyLeft) { - debug_view->callback(DesktopDebugEventWrongDeed, debug_view->context); + while(count-- > 0) { + debug_view->callback(DesktopDebugEventWrongDeed, debug_view->context); + } } else if(event->key == InputKeyRight) { - debug_view->callback(DesktopDebugEventDeed, debug_view->context); + while(count-- > 0) { + debug_view->callback(DesktopDebugEventDeed, debug_view->context); + } } else if(event->key == InputKeyOk) { debug_view->callback(DesktopDebugEventSaveState, debug_view->context); } else { diff --git a/applications/dolphin/helpers/dolphin_deed.h b/applications/dolphin/helpers/dolphin_deed.h index 20e18d705..1f63db3ff 100644 --- a/applications/dolphin/helpers/dolphin_deed.h +++ b/applications/dolphin/helpers/dolphin_deed.h @@ -52,7 +52,10 @@ typedef enum { DolphinDeedU2fAuthorized, - DolphinDeedMAX + DolphinDeedMAX, + + DolphinDeedTestLeft, + DolphinDeedTestRight, } DolphinDeed; typedef struct { diff --git a/applications/dolphin/helpers/dolphin_state.c b/applications/dolphin/helpers/dolphin_state.c index 08a7dae36..bfd467b8b 100644 --- a/applications/dolphin/helpers/dolphin_state.c +++ b/applications/dolphin/helpers/dolphin_state.c @@ -126,6 +126,23 @@ uint32_t dolphin_state_xp_to_levelup(uint32_t icounter) { } void dolphin_state_on_deed(DolphinState* dolphin_state, DolphinDeed deed) { + // Special case for testing + if(deed > DolphinDeedMAX) { + if(deed == DolphinDeedTestLeft) { + dolphin_state->data.butthurt = + CLAMP(dolphin_state->data.butthurt + 1, BUTTHURT_MAX, BUTTHURT_MIN); + if(dolphin_state->data.icounter > 0) dolphin_state->data.icounter--; + dolphin_state->data.timestamp = dolphin_state_timestamp(); + dolphin_state->dirty = true; + } else if(deed == DolphinDeedTestRight) { + dolphin_state->data.butthurt = BUTTHURT_MIN; + if(dolphin_state->data.icounter < UINT32_MAX) dolphin_state->data.icounter++; + dolphin_state->data.timestamp = dolphin_state_timestamp(); + dolphin_state->dirty = true; + } + return; + } + DolphinApp app = dolphin_deed_get_app(deed); int8_t weight_limit = dolphin_deed_get_app_limit(app) - dolphin_state->data.icounter_daily_limit[app]; diff --git a/applications/loader/loader.c b/applications/loader/loader.c index 054562a2f..dafe255a3 100644 --- a/applications/loader/loader.c +++ b/applications/loader/loader.c @@ -101,6 +101,11 @@ const FlipperApplication* loader_find_application_by_name(const char* name) { } void loader_cli_open(Cli* cli, string_t args, Loader* instance) { + if(loader_is_locked(instance)) { + printf("Can't start, furi application is running"); + return; + } + string_t application_name; string_init(application_name); @@ -292,7 +297,7 @@ static Loader* loader_alloc() { #ifdef SRV_CLI instance->cli = furi_record_open("cli"); - cli_add_command(instance->cli, "loader", CliCommandFlagDefault, loader_cli, instance); + cli_add_command(instance->cli, "loader", CliCommandFlagParallelSafe, loader_cli, instance); #else UNUSED(loader_cli); #endif @@ -488,4 +493,4 @@ int32_t loader_srv(void* p) { FuriPubSub* loader_get_pubsub(Loader* instance) { return instance->pubsub; -} \ No newline at end of file +} diff --git a/applications/notification/notification_app.c b/applications/notification/notification_app.c index 447bf9034..1e2e2dde9 100644 --- a/applications/notification/notification_app.c +++ b/applications/notification/notification_app.c @@ -418,11 +418,8 @@ static bool notification_save_settings(NotificationApp* app) { static void input_event_callback(const void* value, void* context) { furi_assert(value); furi_assert(context); - const InputEvent* event = value; NotificationApp* app = context; - if(event->type == InputTypePress) { - notification_message(app, &sequence_display_on); - } + notification_message(app, &sequence_display_on); } // App alloc diff --git a/applications/subghz/scenes/subghz_scene_read_raw.c b/applications/subghz/scenes/subghz_scene_read_raw.c index cbd64f8f7..10248c357 100644 --- a/applications/subghz/scenes/subghz_scene_read_raw.c +++ b/applications/subghz/scenes/subghz_scene_read_raw.c @@ -127,8 +127,7 @@ bool subghz_scene_read_raw_on_event(void* context, SceneManagerEvent event) { scene_manager_next_scene(subghz->scene_manager, SubGhzSceneNeedSaving); } else { //Restore default setting - subghz->txrx->frequency = subghz_setting_get_frequency( - subghz->setting, subghz_setting_get_frequency_default_index(subghz->setting)); + subghz->txrx->frequency = subghz_setting_get_default_frequency(subghz->setting); subghz->txrx->preset = FuriHalSubGhzPresetOok650Async; if(!scene_manager_search_and_switch_to_previous_scene( subghz->scene_manager, SubGhzSceneSaved)) { diff --git a/applications/subghz/scenes/subghz_scene_receiver.c b/applications/subghz/scenes/subghz_scene_receiver.c index 8a5ee9218..7183410b2 100644 --- a/applications/subghz/scenes/subghz_scene_receiver.c +++ b/applications/subghz/scenes/subghz_scene_receiver.c @@ -120,8 +120,7 @@ bool subghz_scene_receiver_on_event(void* context, SceneManagerEvent event) { subghz_sleep(subghz); }; subghz->txrx->hopper_state = SubGhzHopperStateOFF; - subghz->txrx->frequency = subghz_setting_get_frequency( - subghz->setting, subghz_setting_get_frequency_default_index(subghz->setting)); + subghz->txrx->frequency = subghz_setting_get_default_frequency(subghz->setting); subghz->txrx->preset = FuriHalSubGhzPresetOok650Async; subghz->txrx->idx_menu_chosen = 0; subghz_receiver_set_rx_callback(subghz->txrx->receiver, NULL, subghz); diff --git a/applications/subghz/scenes/subghz_scene_receiver_config.c b/applications/subghz/scenes/subghz_scene_receiver_config.c index f2ae749f0..d98f45af0 100644 --- a/applications/subghz/scenes/subghz_scene_receiver_config.c +++ b/applications/subghz/scenes/subghz_scene_receiver_config.c @@ -111,19 +111,13 @@ static void subghz_scene_receiver_config_set_hopping_runing(VariableItem* item) sprintf( text_buf, "%lu.%02lu", - subghz_setting_get_frequency( - subghz->setting, subghz_setting_get_frequency_default_index(subghz->setting)) / - 1000000, - (subghz_setting_get_frequency( - subghz->setting, subghz_setting_get_frequency_default_index(subghz->setting)) % - 1000000) / - 10000); + subghz_setting_get_default_frequency(subghz->setting) / 1000000, + (subghz_setting_get_default_frequency(subghz->setting) % 1000000) / 10000); variable_item_set_current_value_text( (VariableItem*)scene_manager_get_scene_state( subghz->scene_manager, SubGhzSceneReceiverConfig), text_buf); - subghz->txrx->frequency = subghz_setting_get_frequency( - subghz->setting, subghz_setting_get_frequency_default_index(subghz->setting)); + subghz->txrx->frequency = subghz_setting_get_default_frequency(subghz->setting); variable_item_set_current_value_index( (VariableItem*)scene_manager_get_scene_state( subghz->scene_manager, SubGhzSceneReceiverConfig), diff --git a/applications/subghz/scenes/subghz_scene_set_type.c b/applications/subghz/scenes/subghz_scene_set_type.c index 4fb36467f..22a151434 100644 --- a/applications/subghz/scenes/subghz_scene_set_type.c +++ b/applications/subghz/scenes/subghz_scene_set_type.c @@ -46,7 +46,7 @@ bool subghz_scene_set_type_submenu_gen_data_protocol( if(!subghz_protocol_decoder_base_serialize( subghz->txrx->decoder_result, subghz->txrx->fff_data, - subghz_setting_get_frequency_default_index(subghz->setting), + subghz_setting_get_default_frequency(subghz->setting), FuriHalSubGhzPresetOok650Async)) { FURI_LOG_E(TAG, "Unable to serialize"); break; @@ -213,7 +213,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) { 0x2, 0x0003, "DoorHan", - subghz_setting_get_frequency_default_index(subghz->setting), + subghz_setting_get_default_frequency(subghz->setting), FuriHalSubGhzPresetOok650Async); generated_protocol = true; } else { diff --git a/applications/subghz/subghz.c b/applications/subghz/subghz.c index 80c697343..5a59d89bb 100644 --- a/applications/subghz/subghz.c +++ b/applications/subghz/subghz.c @@ -130,8 +130,7 @@ SubGhz* subghz_alloc() { //init Worker & Protocol & History subghz->txrx = malloc(sizeof(SubGhzTxRx)); - subghz->txrx->frequency = subghz_setting_get_frequency( - subghz->setting, subghz_setting_get_frequency_default_index(subghz->setting)); + subghz->txrx->frequency = subghz_setting_get_default_frequency(subghz->setting); subghz->txrx->preset = FuriHalSubGhzPresetOok650Async; subghz->txrx->txrx_state = SubGhzTxRxStateSleep; subghz->txrx->hopper_state = SubGhzHopperStateOFF; diff --git a/applications/subghz/subghz_i.c b/applications/subghz/subghz_i.c index 5740ea9d8..60938d175 100644 --- a/applications/subghz/subghz_i.c +++ b/applications/subghz/subghz_i.c @@ -246,7 +246,7 @@ bool subghz_key_load(SubGhz* subghz, const char* file_path) { break; } - if(!flipper_format_read_uint32(fff_data_file, "Frequency", (uint32_t*)&temp_data32, 1)) { + if(!flipper_format_read_uint32(fff_data_file, "Frequency", &temp_data32, 1)) { FURI_LOG_E(TAG, "Missing Frequency"); break; } diff --git a/applications/subghz/subghz_setting.c b/applications/subghz/subghz_setting.c index 98a8a16eb..4d40d49ee 100644 --- a/applications/subghz/subghz_setting.c +++ b/applications/subghz/subghz_setting.c @@ -152,12 +152,11 @@ static const uint32_t subghz_hopper_frequencies_region_jp[] = { }; static const uint32_t subghz_frequency_default_index_region_jp = 9; -LIST_DEF(frequencies_list, uint32_t) -LIST_DEF(hopper_frequencies_list, uint32_t) +LIST_DEF(FrequenciesList, uint32_t) struct SubGhzSetting { - frequencies_list_t frequencies; - hopper_frequencies_list_t hopper_frequencies; + FrequenciesList_t frequencies; + FrequenciesList_t hopper_frequencies; size_t frequencies_count; size_t hopper_frequencies_count; uint32_t frequency_default_index; @@ -165,15 +164,15 @@ struct SubGhzSetting { SubGhzSetting* subghz_setting_alloc(void) { SubGhzSetting* instance = malloc(sizeof(SubGhzSetting)); - frequencies_list_init(instance->frequencies); - hopper_frequencies_list_init(instance->hopper_frequencies); + FrequenciesList_init(instance->frequencies); + FrequenciesList_init(instance->hopper_frequencies); return instance; } void subghz_setting_free(SubGhzSetting* instance) { furi_assert(instance); - frequencies_list_clear(instance->frequencies); - hopper_frequencies_list_clear(instance->hopper_frequencies); + FrequenciesList_clear(instance->frequencies); + FrequenciesList_clear(instance->hopper_frequencies); free(instance); } @@ -184,18 +183,18 @@ void subghz_setting_load_default( const uint32_t frequency_default_index) { furi_assert(instance); size_t i = 0; - frequencies_list_clear(instance->frequencies); - hopper_frequencies_list_clear(instance->hopper_frequencies); + FrequenciesList_clear(instance->frequencies); + FrequenciesList_clear(instance->hopper_frequencies); i = 0; while(frequencies[i]) { - frequencies_list_push_back(instance->frequencies, frequencies[i]); + FrequenciesList_push_back(instance->frequencies, frequencies[i]); i++; } instance->frequencies_count = i; i = 0; while(hopper_frequencies[i]) { - hopper_frequencies_list_push_back(instance->hopper_frequencies, hopper_frequencies[i]); + FrequenciesList_push_back(instance->hopper_frequencies, hopper_frequencies[i]); i++; } instance->hopper_frequencies_count = i; @@ -206,8 +205,8 @@ void subghz_setting_load_default( void subghz_setting_load(SubGhzSetting* instance, const char* file_path) { furi_assert(instance); - frequencies_list_clear(instance->frequencies); - hopper_frequencies_list_clear(instance->hopper_frequencies); + FrequenciesList_clear(instance->frequencies); + FrequenciesList_clear(instance->hopper_frequencies); Storage* storage = furi_record_open("storage"); FlipperFormat* fff_data_file = flipper_format_file_alloc(storage); @@ -246,7 +245,7 @@ void subghz_setting_load(SubGhzSetting* instance, const char* file_path) { fff_data_file, "Frequency", (uint32_t*)&temp_data32, 1)) { if(furi_hal_subghz_is_frequency_valid(temp_data32)) { FURI_LOG_I(TAG, "Frequency loaded %lu", temp_data32); - frequencies_list_push_back(instance->frequencies, temp_data32); + FrequenciesList_push_back(instance->frequencies, temp_data32); i++; } else { FURI_LOG_E(TAG, "Frequency not supported %lu", temp_data32); @@ -263,7 +262,7 @@ void subghz_setting_load(SubGhzSetting* instance, const char* file_path) { fff_data_file, "Hopper_frequency", (uint32_t*)&temp_data32, 1)) { if(furi_hal_subghz_is_frequency_valid(temp_data32)) { FURI_LOG_I(TAG, "Hopper frequency loaded %lu", temp_data32); - hopper_frequencies_list_push_back(instance->hopper_frequencies, temp_data32); + FrequenciesList_push_back(instance->hopper_frequencies, temp_data32); i++; } else { FURI_LOG_E(TAG, "Hopper frequency not supported %lu", temp_data32); @@ -297,6 +296,8 @@ void subghz_setting_load(SubGhzSetting* instance, const char* file_path) { } } while(false); } + + string_clear(temp_str); flipper_format_free(fff_data_file); furi_record_close("storage"); @@ -347,15 +348,20 @@ size_t subghz_setting_get_hopper_frequency_count(SubGhzSetting* instance) { uint32_t subghz_setting_get_frequency(SubGhzSetting* instance, size_t idx) { furi_assert(instance); - return *frequencies_list_get(instance->frequencies, idx); + return *FrequenciesList_get(instance->frequencies, idx); } uint32_t subghz_setting_get_hopper_frequency(SubGhzSetting* instance, size_t idx) { furi_assert(instance); - return *hopper_frequencies_list_get(instance->hopper_frequencies, idx); + return *FrequenciesList_get(instance->hopper_frequencies, idx); } uint32_t subghz_setting_get_frequency_default_index(SubGhzSetting* instance) { furi_assert(instance); return instance->frequency_default_index; -} \ No newline at end of file +} + +uint32_t subghz_setting_get_default_frequency(SubGhzSetting* instance) { + furi_assert(instance); + return *FrequenciesList_get(instance->frequencies, instance->frequency_default_index); +} diff --git a/applications/subghz/subghz_setting.h b/applications/subghz/subghz_setting.h index cdf607974..58a898c56 100644 --- a/applications/subghz/subghz_setting.h +++ b/applications/subghz/subghz_setting.h @@ -8,10 +8,19 @@ typedef struct SubGhzSetting SubGhzSetting; SubGhzSetting* subghz_setting_alloc(void); + void subghz_setting_free(SubGhzSetting* instance); + void subghz_setting_load(SubGhzSetting* instance, const char* file_path); + size_t subghz_setting_get_frequency_count(SubGhzSetting* instance); + size_t subghz_setting_get_hopper_frequency_count(SubGhzSetting* instance); + uint32_t subghz_setting_get_frequency(SubGhzSetting* instance, size_t idx); + uint32_t subghz_setting_get_hopper_frequency(SubGhzSetting* instance, size_t idx); + uint32_t subghz_setting_get_frequency_default_index(SubGhzSetting* instance); + +uint32_t subghz_setting_get_default_frequency(SubGhzSetting* instance); From 827e30aa5a6405f9f1510a550f3816a6e11db757 Mon Sep 17 00:00:00 2001 From: hedger Date: Fri, 15 Apr 2022 19:47:57 +0300 Subject: [PATCH 2/3] [FL-2468] Reboot to update with RPC (#1122) * Added update boot mode for RPC * Fixed FLIPPER_SYSTEM_APPS_COUNT & updater app arg parsing * Bumped RPC version * Moved boot mode --- applications/power/power_service/power.h | 1 + applications/power/power_service/power_api.c | 2 ++ applications/rpc/rpc_system.c | 4 +++- applications/updater/updater.c | 4 +++- assets/compiled/system.pb.h | 13 +++++++------ assets/protobuf | 2 +- 6 files changed, 17 insertions(+), 9 deletions(-) diff --git a/applications/power/power_service/power.h b/applications/power/power_service/power.h index 093c52ed9..92cca6f72 100644 --- a/applications/power/power_service/power.h +++ b/applications/power/power_service/power.h @@ -9,6 +9,7 @@ typedef struct Power Power; typedef enum { PowerBootModeNormal, PowerBootModeDfu, + PowerBootModeUpdateStart, } PowerBootMode; typedef enum { diff --git a/applications/power/power_service/power_api.c b/applications/power/power_service/power_api.c index 28c23fcff..b290cb831 100644 --- a/applications/power/power_service/power_api.c +++ b/applications/power/power_service/power_api.c @@ -17,6 +17,8 @@ void power_reboot(PowerBootMode mode) { furi_hal_rtc_set_boot_mode(FuriHalRtcBootModeNormal); } else if(mode == PowerBootModeDfu) { furi_hal_rtc_set_boot_mode(FuriHalRtcBootModeDfu); + } else if(mode == PowerBootModeUpdateStart) { + furi_hal_rtc_set_boot_mode(FuriHalRtcBootModePreUpdate); } furi_hal_power_reset(); } diff --git a/applications/rpc/rpc_system.c b/applications/rpc/rpc_system.c index f54bb1979..9ce7e34a3 100644 --- a/applications/rpc/rpc_system.c +++ b/applications/rpc/rpc_system.c @@ -61,6 +61,8 @@ static void rpc_system_system_reboot_process(const PB_Main* request, void* conte power_reboot(PowerBootModeNormal); } else if(mode == PB_System_RebootRequest_RebootMode_DFU) { power_reboot(PowerBootModeDfu); + } else if(mode == PB_System_RebootRequest_RebootMode_UPDATE) { + power_reboot(PowerBootModeUpdateStart); } else { rpc_send_and_release_empty( session, request->command_id, PB_CommandStatus_ERROR_INVALID_PARAMETERS); @@ -274,7 +276,7 @@ static void rpc_system_system_update_request_process(const PB_Main* request, voi furi_assert(session); bool update_prepare_result = - update_operation_prepare(request->content.system_update_request.update_folder) == + update_operation_prepare(request->content.system_update_request.update_manifest) == UpdatePrepareResultOK; PB_Main* response = malloc(sizeof(PB_Main)); diff --git a/applications/updater/updater.c b/applications/updater/updater.c index dbad239b0..519ba167d 100644 --- a/applications/updater/updater.c +++ b/applications/updater/updater.c @@ -80,7 +80,9 @@ Updater* updater_alloc(const char* arg) { #ifdef FURI_RAM_EXEC if(true) { #else - if(!arg) { + FuriHalRtcBootMode boot_mode = furi_hal_rtc_get_boot_mode(); + if(!arg && ((boot_mode == FuriHalRtcBootModePreUpdate) || + (boot_mode == FuriHalRtcBootModePostUpdate))) { #endif updater->update_task = update_task_alloc(); update_task_set_progress_cb(updater->update_task, status_update_cb, updater->main_view); diff --git a/assets/compiled/system.pb.h b/assets/compiled/system.pb.h index 0932c6fb6..978219ae0 100644 --- a/assets/compiled/system.pb.h +++ b/assets/compiled/system.pb.h @@ -12,7 +12,8 @@ /* Enum definitions */ typedef enum _PB_System_RebootRequest_RebootMode { PB_System_RebootRequest_RebootMode_OS = 0, - PB_System_RebootRequest_RebootMode_DFU = 1 + PB_System_RebootRequest_RebootMode_DFU = 1, + PB_System_RebootRequest_RebootMode_UPDATE = 2 } PB_System_RebootRequest_RebootMode; /* Struct definitions */ @@ -59,7 +60,7 @@ typedef struct _PB_System_ProtobufVersionRequest { } PB_System_ProtobufVersionRequest; typedef struct _PB_System_UpdateRequest { - char *update_folder; + char *update_manifest; } PB_System_UpdateRequest; typedef struct _PB_System_DateTime { @@ -96,8 +97,8 @@ typedef struct _PB_System_SetDateTimeRequest { /* Helper constants for enums */ #define _PB_System_RebootRequest_RebootMode_MIN PB_System_RebootRequest_RebootMode_OS -#define _PB_System_RebootRequest_RebootMode_MAX PB_System_RebootRequest_RebootMode_DFU -#define _PB_System_RebootRequest_RebootMode_ARRAYSIZE ((PB_System_RebootRequest_RebootMode)(PB_System_RebootRequest_RebootMode_DFU+1)) +#define _PB_System_RebootRequest_RebootMode_MAX PB_System_RebootRequest_RebootMode_UPDATE +#define _PB_System_RebootRequest_RebootMode_ARRAYSIZE ((PB_System_RebootRequest_RebootMode)(PB_System_RebootRequest_RebootMode_UPDATE+1)) #ifdef __cplusplus @@ -145,7 +146,7 @@ extern "C" { #define PB_System_PingResponse_data_tag 1 #define PB_System_PowerInfoResponse_key_tag 1 #define PB_System_PowerInfoResponse_value_tag 2 -#define PB_System_UpdateRequest_update_folder_tag 1 +#define PB_System_UpdateRequest_update_manifest_tag 1 #define PB_System_DateTime_hour_tag 1 #define PB_System_DateTime_minute_tag 2 #define PB_System_DateTime_second_tag 3 @@ -236,7 +237,7 @@ X(a, STATIC, SINGULAR, UINT32, minor, 2) #define PB_System_ProtobufVersionResponse_DEFAULT NULL #define PB_System_UpdateRequest_FIELDLIST(X, a) \ -X(a, POINTER, SINGULAR, STRING, update_folder, 1) +X(a, POINTER, SINGULAR, STRING, update_manifest, 1) #define PB_System_UpdateRequest_CALLBACK NULL #define PB_System_UpdateRequest_DEFAULT NULL diff --git a/assets/protobuf b/assets/protobuf index 0403ae1ba..0ad90705b 160000 --- a/assets/protobuf +++ b/assets/protobuf @@ -1 +1 @@ -Subproject commit 0403ae1ba7a4501274da54b3aa6274f76fdd090c +Subproject commit 0ad90705b9434b6f8fb2c4b605069f0d56d8cc70 From 000ebb8f962e0743df977a6df430a95f6806cee7 Mon Sep 17 00:00:00 2001 From: hedger Date: Fri, 15 Apr 2022 20:26:23 +0300 Subject: [PATCH 3/3] Fixed README formatting & outdated information (#1123) --- ReadMe.md | 2 +- RoadMap.md | 1 - firmware/ReadMe.md | 11 +++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ReadMe.md b/ReadMe.md index 9a355ebac..c6b73c8ba 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -16,7 +16,7 @@ Flipper Zero's firmware consists of two components: - Core2 firmware set - proprietary components by ST: FUS + radio stack. FUS is flashed at factory and you should never update it. - Core1 Firmware - HAL + OS + Drivers + Applications. -All 3 of them must be flashed in order described. +They both must be flashed in order described. ## With STLink diff --git a/RoadMap.md b/RoadMap.md index e8b2bf099..32ed860f2 100644 --- a/RoadMap.md +++ b/RoadMap.md @@ -35,7 +35,6 @@ Main goal for 1.0.0 is to provide first stable version for both Users and Develo ## What we're planning to implement in 1.0.0 -- Updating firmware from SD (work in progress, almost done) - Loading applications from SD (tested as PoC, work scheduled for Q2) - More protocols (gathering feedback) - User documentation (work in progress) diff --git a/firmware/ReadMe.md b/firmware/ReadMe.md index f12f2e7bd..38271fd27 100644 --- a/firmware/ReadMe.md +++ b/firmware/ReadMe.md @@ -10,10 +10,9 @@ What does it do? # Targets -| Name | Firmware | Reset | DFU | -| | Address | Combo | Combo | ---------------------------------------------------------------------------------- -| f7 | 0x08000000 | L+Back, release both | L+Back, release Back | +| Name | Firmware Address | Reset Combo | DFU Combo | +|-----------|-------------------|-----------------------|-----------------------| +| f7 | 0x08000000 | L+Back, release both | L+Back, release Back | Also there is a "hardware" ST bootloader combo available even on a bricked or empty device: L+Ok+Back, release Back, Left. Target independent code and headers in `target/include` folders. More details in `documentation/KeyCombo.md` @@ -35,6 +34,10 @@ Target independent code and headers in `target/include` folders. More details in - `TARGET` - string - target to build. Default is `f7`. - `RAM_EXEC` - 0/1 - whether to build full firmware or RAM-based stage for firmware update. 0 is default, builds firmware. +# Building self-update package + +`make DEBUG=0 COMPACT=1 updater_package` + # Flashing Using SWD (STLink):