liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Release Candidate 0.48.0 Bug Fixes (#991)

Browse Source 
* Power: wait a little bit till message displayed on screen when executing power off. FuriCore: do not use bkpt in release builds(causing HardFault when SPI is active).
* Cleanup BSS section: add more consty consts to be more constish.
* Desktop: properly handle autostarted applications.
This commit is contained in:
あく
2022-02-13 22:24:03 +03:00
committed by GitHub
parent 2c616983cf
commit 939998a8c8
26 changed files with 258 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/accessor/helpers/wiegand.cpp
View File

@@ -11,8 +11,8 @@ volatile int WIEGAND::_bitCount = 0;
int WIEGAND::_wiegandType = 0;
constexpr uint32_t clocks_in_ms = 64 * 1000;
const GpioPin* pinD0 = &gpio_ext_pa4;
const GpioPin* pinD1 = &gpio_ext_pa7;
const GpioPin* const pinD0 = &gpio_ext_pa4;
const GpioPin* const pinD1 = &gpio_ext_pa7;
WIEGAND::WIEGAND() {
}

2
applications/debug_tools/display_test/view_display_test.c
View File

@@ -89,7 +89,7 @@ static void view_display_test_draw_callback_move(Canvas* canvas, void* _model) {
canvas_draw_box(canvas, x, y, block, block);
}
ViewDrawCallback view_display_test_tests[] = {
const ViewDrawCallback view_display_test_tests[] = {
view_display_test_draw_callback_intro,
view_display_test_draw_callback_fill,
view_display_test_draw_callback_hstripe,

5
applications/desktop/animations/animation_manager.c
View File

@@ -408,6 +408,11 @@ static StorageAnimation*
return selected;
}
bool animation_manager_is_animation_loaded(AnimationManager* animation_manager) {
furi_assert(animation_manager);
return animation_manager->current_animation;
}
void animation_manager_unload_and_stall_animation(AnimationManager* animation_manager) {
furi_assert(animation_manager);
furi_assert(animation_manager->current_animation);

6
applications/desktop/animations/animation_manager.h
View File

@@ -133,6 +133,12 @@ void animation_manager_set_interact_callback(
*/
void animation_manager_interact_process(AnimationManager* animation_manager);
/** Check if animation loaded
*
* @animation_manager instance
*/
bool animation_manager_is_animation_loaded(AnimationManager* animation_manager);
/**
* Unload and Stall animation actions. Draw callback in view
* paints first frame of current animation until

4
applications/desktop/animations/animation_storage.c
View File

@@ -261,7 +261,7 @@ static void animation_storage_free_frames(BubbleAnimation* animation) {
}
}
free(icon->frames);
free((void*)icon->frames);
}
static bool animation_storage_load_frames(
@@ -317,7 +317,7 @@ static bool animation_storage_load_frames(
break;
}
icon->frames[i] = furi_alloc(file_info.size);
FURI_CONST_ASSIGN_PTR(icon->frames[i], furi_alloc(file_info.size));
if(storage_file_read(file, (void*)icon->frames[i], file_info.size) != file_info.size) {
FURI_LOG_E(TAG, "Read failed: \'%s\'", string_get_cstr(filename));
break;

4
applications/desktop/animations/views/bubble_animation_view.c
View File

@@ -266,7 +266,7 @@ static Icon* bubble_animation_clone_first_frame(const Icon* icon_orig) {
* for compressed header
*/
size_t max_bitmap_size = ROUND_UP_TO(icon_orig->width, 8) * icon_orig->height + 1;
icon_clone->frames[0] = furi_alloc(max_bitmap_size);
FURI_CONST_ASSIGN_PTR(icon_clone->frames[0], furi_alloc(max_bitmap_size));
memcpy((void*)icon_clone->frames[0], icon_orig->frames[0], max_bitmap_size);
FURI_CONST_ASSIGN(icon_clone->frame_count, 1);
@@ -278,7 +278,7 @@ static void bubble_animation_release_frame(Icon** icon) {
furi_assert(*icon);
free((void*)(*icon)->frames[0]);
free((*icon)->frames);
free((void*)(*icon)->frames);
free(*icon);
*icon = NULL;
}

12
applications/desktop/desktop.c
View File

@@ -3,8 +3,8 @@
#include <gui/view_stack.h>
#include <furi.h>
#include <furi_hal.h>
#include <portmacro.h>
#include <stdint.h>
#include <loader/loader.h>
#include "animations/animation_manager.h"
#include "desktop/scenes/desktop_scene.h"
@@ -121,6 +121,14 @@ Desktop* desktop_alloc() {
view_port_enabled_set(desktop->lock_viewport, false);
gui_add_view_port(desktop->gui, desktop->lock_viewport, GuiLayerStatusBarLeft);
// Special case: autostart application is already running
Loader* loader = furi_record_open("loader");
if(loader_is_locked(loader) &&
animation_manager_is_animation_loaded(desktop->animation_manager)) {
animation_manager_unload_and_stall_animation(desktop->animation_manager);
}
furi_record_close("loader");
return desktop;
}

9
applications/desktop/scenes/desktop_scene_lock_menu.c
View File

@@ -11,6 +11,8 @@
#include "desktop_scene_i.h"
#include "desktop_scene.h"
#define TAG "DesktopSceneLock"
void desktop_scene_lock_menu_callback(DesktopEvent event, void* context) {
Desktop* desktop = (Desktop*)context;
view_dispatcher_send_custom_event(desktop->view_dispatcher, event);
@@ -58,12 +60,15 @@ bool desktop_scene_lock_menu_on_event(void* context, SceneManagerEvent event) {
desktop->scene_manager, DesktopSceneLocked, SCENE_LOCKED_FIRST_ENTER);
scene_manager_next_scene(desktop->scene_manager, DesktopSceneLocked);
} else {
scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, 1);
Loader* loader = furi_record_open("loader");
LoaderStatus status =
loader_start(loader, "Desktop", DESKTOP_SETTINGS_RUN_PIN_SETUP_ARG);
furi_check(status == LoaderStatusOk);
furi_record_close("loader");
if(status == LoaderStatusOk) {
scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, 1);
} else {
FURI_LOG_E(TAG, "Unable to start desktop settings");
}
}
consumed = true;

6
applications/desktop/scenes/desktop_scene_main.c
View File

@@ -87,12 +87,6 @@ void desktop_scene_main_on_enter(void* context) {
Loader* loader = furi_record_open("loader");
desktop->app_start_stop_subscription = furi_pubsub_subscribe(
loader_get_pubsub(loader), desktop_scene_main_app_started_callback, desktop);
// Special case: application is already running (autostart application)
if(loader_is_locked(loader)) {
animation_manager_unload_and_stall_animation(desktop->animation_manager);
}
furi_record_close("loader");
desktop_main_set_callback(main_view, desktop_scene_main_callback, desktop);

9
applications/dolphin/passport/passport.c
View File

@@ -12,19 +12,20 @@
#define MOODS_TOTAL 3
#define BUTTHURT_MAX 3
static const Icon* portrait_happy[BUTTHURT_MAX] = {
static const Icon* const portrait_happy[BUTTHURT_MAX] = {
&I_passport_happy1_46x49,
&I_passport_happy2_46x49,
&I_passport_happy3_46x49};
static const Icon* portrait_ok[BUTTHURT_MAX] = {
static const Icon* const portrait_ok[BUTTHURT_MAX] = {
&I_passport_okay1_46x49,
&I_passport_okay2_46x49,
&I_passport_okay3_46x49};
static const Icon* portrait_bad[BUTTHURT_MAX] = {
static const Icon* const portrait_bad[BUTTHURT_MAX] = {
&I_passport_bad1_46x49,
&I_passport_bad2_46x49,
&I_passport_bad3_46x49};
static const Icon** portraits[MOODS_TOTAL] = {portrait_happy, portrait_ok, portrait_bad};
static const Icon* const* portraits[MOODS_TOTAL] = {portrait_happy, portrait_ok, portrait_bad};
static void input_callback(InputEvent* input, void* ctx) {
osSemaphoreId_t semaphore = ctx;

2
applications/gui/icon_i.h
View File

@@ -11,5 +11,5 @@ struct Icon {
const uint8_t height;
const uint8_t frame_count;
const uint8_t frame_rate;
const uint8_t** frames;
const uint8_t* const* frames;
};

2
applications/music_player/music_player.c
View File

@@ -102,7 +102,7 @@ typedef struct {
uint8_t volume_id_max;
} State;
float volumes[] = {0, 0.02, 0.05, 0.1, 0.5};
const float volumes[] = {0, 0.02, 0.05, 0.1, 0.5};
bool is_white_note(const MelodyEventRecord* note_record, uint8_t id) {
if(note_record == NULL) return false;

1
applications/power/power_cli.c
View File

@@ -8,6 +8,7 @@
void power_cli_off(Cli* cli, string_t args) {
Power* power = furi_record_open("power");
printf("It's now safe to disconnect USB from your flipper\r\n");
osDelay(666);
power_off(power);
}