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

[FL-3103] New pin reset splashscreen (#2405)

Browse Source 
* New pin reset splashscreen
* Recovery: optimize drawing routine
* Recovery: increase erase confirmation time
* Change the required button

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
This commit is contained in:
Astra 2023-03-02 13:56:23 +02:00 committed by GitHub
parent 777a4d109d
commit 4359e2eaa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/icons/ErasePin/Erase_pin_128x64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.1 KiB

34
firmware/targets/f7/src/recovery.c
View File

@ -5,24 +5,20 @@
#include <u8g2_glue.h> #include <u8g2_glue.h>
#include <assets_icons.h> #include <assets_icons.h>
#define COUNTER_VALUE (100U) #define COUNTER_VALUE (136U)
static void flipper_boot_recovery_draw_splash(u8g2_t* fb, size_t progress) { static void flipper_boot_recovery_draw_splash(u8g2_t* fb, size_t progress) {
u8g2_ClearBuffer(fb);
u8g2_SetDrawColor(fb, 0x01);
u8g2_SetFont(fb, u8g2_font_helvB08_tr);
u8g2_DrawStr(fb, 2, 8, "PIN and Factory Reset");
u8g2_SetFont(fb, u8g2_font_haxrcorp4089_tr);
u8g2_DrawStr(fb, 2, 21, "Hold Right to confirm");
u8g2_DrawStr(fb, 2, 31, "Press Down to cancel");
if(progress < COUNTER_VALUE) { if(progress < COUNTER_VALUE) {
size_t width = progress / (COUNTER_VALUE / 100); // Fill the progress bar while the progress is going down
u8g2_DrawBox(fb, 14 + (50 - width / 2), 54, width, 3); u8g2_SetDrawColor(fb, 0x01);
u8g2_DrawRFrame(fb, 59, 41, 69, 8, 2);
size_t width = (COUNTER_VALUE - progress) * 68 / COUNTER_VALUE;
u8g2_DrawBox(fb, 60, 42, width, 6);
} else {
u8g2_SetDrawColor(fb, 0x00);
u8g2_DrawRBox(fb, 59, 41, 69, 8, 2);
} }
u8g2_SetPowerSave(fb, 0);
u8g2_SendBuffer(fb); u8g2_SendBuffer(fb);
} }
@ -31,6 +27,18 @@ void flipper_boot_recovery_exec() {
u8g2_Setup_st756x_flipper(fb, U8G2_R0, u8x8_hw_spi_stm32, u8g2_gpio_and_delay_stm32); u8g2_Setup_st756x_flipper(fb, U8G2_R0, u8x8_hw_spi_stm32, u8g2_gpio_and_delay_stm32);
u8g2_InitDisplay(fb); u8g2_InitDisplay(fb);
furi_hal_compress_icon_init();
uint8_t* splash_data = NULL;
furi_hal_compress_icon_decode(icon_get_data(&I_Erase_pin_128x64), &splash_data);
u8g2_ClearBuffer(fb);
u8g2_SetDrawColor(fb, 0x01);
// Draw the recovery picture
u8g2_DrawXBM(fb, 0, 0, 128, 64, splash_data);
u8g2_SendBuffer(fb);
u8g2_SetPowerSave(fb, 0);
size_t counter = COUNTER_VALUE; size_t counter = COUNTER_VALUE;
while(counter) { while(counter) {
if(!furi_hal_gpio_read(&gpio_button_down)) { if(!furi_hal_gpio_read(&gpio_button_down)) {