From 516a43730566e7c4cda70ca62e0247212b83ded8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=81=8F?= Date: Tue, 16 Nov 2021 03:04:33 +0300 Subject: [PATCH 01/11] Storage: move factory reset to the place it belongs, add gui version. (#822) --- ReadMe.md | 2 +- applications/power/power_cli.c | 14 --- applications/storage/storage-cli.c | 65 ++++++++------ .../scenes/storage_settings_scene.c} | 8 +- .../scenes/storage_settings_scene.h} | 8 +- .../storage_settings_scene_benchmark.c} | 16 ++-- .../scenes/storage_settings_scene_config.h} | 3 +- .../storage_settings_scene_eject_confirm.c} | 2 +- .../scenes/storage_settings_scene_ejected.c} | 2 +- .../storage_settings_scene_factory_reset.c | 90 +++++++++++++++++++ .../storage_settings_scene_format_confirm.c} | 2 +- .../storage_settings_scene_formatting.c} | 2 +- .../storage_settings_scene_internal_info.c} | 2 +- .../scenes/storage_settings_scene_sd_info.c} | 2 +- .../scenes/storage_settings_scene_start.c} | 17 +++- .../storage_settings.c} | 2 +- .../storage_settings.h} | 2 +- 17 files changed, 173 insertions(+), 66 deletions(-) rename applications/{storage-settings/scenes/storage-settings-scene.c => storage_settings/scenes/storage_settings_scene.c} (85%) rename applications/{storage-settings/scenes/storage-settings-scene.h => storage_settings/scenes/storage_settings_scene.h} (81%) rename applications/{storage-settings/scenes/storage-settings-benchmark.c => storage_settings/scenes/storage_settings_scene_benchmark.c} (90%) rename applications/{storage-settings/scenes/storage-settings-scene-config.h => storage_settings/scenes/storage_settings_scene_config.h} (77%) rename applications/{storage-settings/scenes/storage-settings-scene-eject-confirm.c => storage_settings/scenes/storage_settings_scene_eject_confirm.c} (98%) rename applications/{storage-settings/scenes/storage-settings-scene-ejected.c => storage_settings/scenes/storage_settings_scene_ejected.c} (98%) create mode 100644 applications/storage_settings/scenes/storage_settings_scene_factory_reset.c rename applications/{storage-settings/scenes/storage-settings-scene-format-confirm.c => storage_settings/scenes/storage_settings_scene_format_confirm.c} (98%) rename applications/{storage-settings/scenes/storage-settings-scene-formatting.c => storage_settings/scenes/storage_settings_scene_formatting.c} (98%) rename applications/{storage-settings/scenes/storage-settings-scene-internal-info.c => storage_settings/scenes/storage_settings_scene_internal_info.c} (98%) rename applications/{storage-settings/scenes/storage-settings-scene-sd-info.c => storage_settings/scenes/storage_settings_scene_sd_info.c} (98%) rename applications/{storage-settings/scenes/storage-settings-scene-start.c => storage_settings/scenes/storage_settings_scene_start.c} (85%) rename applications/{storage-settings/storage-settings.c => storage_settings/storage_settings.c} (98%) rename applications/{storage-settings/storage-settings.h => storage_settings/storage_settings.h} (95%) diff --git a/ReadMe.md b/ReadMe.md index ad8bd530..2af12aa6 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -162,7 +162,7 @@ Finally, you will have **`firmware/.obj/f7/full.dfu`** file that can be distribu * power-observer - power debug tool * scened-app-example - c++ application example * storage - storage service, internal + sdcard - * storage-settings - storage settings app + * storage_settings - storage settings app * subghz - subghz application, 433 fobs and etc * tests - unit tests and etc - assets - assets used by applications and services diff --git a/applications/power/power_cli.c b/applications/power/power_cli.c index 63c0fda5..515d4fcb 100644 --- a/applications/power/power_cli.c +++ b/applications/power/power_cli.c @@ -18,18 +18,6 @@ void power_cli_dfu(Cli* cli, string_t args, void* context) { power_reboot(PowerBootModeDfu); } -void power_cli_factory_reset(Cli* cli, string_t args, void* context) { - printf("All data will be lost. Are you sure (y/n)?\r\n"); - char c = cli_getc(cli); - if(c == 'y' || c == 'Y') { - printf("Data will be wiped after reboot.\r\n"); - furi_hal_bootloader_set_flags(FuriHalBootloaderFlagFactoryReset); - power_reboot(PowerBootModeNormal); - } else { - printf("Safe choice.\r\n"); - } -} - void power_cli_info(Cli* cli, string_t args, void* context) { furi_hal_power_dump_state(); } @@ -59,8 +47,6 @@ void power_cli_init() { cli_add_command(cli, "poweroff", CliCommandFlagParallelSafe, power_cli_poweroff, NULL); cli_add_command(cli, "reboot", CliCommandFlagParallelSafe, power_cli_reboot, NULL); - cli_add_command( - cli, "factory_reset", CliCommandFlagParallelSafe, power_cli_factory_reset, NULL); cli_add_command(cli, "dfu", CliCommandFlagParallelSafe, power_cli_dfu, NULL); cli_add_command(cli, "power_info", CliCommandFlagParallelSafe, power_cli_info, NULL); cli_add_command(cli, "power_otg", CliCommandFlagParallelSafe, power_cli_otg, NULL); diff --git a/applications/storage/storage-cli.c b/applications/storage/storage-cli.c index 14425993..fc80864b 100644 --- a/applications/storage/storage-cli.c +++ b/applications/storage/storage-cli.c @@ -1,23 +1,16 @@ #include +#include + #include #include #include #include #include -#include +#include #define MAX_NAME_LENGTH 255 -void storage_cli(Cli* cli, string_t args, void* context); - -// app cli function -void storage_cli_init() { - Cli* cli = furi_record_open("cli"); - cli_add_command(cli, "storage", CliCommandFlagDefault, storage_cli, NULL); - furi_record_close("cli"); -} - -void storage_cli_print_usage() { +static void storage_cli_print_usage() { printf("Usage:\r\n"); printf("storage \r\n"); printf("The path must start with /int or /ext\r\n"); @@ -39,11 +32,11 @@ void storage_cli_print_usage() { printf("\tstat\t - info about file or dir\r\n"); }; -void storage_cli_print_error(FS_Error error) { +static void storage_cli_print_error(FS_Error error) { printf("Storage error: %s\r\n", storage_error_get_desc(error)); } -void storage_cli_info(Cli* cli, string_t path) { +static void storage_cli_info(Cli* cli, string_t path) { Storage* api = furi_record_open("storage"); if(string_cmp_str(path, "/int") == 0) { @@ -81,7 +74,7 @@ void storage_cli_info(Cli* cli, string_t path) { furi_record_close("storage"); }; -void storage_cli_format(Cli* cli, string_t path) { +static void storage_cli_format(Cli* cli, string_t path) { if(string_cmp_str(path, "/int") == 0) { storage_cli_print_error(FSE_NOT_IMPLEMENTED); } else if(string_cmp_str(path, "/ext") == 0) { @@ -107,7 +100,7 @@ void storage_cli_format(Cli* cli, string_t path) { } }; -void storage_cli_list(Cli* cli, string_t path) { +static void storage_cli_list(Cli* cli, string_t path) { if(string_cmp_str(path, "/") == 0) { printf("\t[D] int\r\n"); printf("\t[D] ext\r\n"); @@ -143,7 +136,7 @@ void storage_cli_list(Cli* cli, string_t path) { } } -void storage_cli_read(Cli* cli, string_t path) { +static void storage_cli_read(Cli* cli, string_t path) { Storage* api = furi_record_open("storage"); File* file = storage_file_alloc(api); @@ -173,7 +166,7 @@ void storage_cli_read(Cli* cli, string_t path) { furi_record_close("storage"); } -void storage_cli_write(Cli* cli, string_t path) { +static void storage_cli_write(Cli* cli, string_t path) { Storage* api = furi_record_open("storage"); File* file = storage_file_alloc(api); @@ -227,7 +220,7 @@ void storage_cli_write(Cli* cli, string_t path) { furi_record_close("storage"); } -void storage_cli_read_chunks(Cli* cli, string_t path, string_t args) { +static void storage_cli_read_chunks(Cli* cli, string_t path, string_t args) { Storage* api = furi_record_open("storage"); File* file = storage_file_alloc(api); @@ -265,7 +258,7 @@ void storage_cli_read_chunks(Cli* cli, string_t path, string_t args) { furi_record_close("storage"); } -void storage_cli_write_chunk(Cli* cli, string_t path, string_t args) { +static void storage_cli_write_chunk(Cli* cli, string_t path, string_t args) { Storage* api = furi_record_open("storage"); File* file = storage_file_alloc(api); @@ -301,7 +294,7 @@ void storage_cli_write_chunk(Cli* cli, string_t path, string_t args) { furi_record_close("storage"); } -void storage_cli_stat(Cli* cli, string_t path) { +static void storage_cli_stat(Cli* cli, string_t path) { Storage* api = furi_record_open("storage"); if(string_cmp_str(path, "/") == 0) { @@ -340,7 +333,7 @@ void storage_cli_stat(Cli* cli, string_t path) { furi_record_close("storage"); } -void storage_cli_copy(Cli* cli, string_t old_path, string_t args) { +static void storage_cli_copy(Cli* cli, string_t old_path, string_t args) { Storage* api = furi_record_open("storage"); string_t new_path; string_init(new_path); @@ -360,7 +353,7 @@ void storage_cli_copy(Cli* cli, string_t old_path, string_t args) { furi_record_close("storage"); } -void storage_cli_remove(Cli* cli, string_t path) { +static void storage_cli_remove(Cli* cli, string_t path) { Storage* api = furi_record_open("storage"); FS_Error error = storage_common_remove(api, string_get_cstr(path)); @@ -371,7 +364,7 @@ void storage_cli_remove(Cli* cli, string_t path) { furi_record_close("storage"); } -void storage_cli_rename(Cli* cli, string_t old_path, string_t args) { +static void storage_cli_rename(Cli* cli, string_t old_path, string_t args) { Storage* api = furi_record_open("storage"); string_t new_path; string_init(new_path); @@ -391,7 +384,7 @@ void storage_cli_rename(Cli* cli, string_t old_path, string_t args) { furi_record_close("storage"); } -void storage_cli_mkdir(Cli* cli, string_t path) { +static void storage_cli_mkdir(Cli* cli, string_t path) { Storage* api = furi_record_open("storage"); FS_Error error = storage_common_mkdir(api, string_get_cstr(path)); @@ -402,7 +395,7 @@ void storage_cli_mkdir(Cli* cli, string_t path) { furi_record_close("storage"); } -void storage_cli_md5(Cli* cli, string_t path) { +static void storage_cli_md5(Cli* cli, string_t path) { Storage* api = furi_record_open("storage"); File* file = storage_file_alloc(api); @@ -439,7 +432,7 @@ void storage_cli_md5(Cli* cli, string_t path) { furi_record_close("storage"); } -void storage_cli(Cli* cli, string_t args, void* context) { +static void storage_cli(Cli* cli, string_t args, void* context) { string_t cmd; string_t path; string_init(cmd); @@ -527,3 +520,23 @@ void storage_cli(Cli* cli, string_t args, void* context) { string_clear(path); string_clear(cmd); } + +static void storage_cli_factory_reset(Cli* cli, string_t args, void* context) { + printf("All data will be lost. Are you sure (y/n)?\r\n"); + char c = cli_getc(cli); + if(c == 'y' || c == 'Y') { + printf("Data will be wiped after reboot.\r\n"); + furi_hal_bootloader_set_flags(FuriHalBootloaderFlagFactoryReset); + power_reboot(PowerBootModeNormal); + } else { + printf("Safe choice.\r\n"); + } +} + +void storage_cli_init() { + Cli* cli = furi_record_open("cli"); + cli_add_command(cli, "storage", CliCommandFlagDefault, storage_cli, NULL); + cli_add_command( + cli, "factory_reset", CliCommandFlagParallelSafe, storage_cli_factory_reset, NULL); + furi_record_close("cli"); +} diff --git a/applications/storage-settings/scenes/storage-settings-scene.c b/applications/storage_settings/scenes/storage_settings_scene.c similarity index 85% rename from applications/storage-settings/scenes/storage-settings-scene.c rename to applications/storage_settings/scenes/storage_settings_scene.c index ea4c3f00..3591ae1f 100644 --- a/applications/storage-settings/scenes/storage-settings-scene.c +++ b/applications/storage_settings/scenes/storage_settings_scene.c @@ -1,23 +1,23 @@ -#include "storage-settings-scene.h" +#include "storage_settings_scene.h" // Generate scene on_enter handlers array #define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_enter, void (*const storage_settings_on_enter_handlers[])(void*) = { -#include "storage-settings-scene-config.h" +#include "storage_settings_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 storage_settings_on_event_handlers[])(void* context, SceneManagerEvent event) = { -#include "storage-settings-scene-config.h" +#include "storage_settings_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 storage_settings_on_exit_handlers[])(void* context) = { -#include "storage-settings-scene-config.h" +#include "storage_settings_scene_config.h" }; #undef ADD_SCENE diff --git a/applications/storage-settings/scenes/storage-settings-scene.h b/applications/storage_settings/scenes/storage_settings_scene.h similarity index 81% rename from applications/storage-settings/scenes/storage-settings-scene.h rename to applications/storage_settings/scenes/storage_settings_scene.h index 86ade12d..5b4fb736 100644 --- a/applications/storage-settings/scenes/storage-settings-scene.h +++ b/applications/storage_settings/scenes/storage_settings_scene.h @@ -5,7 +5,7 @@ // Generate scene id and total number #define ADD_SCENE(prefix, name, id) StorageSettings##id, typedef enum { -#include "storage-settings-scene-config.h" +#include "storage_settings_scene_config.h" StorageSettingsSceneNum, } StorageSettingsScene; #undef ADD_SCENE @@ -14,16 +14,16 @@ extern const SceneManagerHandlers storage_settings_scene_handlers; // Generate scene on_enter handlers declaration #define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_enter(void*); -#include "storage-settings-scene-config.h" +#include "storage_settings_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 "storage-settings-scene-config.h" +#include "storage_settings_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 "storage-settings-scene-config.h" +#include "storage_settings_scene_config.h" #undef ADD_SCENE diff --git a/applications/storage-settings/scenes/storage-settings-benchmark.c b/applications/storage_settings/scenes/storage_settings_scene_benchmark.c similarity index 90% rename from applications/storage-settings/scenes/storage-settings-benchmark.c rename to applications/storage_settings/scenes/storage_settings_scene_benchmark.c index 454e3a39..e7cfd826 100644 --- a/applications/storage-settings/scenes/storage-settings-benchmark.c +++ b/applications/storage_settings/scenes/storage_settings_scene_benchmark.c @@ -1,4 +1,4 @@ -#include "../storage-settings.h" +#include "../storage_settings.h" #define BENCH_DATA_SIZE 4096 #define BENCH_COUNT 6 @@ -12,7 +12,7 @@ static void view_dispatcher_send_custom_event(app->view_dispatcher, result); } -static bool storage_settings_bench_write( +static bool storage_settings_scene_bench_write( Storage* api, uint16_t size, const uint8_t* data, @@ -43,7 +43,7 @@ static bool storage_settings_bench_write( } static bool - storage_settings_bench_read(Storage* api, uint16_t size, uint8_t* data, uint32_t* speed) { + storage_settings_scene_bench_read(Storage* api, uint16_t size, uint8_t* data, uint32_t* speed) { File* file = storage_file_alloc(api); bool result = true; *speed = -1; @@ -71,7 +71,7 @@ static bool return result; } -static void storage_settings_benchmark(StorageSettings* app) { +static void storage_settings_scene_benchmark(StorageSettings* app) { DialogEx* dialog_ex = app->dialog_ex; uint8_t* bench_data; dialog_ex_set_header(dialog_ex, "Preparing data...", 64, 32, AlignCenter, AlignCenter); @@ -87,7 +87,8 @@ static void storage_settings_benchmark(StorageSettings* app) { dialog_ex_set_header(dialog_ex, "Benchmarking...", 64, 32, AlignCenter, AlignCenter); for(size_t i = 0; i < BENCH_COUNT; i++) { - if(!storage_settings_bench_write(app->fs_api, bench_size[i], bench_data, &bench_w_speed[i])) + if(!storage_settings_scene_bench_write( + app->fs_api, bench_size[i], bench_data, &bench_w_speed[i])) break; if(i > 0) string_cat_printf(app->text_string, "\n"); @@ -96,7 +97,8 @@ static void storage_settings_benchmark(StorageSettings* app) { dialog_ex_set_text( dialog_ex, string_get_cstr(app->text_string), 0, 32, AlignLeft, AlignCenter); - if(!storage_settings_bench_read(app->fs_api, bench_size[i], bench_data, &bench_r_speed[i])) + if(!storage_settings_scene_bench_read( + app->fs_api, bench_size[i], bench_data, &bench_r_speed[i])) break; string_cat_printf(app->text_string, "R %luK", bench_r_speed[i]); @@ -126,7 +128,7 @@ void storage_settings_scene_benchmark_on_enter(void* context) { AlignCenter); dialog_ex_set_left_button_text(dialog_ex, "Back"); } else { - storage_settings_benchmark(app); + storage_settings_scene_benchmark(app); notification_message(app->notification, &sequence_blink_green_100); } } diff --git a/applications/storage-settings/scenes/storage-settings-scene-config.h b/applications/storage_settings/scenes/storage_settings_scene_config.h similarity index 77% rename from applications/storage-settings/scenes/storage-settings-scene-config.h rename to applications/storage_settings/scenes/storage_settings_scene_config.h index 1191a376..7628d143 100644 --- a/applications/storage-settings/scenes/storage-settings-scene-config.h +++ b/applications/storage_settings/scenes/storage_settings_scene_config.h @@ -5,4 +5,5 @@ ADD_SCENE(storage_settings, format_confirm, FormatConfirm) ADD_SCENE(storage_settings, formatting, Formatting) ADD_SCENE(storage_settings, sd_info, SDInfo) ADD_SCENE(storage_settings, internal_info, InternalInfo) -ADD_SCENE(storage_settings, benchmark, Benchmark) \ No newline at end of file +ADD_SCENE(storage_settings, benchmark, Benchmark) +ADD_SCENE(storage_settings, factory_reset, FactoryReset) \ No newline at end of file diff --git a/applications/storage-settings/scenes/storage-settings-scene-eject-confirm.c b/applications/storage_settings/scenes/storage_settings_scene_eject_confirm.c similarity index 98% rename from applications/storage-settings/scenes/storage-settings-scene-eject-confirm.c rename to applications/storage_settings/scenes/storage_settings_scene_eject_confirm.c index ec40352d..8fc6c871 100644 --- a/applications/storage-settings/scenes/storage-settings-scene-eject-confirm.c +++ b/applications/storage_settings/scenes/storage_settings_scene_eject_confirm.c @@ -1,4 +1,4 @@ -#include "../storage-settings.h" +#include "../storage_settings.h" static void storage_settings_scene_unmount_confirm_dialog_callback(DialogExResult result, void* context) { diff --git a/applications/storage-settings/scenes/storage-settings-scene-ejected.c b/applications/storage_settings/scenes/storage_settings_scene_ejected.c similarity index 98% rename from applications/storage-settings/scenes/storage-settings-scene-ejected.c rename to applications/storage_settings/scenes/storage_settings_scene_ejected.c index 8fb53570..08208f87 100755 --- a/applications/storage-settings/scenes/storage-settings-scene-ejected.c +++ b/applications/storage_settings/scenes/storage_settings_scene_ejected.c @@ -1,4 +1,4 @@ -#include "../storage-settings.h" +#include "../storage_settings.h" static void storage_settings_scene_unmounted_dialog_callback(DialogExResult result, void* context) { diff --git a/applications/storage_settings/scenes/storage_settings_scene_factory_reset.c b/applications/storage_settings/scenes/storage_settings_scene_factory_reset.c new file mode 100644 index 00000000..5409a33e --- /dev/null +++ b/applications/storage_settings/scenes/storage_settings_scene_factory_reset.c @@ -0,0 +1,90 @@ +#include "../storage_settings.h" +#include +#include + +#define STORAGE_SETTINGS_SCENE_FACTORY_RESET_CONFIRM_COUNT 5 + +static void + storage_settings_scene_factory_reset_dialog_callback(DialogExResult result, void* context) { + StorageSettings* app = context; + + view_dispatcher_send_custom_event(app->view_dispatcher, result); +} + +void storage_settings_scene_factory_reset_on_enter(void* context) { + StorageSettings* app = context; + DialogEx* dialog_ex = app->dialog_ex; + + dialog_ex_set_context(dialog_ex, app); + dialog_ex_set_result_callback(dialog_ex, storage_settings_scene_factory_reset_dialog_callback); + + dialog_ex_set_left_button_text(dialog_ex, "Back"); + dialog_ex_set_right_button_text(dialog_ex, "Erase"); + + dialog_ex_set_header(dialog_ex, "Confirm Factory Reset", 64, 10, AlignCenter, AlignCenter); + dialog_ex_set_text( + dialog_ex, + "Internal storage will be erased\r\nData and setting will be lost", + 64, + 32, + AlignCenter, + AlignCenter); + + view_dispatcher_switch_to_view(app->view_dispatcher, StorageSettingsViewDialogEx); +} + +bool storage_settings_scene_factory_reset_on_event(void* context, SceneManagerEvent event) { + StorageSettings* app = context; + bool consumed = false; + + uint32_t counter = + scene_manager_get_scene_state(app->scene_manager, StorageSettingsFactoryReset); + + if(event.type == SceneManagerEventTypeCustom) { + switch(event.event) { + case DialogExResultLeft: + scene_manager_set_scene_state(app->scene_manager, StorageSettingsFactoryReset, 0); + consumed = scene_manager_previous_scene(app->scene_manager); + break; + case DialogExResultRight: + counter++; + if(counter < STORAGE_SETTINGS_SCENE_FACTORY_RESET_CONFIRM_COUNT) { + string_printf( + app->text_string, + "%ld presses left", + STORAGE_SETTINGS_SCENE_FACTORY_RESET_CONFIRM_COUNT - counter); + dialog_ex_set_text( + app->dialog_ex, + string_get_cstr(app->text_string), + 64, + 32, + AlignCenter, + AlignCenter); + scene_manager_set_scene_state( + app->scene_manager, StorageSettingsFactoryReset, counter); + } else { + furi_hal_bootloader_set_flags(FuriHalBootloaderFlagFactoryReset); + power_reboot(PowerBootModeNormal); + } + + consumed = true; + break; + } + } + return consumed; +} + +void storage_settings_scene_factory_reset_on_exit(void* context) { + StorageSettings* app = context; + DialogEx* dialog_ex = app->dialog_ex; + + dialog_ex_set_header(dialog_ex, NULL, 0, 0, AlignCenter, AlignCenter); + dialog_ex_set_text(dialog_ex, NULL, 0, 0, AlignCenter, AlignTop); + dialog_ex_set_icon(dialog_ex, 0, 0, NULL); + dialog_ex_set_left_button_text(dialog_ex, NULL); + dialog_ex_set_right_button_text(dialog_ex, NULL); + dialog_ex_set_result_callback(dialog_ex, NULL); + dialog_ex_set_context(dialog_ex, NULL); + + string_reset(app->text_string); +} diff --git a/applications/storage-settings/scenes/storage-settings-scene-format-confirm.c b/applications/storage_settings/scenes/storage_settings_scene_format_confirm.c similarity index 98% rename from applications/storage-settings/scenes/storage-settings-scene-format-confirm.c rename to applications/storage_settings/scenes/storage_settings_scene_format_confirm.c index 92a8d532..a80215bc 100644 --- a/applications/storage-settings/scenes/storage-settings-scene-format-confirm.c +++ b/applications/storage_settings/scenes/storage_settings_scene_format_confirm.c @@ -1,4 +1,4 @@ -#include "../storage-settings.h" +#include "../storage_settings.h" static void storage_settings_scene_format_confirm_dialog_callback(DialogExResult result, void* context) { diff --git a/applications/storage-settings/scenes/storage-settings-scene-formatting.c b/applications/storage_settings/scenes/storage_settings_scene_formatting.c similarity index 98% rename from applications/storage-settings/scenes/storage-settings-scene-formatting.c rename to applications/storage_settings/scenes/storage_settings_scene_formatting.c index 9a82491d..143bda95 100755 --- a/applications/storage-settings/scenes/storage-settings-scene-formatting.c +++ b/applications/storage_settings/scenes/storage_settings_scene_formatting.c @@ -1,4 +1,4 @@ -#include "../storage-settings.h" +#include "../storage_settings.h" static const NotificationMessage message_green_165 = { .type = NotificationMessageTypeLedGreen, diff --git a/applications/storage-settings/scenes/storage-settings-scene-internal-info.c b/applications/storage_settings/scenes/storage_settings_scene_internal_info.c similarity index 98% rename from applications/storage-settings/scenes/storage-settings-scene-internal-info.c rename to applications/storage_settings/scenes/storage_settings_scene_internal_info.c index 8a831610..1fb05ca5 100644 --- a/applications/storage-settings/scenes/storage-settings-scene-internal-info.c +++ b/applications/storage_settings/scenes/storage_settings_scene_internal_info.c @@ -1,4 +1,4 @@ -#include "../storage-settings.h" +#include "../storage_settings.h" #include static void diff --git a/applications/storage-settings/scenes/storage-settings-scene-sd-info.c b/applications/storage_settings/scenes/storage_settings_scene_sd_info.c similarity index 98% rename from applications/storage-settings/scenes/storage-settings-scene-sd-info.c rename to applications/storage_settings/scenes/storage_settings_scene_sd_info.c index c82d2f14..297041a5 100644 --- a/applications/storage-settings/scenes/storage-settings-scene-sd-info.c +++ b/applications/storage_settings/scenes/storage_settings_scene_sd_info.c @@ -1,4 +1,4 @@ -#include "../storage-settings.h" +#include "../storage_settings.h" static void storage_settings_scene_sd_info_dialog_callback(DialogExResult result, void* context) { StorageSettings* app = context; diff --git a/applications/storage-settings/scenes/storage-settings-scene-start.c b/applications/storage_settings/scenes/storage_settings_scene_start.c similarity index 85% rename from applications/storage-settings/scenes/storage-settings-scene-start.c rename to applications/storage_settings/scenes/storage_settings_scene_start.c index f3c42b08..595c73f1 100644 --- a/applications/storage-settings/scenes/storage-settings-scene-start.c +++ b/applications/storage_settings/scenes/storage_settings_scene_start.c @@ -1,4 +1,4 @@ -#include "../storage-settings.h" +#include "../storage_settings.h" enum StorageSettingsStartSubmenuIndex { StorageSettingsStartSubmenuIndexInternalInfo, @@ -6,6 +6,7 @@ enum StorageSettingsStartSubmenuIndex { StorageSettingsStartSubmenuIndexUnmount, StorageSettingsStartSubmenuIndexFormat, StorageSettingsStartSubmenuIndexBenchy, + StorageSettingsStartSubmenuIndexFactoryReset }; static void storage_settings_scene_start_submenu_callback(void* context, uint32_t index) { @@ -48,6 +49,12 @@ void storage_settings_scene_start_on_enter(void* context) { StorageSettingsStartSubmenuIndexBenchy, storage_settings_scene_start_submenu_callback, app); + submenu_add_item( + submenu, + "Factory Reset", + StorageSettingsStartSubmenuIndexFactoryReset, + storage_settings_scene_start_submenu_callback, + app); submenu_set_selected_item( submenu, scene_manager_get_scene_state(app->scene_manager, StorageSettingsStart)); @@ -93,6 +100,14 @@ bool storage_settings_scene_start_on_event(void* context, SceneManagerEvent even scene_manager_next_scene(app->scene_manager, StorageSettingsBenchmark); consumed = true; break; + case StorageSettingsStartSubmenuIndexFactoryReset: + scene_manager_set_scene_state( + app->scene_manager, + StorageSettingsStart, + StorageSettingsStartSubmenuIndexFactoryReset); + scene_manager_next_scene(app->scene_manager, StorageSettingsFactoryReset); + consumed = true; + break; } } return consumed; diff --git a/applications/storage-settings/storage-settings.c b/applications/storage_settings/storage_settings.c similarity index 98% rename from applications/storage-settings/storage-settings.c rename to applications/storage_settings/storage_settings.c index 8e18071b..ac61cd3b 100644 --- a/applications/storage-settings/storage-settings.c +++ b/applications/storage_settings/storage_settings.c @@ -1,4 +1,4 @@ -#include "storage-settings.h" +#include "storage_settings.h" static bool storage_settings_custom_event_callback(void* context, uint32_t event) { furi_assert(context); diff --git a/applications/storage-settings/storage-settings.h b/applications/storage_settings/storage_settings.h similarity index 95% rename from applications/storage-settings/storage-settings.h rename to applications/storage_settings/storage_settings.h index f79066c7..c9490aeb 100644 --- a/applications/storage-settings/storage-settings.h +++ b/applications/storage_settings/storage_settings.h @@ -13,7 +13,7 @@ #include #include -#include "scenes/storage-settings-scene.h" +#include "scenes/storage_settings_scene.h" #ifdef __cplusplus extern "C" { From b3d8f0b9506170a99f4eeb5f5d68015e95f5db5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=81=8F?= Date: Tue, 16 Nov 2021 03:12:30 +0300 Subject: [PATCH 02/11] [FL-2038] Power off and auto power off on first start screen (#821) * Power: change power_off signature to match implementation * Desktop: auto power off on first start screen and with ok button. Co-authored-by: SG --- applications/desktop/desktop_i.h | 1 + .../scenes/desktop_scene_first_start.c | 7 ++ .../desktop/views/desktop_first_start.c | 109 +++++++++++++----- .../desktop/views/desktop_first_start.h | 18 +-- applications/power/power_service/power.h | 2 +- 5 files changed, 91 insertions(+), 46 deletions(-) diff --git a/applications/desktop/desktop_i.h b/applications/desktop/desktop_i.h index 0bf5f3da..71a6c039 100644 --- a/applications/desktop/desktop_i.h +++ b/applications/desktop/desktop_i.h @@ -12,6 +12,7 @@ #include #include #include +#include #include "views/desktop_main.h" #include "views/desktop_first_start.h" diff --git a/applications/desktop/scenes/desktop_scene_first_start.c b/applications/desktop/scenes/desktop_scene_first_start.c index 98f6ef73..289e7d1f 100644 --- a/applications/desktop/scenes/desktop_scene_first_start.c +++ b/applications/desktop/scenes/desktop_scene_first_start.c @@ -20,6 +20,7 @@ bool desktop_scene_first_start_on_event(void* context, SceneManagerEvent event) Desktop* desktop = (Desktop*)context; bool consumed = false; Storage* storage = NULL; + Power* power = NULL; if(event.type == SceneManagerEventTypeCustom) { switch(event.event) { @@ -30,6 +31,12 @@ bool desktop_scene_first_start_on_event(void* context, SceneManagerEvent event) scene_manager_previous_scene(desktop->scene_manager); consumed = true; break; + case DesktopFirstStartPoweroff: + power = furi_record_open("power"); + power_off(power); + furi_record_close("power"); + consumed = true; + break; default: break; diff --git a/applications/desktop/views/desktop_first_start.c b/applications/desktop/views/desktop_first_start.c index c63c7752..a1ad2957 100644 --- a/applications/desktop/views/desktop_first_start.c +++ b/applications/desktop/views/desktop_first_start.c @@ -2,17 +2,21 @@ #include "../desktop_i.h" #include "desktop_first_start.h" -void desktop_first_start_set_callback( - DesktopFirstStartView* first_start_view, - DesktopFirstStartViewCallback callback, - void* context) { - furi_assert(first_start_view); - furi_assert(callback); - first_start_view->callback = callback; - first_start_view->context = context; -} +#define DESKTOP_FIRST_START_POWEROFF_SHORT 5000 +#define DESKTOP_FIRST_START_POWEROFF_LONG (60 * 60 * 1000) -void desktop_first_start_render(Canvas* canvas, void* model) { +struct DesktopFirstStartView { + View* view; + DesktopFirstStartViewCallback callback; + void* context; + osTimerId_t timer; +}; + +typedef struct { + uint8_t page; +} DesktopFirstStartViewModel; + +static void desktop_first_start_draw(Canvas* canvas, void* model) { DesktopFirstStartViewModel* m = model; canvas_clear(canvas); @@ -62,46 +66,87 @@ void desktop_first_start_render(Canvas* canvas, void* model) { } } -View* desktop_first_start_get_view(DesktopFirstStartView* first_start_view) { - furi_assert(first_start_view); - return first_start_view->view; -} - -bool desktop_first_start_input(InputEvent* event, void* context) { +static bool desktop_first_start_input(InputEvent* event, void* context) { furi_assert(event); - DesktopFirstStartView* first_start_view = context; + DesktopFirstStartView* instance = context; if(event->type == InputTypeShort) { - DesktopFirstStartViewModel* model = view_get_model(first_start_view->view); + DesktopFirstStartViewModel* model = view_get_model(instance->view); if(event->key == InputKeyLeft) { if(model->page > 0) model->page--; } else if(event->key == InputKeyRight) { uint32_t page = ++model->page; if(page > 8) { - first_start_view->callback(DesktopFirstStartCompleted, first_start_view->context); + instance->callback(DesktopFirstStartCompleted, instance->context); } } - view_commit_model(first_start_view->view, true); + view_commit_model(instance->view, true); + } + + if(event->key == InputKeyOk) { + if(event->type == InputTypePress) { + osTimerStart(instance->timer, DESKTOP_FIRST_START_POWEROFF_SHORT); + } else if(event->type == InputTypeRelease) { + osTimerStop(instance->timer); + } } return true; } +static void desktop_first_start_timer_callback(void* context) { + DesktopFirstStartView* instance = context; + instance->callback(DesktopFirstStartPoweroff, instance->context); +} + +static void desktop_first_start_enter(void* context) { + DesktopFirstStartView* instance = context; + + furi_assert(instance->timer == NULL); + instance->timer = osTimerNew(desktop_first_start_timer_callback, osTimerOnce, instance, NULL); + + osTimerStart(instance->timer, DESKTOP_FIRST_START_POWEROFF_LONG); +} + +static void desktop_first_start_exit(void* context) { + DesktopFirstStartView* instance = context; + + osTimerStop(instance->timer); + osTimerDelete(instance->timer); + instance->timer = NULL; +} + DesktopFirstStartView* desktop_first_start_alloc() { - DesktopFirstStartView* first_start_view = furi_alloc(sizeof(DesktopFirstStartView)); - first_start_view->view = view_alloc(); - view_allocate_model( - first_start_view->view, ViewModelTypeLocking, sizeof(DesktopFirstStartViewModel)); - view_set_context(first_start_view->view, first_start_view); - view_set_draw_callback(first_start_view->view, (ViewDrawCallback)desktop_first_start_render); - view_set_input_callback(first_start_view->view, desktop_first_start_input); + DesktopFirstStartView* instance = furi_alloc(sizeof(DesktopFirstStartView)); + instance->view = view_alloc(); + view_allocate_model(instance->view, ViewModelTypeLocking, sizeof(DesktopFirstStartViewModel)); + view_set_context(instance->view, instance); + view_set_draw_callback(instance->view, (ViewDrawCallback)desktop_first_start_draw); + view_set_input_callback(instance->view, desktop_first_start_input); + view_set_enter_callback(instance->view, desktop_first_start_enter); + view_set_exit_callback(instance->view, desktop_first_start_exit); - return first_start_view; + return instance; } -void desktop_first_start_free(DesktopFirstStartView* first_start_view) { - furi_assert(first_start_view); +void desktop_first_start_free(DesktopFirstStartView* instance) { + furi_assert(instance); - view_free(first_start_view->view); - free(first_start_view); + view_free(instance->view); + free(instance); +} + +View* desktop_first_start_get_view(DesktopFirstStartView* instance) { + furi_assert(instance); + return instance->view; +} + +void desktop_first_start_set_callback( + DesktopFirstStartView* instance, + DesktopFirstStartViewCallback callback, + void* context) { + furi_assert(instance); + furi_assert(callback); + instance->callback = callback; + instance->context = context; } diff --git a/applications/desktop/views/desktop_first_start.h b/applications/desktop/views/desktop_first_start.h index 4cc5b54a..d86c2273 100644 --- a/applications/desktop/views/desktop_first_start.h +++ b/applications/desktop/views/desktop_first_start.h @@ -8,28 +8,20 @@ typedef enum { DesktopFirstStartCompleted, + DesktopFirstStartPoweroff, } DesktopFirstStartEvent; typedef struct DesktopFirstStartView DesktopFirstStartView; typedef void (*DesktopFirstStartViewCallback)(DesktopFirstStartEvent event, void* context); -struct DesktopFirstStartView { - View* view; - DesktopFirstStartViewCallback callback; - void* context; -}; +DesktopFirstStartView* desktop_first_start_alloc(); -typedef struct { - uint8_t page; -} DesktopFirstStartViewModel; +void desktop_first_start_free(DesktopFirstStartView* main_view); + +View* desktop_first_start_get_view(DesktopFirstStartView* main_view); void desktop_first_start_set_callback( DesktopFirstStartView* main_view, DesktopFirstStartViewCallback callback, void* context); - -View* desktop_first_start_get_view(DesktopFirstStartView* main_view); - -DesktopFirstStartView* desktop_first_start_alloc(); -void desktop_first_start_free(DesktopFirstStartView* main_view); diff --git a/applications/power/power_service/power.h b/applications/power/power_service/power.h index 947d917c..f80b538d 100644 --- a/applications/power/power_service/power.h +++ b/applications/power/power_service/power.h @@ -46,7 +46,7 @@ typedef struct { /** Power off device */ -void power_off(); +void power_off(Power* power); /** Reboot device * @param mode - PowerBootMode From 4cb986b5347b7ece3f071e281a13225c1f8aac3d Mon Sep 17 00:00:00 2001 From: SG Date: Tue, 16 Nov 2021 18:47:49 +1000 Subject: [PATCH 03/11] [FL-1904] LFRFID: dedicated reading modes (#823) * LFRFID: dedicated reading modes * LFRFID: normal and indala mode --- applications/lfrfid/helpers/rfid-reader.cpp | 4 +-- applications/lfrfid/helpers/rfid-reader.h | 2 +- applications/lfrfid/lfrfid-cli.cpp | 38 +++++++++++++++++---- 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/applications/lfrfid/helpers/rfid-reader.cpp b/applications/lfrfid/helpers/rfid-reader.cpp index 1af1999e..0ac193c5 100644 --- a/applications/lfrfid/helpers/rfid-reader.cpp +++ b/applications/lfrfid/helpers/rfid-reader.cpp @@ -102,7 +102,7 @@ void RfidReader::stop() { stop_comparator(); } -bool RfidReader::read(LfrfidKeyType* _type, uint8_t* data, uint8_t data_size) { +bool RfidReader::read(LfrfidKeyType* _type, uint8_t* data, uint8_t data_size, bool switch_enable) { bool result = false; bool something_readed = false; @@ -140,7 +140,7 @@ bool RfidReader::read(LfrfidKeyType* _type, uint8_t* data, uint8_t data_size) { } // mode switching - if(switch_timer_elapsed()) { + if(switch_enable && switch_timer_elapsed()) { switch_mode(); last_readed_count = 0; } diff --git a/applications/lfrfid/helpers/rfid-reader.h b/applications/lfrfid/helpers/rfid-reader.h index e62c4196..07cc3b8e 100644 --- a/applications/lfrfid/helpers/rfid-reader.h +++ b/applications/lfrfid/helpers/rfid-reader.h @@ -19,7 +19,7 @@ public: void start(); void start_forced(RfidReader::Type type); void stop(); - bool read(LfrfidKeyType* type, uint8_t* data, uint8_t data_size); + bool read(LfrfidKeyType* type, uint8_t* data, uint8_t data_size, bool switch_enable = true); bool detect(); bool any_read(); diff --git a/applications/lfrfid/lfrfid-cli.cpp b/applications/lfrfid/lfrfid-cli.cpp index 2422dc5f..5c61af66 100644 --- a/applications/lfrfid/lfrfid-cli.cpp +++ b/applications/lfrfid/lfrfid-cli.cpp @@ -18,7 +18,7 @@ extern "C" void lfrfid_cli_init() { void lfrfid_cli_print_usage() { printf("Usage:\r\n"); - printf("rfid read\r\n"); + printf("rfid read \r\n"); printf("rfid \r\n"); printf("\t choose from:\r\n"); printf("\tEM4100, EM-Marin (5 bytes key_data)\r\n"); @@ -44,17 +44,39 @@ bool lfrfid_cli_get_key_type(string_t data, LfrfidKeyType* type) { return result; } -void lfrfid_cli_read(Cli* cli) { +void lfrfid_cli_read(Cli* cli, string_t args) { RfidReader reader; - reader.start(); - + string_t type_string; + string_init(type_string); + bool simple_mode = true; + LfrfidKeyType type; + RfidReader::Type reader_type = RfidReader::Type::Normal; static const uint8_t data_size = LFRFID_KEY_SIZE; uint8_t data[data_size] = {0}; - LfrfidKeyType type; + + if(args_read_string_and_trim(args, type_string)) { + simple_mode = false; + + if(string_cmp_str(type_string, "normal") == 0) { + reader_type = RfidReader::Type::Normal; + } else if(string_cmp_str(type_string, "indala") == 0) { + reader_type = RfidReader::Type::Indala; + } else { + lfrfid_cli_print_usage(); + string_clear(type_string); + return; + } + } + + if(simple_mode) { + reader.start(); + } else { + reader.start_forced(reader_type); + } printf("Reading RFID...\r\nPress Ctrl+C to abort\r\n"); while(!cli_cmd_interrupt_received(cli)) { - if(reader.read(&type, data, data_size)) { + if(reader.read(&type, data, data_size, simple_mode)) { printf("%s", lfrfid_key_get_type_string(type)); printf(" "); @@ -69,6 +91,8 @@ void lfrfid_cli_read(Cli* cli) { printf("Reading stopped\r\n"); reader.stop(); + + string_clear(type_string); } void lfrfid_cli_write(Cli* cli, string_t args) { @@ -129,7 +153,7 @@ void lfrfid_cli(Cli* cli, string_t args, void* context) { } if(string_cmp_str(cmd, "read") == 0) { - lfrfid_cli_read(cli); + lfrfid_cli_read(cli, args); } else if(string_cmp_str(cmd, "write") == 0) { lfrfid_cli_write(cli, args); } else if(string_cmp_str(cmd, "emulate") == 0) { From 65e6ab5b8b3807f98c7cc81adafd81a9d97ee21d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=81=8F?= Date: Tue, 16 Nov 2021 17:10:06 +0300 Subject: [PATCH 04/11] [FL-2017] Gui: correct empty folder handling in file_select. #824 --- applications/gui/modules/file_select.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/applications/gui/modules/file_select.c b/applications/gui/modules/file_select.c index 4007fd95..449f3194 100644 --- a/applications/gui/modules/file_select.c +++ b/applications/gui/modules/file_select.c @@ -142,9 +142,11 @@ static bool file_select_input_callback(InputEvent* event, void* context) { } } else if(event->key == InputKeyOk) { if(file_select->callback != NULL) { + size_t files = 0; if(file_select->buffer) { with_view_model( file_select->view, (FileSelectModel * model) { + files = model->file_count; strlcpy( file_select->buffer, string_get_cstr(model->filename[model->position]), @@ -153,8 +155,9 @@ static bool file_select_input_callback(InputEvent* event, void* context) { return false; }); }; - - file_select->callback(true, file_select->context); + if(files > 0) { + file_select->callback(true, file_select->context); + } } consumed = true; } From 22e8da710884eb563e34447dba3d6a710d1ae041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=81=8F?= Date: Tue, 16 Nov 2021 21:52:49 +0300 Subject: [PATCH 05/11] SubGhz: remove debug log (#825) --- lib/subghz/subghz_keystore.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/subghz/subghz_keystore.c b/lib/subghz/subghz_keystore.c index 174b39d1..fe37e96f 100644 --- a/lib/subghz/subghz_keystore.c +++ b/lib/subghz/subghz_keystore.c @@ -305,12 +305,15 @@ bool subghz_keystore_save(SubGhzKeystore* instance, const char* file_name, uint8 storage_file_write(file, encrypted_line, strlen(encrypted_line)); storage_file_write(file, "\n", 1); encrypted_line_count++; - - FURI_LOG_I( - TAG, "Encrypted: `%s` -> `%s`", decrypted_line, encrypted_line); } furi_hal_crypto_store_unload_key(SUBGHZ_KEYSTORE_FILE_ENCRYPTION_KEY_SLOT); - result = encrypted_line_count == SubGhzKeyArray_size(instance->data); + size_t total_keys = SubGhzKeyArray_size(instance->data); + result = encrypted_line_count == total_keys; + if (result) { + FURI_LOG_I(TAG, "Success. Encrypted: %d of %d", encrypted_line_count, total_keys); + } else { + FURI_LOG_E(TAG, "Failure. Encrypted: %d of %d", encrypted_line_count, total_keys); + } } while(0); flipper_file_close(flipper_file); flipper_file_free(flipper_file); From 6792e24b6ec59254f9b325f14ab4017be0db89c3 Mon Sep 17 00:00:00 2001 From: Skorpionm <85568270+Skorpionm@users.noreply.github.com> Date: Wed, 17 Nov 2021 17:52:06 +0400 Subject: [PATCH 06/11] SubGhz: Add new man key (#817) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * SubGhz: fix kelog pattern * SubGhz: add Keloog Secure Learning * SubGhz: add man NICE_Smilo, NICE_MHOUSE, DEA, Genius, FAAC_RC,XT, Came_Space, DTM Co-authored-by: あく --- assets/resources/subghz/keeloq_mfcodes | 9 +- lib/subghz/protocols/subghz_protocol_keeloq.c | 105 +++++++++++------- .../protocols/subghz_protocol_keeloq_common.c | 49 +++++--- .../protocols/subghz_protocol_keeloq_common.h | 27 +++-- 4 files changed, 124 insertions(+), 66 deletions(-) diff --git a/assets/resources/subghz/keeloq_mfcodes b/assets/resources/subghz/keeloq_mfcodes index 9f5ff755..3733b76c 100644 --- a/assets/resources/subghz/keeloq_mfcodes +++ b/assets/resources/subghz/keeloq_mfcodes @@ -23,5 +23,10 @@ C38CBE29F22D0E83E58A52E94AA2485DA8E702FBDB89D27249473CB8A19AEF61 9F0EB580F7474985E8460E1682451E213778B77A9CAB4734B75C5386851050BF 2364EBB8237363B21226565675B9F478482CADAE41E795C27287E26137797C10 775C9A28BA50D759FB438D0200121F01F7DB11986D44D3960F745EAA1E7A2CE2AD92AD718AFCD98BC3269C39F65ADC53 -6911E7EAFFAC15B4E3ABDAD271E92EAEFE1F2E288789EC7599AAA32986273306 -5387D67534234AFD8BAB90DC74BA39598B938526CBFAF14F75AA36A29C13836A31897A86D2E1178AE66191E771A7FEA4 +80F637A04446BF1FBEF3399307527403A15031FC4030F7C1E8217A2367B21A52 +1E3EC8CCECC14E8898D13BB2EEEC1EABABCD83D6930DBB8D381D8378EC5FAF22 +46A68DD969BFF20ADFAC767AFA87D3CA98AE6C056B0B4D43A5A24A7ABBD88D57 +FEC591F298259129A9EC9BE66D903C2D5D94A17D38CD889C878664FC3C118FDA +2BC0AA2C0909417140615C7E901566A9AD2F88BCF500A0AF82A79BE4C0B013CE +D9C9119FE35EB25800F60C2D5D2F018D43CC888147D469BF26F86A8DBABB2DCB +6FFECFF334702D6E32B55B5CDE4191176D2D3CC3A3CE10E880425BD7FC262193 diff --git a/lib/subghz/protocols/subghz_protocol_keeloq.c b/lib/subghz/protocols/subghz_protocol_keeloq.c index f3f33085..42352462 100644 --- a/lib/subghz/protocols/subghz_protocol_keeloq.c +++ b/lib/subghz/protocols/subghz_protocol_keeloq.c @@ -49,6 +49,20 @@ void subghz_protocol_keeloq_free(SubGhzProtocolKeeloq* instance) { free(instance); } +static inline bool subghz_protocol_keeloq_check_decrypt( + SubGhzProtocolKeeloq* instance, + uint32_t decrypt, + uint8_t btn, + uint32_t end_serial) { + furi_assert(instance); + if((decrypt >> 28 == btn) && (((((uint16_t)(decrypt >> 16)) & 0xFF) == end_serial) || + ((((uint16_t)(decrypt >> 16)) & 0xFF) == 0))) { + instance->common.cnt = decrypt & 0x0000FFFF; + return true; + } + return false; +} + /** Checking the accepted code against the database manafacture key * * @param instance SubGhzProtocolKeeloq instance @@ -60,10 +74,15 @@ uint8_t subghz_protocol_keeloq_check_remote_controller_selector( SubGhzProtocolKeeloq* instance, uint32_t fix, uint32_t hop) { - uint16_t end_serial = (uint16_t)(fix & 0x3FF); + // protocol HCS300 uses 10 bits in discriminator, HCS200 uses 8 bits, for backward compatibility, we are looking for the 8-bit pattern + // HCS300 -> uint16_t end_serial = (uint16_t)(fix & 0x3FF); + // HCS200 -> uint16_t end_serial = (uint16_t)(fix & 0xFF); + + uint16_t end_serial = (uint16_t)(fix & 0xFF); uint8_t btn = (uint8_t)(fix >> 28); uint32_t decrypt = 0; - uint64_t man_normal_learning; + uint64_t man_learning; + uint32_t seed = 0; for M_EACH(manufacture_code, *subghz_keystore_get_data(instance->keystore), SubGhzKeyArray_t) { @@ -71,36 +90,36 @@ uint8_t subghz_protocol_keeloq_check_remote_controller_selector( case KEELOQ_LEARNING_SIMPLE: // Simple Learning decrypt = subghz_protocol_keeloq_common_decrypt(hop, manufacture_code->key); - if((decrypt >> 28 == btn) && - (((((uint16_t)(decrypt >> 16)) & 0x3FF) == end_serial) || - ((((uint16_t)(decrypt >> 16)) & 0x3FF) == 0))) { + if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) { instance->manufacture_name = string_get_cstr(manufacture_code->name); - instance->common.cnt = decrypt & 0x0000FFFF; return 1; } break; case KEELOQ_LEARNING_NORMAL: // Normal_Learning // https://phreakerclub.com/forum/showpost.php?p=43557&postcount=37 - man_normal_learning = + man_learning = subghz_protocol_keeloq_common_normal_learning(fix, manufacture_code->key); - decrypt = subghz_protocol_keeloq_common_decrypt(hop, man_normal_learning); - if((decrypt >> 28 == btn) && - (((((uint16_t)(decrypt >> 16)) & 0x3FF) == end_serial) || - ((((uint16_t)(decrypt >> 16)) & 0x3FF) == 0))) { + decrypt = subghz_protocol_keeloq_common_decrypt(hop, man_learning); + if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) { + instance->manufacture_name = string_get_cstr(manufacture_code->name); + return 1; + } + break; + case KEELOQ_LEARNING_SECURE: + man_learning = subghz_protocol_keeloq_common_secure_learning( + fix, seed, manufacture_code->key); + decrypt = subghz_protocol_keeloq_common_decrypt(hop, man_learning); + if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) { instance->manufacture_name = string_get_cstr(manufacture_code->name); - instance->common.cnt = decrypt & 0x0000FFFF; return 1; } break; case KEELOQ_LEARNING_UNKNOWN: // Simple Learning decrypt = subghz_protocol_keeloq_common_decrypt(hop, manufacture_code->key); - if((decrypt >> 28 == btn) && - (((((uint16_t)(decrypt >> 16)) & 0x3FF) == end_serial) || - ((((uint16_t)(decrypt >> 16)) & 0x3FF) == 0))) { + if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) { instance->manufacture_name = string_get_cstr(manufacture_code->name); - instance->common.cnt = decrypt & 0x0000FFFF; return 1; } // Check for mirrored man @@ -111,40 +130,42 @@ uint8_t subghz_protocol_keeloq_check_remote_controller_selector( man_rev = man_rev | man_rev_byte << (56 - i); } decrypt = subghz_protocol_keeloq_common_decrypt(hop, man_rev); - if((decrypt >> 28 == btn) && - (((((uint16_t)(decrypt >> 16)) & 0x3FF) == end_serial) || - ((((uint16_t)(decrypt >> 16)) & 0x3FF) == 0))) { + if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) { instance->manufacture_name = string_get_cstr(manufacture_code->name); - instance->common.cnt = decrypt & 0x0000FFFF; return 1; } //########################### // Normal_Learning // https://phreakerclub.com/forum/showpost.php?p=43557&postcount=37 - man_normal_learning = + man_learning = subghz_protocol_keeloq_common_normal_learning(fix, manufacture_code->key); - decrypt = subghz_protocol_keeloq_common_decrypt(hop, man_normal_learning); - if((decrypt >> 28 == btn) && - (((((uint16_t)(decrypt >> 16)) & 0x3FF) == end_serial) || - ((((uint16_t)(decrypt >> 16)) & 0x3FF) == 0))) { + decrypt = subghz_protocol_keeloq_common_decrypt(hop, man_learning); + if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) { instance->manufacture_name = string_get_cstr(manufacture_code->name); - instance->common.cnt = decrypt & 0x0000FFFF; return 1; } - // Check for mirrored man - man_rev = 0; - man_rev_byte = 0; - for(uint8_t i = 0; i < 64; i += 8) { - man_rev_byte = (uint8_t)(manufacture_code->key >> i); - man_rev = man_rev | man_rev_byte << (56 - i); - } - man_normal_learning = subghz_protocol_keeloq_common_normal_learning(fix, man_rev); - decrypt = subghz_protocol_keeloq_common_decrypt(hop, man_normal_learning); - if((decrypt >> 28 == btn) && - (((((uint16_t)(decrypt >> 16)) & 0x3FF) == end_serial) || - ((((uint16_t)(decrypt >> 16)) & 0x3FF) == 0))) { + man_learning = subghz_protocol_keeloq_common_normal_learning(fix, man_rev); + decrypt = subghz_protocol_keeloq_common_decrypt(hop, man_learning); + if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) { + instance->manufacture_name = string_get_cstr(manufacture_code->name); + return 1; + } + + // Secure Learning + man_learning = subghz_protocol_keeloq_common_secure_learning( + fix, seed, manufacture_code->key); + decrypt = subghz_protocol_keeloq_common_decrypt(hop, man_learning); + if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) { + instance->manufacture_name = string_get_cstr(manufacture_code->name); + return 1; + } + + // Check for mirrored man + + man_learning = subghz_protocol_keeloq_common_secure_learning(fix, seed, man_rev); + decrypt = subghz_protocol_keeloq_common_decrypt(hop, man_learning); + if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) { instance->manufacture_name = string_get_cstr(manufacture_code->name); - instance->common.cnt = decrypt & 0x0000FFFF; return 1; } break; @@ -214,7 +235,7 @@ uint64_t subghz_protocol_keeloq_gen_key(void* context) { uint32_t decrypt = instance->common.btn << 28 | (instance->common.serial & 0x3FF) << 16 | instance->common.cnt; uint32_t hop = 0; - uint64_t man_normal_learning = 0; + uint64_t man_learning = 0; int res = 0; for @@ -228,9 +249,9 @@ uint64_t subghz_protocol_keeloq_gen_key(void* context) { break; case KEELOQ_LEARNING_NORMAL: //Simple Learning - man_normal_learning = + man_learning = subghz_protocol_keeloq_common_normal_learning(fix, manufacture_code->key); - hop = subghz_protocol_keeloq_common_encrypt(decrypt, man_normal_learning); + hop = subghz_protocol_keeloq_common_encrypt(decrypt, man_learning); break; case KEELOQ_LEARNING_UNKNOWN: hop = 0; //todo diff --git a/lib/subghz/protocols/subghz_protocol_keeloq_common.c b/lib/subghz/protocols/subghz_protocol_keeloq_common.c index 1c69f701..0726a604 100644 --- a/lib/subghz/protocols/subghz_protocol_keeloq_common.c +++ b/lib/subghz/protocols/subghz_protocol_keeloq_common.c @@ -12,8 +12,10 @@ */ inline uint32_t subghz_protocol_keeloq_common_encrypt(const uint32_t data, const uint64_t key) { uint32_t x = data, r; - for (r = 0; r < 528; r++) - x = (x>>1)^((bit(x,0)^bit(x,16)^(uint32_t)bit(key,r&63)^bit(KEELOQ_NLF,g5(x,1,9,20,26,31)))<<31); + for(r = 0; r < 528; r++) + x = (x >> 1) ^ ((bit(x, 0) ^ bit(x, 16) ^ (uint32_t)bit(key, r & 63) ^ + bit(KEELOQ_NLF, g5(x, 1, 9, 20, 26, 31))) + << 31); return x; } @@ -24,8 +26,9 @@ inline uint32_t subghz_protocol_keeloq_common_encrypt(const uint32_t data, const */ inline uint32_t subghz_protocol_keeloq_common_decrypt(const uint32_t data, const uint64_t key) { uint32_t x = data, r; - for (r = 0; r < 528; r++) - x = (x<<1)^bit(x,31)^bit(x,15)^(uint32_t)bit(key,(15-r)&63)^bit(KEELOQ_NLF,g5(x,0,8,19,25,30)); + for(r = 0; r < 528; r++) + x = (x << 1) ^ bit(x, 31) ^ bit(x, 15) ^ (uint32_t)bit(key, (15 - r) & 63) ^ + bit(KEELOQ_NLF, g5(x, 0, 8, 19, 25, 30)); return x; } @@ -34,16 +37,36 @@ inline uint32_t subghz_protocol_keeloq_common_decrypt(const uint32_t data, const * @param key - manufacture (64bit) * @return manufacture for this serial number (64bit) */ -inline uint64_t subghz_protocol_keeloq_common_normal_learning(uint32_t data, const uint64_t key){ - uint32_t k1,k2; +inline uint64_t subghz_protocol_keeloq_common_normal_learning(uint32_t data, const uint64_t key) { + uint32_t k1, k2; - data&=0x0FFFFFFF; - data|=0x20000000; - k1=subghz_protocol_keeloq_common_decrypt(data, key); + data &= 0x0FFFFFFF; + data |= 0x20000000; + k1 = subghz_protocol_keeloq_common_decrypt(data, key); - data&=0x0FFFFFFF; - data|=0x60000000; - k2=subghz_protocol_keeloq_common_decrypt(data, key); + data &= 0x0FFFFFFF; + data |= 0x60000000; + k2 = subghz_protocol_keeloq_common_decrypt(data, key); - return ((uint64_t)k2<<32)| k1; // key - shifrovanoya + return ((uint64_t)k2 << 32) | k1; // key - shifrovanoya } + +/** Secure Learning + * @param data - serial number (28bit) + * @param seed - serial number (32bit) + * @param key - manufacture (64bit) + * @return manufacture for this serial number (64bit) + */ + +inline uint64_t subghz_protocol_keeloq_common_secure_learning( + uint32_t data, + uint32_t seed, + const uint64_t key) { + uint32_t k1, k2; + + data &= 0x0FFFFFFF; + k1 = subghz_protocol_keeloq_common_decrypt(data, key); + k2 = subghz_protocol_keeloq_common_decrypt(seed, key); + + return ((uint64_t)k1 << 32) | k2; +} \ No newline at end of file diff --git a/lib/subghz/protocols/subghz_protocol_keeloq_common.h b/lib/subghz/protocols/subghz_protocol_keeloq_common.h index 41cd76e5..cd21a039 100644 --- a/lib/subghz/protocols/subghz_protocol_keeloq_common.h +++ b/lib/subghz/protocols/subghz_protocol_keeloq_common.h @@ -2,7 +2,6 @@ #include "subghz_protocol_common.h" #include "file-worker.h" - #include /* @@ -12,19 +11,19 @@ * */ -#define KEELOQ_NLF 0x3A5C742E -#define bit(x,n) (((x)>>(n))&1) -#define g5(x,a,b,c,d,e) (bit(x,a)+bit(x,b)*2+bit(x,c)*4+bit(x,d)*8+bit(x,e)*16) +#define KEELOQ_NLF 0x3A5C742E +#define bit(x, n) (((x) >> (n)) & 1) +#define g5(x, a, b, c, d, e) \ + (bit(x, a) + bit(x, b) * 2 + bit(x, c) * 4 + bit(x, d) * 8 + bit(x, e) * 16) /* * KeeLoq learning types * https://phreakerclub.com/forum/showthread.php?t=67 */ -#define KEELOQ_LEARNING_UNKNOWN 0u -#define KEELOQ_LEARNING_SIMPLE 1u -#define KEELOQ_LEARNING_NORMAL 2u -#define KEELOQ_LEARNING_SECURE 3u - +#define KEELOQ_LEARNING_UNKNOWN 0u +#define KEELOQ_LEARNING_SIMPLE 1u +#define KEELOQ_LEARNING_NORMAL 2u +#define KEELOQ_LEARNING_SECURE 3u /** Simple Learning Encrypt * @param data - 0xBSSSCCCC, B(4bit) key, S(10bit) serial&0x3FF, C(16bit) counter @@ -46,3 +45,13 @@ uint32_t subghz_protocol_keeloq_common_decrypt(const uint32_t data, const uint64 * @return manufacture for this serial number (64bit) */ uint64_t subghz_protocol_keeloq_common_normal_learning(uint32_t data, const uint64_t key); + +/** Secure Learning + * @param data - serial number (28bit) + * @param seed - serial number (32bit) + * @param key - manufacture (64bit) + * @return manufacture for this serial number (64bit) + */ + +uint64_t + subghz_protocol_keeloq_common_secure_learning(uint32_t data, uint32_t seed, const uint64_t key); \ No newline at end of file From cc044c5033bb3aa4176f1814580c835e96b8be6f Mon Sep 17 00:00:00 2001 From: gornekich Date: Wed, 17 Nov 2021 21:15:58 +0300 Subject: [PATCH 07/11] Fix incorrect RPC session termination on BLE disconnect #828 --- applications/bt/bt_service/bt.c | 19 +++++++++++++++---- applications/bt/bt_service/bt_i.h | 2 +- applications/rpc/rpc.c | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/applications/bt/bt_service/bt.c b/applications/bt/bt_service/bt.c index 64966570..296f5593 100755 --- a/applications/bt/bt_service/bt.c +++ b/applications/bt/bt_service/bt.c @@ -4,6 +4,10 @@ #define TAG "BtSrv" +#define BT_RPC_EVENT_BUFF_SENT (1UL << 0) +#define BT_RPC_EVENT_DISCONNECTED (1UL << 1) +#define BT_RPC_EVENT_ALL (BT_RPC_EVENT_BUFF_SENT | BT_RPC_EVENT_DISCONNECTED) + static void bt_draw_statusbar_callback(Canvas* canvas, void* context) { furi_assert(context); @@ -75,7 +79,7 @@ Bt* bt_alloc() { // RPC bt->rpc = furi_record_open("rpc"); - bt->rpc_sem = osSemaphoreNew(1, 0, NULL); + bt->rpc_event = osEventFlagsNew(NULL); return bt; } @@ -97,7 +101,7 @@ static void bt_on_data_sent_callback(void* context) { furi_assert(context); Bt* bt = context; - osSemaphoreRelease(bt->rpc_sem); + osEventFlagsSet(bt->rpc_event, BT_RPC_EVENT_BUFF_SENT); } // Called from RPC thread @@ -105,6 +109,7 @@ static void bt_rpc_send_bytes_callback(void* context, uint8_t* bytes, size_t byt furi_assert(context); Bt* bt = context; + osEventFlagsClear(bt->rpc_event, BT_RPC_EVENT_ALL); size_t bytes_sent = 0; while(bytes_sent < bytes_len) { size_t bytes_remain = bytes_len - bytes_sent; @@ -115,7 +120,11 @@ static void bt_rpc_send_bytes_callback(void* context, uint8_t* bytes, size_t byt furi_hal_bt_tx(&bytes[bytes_sent], bytes_remain); bytes_sent += bytes_remain; } - osSemaphoreAcquire(bt->rpc_sem, osWaitForever); + uint32_t event_flag = + osEventFlagsWait(bt->rpc_event, BT_RPC_EVENT_ALL, osFlagsWaitAny, osWaitForever); + if(event_flag & BT_RPC_EVENT_DISCONNECTED) { + break; + } } } @@ -149,9 +158,11 @@ static void bt_on_gap_event_callback(BleEvent event, void* context) { message.data.battery_level = info.charge; furi_check(osMessageQueuePut(bt->message_queue, &message, 0, osWaitForever) == osOK); } else if(event.type == BleEventTypeDisconnected) { - FURI_LOG_I(TAG, "Close RPC connection"); if(bt->rpc_session) { + FURI_LOG_I(TAG, "Close RPC connection"); + osEventFlagsSet(bt->rpc_event, BT_RPC_EVENT_DISCONNECTED); rpc_session_close(bt->rpc_session); + furi_hal_bt_set_data_event_callbacks(0, NULL, NULL, NULL); bt->rpc_session = NULL; } } else if(event.type == BleEventTypeStartAdvertising) { diff --git a/applications/bt/bt_service/bt_i.h b/applications/bt/bt_service/bt_i.h index 3921a4c5..698dee1e 100644 --- a/applications/bt/bt_service/bt_i.h +++ b/applications/bt/bt_service/bt_i.h @@ -51,5 +51,5 @@ struct Bt { Power* power; Rpc* rpc; RpcSession* rpc_session; - osSemaphoreId_t rpc_sem; + osEventFlagsId_t rpc_event; }; diff --git a/applications/rpc/rpc.c b/applications/rpc/rpc.c index 450daaee..fa39699f 100644 --- a/applications/rpc/rpc.c +++ b/applications/rpc/rpc.c @@ -354,6 +354,7 @@ void rpc_session_close(RpcSession* session) { rpc_session_set_send_bytes_callback(session, NULL); rpc_session_set_close_callback(session, NULL); + rpc_session_set_buffer_is_empty_callback(session, NULL); osEventFlagsSet(session->rpc->events, RPC_EVENT_DISCONNECT); } @@ -409,7 +410,6 @@ void rpc_session_set_buffer_is_empty_callback( RpcSession* session, RpcBufferIsEmptyCallback callback) { furi_assert(session); - furi_assert(callback); furi_assert(session->rpc->busy); osMutexAcquire(session->callbacks_mutex, osWaitForever); From 4303945748d62a0563d62a5d5ddb5d470715d3d3 Mon Sep 17 00:00:00 2001 From: Anna Prosvetova Date: Thu, 18 Nov 2021 11:46:47 +0300 Subject: [PATCH 08/11] Simpler build, less dependencies (#827) * Simpler build, less dependencies * Follow ugly python linter * Introduce Brewfile & Update Readme * Make dist.sh target-specific * Tidy up make output * Get rid of cat and truncate (I still love cats tho) * Suppress dd output * Long live the cat --- .github/workflows/build.yml | 98 ++---------------------------- .gitignore | 4 ++ Brewfile | 6 ++ Makefile | 38 ++++++------ ReadMe.md | 118 +++++++++++++++++++----------------- bootloader/Makefile | 2 +- docker/Dockerfile | 6 -- firmware/Makefile | 2 +- make/defaults.mk | 2 + make/git.mk | 2 +- make/rules.mk | 16 ++--- scripts/bin2dfu.py | 70 +++++++++++++++++++++ scripts/dist.sh | 52 ++++++++++++++++ scripts/flipper/app.py | 2 +- scripts/meta.py | 53 ++++++++++++---- 15 files changed, 273 insertions(+), 198 deletions(-) create mode 100644 Brewfile create mode 100644 make/defaults.mk create mode 100755 scripts/bin2dfu.py create mode 100755 scripts/dist.sh mode change 100644 => 100755 scripts/meta.py diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e5c59cfa..48a70686 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,66 +67,19 @@ jobs: fi echo "WORKFLOW_BRANCH_OR_TAG=${BRANCH_OR_TAG}" >> $GITHUB_ENV + echo "DIST_SUFFIX=${SUFFIX}" >> $GITHUB_ENV echo "::set-output name=artifacts-path::${BRANCH_OR_TAG}" echo "::set-output name=suffix::${SUFFIX}" echo "::set-output name=short-hash::${SHA}" echo "::set-output name=default-target::${DEFAULT_TARGET}" - - name: 'Build bootloader in docker' + - name: 'Build the firmware in docker' uses: ./.github/actions/docker with: run: | for TARGET in ${TARGETS} do - make -j$(nproc) -C bootloader TARGET=${TARGET} - done - - - name: 'Build firmware in docker' - uses: ./.github/actions/docker - with: - run: | - for TARGET in ${TARGETS} - do - make -j$(nproc) -C firmware TARGET=${TARGET} - done - - - name: 'Generate full hex file' - if: ${{ !github.event.pull_request.head.repo.fork }} - uses: ./.github/actions/docker - with: - run: | - for TARGET in ${TARGETS} - do - srec_cat \ - bootloader/.obj/${TARGET}/bootloader.hex -Intel \ - firmware/.obj/${TARGET}/firmware.hex -Intel \ - -o firmware/.obj/${TARGET}/full.hex -Intel - done - - - name: 'Generate full dfu file' - if: ${{ !github.event.pull_request.head.repo.fork }} - uses: ./.github/actions/docker - with: - run: | - for TARGET in ${TARGETS} - do - hex2dfu \ - -i firmware/.obj/${TARGET}/full.hex \ - -o artifacts/flipper-z-${TARGET}-full-${{steps.names.outputs.suffix}}.dfu \ - -l "Flipper Zero $(echo $TARGET | tr a-z A-Z)" - done - - - name: 'Generate full json file' - if: ${{ !github.event.pull_request.head.repo.fork }} - uses: ./.github/actions/docker - with: - run: | - for TARGET in ${TARGETS} - do - jq -s '.[0] * .[1]' \ - bootloader/.obj/${TARGET}/bootloader.json \ - firmware/.obj/${TARGET}/firmware.json \ - > artifacts/flipper-z-${TARGET}-full-${{steps.names.outputs.suffix}}.json + make TARGET=${TARGET} done - name: 'Move upload files' @@ -136,52 +89,9 @@ jobs: run: | for TARGET in ${TARGETS} do - mv bootloader/.obj/${TARGET}/bootloader.dfu \ - artifacts/flipper-z-${TARGET}-bootloader-${{steps.names.outputs.suffix}}.dfu - mv bootloader/.obj/${TARGET}/bootloader.bin \ - artifacts/flipper-z-${TARGET}-bootloader-${{steps.names.outputs.suffix}}.bin - mv bootloader/.obj/${TARGET}/bootloader.elf \ - artifacts/flipper-z-${TARGET}-bootloader-${{steps.names.outputs.suffix}}.elf - mv bootloader/.obj/${TARGET}/bootloader.json \ - artifacts/flipper-z-${TARGET}-bootloader-${{steps.names.outputs.suffix}}.json - mv firmware/.obj/${TARGET}/firmware.dfu \ - artifacts/flipper-z-${TARGET}-firmware-${{steps.names.outputs.suffix}}.dfu - mv firmware/.obj/${TARGET}/firmware.bin \ - artifacts/flipper-z-${TARGET}-firmware-${{steps.names.outputs.suffix}}.bin - mv firmware/.obj/${TARGET}/firmware.elf \ - artifacts/flipper-z-${TARGET}-firmware-${{steps.names.outputs.suffix}}.elf - mv firmware/.obj/${TARGET}/firmware.json \ - artifacts/flipper-z-${TARGET}-firmware-${{steps.names.outputs.suffix}}.json + mv dist/${TARGET}/* artifacts/ done - - name: 'Full flash asssembly: bootloader as base' - if: ${{ !github.event.pull_request.head.repo.fork }} - run: | - for TARGET in ${TARGETS} - do - cp \ - artifacts/flipper-z-${TARGET}-bootloader-${{steps.names.outputs.suffix}}.bin \ - artifacts/flipper-z-${TARGET}-full-${{steps.names.outputs.suffix}}.bin - done - - - name: 'Full flash asssembly: bootloader padding' - if: ${{ !github.event.pull_request.head.repo.fork }} - run: | - for TARGET in ${TARGETS} - do - truncate -s 32768 artifacts/flipper-z-${TARGET}-full-${{steps.names.outputs.suffix}}.bin - done - - - name: 'Full flash asssembly: append firmware' - if: ${{ !github.event.pull_request.head.repo.fork }} - run: | - for TARGET in ${TARGETS} - do - cat \ - artifacts/flipper-z-${TARGET}-firmware-${{steps.names.outputs.suffix}}.bin \ - >> artifacts/flipper-z-${TARGET}-full-${{steps.names.outputs.suffix}}.bin - done - - name: 'Bundle core2 firmware' if: ${{ !github.event.pull_request.head.repo.fork }} run: | diff --git a/.gitignore b/.gitignore index b6365639..3b032201 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ __pycache__/ bindings/ .DS_Store .mxproject +Brewfile.lock.json # Visual Studio Code .vscode/ @@ -31,3 +32,6 @@ bindings/ # legendary cmake's build CMakeLists.txt + +# bundle output +dist \ No newline at end of file diff --git a/Brewfile b/Brewfile new file mode 100644 index 00000000..aa88d642 --- /dev/null +++ b/Brewfile @@ -0,0 +1,6 @@ +cask "gcc-arm-embedded" +brew "protobuf" +brew "heatshrink" +brew "open-ocd" +brew "clang-format" +brew "dfu-util" \ No newline at end of file diff --git a/Makefile b/Makefile index c077407c..05a3ae75 100644 --- a/Makefile +++ b/Makefile @@ -10,65 +10,69 @@ else ifeq ($(OS), Darwin) NPROCS := $(shell sysctl -n hw.ncpu) endif +include $(PROJECT_ROOT)/make/defaults.mk + .PHONY: all all: bootloader_all firmware_all + @$(PROJECT_ROOT)/scripts/dist.sh .PHONY: whole whole: flash_radio bootloader_flash firmware_flash .PHONY: clean clean: bootloader_clean firmware_clean + @rm -rf $(PROJECT_ROOT)/dist/$(TARGET) .PHONY: flash flash: bootloader_flash firmware_flash .PHONY: debug debug: - $(MAKE) -C firmware -j$(NPROCS) debug + @$(MAKE) -C firmware -j$(NPROCS) debug .PHONY: blackmagic blackmagic: - $(MAKE) -C firmware -j$(NPROCS) blackmagic + @$(MAKE) -C firmware -j$(NPROCS) blackmagic .PHONY: wipe wipe: - $(PROJECT_ROOT)/scripts/flash.py wipe - $(PROJECT_ROOT)/scripts/ob.py set + @$(PROJECT_ROOT)/scripts/flash.py wipe + @$(PROJECT_ROOT)/scripts/ob.py set .PHONY: bootloader_all bootloader_all: - $(MAKE) -C $(PROJECT_ROOT)/bootloader -j$(NPROCS) all + @$(MAKE) -C $(PROJECT_ROOT)/bootloader -j$(NPROCS) all .PHONY: firmware_all firmware_all: - $(MAKE) -C $(PROJECT_ROOT)/firmware -j$(NPROCS) all + @$(MAKE) -C $(PROJECT_ROOT)/firmware -j$(NPROCS) all .PHONY: bootloader_clean bootloader_clean: - $(MAKE) -C $(PROJECT_ROOT)/bootloader -j$(NPROCS) clean + @$(MAKE) -C $(PROJECT_ROOT)/bootloader -j$(NPROCS) clean .PHONY: firmware_clean firmware_clean: - $(MAKE) -C $(PROJECT_ROOT)/firmware -j$(NPROCS) clean + @$(MAKE) -C $(PROJECT_ROOT)/firmware -j$(NPROCS) clean .PHONY: bootloader_flash bootloader_flash: ifeq ($(FORCE), 1) - rm $(PROJECT_ROOT)/bootloader/.obj/f*/flash || true + @rm $(PROJECT_ROOT)/bootloader/.obj/f*/flash || true endif - $(MAKE) -C $(PROJECT_ROOT)/bootloader -j$(NPROCS) flash + @$(MAKE) -C $(PROJECT_ROOT)/bootloader -j$(NPROCS) flash .PHONY: firmware_flash firmware_flash: ifeq ($(FORCE), 1) - rm $(PROJECT_ROOT)/firmware/.obj/f*/flash || true + @rm $(PROJECT_ROOT)/firmware/.obj/f*/flash || true endif - $(MAKE) -C $(PROJECT_ROOT)/firmware -j$(NPROCS) flash + @$(MAKE) -C $(PROJECT_ROOT)/firmware -j$(NPROCS) flash .PHONY: flash_radio flash_radio: - $(PROJECT_ROOT)/scripts/flash.py core2radio 0x080CA000 $(COPRO_DIR)/stm32wb5x_BLE_Stack_full_fw.bin - $(PROJECT_ROOT)/scripts/ob.py set + @$(PROJECT_ROOT)/scripts/flash.py core2radio 0x080CA000 $(COPRO_DIR)/stm32wb5x_BLE_Stack_full_fw.bin + @$(PROJECT_ROOT)/scripts/ob.py set .PHONY: flash_radio_fus flash_radio_fus: @@ -83,9 +87,9 @@ flash_radio_fus: .PHONY: flash_radio_fus_please_i_m_not_going_to_complain flash_radio_fus_please_i_m_not_going_to_complain: - $(PROJECT_ROOT)/scripts/flash.py core2fus 0x080EC000 --statement=AGREE_TO_LOOSE_FLIPPER_FEATURES_THAT_USES_CRYPTO_ENCLAVE $(COPRO_DIR)/stm32wb5x_FUS_fw_for_fus_0_5_3.bin - $(PROJECT_ROOT)/scripts/flash.py core2fus 0x080EC000 --statement=AGREE_TO_LOOSE_FLIPPER_FEATURES_THAT_USES_CRYPTO_ENCLAVE $(COPRO_DIR)/stm32wb5x_FUS_fw.bin - $(PROJECT_ROOT)/scripts/ob.py set + @$(PROJECT_ROOT)/scripts/flash.py core2fus 0x080EC000 --statement=AGREE_TO_LOOSE_FLIPPER_FEATURES_THAT_USES_CRYPTO_ENCLAVE $(COPRO_DIR)/stm32wb5x_FUS_fw_for_fus_0_5_3.bin + @$(PROJECT_ROOT)/scripts/flash.py core2fus 0x080EC000 --statement=AGREE_TO_LOOSE_FLIPPER_FEATURES_THAT_USES_CRYPTO_ENCLAVE $(COPRO_DIR)/stm32wb5x_FUS_fw.bin + @$(PROJECT_ROOT)/scripts/ob.py set FORMAT_SOURCES = $(shell find applications bootloader core -iname "*.h" -o -iname "*.c" -o -iname "*.cpp") diff --git a/ReadMe.md b/ReadMe.md index 2af12aa6..ccfa2b59 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -55,17 +55,12 @@ One liner: `./flash_core1_main.sh` 3. Run `dfu-util -D full.dfu -a 0` -# Build from source +# Build with Docker ## Prerequisites 1. Install [Docker Engine and Docker Compose](https://www.docker.com/get-started) -2. Clone the repo: - ```sh - git clone https://github.com/flipperdevices/flipperzero-firmware - cd flipperzero-firmware - ``` -3. Prepare the container: +2. Prepare the container: ```sh docker-compose up -d ``` @@ -73,62 +68,71 @@ One liner: `./flash_core1_main.sh` ## Compile everything ```sh -docker-compose exec dev make -j$(nproc) +docker-compose exec dev make ``` +Check `dist/` for build outputs. + +Use **`flipper-z-{target}-full-{suffix}.dfu`** to flash your device. + +# Build on Linux/macOS + +## macOS Prerequisites + +Make sure you have [brew](https://brew.sh) and install all the dependencies: +```sh +brew bundle --verbose +``` + +## Linux Prerequisites + +### gcc-arm-none-eabi + +```sh +toolchain="gcc-arm-none-eabi-10.3-2021.10" +toolchain_package="$toolchain-$(uname -m)-linux" + +wget -P /opt "https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/$toolchain_package.tar.bz2" + +tar xjf /opt/$toolchain_package.tar.bz2 -C /opt +rm /opt/$toolchain_package.tar.bz2 + +for file in /opt/$toolchain/bin/* ; do ln -s "${file}" "/usr/bin/$(basename ${file})" ; done +``` + +### Optional dependencies + +- openocd (debugging/flashing over SWD) +- heatshrink (compiling image assets) +- clang-format (code formatting) +- dfu-util (flashing over USB DFU) +- protobuf (compiling proto sources) + +For example, to install them on Debian, use: +```sh +apt update +apt install openocd clang-format-13 dfu-util protobuf-compiler +``` + +heatshrink has to be compiled [from sources](https://github.com/atomicobject/heatshrink). + +## Compile everything + +```sh +make +``` + +Check `dist/` for build outputs. + +Use **`flipper-z-{target}-full-{suffix}.dfu`** to flash your device. + ## Flash everything +Connect your device via ST-Link and run: ```sh -docker-compose exec dev make -j$(nproc) whole +make whole ``` -## Compile bootloader - -```sh -docker-compose exec dev make -j$(nproc) -C bootloader -``` - -Bootloader compilation results: -* `bootloader/.obj/f7/bootloader.elf` -* `bootloader/.obj/f7/bootloader.hex` -* `bootloader/.obj/f7/bootloader.bin` -* **`bootloader/.obj/f7/bootloader.dfu`** - should be used to flash - -## Compile firmware - -```sh -docker-compose exec dev make -j$(nproc) -C firmware -``` - -Firmware compilation results: -* `firmware/.obj/f7/firmware.elf` -* `firmware/.obj/f7/firmware.hex` -* `firmware/.obj/f7/firmware.bin` -* **`firmware/.obj/f7/firmware.dfu`** - should be used to flash - -## Concatenate bootloader and firmware - -You might want to do this to distribute the firmware as a single file. - -That's exactly how we generate our `full` builds. - -1. Concatenate HEX files: - ```sh - docker-compose exec dev srec_cat \ - bootloader/.obj/f7/bootloader.hex -Intel \ - firmware/.obj/f7/firmware.hex -Intel \ - -o firmware/.obj/f7/full.hex -Intel - ``` -2. Convert HEX to DFU: - ```sh - docker-compose exec dev hex2dfu \ - -i firmware/.obj/f7/full.hex \ - -o firmware/.obj/f7/full.dfu \ - -l "Flipper Zero F7" - ``` - -Finally, you will have **`firmware/.obj/f7/full.dfu`** file that can be distributed and flashed. - # Links * Discord: [flipp.dev/discord](https://flipp.dev/discord) * Website: [flipperzero.one](https://flipperzero.one) @@ -198,4 +202,4 @@ Finally, you will have **`firmware/.obj/f7/full.dfu`** file that can be distribu * toolbox - toolbox of things that we are using but don't place in core * u8g2 - graphics library that we use to draw GUI - make - make helpers -- scripts - supplimentary scripts +- scripts - supplementary scripts diff --git a/bootloader/Makefile b/bootloader/Makefile index 0b216e4e..30b99876 100644 --- a/bootloader/Makefile +++ b/bootloader/Makefile @@ -8,7 +8,7 @@ ASM_SOURCES += $(wildcard src/*.s) C_SOURCES += $(wildcard src/*.c) CPP_SOURCES += $(wildcard src/*.cpp) -TARGET ?= f7 +include $(PROJECT_ROOT)/make/defaults.mk TARGET_DIR = targets/$(TARGET) include $(TARGET_DIR)/target.mk diff --git a/docker/Dockerfile b/docker/Dockerfile index d987d75a..4d9b5fa8 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -8,14 +8,12 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-instal clang-format-12 \ dfu-util \ openocd \ - srecord \ libncurses5 \ python-setuptools \ libpython2.7-dev \ libxml2-dev \ libxslt1-dev \ zlib1g-dev \ - jq \ wget && \ apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* @@ -30,10 +28,6 @@ RUN wget --progress=dot:giga "https://developer.arm.com/-/media/Files/downloads/ RUN wget --progress=dot:giga -O - https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2 && \ pip install --no-cache-dir lxml==4.6.3 -RUN git clone https://github.com/rusdacent/hex2dfu.git && \ - cd hex2dfu && gcc hex2dfu.c ED25519/*.c -o hex2dfu && mv ./hex2dfu /usr/local/bin/hex2dfu && \ - hex2dfu -h - RUN git clone --depth 1 --branch v0.4.1 https://github.com/atomicobject/heatshrink.git && \ cd heatshrink && make && mv ./heatshrink /usr/local/bin/heatshrink diff --git a/firmware/Makefile b/firmware/Makefile index 6e2220b6..e8f3f93a 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -12,7 +12,7 @@ CFLAGS += -I$(PROJECT_ROOT) -Itargets/furi-hal-include CFLAGS += -Werror -Wno-address-of-packed-member CPPFLAGS += -Werror -TARGET ?= f7 +include $(PROJECT_ROOT)/make/defaults.mk TARGET_DIR = targets/$(TARGET) include $(TARGET_DIR)/target.mk diff --git a/make/defaults.mk b/make/defaults.mk new file mode 100644 index 00000000..86e4f03d --- /dev/null +++ b/make/defaults.mk @@ -0,0 +1,2 @@ +TARGET ?= f7 +export TARGET \ No newline at end of file diff --git a/make/git.mk b/make/git.mk index dc990d09..dd8842e8 100644 --- a/make/git.mk +++ b/make/git.mk @@ -2,7 +2,7 @@ GIT_COMMIT := $(shell git rev-parse --short HEAD || echo 'unknown') GIT_BRANCH := $(shell echo $${WORKFLOW_BRANCH_OR_TAG-$$(git rev-parse --abbrev-ref HEAD || echo 'unknown')}) GIT_BRANCH_NUM := $(shell git rev-list --count HEAD || echo 'nan') BUILD_DATE := $(shell date '+%d-%m-%Y' || echo 'unknown') -VERSION := $(shell git describe --tags --abbrev=0 --exact-match || echo 'unknown') +VERSION := $(shell git describe --tags --abbrev=0 --exact-match 2>/dev/null || echo 'unknown') CFLAGS += \ -DGIT_COMMIT=\"$(GIT_COMMIT)\" \ diff --git a/make/rules.mk b/make/rules.mk index 7f4332ab..ca6bcd86 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -33,6 +33,7 @@ CHECK_AND_REINIT_SUBMODULES_SHELL=\ $(info $(shell $(CHECK_AND_REINIT_SUBMODULES_SHELL))) all: $(OBJ_DIR)/$(PROJECT).elf $(OBJ_DIR)/$(PROJECT).hex $(OBJ_DIR)/$(PROJECT).bin $(OBJ_DIR)/$(PROJECT).dfu $(OBJ_DIR)/$(PROJECT).json + @: $(OBJ_DIR)/$(PROJECT).elf: $(OBJECTS) @echo "\tLD\t" $@ @@ -47,27 +48,28 @@ $(OBJ_DIR)/$(PROJECT).bin: $(OBJ_DIR)/$(PROJECT).elf @echo "\tBIN\t" $@ @$(BIN) $< $@ -$(OBJ_DIR)/$(PROJECT).dfu: $(OBJ_DIR)/$(PROJECT).hex +$(OBJ_DIR)/$(PROJECT).dfu: $(OBJ_DIR)/$(PROJECT).bin @echo "\tDFU\t" $@ - @hex2dfu \ - -i $(OBJ_DIR)/$(PROJECT).hex \ + @../scripts/bin2dfu.py \ + -i $(OBJ_DIR)/$(PROJECT).bin \ -o $(OBJ_DIR)/$(PROJECT).dfu \ + -a $(FLASH_ADDRESS) \ -l "Flipper Zero $(shell echo $(TARGET) | tr a-z A-Z)" > /dev/null $(OBJ_DIR)/$(PROJECT).json: $(OBJ_DIR)/$(PROJECT).dfu @echo "\tJSON\t" $@ - @python3 ../scripts/meta.py -p $(PROJECT) $(CFLAGS) > $(OBJ_DIR)/$(PROJECT).json + @../scripts/meta.py generate -p $(PROJECT) $(CFLAGS) > $(OBJ_DIR)/$(PROJECT).json $(OBJ_DIR)/%.o: %.c $(OBJ_DIR)/BUILD_FLAGS - @echo "\tCC\t" $< "->" $@ + @echo "\tCC\t" $(subst $(PROJECT_ROOT)/,,$(realpath $<)) "->" $@ @$(CC) $(CFLAGS) -c $< -o $@ $(OBJ_DIR)/%.o: %.s $(OBJ_DIR)/BUILD_FLAGS - @echo "\tASM\t" $< "->" $@ + @echo "\tASM\t" $(subst $(PROJECT_ROOT)/,,$(realpath $<)) "->" $@ @$(AS) $(CFLAGS) -c $< -o $@ $(OBJ_DIR)/%.o: %.cpp $(OBJ_DIR)/BUILD_FLAGS - @echo "\tCPP\t" $< "->" $@ + @echo "\tCPP\t" $(subst $(PROJECT_ROOT)/,,$(realpath $<)) "->" $@ @$(CPP) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ $(OBJ_DIR)/flash: $(OBJ_DIR)/$(PROJECT).bin diff --git a/scripts/bin2dfu.py b/scripts/bin2dfu.py new file mode 100755 index 00000000..62554f69 --- /dev/null +++ b/scripts/bin2dfu.py @@ -0,0 +1,70 @@ +#!/usr/bin/env python3 + +import os +import struct +from zlib import crc32 + +from flipper.app import App + + +class Main(App): + def init(self): + self.parser.add_argument("-i", "--input", help=".bin input path", required=True) + self.parser.add_argument( + "-o", "--output", help=".dfu output path", required=True + ) + self.parser.add_argument( + "-a", + "--address", + help="Flash address", + type=lambda x: int(x, 0), + required=True, + ) + self.parser.add_argument( + "-l", "--label", help="DFU Target label", required=True + ) + self.parser.add_argument( + "--vid", help="USB Vendor ID", default=0x0483, type=lambda x: int(x, 0) + ) + self.parser.add_argument( + "--pid", help="USB Product ID", default=0xDF11, type=lambda x: int(x, 0) + ) + + self.parser.set_defaults(func=self.convert) + + def convert(self): + if not os.path.exists(self.args.input): + self.logger.error(f'"{self.args.input}" does not exist') + return 1 + + with open(self.args.input, mode="rb") as file: + bin = file.read() + + data = struct.pack(" /dev/null +cat dist/${TARGET}/flipper-z-${TARGET}-firmware-${suffix}.bin \ + >>dist/${TARGET}/flipper-z-${TARGET}-full-${suffix}.bin \ + 2> /dev/null + +# generate full.dfu +./scripts/bin2dfu.py \ + -i dist/${TARGET}/flipper-z-${TARGET}-full-${suffix}.bin \ + -o dist/${TARGET}/flipper-z-${TARGET}-full-${suffix}.dfu \ + -a 0x08000000 \ + -l "Flipper Zero $(echo ${TARGET} | tr a-z A-Z)" + +# generate full.json +./scripts/meta.py merge \ + -i dist/${TARGET}/flipper-z-${TARGET}-bootloader-${suffix}.json \ + dist/${TARGET}/flipper-z-${TARGET}-firmware-${suffix}.json \ + >dist/${TARGET}/flipper-z-${TARGET}-full-${suffix}.json + +echo "Firmware binaries can be found at:" +echo -e "\t$(pwd)/dist/${TARGET}" +echo "Use this file to flash your Flipper:" +echo -e "\tflipper-z-${TARGET}-full-${suffix}.dfu" diff --git a/scripts/flipper/app.py b/scripts/flipper/app.py index eef61a23..5d088ea5 100644 --- a/scripts/flipper/app.py +++ b/scripts/flipper/app.py @@ -15,7 +15,7 @@ class App: self.init() def __call__(self): - self.args = self.parser.parse_args() + self.args, _ = self.parser.parse_known_args() if "func" not in self.args: self.parser.error("Choose something to do") # configure log output diff --git a/scripts/meta.py b/scripts/meta.py old mode 100644 new mode 100755 index 3cb8cb78..1741a4ad --- a/scripts/meta.py +++ b/scripts/meta.py @@ -1,31 +1,58 @@ #!/usr/bin/env python3 -import argparse +from flipper.app import App import json -class Main: - def __init__(self): - # parse CFLAGS - self.parser = argparse.ArgumentParser(allow_abbrev=False) - self.parser.add_argument("-p", dest="project", required=True) - self.parser.add_argument("-DBUILD_DATE", dest="build_date", required=True) - self.parser.add_argument("-DGIT_COMMIT", dest="commit", required=True) - self.parser.add_argument("-DGIT_BRANCH", dest="branch", required=True) - self.parser.add_argument("-DTARGET", dest="target", type=int, required=True) +class Main(App): + def init(self): + self.subparsers = self.parser.add_subparsers(help="sub-command help") - def __call__(self): - self.args, _ = self.parser.parse_known_args() + # generate + self.parser_generate = self.subparsers.add_parser( + "generate", help="Generate JSON meta file" + ) + self.parser_generate.add_argument("-p", dest="project", required=True) + self.parser_generate.add_argument( + "-DBUILD_DATE", dest="build_date", required=True + ) + self.parser_generate.add_argument("-DGIT_COMMIT", dest="commit", required=True) + self.parser_generate.add_argument("-DGIT_BRANCH", dest="branch", required=True) + self.parser_generate.add_argument( + "-DTARGET", dest="target", type=int, required=True + ) + self.parser_generate.set_defaults(func=self.generate) + # merge + self.parser_merge = self.subparsers.add_parser( + "merge", help="Merge JSON meta files" + ) + self.parser_merge.add_argument( + "-i", dest="input", action="append", nargs="+", required=True + ) + self.parser_merge.set_defaults(func=self.merge) + + def generate(self): meta = {} for k, v in vars(self.args).items(): - if k == "project": + if k == "project" or k == "func": continue if isinstance(v, str): v = v.strip('"') meta[self.args.project + "_" + k] = v print(json.dumps(meta, indent=4)) + return 0 + + def merge(self): + full = {} + for path in self.args.input[0]: + with open(path, mode="r") as file: + dict = json.loads(file.read()) + full |= dict + + print(json.dumps(full, indent=4)) + return 0 if __name__ == "__main__": From 013ed64cbbb6ba0a97958a7e7e96bfc667bda176 Mon Sep 17 00:00:00 2001 From: SG Date: Sat, 20 Nov 2021 08:19:31 +1000 Subject: [PATCH 09/11] UART echo app (#831) * HAL: add context to UART IRQ's * Apps: uart echo/log application * Sync api * Another api sync --- applications/applications.c | 5 + applications/applications.mk | 6 + applications/debug_tools/uart_echo.c | 268 ++++++++++++++++++ applications/gpio/usb_uart_bridge.c | 6 +- .../targets/f6/furi-hal/furi-hal-console.c | 2 +- firmware/targets/f6/furi-hal/furi-hal-uart.c | 93 +++--- firmware/targets/f6/furi-hal/furi-hal-uart.h | 54 +++- .../targets/f7/furi-hal/furi-hal-console.c | 22 +- firmware/targets/f7/furi-hal/furi-hal-uart.c | 93 +++--- firmware/targets/f7/furi-hal/furi-hal-uart.h | 56 +++- 10 files changed, 498 insertions(+), 107 deletions(-) create mode 100644 applications/debug_tools/uart_echo.c diff --git a/applications/applications.c b/applications/applications.c index 7cc105bb..fe58e56a 100644 --- a/applications/applications.c +++ b/applications/applications.c @@ -20,6 +20,7 @@ extern int32_t desktop_srv(void* p); extern int32_t accessor_app(void* p); extern int32_t archive_app(void* p); extern int32_t bad_usb_app(void* p); +extern int32_t uart_echo_app(void* p); extern int32_t blink_test_app(void* p); extern int32_t bt_debug_app(void* p); extern int32_t delay_test_app(void* p); @@ -236,6 +237,10 @@ const FlipperApplication FLIPPER_DEBUG_APPS[] = { {.app = bad_usb_app, .name = "Bad USB test", .stack_size = 2048, .icon = NULL}, #endif +#ifdef APP_UART_ECHO + {.app = uart_echo_app, .name = "Uart Echo", .stack_size = 2048, .icon = NULL}, +#endif + #ifdef APP_IRDA_MONITOR {.app = irda_monitor_app, .name = "Irda Monitor", .stack_size = 1024, .icon = NULL}, #endif diff --git a/applications/applications.mk b/applications/applications.mk index 4f0a5a67..9f87c6c3 100644 --- a/applications/applications.mk +++ b/applications/applications.mk @@ -48,6 +48,7 @@ APP_DISPLAY_TEST = 1 APP_USB_MOUSE = 1 APP_BAD_USB = 1 +APP_UART_ECHO = 1 endif @@ -132,6 +133,11 @@ CFLAGS += -DAPP_USB_TEST SRV_GUI = 1 endif +APP_UART_ECHO ?= 0 +ifeq ($(APP_UART_ECHO), 1) +CFLAGS += -DAPP_UART_ECHO +SRV_GUI = 1 +endif APP_DISPLAY_TEST ?= 0 ifeq ($(APP_DISPLAY_TEST), 1) diff --git a/applications/debug_tools/uart_echo.c b/applications/debug_tools/uart_echo.c new file mode 100644 index 00000000..feff06e7 --- /dev/null +++ b/applications/debug_tools/uart_echo.c @@ -0,0 +1,268 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define LINES_ON_SCREEN 6 +#define COLUMNS_ON_SCREEN 21 + +typedef struct UartDumpModel UartDumpModel; + +typedef struct { + Gui* gui; + NotificationApp* notification; + ViewDispatcher* view_dispatcher; + View* view; + FuriThread* worker_thread; + StreamBufferHandle_t rx_stream; +} UartEchoApp; + +typedef struct { + string_t text; +} ListElement; + +struct UartDumpModel { + ListElement* list[LINES_ON_SCREEN]; + uint8_t line; + + char last_char; + bool escape; +}; + +typedef enum { + WorkerEventReserved = (1 << 0), // Reserved for StreamBuffer internal event + WorkerEventStop = (1 << 1), + WorkerEventRx = (1 << 2), +} WorkerEventFlags; + +#define WORKER_EVENTS_MASK (WorkerEventStop | WorkerEventRx) + +const NotificationSequence sequence_notification = { + &message_display_on, + &message_green_255, + &message_delay_10, + NULL, +}; + +static void uart_echo_view_draw_callback(Canvas* canvas, void* _model) { + UartDumpModel* model = _model; + + // Prepare canvas + canvas_clear(canvas); + canvas_set_color(canvas, ColorBlack); + canvas_set_font(canvas, FontKeyboard); + + for(size_t i = 0; i < LINES_ON_SCREEN; i++) { + canvas_draw_str( + canvas, + 0, + (i + 1) * (canvas_current_font_height(canvas) - 1), + string_get_cstr(model->list[i]->text)); + + if(i == model->line) { + uint8_t width = canvas_string_width(canvas, string_get_cstr(model->list[i]->text)); + + canvas_draw_box( + canvas, + width, + (i) * (canvas_current_font_height(canvas) - 1) + 2, + 2, + canvas_current_font_height(canvas) - 2); + } + } +} + +static bool uart_echo_view_input_callback(InputEvent* event, void* context) { + bool consumed = false; + return consumed; +} + +static uint32_t uart_echo_exit(void* context) { + return VIEW_NONE; +} + +static void uart_echo_on_irq_cb(UartIrqEvent ev, uint8_t data, void* context) { + furi_assert(context); + BaseType_t xHigherPriorityTaskWoken = pdFALSE; + UartEchoApp* app = context; + + if(ev == UartIrqEventRXNE) { + xStreamBufferSendFromISR(app->rx_stream, &data, 1, &xHigherPriorityTaskWoken); + osThreadFlagsSet(furi_thread_get_thread_id(app->worker_thread), WorkerEventRx); + portYIELD_FROM_ISR(xHigherPriorityTaskWoken); + } +} + +static void uart_echo_push_to_list(UartDumpModel* model, const char data) { + if(model->escape) { + // escape code end with letter + if((data >= 'a' && data <= 'z') || (data >= 'A' && data <= 'Z')) { + model->escape = false; + } + } else if(data == '[' && model->last_char == '\e') { + // "Esc[" is a escape code + model->escape = true; + } else if((data >= ' ' && data <= '~') || (data == '\n' || data == '\r')) { + bool new_string_needed = false; + if(string_size(model->list[model->line]->text) >= COLUMNS_ON_SCREEN) { + new_string_needed = true; + } else if((data == '\n' || data == '\r')) { + // pack line breaks + if(model->last_char != '\n' && model->last_char != '\r') { + new_string_needed = true; + } + } + + if(new_string_needed) { + if((model->line + 1) < LINES_ON_SCREEN) { + model->line += 1; + } else { + ListElement* first = model->list[0]; + + for(size_t i = 1; i < LINES_ON_SCREEN; i++) { + model->list[i - 1] = model->list[i]; + } + + string_reset(first->text); + model->list[model->line] = first; + } + } + + if(data != '\n' && data != '\r') { + string_push_back(model->list[model->line]->text, data); + } + } + model->last_char = data; +} + +static int32_t uart_echo_worker(void* context) { + furi_assert(context); + UartEchoApp* app = context; + + while(1) { + uint32_t events = osThreadFlagsWait(WORKER_EVENTS_MASK, osFlagsWaitAny, osWaitForever); + furi_check((events & osFlagsError) == 0); + + if(events & WorkerEventStop) break; + if(events & WorkerEventRx) { + size_t length = 0; + do { + uint8_t data[64]; + length = xStreamBufferReceive(app->rx_stream, data, 64, 0); + if(length > 0) { + furi_hal_uart_tx(FuriHalUartIdUSART1, data, length); + with_view_model( + app->view, (UartDumpModel * model) { + for(size_t i = 0; i < length; i++) { + uart_echo_push_to_list(model, data[i]); + } + return false; + }); + } + } while(length > 0); + + notification_message(app->notification, &sequence_notification); + with_view_model( + app->view, (UartDumpModel * model) { return true; }); + } + } + + return 0; +} + +static UartEchoApp* uart_echo_app_alloc() { + UartEchoApp* app = furi_alloc(sizeof(UartEchoApp)); + + app->rx_stream = xStreamBufferCreate(2048, 1); + + // Gui + app->gui = furi_record_open("gui"); + app->notification = furi_record_open("notification"); + + // View dispatcher + app->view_dispatcher = view_dispatcher_alloc(); + view_dispatcher_enable_queue(app->view_dispatcher); + view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen); + + // Views + app->view = view_alloc(); + view_set_draw_callback(app->view, uart_echo_view_draw_callback); + view_set_input_callback(app->view, uart_echo_view_input_callback); + view_allocate_model(app->view, ViewModelTypeLocking, sizeof(UartDumpModel)); + with_view_model( + app->view, (UartDumpModel * model) { + for(size_t i = 0; i < LINES_ON_SCREEN; i++) { + model->line = 0; + model->escape = false; + model->list[i] = furi_alloc(sizeof(ListElement)); + string_init(model->list[i]->text); + } + return true; + }); + + view_set_previous_callback(app->view, uart_echo_exit); + view_dispatcher_add_view(app->view_dispatcher, 0, app->view); + view_dispatcher_switch_to_view(app->view_dispatcher, 0); + + // Enable uart listener + furi_hal_console_disable(); + furi_hal_uart_set_br(FuriHalUartIdUSART1, 115200); + furi_hal_uart_set_irq_cb(FuriHalUartIdUSART1, uart_echo_on_irq_cb, app); + + app->worker_thread = furi_thread_alloc(); + furi_thread_set_name(app->worker_thread, "UsbUartWorker"); + furi_thread_set_stack_size(app->worker_thread, 1024); + furi_thread_set_context(app->worker_thread, app); + furi_thread_set_callback(app->worker_thread, uart_echo_worker); + furi_thread_start(app->worker_thread); + + return app; +} + +static void uart_echo_app_free(UartEchoApp* app) { + furi_assert(app); + + osThreadFlagsSet(furi_thread_get_thread_id(app->worker_thread), WorkerEventStop); + furi_thread_join(app->worker_thread); + furi_thread_free(app->worker_thread); + + furi_hal_console_enable(); + + // Free views + view_dispatcher_remove_view(app->view_dispatcher, 0); + + with_view_model( + app->view, (UartDumpModel * model) { + for(size_t i = 0; i < LINES_ON_SCREEN; i++) { + string_clear(model->list[i]->text); + free(model->list[i]); + } + return true; + }); + view_free(app->view); + view_dispatcher_free(app->view_dispatcher); + + // Close gui record + furi_record_close("gui"); + furi_record_close("notification"); + app->gui = NULL; + + vStreamBufferDelete(app->rx_stream); + + // Free rest + free(app); +} + +int32_t uart_echo_app(void* p) { + UartEchoApp* app = uart_echo_app_alloc(); + view_dispatcher_run(app->view_dispatcher); + uart_echo_app_free(app); + return 0; +} \ No newline at end of file diff --git a/applications/gpio/usb_uart_bridge.c b/applications/gpio/usb_uart_bridge.c index 9b43f643..99fe62eb 100644 --- a/applications/gpio/usb_uart_bridge.c +++ b/applications/gpio/usb_uart_bridge.c @@ -57,7 +57,7 @@ static CdcCallbacks cdc_cb = { static int32_t usb_uart_tx_thread(void* context); -static void usb_uart_on_irq_cb(UartIrqEvent ev, uint8_t data) { +static void usb_uart_on_irq_cb(UartIrqEvent ev, uint8_t data, void* context) { BaseType_t xHigherPriorityTaskWoken = pdFALSE; if(ev == UartIrqEventRXNE) { @@ -94,10 +94,10 @@ static int32_t usb_uart_worker(void* context) { furi_hal_console_disable(); } else if(usb_uart->cfg.uart_ch == FuriHalUartIdLPUART1) { furi_hal_uart_init(usb_uart->cfg.uart_ch, 115200); - furi_hal_uart_set_irq_cb(usb_uart->cfg.uart_ch, usb_uart_on_irq_cb); + furi_hal_uart_set_irq_cb(usb_uart->cfg.uart_ch, usb_uart_on_irq_cb, NULL); } - furi_hal_uart_set_irq_cb(usb_uart->cfg.uart_ch, usb_uart_on_irq_cb); + furi_hal_uart_set_irq_cb(usb_uart->cfg.uart_ch, usb_uart_on_irq_cb, NULL); if(usb_uart->cfg.baudrate != 0) furi_hal_uart_set_br(usb_uart->cfg.uart_ch, usb_uart->cfg.baudrate); else diff --git a/firmware/targets/f6/furi-hal/furi-hal-console.c b/firmware/targets/f6/furi-hal/furi-hal-console.c index 993b498e..a0b0083b 100644 --- a/firmware/targets/f6/furi-hal/furi-hal-console.c +++ b/firmware/targets/f6/furi-hal/furi-hal-console.c @@ -24,7 +24,7 @@ void furi_hal_console_init() { } void furi_hal_console_enable() { - furi_hal_uart_set_irq_cb(FuriHalUartIdUSART1, NULL); + furi_hal_uart_set_irq_cb(FuriHalUartIdUSART1, NULL, NULL); while (!LL_USART_IsActiveFlag_TC(USART1)); furi_hal_uart_set_br(FuriHalUartIdUSART1, CONSOLE_BAUDRATE); furi_hal_console_alive = true; diff --git a/firmware/targets/f6/furi-hal/furi-hal-uart.c b/firmware/targets/f6/furi-hal/furi-hal-uart.c index ff5a056b..92942a91 100644 --- a/firmware/targets/f6/furi-hal/furi-hal-uart.c +++ b/firmware/targets/f6/furi-hal/furi-hal-uart.c @@ -6,7 +6,8 @@ #include -static void (*irq_cb[2])(uint8_t ev, uint8_t data); +static void (*irq_cb[2])(uint8_t ev, uint8_t data, void* context); +static void* irq_ctx[2]; static void furi_hal_usart_init(uint32_t baud) { hal_gpio_init_ex( @@ -38,7 +39,8 @@ static void furi_hal_usart_init(uint32_t baud) { LL_USART_Enable(USART1); - while(!LL_USART_IsActiveFlag_TEACK(USART1)); + while(!LL_USART_IsActiveFlag_TEACK(USART1)) + ; LL_USART_EnableIT_RXNE_RXFNE(USART1); LL_USART_EnableIT_IDLE(USART1); @@ -74,7 +76,8 @@ static void furi_hal_lpuart_init(uint32_t baud) { LL_LPUART_Enable(LPUART1); - while((!(LL_LPUART_IsActiveFlag_TEACK(LPUART1))) || (!(LL_LPUART_IsActiveFlag_REACK(LPUART1)))); + while((!(LL_LPUART_IsActiveFlag_TEACK(LPUART1))) || (!(LL_LPUART_IsActiveFlag_REACK(LPUART1)))) + ; furi_hal_uart_set_br(FuriHalUartIdLPUART1, baud); @@ -84,29 +87,32 @@ static void furi_hal_lpuart_init(uint32_t baud) { } void furi_hal_uart_init(FuriHalUartId ch, uint32_t baud) { - if (ch == FuriHalUartIdLPUART1) + if(ch == FuriHalUartIdLPUART1) furi_hal_lpuart_init(baud); - else if (ch == FuriHalUartIdUSART1) + else if(ch == FuriHalUartIdUSART1) furi_hal_usart_init(baud); } void furi_hal_uart_set_br(FuriHalUartId ch, uint32_t baud) { - if (ch == FuriHalUartIdUSART1) { - if (LL_USART_IsEnabled(USART1)) { + if(ch == FuriHalUartIdUSART1) { + if(LL_USART_IsEnabled(USART1)) { // Wait for transfer complete flag - while (!LL_USART_IsActiveFlag_TC(USART1)); + while(!LL_USART_IsActiveFlag_TC(USART1)) + ; LL_USART_Disable(USART1); uint32_t uartclk = LL_RCC_GetUSARTClockFreq(LL_RCC_USART1_CLKSOURCE); - LL_USART_SetBaudRate(USART1, uartclk, LL_USART_PRESCALER_DIV1, LL_USART_OVERSAMPLING_16, baud); + LL_USART_SetBaudRate( + USART1, uartclk, LL_USART_PRESCALER_DIV1, LL_USART_OVERSAMPLING_16, baud); LL_USART_Enable(USART1); } - } else if (ch == FuriHalUartIdLPUART1) { - if (LL_LPUART_IsEnabled(LPUART1)) { + } else if(ch == FuriHalUartIdLPUART1) { + if(LL_LPUART_IsEnabled(LPUART1)) { // Wait for transfer complete flag - while (!LL_LPUART_IsActiveFlag_TC(LPUART1)); + while(!LL_LPUART_IsActiveFlag_TC(LPUART1)) + ; LL_LPUART_Disable(LPUART1); uint32_t uartclk = LL_RCC_GetLPUARTClockFreq(LL_RCC_LPUART1_CLKSOURCE); - if (uartclk/baud > 4095) { + if(uartclk / baud > 4095) { LL_LPUART_SetPrescaler(LPUART1, LL_LPUART_PRESCALER_DIV32); LL_LPUART_SetBaudRate(LPUART1, uartclk, LL_LPUART_PRESCALER_DIV32, baud); } else { @@ -119,12 +125,12 @@ void furi_hal_uart_set_br(FuriHalUartId ch, uint32_t baud) { } void furi_hal_uart_deinit(FuriHalUartId ch) { - furi_hal_uart_set_irq_cb(ch, NULL); - if (ch == FuriHalUartIdUSART1) { + furi_hal_uart_set_irq_cb(ch, NULL, NULL); + if(ch == FuriHalUartIdUSART1) { LL_USART_Disable(USART1); hal_gpio_init(&gpio_usart_tx, GpioModeAnalog, GpioPullNo, GpioSpeedLow); hal_gpio_init(&gpio_usart_rx, GpioModeAnalog, GpioPullNo, GpioSpeedLow); - } else if (ch == FuriHalUartIdLPUART1) { + } else if(ch == FuriHalUartIdLPUART1) { LL_LPUART_Disable(LPUART1); hal_gpio_init(&gpio_ext_pc0, GpioModeAnalog, GpioPullNo, GpioSpeedLow); hal_gpio_init(&gpio_ext_pc1, GpioModeAnalog, GpioPullNo, GpioSpeedLow); @@ -132,70 +138,75 @@ void furi_hal_uart_deinit(FuriHalUartId ch) { } void furi_hal_uart_tx(FuriHalUartId ch, uint8_t* buffer, size_t buffer_size) { - if (ch == FuriHalUartIdUSART1) { - if (LL_USART_IsEnabled(USART1) == 0) - return; + if(ch == FuriHalUartIdUSART1) { + if(LL_USART_IsEnabled(USART1) == 0) return; while(buffer_size > 0) { - while (!LL_USART_IsActiveFlag_TXE(USART1)); + while(!LL_USART_IsActiveFlag_TXE(USART1)) + ; LL_USART_TransmitData8(USART1, *buffer); buffer++; buffer_size--; } - } else if (ch == FuriHalUartIdLPUART1) { - if (LL_LPUART_IsEnabled(LPUART1) == 0) - return; + } else if(ch == FuriHalUartIdLPUART1) { + if(LL_LPUART_IsEnabled(LPUART1) == 0) return; while(buffer_size > 0) { - while (!LL_LPUART_IsActiveFlag_TXE(LPUART1)); + while(!LL_LPUART_IsActiveFlag_TXE(LPUART1)) + ; LL_LPUART_TransmitData8(LPUART1, *buffer); - + buffer++; buffer_size--; } } } -void furi_hal_uart_set_irq_cb(FuriHalUartId ch, void (*cb)(UartIrqEvent ev, uint8_t data)) { - if (cb == NULL) { - if (ch == FuriHalUartIdUSART1) +void furi_hal_uart_set_irq_cb( + FuriHalUartId ch, + void (*cb)(UartIrqEvent ev, uint8_t data, void* ctx), + void* ctx) { + if(cb == NULL) { + if(ch == FuriHalUartIdUSART1) NVIC_DisableIRQ(USART1_IRQn); - else if (ch == FuriHalUartIdLPUART1) + else if(ch == FuriHalUartIdLPUART1) NVIC_DisableIRQ(LPUART1_IRQn); irq_cb[ch] = cb; + irq_ctx[ch] = ctx; } else { + irq_ctx[ch] = ctx; irq_cb[ch] = cb; - if (ch == FuriHalUartIdUSART1) + if(ch == FuriHalUartIdUSART1) NVIC_EnableIRQ(USART1_IRQn); - else if (ch == FuriHalUartIdLPUART1) + else if(ch == FuriHalUartIdLPUART1) NVIC_EnableIRQ(LPUART1_IRQn); } } void LPUART1_IRQHandler(void) { - if (LL_LPUART_IsActiveFlag_RXNE_RXFNE(LPUART1)) { + if(LL_LPUART_IsActiveFlag_RXNE_RXFNE(LPUART1)) { uint8_t data = LL_LPUART_ReceiveData8(LPUART1); - irq_cb[FuriHalUartIdLPUART1](UartIrqEventRXNE, data); - } else if (LL_LPUART_IsActiveFlag_IDLE(LPUART1)) { - irq_cb[FuriHalUartIdLPUART1](UartIrqEventIDLE, 0); + irq_cb[FuriHalUartIdLPUART1](UartIrqEventRXNE, data, irq_ctx[FuriHalUartIdLPUART1]); + } else if(LL_LPUART_IsActiveFlag_IDLE(LPUART1)) { + irq_cb[FuriHalUartIdLPUART1](UartIrqEventIDLE, 0, irq_ctx[FuriHalUartIdLPUART1]); LL_LPUART_ClearFlag_IDLE(LPUART1); - } else if (LL_LPUART_IsActiveFlag_ORE(LPUART1)) { + } else if(LL_LPUART_IsActiveFlag_ORE(LPUART1)) { LL_LPUART_ClearFlag_ORE(LPUART1); } //TODO: more events } void USART1_IRQHandler(void) { - if (LL_USART_IsActiveFlag_RXNE_RXFNE(USART1)) { + if(LL_USART_IsActiveFlag_RXNE_RXFNE(USART1)) { uint8_t data = LL_USART_ReceiveData8(USART1); - irq_cb[FuriHalUartIdUSART1](UartIrqEventRXNE, data); - } else if (LL_USART_IsActiveFlag_IDLE(USART1)) { - irq_cb[FuriHalUartIdUSART1](UartIrqEventIDLE, 0); + irq_cb[FuriHalUartIdUSART1](UartIrqEventRXNE, data, irq_ctx[FuriHalUartIdUSART1]); + } else if(LL_USART_IsActiveFlag_IDLE(USART1)) { + irq_cb[FuriHalUartIdUSART1](UartIrqEventIDLE, 0, irq_ctx[FuriHalUartIdUSART1]); LL_USART_ClearFlag_IDLE(USART1); - } else if (LL_USART_IsActiveFlag_ORE(USART1)) { + } else if(LL_USART_IsActiveFlag_ORE(USART1)) { LL_USART_ClearFlag_ORE(USART1); } } diff --git a/firmware/targets/f6/furi-hal/furi-hal-uart.h b/firmware/targets/f6/furi-hal/furi-hal-uart.h index 731a12a2..f245c484 100644 --- a/firmware/targets/f6/furi-hal/furi-hal-uart.h +++ b/firmware/targets/f6/furi-hal/furi-hal-uart.h @@ -1,3 +1,10 @@ +/** + * @file furi-hal-uart.h + * @version 1.0 + * @date 2021-11-19 + * + * UART HAL api interface + */ #pragma once #include @@ -7,26 +14,63 @@ extern "C" { #endif +/** + * UART channels + */ typedef enum { FuriHalUartIdUSART1, FuriHalUartIdLPUART1, } FuriHalUartId; +/** + * UART events + */ typedef enum { UartIrqEventRXNE, UartIrqEventIDLE, //TODO: more events } UartIrqEvent; -void furi_hal_uart_init(FuriHalUartId ch, uint32_t baud); +/** + * Init UART + * Configures GPIO to UART function, сonfigures UART hardware, enables UART hardware + * @param channel UART channel + * @param baud baudrate + */ +void furi_hal_uart_init(FuriHalUartId channel, uint32_t baud); -void furi_hal_uart_deinit(FuriHalUartId ch); +/** + * Deinit UART + * Configures GPIO to analog, clears callback and callback context, disables UART hardware + * @param channel UART channel + */ +void furi_hal_uart_deinit(FuriHalUartId channel); -void furi_hal_uart_set_br(FuriHalUartId ch, uint32_t baud); +/** + * Changes UART baudrate + * @param channel UART channel + * @param baud baudrate + */ +void furi_hal_uart_set_br(FuriHalUartId channel, uint32_t baud); -void furi_hal_uart_tx(FuriHalUartId ch, uint8_t* buffer, size_t buffer_size); +/** + * Transmits data + * @param channel UART channel + * @param buffer data + * @param buffer_size data size (in bytes) + */ +void furi_hal_uart_tx(FuriHalUartId channel, uint8_t* buffer, size_t buffer_size); -void furi_hal_uart_set_irq_cb(FuriHalUartId ch, void (*cb)(UartIrqEvent ev, uint8_t data)); +/** + * Sets UART event callback + * @param channel UART channel + * @param callback callback pointer + * @param context callback context + */ +void furi_hal_uart_set_irq_cb( + FuriHalUartId channel, + void (*callback)(UartIrqEvent event, uint8_t data, void* context), + void* context); #ifdef __cplusplus } diff --git a/firmware/targets/f7/furi-hal/furi-hal-console.c b/firmware/targets/f7/furi-hal/furi-hal-console.c index 993b498e..66ff40ee 100644 --- a/firmware/targets/f7/furi-hal/furi-hal-console.c +++ b/firmware/targets/f7/furi-hal/furi-hal-console.c @@ -24,32 +24,33 @@ void furi_hal_console_init() { } void furi_hal_console_enable() { - furi_hal_uart_set_irq_cb(FuriHalUartIdUSART1, NULL); - while (!LL_USART_IsActiveFlag_TC(USART1)); + furi_hal_uart_set_irq_cb(FuriHalUartIdUSART1, NULL, NULL); + while(!LL_USART_IsActiveFlag_TC(USART1)) + ; furi_hal_uart_set_br(FuriHalUartIdUSART1, CONSOLE_BAUDRATE); furi_hal_console_alive = true; } void furi_hal_console_disable() { - while (!LL_USART_IsActiveFlag_TC(USART1)); + while(!LL_USART_IsActiveFlag_TC(USART1)) + ; furi_hal_console_alive = false; } void furi_hal_console_tx(const uint8_t* buffer, size_t buffer_size) { - if (!furi_hal_console_alive) - return; + if(!furi_hal_console_alive) return; UTILS_ENTER_CRITICAL_SECTION(); // Transmit data furi_hal_uart_tx(FuriHalUartIdUSART1, (uint8_t*)buffer, buffer_size); // Wait for TC flag to be raised for last char - while (!LL_USART_IsActiveFlag_TC(USART1)); + while(!LL_USART_IsActiveFlag_TC(USART1)) + ; UTILS_EXIT_CRITICAL_SECTION(); } void furi_hal_console_tx_with_new_line(const uint8_t* buffer, size_t buffer_size) { - if (!furi_hal_console_alive) - return; + if(!furi_hal_console_alive) return; UTILS_ENTER_CRITICAL_SECTION(); // Transmit data @@ -57,7 +58,8 @@ void furi_hal_console_tx_with_new_line(const uint8_t* buffer, size_t buffer_size // Transmit new line symbols furi_hal_uart_tx(FuriHalUartIdUSART1, (uint8_t*)"\r\n", 2); // Wait for TC flag to be raised for last char - while (!LL_USART_IsActiveFlag_TC(USART1)); + while(!LL_USART_IsActiveFlag_TC(USART1)) + ; UTILS_EXIT_CRITICAL_SECTION(); } @@ -71,6 +73,6 @@ void furi_hal_console_printf(const char format[], ...) { string_clear(string); } -void furi_hal_console_puts(const char *data) { +void furi_hal_console_puts(const char* data) { furi_hal_console_tx((const uint8_t*)data, strlen(data)); } diff --git a/firmware/targets/f7/furi-hal/furi-hal-uart.c b/firmware/targets/f7/furi-hal/furi-hal-uart.c index ff5a056b..92942a91 100644 --- a/firmware/targets/f7/furi-hal/furi-hal-uart.c +++ b/firmware/targets/f7/furi-hal/furi-hal-uart.c @@ -6,7 +6,8 @@ #include -static void (*irq_cb[2])(uint8_t ev, uint8_t data); +static void (*irq_cb[2])(uint8_t ev, uint8_t data, void* context); +static void* irq_ctx[2]; static void furi_hal_usart_init(uint32_t baud) { hal_gpio_init_ex( @@ -38,7 +39,8 @@ static void furi_hal_usart_init(uint32_t baud) { LL_USART_Enable(USART1); - while(!LL_USART_IsActiveFlag_TEACK(USART1)); + while(!LL_USART_IsActiveFlag_TEACK(USART1)) + ; LL_USART_EnableIT_RXNE_RXFNE(USART1); LL_USART_EnableIT_IDLE(USART1); @@ -74,7 +76,8 @@ static void furi_hal_lpuart_init(uint32_t baud) { LL_LPUART_Enable(LPUART1); - while((!(LL_LPUART_IsActiveFlag_TEACK(LPUART1))) || (!(LL_LPUART_IsActiveFlag_REACK(LPUART1)))); + while((!(LL_LPUART_IsActiveFlag_TEACK(LPUART1))) || (!(LL_LPUART_IsActiveFlag_REACK(LPUART1)))) + ; furi_hal_uart_set_br(FuriHalUartIdLPUART1, baud); @@ -84,29 +87,32 @@ static void furi_hal_lpuart_init(uint32_t baud) { } void furi_hal_uart_init(FuriHalUartId ch, uint32_t baud) { - if (ch == FuriHalUartIdLPUART1) + if(ch == FuriHalUartIdLPUART1) furi_hal_lpuart_init(baud); - else if (ch == FuriHalUartIdUSART1) + else if(ch == FuriHalUartIdUSART1) furi_hal_usart_init(baud); } void furi_hal_uart_set_br(FuriHalUartId ch, uint32_t baud) { - if (ch == FuriHalUartIdUSART1) { - if (LL_USART_IsEnabled(USART1)) { + if(ch == FuriHalUartIdUSART1) { + if(LL_USART_IsEnabled(USART1)) { // Wait for transfer complete flag - while (!LL_USART_IsActiveFlag_TC(USART1)); + while(!LL_USART_IsActiveFlag_TC(USART1)) + ; LL_USART_Disable(USART1); uint32_t uartclk = LL_RCC_GetUSARTClockFreq(LL_RCC_USART1_CLKSOURCE); - LL_USART_SetBaudRate(USART1, uartclk, LL_USART_PRESCALER_DIV1, LL_USART_OVERSAMPLING_16, baud); + LL_USART_SetBaudRate( + USART1, uartclk, LL_USART_PRESCALER_DIV1, LL_USART_OVERSAMPLING_16, baud); LL_USART_Enable(USART1); } - } else if (ch == FuriHalUartIdLPUART1) { - if (LL_LPUART_IsEnabled(LPUART1)) { + } else if(ch == FuriHalUartIdLPUART1) { + if(LL_LPUART_IsEnabled(LPUART1)) { // Wait for transfer complete flag - while (!LL_LPUART_IsActiveFlag_TC(LPUART1)); + while(!LL_LPUART_IsActiveFlag_TC(LPUART1)) + ; LL_LPUART_Disable(LPUART1); uint32_t uartclk = LL_RCC_GetLPUARTClockFreq(LL_RCC_LPUART1_CLKSOURCE); - if (uartclk/baud > 4095) { + if(uartclk / baud > 4095) { LL_LPUART_SetPrescaler(LPUART1, LL_LPUART_PRESCALER_DIV32); LL_LPUART_SetBaudRate(LPUART1, uartclk, LL_LPUART_PRESCALER_DIV32, baud); } else { @@ -119,12 +125,12 @@ void furi_hal_uart_set_br(FuriHalUartId ch, uint32_t baud) { } void furi_hal_uart_deinit(FuriHalUartId ch) { - furi_hal_uart_set_irq_cb(ch, NULL); - if (ch == FuriHalUartIdUSART1) { + furi_hal_uart_set_irq_cb(ch, NULL, NULL); + if(ch == FuriHalUartIdUSART1) { LL_USART_Disable(USART1); hal_gpio_init(&gpio_usart_tx, GpioModeAnalog, GpioPullNo, GpioSpeedLow); hal_gpio_init(&gpio_usart_rx, GpioModeAnalog, GpioPullNo, GpioSpeedLow); - } else if (ch == FuriHalUartIdLPUART1) { + } else if(ch == FuriHalUartIdLPUART1) { LL_LPUART_Disable(LPUART1); hal_gpio_init(&gpio_ext_pc0, GpioModeAnalog, GpioPullNo, GpioSpeedLow); hal_gpio_init(&gpio_ext_pc1, GpioModeAnalog, GpioPullNo, GpioSpeedLow); @@ -132,70 +138,75 @@ void furi_hal_uart_deinit(FuriHalUartId ch) { } void furi_hal_uart_tx(FuriHalUartId ch, uint8_t* buffer, size_t buffer_size) { - if (ch == FuriHalUartIdUSART1) { - if (LL_USART_IsEnabled(USART1) == 0) - return; + if(ch == FuriHalUartIdUSART1) { + if(LL_USART_IsEnabled(USART1) == 0) return; while(buffer_size > 0) { - while (!LL_USART_IsActiveFlag_TXE(USART1)); + while(!LL_USART_IsActiveFlag_TXE(USART1)) + ; LL_USART_TransmitData8(USART1, *buffer); buffer++; buffer_size--; } - } else if (ch == FuriHalUartIdLPUART1) { - if (LL_LPUART_IsEnabled(LPUART1) == 0) - return; + } else if(ch == FuriHalUartIdLPUART1) { + if(LL_LPUART_IsEnabled(LPUART1) == 0) return; while(buffer_size > 0) { - while (!LL_LPUART_IsActiveFlag_TXE(LPUART1)); + while(!LL_LPUART_IsActiveFlag_TXE(LPUART1)) + ; LL_LPUART_TransmitData8(LPUART1, *buffer); - + buffer++; buffer_size--; } } } -void furi_hal_uart_set_irq_cb(FuriHalUartId ch, void (*cb)(UartIrqEvent ev, uint8_t data)) { - if (cb == NULL) { - if (ch == FuriHalUartIdUSART1) +void furi_hal_uart_set_irq_cb( + FuriHalUartId ch, + void (*cb)(UartIrqEvent ev, uint8_t data, void* ctx), + void* ctx) { + if(cb == NULL) { + if(ch == FuriHalUartIdUSART1) NVIC_DisableIRQ(USART1_IRQn); - else if (ch == FuriHalUartIdLPUART1) + else if(ch == FuriHalUartIdLPUART1) NVIC_DisableIRQ(LPUART1_IRQn); irq_cb[ch] = cb; + irq_ctx[ch] = ctx; } else { + irq_ctx[ch] = ctx; irq_cb[ch] = cb; - if (ch == FuriHalUartIdUSART1) + if(ch == FuriHalUartIdUSART1) NVIC_EnableIRQ(USART1_IRQn); - else if (ch == FuriHalUartIdLPUART1) + else if(ch == FuriHalUartIdLPUART1) NVIC_EnableIRQ(LPUART1_IRQn); } } void LPUART1_IRQHandler(void) { - if (LL_LPUART_IsActiveFlag_RXNE_RXFNE(LPUART1)) { + if(LL_LPUART_IsActiveFlag_RXNE_RXFNE(LPUART1)) { uint8_t data = LL_LPUART_ReceiveData8(LPUART1); - irq_cb[FuriHalUartIdLPUART1](UartIrqEventRXNE, data); - } else if (LL_LPUART_IsActiveFlag_IDLE(LPUART1)) { - irq_cb[FuriHalUartIdLPUART1](UartIrqEventIDLE, 0); + irq_cb[FuriHalUartIdLPUART1](UartIrqEventRXNE, data, irq_ctx[FuriHalUartIdLPUART1]); + } else if(LL_LPUART_IsActiveFlag_IDLE(LPUART1)) { + irq_cb[FuriHalUartIdLPUART1](UartIrqEventIDLE, 0, irq_ctx[FuriHalUartIdLPUART1]); LL_LPUART_ClearFlag_IDLE(LPUART1); - } else if (LL_LPUART_IsActiveFlag_ORE(LPUART1)) { + } else if(LL_LPUART_IsActiveFlag_ORE(LPUART1)) { LL_LPUART_ClearFlag_ORE(LPUART1); } //TODO: more events } void USART1_IRQHandler(void) { - if (LL_USART_IsActiveFlag_RXNE_RXFNE(USART1)) { + if(LL_USART_IsActiveFlag_RXNE_RXFNE(USART1)) { uint8_t data = LL_USART_ReceiveData8(USART1); - irq_cb[FuriHalUartIdUSART1](UartIrqEventRXNE, data); - } else if (LL_USART_IsActiveFlag_IDLE(USART1)) { - irq_cb[FuriHalUartIdUSART1](UartIrqEventIDLE, 0); + irq_cb[FuriHalUartIdUSART1](UartIrqEventRXNE, data, irq_ctx[FuriHalUartIdUSART1]); + } else if(LL_USART_IsActiveFlag_IDLE(USART1)) { + irq_cb[FuriHalUartIdUSART1](UartIrqEventIDLE, 0, irq_ctx[FuriHalUartIdUSART1]); LL_USART_ClearFlag_IDLE(USART1); - } else if (LL_USART_IsActiveFlag_ORE(USART1)) { + } else if(LL_USART_IsActiveFlag_ORE(USART1)) { LL_USART_ClearFlag_ORE(USART1); } } diff --git a/firmware/targets/f7/furi-hal/furi-hal-uart.h b/firmware/targets/f7/furi-hal/furi-hal-uart.h index 731a12a2..53a45f1e 100644 --- a/firmware/targets/f7/furi-hal/furi-hal-uart.h +++ b/firmware/targets/f7/furi-hal/furi-hal-uart.h @@ -1,3 +1,10 @@ +/** + * @file furi-hal-uart.h + * @version 1.0 + * @date 2021-11-19 + * + * UART HAL api interface + */ #pragma once #include @@ -7,27 +14,64 @@ extern "C" { #endif +/** + * UART channels + */ typedef enum { FuriHalUartIdUSART1, FuriHalUartIdLPUART1, } FuriHalUartId; +/** + * UART events + */ typedef enum { UartIrqEventRXNE, UartIrqEventIDLE, //TODO: more events } UartIrqEvent; -void furi_hal_uart_init(FuriHalUartId ch, uint32_t baud); +/** + * Init UART + * Configures GPIO to UART function, сonfigures UART hardware, enables UART hardware + * @param channel UART channel + * @param baud baudrate + */ +void furi_hal_uart_init(FuriHalUartId channel, uint32_t baud); -void furi_hal_uart_deinit(FuriHalUartId ch); +/** + * Deinit UART + * Configures GPIO to analog, clears callback and callback context, disables UART hardware + * @param channel UART channel + */ +void furi_hal_uart_deinit(FuriHalUartId channel); -void furi_hal_uart_set_br(FuriHalUartId ch, uint32_t baud); +/** + * Changes UART baudrate + * @param channel UART channel + * @param baud baudrate + */ +void furi_hal_uart_set_br(FuriHalUartId channel, uint32_t baud); -void furi_hal_uart_tx(FuriHalUartId ch, uint8_t* buffer, size_t buffer_size); +/** + * Transmits data + * @param channel UART channel + * @param buffer data + * @param buffer_size data size (in bytes) + */ +void furi_hal_uart_tx(FuriHalUartId channel, uint8_t* buffer, size_t buffer_size); -void furi_hal_uart_set_irq_cb(FuriHalUartId ch, void (*cb)(UartIrqEvent ev, uint8_t data)); +/** + * Sets UART event callback + * @param channel UART channel + * @param callback callback pointer + * @param context callback context + */ +void furi_hal_uart_set_irq_cb( + FuriHalUartId channel, + void (*callback)(UartIrqEvent event, uint8_t data, void* context), + void* context); #ifdef __cplusplus } -#endif +#endif \ No newline at end of file From a5052a03750abd9a94531e9bd8c3ebd3e708d7ec Mon Sep 17 00:00:00 2001 From: gornekich Date: Sun, 21 Nov 2021 17:47:54 +0300 Subject: [PATCH 10/11] [FL-2053] BLE MTU processing #830 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: あく --- applications/bt/bt_service/bt.c | 10 +++++++--- applications/bt/bt_service/bt_i.h | 1 + firmware/targets/f6/ble-glue/gap.c | 10 ++++++++++ firmware/targets/f6/ble-glue/gap.h | 2 ++ firmware/targets/f6/ble-glue/serial_service.h | 2 +- firmware/targets/f7/ble-glue/gap.c | 10 ++++++++++ firmware/targets/f7/ble-glue/gap.h | 2 ++ firmware/targets/f7/ble-glue/serial_service.h | 2 +- 8 files changed, 34 insertions(+), 5 deletions(-) diff --git a/applications/bt/bt_service/bt.c b/applications/bt/bt_service/bt.c index 296f5593..bcf37fa0 100755 --- a/applications/bt/bt_service/bt.c +++ b/applications/bt/bt_service/bt.c @@ -55,6 +55,8 @@ static void bt_battery_level_changed_callback(const void* _event, void* context) Bt* bt_alloc() { Bt* bt = furi_alloc(sizeof(Bt)); + // Init default maximum packet size + bt->max_packet_size = FURI_HAL_BT_PACKET_SIZE_MAX; // Load settings if(!bt_settings_load(&bt->bt_settings)) { bt_settings_save(&bt->bt_settings); @@ -113,9 +115,9 @@ static void bt_rpc_send_bytes_callback(void* context, uint8_t* bytes, size_t byt size_t bytes_sent = 0; while(bytes_sent < bytes_len) { size_t bytes_remain = bytes_len - bytes_sent; - if(bytes_remain > FURI_HAL_BT_PACKET_SIZE_MAX) { - furi_hal_bt_tx(&bytes[bytes_sent], FURI_HAL_BT_PACKET_SIZE_MAX); - bytes_sent += FURI_HAL_BT_PACKET_SIZE_MAX; + if(bytes_remain > bt->max_packet_size) { + furi_hal_bt_tx(&bytes[bytes_sent], bt->max_packet_size); + bytes_sent += bt->max_packet_size; } else { furi_hal_bt_tx(&bytes[bytes_sent], bytes_remain); bytes_sent += bytes_remain; @@ -177,6 +179,8 @@ static void bt_on_gap_event_callback(BleEvent event, void* context) { BtMessage message = { .type = BtMessageTypePinCodeShow, .data.pin_code = event.data.pin_code}; furi_check(osMessageQueuePut(bt->message_queue, &message, 0, osWaitForever) == osOK); + } else if(event.type == BleEventTypeUpdateMTU) { + bt->max_packet_size = event.data.max_packet_size; } } diff --git a/applications/bt/bt_service/bt_i.h b/applications/bt/bt_service/bt_i.h index 698dee1e..840d920e 100644 --- a/applications/bt/bt_service/bt_i.h +++ b/applications/bt/bt_service/bt_i.h @@ -41,6 +41,7 @@ typedef struct { struct Bt { uint8_t* bt_keys_addr_start; uint16_t bt_keys_size; + uint16_t max_packet_size; BtSettings bt_settings; BtStatus status; osMessageQueueId_t message_queue; diff --git a/firmware/targets/f6/ble-glue/gap.c b/firmware/targets/f6/ble-glue/gap.c index 2fd29f10..a2381653 100644 --- a/firmware/targets/f6/ble-glue/gap.c +++ b/firmware/targets/f6/ble-glue/gap.c @@ -155,6 +155,16 @@ SVCCTL_UserEvtFlowStatus_t SVCCTL_App_Notification( void *pckt ) } break; + case EVT_BLUE_ATT_EXCHANGE_MTU_RESP: + { + aci_att_exchange_mtu_resp_event_rp0 *pr = (void*)blue_evt->data; + FURI_LOG_I(TAG, "Rx MTU size: %d", pr->Server_RX_MTU); + // Set maximum packet size given header size is 3 bytes + BleEvent event = {.type = BleEventTypeUpdateMTU, .data.max_packet_size = pr->Server_RX_MTU - 3}; + gap->on_event_cb(event, gap->context); + } + break; + case EVT_BLUE_GAP_AUTHORIZATION_REQUEST: FURI_LOG_I(TAG, "Authorization request event"); break; diff --git a/firmware/targets/f6/ble-glue/gap.h b/firmware/targets/f6/ble-glue/gap.h index 5b82cfec..dfeffd63 100644 --- a/firmware/targets/f6/ble-glue/gap.h +++ b/firmware/targets/f6/ble-glue/gap.h @@ -13,10 +13,12 @@ typedef enum { BleEventTypeStartAdvertising, BleEventTypeStopAdvertising, BleEventTypePinCodeShow, + BleEventTypeUpdateMTU, } BleEventType; typedef union { uint32_t pin_code; + uint16_t max_packet_size; } BleEventData; typedef struct { diff --git a/firmware/targets/f6/ble-glue/serial_service.h b/firmware/targets/f6/ble-glue/serial_service.h index 0aa4c79f..5be13f1b 100644 --- a/firmware/targets/f6/ble-glue/serial_service.h +++ b/firmware/targets/f6/ble-glue/serial_service.h @@ -3,7 +3,7 @@ #include #include -#define SERIAL_SVC_DATA_LEN_MAX (245) +#define SERIAL_SVC_DATA_LEN_MAX (248) #ifdef __cplusplus extern "C" { diff --git a/firmware/targets/f7/ble-glue/gap.c b/firmware/targets/f7/ble-glue/gap.c index 2fd29f10..a2381653 100644 --- a/firmware/targets/f7/ble-glue/gap.c +++ b/firmware/targets/f7/ble-glue/gap.c @@ -155,6 +155,16 @@ SVCCTL_UserEvtFlowStatus_t SVCCTL_App_Notification( void *pckt ) } break; + case EVT_BLUE_ATT_EXCHANGE_MTU_RESP: + { + aci_att_exchange_mtu_resp_event_rp0 *pr = (void*)blue_evt->data; + FURI_LOG_I(TAG, "Rx MTU size: %d", pr->Server_RX_MTU); + // Set maximum packet size given header size is 3 bytes + BleEvent event = {.type = BleEventTypeUpdateMTU, .data.max_packet_size = pr->Server_RX_MTU - 3}; + gap->on_event_cb(event, gap->context); + } + break; + case EVT_BLUE_GAP_AUTHORIZATION_REQUEST: FURI_LOG_I(TAG, "Authorization request event"); break; diff --git a/firmware/targets/f7/ble-glue/gap.h b/firmware/targets/f7/ble-glue/gap.h index 5b82cfec..dfeffd63 100644 --- a/firmware/targets/f7/ble-glue/gap.h +++ b/firmware/targets/f7/ble-glue/gap.h @@ -13,10 +13,12 @@ typedef enum { BleEventTypeStartAdvertising, BleEventTypeStopAdvertising, BleEventTypePinCodeShow, + BleEventTypeUpdateMTU, } BleEventType; typedef union { uint32_t pin_code; + uint16_t max_packet_size; } BleEventData; typedef struct { diff --git a/firmware/targets/f7/ble-glue/serial_service.h b/firmware/targets/f7/ble-glue/serial_service.h index 0aa4c79f..5be13f1b 100644 --- a/firmware/targets/f7/ble-glue/serial_service.h +++ b/firmware/targets/f7/ble-glue/serial_service.h @@ -3,7 +3,7 @@ #include #include -#define SERIAL_SVC_DATA_LEN_MAX (245) +#define SERIAL_SVC_DATA_LEN_MAX (248) #ifdef __cplusplus extern "C" { From efded63bcbf87b3cee1f63beb6b3bedf9678f51f Mon Sep 17 00:00:00 2001 From: Nikolay Minaylov Date: Sun, 21 Nov 2021 18:17:43 +0300 Subject: [PATCH 11/11] USB-UART: New GUI (#826) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * USB-UART: new gui * Furi: use furi_console for logging instead of printf. * CDC: calling open/close callbacks on interface change * fix vcp_tx block on disconnect * USB mode set by struct pointer * FuriHal: proper event sequence on vcp reconnect * disable debug prints * HAL: add context to UART IRQ's * Context usage in UART IRQ and CDC callbacks * USB-UART: geting rid of baudrate limitations * FuriHal: remove struct pollutant in usb api. Co-authored-by: あく Co-authored-by: DrZlo13 --- applications/debug_tools/bad_usb.c | 4 +- applications/debug_tools/usb_mouse.c | 4 +- applications/debug_tools/usb_test.c | 6 +- applications/gpio/gpio_app.c | 23 +- applications/gpio/gpio_app_i.h | 16 +- applications/gpio/gpio_custom_event.h | 10 + applications/gpio/scenes/gpio_scene_config.h | 1 + applications/gpio/scenes/gpio_scene_start.c | 35 +- .../gpio/scenes/gpio_scene_usb_uart.c | 167 ++---- .../gpio/scenes/gpio_scene_usb_uart_config.c | 140 +++++ applications/gpio/usb_uart_bridge.c | 293 +++++++--- applications/gpio/usb_uart_bridge.h | 20 +- applications/gpio/views/gpio_usb_uart.c | 154 ++++++ applications/gpio/views/gpio_usb_uart.h | 18 + assets/compiled/assets_icons.c | 508 +++++++++--------- assets/compiled/assets_icons.h | 136 ++--- assets/icons/GPIO/ArrowDownEmpty_14x15.png | Bin 0 -> 654 bytes assets/icons/GPIO/ArrowDownFilled_14x15.png | Bin 0 -> 669 bytes assets/icons/GPIO/ArrowUpEmpty_14x15.png | Bin 0 -> 3616 bytes assets/icons/GPIO/ArrowUpFilled_14x15.png | Bin 0 -> 3628 bytes core/furi/log.c | 38 +- core/furi/log.h | 5 +- .../targets/f6/furi-hal/furi-hal-usb-cdc.c | 59 +- .../targets/f6/furi-hal/furi-hal-usb-cdc_i.h | 12 +- .../targets/f6/furi-hal/furi-hal-usb-hid.c | 7 +- firmware/targets/f6/furi-hal/furi-hal-usb.c | 65 +-- firmware/targets/f6/furi-hal/furi-hal-usb_i.h | 15 - firmware/targets/f6/furi-hal/furi-hal-vcp.c | 237 ++++---- firmware/targets/f6/furi-hal/furi-hal.c | 2 +- .../targets/f7/furi-hal/furi-hal-usb-cdc.c | 59 +- .../targets/f7/furi-hal/furi-hal-usb-cdc_i.h | 12 +- .../targets/f7/furi-hal/furi-hal-usb-hid.c | 7 +- firmware/targets/f7/furi-hal/furi-hal-usb.c | 65 +-- firmware/targets/f7/furi-hal/furi-hal-usb_i.h | 15 - firmware/targets/f7/furi-hal/furi-hal-vcp.c | 237 ++++---- firmware/targets/f7/furi-hal/furi-hal.c | 2 +- .../targets/furi-hal-include/furi-hal-usb.h | 33 +- 37 files changed, 1444 insertions(+), 961 deletions(-) create mode 100644 applications/gpio/gpio_custom_event.h create mode 100644 applications/gpio/scenes/gpio_scene_usb_uart_config.c create mode 100644 applications/gpio/views/gpio_usb_uart.c create mode 100755 applications/gpio/views/gpio_usb_uart.h create mode 100644 assets/icons/GPIO/ArrowDownEmpty_14x15.png create mode 100644 assets/icons/GPIO/ArrowDownFilled_14x15.png create mode 100644 assets/icons/GPIO/ArrowUpEmpty_14x15.png create mode 100644 assets/icons/GPIO/ArrowUpFilled_14x15.png diff --git a/applications/debug_tools/bad_usb.c b/applications/debug_tools/bad_usb.c index c86ffbac..0bcaca2a 100644 --- a/applications/debug_tools/bad_usb.c +++ b/applications/debug_tools/bad_usb.c @@ -285,8 +285,8 @@ int32_t bad_usb_app(void* p) { furi_check(app->event_queue); ViewPort* view_port = view_port_alloc(); - UsbMode usb_mode_prev = furi_hal_usb_get_config(); - furi_hal_usb_set_config(UsbModeHid); + UsbInterface* usb_mode_prev = furi_hal_usb_get_config(); + furi_hal_usb_set_config(&usb_hid); view_port_draw_callback_set(view_port, bad_usb_render_callback, app); view_port_input_callback_set(view_port, bad_usb_input_callback, app->event_queue); diff --git a/applications/debug_tools/usb_mouse.c b/applications/debug_tools/usb_mouse.c index a9b8be6e..339a4bdb 100644 --- a/applications/debug_tools/usb_mouse.c +++ b/applications/debug_tools/usb_mouse.c @@ -41,8 +41,8 @@ int32_t usb_mouse_app(void* p) { furi_check(event_queue); ViewPort* view_port = view_port_alloc(); - UsbMode usb_mode_prev = furi_hal_usb_get_config(); - furi_hal_usb_set_config(UsbModeHid); + UsbInterface* usb_mode_prev = furi_hal_usb_get_config(); + furi_hal_usb_set_config(&usb_hid); view_port_draw_callback_set(view_port, usb_mouse_render_callback, NULL); view_port_input_callback_set(view_port, usb_mouse_input_callback, event_queue); diff --git a/applications/debug_tools/usb_test.c b/applications/debug_tools/usb_test.c index f1677cae..1936fe21 100644 --- a/applications/debug_tools/usb_test.c +++ b/applications/debug_tools/usb_test.c @@ -29,11 +29,11 @@ void usb_test_submenu_callback(void* context, uint32_t index) { } else if(index == UsbTestSubmenuIndexDisable) { furi_hal_usb_disable(); } else if(index == UsbTestSubmenuIndexVcpSingle) { - furi_hal_usb_set_config(UsbModeVcpSingle); + furi_hal_usb_set_config(&usb_cdc_single); } else if(index == UsbTestSubmenuIndexVcpDual) { - furi_hal_usb_set_config(UsbModeVcpDual); + furi_hal_usb_set_config(&usb_cdc_dual); } else if(index == UsbTestSubmenuIndexHid) { - furi_hal_usb_set_config(UsbModeHid); + furi_hal_usb_set_config(&usb_hid); } else if(index == UsbTestSubmenuIndexHidU2F) { //furi_hal_usb_set_config(UsbModeU2F); } diff --git a/applications/gpio/gpio_app.c b/applications/gpio/gpio_app.c index 8cd27bc1..eb044bb8 100644 --- a/applications/gpio/gpio_app.c +++ b/applications/gpio/gpio_app.c @@ -15,11 +15,16 @@ static bool gpio_app_back_event_callback(void* context) { return scene_manager_handle_back_event(app->scene_manager); } +static void gpio_app_tick_event_callback(void* context) { + furi_assert(context); + GpioApp* app = context; + scene_manager_handle_tick_event(app->scene_manager); +} + GpioApp* gpio_app_alloc() { GpioApp* app = furi_alloc(sizeof(GpioApp)); app->gui = furi_record_open("gui"); - app->notifications = furi_record_open("notification"); app->view_dispatcher = view_dispatcher_alloc(); app->scene_manager = scene_manager_alloc(&gpio_scene_handlers, app); @@ -30,9 +35,13 @@ GpioApp* gpio_app_alloc() { app->view_dispatcher, gpio_app_custom_event_callback); view_dispatcher_set_navigation_event_callback( app->view_dispatcher, gpio_app_back_event_callback); + view_dispatcher_set_tick_event_callback( + app->view_dispatcher, gpio_app_tick_event_callback, 100); view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen); + app->notifications = furi_record_open("notification"); + app->var_item_list = variable_item_list_alloc(); view_dispatcher_add_view( app->view_dispatcher, @@ -42,8 +51,14 @@ GpioApp* gpio_app_alloc() { view_dispatcher_add_view( app->view_dispatcher, GpioAppViewGpioTest, gpio_test_get_view(app->gpio_test)); + app->gpio_usb_uart = gpio_usb_uart_alloc(); view_dispatcher_add_view( - app->view_dispatcher, GpioAppViewUsbUart, variable_item_list_get_view(app->var_item_list)); + app->view_dispatcher, GpioAppViewUsbUart, gpio_usb_uart_get_view(app->gpio_usb_uart)); + + view_dispatcher_add_view( + app->view_dispatcher, + GpioAppViewUsbUartCfg, + variable_item_list_get_view(app->var_item_list)); scene_manager_next_scene(app->scene_manager, GpioSceneStart); @@ -55,10 +70,12 @@ void gpio_app_free(GpioApp* app) { // Views view_dispatcher_remove_view(app->view_dispatcher, GpioAppViewVarItemList); - variable_item_list_free(app->var_item_list); view_dispatcher_remove_view(app->view_dispatcher, GpioAppViewGpioTest); view_dispatcher_remove_view(app->view_dispatcher, GpioAppViewUsbUart); + view_dispatcher_remove_view(app->view_dispatcher, GpioAppViewUsbUartCfg); + variable_item_list_free(app->var_item_list); gpio_test_free(app->gpio_test); + gpio_usb_uart_free(app->gpio_usb_uart); // View dispatcher view_dispatcher_free(app->view_dispatcher); diff --git a/applications/gpio/gpio_app_i.h b/applications/gpio/gpio_app_i.h index 226fa06e..168b2562 100644 --- a/applications/gpio/gpio_app_i.h +++ b/applications/gpio/gpio_app_i.h @@ -3,6 +3,8 @@ #include "gpio_app.h" #include "gpio_item.h" #include "scenes/gpio_scene.h" +#include "gpio_custom_event.h" +#include "usb_uart_bridge.h" #include #include @@ -11,27 +13,23 @@ #include #include #include "views/gpio_test.h" - -#define GPIO_SCENE_START_CUSTOM_EVENT_OTG_OFF (0UL) -#define GPIO_SCENE_START_CUSTOM_EVENT_OTG_ON (1UL) -#define GPIO_SCENE_START_CUSTOM_EVENT_TEST (2UL) -#define GPIO_SCENE_START_CUSTOM_EVENT_USB_UART (3UL) - -#define GPIO_SCENE_USB_UART_CUSTOM_EVENT_ENABLE (4UL) -#define GPIO_SCENE_USB_UART_CUSTOM_EVENT_DISABLE (5UL) +#include "views/gpio_usb_uart.h" struct GpioApp { Gui* gui; + NotificationApp* notifications; ViewDispatcher* view_dispatcher; SceneManager* scene_manager; - NotificationApp* notifications; VariableItemList* var_item_list; GpioTest* gpio_test; + GpioUsbUart* gpio_usb_uart; + UsbUartBridge* usb_uart_bridge; }; typedef enum { GpioAppViewVarItemList, GpioAppViewGpioTest, GpioAppViewUsbUart, + GpioAppViewUsbUartCfg, } GpioAppView; diff --git a/applications/gpio/gpio_custom_event.h b/applications/gpio/gpio_custom_event.h new file mode 100644 index 00000000..1682dc0f --- /dev/null +++ b/applications/gpio/gpio_custom_event.h @@ -0,0 +1,10 @@ +#pragma once + +typedef enum { + GpioStartEventOtgOff = 0, + GpioStartEventOtgOn, + GpioStartEventManualConrol, + GpioStartEventUsbUart, + + GpioUsbUartEventConfig, +} GpioCustomEvent; diff --git a/applications/gpio/scenes/gpio_scene_config.h b/applications/gpio/scenes/gpio_scene_config.h index 263df2d1..925f4c5c 100644 --- a/applications/gpio/scenes/gpio_scene_config.h +++ b/applications/gpio/scenes/gpio_scene_config.h @@ -1,3 +1,4 @@ ADD_SCENE(gpio, start, Start) ADD_SCENE(gpio, test, Test) ADD_SCENE(gpio, usb_uart, UsbUart) +ADD_SCENE(gpio, usb_uart_cfg, UsbUartCfg) diff --git a/applications/gpio/scenes/gpio_scene_start.c b/applications/gpio/scenes/gpio_scene_start.c index df210882..602ee048 100644 --- a/applications/gpio/scenes/gpio_scene_start.c +++ b/applications/gpio/scenes/gpio_scene_start.c @@ -2,9 +2,9 @@ #include "furi-hal-power.h" enum GpioItem { - GpioItemOtg, - GpioItemTest, GpioItemUsbUart, + GpioItemTest, + GpioItemOtg, }; enum GpioOtg { @@ -22,11 +22,9 @@ static void gpio_scene_start_var_list_enter_callback(void* context, uint32_t ind furi_assert(context); GpioApp* app = context; if(index == GpioItemTest) { - view_dispatcher_send_custom_event( - app->view_dispatcher, GPIO_SCENE_START_CUSTOM_EVENT_TEST); + view_dispatcher_send_custom_event(app->view_dispatcher, GpioStartEventManualConrol); } else if(index == GpioItemUsbUart) { - view_dispatcher_send_custom_event( - app->view_dispatcher, GPIO_SCENE_START_CUSTOM_EVENT_USB_UART); + view_dispatcher_send_custom_event(app->view_dispatcher, GpioStartEventUsbUart); } } @@ -36,11 +34,9 @@ static void gpio_scene_start_var_list_change_callback(VariableItem* item) { variable_item_set_current_value_text(item, gpio_otg_text[index]); if(index == GpioOtgOff) { - view_dispatcher_send_custom_event( - app->view_dispatcher, GPIO_SCENE_START_CUSTOM_EVENT_OTG_OFF); + view_dispatcher_send_custom_event(app->view_dispatcher, GpioStartEventOtgOff); } else if(index == GpioOtgOn) { - view_dispatcher_send_custom_event( - app->view_dispatcher, GPIO_SCENE_START_CUSTOM_EVENT_OTG_ON); + view_dispatcher_send_custom_event(app->view_dispatcher, GpioStartEventOtgOn); } } @@ -51,6 +47,11 @@ void gpio_scene_start_on_enter(void* context) { VariableItem* item; variable_item_list_set_enter_callback( var_item_list, gpio_scene_start_var_list_enter_callback, app); + + variable_item_list_add(var_item_list, "USB-UART bridge", 0, NULL, NULL); + + variable_item_list_add(var_item_list, "GPIO manual control", 0, NULL, NULL); + item = variable_item_list_add( var_item_list, "5V on GPIO", @@ -64,8 +65,6 @@ void gpio_scene_start_on_enter(void* context) { variable_item_set_current_value_index(item, GpioOtgOff); variable_item_set_current_value_text(item, gpio_otg_text[GpioOtgOff]); } - variable_item_list_add(var_item_list, "GPIO tester", 0, NULL, NULL); - variable_item_list_add(var_item_list, "USB-UART bridge", 0, NULL, NULL); variable_item_list_set_selected_item( var_item_list, scene_manager_get_scene_state(app->scene_manager, GpioSceneStart)); @@ -78,15 +77,15 @@ bool gpio_scene_start_on_event(void* context, SceneManagerEvent event) { bool consumed = false; if(event.type == SceneManagerEventTypeCustom) { - if(event.event == GPIO_SCENE_START_CUSTOM_EVENT_OTG_ON) { + if(event.event == GpioStartEventOtgOn) { furi_hal_power_enable_otg(); - } else if(event.event == GPIO_SCENE_START_CUSTOM_EVENT_OTG_OFF) { + } else if(event.event == GpioStartEventOtgOff) { furi_hal_power_disable_otg(); - } else if(event.event == GPIO_SCENE_START_CUSTOM_EVENT_TEST) { - scene_manager_set_scene_state(app->scene_manager, GpioSceneStart, 1); + } else if(event.event == GpioStartEventManualConrol) { + scene_manager_set_scene_state(app->scene_manager, GpioSceneStart, GpioItemTest); scene_manager_next_scene(app->scene_manager, GpioSceneTest); - } else if(event.event == GPIO_SCENE_START_CUSTOM_EVENT_USB_UART) { - scene_manager_set_scene_state(app->scene_manager, GpioSceneStart, 2); + } else if(event.event == GpioStartEventUsbUart) { + scene_manager_set_scene_state(app->scene_manager, GpioSceneStart, GpioItemUsbUart); scene_manager_next_scene(app->scene_manager, GpioSceneUsbUart); } consumed = true; diff --git a/applications/gpio/scenes/gpio_scene_usb_uart.c b/applications/gpio/scenes/gpio_scene_usb_uart.c index b24e4b3e..2e34bc8d 100644 --- a/applications/gpio/scenes/gpio_scene_usb_uart.c +++ b/applications/gpio/scenes/gpio_scene_usb_uart.c @@ -1,138 +1,65 @@ -#include "../usb_uart_bridge.h" #include "../gpio_app_i.h" -#include "furi-hal.h" +#include "../usb_uart_bridge.h" -typedef enum { - UsbUartLineIndexVcp, - UsbUartLineIndexUart, - UsbUartLineIndexBaudrate, - UsbUartLineIndexEnable, - UsbUartLineIndexDisable, -} LineIndex; +typedef struct { + UsbUartConfig cfg; + UsbUartState state; +} SceneUsbUartBridge; -static UsbUartConfig* cfg_set; +static SceneUsbUartBridge* scene_usb_uart; -static const char* vcp_ch[] = {"0 (CLI)", "1"}; -static const char* uart_ch[] = {"USART1", "LPUART1"}; -static const char* baudrate_mode[] = {"Host"}; -static const uint32_t baudrate_list[] = { - 2400, - 9600, - 19200, - 38400, - 57600, - 115200, - 230400, - 460800, - 921600, -}; - -bool gpio_scene_usb_uart_on_event(void* context, SceneManagerEvent event) { - //GpioApp* app = context; - bool consumed = false; - - if(event.type == SceneManagerEventTypeCustom) { - if(event.event == GPIO_SCENE_USB_UART_CUSTOM_EVENT_ENABLE) { - usb_uart_enable(cfg_set); - } else if(event.event == GPIO_SCENE_USB_UART_CUSTOM_EVENT_DISABLE) { - usb_uart_disable(); - } - consumed = true; - } - return consumed; -} - -static void line_vcp_cb(VariableItem* item) { - //GpioApp* app = variable_item_get_context(item); - uint8_t index = variable_item_get_current_value_index(item); - - variable_item_set_current_value_text(item, vcp_ch[index]); - - cfg_set->vcp_ch = index; -} - -static void line_port_cb(VariableItem* item) { - //GpioApp* app = variable_item_get_context(item); - uint8_t index = variable_item_get_current_value_index(item); - - variable_item_set_current_value_text(item, uart_ch[index]); - - if(index == 0) - cfg_set->uart_ch = FuriHalUartIdUSART1; - else if(index == 1) - cfg_set->uart_ch = FuriHalUartIdLPUART1; -} - -static void line_baudrate_cb(VariableItem* item) { - //GpioApp* app = variable_item_get_context(item); - uint8_t index = variable_item_get_current_value_index(item); - - char br_text[8]; - - if(index > 0) { - snprintf(br_text, 7, "%lu", baudrate_list[index - 1]); - variable_item_set_current_value_text(item, br_text); - cfg_set->baudrate = baudrate_list[index - 1]; - } else { - variable_item_set_current_value_text(item, baudrate_mode[index]); - cfg_set->baudrate = 0; - } -} - -static void gpio_scene_usb_uart_enter_callback(void* context, uint32_t index) { +void gpio_scene_usb_uart_callback(GpioCustomEvent event, void* context) { furi_assert(context); GpioApp* app = context; - if(index == UsbUartLineIndexEnable) - view_dispatcher_send_custom_event( - app->view_dispatcher, GPIO_SCENE_USB_UART_CUSTOM_EVENT_ENABLE); - else if(index == UsbUartLineIndexDisable) - view_dispatcher_send_custom_event( - app->view_dispatcher, GPIO_SCENE_USB_UART_CUSTOM_EVENT_DISABLE); + view_dispatcher_send_custom_event(app->view_dispatcher, event); } void gpio_scene_usb_uart_on_enter(void* context) { GpioApp* app = context; - VariableItemList* var_item_list = app->var_item_list; + uint32_t prev_state = scene_manager_get_scene_state(app->scene_manager, GpioAppViewUsbUart); + if(prev_state == 0) { + scene_usb_uart = furi_alloc(sizeof(SceneUsbUartBridge)); + scene_usb_uart->cfg.vcp_ch = 0; // TODO: settings load + scene_usb_uart->cfg.uart_ch = 0; + scene_usb_uart->cfg.flow_pins = 0; + scene_usb_uart->cfg.baudrate_mode = 0; + scene_usb_uart->cfg.baudrate = 0; + app->usb_uart_bridge = usb_uart_enable(&scene_usb_uart->cfg); + } - cfg_set = furi_alloc(sizeof(UsbUartConfig)); - - VariableItem* item; - - variable_item_list_set_enter_callback(var_item_list, gpio_scene_usb_uart_enter_callback, app); - - item = variable_item_list_add(var_item_list, "VCP Channel", 2, line_vcp_cb, app); - variable_item_set_current_value_index(item, 0); - variable_item_set_current_value_text(item, vcp_ch[0]); - - item = variable_item_list_add(var_item_list, "UART Port", 2, line_port_cb, app); - variable_item_set_current_value_index(item, 0); - variable_item_set_current_value_text(item, uart_ch[0]); - - item = variable_item_list_add( - var_item_list, - "Baudrate", - sizeof(baudrate_list) / sizeof(baudrate_list[0]) + 1, - line_baudrate_cb, - app); - variable_item_set_current_value_index(item, 0); - variable_item_set_current_value_text(item, baudrate_mode[0]); - - item = variable_item_list_add(var_item_list, "Enable", 0, NULL, NULL); - item = variable_item_list_add(var_item_list, "Disable", 0, NULL, NULL); - - variable_item_list_set_selected_item( - var_item_list, scene_manager_get_scene_state(app->scene_manager, GpioSceneUsbUart)); + usb_uart_get_config(app->usb_uart_bridge, &scene_usb_uart->cfg); + usb_uart_get_state(app->usb_uart_bridge, &scene_usb_uart->state); + gpio_usb_uart_set_callback(app->gpio_usb_uart, gpio_scene_usb_uart_callback, app); + scene_manager_set_scene_state(app->scene_manager, GpioAppViewUsbUart, 0); view_dispatcher_switch_to_view(app->view_dispatcher, GpioAppViewUsbUart); } +bool gpio_scene_usb_uart_on_event(void* context, SceneManagerEvent event) { + GpioApp* app = context; + if(event.type == SceneManagerEventTypeCustom) { + scene_manager_set_scene_state(app->scene_manager, GpioAppViewUsbUart, 1); + scene_manager_next_scene(app->scene_manager, GpioAppViewUsbUartCfg); + return true; + } else if(event.type == SceneManagerEventTypeTick) { + uint32_t tx_cnt_last = scene_usb_uart->state.tx_cnt; + uint32_t rx_cnt_last = scene_usb_uart->state.rx_cnt; + usb_uart_get_state(app->usb_uart_bridge, &scene_usb_uart->state); + gpio_usb_uart_update_state( + app->gpio_usb_uart, &scene_usb_uart->cfg, &scene_usb_uart->state); + if(tx_cnt_last != scene_usb_uart->state.tx_cnt) + notification_message(app->notifications, &sequence_blink_blue_10); + if(rx_cnt_last != scene_usb_uart->state.rx_cnt) + notification_message(app->notifications, &sequence_blink_green_10); + } + return false; +} + void gpio_scene_usb_uart_on_exit(void* context) { GpioApp* app = context; - usb_uart_disable(); - scene_manager_set_scene_state( - app->scene_manager, - GpioSceneUsbUart, - variable_item_list_get_selected_item_index(app->var_item_list)); - variable_item_list_clean(app->var_item_list); - free(cfg_set); + uint32_t prev_state = scene_manager_get_scene_state(app->scene_manager, GpioAppViewUsbUart); + if(prev_state == 0) { + usb_uart_disable(app->usb_uart_bridge); + free(scene_usb_uart); + } } diff --git a/applications/gpio/scenes/gpio_scene_usb_uart_config.c b/applications/gpio/scenes/gpio_scene_usb_uart_config.c new file mode 100644 index 00000000..d622ffc3 --- /dev/null +++ b/applications/gpio/scenes/gpio_scene_usb_uart_config.c @@ -0,0 +1,140 @@ +#include "../usb_uart_bridge.h" +#include "../gpio_app_i.h" +#include "furi-hal.h" + +typedef enum { + UsbUartLineIndexVcp, + UsbUartLineIndexBaudrate, + UsbUartLineIndexUart, + UsbUartLineIndexFlow, +} LineIndex; + +static UsbUartConfig* cfg_set; + +static const char* vcp_ch[] = {"0 (CLI)", "1"}; +static const char* uart_ch[] = {"13,14", "15,16"}; +static const char* flow_pins[] = {"None", "2,3", "6,7"}; +static const char* baudrate_mode[] = {"Host"}; +static const uint32_t baudrate_list[] = { + 2400, + 9600, + 19200, + 38400, + 57600, + 115200, + 230400, + 460800, + 921600, +}; + +bool gpio_scene_usb_uart_cfg_on_event(void* context, SceneManagerEvent event) { + //GpioApp* app = context; + bool consumed = false; + + if(event.type == SceneManagerEventTypeCustom) { + } + return consumed; +} + +static void line_vcp_cb(VariableItem* item) { + GpioApp* app = variable_item_get_context(item); + uint8_t index = variable_item_get_current_value_index(item); + + variable_item_set_current_value_text(item, vcp_ch[index]); + + cfg_set->vcp_ch = index; + usb_uart_set_config(app->usb_uart_bridge, cfg_set); +} + +static void line_port_cb(VariableItem* item) { + GpioApp* app = variable_item_get_context(item); + uint8_t index = variable_item_get_current_value_index(item); + + variable_item_set_current_value_text(item, uart_ch[index]); + + if(index == 0) + cfg_set->uart_ch = FuriHalUartIdUSART1; + else if(index == 1) + cfg_set->uart_ch = FuriHalUartIdLPUART1; + usb_uart_set_config(app->usb_uart_bridge, cfg_set); +} + +static void line_flow_cb(VariableItem* item) { + GpioApp* app = variable_item_get_context(item); + uint8_t index = variable_item_get_current_value_index(item); + + variable_item_set_current_value_text(item, flow_pins[index]); + + cfg_set->flow_pins = index; + usb_uart_set_config(app->usb_uart_bridge, cfg_set); +} + +static void line_baudrate_cb(VariableItem* item) { + GpioApp* app = variable_item_get_context(item); + uint8_t index = variable_item_get_current_value_index(item); + + char br_text[8]; + + if(index > 0) { + snprintf(br_text, 7, "%lu", baudrate_list[index - 1]); + variable_item_set_current_value_text(item, br_text); + cfg_set->baudrate = baudrate_list[index - 1]; + } else { + variable_item_set_current_value_text(item, baudrate_mode[index]); + cfg_set->baudrate = 0; + } + cfg_set->baudrate_mode = index; + usb_uart_set_config(app->usb_uart_bridge, cfg_set); +} + +void gpio_scene_usb_uart_cfg_on_enter(void* context) { + GpioApp* app = context; + VariableItemList* var_item_list = app->var_item_list; + + cfg_set = furi_alloc(sizeof(UsbUartConfig)); + usb_uart_get_config(app->usb_uart_bridge, cfg_set); + + VariableItem* item; + char br_text[8]; + + item = variable_item_list_add(var_item_list, "USB Channel", 2, line_vcp_cb, app); + variable_item_set_current_value_index(item, cfg_set->vcp_ch); + variable_item_set_current_value_text(item, vcp_ch[cfg_set->vcp_ch]); + + item = variable_item_list_add( + var_item_list, + "Baudrate", + sizeof(baudrate_list) / sizeof(baudrate_list[0]) + 1, + line_baudrate_cb, + app); + variable_item_set_current_value_index(item, cfg_set->baudrate_mode); + if(cfg_set->baudrate_mode > 0) { + snprintf(br_text, 7, "%lu", baudrate_list[cfg_set->baudrate_mode - 1]); + variable_item_set_current_value_text(item, br_text); + } else { + variable_item_set_current_value_text(item, baudrate_mode[cfg_set->baudrate_mode]); + } + + item = variable_item_list_add(var_item_list, "UART Pins", 2, line_port_cb, app); + variable_item_set_current_value_index(item, cfg_set->uart_ch); + variable_item_set_current_value_text(item, uart_ch[cfg_set->uart_ch]); + + item = variable_item_list_add(var_item_list, "RTS/DTR Pins", 3, line_flow_cb, app); + variable_item_set_current_value_index(item, cfg_set->flow_pins); + variable_item_set_current_value_text(item, flow_pins[cfg_set->flow_pins]); + + variable_item_list_set_selected_item( + var_item_list, scene_manager_get_scene_state(app->scene_manager, GpioAppViewUsbUartCfg)); + + view_dispatcher_switch_to_view(app->view_dispatcher, GpioAppViewUsbUartCfg); +} + +void gpio_scene_usb_uart_cfg_on_exit(void* context) { + GpioApp* app = context; + scene_manager_set_scene_state( + app->scene_manager, + GpioAppViewUsbUartCfg, + variable_item_list_get_selected_item_index(app->var_item_list)); + variable_item_list_clean(app->var_item_list); + free(cfg_set); +} diff --git a/applications/gpio/usb_uart_bridge.c b/applications/gpio/usb_uart_bridge.c index 99fe62eb..167c09aa 100644 --- a/applications/gpio/usb_uart_bridge.c +++ b/applications/gpio/usb_uart_bridge.c @@ -7,6 +7,14 @@ #define USB_CDC_PKT_LEN CDC_DATA_SZ #define USB_UART_RX_BUF_SIZE (USB_CDC_PKT_LEN * 5) +#define USB_CDC_BIT_DTR (1 << 0) +#define USB_CDC_BIT_RTS (1 << 1) + +static const GpioPin* flow_pins[][2] = { + {&gpio_ext_pa7, &gpio_ext_pa6}, // 2, 3 + {&gpio_ext_pb2, &gpio_ext_pc3}, // 6, 7 +}; + typedef enum { WorkerEvtReserved = (1 << 0), // Reserved for StreamBuffer internal event WorkerEvtStop = (1 << 1), @@ -14,13 +22,22 @@ typedef enum { WorkerEvtTxStop = (1 << 3), WorkerEvtCdcRx = (1 << 4), + + WorkerEvtCfgChange = (1 << 5), + + WorkerEvtLineCfgSet = (1 << 6), + WorkerEvtCtrlLineSet = (1 << 7), + } WorkerEvtFlags; -#define WORKER_ALL_RX_EVENTS (WorkerEvtStop | WorkerEvtRxDone) +#define WORKER_ALL_RX_EVENTS \ + (WorkerEvtStop | WorkerEvtRxDone | WorkerEvtCfgChange | WorkerEvtLineCfgSet | \ + WorkerEvtCtrlLineSet) #define WORKER_ALL_TX_EVENTS (WorkerEvtTxStop | WorkerEvtCdcRx) -typedef struct { +struct UsbUartBridge { UsbUartConfig cfg; + UsbUartConfig cfg_new; FuriThread* thread; FuriThread* tx_thread; @@ -31,21 +48,18 @@ typedef struct { osSemaphoreId_t tx_sem; + UsbUartState st; + uint8_t rx_buf[USB_CDC_PKT_LEN]; +}; - bool buf_full; -} UsbUartParams; +static void vcp_on_cdc_tx_complete(void* context); +static void vcp_on_cdc_rx(void* context); +static void vcp_state_callback(void* context, uint8_t state); +static void vcp_on_cdc_control_line(void* context, uint8_t state); +static void vcp_on_line_config(void* context, struct usb_cdc_line_coding* config); -static UsbUartParams* usb_uart; -static bool running = false; - -static void vcp_on_cdc_tx_complete(); -static void vcp_on_cdc_rx(); -static void vcp_state_callback(uint8_t state); -static void vcp_on_cdc_control_line(uint8_t state); -static void vcp_on_line_config(struct usb_cdc_line_coding* config); - -static CdcCallbacks cdc_cb = { +static const CdcCallbacks cdc_cb = { vcp_on_cdc_tx_complete, vcp_on_cdc_rx, vcp_state_callback, @@ -58,17 +72,76 @@ static CdcCallbacks cdc_cb = { static int32_t usb_uart_tx_thread(void* context); static void usb_uart_on_irq_cb(UartIrqEvent ev, uint8_t data, void* context) { + UsbUartBridge* usb_uart = (UsbUartBridge*)context; BaseType_t xHigherPriorityTaskWoken = pdFALSE; if(ev == UartIrqEventRXNE) { xStreamBufferSendFromISR(usb_uart->rx_stream, &data, 1, &xHigherPriorityTaskWoken); - portYIELD_FROM_ISR(xHigherPriorityTaskWoken); osThreadFlagsSet(furi_thread_get_thread_id(usb_uart->thread), WorkerEvtRxDone); + portYIELD_FROM_ISR(xHigherPriorityTaskWoken); + } +} + +static void usb_uart_vcp_init(UsbUartBridge* usb_uart, uint8_t vcp_ch) { + if(vcp_ch == 0) { + furi_hal_usb_set_config(&usb_cdc_single); + furi_hal_vcp_disable(); + } else { + furi_hal_usb_set_config(&usb_cdc_dual); + } + furi_hal_cdc_set_callbacks(vcp_ch, (CdcCallbacks*)&cdc_cb, usb_uart); +} + +static void usb_uart_vcp_deinit(UsbUartBridge* usb_uart, uint8_t vcp_ch) { + furi_hal_cdc_set_callbacks(vcp_ch, NULL, NULL); + if(vcp_ch == 0) furi_hal_vcp_enable(); +} + +static void usb_uart_serial_init(UsbUartBridge* usb_uart, uint8_t uart_ch) { + if(uart_ch == FuriHalUartIdUSART1) { + furi_hal_console_disable(); + } else if(uart_ch == FuriHalUartIdLPUART1) { + furi_hal_uart_init(uart_ch, 115200); + } + furi_hal_uart_set_irq_cb(uart_ch, usb_uart_on_irq_cb, usb_uart); +} + +static void usb_uart_serial_deinit(UsbUartBridge* usb_uart, uint8_t uart_ch) { + furi_hal_uart_set_irq_cb(uart_ch, NULL, NULL); + if(uart_ch == FuriHalUartIdUSART1) + furi_hal_console_enable(); + else if(uart_ch == FuriHalUartIdLPUART1) + furi_hal_uart_deinit(uart_ch); +} + +static void usb_uart_set_baudrate(UsbUartBridge* usb_uart, uint32_t baudrate) { + if(baudrate != 0) { + furi_hal_uart_set_br(usb_uart->cfg.uart_ch, baudrate); + usb_uart->st.baudrate_cur = baudrate; + } else { + struct usb_cdc_line_coding* line_cfg = + furi_hal_cdc_get_port_settings(usb_uart->cfg.vcp_ch); + if(line_cfg->dwDTERate > 0) { + furi_hal_uart_set_br(usb_uart->cfg.uart_ch, line_cfg->dwDTERate); + usb_uart->st.baudrate_cur = line_cfg->dwDTERate; + } + } +} + +static void usb_uart_update_ctrl_lines(UsbUartBridge* usb_uart) { + if(usb_uart->cfg.flow_pins != 0) { + furi_assert((usb_uart->cfg.flow_pins - 1) < (sizeof(flow_pins) / sizeof(flow_pins[0]))); + uint8_t state = furi_hal_cdc_get_ctrl_line_state(usb_uart->cfg.vcp_ch); + + hal_gpio_write(flow_pins[usb_uart->cfg.flow_pins - 1][0], !(state & USB_CDC_BIT_RTS)); + hal_gpio_write(flow_pins[usb_uart->cfg.flow_pins - 1][1], !(state & USB_CDC_BIT_DTR)); } } static int32_t usb_uart_worker(void* context) { - memcpy(&usb_uart->cfg, context, sizeof(UsbUartConfig)); + UsbUartBridge* usb_uart = (UsbUartBridge*)context; + + memcpy(&usb_uart->cfg, &usb_uart->cfg_new, sizeof(UsbUartConfig)); usb_uart->rx_stream = xStreamBufferCreate(USB_UART_RX_BUF_SIZE, 1); @@ -78,33 +151,22 @@ static int32_t usb_uart_worker(void* context) { usb_uart->tx_thread = furi_thread_alloc(); furi_thread_set_name(usb_uart->tx_thread, "UsbUartTxWorker"); furi_thread_set_stack_size(usb_uart->tx_thread, 512); - furi_thread_set_context(usb_uart->tx_thread, NULL); + furi_thread_set_context(usb_uart->tx_thread, usb_uart); furi_thread_set_callback(usb_uart->tx_thread, usb_uart_tx_thread); - UsbMode usb_mode_prev = furi_hal_usb_get_config(); - if(usb_uart->cfg.vcp_ch == 0) { - furi_hal_usb_set_config(UsbModeVcpSingle); - furi_hal_vcp_disable(); - } else { - furi_hal_usb_set_config(UsbModeVcpDual); + UsbInterface* usb_mode_prev = furi_hal_usb_get_config(); + usb_uart_vcp_init(usb_uart, usb_uart->cfg.vcp_ch); + usb_uart_serial_init(usb_uart, usb_uart->cfg.uart_ch); + usb_uart_set_baudrate(usb_uart, usb_uart->cfg.baudrate); + if(usb_uart->cfg.flow_pins != 0) { + furi_assert((usb_uart->cfg.flow_pins - 1) < (sizeof(flow_pins) / sizeof(flow_pins[0]))); + hal_gpio_init_simple(flow_pins[usb_uart->cfg.flow_pins - 1][0], GpioModeOutputPushPull); + hal_gpio_init_simple(flow_pins[usb_uart->cfg.flow_pins - 1][1], GpioModeOutputPushPull); + usb_uart_update_ctrl_lines(usb_uart); } + osThreadFlagsSet(furi_thread_get_thread_id(usb_uart->tx_thread), WorkerEvtCdcRx); - if(usb_uart->cfg.uart_ch == FuriHalUartIdUSART1) { - furi_hal_console_disable(); - } else if(usb_uart->cfg.uart_ch == FuriHalUartIdLPUART1) { - furi_hal_uart_init(usb_uart->cfg.uart_ch, 115200); - furi_hal_uart_set_irq_cb(usb_uart->cfg.uart_ch, usb_uart_on_irq_cb, NULL); - } - - furi_hal_uart_set_irq_cb(usb_uart->cfg.uart_ch, usb_uart_on_irq_cb, NULL); - if(usb_uart->cfg.baudrate != 0) - furi_hal_uart_set_br(usb_uart->cfg.uart_ch, usb_uart->cfg.baudrate); - else - vcp_on_line_config(furi_hal_cdc_get_port_settings(usb_uart->cfg.vcp_ch)); - - furi_hal_cdc_set_callbacks(usb_uart->cfg.vcp_ch, &cdc_cb); - furi_thread_start(usb_uart->tx_thread); while(1) { @@ -116,6 +178,7 @@ static int32_t usb_uart_worker(void* context) { xStreamBufferReceive(usb_uart->rx_stream, usb_uart->rx_buf, USB_CDC_PKT_LEN, 0); if(len > 0) { if(osSemaphoreAcquire(usb_uart->tx_sem, 100) == osOK) { + usb_uart->st.rx_cnt += len; furi_check(osMutexAcquire(usb_uart->usb_mutex, osWaitForever) == osOK); furi_hal_cdc_send(usb_uart->cfg.vcp_ch, usb_uart->rx_buf, len); furi_check(osMutexRelease(usb_uart->usb_mutex) == osOK); @@ -124,21 +187,76 @@ static int32_t usb_uart_worker(void* context) { } } } + if(events & WorkerEvtCfgChange) { + if(usb_uart->cfg.vcp_ch != usb_uart->cfg_new.vcp_ch) { + osThreadFlagsSet(furi_thread_get_thread_id(usb_uart->tx_thread), WorkerEvtTxStop); + furi_thread_join(usb_uart->tx_thread); + + usb_uart_vcp_deinit(usb_uart, usb_uart->cfg.vcp_ch); + usb_uart_vcp_init(usb_uart, usb_uart->cfg_new.vcp_ch); + + usb_uart->cfg.vcp_ch = usb_uart->cfg_new.vcp_ch; + furi_thread_start(usb_uart->tx_thread); + events |= WorkerEvtCtrlLineSet; + events |= WorkerEvtLineCfgSet; + } + if(usb_uart->cfg.uart_ch != usb_uart->cfg_new.uart_ch) { + osThreadFlagsSet(furi_thread_get_thread_id(usb_uart->tx_thread), WorkerEvtTxStop); + furi_thread_join(usb_uart->tx_thread); + + usb_uart_serial_deinit(usb_uart, usb_uart->cfg.uart_ch); + usb_uart_serial_init(usb_uart, usb_uart->cfg_new.uart_ch); + + usb_uart->cfg.uart_ch = usb_uart->cfg_new.uart_ch; + usb_uart_set_baudrate(usb_uart, usb_uart->cfg.baudrate); + + furi_thread_start(usb_uart->tx_thread); + } + if(usb_uart->cfg.baudrate != usb_uart->cfg_new.baudrate) { + usb_uart_set_baudrate(usb_uart, usb_uart->cfg_new.baudrate); + usb_uart->cfg.baudrate = usb_uart->cfg_new.baudrate; + } + if(usb_uart->cfg.flow_pins != usb_uart->cfg_new.flow_pins) { + if(usb_uart->cfg.flow_pins != 0) { + hal_gpio_init_simple( + flow_pins[usb_uart->cfg.flow_pins - 1][0], GpioModeAnalog); + hal_gpio_init_simple( + flow_pins[usb_uart->cfg.flow_pins - 1][1], GpioModeAnalog); + } + if(usb_uart->cfg_new.flow_pins != 0) { + furi_assert( + (usb_uart->cfg_new.flow_pins - 1) < + (sizeof(flow_pins) / sizeof(flow_pins[0]))); + hal_gpio_init_simple( + flow_pins[usb_uart->cfg_new.flow_pins - 1][0], GpioModeOutputPushPull); + hal_gpio_init_simple( + flow_pins[usb_uart->cfg_new.flow_pins - 1][1], GpioModeOutputPushPull); + } + usb_uart->cfg.flow_pins = usb_uart->cfg_new.flow_pins; + events |= WorkerEvtCtrlLineSet; + } + } + if(events & WorkerEvtLineCfgSet) { + if(usb_uart->cfg.baudrate == 0) + usb_uart_set_baudrate(usb_uart, usb_uart->cfg.baudrate); + } + if(events & WorkerEvtCtrlLineSet) { + usb_uart_update_ctrl_lines(usb_uart); + } + } + + usb_uart_vcp_deinit(usb_uart, usb_uart->cfg.vcp_ch); + usb_uart_serial_deinit(usb_uart, usb_uart->cfg.uart_ch); + furi_hal_usb_set_config(usb_mode_prev); + if(usb_uart->cfg.flow_pins != 0) { + hal_gpio_init_simple(flow_pins[usb_uart->cfg.flow_pins - 1][0], GpioModeAnalog); + hal_gpio_init_simple(flow_pins[usb_uart->cfg.flow_pins - 1][1], GpioModeAnalog); } osThreadFlagsSet(furi_thread_get_thread_id(usb_uart->tx_thread), WorkerEvtTxStop); furi_thread_join(usb_uart->tx_thread); furi_thread_free(usb_uart->tx_thread); - if(usb_uart->cfg.uart_ch == FuriHalUartIdUSART1) - furi_hal_console_enable(); - else if(usb_uart->cfg.uart_ch == FuriHalUartIdLPUART1) - furi_hal_uart_deinit(usb_uart->cfg.uart_ch); - - furi_hal_cdc_set_callbacks(usb_uart->cfg.vcp_ch, NULL); - furi_hal_usb_set_config(usb_mode_prev); - if(usb_uart->cfg.vcp_ch == 0) furi_hal_vcp_enable(); - vStreamBufferDelete(usb_uart->rx_stream); osMutexDelete(usb_uart->usb_mutex); osSemaphoreDelete(usb_uart->tx_sem); @@ -147,6 +265,8 @@ static int32_t usb_uart_worker(void* context) { } static int32_t usb_uart_tx_thread(void* context) { + UsbUartBridge* usb_uart = (UsbUartBridge*)context; + uint8_t data[USB_CDC_PKT_LEN]; while(1) { uint32_t events = osThreadFlagsWait(WORKER_ALL_TX_EVENTS, osFlagsWaitAny, osWaitForever); @@ -154,11 +274,12 @@ static int32_t usb_uart_tx_thread(void* context) { if(events & WorkerEvtTxStop) break; if(events & WorkerEvtCdcRx) { furi_check(osMutexAcquire(usb_uart->usb_mutex, osWaitForever) == osOK); - int32_t size = furi_hal_cdc_receive(usb_uart->cfg.vcp_ch, data, USB_CDC_PKT_LEN); + size_t len = furi_hal_cdc_receive(usb_uart->cfg.vcp_ch, data, USB_CDC_PKT_LEN); furi_check(osMutexRelease(usb_uart->usb_mutex) == osOK); - if(size > 0) { - furi_hal_uart_tx(usb_uart->cfg.uart_ch, data, size); + if(len > 0) { + usb_uart->st.tx_cnt += len; + furi_hal_uart_tx(usb_uart->cfg.uart_ch, data, len); } } } @@ -167,46 +288,66 @@ static int32_t usb_uart_tx_thread(void* context) { /* VCP callbacks */ -static void vcp_on_cdc_tx_complete() { +static void vcp_on_cdc_tx_complete(void* context) { + UsbUartBridge* usb_uart = (UsbUartBridge*)context; osSemaphoreRelease(usb_uart->tx_sem); } -static void vcp_on_cdc_rx() { +static void vcp_on_cdc_rx(void* context) { + UsbUartBridge* usb_uart = (UsbUartBridge*)context; osThreadFlagsSet(furi_thread_get_thread_id(usb_uart->tx_thread), WorkerEvtCdcRx); } -static void vcp_state_callback(uint8_t state) { +static void vcp_state_callback(void* context, uint8_t state) { } -static void vcp_on_cdc_control_line(uint8_t state) { +static void vcp_on_cdc_control_line(void* context, uint8_t state) { + UsbUartBridge* usb_uart = (UsbUartBridge*)context; + osThreadFlagsSet(furi_thread_get_thread_id(usb_uart->thread), WorkerEvtCtrlLineSet); } -static void vcp_on_line_config(struct usb_cdc_line_coding* config) { - if((usb_uart->cfg.baudrate == 0) && (config->dwDTERate != 0)) - furi_hal_uart_set_br(usb_uart->cfg.uart_ch, config->dwDTERate); +static void vcp_on_line_config(void* context, struct usb_cdc_line_coding* config) { + UsbUartBridge* usb_uart = (UsbUartBridge*)context; + osThreadFlagsSet(furi_thread_get_thread_id(usb_uart->thread), WorkerEvtLineCfgSet); } -void usb_uart_enable(UsbUartConfig* cfg) { - if(running == false) { - running = true; - usb_uart = furi_alloc(sizeof(UsbUartParams)); +UsbUartBridge* usb_uart_enable(UsbUartConfig* cfg) { + UsbUartBridge* usb_uart = furi_alloc(sizeof(UsbUartBridge)); - usb_uart->thread = furi_thread_alloc(); - furi_thread_set_name(usb_uart->thread, "UsbUartWorker"); - furi_thread_set_stack_size(usb_uart->thread, 1024); - furi_thread_set_context(usb_uart->thread, cfg); - furi_thread_set_callback(usb_uart->thread, usb_uart_worker); + memcpy(&(usb_uart->cfg_new), cfg, sizeof(UsbUartConfig)); - furi_thread_start(usb_uart->thread); - } + usb_uart->thread = furi_thread_alloc(); + furi_thread_set_name(usb_uart->thread, "UsbUartWorker"); + furi_thread_set_stack_size(usb_uart->thread, 1024); + furi_thread_set_context(usb_uart->thread, usb_uart); + furi_thread_set_callback(usb_uart->thread, usb_uart_worker); + + furi_thread_start(usb_uart->thread); + return usb_uart; } -void usb_uart_disable() { - if(running == true) { - osThreadFlagsSet(furi_thread_get_thread_id(usb_uart->thread), WorkerEvtStop); - furi_thread_join(usb_uart->thread); - furi_thread_free(usb_uart->thread); - free(usb_uart); - running = false; - } +void usb_uart_disable(UsbUartBridge* usb_uart) { + osThreadFlagsSet(furi_thread_get_thread_id(usb_uart->thread), WorkerEvtStop); + furi_thread_join(usb_uart->thread); + furi_thread_free(usb_uart->thread); + free(usb_uart); +} + +void usb_uart_set_config(UsbUartBridge* usb_uart, UsbUartConfig* cfg) { + furi_assert(usb_uart); + furi_assert(cfg); + memcpy(&(usb_uart->cfg_new), cfg, sizeof(UsbUartConfig)); + osThreadFlagsSet(furi_thread_get_thread_id(usb_uart->thread), WorkerEvtCfgChange); +} + +void usb_uart_get_config(UsbUartBridge* usb_uart, UsbUartConfig* cfg) { + furi_assert(usb_uart); + furi_assert(cfg); + memcpy(cfg, &(usb_uart->cfg_new), sizeof(UsbUartConfig)); +} + +void usb_uart_get_state(UsbUartBridge* usb_uart, UsbUartState* st) { + furi_assert(usb_uart); + furi_assert(st); + memcpy(st, &(usb_uart->st), sizeof(UsbUartState)); } diff --git a/applications/gpio/usb_uart_bridge.h b/applications/gpio/usb_uart_bridge.h index 2fe6d1d8..e35ec2da 100644 --- a/applications/gpio/usb_uart_bridge.h +++ b/applications/gpio/usb_uart_bridge.h @@ -2,12 +2,28 @@ #include +typedef struct UsbUartBridge UsbUartBridge; + typedef struct { uint8_t vcp_ch; uint8_t uart_ch; + uint8_t flow_pins; + uint8_t baudrate_mode; uint32_t baudrate; } UsbUartConfig; -void usb_uart_enable(UsbUartConfig* cfg); +typedef struct { + uint32_t rx_cnt; + uint32_t tx_cnt; + uint32_t baudrate_cur; +} UsbUartState; -void usb_uart_disable(); +UsbUartBridge* usb_uart_enable(UsbUartConfig* cfg); + +void usb_uart_disable(UsbUartBridge* usb_uart); + +void usb_uart_set_config(UsbUartBridge* usb_uart, UsbUartConfig* cfg); + +void usb_uart_get_config(UsbUartBridge* usb_uart, UsbUartConfig* cfg); + +void usb_uart_get_state(UsbUartBridge* usb_uart, UsbUartState* st); diff --git a/applications/gpio/views/gpio_usb_uart.c b/applications/gpio/views/gpio_usb_uart.c new file mode 100644 index 00000000..d83f2532 --- /dev/null +++ b/applications/gpio/views/gpio_usb_uart.c @@ -0,0 +1,154 @@ +#include "../usb_uart_bridge.h" +#include "../gpio_app_i.h" +#include "furi-hal.h" +#include + +struct GpioUsbUart { + View* view; + GpioUsbUartCallback callback; + void* context; +}; + +typedef struct { + uint32_t baudrate; + uint32_t tx_cnt; + uint32_t rx_cnt; + uint8_t vcp_port; + uint8_t tx_pin; + uint8_t rx_pin; + bool tx_active; + bool rx_active; +} GpioUsbUartModel; + +static void gpio_usb_uart_draw_callback(Canvas* canvas, void* _model) { + GpioUsbUartModel* model = _model; + char temp_str[18]; + elements_button_left(canvas, "Config"); + canvas_draw_line(canvas, 2, 10, 125, 10); + canvas_draw_line(canvas, 44, 52, 123, 52); + + canvas_set_font(canvas, FontPrimary); + canvas_draw_str(canvas, 2, 9, "USB Serial"); + canvas_draw_str(canvas, 3, 25, "TX:"); + canvas_draw_str(canvas, 3, 42, "RX:"); + + canvas_set_font(canvas, FontSecondary); + snprintf(temp_str, 18, "COM PORT:%u", model->vcp_port); + canvas_draw_str_aligned(canvas, 126, 8, AlignRight, AlignBottom, temp_str); + snprintf(temp_str, 18, "Pin %u", model->tx_pin); + canvas_draw_str(canvas, 22, 25, temp_str); + snprintf(temp_str, 18, "Pin %u", model->rx_pin); + canvas_draw_str(canvas, 22, 42, temp_str); + + canvas_draw_str_aligned(canvas, 127, 24, AlignRight, AlignBottom, "B."); + canvas_draw_str_aligned(canvas, 127, 41, AlignRight, AlignBottom, "B."); + + if(model->baudrate == 0) + snprintf(temp_str, 18, "Baud: ????"); + else + snprintf(temp_str, 18, "Baud: %lu", model->baudrate); + canvas_draw_str(canvas, 45, 62, temp_str); + + if(model->tx_cnt < 100000000) { + canvas_set_font(canvas, FontSecondary); + canvas_draw_str_aligned(canvas, 127, 24, AlignRight, AlignBottom, "B."); + canvas_set_font(canvas, FontKeyboard); + snprintf(temp_str, 18, "%lu", model->tx_cnt); + canvas_draw_str_aligned(canvas, 116, 24, AlignRight, AlignBottom, temp_str); + } else { + canvas_set_font(canvas, FontSecondary); + canvas_draw_str_aligned(canvas, 127, 24, AlignRight, AlignBottom, "KB."); + canvas_set_font(canvas, FontKeyboard); + snprintf(temp_str, 18, "%lu", model->tx_cnt); + canvas_draw_str_aligned(canvas, 110, 24, AlignRight, AlignBottom, temp_str); + } + + if(model->rx_cnt < 100000000) { + canvas_set_font(canvas, FontSecondary); + canvas_draw_str_aligned(canvas, 127, 41, AlignRight, AlignBottom, "B."); + canvas_set_font(canvas, FontKeyboard); + snprintf(temp_str, 18, "%lu", model->rx_cnt); + canvas_draw_str_aligned(canvas, 116, 41, AlignRight, AlignBottom, temp_str); + } else { + canvas_set_font(canvas, FontSecondary); + canvas_draw_str_aligned(canvas, 127, 41, AlignRight, AlignBottom, "KB."); + canvas_set_font(canvas, FontKeyboard); + snprintf(temp_str, 18, "%lu", model->rx_cnt); + canvas_draw_str_aligned(canvas, 110, 41, AlignRight, AlignBottom, temp_str); + } + + if(model->tx_active) + canvas_draw_icon(canvas, 48, 14, &I_ArrowUpFilled_14x15); + else + canvas_draw_icon(canvas, 48, 14, &I_ArrowUpEmpty_14x15); + + if(model->rx_active) + canvas_draw_icon(canvas, 48, 34, &I_ArrowDownFilled_14x15); + else + canvas_draw_icon(canvas, 48, 34, &I_ArrowDownEmpty_14x15); +} + +static bool gpio_usb_uart_input_callback(InputEvent* event, void* context) { + furi_assert(context); + GpioUsbUart* usb_uart = context; + bool consumed = false; + + if(event->type == InputTypeShort) { + if(event->key == InputKeyLeft) { + consumed = true; + furi_assert(usb_uart->callback); + usb_uart->callback(GpioUsbUartEventConfig, usb_uart->context); + } + } + + return consumed; +} + +GpioUsbUart* gpio_usb_uart_alloc() { + GpioUsbUart* usb_uart = furi_alloc(sizeof(GpioUsbUart)); + + usb_uart->view = view_alloc(); + view_allocate_model(usb_uart->view, ViewModelTypeLocking, sizeof(GpioUsbUartModel)); + view_set_context(usb_uart->view, usb_uart); + view_set_draw_callback(usb_uart->view, gpio_usb_uart_draw_callback); + view_set_input_callback(usb_uart->view, gpio_usb_uart_input_callback); + + return usb_uart; +} + +void gpio_usb_uart_free(GpioUsbUart* usb_uart) { + furi_assert(usb_uart); + view_free(usb_uart->view); + free(usb_uart); +} + +View* gpio_usb_uart_get_view(GpioUsbUart* usb_uart) { + furi_assert(usb_uart); + return usb_uart->view; +} + +void gpio_usb_uart_set_callback(GpioUsbUart* usb_uart, GpioUsbUartCallback callback, void* context) { + furi_assert(usb_uart); + furi_assert(callback); + usb_uart->callback = callback; + usb_uart->context = context; +} + +void gpio_usb_uart_update_state(GpioUsbUart* instance, UsbUartConfig* cfg, UsbUartState* st) { + furi_assert(instance); + furi_assert(cfg); + furi_assert(st); + + with_view_model( + instance->view, (GpioUsbUartModel * model) { + model->baudrate = st->baudrate_cur; + model->vcp_port = cfg->vcp_ch; + model->tx_pin = (cfg->uart_ch == 0) ? (13) : (15); + model->rx_pin = (cfg->uart_ch == 0) ? (14) : (16); + model->tx_active = (model->tx_cnt != st->tx_cnt); + model->rx_active = (model->rx_cnt != st->rx_cnt); + model->tx_cnt = st->tx_cnt; + model->rx_cnt = st->rx_cnt; + return false; + }); +} diff --git a/applications/gpio/views/gpio_usb_uart.h b/applications/gpio/views/gpio_usb_uart.h new file mode 100755 index 00000000..854b51f8 --- /dev/null +++ b/applications/gpio/views/gpio_usb_uart.h @@ -0,0 +1,18 @@ +#pragma once + +#include +#include "../gpio_custom_event.h" +#include "../usb_uart_bridge.h" + +typedef struct GpioUsbUart GpioUsbUart; +typedef void (*GpioUsbUartCallback)(GpioCustomEvent event, void* context); + +GpioUsbUart* gpio_usb_uart_alloc(); + +void gpio_usb_uart_free(GpioUsbUart* usb_uart); + +View* gpio_usb_uart_get_view(GpioUsbUart* usb_uart); + +void gpio_usb_uart_set_callback(GpioUsbUart* usb_uart, GpioUsbUartCallback callback, void* context); + +void gpio_usb_uart_update_state(GpioUsbUart* instance, UsbUartConfig* cfg, UsbUartState* st); diff --git a/assets/compiled/assets_icons.c b/assets/compiled/assets_icons.c index a9fe403d..65178a9c 100644 --- a/assets/compiled/assets_icons.c +++ b/assets/compiled/assets_icons.c @@ -25,185 +25,197 @@ const uint8_t _A_Wink_128x64_7[] = {0x01,0x00,0x9a,0x01,0x00,0x78,0x03,0xc0,0x1e const uint8_t _A_Wink_128x64_8[] = {0x01,0x00,0x95,0x01,0x00,0x78,0x03,0xc0,0x1e,0x00,0xf0,0x07,0x80,0x3c,0x01,0xe0,0x0f,0x00,0x78,0x03,0xc0,0x1e,0x00,0xf0,0x00,0xf8,0x3f,0xf1,0xf0,0x7e,0x4e,0x02,0x23,0x01,0x07,0xdc,0x1e,0x01,0xf0,0x87,0x03,0xab,0x81,0xff,0xdf,0xc7,0xae,0x00,0xfa,0x98,0x40,0x2a,0x90,0x7e,0xc0,0xc2,0xa3,0x10,0x0d,0x54,0x0f,0x1d,0x03,0x07,0xcc,0x12,0x01,0x55,0x81,0xc4,0xc8,0x16,0x1f,0x1e,0x0d,0x86,0x10,0x0f,0xbe,0xad,0xc3,0x08,0x34,0x10,0x03,0xe0,0x00,0x43,0xea,0x8c,0x42,0x22,0x3e,0x08,0x78,0x3d,0xa8,0x00,0x21,0xaa,0xe3,0x22,0x13,0x88,0xe5,0xe0,0x1e,0xd2,0x00,0x10,0xda,0xa0,0x92,0x19,0x64,0x1f,0x80,0x7e,0x7c,0x07,0xfe,0x7f,0x0c,0x81,0x79,0xa0,0x38,0x04,0x13,0x44,0x03,0x03,0x18,0x8c,0x61,0x24,0x6b,0x31,0x07,0xb4,0x22,0xc1,0xfe,0x99,0xcc,0x3c,0x11,0x08,0x07,0xe0,0x1e,0xd0,0x49,0x84,0x06,0xc9,0x20,0x9c,0x43,0x20,0x1f,0xe1,0xfb,0x40,0xb2,0x10,0x0e,0x41,0xb0,0x60,0x58,0x0b,0xf8,0x3d,0xa0,0x34,0x8f,0xe6,0x44,0x0a,0x5e,0x09,0xfa,0x41,0xe5,0x1f,0xed,0x1c,0x04,0xa6,0x3f,0x08,0xf8,0x3d,0xe4,0x9f,0xf9,0x3c,0x05,0xe6,0x3f,0xc4,0xfb,0xc0,0x22,0x9f,0xfa,0x3c,0x05,0x9c,0x3f,0xe8,0x38,0x3d,0xf2,0x9e,0x7a,0x7c,0x06,0x0c,0x94,0x18,0x18,0x3e,0xb0,0x24,0x01,0xff,0x9f,0x98,0x1e,0x5f,0xfa,0x7d,0xc6,0x01,0xe0,0xff,0xbc,0x20,0x1e,0x51,0xd2,0xf0,0x9f,0x9c,0x1e,0x84,0xb1,0xfc,0x1f,0xa3,0x01,0x96,0xff,0x86,0xcb,0xf8,0x7e,0x8a,0x04,0x97,0xff,0x41,0x02,0x8f,0xf8,0xfd,0x1a,0x09,0x55,0xf8,0x0a,0x5f,0xf3,0xf4,0x54,0x29,0xb1,0xe1,0xa1,0x1f,0xa7,0x51,0x9a,0x81,0x01,0x04,0xfc,0x58,0x01,0x0b,0x54,0x32,0xa8,0x92,0xf8,0x7f,0xca,0x83,0x0e,0x0f,0xb7,0xa8,0x08,0x5f,0x88,0x09,0x7c,0x61,0x21,0xf6,0xaa,0x81,0x0b,0xf9,0x00,0xb8,0x70,0x1a,0x62,0x1f,0x59,0x50,0x10,0xa7,0xcb,0x01,0x9c,0x83,0xda,0xa1,0x15,0x80,0x58,0x30,0x02,0xd1,0xc0,0x43,0xe0,0x81,0xf6,0x85,0x17,0x47,0xe0,0xad,0x1f,0x84,0x00,0x1e,0xd5,0x08,0x2a,0x34,0x80,0x02,0x21,0x13,0xb1,0x07,0xd8,0x00,0xa7,0x62,0x0f,0xbb,0x5d,0x17,0xee,0x1f,0x6a,0x02,0xc1,0xc0,0x0d,0x3c,0x07,0x6f,0x01,0xa1,0x00,0x05,0x98,0x03,0xb5,0x1c,0x20,0xfd,0xb8,0x13,0x79,0xd8,0xc0,0xff,0x1f,0x78,0x01,0xfe,0x10,0x70,0x7e,0xff,0x0f,0xbd,0xfe,0x07,0xc8,}; const uint8_t *_A_Wink_128x64[] = {_A_Wink_128x64_0,_A_Wink_128x64_1,_A_Wink_128x64_2,_A_Wink_128x64_3,_A_Wink_128x64_4,_A_Wink_128x64_5,_A_Wink_128x64_6,_A_Wink_128x64_7,_A_Wink_128x64_8}; -const uint8_t _I_sub1_10px_0[] = {0x01,0x00,0x12,0x00,0x81,0x40,0x69,0x30,0x2c,0x2c,0x0b,0x6a,0x01,0x28,0x0c,0x0a,0x65,0x01,0x98,0x40,0x00,0x26,}; -const uint8_t *_I_sub1_10px[] = {_I_sub1_10px_0}; - -const uint8_t _I_ir_10px_0[] = {0x00,0xFC,0x00,0x02,0x01,0x79,0x02,0x84,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x58,0x00,0x78,0x00,0xFF,0x03,}; -const uint8_t *_I_ir_10px[] = {_I_ir_10px_0}; - -const uint8_t _I_unknown_10px_0[] = {0x01,0x00,0x12,0x00,0xbc,0x40,0x39,0x90,0x0c,0x24,0x03,0x81,0x00,0xb0,0x40,0x26,0x00,0x12,0x00,0x08,0x14,0xc0,}; -const uint8_t *_I_unknown_10px[] = {_I_unknown_10px_0}; +const uint8_t _I_ble_10px_0[] = {0x00,0x04,0x00,0x8C,0x00,0x15,0x01,0x56,0x02,0x8C,0x02,0x8C,0x02,0x56,0x02,0x15,0x01,0x8C,0x00,0x04,0x00,}; +const uint8_t *_I_ble_10px[] = {_I_ble_10px_0}; const uint8_t _I_ibutt_10px_0[] = {0x00,0x80,0x03,0x40,0x02,0x20,0x02,0x10,0x01,0x8E,0x00,0x41,0x00,0x2D,0x00,0x2D,0x00,0x21,0x00,0x1E,0x00,}; const uint8_t *_I_ibutt_10px[] = {_I_ibutt_10px_0}; -const uint8_t _I_Nfc_10px_0[] = {0x00,0x80,0x00,0x00,0x01,0x22,0x02,0x43,0x02,0x45,0x02,0x49,0x02,0x31,0x02,0x22,0x02,0x00,0x01,0x80,0x00,}; -const uint8_t *_I_Nfc_10px[] = {_I_Nfc_10px_0}; - -const uint8_t _I_ble_10px_0[] = {0x00,0x04,0x00,0x8C,0x00,0x15,0x01,0x56,0x02,0x8C,0x02,0x8C,0x02,0x56,0x02,0x15,0x01,0x8C,0x00,0x04,0x00,}; -const uint8_t *_I_ble_10px[] = {_I_ble_10px_0}; - const uint8_t _I_125_10px_0[] = {0x00,0xE0,0x00,0x00,0x01,0x0E,0x02,0x31,0x02,0x45,0x02,0x91,0x00,0xAA,0x00,0x92,0x00,0x44,0x00,0x38,0x00,}; const uint8_t *_I_125_10px[] = {_I_125_10px_0}; +const uint8_t _I_sub1_10px_0[] = {0x01,0x00,0x12,0x00,0x81,0x40,0x69,0x30,0x2c,0x2c,0x0b,0x6a,0x01,0x28,0x0c,0x0a,0x65,0x01,0x98,0x40,0x00,0x26,}; +const uint8_t *_I_sub1_10px[] = {_I_sub1_10px_0}; + const uint8_t _I_dir_10px_0[] = {0x01,0x00,0x11,0x00,0x00,0x0c,0xfe,0x01,0x41,0x80,0x7f,0xe0,0x70,0x18,0x10,0x05,0x7f,0xd0,0x10,0x88,0x80,}; const uint8_t *_I_dir_10px[] = {_I_dir_10px_0}; +const uint8_t _I_ir_10px_0[] = {0x00,0xFC,0x00,0x02,0x01,0x79,0x02,0x84,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x58,0x00,0x78,0x00,0xFF,0x03,}; +const uint8_t *_I_ir_10px[] = {_I_ir_10px_0}; + +const uint8_t _I_Nfc_10px_0[] = {0x00,0x80,0x00,0x00,0x01,0x22,0x02,0x43,0x02,0x45,0x02,0x49,0x02,0x31,0x02,0x22,0x02,0x00,0x01,0x80,0x00,}; +const uint8_t *_I_Nfc_10px[] = {_I_Nfc_10px_0}; + +const uint8_t _I_unknown_10px_0[] = {0x01,0x00,0x12,0x00,0xbc,0x40,0x39,0x90,0x0c,0x24,0x03,0x81,0x00,0xb0,0x40,0x26,0x00,0x12,0x00,0x08,0x14,0xc0,}; +const uint8_t *_I_unknown_10px[] = {_I_unknown_10px_0}; + const uint8_t _I_BLE_Pairing_128x64_0[] = {0x01,0x00,0xb7,0x01,0x00,0x6c,0x38,0x1f,0xd0,0x10,0x76,0xe0,0x03,0xdd,0x40,0x07,0xf4,0x82,0x01,0x08,0x07,0xf4,0xc0,0x1f,0x91,0x08,0x07,0x00,0x1f,0xc0,0x0d,0x1e,0xe8,0x3f,0xc0,0x03,0x58,0x80,0xcf,0x11,0xd9,0xaf,0x85,0x77,0x01,0xf7,0x60,0xf8,0x45,0xff,0x05,0xed,0x9e,0x7c,0x09,0xdb,0xe0,0x2f,0x78,0x03,0x3c,0x8e,0xee,0x8a,0x43,0x81,0xfb,0x0c,0x66,0xe8,0xfc,0x59,0xba,0x6f,0x28,0x1b,0xfb,0xa3,0x80,0xfc,0xa0,0x1f,0xc6,0x86,0xbf,0xc3,0x78,0xce,0x04,0x19,0x26,0x77,0xfa,0x43,0xbe,0x12,0xa0,0x7e,0xf8,0x2a,0xa2,0x02,0xff,0x89,0x27,0x01,0xbf,0x99,0x38,0x8a,0xfc,0x0f,0x8e,0x07,0xfe,0x0e,0x94,0x2c,0x07,0xfc,0x7f,0x1f,0xf5,0x00,0xc3,0x00,0xe4,0x31,0x13,0xd1,0x00,0x0a,0xb8,0x19,0x25,0x91,0xc0,0x81,0xe2,0xb9,0x4d,0x5d,0x78,0x64,0x2e,0x84,0x80,0x61,0x07,0x02,0x3e,0x2a,0xa4,0xa2,0x00,0xf2,0x40,0x20,0xe3,0x21,0xa0,0x62,0x9f,0x60,0x05,0x02,0x3e,0x36,0x41,0x66,0x23,0x20,0x51,0xfc,0x40,0x68,0x0f,0x15,0x90,0x60,0x20,0x1b,0x09,0x89,0x70,0x46,0x42,0x07,0x14,0x99,0x41,0xe8,0x1f,0x18,0x0c,0x07,0xc1,0x19,0xff,0xc3,0xce,0x6b,0x54,0x8f,0xe0,0x3f,0x90,0x78,0x17,0x02,0x1a,0x70,0x39,0x01,0xa0,0xb1,0x53,0xb5,0x88,0xc7,0xe0,0x98,0x08,0x3a,0xd5,0xe8,0x97,0xd0,0x78,0xcf,0xe1,0x07,0xf1,0x0d,0x08,0x00,0x74,0x10,0x80,0x18,0xe8,0x97,0xc3,0xf2,0xff,0xc4,0x03,0xe3,0x04,0x8c,0x19,0xcc,0x00,0x35,0x0c,0x3c,0x03,0xf9,0x3f,0xb0,0x8f,0xc6,0x31,0x0e,0x0f,0x90,0x90,0xb5,0x45,0xc1,0xf8,0x4f,0xf0,0xde,0x18,0xcc,0x82,0x08,0x1f,0x22,0x20,0xd0,0x3a,0xab,0xd1,0xe0,0x5f,0xa1,0x1b,0x19,0x8d,0x02,0x04,0x9a,0x1d,0x04,0x28,0x26,0x36,0xa8,0x05,0xf0,0xe0,0x3f,0x04,0xf8,0xd0,0x30,0x55,0xfa,0xad,0x54,0x3e,0x35,0x09,0xab,0xac,0xbf,0x2b,0xf2,0x0a,0x0e,0xfb,0x55,0xaa,0x0f,0x94,0x68,0x04,0x30,0x6f,0xd3,0x7c,0xb0,0x15,0x0f,0xfd,0x7f,0xeb,0x05,0x4f,0x0b,0x60,0xa3,0x1f,0x28,0x0b,0xfc,0xbc,0x30,0x1f,0xf7,0xfe,0x54,0x2c,0x18,0x30,0x3c,0x6f,0x00,0xf2,0x1c,0x8c,0xf8,0x10,0x3c,0x00,0xf8,0xd5,0x5c,0x05,0xb8,0xb0,0xaa,0xdb,0x01,0x2b,0x31,0x0a,0xdc,0xa7,0x00,0xe6,0x00,0x0c,0x56,0x00,0x7e,0x10,0x00,0xcc,0x01,0xf0,0x1f,0x1b,0x40,0x2e,0x00,0x07,0x16,0x10,0x90,0x02,0xe5,0x90,0x06,0x29,0x00,0x2a,0xa9,0x00,0x2f,0x10,0x02,0xa5,0x10,0x02,0xf1,0x00,0x2a,0xa0,0x0d,0xc0,0x00,0xec,0x01,0xfd,0x60,0x17,0x6a,0xc0,0x60,0x40,0xfd,0xc0,0x30,0x04,0x01,0xb0,0xb0,0x7f,0x45,0x80,}; const uint8_t *_I_BLE_Pairing_128x64[] = {_I_BLE_Pairing_128x64_0}; -const uint8_t _I_ButtonDown_7x4_0[] = {0x00,0x7F,0x3E,0x1C,0x08,}; -const uint8_t *_I_ButtonDown_7x4[] = {_I_ButtonDown_7x4_0}; - -const uint8_t _I_ButtonCenter_7x7_0[] = {0x00,0x1C,0x22,0x5D,0x5D,0x5D,0x22,0x1C,}; -const uint8_t *_I_ButtonCenter_7x7[] = {_I_ButtonCenter_7x7_0}; - -const uint8_t _I_ButtonLeft_4x7_0[] = {0x00,0x08,0x0C,0x0E,0x0F,0x0E,0x0C,0x08,}; -const uint8_t *_I_ButtonLeft_4x7[] = {_I_ButtonLeft_4x7_0}; - -const uint8_t _I_ButtonUp_7x4_0[] = {0x00,0x08,0x1C,0x3E,0x7F,}; -const uint8_t *_I_ButtonUp_7x4[] = {_I_ButtonUp_7x4_0}; - -const uint8_t _I_DFU_128x50_0[] = {0x01,0x00,0x2e,0x02,0x00,0x57,0xfe,0x0e,0x0e,0xcf,0x84,0x02,0x70,0x0f,0xc8,0x74,0x03,0x80,0x0e,0xbc,0x7c,0x04,0x06,0x30,0x30,0x74,0xe0,0x2f,0xe0,0x42,0x82,0x03,0xe7,0x81,0xff,0x02,0x14,0x20,0x1f,0x3e,0x00,0x79,0xc4,0x01,0xfd,0x20,0x07,0xd5,0xd4,0xe2,0x53,0xf2,0x74,0xff,0xe1,0x40,0x41,0x87,0xd8,0x01,0xf1,0x60,0xf0,0x43,0xca,0x43,0xe0,0xa7,0x83,0xe2,0x30,0x01,0x29,0x84,0x7b,0x20,0x0f,0x88,0x30,0x3c,0xb1,0x90,0x1d,0x00,0xfa,0x30,0x3f,0xf8,0xcc,0x02,0xc6,0x31,0x1f,0x83,0x49,0xa8,0x16,0x0a,0xf4,0x7f,0x00,0x21,0x1f,0x04,0x38,0x06,0x20,0x04,0x90,0x46,0x35,0xf0,0xfa,0x00,0xcc,0x7f,0x10,0x14,0x0b,0x46,0x20,0xd5,0x70,0x50,0xb4,0x06,0xf1,0x00,0x9f,0x03,0xd7,0x09,0x81,0xd7,0xc0,0x8b,0x85,0x38,0xc0,0x50,0x41,0xeb,0x63,0xc0,0x07,0xc6,0x90,0xbf,0x2b,0x05,0x01,0xb8,0xb1,0x0c,0x06,0xae,0x01,0x24,0x6f,0x94,0x42,0x80,0xb2,0x49,0xc4,0x33,0x80,0x1f,0x18,0x93,0xfc,0xa1,0x14,0x0e,0x02,0x9c,0x43,0xc3,0x07,0x81,0xfc,0x03,0xe2,0xc0,0x28,0x14,0x10,0x5e,0x3f,0x03,0xc0,0xcf,0xf8,0x10,0x0f,0xe5,0x56,0x03,0x05,0xf0,0x40,0x20,0x20,0xf2,0x42,0x0d,0xfd,0x72,0x30,0x0f,0xf8,0x7c,0x41,0xe3,0x80,0x10,0x0d,0x00,0x5c,0x4a,0xd1,0x87,0xf8,0x39,0xf5,0x5c,0x0c,0x0b,0xe0,0x1c,0x10,0x78,0xfc,0x02,0x04,0x20,0x1f,0xf7,0x0f,0x57,0x80,0x81,0x5e,0x13,0x83,0x01,0x1f,0x97,0xff,0xfe,0x03,0x2e,0x07,0x57,0x03,0x01,0xbf,0x1d,0x45,0x70,0x27,0xe4,0xff,0x8c,0x07,0xf5,0x83,0xe0,0xcf,0xe1,0x00,0xf6,0x10,0x8c,0x07,0xb1,0x07,0xc1,0xfc,0x63,0xe5,0xd2,0x07,0x8f,0x80,0x1a,0x21,0xe1,0xc0,0x71,0xe0,0x20,0xf1,0x24,0x88,0x34,0x62,0x00,0xe3,0x3f,0x8d,0xfe,0x81,0x80,0xc1,0xf8,0x5b,0xe2,0x0f,0x18,0xc7,0xf0,0x1e,0x50,0x35,0xa0,0xc8,0x3f,0x98,0x30,0x70,0x87,0x44,0x1e,0x21,0xe3,0xf8,0x02,0x4b,0xaf,0x01,0x81,0xb3,0xca,0x01,0x1c,0x25,0x94,0x01,0x04,0x58,0x8d,0x5c,0x0b,0xc6,0x08,0x10,0x78,0xc3,0x3f,0xf0,0x72,0x88,0x98,0x8b,0x89,0x55,0x82,0xc7,0x9b,0xe5,0x00,0x87,0x26,0xc4,0x46,0x20,0xf2,0xd1,0x87,0xc6,0x0c,0xdf,0x21,0x50,0x8a,0xc7,0x00,0x38,0x2e,0x04,0x42,0xaf,0x05,0x06,0x0a,0xb8,0x70,0x0f,0x91,0x80,0x5c,0x03,0xc5,0x30,0x84,0x6a,0xe1,0x40,0xf1,0x7b,0x0f,0x00,0x7a,0x24,0x21,0x07,0x94,0x33,0x09,0x57,0x8a,0x93,0x85,0xec,0x3e,0x00,0x79,0x0b,0x88,0x06,0x3c,0x3f,0xfc,0xa8,0x1e,0x21,0x91,0x76,0x90,0x90,0x40,0x03,0xe0,0xe0,0x78,0x3f,0xd5,0x58,0x0e,0x08,0x32,0x3f,0x88,0xa8,0x90,0x8c,0x25,0x30,0xbc,0x7f,0xb5,0x50,0x1b,0xe0,0x20,0x7f,0x92,0x33,0x88,0x97,0x4a,0x07,0x0c,0x9e,0x5f,0xeb,0xaa,0xf2,0x74,0x8d,0x17,0x80,0x06,0x29,0xf1,0xe0,0x71,0xfb,0xfd,0x71,0xd8,0xff,0xf8,0x21,0x71,0x04,0x87,0x01,0xc1,0xa1,0xff,0x83,0xe7,0xf0,0xff,0xc1,0x51,0xe4,0xdd,0x1b,0x07,0xc2,0x63,0xf6,0x0f,0x9f,0xeb,0x5f,0x02,0x77,0x8a,0xc4,0xa3,0x17,0xc8,0x44,0x8c,0x34,0x20,0x71,0xfe,0x99,0x04,0x88,0x40,0x01,0xc3,0x47,0xf0,0x93,0x0f,0xf4,0x28,0x0e,0x3a,0xad,0x50,0x39,0x30,0x1f,0x18,0x3d,0x0e,0x31,0xff,0x3d,0x0c,0x02,0xa8,0x03,0x20,0x01,0x7e,0x3f,0xf8,0x09,0x06,0x33,0xfe,0x1b,0x50,}; -const uint8_t *_I_DFU_128x50[] = {_I_DFU_128x50_0}; - -const uint8_t _I_ButtonLeftSmall_3x5_0[] = {0x00,0x04,0x06,0x07,0x06,0x04,}; -const uint8_t *_I_ButtonLeftSmall_3x5[] = {_I_ButtonLeftSmall_3x5_0}; - const uint8_t _I_ButtonRightSmall_3x5_0[] = {0x00,0x01,0x03,0x07,0x03,0x01,}; const uint8_t *_I_ButtonRightSmall_3x5[] = {_I_ButtonRightSmall_3x5_0}; +const uint8_t _I_ButtonLeftSmall_3x5_0[] = {0x00,0x04,0x06,0x07,0x06,0x04,}; +const uint8_t *_I_ButtonLeftSmall_3x5[] = {_I_ButtonLeftSmall_3x5_0}; + +const uint8_t _I_ButtonCenter_7x7_0[] = {0x00,0x1C,0x22,0x5D,0x5D,0x5D,0x22,0x1C,}; +const uint8_t *_I_ButtonCenter_7x7[] = {_I_ButtonCenter_7x7_0}; + +const uint8_t _I_ButtonDown_7x4_0[] = {0x00,0x7F,0x3E,0x1C,0x08,}; +const uint8_t *_I_ButtonDown_7x4[] = {_I_ButtonDown_7x4_0}; + const uint8_t _I_ButtonRight_4x7_0[] = {0x00,0x01,0x03,0x07,0x0F,0x07,0x03,0x01,}; const uint8_t *_I_ButtonRight_4x7[] = {_I_ButtonRight_4x7_0}; +const uint8_t _I_DFU_128x50_0[] = {0x01,0x00,0x2e,0x02,0x00,0x57,0xfe,0x0e,0x0e,0xcf,0x84,0x02,0x70,0x0f,0xc8,0x74,0x03,0x80,0x0e,0xbc,0x7c,0x04,0x06,0x30,0x30,0x74,0xe0,0x2f,0xe0,0x42,0x82,0x03,0xe7,0x81,0xff,0x02,0x14,0x20,0x1f,0x3e,0x00,0x79,0xc4,0x01,0xfd,0x20,0x07,0xd5,0xd4,0xe2,0x53,0xf2,0x74,0xff,0xe1,0x40,0x41,0x87,0xd8,0x01,0xf1,0x60,0xf0,0x43,0xca,0x43,0xe0,0xa7,0x83,0xe2,0x30,0x01,0x29,0x84,0x7b,0x20,0x0f,0x88,0x30,0x3c,0xb1,0x90,0x1d,0x00,0xfa,0x30,0x3f,0xf8,0xcc,0x02,0xc6,0x31,0x1f,0x83,0x49,0xa8,0x16,0x0a,0xf4,0x7f,0x00,0x21,0x1f,0x04,0x38,0x06,0x20,0x04,0x90,0x46,0x35,0xf0,0xfa,0x00,0xcc,0x7f,0x10,0x14,0x0b,0x46,0x20,0xd5,0x70,0x50,0xb4,0x06,0xf1,0x00,0x9f,0x03,0xd7,0x09,0x81,0xd7,0xc0,0x8b,0x85,0x38,0xc0,0x50,0x41,0xeb,0x63,0xc0,0x07,0xc6,0x90,0xbf,0x2b,0x05,0x01,0xb8,0xb1,0x0c,0x06,0xae,0x01,0x24,0x6f,0x94,0x42,0x80,0xb2,0x49,0xc4,0x33,0x80,0x1f,0x18,0x93,0xfc,0xa1,0x14,0x0e,0x02,0x9c,0x43,0xc3,0x07,0x81,0xfc,0x03,0xe2,0xc0,0x28,0x14,0x10,0x5e,0x3f,0x03,0xc0,0xcf,0xf8,0x10,0x0f,0xe5,0x56,0x03,0x05,0xf0,0x40,0x20,0x20,0xf2,0x42,0x0d,0xfd,0x72,0x30,0x0f,0xf8,0x7c,0x41,0xe3,0x80,0x10,0x0d,0x00,0x5c,0x4a,0xd1,0x87,0xf8,0x39,0xf5,0x5c,0x0c,0x0b,0xe0,0x1c,0x10,0x78,0xfc,0x02,0x04,0x20,0x1f,0xf7,0x0f,0x57,0x80,0x81,0x5e,0x13,0x83,0x01,0x1f,0x97,0xff,0xfe,0x03,0x2e,0x07,0x57,0x03,0x01,0xbf,0x1d,0x45,0x70,0x27,0xe4,0xff,0x8c,0x07,0xf5,0x83,0xe0,0xcf,0xe1,0x00,0xf6,0x10,0x8c,0x07,0xb1,0x07,0xc1,0xfc,0x63,0xe5,0xd2,0x07,0x8f,0x80,0x1a,0x21,0xe1,0xc0,0x71,0xe0,0x20,0xf1,0x24,0x88,0x34,0x62,0x00,0xe3,0x3f,0x8d,0xfe,0x81,0x80,0xc1,0xf8,0x5b,0xe2,0x0f,0x18,0xc7,0xf0,0x1e,0x50,0x35,0xa0,0xc8,0x3f,0x98,0x30,0x70,0x87,0x44,0x1e,0x21,0xe3,0xf8,0x02,0x4b,0xaf,0x01,0x81,0xb3,0xca,0x01,0x1c,0x25,0x94,0x01,0x04,0x58,0x8d,0x5c,0x0b,0xc6,0x08,0x10,0x78,0xc3,0x3f,0xf0,0x72,0x88,0x98,0x8b,0x89,0x55,0x82,0xc7,0x9b,0xe5,0x00,0x87,0x26,0xc4,0x46,0x20,0xf2,0xd1,0x87,0xc6,0x0c,0xdf,0x21,0x50,0x8a,0xc7,0x00,0x38,0x2e,0x04,0x42,0xaf,0x05,0x06,0x0a,0xb8,0x70,0x0f,0x91,0x80,0x5c,0x03,0xc5,0x30,0x84,0x6a,0xe1,0x40,0xf1,0x7b,0x0f,0x00,0x7a,0x24,0x21,0x07,0x94,0x33,0x09,0x57,0x8a,0x93,0x85,0xec,0x3e,0x00,0x79,0x0b,0x88,0x06,0x3c,0x3f,0xfc,0xa8,0x1e,0x21,0x91,0x76,0x90,0x90,0x40,0x03,0xe0,0xe0,0x78,0x3f,0xd5,0x58,0x0e,0x08,0x32,0x3f,0x88,0xa8,0x90,0x8c,0x25,0x30,0xbc,0x7f,0xb5,0x50,0x1b,0xe0,0x20,0x7f,0x92,0x33,0x88,0x97,0x4a,0x07,0x0c,0x9e,0x5f,0xeb,0xaa,0xf2,0x74,0x8d,0x17,0x80,0x06,0x29,0xf1,0xe0,0x71,0xfb,0xfd,0x71,0xd8,0xff,0xf8,0x21,0x71,0x04,0x87,0x01,0xc1,0xa1,0xff,0x83,0xe7,0xf0,0xff,0xc1,0x51,0xe4,0xdd,0x1b,0x07,0xc2,0x63,0xf6,0x0f,0x9f,0xeb,0x5f,0x02,0x77,0x8a,0xc4,0xa3,0x17,0xc8,0x44,0x8c,0x34,0x20,0x71,0xfe,0x99,0x04,0x88,0x40,0x01,0xc3,0x47,0xf0,0x93,0x0f,0xf4,0x28,0x0e,0x3a,0xad,0x50,0x39,0x30,0x1f,0x18,0x3d,0x0e,0x31,0xff,0x3d,0x0c,0x02,0xa8,0x03,0x20,0x01,0x7e,0x3f,0xf8,0x09,0x06,0x33,0xfe,0x1b,0x50,}; +const uint8_t *_I_DFU_128x50[] = {_I_DFU_128x50_0}; + +const uint8_t _I_ButtonUp_7x4_0[] = {0x00,0x08,0x1C,0x3E,0x7F,}; +const uint8_t *_I_ButtonUp_7x4[] = {_I_ButtonUp_7x4_0}; + const uint8_t _I_Warning_30x23_0[] = {0x01,0x00,0x47,0x00,0x80,0x70,0x00,0x65,0xe0,0x80,0x80,0xc7,0xe1,0x03,0x01,0xaf,0xe2,0x0e,0x03,0x19,0xe4,0x3c,0x06,0xb3,0xe8,0xf8,0x0c,0x67,0xf3,0xf0,0x1a,0x60,0x27,0xf7,0xf1,0x50,0xcf,0xff,0xe0,0x34,0xf0,0x00,0xc6,0x03,0xf0,0x01,0x8c,0x0c,0x06,0x7f,0x80,0x18,0xc1,0xff,0x9f,0xff,0xfc,0x3c,0x06,0x7f,0xe0,0x58,0xc7,0xff,0xe0,0x31,0x00,0x88,0x00,0x67,0xff,0xe0,0x18,0xc7,0xc0,}; const uint8_t *_I_Warning_30x23[] = {_I_Warning_30x23_0}; -const uint8_t _I_DolphinFirstStart2_59x51_0[] = {0x01,0x00,0x2e,0x01,0x00,0x1f,0xfe,0x06,0x05,0x3f,0xc7,0xfe,0x01,0x1c,0x03,0x16,0x02,0xaf,0x0f,0x80,0x58,0x01,0xc7,0xaa,0x80,0x82,0xc4,0x0e,0x55,0x6b,0x28,0x10,0x81,0x45,0xab,0x8d,0x01,0xca,0x04,0x1a,0x1a,0xac,0x1c,0x0e,0x50,0x48,0x06,0xc0,0x3c,0x40,0x01,0x84,0x40,0x2b,0x15,0x51,0xd9,0xc4,0x20,0x1a,0xc9,0x50,0x1c,0xe4,0x02,0xe1,0x8a,0x81,0xd7,0x55,0x0a,0x03,0x9d,0x02,0x01,0x5c,0x82,0x81,0xd7,0xc0,0x3a,0x10,0x3a,0x12,0x88,0xc8,0x60,0x11,0x07,0xa0,0x1c,0x68,0x00,0xf6,0xe0,0x22,0x50,0x0e,0x36,0x00,0x7b,0x68,0x00,0x83,0xa0,0x11,0x08,0x1c,0x6a,0x03,0x42,0x44,0x1e,0xc0,0x28,0x50,0x61,0xf9,0x56,0x00,0xe3,0x60,0x40,0x88,0x1c,0x75,0x01,0x42,0x07,0x9d,0x50,0x5e,0x4b,0x01,0x37,0x8e,0xb0,0x0e,0x51,0xd8,0x04,0xc2,0x01,0xd4,0x5d,0x1c,0x02,0x30,0x7f,0x14,0x99,0x5c,0x20,0x11,0x48,0x07,0x58,0x0e,0x20,0x81,0xd0,0x23,0x04,0x1e,0x30,0x80,0x38,0xd4,0x11,0x82,0x0f,0x18,0x40,0xb0,0xb0,0x50,0x3d,0x58,0x1c,0x52,0x85,0xf1,0x83,0x75,0x58,0x64,0x49,0x1a,0xfc,0x17,0x57,0x01,0x88,0x25,0x0b,0x55,0x02,0xaa,0xc0,0x64,0x14,0x08,0x1e,0x02,0xaa,0x1f,0x18,0x0f,0x00,0xbe,0x20,0xf1,0x80,0x82,0x46,0x01,0x03,0x82,0xe0,0x04,0xa3,0xab,0x46,0x0e,0x32,0x15,0x80,0xb5,0x40,0x2a,0xa4,0x21,0x98,0x43,0x70,0x13,0x58,0x04,0xac,0xa4,0x3c,0x08,0xd6,0x02,0x35,0x00,0x8a,0xcd,0x06,0xa3,0x1d,0xa0,0x24,0x46,0x57,0xe8,0x26,0x8c,0xdb,0x80,0x84,0x18,0xad,0x42,0x07,0x5f,0xbf,0xb9,0x8a,0x17,0x80,0xff,0x6a,0xb0,0x46,0x91,0x07,0x88,0xc4,0x4a,0x43,0x1f,0x07,0x92,0xc4,0x49,0x82,0x9b,0x25,0x98,0xc0,0x28,0xa0,0x73,0x1f,0x0b,0x50,0x81,0xea,0x07,0x40,0x7b,0xac,0x44,0x0e,0xa0,}; -const uint8_t *_I_DolphinFirstStart2_59x51[] = {_I_DolphinFirstStart2_59x51_0}; +const uint8_t _I_ButtonLeft_4x7_0[] = {0x00,0x08,0x0C,0x0E,0x0F,0x0E,0x0C,0x08,}; +const uint8_t *_I_ButtonLeft_4x7[] = {_I_ButtonLeft_4x7_0}; -const uint8_t _I_DolphinFirstStart5_54x49_0[] = {0x01,0x00,0x0b,0x01,0x00,0x0f,0xf2,0xfe,0x06,0x48,0x1e,0x02,0x06,0x05,0x2e,0x00,0x08,0x61,0x80,0x62,0x98,0x00,0x86,0x20,0x06,0x28,0x40,0x08,0x64,0x00,0x62,0x82,0x00,0x86,0x80,0x06,0x28,0x14,0x72,0x01,0x80,0x03,0x14,0x06,0x44,0x03,0x20,0x49,0x00,0xc4,0x0c,0x61,0x13,0x81,0x07,0x90,0x0c,0xff,0xa8,0x18,0xcc,0xe0,0x10,0x78,0x60,0x18,0xc9,0xe3,0x10,0x03,0x0e,0x02,0x02,0x4f,0x19,0x00,0x18,0x78,0x10,0x12,0x78,0xc8,0x0a,0xc3,0xf8,0x80,0xc1,0x80,0xc5,0xe0,0xff,0x8f,0x47,0xe1,0x27,0x03,0x0d,0xfc,0x80,0x3b,0xc9,0x74,0x43,0x81,0x0f,0xb0,0x40,0x2b,0xd2,0xd3,0x71,0x07,0x87,0x5f,0x16,0x84,0x54,0x23,0xe3,0x21,0xab,0xc5,0x61,0x1a,0x82,0xf0,0xf0,0x35,0x70,0xa8,0x45,0x50,0x2a,0x3e,0x0a,0xac,0x1e,0x11,0x28,0x03,0x0f,0xc3,0xfe,0x06,0x19,0xa0,0x18,0x6f,0x9f,0x08,0x7c,0x22,0x30,0x06,0x1d,0xfc,0x3e,0x21,0x08,0x00,0x8f,0x01,0x7a,0x31,0x08,0x24,0x42,0x21,0xf0,0x5e,0x08,0x18,0x44,0xe3,0x0f,0x59,0x92,0xb4,0x96,0x66,0x06,0x58,0x10,0x19,0x60,0x20,0x64,0x46,0x08,0x19,0x27,0x00,0x65,0x9f,0x81,0x93,0xd1,0x2b,0x03,0x17,0x82,0x3f,0x50,0x9a,0x81,0x87,0x51,0x1e,0xf0,0x68,0x69,0x40,0x61,0xea,0x9d,0x86,0x1d,0x45,0x80,0x61,0x2d,0x48,0xc2,0x67,0x8d,0x12,0x3a,0x06,0x19,0x02,0x88,0x74,0x4b,0x21,0x03,0x1d,0x08,0xca,0x21,0x41,0x06,0x93,0xe8,0xa1,0x85,0x31,0xe9,0x24,0x48,0x20,0x30,0x1b,0x10,0x18,0x77,0x8f,0xa1,0x80,0xcc,0x40,0xc3,0x56,0x0b,0x8c,0x0a,0x22,0xba,0x12,0x88,0x81,0x84,}; -const uint8_t *_I_DolphinFirstStart5_54x49[] = {_I_DolphinFirstStart5_54x49_0}; - -const uint8_t _I_DolphinFirstStart6_58x54_0[] = {0x01,0x00,0x21,0x01,0x00,0x0f,0xf2,0x7e,0x06,0x4c,0x04,0x0f,0x81,0x03,0x03,0x9d,0x80,0x04,0x30,0xc0,0x39,0xc6,0x00,0x43,0x30,0x03,0x9c,0x10,0x04,0x34,0x00,0x39,0xc0,0x84,0x44,0x07,0x38,0x08,0x0d,0x41,0x68,0x13,0x70,0x39,0x08,0xd0,0x56,0xa1,0xd1,0x03,0x94,0x80,0x04,0x30,0x68,0x04,0x20,0x0e,0x84,0x91,0x03,0xa9,0x64,0x62,0x80,0x41,0x88,0x40,0x3f,0xc6,0xf1,0xfe,0x43,0xc0,0xe3,0x80,0xff,0xff,0xe0,0x3f,0xf8,0xf8,0x1c,0x78,0x18,0x1f,0xfe,0x0f,0x02,0x12,0x18,0x47,0x03,0x82,0x10,0x1e,0x08,0x1c,0xf5,0x60,0x71,0xd4,0x81,0xcf,0xab,0xff,0xd5,0xf5,0xc0,0xe3,0x04,0xe0,0x03,0x86,0xae,0x27,0x28,0x27,0x40,0x0e,0x21,0x91,0x03,0x96,0x80,0x0e,0x34,0x18,0x79,0x28,0x60,0x95,0x00,0x38,0xf8,0x20,0x27,0xd1,0x82,0x6a,0x03,0xc3,0x1c,0x39,0x94,0x0a,0xa1,0xc0,0xc5,0x2f,0xca,0x05,0x02,0x90,0x24,0x56,0x04,0x68,0x10,0x01,0x4f,0x80,0xea,0x5b,0x10,0x38,0x83,0x8d,0xa0,0x30,0x30,0x38,0xa3,0x09,0xc0,0x20,0xf2,0x03,0x90,0xc0,0x46,0xe2,0x91,0x2f,0x80,0xfc,0xe0,0x1e,0x08,0x02,0x54,0x47,0x62,0x27,0x2f,0xfb,0x14,0xdc,0xc6,0xb5,0x30,0x38,0x8b,0x05,0x6a,0x60,0x01,0x89,0x00,0xc8,0x16,0x50,0x29,0x10,0x1c,0x8d,0x25,0x05,0xa1,0x15,0xc9,0xfe,0x50,0xaa,0x08,0x10,0x67,0x01,0x22,0x8a,0xe0,0x60,0xe5,0xf2,0x07,0x8e,0xa8,0xb0,0x49,0xe1,0x00,0x0d,0xd4,0x68,0x5a,0x00,0x39,0x46,0x88,0x84,0x07,0x30,0xe8,0x81,0xc6,0x40,0x4d,0x11,0x91,0x17,0x06,0x40,0x65,0x11,0x51,0x01,0xc6,0x81,0x04,0x32,0x18,0x1e,0x92,0x64,0x00,0x11,0x68,0x81,0xd6,0xa0,0x07,0x16,0x22,0x6b,0x0a,0x82,0x07,0x3f,0x05,0x4d,0xdc,0x24,0x21,}; -const uint8_t *_I_DolphinFirstStart6_58x54[] = {_I_DolphinFirstStart6_58x54_0}; - -const uint8_t _I_Flipper_young_80x60_0[] = {0x01,0x00,0xa3,0x01,0x00,0x1e,0x03,0xff,0xff,0x87,0x82,0x57,0xf1,0x83,0x90,0xde,0x01,0x2b,0x0e,0x83,0x70,0xfb,0x10,0x10,0x41,0xf8,0x27,0x70,0xcc,0x34,0xc6,0x0e,0x09,0x3e,0x04,0x86,0x21,0x0c,0x90,0xc3,0x03,0xa9,0xe7,0xb0,0x46,0x2c,0x51,0x40,0x4a,0x63,0x38,0x31,0x0a,0x34,0x90,0x12,0x91,0x8e,0x3c,0xff,0x89,0x4c,0x04,0xa4,0x43,0xfd,0xf3,0xc3,0xf2,0x01,0x29,0xe0,0x2b,0x8e,0x72,0xa0,0x46,0x4b,0xe0,0x30,0xba,0x10,0x22,0xca,0x1c,0x0b,0x26,0x09,0x3c,0x04,0x0c,0x08,0x59,0xc8,0x21,0x64,0xc4,0x47,0x98,0x82,0x81,0x0a,0xe0,0x21,0x39,0x04,0x34,0x88,0x60,0x93,0xa0,0x45,0x4b,0x06,0xa3,0x40,0x48,0xfc,0x20,0xf0,0x82,0xa2,0x4d,0x60,0x11,0xe9,0xc2,0x19,0x64,0xd0,0x08,0x1f,0x80,0x7e,0x60,0x01,0x92,0x60,0x20,0x38,0x05,0x21,0x7c,0x3f,0xf0,0x1a,0xe6,0x00,0xe6,0x21,0x32,0x1a,0x0c,0x0e,0x91,0x80,0x8f,0xc0,0x06,0x25,0xcc,0xbf,0xc1,0xaa,0x10,0x0b,0xfc,0x02,0x60,0x2e,0x2c,0x04,0x32,0xc1,0x00,0xff,0x40,0x68,0x00,0x91,0x89,0xc0,0x21,0x20,0x51,0xfe,0x41,0xf0,0x00,0x91,0xc4,0xcf,0xe2,0x40,0x51,0xfc,0x0c,0x86,0x07,0x80,0xe2,0xdf,0xda,0x25,0xf0,0x9f,0xc0,0x21,0x98,0x0f,0x27,0xfd,0xa2,0x5e,0x01,0x90,0xc4,0x30,0x1e,0x2f,0xfc,0xa1,0x3a,0x45,0x41,0xb0,0x60,0x3e,0x5e,0x79,0x4a,0x10,0xbf,0xe2,0x61,0xc0,0x82,0x52,0x01,0xff,0x36,0x8e,0x3b,0xe5,0xff,0x04,0x9f,0xf8,0x78,0x3b,0x8f,0x97,0xf8,0x12,0x7f,0xc3,0x78,0xf8,0x3e,0x5f,0xc0,0x49,0xfe,0x08,0xc2,0x17,0x1f,0xcd,0xa5,0xac,0x5f,0x02,0x30,0xc0,0x30,0x5f,0xfd,0x23,0xbc,0xbc,0x1f,0xf0,0xc1,0x5f,0xaa,0x8e,0x52,0x28,0x10,0x10,0x6f,0x1b,0x28,0x57,0x81,0x66,0x25,0x01,0x80,0x4e,0x28,0x15,0x98,0xad,0xc3,0xfd,0xff,0xff,0x91,0x87,0xc1,0x80,0xd4,0xc2,0xb2,0x03,0xb1,0x5b,0x13,0x34,0x6a,0xf1,0x58,0x84,0x0e,0x1d,0x00,0x23,0x14,0x0f,0x55,0x0a,0x88,0x67,0x0d,0x83,0x7c,0x04,0x8c,0x0a,0xa9,0x15,0x90,0x7c,0x07,0x23,0xf8,0x80,0xc1,0xa0,0xda,0x88,0x54,0x82,0x00,0x2f,0x1f,0xe4,0x3c,0x7a,0x35,0x08,0xab,0x20,0x7f,0x03,0xc1,0x2d,0x96,0x82,0x14,0xce,0x20,0x02,0x04,0xc6,0x00,0x60,0x20,0x01,0x84,0xc4,0x6a,0x21,0x36,0x3b,0x8c,0xf0,0x3c,0xc8,0x02,0x1b,0x88,0x01,0xe1,0x80,0x98,0x2d,0x10,0x01,0xb0,0x05,0xa1,0x00,0x3d,0xf8,0x13,0x17,0x81,0x47,0x80,0x0b,0xc0,0x28,0x8e,0x02,0xa4,0x81,0x2c,0xf0,0x20,0x01,0x00,}; -const uint8_t *_I_Flipper_young_80x60[] = {_I_Flipper_young_80x60_0}; - -const uint8_t _I_DolphinFirstStart8_56x51_0[] = {0x01,0x00,0xfd,0x00,0x00,0x17,0x83,0xff,0x01,0x03,0x1c,0x72,0x01,0x06,0x03,0x1c,0x0e,0x01,0x18,0x02,0x96,0x00,0x04,0x36,0x00,0x31,0x50,0x01,0x24,0x1c,0x29,0x00,0x28,0xa0,0x40,0x21,0x88,0x01,0x8a,0x08,0x02,0x18,0x40,0x18,0x80,0x64,0x09,0x20,0x89,0x81,0x98,0x3c,0x42,0x63,0x03,0x30,0xcc,0x70,0x10,0x71,0xd9,0x01,0x86,0xc1,0x1c,0x03,0x24,0x42,0x7e,0x50,0x12,0x91,0x62,0x2f,0xf8,0x0e,0x00,0x18,0xb9,0x17,0x1c,0x04,0x83,0x02,0x06,0x1e,0x27,0xc4,0x54,0x20,0x62,0xf2,0x7c,0xe0,0x52,0x0c,0x10,0x88,0x7c,0x9f,0xf8,0x28,0x18,0x41,0xa5,0xff,0x85,0x48,0x30,0x80,0xd1,0xe4,0x5f,0xc1,0xa3,0x84,0x26,0x0f,0x23,0xfe,0x1b,0x18,0x44,0x16,0x01,0x90,0x81,0xc1,0x62,0x10,0x84,0xc0,0xf8,0x20,0x30,0x28,0x84,0x40,0x1a,0x25,0x11,0x82,0x42,0x22,0x11,0xf4,0xd9,0xc1,0x02,0x22,0xb2,0x38,0x14,0xc1,0x8e,0x90,0x14,0xc1,0xa2,0x86,0x02,0xc6,0x30,0x31,0x06,0x8c,0x0c,0x26,0x02,0x56,0x9d,0x04,0x0c,0x6a,0xa1,0x03,0x21,0x20,0x68,0x5f,0xe7,0xa9,0x00,0x86,0x85,0x01,0x8f,0xe0,0x08,0xe3,0x00,0xe1,0x02,0xc6,0xfe,0x16,0x23,0xe1,0x13,0x10,0xa4,0x82,0xb1,0x12,0x88,0x00,0xf0,0x91,0xe0,0x6a,0xfd,0x63,0xfc,0x08,0x78,0x18,0xb5,0x5e,0xad,0xfb,0x84,0xa0,0x95,0x48,0xad,0x54,0x4a,0x50,0x4d,0x44,0x6b,0x56,0x0d,0x28,0x45,0x42,0x6a,0x0d,0x38,0x46,0x02,0x55,0xaa,0x35,0x25,0x52,0xac,0x06,0x4b,0x04,0xa8,0x0c,0x94,0x03,0xa0,0x80,0x04,}; -const uint8_t *_I_DolphinFirstStart8_56x51[] = {_I_DolphinFirstStart8_56x51_0}; - -const uint8_t _I_DolphinFirstStart1_59x53_0[] = {0x01,0x00,0x1e,0x01,0x00,0x0e,0x03,0xfe,0x07,0x5b,0x84,0x02,0x06,0x07,0x48,0x64,0x02,0x08,0x07,0x48,0x14,0x02,0x10,0x07,0x48,0x0c,0x03,0x21,0x3f,0x13,0x18,0x84,0xa8,0x00,0x75,0x8c,0x00,0xca,0x00,0x0b,0x28,0x20,0x1d,0xa0,0x59,0xe0,0x39,0x48,0x07,0x03,0x81,0xd5,0x81,0xd6,0x81,0x55,0x8c,0x01,0xc6,0x21,0x00,0x87,0x68,0x25,0x52,0x40,0x39,0x7c,0x21,0xf5,0x08,0xa8,0x1d,0x20,0xfa,0x88,0x70,0x1c,0xfd,0x10,0x3a,0xa4,0x1f,0x88,0x54,0x18,0x85,0x52,0x09,0xbe,0x81,0xc1,0x0c,0x83,0x10,0x94,0x40,0x39,0xf0,0x19,0x21,0xc8,0x62,0x12,0x0c,0x04,0x0e,0x0c,0x07,0x38,0x07,0x86,0x07,0x18,0x03,0x94,0xc2,0x01,0x9e,0x81,0xca,0x38,0x89,0x21,0x0f,0x0c,0x03,0xf9,0x27,0x13,0x94,0xd0,0xb6,0x70,0x20,0x38,0xda,0x80,0xe5,0x10,0x03,0x95,0x59,0x54,0x70,0x10,0x38,0xda,0xc0,0xc3,0xfe,0xc1,0xab,0x0b,0xaa,0x2a,0x1c,0x05,0x81,0x58,0x38,0x09,0xd0,0x5c,0xa3,0xe0,0x72,0x86,0xae,0x8d,0x40,0x34,0x06,0xa1,0xc0,0xc0,0xe3,0xc0,0x65,0x1c,0x19,0x58,0x29,0xe1,0x00,0x14,0x28,0x0a,0x26,0x61,0x00,0x15,0x58,0x0a,0x2e,0x34,0xd6,0x42,0x9e,0x6b,0x54,0x82,0x92,0x08,0x1e,0x63,0x41,0x1d,0x0a,0x88,0x60,0x1d,0x42,0x11,0x5c,0x01,0xe5,0x3c,0x03,0x97,0x30,0x0e,0x42,0x42,0x80,0xd0,0x82,0xe4,0x07,0x28,0x17,0x10,0x1e,0xb0,0x4a,0x20,0x3d,0x61,0x1a,0x80,0x79,0x0f,0x0a,0x21,0x70,0x07,0x90,0x1c,0xa4,0x1a,0x00,0x7a,0xd0,0x0e,0x42,0x34,0x20,0x10,0xe0,0x00,0xed,0x00,0xa1,0x82,0xc8,0xc6,0x74,0x40,0xd9,0x01,0xce,0x84,0x07,0x69,0x10,0xcc,0x80,0xe7,0x5c,0x03,0xb4,0xa8,0x96,0x40,0x73,0x8a,0x96,0xc8,0x0c,0x40,}; -const uint8_t *_I_DolphinFirstStart1_59x53[] = {_I_DolphinFirstStart1_59x53_0}; +const uint8_t _I_DolphinFirstStart7_61x51_0[] = {0x01,0x00,0x13,0x01,0x00,0x17,0x03,0xff,0x01,0x03,0xa4,0xe2,0x01,0x0e,0x03,0xa4,0x1a,0x01,0x30,0x03,0x1e,0x00,0x2a,0x3c,0x00,0x39,0xd0,0x00,0x65,0x03,0x01,0x94,0x80,0x06,0x50,0x40,0x19,0x44,0x00,0x65,0x08,0x01,0xb0,0x2c,0xe2,0x81,0xb6,0x86,0x0a,0xd8,0x7c,0x20,0x75,0x85,0x10,0xcc,0x06,0x50,0x50,0x3b,0x10,0xce,0x00,0x69,0x20,0x79,0x7c,0x20,0x20,0x71,0xc0,0x07,0xca,0xf1,0x02,0x81,0x01,0xc6,0x3a,0x07,0x1f,0xe4,0x10,0x0e,0x53,0xe0,0x38,0xe7,0xa0,0xa0,0x72,0xbb,0x81,0xca,0x12,0x68,0x1c,0x05,0x5c,0x0e,0x3f,0xe8,0xc8,0x1c,0xab,0xe0,0x72,0x94,0x81,0xda,0xb2,0x07,0x5f,0xe0,0x3d,0xbf,0x95,0x44,0x20,0x81,0xce,0xf1,0x2f,0x03,0x94,0xb8,0xae,0x51,0x00,0x39,0x47,0x60,0xd0,0x84,0x70,0x81,0xcb,0x44,0x9d,0x10,0x3a,0x58,0xce,0xe6,0x07,0x29,0x10,0x18,0xa0,0x50,0x88,0x76,0x02,0x22,0x07,0x49,0x8e,0x02,0x24,0x07,0x4e,0x0e,0x02,0x12,0x96,0x38,0x44,0x07,0x02,0x8f,0x1c,0x07,0x1c,0x4e,0x30,0x1c,0x10,0x3c,0x6c,0x13,0x80,0x38,0xc0,0xb0,0x80,0xf1,0x6e,0x90,0x1c,0x71,0x10,0xd7,0x49,0x81,0xc7,0x20,0x0f,0x17,0xe9,0x42,0x20,0x91,0x09,0xeb,0x24,0xe2,0x10,0x49,0x07,0x6f,0xff,0x80,0x56,0x88,0x1c,0xa2,0xae,0xd1,0x66,0x89,0xe0,0x68,0x11,0xb8,0x06,0xc0,0x2e,0x40,0x71,0x9a,0xc0,0x2b,0x00,0x73,0xc0,0x7a,0xe0,0x09,0x12,0x03,0x95,0x57,0xff,0x17,0x03,0x9c,0x03,0x57,0xaa,0x78,0x94,0x40,0xa6,0x35,0x5a,0xac,0x14,0x0e,0x9a,0xad,0x50,0xf8,0x41,0x05,0x00,0x83,0x55,0x14,0x06,0x07,0x18,0x54,0xa0,0x0e,0xb0,0x60,0x31,0xc0,0x00,}; +const uint8_t *_I_DolphinFirstStart7_61x51[] = {_I_DolphinFirstStart7_61x51_0}; const uint8_t _I_DolphinOkay_41x43_0[] = {0x01,0x00,0xa0,0x00,0x00,0x0f,0x82,0x3e,0x05,0x38,0xf7,0x80,0x08,0x58,0x08,0x0c,0x02,0x0e,0x05,0x1b,0x00,0x08,0x63,0x00,0x21,0x88,0x00,0x86,0x40,0x02,0x18,0x40,0x08,0x68,0x00,0x21,0x82,0x06,0x88,0x0a,0xf0,0x21,0x39,0x09,0x84,0x02,0x20,0x57,0x09,0x98,0x15,0x67,0xc0,0x54,0xbe,0x81,0x4f,0x01,0xfe,0x02,0x9d,0x03,0xc4,0x20,0x10,0x29,0x7c,0x80,0xa9,0xfe,0x02,0xac,0x14,0x0a,0x77,0xc8,0x58,0x8c,0xf0,0x11,0x51,0x79,0xff,0x61,0x44,0x93,0x81,0x02,0xc4,0x9e,0x60,0xb2,0xf0,0xa0,0x46,0x0c,0x17,0x14,0x99,0x1a,0x07,0x80,0x59,0x49,0x82,0x21,0xc0,0xa4,0x82,0x24,0xb9,0x20,0x88,0x1c,0x47,0xc2,0x07,0x11,0x54,0xa0,0x60,0x53,0xb8,0x0a,0x4b,0xf3,0x03,0x87,0x81,0x4a,0x0d,0xfc,0x1a,0x98,0x68,0xb8,0x01,0x51,0x13,0x15,0xe0,0x82,0x7f,0x8d,0x78,0x38,0xbf,0xff,0xfa,0xb8,0x60,0xbf,0x1b,0xf9,0x50,0x14,0xea,0xe7,0x02,0x02,0x8e,0xac,0x94,0x40,}; const uint8_t *_I_DolphinOkay_41x43[] = {_I_DolphinOkay_41x43_0}; +const uint8_t _I_DolphinFirstStart5_54x49_0[] = {0x01,0x00,0x0b,0x01,0x00,0x0f,0xf2,0xfe,0x06,0x48,0x1e,0x02,0x06,0x05,0x2e,0x00,0x08,0x61,0x80,0x62,0x98,0x00,0x86,0x20,0x06,0x28,0x40,0x08,0x64,0x00,0x62,0x82,0x00,0x86,0x80,0x06,0x28,0x14,0x72,0x01,0x80,0x03,0x14,0x06,0x44,0x03,0x20,0x49,0x00,0xc4,0x0c,0x61,0x13,0x81,0x07,0x90,0x0c,0xff,0xa8,0x18,0xcc,0xe0,0x10,0x78,0x60,0x18,0xc9,0xe3,0x10,0x03,0x0e,0x02,0x02,0x4f,0x19,0x00,0x18,0x78,0x10,0x12,0x78,0xc8,0x0a,0xc3,0xf8,0x80,0xc1,0x80,0xc5,0xe0,0xff,0x8f,0x47,0xe1,0x27,0x03,0x0d,0xfc,0x80,0x3b,0xc9,0x74,0x43,0x81,0x0f,0xb0,0x40,0x2b,0xd2,0xd3,0x71,0x07,0x87,0x5f,0x16,0x84,0x54,0x23,0xe3,0x21,0xab,0xc5,0x61,0x1a,0x82,0xf0,0xf0,0x35,0x70,0xa8,0x45,0x50,0x2a,0x3e,0x0a,0xac,0x1e,0x11,0x28,0x03,0x0f,0xc3,0xfe,0x06,0x19,0xa0,0x18,0x6f,0x9f,0x08,0x7c,0x22,0x30,0x06,0x1d,0xfc,0x3e,0x21,0x08,0x00,0x8f,0x01,0x7a,0x31,0x08,0x24,0x42,0x21,0xf0,0x5e,0x08,0x18,0x44,0xe3,0x0f,0x59,0x92,0xb4,0x96,0x66,0x06,0x58,0x10,0x19,0x60,0x20,0x64,0x46,0x08,0x19,0x27,0x00,0x65,0x9f,0x81,0x93,0xd1,0x2b,0x03,0x17,0x82,0x3f,0x50,0x9a,0x81,0x87,0x51,0x1e,0xf0,0x68,0x69,0x40,0x61,0xea,0x9d,0x86,0x1d,0x45,0x80,0x61,0x2d,0x48,0xc2,0x67,0x8d,0x12,0x3a,0x06,0x19,0x02,0x88,0x74,0x4b,0x21,0x03,0x1d,0x08,0xca,0x21,0x41,0x06,0x93,0xe8,0xa1,0x85,0x31,0xe9,0x24,0x48,0x20,0x30,0x1b,0x10,0x18,0x77,0x8f,0xa1,0x80,0xcc,0x40,0xc3,0x56,0x0b,0x8c,0x0a,0x22,0xba,0x12,0x88,0x81,0x84,}; +const uint8_t *_I_DolphinFirstStart5_54x49[] = {_I_DolphinFirstStart5_54x49_0}; + +const uint8_t _I_Flipper_young_80x60_0[] = {0x01,0x00,0xa3,0x01,0x00,0x1e,0x03,0xff,0xff,0x87,0x82,0x57,0xf1,0x83,0x90,0xde,0x01,0x2b,0x0e,0x83,0x70,0xfb,0x10,0x10,0x41,0xf8,0x27,0x70,0xcc,0x34,0xc6,0x0e,0x09,0x3e,0x04,0x86,0x21,0x0c,0x90,0xc3,0x03,0xa9,0xe7,0xb0,0x46,0x2c,0x51,0x40,0x4a,0x63,0x38,0x31,0x0a,0x34,0x90,0x12,0x91,0x8e,0x3c,0xff,0x89,0x4c,0x04,0xa4,0x43,0xfd,0xf3,0xc3,0xf2,0x01,0x29,0xe0,0x2b,0x8e,0x72,0xa0,0x46,0x4b,0xe0,0x30,0xba,0x10,0x22,0xca,0x1c,0x0b,0x26,0x09,0x3c,0x04,0x0c,0x08,0x59,0xc8,0x21,0x64,0xc4,0x47,0x98,0x82,0x81,0x0a,0xe0,0x21,0x39,0x04,0x34,0x88,0x60,0x93,0xa0,0x45,0x4b,0x06,0xa3,0x40,0x48,0xfc,0x20,0xf0,0x82,0xa2,0x4d,0x60,0x11,0xe9,0xc2,0x19,0x64,0xd0,0x08,0x1f,0x80,0x7e,0x60,0x01,0x92,0x60,0x20,0x38,0x05,0x21,0x7c,0x3f,0xf0,0x1a,0xe6,0x00,0xe6,0x21,0x32,0x1a,0x0c,0x0e,0x91,0x80,0x8f,0xc0,0x06,0x25,0xcc,0xbf,0xc1,0xaa,0x10,0x0b,0xfc,0x02,0x60,0x2e,0x2c,0x04,0x32,0xc1,0x00,0xff,0x40,0x68,0x00,0x91,0x89,0xc0,0x21,0x20,0x51,0xfe,0x41,0xf0,0x00,0x91,0xc4,0xcf,0xe2,0x40,0x51,0xfc,0x0c,0x86,0x07,0x80,0xe2,0xdf,0xda,0x25,0xf0,0x9f,0xc0,0x21,0x98,0x0f,0x27,0xfd,0xa2,0x5e,0x01,0x90,0xc4,0x30,0x1e,0x2f,0xfc,0xa1,0x3a,0x45,0x41,0xb0,0x60,0x3e,0x5e,0x79,0x4a,0x10,0xbf,0xe2,0x61,0xc0,0x82,0x52,0x01,0xff,0x36,0x8e,0x3b,0xe5,0xff,0x04,0x9f,0xf8,0x78,0x3b,0x8f,0x97,0xf8,0x12,0x7f,0xc3,0x78,0xf8,0x3e,0x5f,0xc0,0x49,0xfe,0x08,0xc2,0x17,0x1f,0xcd,0xa5,0xac,0x5f,0x02,0x30,0xc0,0x30,0x5f,0xfd,0x23,0xbc,0xbc,0x1f,0xf0,0xc1,0x5f,0xaa,0x8e,0x52,0x28,0x10,0x10,0x6f,0x1b,0x28,0x57,0x81,0x66,0x25,0x01,0x80,0x4e,0x28,0x15,0x98,0xad,0xc3,0xfd,0xff,0xff,0x91,0x87,0xc1,0x80,0xd4,0xc2,0xb2,0x03,0xb1,0x5b,0x13,0x34,0x6a,0xf1,0x58,0x84,0x0e,0x1d,0x00,0x23,0x14,0x0f,0x55,0x0a,0x88,0x67,0x0d,0x83,0x7c,0x04,0x8c,0x0a,0xa9,0x15,0x90,0x7c,0x07,0x23,0xf8,0x80,0xc1,0xa0,0xda,0x88,0x54,0x82,0x00,0x2f,0x1f,0xe4,0x3c,0x7a,0x35,0x08,0xab,0x20,0x7f,0x03,0xc1,0x2d,0x96,0x82,0x14,0xce,0x20,0x02,0x04,0xc6,0x00,0x60,0x20,0x01,0x84,0xc4,0x6a,0x21,0x36,0x3b,0x8c,0xf0,0x3c,0xc8,0x02,0x1b,0x88,0x01,0xe1,0x80,0x98,0x2d,0x10,0x01,0xb0,0x05,0xa1,0x00,0x3d,0xf8,0x13,0x17,0x81,0x47,0x80,0x0b,0xc0,0x28,0x8e,0x02,0xa4,0x81,0x2c,0xf0,0x20,0x01,0x00,}; +const uint8_t *_I_Flipper_young_80x60[] = {_I_Flipper_young_80x60_0}; + +const uint8_t _I_DolphinFirstStart2_59x51_0[] = {0x01,0x00,0x2e,0x01,0x00,0x1f,0xfe,0x06,0x05,0x3f,0xc7,0xfe,0x01,0x1c,0x03,0x16,0x02,0xaf,0x0f,0x80,0x58,0x01,0xc7,0xaa,0x80,0x82,0xc4,0x0e,0x55,0x6b,0x28,0x10,0x81,0x45,0xab,0x8d,0x01,0xca,0x04,0x1a,0x1a,0xac,0x1c,0x0e,0x50,0x48,0x06,0xc0,0x3c,0x40,0x01,0x84,0x40,0x2b,0x15,0x51,0xd9,0xc4,0x20,0x1a,0xc9,0x50,0x1c,0xe4,0x02,0xe1,0x8a,0x81,0xd7,0x55,0x0a,0x03,0x9d,0x02,0x01,0x5c,0x82,0x81,0xd7,0xc0,0x3a,0x10,0x3a,0x12,0x88,0xc8,0x60,0x11,0x07,0xa0,0x1c,0x68,0x00,0xf6,0xe0,0x22,0x50,0x0e,0x36,0x00,0x7b,0x68,0x00,0x83,0xa0,0x11,0x08,0x1c,0x6a,0x03,0x42,0x44,0x1e,0xc0,0x28,0x50,0x61,0xf9,0x56,0x00,0xe3,0x60,0x40,0x88,0x1c,0x75,0x01,0x42,0x07,0x9d,0x50,0x5e,0x4b,0x01,0x37,0x8e,0xb0,0x0e,0x51,0xd8,0x04,0xc2,0x01,0xd4,0x5d,0x1c,0x02,0x30,0x7f,0x14,0x99,0x5c,0x20,0x11,0x48,0x07,0x58,0x0e,0x20,0x81,0xd0,0x23,0x04,0x1e,0x30,0x80,0x38,0xd4,0x11,0x82,0x0f,0x18,0x40,0xb0,0xb0,0x50,0x3d,0x58,0x1c,0x52,0x85,0xf1,0x83,0x75,0x58,0x64,0x49,0x1a,0xfc,0x17,0x57,0x01,0x88,0x25,0x0b,0x55,0x02,0xaa,0xc0,0x64,0x14,0x08,0x1e,0x02,0xaa,0x1f,0x18,0x0f,0x00,0xbe,0x20,0xf1,0x80,0x82,0x46,0x01,0x03,0x82,0xe0,0x04,0xa3,0xab,0x46,0x0e,0x32,0x15,0x80,0xb5,0x40,0x2a,0xa4,0x21,0x98,0x43,0x70,0x13,0x58,0x04,0xac,0xa4,0x3c,0x08,0xd6,0x02,0x35,0x00,0x8a,0xcd,0x06,0xa3,0x1d,0xa0,0x24,0x46,0x57,0xe8,0x26,0x8c,0xdb,0x80,0x84,0x18,0xad,0x42,0x07,0x5f,0xbf,0xb9,0x8a,0x17,0x80,0xff,0x6a,0xb0,0x46,0x91,0x07,0x88,0xc4,0x4a,0x43,0x1f,0x07,0x92,0xc4,0x49,0x82,0x9b,0x25,0x98,0xc0,0x28,0xa0,0x73,0x1f,0x0b,0x50,0x81,0xea,0x07,0x40,0x7b,0xac,0x44,0x0e,0xa0,}; +const uint8_t *_I_DolphinFirstStart2_59x51[] = {_I_DolphinFirstStart2_59x51_0}; + +const uint8_t _I_DolphinFirstStart8_56x51_0[] = {0x01,0x00,0xfd,0x00,0x00,0x17,0x83,0xff,0x01,0x03,0x1c,0x72,0x01,0x06,0x03,0x1c,0x0e,0x01,0x18,0x02,0x96,0x00,0x04,0x36,0x00,0x31,0x50,0x01,0x24,0x1c,0x29,0x00,0x28,0xa0,0x40,0x21,0x88,0x01,0x8a,0x08,0x02,0x18,0x40,0x18,0x80,0x64,0x09,0x20,0x89,0x81,0x98,0x3c,0x42,0x63,0x03,0x30,0xcc,0x70,0x10,0x71,0xd9,0x01,0x86,0xc1,0x1c,0x03,0x24,0x42,0x7e,0x50,0x12,0x91,0x62,0x2f,0xf8,0x0e,0x00,0x18,0xb9,0x17,0x1c,0x04,0x83,0x02,0x06,0x1e,0x27,0xc4,0x54,0x20,0x62,0xf2,0x7c,0xe0,0x52,0x0c,0x10,0x88,0x7c,0x9f,0xf8,0x28,0x18,0x41,0xa5,0xff,0x85,0x48,0x30,0x80,0xd1,0xe4,0x5f,0xc1,0xa3,0x84,0x26,0x0f,0x23,0xfe,0x1b,0x18,0x44,0x16,0x01,0x90,0x81,0xc1,0x62,0x10,0x84,0xc0,0xf8,0x20,0x30,0x28,0x84,0x40,0x1a,0x25,0x11,0x82,0x42,0x22,0x11,0xf4,0xd9,0xc1,0x02,0x22,0xb2,0x38,0x14,0xc1,0x8e,0x90,0x14,0xc1,0xa2,0x86,0x02,0xc6,0x30,0x31,0x06,0x8c,0x0c,0x26,0x02,0x56,0x9d,0x04,0x0c,0x6a,0xa1,0x03,0x21,0x20,0x68,0x5f,0xe7,0xa9,0x00,0x86,0x85,0x01,0x8f,0xe0,0x08,0xe3,0x00,0xe1,0x02,0xc6,0xfe,0x16,0x23,0xe1,0x13,0x10,0xa4,0x82,0xb1,0x12,0x88,0x00,0xf0,0x91,0xe0,0x6a,0xfd,0x63,0xfc,0x08,0x78,0x18,0xb5,0x5e,0xad,0xfb,0x84,0xa0,0x95,0x48,0xad,0x54,0x4a,0x50,0x4d,0x44,0x6b,0x56,0x0d,0x28,0x45,0x42,0x6a,0x0d,0x38,0x46,0x02,0x55,0xaa,0x35,0x25,0x52,0xac,0x06,0x4b,0x04,0xa8,0x0c,0x94,0x03,0xa0,0x80,0x04,}; +const uint8_t *_I_DolphinFirstStart8_56x51[] = {_I_DolphinFirstStart8_56x51_0}; + const uint8_t _I_DolphinFirstStart3_57x48_0[] = {0x01,0x00,0x12,0x01,0x00,0x16,0x03,0xff,0x07,0x03,0xa5,0x82,0x01,0x38,0x03,0xa4,0x62,0x01,0xc0,0x03,0xa4,0x10,0x04,0x30,0x10,0x39,0xc0,0x80,0x48,0x0c,0x40,0x91,0x7e,0x20,0x60,0x72,0x84,0x02,0x8b,0x78,0x12,0x28,0x80,0x68,0x85,0x87,0x20,0x11,0x18,0x5c,0x80,0xe8,0x01,0x19,0xc5,0x00,0x0e,0x62,0xc1,0x9f,0x01,0xcb,0xe9,0x03,0x84,0x60,0x20,0xf8,0x00,0x38,0xd7,0x21,0xb1,0x0f,0x04,0x04,0x0e,0x5a,0x89,0xd4,0x83,0xc0,0x4b,0x3a,0xc5,0x54,0xcc,0x20,0x51,0x00,0x8e,0xc3,0x54,0x80,0x13,0xf8,0x81,0xc6,0xc1,0x55,0x01,0x8c,0x78,0x0e,0x30,0xee,0x06,0xaa,0x05,0xe0,0xae,0x01,0xc6,0x23,0x80,0xaa,0xc1,0x60,0x1a,0x90,0x38,0xc8,0x60,0x1a,0xb8,0x54,0x02,0xad,0x07,0x80,0xd0,0x40,0x83,0x15,0x80,0x7b,0x21,0x10,0x1c,0x0c,0x03,0x7f,0x2a,0x80,0x4d,0x00,0xe3,0x01,0xf8,0xf0,0x2a,0xf0,0x08,0x60,0x1c,0x60,0x41,0xd1,0xdf,0x1a,0x44,0x0e,0x50,0x68,0x05,0xe3,0x07,0x02,0x82,0x01,0xc6,0x19,0x00,0xf8,0x5f,0xe0,0x20,0x72,0xfa,0x40,0x7f,0xc2,0xb1,0x03,0x88,0x68,0x7f,0xf6,0xb4,0x28,0xc0,0x80,0xe3,0x88,0xaa,0xc7,0x40,0xe9,0x50,0xd5,0x41,0x94,0xa2,0x07,0x29,0x87,0x52,0x02,0x07,0x12,0x30,0xc1,0x22,0x16,0x86,0x29,0x01,0xca,0x30,0xf6,0x10,0x39,0xc2,0x23,0x10,0x6c,0x00,0x1d,0x3d,0x10,0x1b,0x02,0xe0,0x41,0x03,0x08,0x75,0x0c,0x60,0x0e,0x4f,0x11,0x0a,0x0c,0x18,0x0e,0x96,0x06,0x28,0x81,0xd3,0x01,0x1f,0x01,0x90,0x1c,0xdc,0xc2,0x01,0x15,0xd0,0x81,0xdc,0x4c,0x30,0x30,0x3f,0x00,0xc4,0x0e,0x30,0x20,0x3c,0x8c,0xc8,0x0f,0x2b,0x41,}; const uint8_t *_I_DolphinFirstStart3_57x48[] = {_I_DolphinFirstStart3_57x48_0}; -const uint8_t _I_DolphinFirstStart7_61x51_0[] = {0x01,0x00,0x13,0x01,0x00,0x17,0x03,0xff,0x01,0x03,0xa4,0xe2,0x01,0x0e,0x03,0xa4,0x1a,0x01,0x30,0x03,0x1e,0x00,0x2a,0x3c,0x00,0x39,0xd0,0x00,0x65,0x03,0x01,0x94,0x80,0x06,0x50,0x40,0x19,0x44,0x00,0x65,0x08,0x01,0xb0,0x2c,0xe2,0x81,0xb6,0x86,0x0a,0xd8,0x7c,0x20,0x75,0x85,0x10,0xcc,0x06,0x50,0x50,0x3b,0x10,0xce,0x00,0x69,0x20,0x79,0x7c,0x20,0x20,0x71,0xc0,0x07,0xca,0xf1,0x02,0x81,0x01,0xc6,0x3a,0x07,0x1f,0xe4,0x10,0x0e,0x53,0xe0,0x38,0xe7,0xa0,0xa0,0x72,0xbb,0x81,0xca,0x12,0x68,0x1c,0x05,0x5c,0x0e,0x3f,0xe8,0xc8,0x1c,0xab,0xe0,0x72,0x94,0x81,0xda,0xb2,0x07,0x5f,0xe0,0x3d,0xbf,0x95,0x44,0x20,0x81,0xce,0xf1,0x2f,0x03,0x94,0xb8,0xae,0x51,0x00,0x39,0x47,0x60,0xd0,0x84,0x70,0x81,0xcb,0x44,0x9d,0x10,0x3a,0x58,0xce,0xe6,0x07,0x29,0x10,0x18,0xa0,0x50,0x88,0x76,0x02,0x22,0x07,0x49,0x8e,0x02,0x24,0x07,0x4e,0x0e,0x02,0x12,0x96,0x38,0x44,0x07,0x02,0x8f,0x1c,0x07,0x1c,0x4e,0x30,0x1c,0x10,0x3c,0x6c,0x13,0x80,0x38,0xc0,0xb0,0x80,0xf1,0x6e,0x90,0x1c,0x71,0x10,0xd7,0x49,0x81,0xc7,0x20,0x0f,0x17,0xe9,0x42,0x20,0x91,0x09,0xeb,0x24,0xe2,0x10,0x49,0x07,0x6f,0xff,0x80,0x56,0x88,0x1c,0xa2,0xae,0xd1,0x66,0x89,0xe0,0x68,0x11,0xb8,0x06,0xc0,0x2e,0x40,0x71,0x9a,0xc0,0x2b,0x00,0x73,0xc0,0x7a,0xe0,0x09,0x12,0x03,0x95,0x57,0xff,0x17,0x03,0x9c,0x03,0x57,0xaa,0x78,0x94,0x40,0xa6,0x35,0x5a,0xac,0x14,0x0e,0x9a,0xad,0x50,0xf8,0x41,0x05,0x00,0x83,0x55,0x14,0x06,0x07,0x18,0x54,0xa0,0x0e,0xb0,0x60,0x31,0xc0,0x00,}; -const uint8_t *_I_DolphinFirstStart7_61x51[] = {_I_DolphinFirstStart7_61x51_0}; - const uint8_t _I_DolphinFirstStart0_70x53_0[] = {0x01,0x00,0x5a,0x01,0x80,0x60,0x3f,0xf7,0xf0,0x42,0xf8,0x01,0x43,0x07,0x04,0x24,0x72,0x01,0xc0,0x9d,0x82,0x13,0xff,0xff,0xbd,0x70,0x20,0x20,0x72,0xe0,0x40,0x2a,0x11,0xdb,0x00,0x6c,0xec,0x10,0x0d,0x44,0x3a,0x71,0x0e,0x04,0x14,0x42,0x01,0x54,0x86,0xd3,0x27,0x02,0x44,0xd4,0x41,0xb0,0xf2,0x10,0x42,0x55,0x38,0x71,0x1b,0x10,0x18,0xa0,0x41,0x11,0xb1,0xc8,0x28,0x98,0x09,0xfc,0x00,0x72,0x35,0x49,0x8d,0x0b,0xc1,0x70,0xf0,0x10,0x4b,0x51,0x11,0xc2,0x6c,0x0a,0xa3,0x03,0x80,0x7f,0xbf,0xf3,0x08,0x46,0x60,0x90,0x30,0x60,0x50,0xd8,0x2c,0x11,0x0c,0x71,0x5c,0x60,0xf8,0x0f,0xcf,0x3f,0x81,0x80,0xa1,0x9e,0x86,0x0f,0xc0,0x82,0x64,0x30,0x3e,0x09,0x84,0x03,0xf1,0x03,0xa0,0x40,0xa4,0x18,0x39,0xfc,0x20,0x52,0x30,0x19,0x07,0xc6,0x8e,0x4a,0x18,0x22,0x74,0x60,0x1a,0x0f,0xc6,0x3c,0x60,0x5c,0x05,0x28,0xe4,0x3f,0x99,0xf8,0x22,0x28,0x7e,0x05,0x91,0xa8,0x7f,0x23,0xf0,0x59,0x00,0xac,0x63,0xe0,0x81,0xcf,0x4f,0xe0,0xb1,0x81,0x58,0xc3,0xc1,0x08,0x24,0x1f,0xf9,0x68,0x6a,0x1f,0xe9,0xff,0x16,0x02,0x34,0x13,0x50,0x82,0x0a,0xea,0x60,0x1f,0xf9,0xf0,0x41,0x05,0x1d,0x30,0x09,0x18,0x60,0x15,0xa3,0xe8,0x83,0x47,0xe0,0xec,0x2c,0xaf,0xf2,0x0e,0x08,0x1f,0xc1,0x18,0x60,0x1a,0xaf,0xc2,0x6c,0x89,0x62,0x03,0x19,0xad,0xe5,0x70,0x44,0x62,0x80,0x5a,0xa1,0x4f,0x63,0x23,0x0c,0x7a,0xaa,0x4d,0x11,0xe9,0x00,0x06,0x73,0xaa,0x25,0x0a,0x78,0xaf,0x90,0x09,0x25,0x54,0x56,0x5f,0x04,0x30,0xc0,0x64,0x7a,0xa1,0x11,0x7e,0x20,0x18,0x0f,0x3c,0x82,0xaa,0x04,0x18,0x0d,0xf8,0x16,0x33,0xe8,0x84,0xa8,0x08,0x3c,0x33,0x00,0xf0,0x20,0x71,0x08,0xa9,0x38,0x86,0x62,0x62,0x18,0x40,0x44,0x80,0x09,0x04,0x08,0x90,0x01,0x20,0x41,0x17,0x22,0x90,0x01,0x3e,0x00,0x76,0x80,0x1d,0x48,0x00,0x8d,0x91,0x00,0x34,0xf8,0x20,0xe2,0xa7,0x9c,0x06,0x5c,0x11,0x02,0x28,0x5d,0x91,0x35,0x48,0xaf,0xf8,0x04,0x3f,0xf9,0x88,0x20,0x01,}; const uint8_t *_I_DolphinFirstStart0_70x53[] = {_I_DolphinFirstStart0_70x53_0}; const uint8_t _I_DolphinFirstStart4_67x53_0[] = {0x01,0x00,0x1f,0x01,0x00,0x17,0xc3,0xfe,0x08,0x68,0x74,0x02,0x0e,0x07,0x4c,0x04,0x06,0x01,0x18,0x04,0x25,0x00,0x04,0x36,0x00,0x42,0x48,0x02,0x88,0x00,0x28,0x80,0x0c,0xa0,0x40,0x83,0x84,0x00,0xca,0x08,0x08,0x30,0x21,0x83,0x0c,0x2c,0x81,0xe3,0x04,0x20,0xc0,0x80,0x02,0x31,0x32,0x11,0x02,0x27,0x00,0x5d,0x40,0x45,0x87,0x90,0x3e,0x7c,0x00,0x43,0x84,0x4e,0x60,0x43,0x30,0x89,0x82,0x12,0x80,0x15,0x20,0x40,0x99,0xc8,0x22,0x7b,0x88,0x10,0x20,0x82,0x27,0x7c,0x82,0x9d,0x48,0x22,0x5f,0x0d,0xfc,0x08,0x10,0x41,0x12,0xf8,0x57,0xc2,0x28,0x30,0x1e,0x07,0x9e,0x06,0x87,0x25,0x79,0xc4,0x20,0x40,0x83,0x21,0x14,0x22,0x08,0x08,0x38,0x2a,0xb8,0xd9,0x47,0x0a,0x14,0x09,0xf0,0x54,0x47,0x1f,0x81,0x82,0x1a,0xde,0x8e,0x33,0xd1,0xc7,0x81,0x0f,0x0e,0x45,0x18,0x20,0xa1,0xe6,0xf2,0x10,0x89,0xa0,0x70,0x11,0x00,0x41,0x46,0x03,0x86,0x55,0x10,0x40,0xc1,0x82,0x25,0x20,0x04,0x11,0x94,0x80,0x43,0x10,0x84,0x01,0x46,0xc0,0xbd,0x38,0x40,0x20,0x8f,0x49,0x08,0xc4,0x1c,0xc8,0x22,0x50,0x38,0x20,0x20,0x86,0xe4,0x83,0x10,0x41,0x8b,0x87,0xf9,0x03,0x81,0xc0,0x81,0x05,0x81,0xc0,0x40,0xf3,0x90,0x60,0x41,0x70,0x2c,0x17,0x01,0xc0,0xc1,0x41,0x05,0x30,0x98,0x43,0x04,0x65,0x01,0x04,0x0c,0x32,0x38,0x91,0x18,0x04,0x14,0x10,0x38,0x18,0x1e,0xac,0x7c,0x41,0x11,0x88,0x5f,0xfc,0x17,0x55,0xa9,0x82,0x06,0x05,0xbc,0x85,0x02,0x08,0xc6,0x32,0x0f,0xe5,0x5e,0x1a,0x08,0x5c,0x06,0xaa,0x34,0x08,0x4a,0x06,0x02,0xab,0x75,0xf0,0x4f,0xc1,0x05,0x80,0x08,0x8e,0xab,0x7f,0xea,0x04,0x11,0x80,0x6a,0xa0,0x02,0x03,0x08,}; const uint8_t *_I_DolphinFirstStart4_67x53[] = {_I_DolphinFirstStart4_67x53_0}; -const uint8_t _I_PassportBottom_128x17_0[] = {0x01,0x00,0x5e,0x00,0x96,0x01,0x97,0xe1,0xff,0x00,0x2e,0x3e,0x68,0x0f,0x5a,0xc5,0x54,0x00,0xb9,0x50,0xfb,0x6a,0x35,0x40,0x05,0xcd,0x4e,0x03,0xfd,0x30,0x0f,0xf8,0x7f,0xa0,0x81,0xfe,0xf9,0x1b,0xfb,0xf3,0x01,0x47,0x66,0x02,0x1b,0x03,0x07,0xe7,0x02,0x0b,0x02,0x07,0xe5,0x82,0x0b,0xf2,0x1c,0xb0,0x01,0x67,0xf0,0x5f,0xd0,0x3f,0x23,0xf0,0x9b,0xc9,0xe5,0x80,0x03,0xd5,0xc0,0x00,0x86,0x01,0xf3,0xe6,0x1e,0x58,0x00,0x36,0xa8,0x06,0xac,0x04,0x30,0x6c,0x30,0xee,0x60,0x1f,0xe0,0x10,0xff,0x0d,0xfb,0x00,}; -const uint8_t *_I_PassportBottom_128x17[] = {_I_PassportBottom_128x17_0}; +const uint8_t _I_DolphinFirstStart6_58x54_0[] = {0x01,0x00,0x21,0x01,0x00,0x0f,0xf2,0x7e,0x06,0x4c,0x04,0x0f,0x81,0x03,0x03,0x9d,0x80,0x04,0x30,0xc0,0x39,0xc6,0x00,0x43,0x30,0x03,0x9c,0x10,0x04,0x34,0x00,0x39,0xc0,0x84,0x44,0x07,0x38,0x08,0x0d,0x41,0x68,0x13,0x70,0x39,0x08,0xd0,0x56,0xa1,0xd1,0x03,0x94,0x80,0x04,0x30,0x68,0x04,0x20,0x0e,0x84,0x91,0x03,0xa9,0x64,0x62,0x80,0x41,0x88,0x40,0x3f,0xc6,0xf1,0xfe,0x43,0xc0,0xe3,0x80,0xff,0xff,0xe0,0x3f,0xf8,0xf8,0x1c,0x78,0x18,0x1f,0xfe,0x0f,0x02,0x12,0x18,0x47,0x03,0x82,0x10,0x1e,0x08,0x1c,0xf5,0x60,0x71,0xd4,0x81,0xcf,0xab,0xff,0xd5,0xf5,0xc0,0xe3,0x04,0xe0,0x03,0x86,0xae,0x27,0x28,0x27,0x40,0x0e,0x21,0x91,0x03,0x96,0x80,0x0e,0x34,0x18,0x79,0x28,0x60,0x95,0x00,0x38,0xf8,0x20,0x27,0xd1,0x82,0x6a,0x03,0xc3,0x1c,0x39,0x94,0x0a,0xa1,0xc0,0xc5,0x2f,0xca,0x05,0x02,0x90,0x24,0x56,0x04,0x68,0x10,0x01,0x4f,0x80,0xea,0x5b,0x10,0x38,0x83,0x8d,0xa0,0x30,0x30,0x38,0xa3,0x09,0xc0,0x20,0xf2,0x03,0x90,0xc0,0x46,0xe2,0x91,0x2f,0x80,0xfc,0xe0,0x1e,0x08,0x02,0x54,0x47,0x62,0x27,0x2f,0xfb,0x14,0xdc,0xc6,0xb5,0x30,0x38,0x8b,0x05,0x6a,0x60,0x01,0x89,0x00,0xc8,0x16,0x50,0x29,0x10,0x1c,0x8d,0x25,0x05,0xa1,0x15,0xc9,0xfe,0x50,0xaa,0x08,0x10,0x67,0x01,0x22,0x8a,0xe0,0x60,0xe5,0xf2,0x07,0x8e,0xa8,0xb0,0x49,0xe1,0x00,0x0d,0xd4,0x68,0x5a,0x00,0x39,0x46,0x88,0x84,0x07,0x30,0xe8,0x81,0xc6,0x40,0x4d,0x11,0x91,0x17,0x06,0x40,0x65,0x11,0x51,0x01,0xc6,0x81,0x04,0x32,0x18,0x1e,0x92,0x64,0x00,0x11,0x68,0x81,0xd6,0xa0,0x07,0x16,0x22,0x6b,0x0a,0x82,0x07,0x3f,0x05,0x4d,0xdc,0x24,0x21,}; +const uint8_t *_I_DolphinFirstStart6_58x54[] = {_I_DolphinFirstStart6_58x54_0}; -const uint8_t _I_DoorLeft_70x55_0[] = {0x01,0x00,0x19,0x01,0x00,0x2c,0x32,0x01,0x03,0x04,0x2c,0x18,0x10,0xf0,0x40,0x47,0x82,0x06,0x81,0x03,0xff,0x80,0x08,0x1a,0x20,0x82,0x15,0x28,0x21,0x87,0x82,0x08,0x6f,0xc0,0xb1,0xe6,0x10,0x10,0x8b,0x46,0x20,0x43,0x55,0x8f,0x82,0x10,0x32,0x73,0x0a,0x09,0x89,0x6c,0x1e,0x09,0x00,0x18,0x60,0xf0,0x0c,0x84,0x93,0x82,0x03,0x18,0x0c,0x02,0x1d,0x00,0x90,0x52,0x70,0x50,0x1e,0x00,0x58,0x63,0x90,0x0a,0x06,0x4a,0x09,0x03,0xb0,0x02,0x06,0x70,0x62,0x49,0xf8,0x0c,0x66,0x3f,0xf0,0x41,0x63,0x04,0x43,0x00,0x99,0x60,0x00,0x85,0xc8,0x06,0x14,0xd0,0x80,0x3f,0xc8,0x0d,0xb8,0x10,0x70,0xf8,0x34,0x13,0x03,0x39,0x04,0x1c,0x42,0x19,0xf8,0xa0,0xc2,0x01,0x07,0xef,0x02,0x8c,0x80,0x10,0x9d,0x00,0x43,0xec,0x00,0xa3,0x10,0x04,0x25,0xce,0x19,0xfc,0x88,0x82,0x12,0x0c,0x35,0x10,0x42,0x4c,0xa1,0x90,0x3f,0xc0,0x21,0x22,0x39,0x82,0xc8,0x88,0xd2,0x11,0xf0,0x01,0x88,0xd5,0x18,0xe2,0x08,0x68,0x10,0x0c,0xa8,0x00,0x83,0x81,0xcc,0xd5,0xc3,0x80,0x84,0x82,0x0e,0xcc,0xc0,0x15,0x79,0x02,0x0b,0x98,0xf8,0x11,0x88,0x82,0x0f,0x31,0x19,0x02,0x08,0x2c,0x9f,0x6a,0x1d,0x20,0x41,0x31,0x4c,0x10,0x8d,0x73,0x04,0x23,0xa4,0xc4,0x6c,0xde,0x20,0x42,0xcc,0x01,0x07,0x07,0xff,0x80,0x06,0x3e,0x08,0x38,0x70,0x20,0xa1,0xe0,0x83,0x8e,0x01,0x0c,0xf0,0x73,0x80,0x43,0x70,0x05,0x08,0x00,0x2c,0x04,0xc4,0x46,0x53,0x09,0x98,0x24,0x80,0x65,0x80,0xb0,0xd9,0x84,0x65,0x32,0x06,0x17,0x0f,0x98,0x23,0x63,0xe1,0x88,0xc4,0x08,0x5f,0xc1,0x30,0x9d,0x84,0x4e,0x66,0x94,0x11,0x98,0x75,0x26,0x00,}; -const uint8_t *_I_DoorLeft_70x55[] = {_I_DoorLeft_70x55_0}; +const uint8_t _I_DolphinFirstStart1_59x53_0[] = {0x01,0x00,0x1e,0x01,0x00,0x0e,0x03,0xfe,0x07,0x5b,0x84,0x02,0x06,0x07,0x48,0x64,0x02,0x08,0x07,0x48,0x14,0x02,0x10,0x07,0x48,0x0c,0x03,0x21,0x3f,0x13,0x18,0x84,0xa8,0x00,0x75,0x8c,0x00,0xca,0x00,0x0b,0x28,0x20,0x1d,0xa0,0x59,0xe0,0x39,0x48,0x07,0x03,0x81,0xd5,0x81,0xd6,0x81,0x55,0x8c,0x01,0xc6,0x21,0x00,0x87,0x68,0x25,0x52,0x40,0x39,0x7c,0x21,0xf5,0x08,0xa8,0x1d,0x20,0xfa,0x88,0x70,0x1c,0xfd,0x10,0x3a,0xa4,0x1f,0x88,0x54,0x18,0x85,0x52,0x09,0xbe,0x81,0xc1,0x0c,0x83,0x10,0x94,0x40,0x39,0xf0,0x19,0x21,0xc8,0x62,0x12,0x0c,0x04,0x0e,0x0c,0x07,0x38,0x07,0x86,0x07,0x18,0x03,0x94,0xc2,0x01,0x9e,0x81,0xca,0x38,0x89,0x21,0x0f,0x0c,0x03,0xf9,0x27,0x13,0x94,0xd0,0xb6,0x70,0x20,0x38,0xda,0x80,0xe5,0x10,0x03,0x95,0x59,0x54,0x70,0x10,0x38,0xda,0xc0,0xc3,0xfe,0xc1,0xab,0x0b,0xaa,0x2a,0x1c,0x05,0x81,0x58,0x38,0x09,0xd0,0x5c,0xa3,0xe0,0x72,0x86,0xae,0x8d,0x40,0x34,0x06,0xa1,0xc0,0xc0,0xe3,0xc0,0x65,0x1c,0x19,0x58,0x29,0xe1,0x00,0x14,0x28,0x0a,0x26,0x61,0x00,0x15,0x58,0x0a,0x2e,0x34,0xd6,0x42,0x9e,0x6b,0x54,0x82,0x92,0x08,0x1e,0x63,0x41,0x1d,0x0a,0x88,0x60,0x1d,0x42,0x11,0x5c,0x01,0xe5,0x3c,0x03,0x97,0x30,0x0e,0x42,0x42,0x80,0xd0,0x82,0xe4,0x07,0x28,0x17,0x10,0x1e,0xb0,0x4a,0x20,0x3d,0x61,0x1a,0x80,0x79,0x0f,0x0a,0x21,0x70,0x07,0x90,0x1c,0xa4,0x1a,0x00,0x7a,0xd0,0x0e,0x42,0x34,0x20,0x10,0xe0,0x00,0xed,0x00,0xa1,0x82,0xc8,0xc6,0x74,0x40,0xd9,0x01,0xce,0x84,0x07,0x69,0x10,0xcc,0x80,0xe7,0x5c,0x03,0xb4,0xa8,0x96,0x40,0x73,0x8a,0x96,0xc8,0x0c,0x40,}; +const uint8_t *_I_DolphinFirstStart1_59x53[] = {_I_DolphinFirstStart1_59x53_0}; -const uint8_t _I_DoorRight_70x55_0[] = {0x01,0x00,0x16,0x01,0x81,0xcc,0x01,0x0f,0x60,0x04,0x3f,0x00,0x10,0xf8,0x08,0x0c,0x02,0x05,0x01,0x84,0x02,0x06,0x26,0x0a,0x10,0x8a,0xcc,0xe0,0x1d,0x68,0xe0,0x18,0xab,0xd0,0x0b,0x18,0x10,0x46,0xe6,0x16,0x1e,0x18,0x10,0x46,0xe4,0x28,0x2c,0x98,0x14,0x68,0x00,0x21,0x1d,0x10,0x8c,0x40,0x02,0x0e,0x10,0xa1,0x08,0xc8,0x40,0x42,0x62,0x11,0x94,0x03,0xfd,0xff,0x00,0x0c,0xff,0x0c,0x08,0x28,0x60,0xe4,0xc0,0x85,0x00,0x83,0x00,0x87,0xf1,0x00,0x8c,0x02,0x0b,0x07,0x24,0x84,0xff,0x04,0xc7,0x80,0xa0,0xe4,0xa0,0x81,0x41,0x04,0x17,0x02,0x41,0x49,0x81,0x0e,0x10,0xb2,0xa0,0x82,0x0e,0x9f,0xfc,0x0a,0x62,0xf2,0xc0,0x03,0x92,0xf0,0x08,0x2d,0x78,0x20,0xff,0x02,0x01,0x08,0xae,0x60,0x64,0x38,0x0d,0xb0,0x8d,0x08,0x82,0x11,0x58,0xc4,0x13,0xc0,0x35,0x68,0x62,0x68,0x81,0x09,0x08,0x84,0x40,0x81,0x0d,0x18,0x69,0x10,0x47,0x44,0x66,0x5f,0x21,0xa9,0x29,0x94,0x10,0x2f,0x23,0x53,0x14,0x60,0x42,0x3c,0x08,0xfc,0x02,0x2c,0x62,0x23,0x58,0xd0,0x22,0x00,0x83,0x3e,0x98,0x44,0x43,0x46,0x22,0x30,0x89,0xce,0x01,0x0f,0x70,0x04,0x3f,0x81,0x8a,0x3c,0x21,0xaa,0x70,0x1a,0xe3,0x44,0x1a,0xa6,0x01,0xd2,0x38,0x90,0x8a,0x40,0x20,0xe5,0x96,0x80,0x43,0x81,0x06,0x6b,0x28,0x07,0xf3,0xfe,0x00,0x19,0xf9,0x34,0xc1,0x08,0x8f,0x20,0xf1,0x3e,0x16,0x00,0xa8,0x19,0x00,0x10,0x76,0x03,0xe2,0x3e,0x90,0x45,0x38,0x01,0x42,0x05,0x88,0x44,0x67,0x15,0x70,0x41,0x38,0x04,0x10,0x24,0x03,0x00,0x10,0x20,0x4a,0x46,0xe9,0x46,0xe1,0x04,0x50,0x66,0x40,0x85,0x19,0x98,0x00,0xc0,}; -const uint8_t *_I_DoorRight_70x55[] = {_I_DoorRight_70x55_0}; +const uint8_t _I_ArrowDownFilled_14x15_0[] = {0x00,0xF8,0x07,0x08,0x04,0xE8,0x05,0x68,0x05,0xA8,0x05,0x68,0x05,0xA8,0x05,0x6F,0x3D,0xA1,0x21,0xFA,0x17,0xF4,0x0B,0xE8,0x05,0xD0,0x02,0x20,0x01,0xC0,0x00,}; +const uint8_t *_I_ArrowDownFilled_14x15[] = {_I_ArrowDownFilled_14x15_0}; + +const uint8_t _I_ArrowUpEmpty_14x15_0[] = {0x01,0x00,0x18,0x00,0xe0,0x40,0x24,0x10,0x18,0x84,0x0a,0x11,0x04,0x82,0x42,0x20,0x51,0x08,0x0c,0x82,0x1f,0x3c,0x04,0x88,0x06,0x7f,0x10,0x70,}; +const uint8_t *_I_ArrowUpEmpty_14x15[] = {_I_ArrowUpEmpty_14x15_0}; + +const uint8_t _I_ArrowUpFilled_14x15_0[] = {0x00,0xC0,0x00,0x20,0x01,0xD0,0x02,0xE8,0x05,0xF4,0x0B,0xFA,0x17,0x61,0x21,0xAF,0x3D,0x68,0x05,0xA8,0x05,0x68,0x05,0xA8,0x05,0xE8,0x05,0x08,0x04,0xF8,0x07,}; +const uint8_t *_I_ArrowUpFilled_14x15[] = {_I_ArrowUpFilled_14x15_0}; + +const uint8_t _I_ArrowDownEmpty_14x15_0[] = {0x01,0x00,0x17,0x00,0xfc,0x41,0xe1,0x10,0x40,0x0c,0xc3,0xe7,0x90,0x19,0x04,0x0a,0x20,0x08,0x10,0x48,0xc4,0x20,0x52,0x08,0x0f,0x02,0x00,}; +const uint8_t *_I_ArrowDownEmpty_14x15[] = {_I_ArrowDownEmpty_14x15_0}; const uint8_t _I_DoorLocked_10x56_0[] = {0x01,0x00,0x4e,0x00,0x86,0x40,0x25,0xb0,0x0b,0x6c,0x03,0x9b,0x00,0xc6,0xc0,0x65,0x90,0x10,0x3a,0xc3,0x20,0x31,0xc8,0x04,0xe2,0x01,0x70,0x80,0x78,0x20,0x1c,0x48,0x07,0x22,0x01,0xd0,0x00,0xf0,0x44,0x68,0x90,0x09,0x04,0x02,0x21,0x00,0x84,0x40,0x25,0x80,0x12,0x1e,0x88,0x14,0xc0,0x2e,0x0d,0x11,0xca,0xf8,0x60,0x1c,0x38,0x07,0x1a,0x05,0xcc,0x80,0x72,0x60,0x5c,0x38,0x10,0x1c,0xf9,0x10,0x2e,0x00,0x05,0x60,0x00,0x11,}; const uint8_t *_I_DoorLocked_10x56[] = {_I_DoorLocked_10x56_0}; +const uint8_t _I_PassportBottom_128x17_0[] = {0x01,0x00,0x5e,0x00,0x96,0x01,0x97,0xe1,0xff,0x00,0x2e,0x3e,0x68,0x0f,0x5a,0xc5,0x54,0x00,0xb9,0x50,0xfb,0x6a,0x35,0x40,0x05,0xcd,0x4e,0x03,0xfd,0x30,0x0f,0xf8,0x7f,0xa0,0x81,0xfe,0xf9,0x1b,0xfb,0xf3,0x01,0x47,0x66,0x02,0x1b,0x03,0x07,0xe7,0x02,0x0b,0x02,0x07,0xe5,0x82,0x0b,0xf2,0x1c,0xb0,0x01,0x67,0xf0,0x5f,0xd0,0x3f,0x23,0xf0,0x9b,0xc9,0xe5,0x80,0x03,0xd5,0xc0,0x00,0x86,0x01,0xf3,0xe6,0x1e,0x58,0x00,0x36,0xa8,0x06,0xac,0x04,0x30,0x6c,0x30,0xee,0x60,0x1f,0xe0,0x10,0xff,0x0d,0xfb,0x00,}; +const uint8_t *_I_PassportBottom_128x17[] = {_I_PassportBottom_128x17_0}; + const uint8_t _I_PassportLeft_6x47_0[] = {0x01,0x00,0x1c,0x00,0x9e,0x40,0xa3,0x32,0x59,0x2c,0x66,0x03,0x01,0x82,0xc2,0x62,0x32,0x50,0x16,0xc8,0x60,0x30,0x28,0x24,0x32,0x39,0x3c,0x9e,0x4d,0x25,0x80,0x1a,}; const uint8_t *_I_PassportLeft_6x47[] = {_I_PassportLeft_6x47_0}; +const uint8_t _I_DoorLeft_70x55_0[] = {0x01,0x00,0x19,0x01,0x00,0x2c,0x32,0x01,0x03,0x04,0x2c,0x18,0x10,0xf0,0x40,0x47,0x82,0x06,0x81,0x03,0xff,0x80,0x08,0x1a,0x20,0x82,0x15,0x28,0x21,0x87,0x82,0x08,0x6f,0xc0,0xb1,0xe6,0x10,0x10,0x8b,0x46,0x20,0x43,0x55,0x8f,0x82,0x10,0x32,0x73,0x0a,0x09,0x89,0x6c,0x1e,0x09,0x00,0x18,0x60,0xf0,0x0c,0x84,0x93,0x82,0x03,0x18,0x0c,0x02,0x1d,0x00,0x90,0x52,0x70,0x50,0x1e,0x00,0x58,0x63,0x90,0x0a,0x06,0x4a,0x09,0x03,0xb0,0x02,0x06,0x70,0x62,0x49,0xf8,0x0c,0x66,0x3f,0xf0,0x41,0x63,0x04,0x43,0x00,0x99,0x60,0x00,0x85,0xc8,0x06,0x14,0xd0,0x80,0x3f,0xc8,0x0d,0xb8,0x10,0x70,0xf8,0x34,0x13,0x03,0x39,0x04,0x1c,0x42,0x19,0xf8,0xa0,0xc2,0x01,0x07,0xef,0x02,0x8c,0x80,0x10,0x9d,0x00,0x43,0xec,0x00,0xa3,0x10,0x04,0x25,0xce,0x19,0xfc,0x88,0x82,0x12,0x0c,0x35,0x10,0x42,0x4c,0xa1,0x90,0x3f,0xc0,0x21,0x22,0x39,0x82,0xc8,0x88,0xd2,0x11,0xf0,0x01,0x88,0xd5,0x18,0xe2,0x08,0x68,0x10,0x0c,0xa8,0x00,0x83,0x81,0xcc,0xd5,0xc3,0x80,0x84,0x82,0x0e,0xcc,0xc0,0x15,0x79,0x02,0x0b,0x98,0xf8,0x11,0x88,0x82,0x0f,0x31,0x19,0x02,0x08,0x2c,0x9f,0x6a,0x1d,0x20,0x41,0x31,0x4c,0x10,0x8d,0x73,0x04,0x23,0xa4,0xc4,0x6c,0xde,0x20,0x42,0xcc,0x01,0x07,0x07,0xff,0x80,0x06,0x3e,0x08,0x38,0x70,0x20,0xa1,0xe0,0x83,0x8e,0x01,0x0c,0xf0,0x73,0x80,0x43,0x70,0x05,0x08,0x00,0x2c,0x04,0xc4,0x46,0x53,0x09,0x98,0x24,0x80,0x65,0x80,0xb0,0xd9,0x84,0x65,0x32,0x06,0x17,0x0f,0x98,0x23,0x63,0xe1,0x88,0xc4,0x08,0x5f,0xc1,0x30,0x9d,0x84,0x4e,0x66,0x94,0x11,0x98,0x75,0x26,0x00,}; +const uint8_t *_I_DoorLeft_70x55[] = {_I_DoorLeft_70x55_0}; + const uint8_t _I_LockPopup_100x49_0[] = {0x01,0x00,0x37,0x01,0xfc,0x7f,0xc0,0x13,0x01,0xfe,0x03,0x2a,0x07,0x06,0x12,0xd4,0x1a,0x06,0x0c,0xa8,0x60,0x33,0xe0,0x12,0x08,0x40,0x32,0x3f,0xd0,0x70,0x64,0xe0,0x20,0x31,0x8a,0x00,0x32,0x2c,0x10,0x0b,0x00,0x32,0x62,0x10,0x0c,0x06,0x00,0x19,0x00,0x82,0xc0,0x83,0x22,0x08,0x04,0x18,0x11,0x6a,0x01,0x25,0x02,0x84,0x83,0x1e,0x02,0x04,0x10,0xe1,0x03,0x1e,0x3c,0x0c,0x9c,0x1c,0x02,0x43,0x00,0x84,0x4f,0xc1,0x8f,0x80,0xaf,0x40,0x39,0x14,0x00,0x63,0xd0,0x36,0xf0,0x09,0xc6,0x00,0x18,0xd4,0x3a,0x06,0x9c,0x08,0x20,0xc9,0xdf,0xc0,0x20,0x7f,0x00,0x65,0x40,0x3f,0x80,0xc7,0xd0,0x10,0x06,0x01,0x7f,0x06,0x34,0x8e,0xa1,0x3d,0x80,0x70,0x0b,0x4f,0x23,0xd0,0x50,0xa0,0x1f,0x08,0x78,0x66,0x11,0xe3,0xfc,0x83,0x83,0x1e,0x40,0x0c,0x1f,0xfb,0xec,0x41,0x8c,0x03,0x1e,0x07,0x00,0x4d,0x10,0x0a,0x04,0xc0,0x9b,0x30,0x0c,0x1f,0xff,0xff,0x9f,0x06,0x3e,0x01,0x80,0x48,0xe7,0x99,0x83,0x0d,0x6a,0xe0,0xc4,0x90,0x03,0x1a,0x76,0x0c,0x38,0xe0,0x34,0x45,0x25,0x02,0x06,0x0d,0xe0,0x18,0x3c,0x08,0x19,0x40,0x78,0x00,0xc1,0x81,0xc3,0x27,0xf8,0x48,0x26,0x82,0x7d,0x00,0xfc,0x40,0xfc,0x10,0xfc,0x04,0xfc,0x18,0x30,0x28,0x7d,0x02,0x3f,0x00,0x98,0x41,0x38,0x31,0x08,0x25,0x0e,0x19,0x1f,0x81,0x42,0x70,0x11,0xa2,0x08,0xe2,0x30,0x72,0x08,0x76,0x0a,0x19,0x0f,0x85,0x42,0x60,0x11,0x51,0x78,0xc2,0x20,0x32,0x08,0x26,0x00,0x18,0x91,0x00,0x60,0x91,0x44,0x08,0x34,0x08,0x64,0x1f,0xe4,0x07,0x3f,0x84,0x0d,0x58,0x44,0x01,0x83,0xdc,0x60,0x43,0xe1,0x39,0xa9,0xd0,0x60,0x70,0x16,0x78,0xca,0x01,0x8f,0x83,0x3d,0x10,0x33,0x29,0x00,0xc7,0xa1,0x83,0x3f,0x10,0x0c,0x79,0x30,0x32,0xa0,0xdf,0xc7,0xa0,0x80,0x22,0x07,0xf8,0x06,0x54,0x04,}; const uint8_t *_I_LockPopup_100x49[] = {_I_LockPopup_100x49_0}; -const uint8_t _I_Down_hvr_25x27_0[] = {0x01,0x00,0x3a,0x00,0xfc,0x7f,0xe7,0xf0,0x0f,0xe7,0xfe,0xff,0x00,0xff,0x7f,0xff,0xf0,0x00,0x10,0xff,0xe0,0x20,0x3f,0x01,0x9c,0x3e,0x01,0xe0,0x01,0xa4,0x7e,0x01,0xf0,0x80,0x8b,0x47,0xf1,0x01,0x16,0x8f,0xf0,0x2e,0x23,0x11,0x01,0x88,0x04,0xf0,0x60,0x32,0xe3,0x80,0xcb,0xde,0x37,0xf0,0x1a,0x95,0xcc,0xbe,0x66,0x73,}; -const uint8_t *_I_Down_hvr_25x27[] = {_I_Down_hvr_25x27_0}; - -const uint8_t _I_Vol_down_hvr_25x27_0[] = {0x01,0x00,0x23,0x00,0xfc,0x7f,0xe7,0xf0,0x0f,0xe7,0xfe,0xff,0x00,0xff,0x7f,0xff,0xf0,0x00,0x10,0xff,0xe0,0x20,0x3f,0x01,0xf8,0xb4,0x7f,0x00,0x34,0x0b,0xf8,0x0f,0xc0,0x6e,0x57,0x32,0xf9,0x99,0xcc,}; -const uint8_t *_I_Vol_down_hvr_25x27[] = {_I_Vol_down_hvr_25x27_0}; - -const uint8_t _I_Down_25x27_0[] = {0x01,0x00,0x46,0x00,0xfc,0x7f,0xe7,0xf0,0x08,0x24,0x02,0x81,0x00,0x81,0x40,0x30,0x10,0x08,0x08,0x38,0x60,0x20,0x3f,0x01,0x9f,0xc7,0xff,0x1f,0x01,0xa7,0x87,0xff,0x0f,0x80,0xf0,0x7f,0xf0,0x78,0x0e,0x07,0xff,0x03,0x0b,0x8f,0xfc,0x04,0x30,0x1f,0xf0,0x7c,0xaf,0x80,0x32,0x9c,0x00,0xca,0x20,0x37,0xf0,0x18,0xc0,0xca,0x63,0x01,0x83,0x40,0x38,0x10,0x0f,0xe7,0xfe,0xfe,0x67,0x40,}; -const uint8_t *_I_Down_25x27[] = {_I_Down_25x27_0}; - -const uint8_t _I_Fill_marker_7x7_0[] = {0x00,0x1C,0x32,0x6F,0x5F,0x7F,0x3E,0x1C,}; -const uint8_t *_I_Fill_marker_7x7[] = {_I_Fill_marker_7x7_0}; - -const uint8_t _I_Vol_down_25x27_0[] = {0x01,0x00,0x2c,0x00,0xfc,0x7f,0xe7,0xf0,0x08,0x24,0x02,0x81,0x00,0x81,0x40,0x30,0x10,0x08,0x08,0x38,0x60,0x20,0x3f,0x01,0xff,0x07,0xff,0x07,0x01,0xa0,0x5f,0xc0,0x7e,0x03,0x38,0x19,0x4c,0x60,0x30,0x68,0x07,0x02,0x01,0xfc,0xff,0xdf,0xcc,0xe8,}; -const uint8_t *_I_Vol_down_25x27[] = {_I_Vol_down_25x27_0}; - -const uint8_t _I_Vol_up_25x27_0[] = {0x01,0x00,0x2f,0x00,0xfc,0x7f,0xe7,0xf0,0x08,0x24,0x02,0x81,0x00,0x81,0x40,0x30,0x10,0x08,0x08,0x38,0x60,0x20,0x38,0x88,0x00,0xfc,0x06,0xbc,0x1f,0xfc,0x1c,0x06,0x81,0x7f,0x01,0xc1,0x0e,0xa0,0x65,0x31,0x80,0xc1,0xa0,0x1c,0x08,0x07,0xf3,0xff,0x7f,0x33,0xa0,}; -const uint8_t *_I_Vol_up_25x27[] = {_I_Vol_up_25x27_0}; - -const uint8_t _I_Up_hvr_25x27_0[] = {0x01,0x00,0x39,0x00,0xfc,0x7f,0xe7,0xf0,0x0f,0xe7,0xfe,0xff,0x00,0xff,0x7f,0xff,0xf0,0x00,0x10,0xff,0xe0,0x20,0x3c,0xf7,0x80,0xcb,0x8e,0x03,0x2c,0x18,0x0c,0x80,0x26,0x25,0x18,0x08,0xa4,0x7f,0x90,0x11,0x88,0xfe,0x20,0x31,0xf8,0x07,0xc2,0x03,0x0f,0x80,0x78,0x00,0x68,0x37,0xf0,0x1d,0x95,0xcc,0xbe,0x66,0x73,}; -const uint8_t *_I_Up_hvr_25x27[] = {_I_Up_hvr_25x27_0}; - -const uint8_t _I_Vol_up_hvr_25x27_0[] = {0x01,0x00,0x28,0x00,0xfc,0x7f,0xe7,0xf0,0x0f,0xe7,0xfe,0xff,0x00,0xff,0x7f,0xff,0xf0,0x00,0x10,0xff,0xe0,0x20,0x38,0xf7,0x80,0xfc,0x06,0xa2,0xd1,0xfc,0x00,0xd0,0x2f,0xe0,0x38,0x21,0xd8,0x0c,0x8a,0xe6,0x5f,0x33,0x39,0x80,}; -const uint8_t *_I_Vol_up_hvr_25x27[] = {_I_Vol_up_hvr_25x27_0}; - -const uint8_t _I_IrdaLearnShort_128x31_0[] = {0x01,0x00,0x10,0x01,0x00,0x47,0xfb,0xfe,0x00,0x38,0x38,0x3e,0x20,0x20,0x54,0x84,0x03,0x9f,0xc0,0x06,0x58,0x80,0x3d,0xf2,0x00,0x65,0x90,0x03,0xde,0x90,0x06,0x5a,0x07,0xc0,0x8a,0x70,0x1a,0x04,0x02,0x51,0x80,0x03,0x94,0x02,0x3f,0x40,0x20,0x24,0x0b,0x01,0x00,0x92,0x70,0x35,0x40,0x01,0xe0,0xdf,0xf0,0x10,0x40,0x71,0x58,0x20,0x90,0x88,0x0c,0x4a,0x81,0x55,0x00,0x0f,0x87,0xf7,0x00,0x82,0x43,0x36,0x16,0xdc,0x9c,0x12,0x21,0x01,0x85,0x70,0x3f,0xc1,0xf1,0xf8,0xfc,0x60,0x20,0xf5,0x90,0x40,0xa1,0x34,0x08,0x18,0x7c,0x7e,0x24,0x91,0x07,0x8c,0xc0,0x5e,0x52,0x28,0x14,0x17,0x81,0x01,0x0f,0x8f,0xe7,0xe3,0x03,0x1f,0x8e,0x02,0xdb,0x03,0x8e,0x49,0x20,0x50,0x2e,0x04,0x72,0xbd,0x55,0xdc,0xeb,0xa0,0x7c,0x4f,0x68,0xbc,0x60,0x72,0x40,0x79,0x50,0x23,0x9a,0x6d,0x56,0x66,0x5c,0x0f,0x21,0x78,0x9b,0x04,0x1e,0x28,0x21,0x8e,0x5c,0x43,0xe6,0x2f,0x10,0xf9,0x0b,0xc7,0x04,0x99,0x18,0x06,0xe0,0x7e,0x56,0x32,0x78,0x8f,0xc4,0x08,0x32,0x20,0x79,0x48,0x2b,0x85,0xf2,0xf8,0x83,0xc4,0x5c,0x3f,0x03,0x78,0xd0,0x81,0xe3,0xc0,0xdf,0x9f,0xcb,0xf3,0x04,0xc6,0x7d,0xfb,0xdf,0x34,0x78,0xd0,0x45,0xe5,0x7e,0x4f,0x97,0xe2,0x09,0x80,0x07,0x88,0xbc,0x61,0x00,0xf3,0xd8,0x2f,0xcb,0xe0,0xcf,0x60,0x68,0xd0,0x30,0x15,0xfa,0xac,0x36,0x3f,0x60,0x77,0xb3,0x80,0x5d,0xe6,0x4b,0x20,0x03,0x03,0xc4,0x01,0xd0,0x10,0x7f,0x40,0x81,0xfc,0xa7,0x10,0x06,0x99,0xd0,0x01,0x51,0x00,0x7f,0x48,0x01,0xfd,0xc0,0x43,0x98,0x00,0x8e,0xfe,0x00,0xf0,}; -const uint8_t *_I_IrdaLearnShort_128x31[] = {_I_IrdaLearnShort_128x31_0}; - -const uint8_t _I_IrdaSend_128x64_0[] = {0x01,0x00,0xe2,0x01,0x00,0x78,0x03,0xc0,0x1e,0x00,0xfe,0x04,0x0e,0x05,0x82,0xd7,0x81,0xca,0x21,0x08,0x01,0x8c,0x10,0x0e,0x54,0x00,0x20,0xe0,0xa4,0x00,0xfb,0xb2,0x4e,0xb0,0xfa,0x0e,0x74,0xc7,0x0f,0x3b,0xce,0x4e,0xec,0xf0,0xe1,0x79,0xe4,0xe9,0x58,0x2d,0x3d,0x4a,0x95,0x41,0x89,0x52,0x31,0x59,0x40,0xfa,0x64,0x01,0xe3,0xa0,0xa9,0x5e,0x81,0xe7,0xf4,0x07,0xcc,0x28,0x1e,0x71,0x40,0x7a,0x58,0x01,0xe4,0x3f,0x1c,0x0c,0x4f,0x11,0x0b,0xb3,0x83,0xcc,0x00,0x94,0x20,0x2a,0x03,0xa0,0x1e,0xd0,0x34,0xdf,0x80,0x3c,0x01,0xe0,0x0f,0x00,0x4c,0xf0,0x17,0x4c,0x81,0xa0,0x18,0x18,0x1f,0x39,0x90,0x6c,0x60,0x27,0x70,0xe9,0x3f,0x67,0x03,0x3c,0x80,0x83,0xde,0x81,0x4a,0x84,0xca,0x68,0xb8,0x2b,0xf0,0x3f,0x29,0x20,0xfe,0xa8,0xe0,0x85,0xf3,0x80,0xa5,0xc3,0xb8,0xf4,0xd8,0x11,0x3e,0x40,0x04,0x1b,0x23,0x7d,0x83,0xcd,0x1f,0x60,0x0f,0x00,0x78,0x03,0x7f,0x9f,0xf0,0x01,0xc0,0xc1,0xf1,0x04,0x02,0xa4,0x08,0x1f,0xe0,0xff,0x01,0x0f,0x00,0x70,0x9f,0xfe,0x20,0x10,0xe7,0xe0,0xf2,0x90,0x07,0xd7,0x89,0xdf,0xaa,0xd5,0x7b,0xa0,0xf3,0x8e,0x03,0xdb,0x54,0x00,0x29,0x70,0x3c,0xa2,0x40,0xf6,0xbf,0x87,0xc7,0xea,0x1f,0x12,0x30,0xc2,0x41,0xed,0xab,0x95,0x07,0xc6,0x75,0x02,0x10,0x0c,0x17,0xe0,0x47,0x18,0xff,0x82,0x07,0xc4,0xaf,0x8f,0xd2,0x43,0x80,0x82,0x56,0x01,0x03,0x35,0xfc,0x43,0xc7,0xe3,0x8a,0xc4,0x6a,0xa5,0x50,0x28,0x8d,0x02,0x05,0xa8,0x13,0x8c,0xaa,0xf9,0x1f,0xe2,0x5d,0xc2,0xc3,0x75,0x9f,0xe0,0xa1,0x14,0x08,0x0f,0x60,0x52,0x33,0x59,0xf4,0xf8,0x7e,0x32,0x2d,0x10,0xfc,0x70,0x58,0x89,0x04,0x06,0xd1,0xa0,0x0f,0x8f,0xfa,0x7e,0x3f,0x3e,0xa8,0x7c,0x69,0x1a,0x08,0x04,0xe2,0x80,0x1f,0x19,0xfd,0xf8,0xfe,0x92,0xa0,0x78,0xd0,0x20,0x19,0x8e,0x19,0xa8,0x7a,0xf7,0x51,0xfb,0x03,0xcb,0x11,0xc3,0xaa,0x4d,0x7a,0x76,0x51,0xf8,0x87,0xc8,0x7e,0x34,0x85,0xf0,0xe2,0x24,0x7a,0xe0,0xf9,0xaf,0xd0,0x9e,0x31,0x08,0x04,0x22,0x01,0x57,0x1f,0x9e,0xb8,0x7e,0x90,0x80,0x79,0x61,0x07,0xe2,0x5f,0x2f,0xfd,0xde,0xeb,0xf7,0x4f,0x8c,0x44,0x3a,0x30,0x8f,0xc0,0x7c,0x4f,0xe6,0x1f,0x29,0xda,0xbc,0x41,0xe5,0xc0,0xd7,0xa7,0xcd,0x8a,0x3d,0xdf,0xe8,0x7c,0x60,0x40,0xf2,0x80,0x55,0x97,0xe7,0xee,0x0f,0x0f,0xa9,0xfe,0x30,0x40,0x79,0x7c,0x05,0x43,0xe1,0x6f,0x88,0x7c,0x40,0x02,0x1f,0x18,0x01,0x3c,0x5d,0xe5,0x9f,0x80,0xbf,0xc4,0x1f,0x00,0x05,0x82,0x01,0x50,0x1e,0x28,0xf1,0x00,0x2c,0x90,0x1e,0xca,0xf1,0x00,0x2d,0x52,0x1e,0x0f,0x5c,0x00,0x7d,0xc1,0xed,0x00,0x25,0x08,0xff,0x00,0x46,0x00,0x3f,0xe1,0x7c,0xff,0xf0,0x30,0xc3,0xc0,0x3c,0x02,0x73,0xbc,0x00,0xcb,0xf0,0x18,0x4f,0xf8,0x3e,0x00,0x0c,0x0f,0xf0,}; -const uint8_t *_I_IrdaSend_128x64[] = {_I_IrdaSend_128x64_0}; - -const uint8_t _I_DolphinReadingSuccess_59x63_0[] = {0x01,0x00,0x19,0x01,0x00,0x1d,0x00,0x0f,0xd2,0x00,0x21,0xe0,0x3f,0xf0,0xf9,0x00,0x40,0xee,0x00,0x11,0x88,0x04,0x0e,0x18,0x11,0x18,0x8c,0x40,0x0e,0x50,0x30,0x10,0xc0,0xa1,0x01,0xe2,0x05,0x14,0x12,0x08,0x33,0x58,0x44,0x08,0x66,0xa1,0xe3,0x01,0x9c,0x83,0x00,0x24,0x11,0x11,0x06,0xc4,0x76,0x20,0x75,0x15,0x99,0x48,0xc0,0xe9,0x0f,0x03,0x95,0xfc,0x86,0x3c,0x09,0x80,0x1c,0x7c,0x00,0x91,0x81,0x48,0x2f,0xc1,0x41,0x8c,0xc0,0x20,0x30,0x1c,0x87,0xfc,0x0e,0x30,0x70,0x70,0x81,0xc7,0xe6,0x07,0x18,0x08,0x1c,0xb9,0x1e,0x38,0x0f,0x02,0x01,0xf0,0x03,0xa0,0xa4,0x7f,0x90,0x30,0x38,0xff,0xe0,0x28,0x21,0xff,0x06,0x44,0x0e,0x46,0xe1,0x01,0x8c,0x03,0x34,0x2f,0x25,0x18,0x80,0xc7,0x2a,0x03,0x2e,0x01,0x3c,0x70,0x12,0xa2,0x39,0x78,0x27,0xe0,0x31,0xea,0x82,0xc4,0x6c,0x31,0xf0,0x78,0xea,0xb0,0x22,0x31,0xfc,0x1a,0xc6,0x01,0x55,0x25,0x88,0xf8,0x4b,0x02,0x1f,0x13,0xe1,0x7f,0x97,0x85,0x15,0x03,0x90,0xf8,0xa0,0x10,0xa1,0xb1,0x0e,0x88,0x00,0x7f,0x0f,0xc0,0x7c,0x57,0x27,0x3c,0xb0,0x7f,0x5f,0xa9,0x1f,0xc0,0x6a,0xc5,0x05,0xc0,0xf0,0x11,0x46,0xac,0x18,0x3f,0xf9,0x54,0x75,0x00,0x73,0x1f,0x0f,0xfe,0xfe,0xc6,0x30,0x01,0xbc,0x48,0x00,0x84,0x82,0x00,0x1b,0x64,0xc0,0x07,0x60,0x03,0xb4,0x70,0x0c,0xbf,0x82,0x31,0x01,0x8d,0x0c,0x40,0x02,0x37,0x08,0x1d,0x74,0x00,0x76,0xa0,0x01,0xdb,0x01,0xfe,0x85,0x8b,0x96,0xaa,0x9b,0x30,0x01,0x6a,0xa3,0x40,0x75,0xaa,0x03,0xdb,0x50,0xbb,0x30,0x01,0x54,0x24,0x25,0xe6,0x51,0x08,0x1f,0x68,0x00,0x7f,0x03,0xf2,0x79,0xc0,0xf4,}; -const uint8_t *_I_DolphinReadingSuccess_59x63[] = {_I_DolphinReadingSuccess_59x63_0}; - -const uint8_t _I_Mute_hvr_25x27_0[] = {0x01,0x00,0x4a,0x00,0xfc,0x7f,0xe7,0xf0,0x0f,0xe7,0xfe,0xff,0x00,0xff,0x7f,0xff,0xf0,0x00,0x10,0xff,0xe0,0x20,0x21,0xfe,0x40,0x7b,0xf7,0xff,0x5c,0x07,0x7f,0xbf,0xf9,0xc0,0x6f,0xfd,0xff,0xd8,0x3c,0x7c,0x1f,0x90,0x38,0xff,0x7f,0x40,0x31,0xbd,0x82,0xc6,0xff,0xb7,0x01,0x97,0x3c,0x06,0xc0,0xb3,0x09,0x98,0x6c,0x84,0x68,0x2b,0x21,0x99,0x8e,0xcc,0x86,0x64,0xb5,0x01,0x89,0x5c,0xcb,0xe6,0x67,0x30,}; -const uint8_t *_I_Mute_hvr_25x27[] = {_I_Mute_hvr_25x27_0}; - -const uint8_t _I_Back_15x10_0[] = {0x00,0x04,0x00,0x06,0x00,0xFF,0x0F,0x06,0x10,0x04,0x20,0x00,0x40,0x00,0x40,0x00,0x20,0x00,0x10,0xFE,0x0F,}; -const uint8_t *_I_Back_15x10[] = {_I_Back_15x10_0}; - -const uint8_t _I_Up_25x27_0[] = {0x01,0x00,0x44,0x00,0xfc,0x7f,0xe7,0xf0,0x08,0x24,0x02,0x81,0x00,0x81,0x40,0x30,0x10,0x08,0x08,0x38,0x60,0x20,0x3c,0x88,0x00,0xca,0x70,0x03,0x2b,0xe0,0x0c,0xbf,0xc0,0x32,0xff,0x80,0x87,0x03,0xff,0x81,0xc0,0x78,0x3f,0xf8,0x3c,0x07,0xc3,0xff,0x87,0xc0,0x7e,0x3f,0xf8,0xf8,0x0d,0x06,0xfe,0x03,0x78,0x19,0x4c,0x60,0x30,0x68,0x07,0x02,0x01,0xfc,0xff,0xdf,0xcc,0xe8,}; -const uint8_t *_I_Up_25x27[] = {_I_Up_25x27_0}; - -const uint8_t _I_IrdaArrowUp_4x8_0[] = {0x00,0x18,0x3C,0x7E,0xFF,}; -const uint8_t *_I_IrdaArrowUp_4x8[] = {_I_IrdaArrowUp_4x8_0}; - -const uint8_t _I_Mute_25x27_0[] = {0x01,0x00,0x51,0x00,0xfc,0x7f,0xe7,0xf0,0x08,0x24,0x02,0x81,0x00,0x81,0x40,0x30,0x10,0x08,0x08,0x38,0x60,0x20,0x31,0x81,0xc0,0x64,0x38,0x08,0xa4,0x06,0x83,0x40,0x86,0x40,0x70,0x32,0x08,0x20,0x3c,0x63,0xf0,0x60,0x38,0xc0,0xa0,0xa0,0x31,0xc2,0x02,0xc7,0x03,0x48,0x01,0x94,0xc0,0x06,0xc0,0xb3,0x09,0x98,0x6c,0x84,0x68,0x2b,0x21,0x99,0x8e,0xcc,0x86,0x64,0xb3,0x81,0x94,0xc6,0x03,0x06,0x80,0x70,0x20,0x1f,0xcf,0xfd,0xfc,0xce,0x80,}; -const uint8_t *_I_Mute_25x27[] = {_I_Mute_25x27_0}; - -const uint8_t _I_Power_25x27_0[] = {0x01,0x00,0x54,0x00,0xfc,0x7f,0xe7,0xf0,0x08,0x24,0x02,0x81,0x00,0x81,0x40,0x30,0x10,0x08,0x08,0x38,0x60,0x30,0x18,0x80,0x0c,0xa7,0x00,0x35,0xc0,0xce,0x60,0x70,0x1e,0x0c,0xe6,0x0f,0x01,0xf0,0xce,0x21,0xd0,0x1b,0x0c,0xe2,0x18,0x03,0x58,0x80,0x0c,0xa0,0x00,0x39,0xf0,0xc0,0x03,0x63,0xc1,0x80,0x88,0xc7,0x03,0x83,0x15,0x8c,0x07,0xfe,0x02,0x18,0x0d,0xf0,0x76,0x44,0x73,0x01,0x94,0x0c,0xa6,0x30,0x18,0x34,0x03,0x81,0x00,0xfe,0x7f,0xef,0xe6,0x74,}; -const uint8_t *_I_Power_25x27[] = {_I_Power_25x27_0}; - -const uint8_t _I_IrdaSendShort_128x34_0[] = {0x01,0x00,0x42,0x01,0xfe,0x7f,0xc0,0x07,0x03,0x07,0xc4,0x10,0x0a,0x90,0x20,0x7f,0x83,0xfc,0x04,0x3c,0x01,0xc2,0x7f,0xf8,0x80,0x43,0x9f,0x83,0xca,0x40,0x1f,0x5e,0x27,0x7e,0xab,0x55,0xee,0x83,0xce,0x38,0x0f,0x6d,0x50,0x00,0xa5,0xc0,0xf2,0x89,0x03,0xda,0xfe,0x1f,0x1f,0xa8,0x7c,0x48,0xc3,0x09,0x07,0xb6,0xae,0x54,0x1f,0x19,0xd4,0x08,0x40,0x30,0x5f,0x81,0x1c,0x63,0xfe,0x08,0x1f,0x12,0xbe,0x3f,0x49,0x0e,0x02,0x09,0x58,0x04,0x0c,0xd7,0xf1,0x0f,0x1f,0x8e,0x2b,0x11,0xaa,0x95,0x40,0xa2,0x34,0x08,0x16,0xa0,0x4e,0x32,0xab,0xe4,0x7f,0x89,0x77,0x0b,0x0d,0xd6,0x7f,0x82,0x84,0x50,0x20,0x3d,0x81,0x48,0xcd,0x67,0xd3,0xe1,0xf8,0xc8,0xb4,0x43,0xf1,0xc1,0x62,0x24,0x10,0x1b,0x46,0x80,0x3e,0x3f,0xe9,0xf8,0xfc,0xfa,0xa1,0xf1,0xa4,0x68,0x20,0x13,0x8a,0x00,0x7c,0x67,0xf7,0xe3,0xfa,0x4a,0x81,0xe3,0x40,0x80,0x66,0x38,0x66,0xa1,0xeb,0xdd,0x47,0xec,0x0f,0x2c,0x47,0x0e,0xa9,0x35,0xe9,0xd9,0x47,0xe2,0x1f,0x21,0xf8,0xd2,0x17,0xc3,0x88,0x91,0xeb,0x83,0xe6,0xbf,0x42,0x78,0xc4,0x20,0x10,0x88,0x05,0x5c,0x7e,0x7a,0xe1,0xfa,0x42,0x01,0xe5,0x84,0x1f,0x89,0x7c,0xbf,0xf7,0x7b,0xaf,0xdd,0x3e,0x31,0x10,0xe8,0xc2,0x3f,0x01,0xf1,0x3f,0x98,0x7c,0xa7,0x6a,0xf1,0x07,0x97,0x03,0x5e,0x9f,0x36,0x28,0xf7,0x7f,0xa1,0xf1,0x81,0x03,0xca,0x01,0x56,0x5f,0x9f,0xb8,0x3c,0x3e,0xa7,0xf8,0xc1,0x01,0xe5,0xf0,0x15,0x0f,0x85,0xbe,0x21,0xf1,0x00,0x08,0x7c,0x60,0x04,0xf1,0x77,0x96,0x7e,0x02,0xff,0x10,0x7c,0x00,0x16,0x08,0x05,0x40,0x78,0xa3,0xc4,0x00,0xb2,0x40,0x7b,0x2b,0xc4,0x00,0xb5,0x48,0x78,0x3d,0x70,0x01,0xf7,0x07,0xb4,0x00,0x94,0x23,0xfc,0x01,0x18,0x00,0xff,0x85,0xf3,0xff,0xc0,0xc3,0x0f,0x00,0xf0,0x09,0xce,0xf0,0x03,0x2f,0xc0,0x61,0x3f,0xe0,0xf8,0x00,0x30,0x3f,0xc0,}; -const uint8_t *_I_IrdaSendShort_128x34[] = {_I_IrdaSendShort_128x34_0}; +const uint8_t _I_DoorRight_70x55_0[] = {0x01,0x00,0x16,0x01,0x81,0xcc,0x01,0x0f,0x60,0x04,0x3f,0x00,0x10,0xf8,0x08,0x0c,0x02,0x05,0x01,0x84,0x02,0x06,0x26,0x0a,0x10,0x8a,0xcc,0xe0,0x1d,0x68,0xe0,0x18,0xab,0xd0,0x0b,0x18,0x10,0x46,0xe6,0x16,0x1e,0x18,0x10,0x46,0xe4,0x28,0x2c,0x98,0x14,0x68,0x00,0x21,0x1d,0x10,0x8c,0x40,0x02,0x0e,0x10,0xa1,0x08,0xc8,0x40,0x42,0x62,0x11,0x94,0x03,0xfd,0xff,0x00,0x0c,0xff,0x0c,0x08,0x28,0x60,0xe4,0xc0,0x85,0x00,0x83,0x00,0x87,0xf1,0x00,0x8c,0x02,0x0b,0x07,0x24,0x84,0xff,0x04,0xc7,0x80,0xa0,0xe4,0xa0,0x81,0x41,0x04,0x17,0x02,0x41,0x49,0x81,0x0e,0x10,0xb2,0xa0,0x82,0x0e,0x9f,0xfc,0x0a,0x62,0xf2,0xc0,0x03,0x92,0xf0,0x08,0x2d,0x78,0x20,0xff,0x02,0x01,0x08,0xae,0x60,0x64,0x38,0x0d,0xb0,0x8d,0x08,0x82,0x11,0x58,0xc4,0x13,0xc0,0x35,0x68,0x62,0x68,0x81,0x09,0x08,0x84,0x40,0x81,0x0d,0x18,0x69,0x10,0x47,0x44,0x66,0x5f,0x21,0xa9,0x29,0x94,0x10,0x2f,0x23,0x53,0x14,0x60,0x42,0x3c,0x08,0xfc,0x02,0x2c,0x62,0x23,0x58,0xd0,0x22,0x00,0x83,0x3e,0x98,0x44,0x43,0x46,0x22,0x30,0x89,0xce,0x01,0x0f,0x70,0x04,0x3f,0x81,0x8a,0x3c,0x21,0xaa,0x70,0x1a,0xe3,0x44,0x1a,0xa6,0x01,0xd2,0x38,0x90,0x8a,0x40,0x20,0xe5,0x96,0x80,0x43,0x81,0x06,0x6b,0x28,0x07,0xf3,0xfe,0x00,0x19,0xf9,0x34,0xc1,0x08,0x8f,0x20,0xf1,0x3e,0x16,0x00,0xa8,0x19,0x00,0x10,0x76,0x03,0xe2,0x3e,0x90,0x45,0x38,0x01,0x42,0x05,0x88,0x44,0x67,0x15,0x70,0x41,0x38,0x04,0x10,0x24,0x03,0x00,0x10,0x20,0x4a,0x46,0xe9,0x46,0xe1,0x04,0x50,0x66,0x40,0x85,0x19,0x98,0x00,0xc0,}; +const uint8_t *_I_DoorRight_70x55[] = {_I_DoorRight_70x55_0}; const uint8_t _I_IrdaArrowDown_4x8_0[] = {0x00,0xFF,0x7E,0x3C,0x18,}; const uint8_t *_I_IrdaArrowDown_4x8[] = {_I_IrdaArrowDown_4x8_0}; +const uint8_t _I_Power_25x27_0[] = {0x01,0x00,0x54,0x00,0xfc,0x7f,0xe7,0xf0,0x08,0x24,0x02,0x81,0x00,0x81,0x40,0x30,0x10,0x08,0x08,0x38,0x60,0x30,0x18,0x80,0x0c,0xa7,0x00,0x35,0xc0,0xce,0x60,0x70,0x1e,0x0c,0xe6,0x0f,0x01,0xf0,0xce,0x21,0xd0,0x1b,0x0c,0xe2,0x18,0x03,0x58,0x80,0x0c,0xa0,0x00,0x39,0xf0,0xc0,0x03,0x63,0xc1,0x80,0x88,0xc7,0x03,0x83,0x15,0x8c,0x07,0xfe,0x02,0x18,0x0d,0xf0,0x76,0x44,0x73,0x01,0x94,0x0c,0xa6,0x30,0x18,0x34,0x03,0x81,0x00,0xfe,0x7f,0xef,0xe6,0x74,}; +const uint8_t *_I_Power_25x27[] = {_I_Power_25x27_0}; + +const uint8_t _I_Mute_25x27_0[] = {0x01,0x00,0x51,0x00,0xfc,0x7f,0xe7,0xf0,0x08,0x24,0x02,0x81,0x00,0x81,0x40,0x30,0x10,0x08,0x08,0x38,0x60,0x20,0x31,0x81,0xc0,0x64,0x38,0x08,0xa4,0x06,0x83,0x40,0x86,0x40,0x70,0x32,0x08,0x20,0x3c,0x63,0xf0,0x60,0x38,0xc0,0xa0,0xa0,0x31,0xc2,0x02,0xc7,0x03,0x48,0x01,0x94,0xc0,0x06,0xc0,0xb3,0x09,0x98,0x6c,0x84,0x68,0x2b,0x21,0x99,0x8e,0xcc,0x86,0x64,0xb3,0x81,0x94,0xc6,0x03,0x06,0x80,0x70,0x20,0x1f,0xcf,0xfd,0xfc,0xce,0x80,}; +const uint8_t *_I_Mute_25x27[] = {_I_Mute_25x27_0}; + +const uint8_t _I_Down_hvr_25x27_0[] = {0x01,0x00,0x3a,0x00,0xfc,0x7f,0xe7,0xf0,0x0f,0xe7,0xfe,0xff,0x00,0xff,0x7f,0xff,0xf0,0x00,0x10,0xff,0xe0,0x20,0x3f,0x01,0x9c,0x3e,0x01,0xe0,0x01,0xa4,0x7e,0x01,0xf0,0x80,0x8b,0x47,0xf1,0x01,0x16,0x8f,0xf0,0x2e,0x23,0x11,0x01,0x88,0x04,0xf0,0x60,0x32,0xe3,0x80,0xcb,0xde,0x37,0xf0,0x1a,0x95,0xcc,0xbe,0x66,0x73,}; +const uint8_t *_I_Down_hvr_25x27[] = {_I_Down_hvr_25x27_0}; + +const uint8_t _I_Vol_up_25x27_0[] = {0x01,0x00,0x2f,0x00,0xfc,0x7f,0xe7,0xf0,0x08,0x24,0x02,0x81,0x00,0x81,0x40,0x30,0x10,0x08,0x08,0x38,0x60,0x20,0x38,0x88,0x00,0xfc,0x06,0xbc,0x1f,0xfc,0x1c,0x06,0x81,0x7f,0x01,0xc1,0x0e,0xa0,0x65,0x31,0x80,0xc1,0xa0,0x1c,0x08,0x07,0xf3,0xff,0x7f,0x33,0xa0,}; +const uint8_t *_I_Vol_up_25x27[] = {_I_Vol_up_25x27_0}; + +const uint8_t _I_IrdaLearnShort_128x31_0[] = {0x01,0x00,0x10,0x01,0x00,0x47,0xfb,0xfe,0x00,0x38,0x38,0x3e,0x20,0x20,0x54,0x84,0x03,0x9f,0xc0,0x06,0x58,0x80,0x3d,0xf2,0x00,0x65,0x90,0x03,0xde,0x90,0x06,0x5a,0x07,0xc0,0x8a,0x70,0x1a,0x04,0x02,0x51,0x80,0x03,0x94,0x02,0x3f,0x40,0x20,0x24,0x0b,0x01,0x00,0x92,0x70,0x35,0x40,0x01,0xe0,0xdf,0xf0,0x10,0x40,0x71,0x58,0x20,0x90,0x88,0x0c,0x4a,0x81,0x55,0x00,0x0f,0x87,0xf7,0x00,0x82,0x43,0x36,0x16,0xdc,0x9c,0x12,0x21,0x01,0x85,0x70,0x3f,0xc1,0xf1,0xf8,0xfc,0x60,0x20,0xf5,0x90,0x40,0xa1,0x34,0x08,0x18,0x7c,0x7e,0x24,0x91,0x07,0x8c,0xc0,0x5e,0x52,0x28,0x14,0x17,0x81,0x01,0x0f,0x8f,0xe7,0xe3,0x03,0x1f,0x8e,0x02,0xdb,0x03,0x8e,0x49,0x20,0x50,0x2e,0x04,0x72,0xbd,0x55,0xdc,0xeb,0xa0,0x7c,0x4f,0x68,0xbc,0x60,0x72,0x40,0x79,0x50,0x23,0x9a,0x6d,0x56,0x66,0x5c,0x0f,0x21,0x78,0x9b,0x04,0x1e,0x28,0x21,0x8e,0x5c,0x43,0xe6,0x2f,0x10,0xf9,0x0b,0xc7,0x04,0x99,0x18,0x06,0xe0,0x7e,0x56,0x32,0x78,0x8f,0xc4,0x08,0x32,0x20,0x79,0x48,0x2b,0x85,0xf2,0xf8,0x83,0xc4,0x5c,0x3f,0x03,0x78,0xd0,0x81,0xe3,0xc0,0xdf,0x9f,0xcb,0xf3,0x04,0xc6,0x7d,0xfb,0xdf,0x34,0x78,0xd0,0x45,0xe5,0x7e,0x4f,0x97,0xe2,0x09,0x80,0x07,0x88,0xbc,0x61,0x00,0xf3,0xd8,0x2f,0xcb,0xe0,0xcf,0x60,0x68,0xd0,0x30,0x15,0xfa,0xac,0x36,0x3f,0x60,0x77,0xb3,0x80,0x5d,0xe6,0x4b,0x20,0x03,0x03,0xc4,0x01,0xd0,0x10,0x7f,0x40,0x81,0xfc,0xa7,0x10,0x06,0x99,0xd0,0x01,0x51,0x00,0x7f,0x48,0x01,0xfd,0xc0,0x43,0x98,0x00,0x8e,0xfe,0x00,0xf0,}; +const uint8_t *_I_IrdaLearnShort_128x31[] = {_I_IrdaLearnShort_128x31_0}; + +const uint8_t _I_Up_25x27_0[] = {0x01,0x00,0x44,0x00,0xfc,0x7f,0xe7,0xf0,0x08,0x24,0x02,0x81,0x00,0x81,0x40,0x30,0x10,0x08,0x08,0x38,0x60,0x20,0x3c,0x88,0x00,0xca,0x70,0x03,0x2b,0xe0,0x0c,0xbf,0xc0,0x32,0xff,0x80,0x87,0x03,0xff,0x81,0xc0,0x78,0x3f,0xf8,0x3c,0x07,0xc3,0xff,0x87,0xc0,0x7e,0x3f,0xf8,0xf8,0x0d,0x06,0xfe,0x03,0x78,0x19,0x4c,0x60,0x30,0x68,0x07,0x02,0x01,0xfc,0xff,0xdf,0xcc,0xe8,}; +const uint8_t *_I_Up_25x27[] = {_I_Up_25x27_0}; + +const uint8_t _I_Vol_down_hvr_25x27_0[] = {0x01,0x00,0x23,0x00,0xfc,0x7f,0xe7,0xf0,0x0f,0xe7,0xfe,0xff,0x00,0xff,0x7f,0xff,0xf0,0x00,0x10,0xff,0xe0,0x20,0x3f,0x01,0xf8,0xb4,0x7f,0x00,0x34,0x0b,0xf8,0x0f,0xc0,0x6e,0x57,0x32,0xf9,0x99,0xcc,}; +const uint8_t *_I_Vol_down_hvr_25x27[] = {_I_Vol_down_hvr_25x27_0}; + +const uint8_t _I_Vol_down_25x27_0[] = {0x01,0x00,0x2c,0x00,0xfc,0x7f,0xe7,0xf0,0x08,0x24,0x02,0x81,0x00,0x81,0x40,0x30,0x10,0x08,0x08,0x38,0x60,0x20,0x3f,0x01,0xff,0x07,0xff,0x07,0x01,0xa0,0x5f,0xc0,0x7e,0x03,0x38,0x19,0x4c,0x60,0x30,0x68,0x07,0x02,0x01,0xfc,0xff,0xdf,0xcc,0xe8,}; +const uint8_t *_I_Vol_down_25x27[] = {_I_Vol_down_25x27_0}; + +const uint8_t _I_Vol_up_hvr_25x27_0[] = {0x01,0x00,0x28,0x00,0xfc,0x7f,0xe7,0xf0,0x0f,0xe7,0xfe,0xff,0x00,0xff,0x7f,0xff,0xf0,0x00,0x10,0xff,0xe0,0x20,0x38,0xf7,0x80,0xfc,0x06,0xa2,0xd1,0xfc,0x00,0xd0,0x2f,0xe0,0x38,0x21,0xd8,0x0c,0x8a,0xe6,0x5f,0x33,0x39,0x80,}; +const uint8_t *_I_Vol_up_hvr_25x27[] = {_I_Vol_up_hvr_25x27_0}; + +const uint8_t _I_Fill_marker_7x7_0[] = {0x00,0x1C,0x32,0x6F,0x5F,0x7F,0x3E,0x1C,}; +const uint8_t *_I_Fill_marker_7x7[] = {_I_Fill_marker_7x7_0}; + +const uint8_t _I_Up_hvr_25x27_0[] = {0x01,0x00,0x39,0x00,0xfc,0x7f,0xe7,0xf0,0x0f,0xe7,0xfe,0xff,0x00,0xff,0x7f,0xff,0xf0,0x00,0x10,0xff,0xe0,0x20,0x3c,0xf7,0x80,0xcb,0x8e,0x03,0x2c,0x18,0x0c,0x80,0x26,0x25,0x18,0x08,0xa4,0x7f,0x90,0x11,0x88,0xfe,0x20,0x31,0xf8,0x07,0xc2,0x03,0x0f,0x80,0x78,0x00,0x68,0x37,0xf0,0x1d,0x95,0xcc,0xbe,0x66,0x73,}; +const uint8_t *_I_Up_hvr_25x27[] = {_I_Up_hvr_25x27_0}; + +const uint8_t _I_IrdaArrowUp_4x8_0[] = {0x00,0x18,0x3C,0x7E,0xFF,}; +const uint8_t *_I_IrdaArrowUp_4x8[] = {_I_IrdaArrowUp_4x8_0}; + +const uint8_t _I_Down_25x27_0[] = {0x01,0x00,0x46,0x00,0xfc,0x7f,0xe7,0xf0,0x08,0x24,0x02,0x81,0x00,0x81,0x40,0x30,0x10,0x08,0x08,0x38,0x60,0x20,0x3f,0x01,0x9f,0xc7,0xff,0x1f,0x01,0xa7,0x87,0xff,0x0f,0x80,0xf0,0x7f,0xf0,0x78,0x0e,0x07,0xff,0x03,0x0b,0x8f,0xfc,0x04,0x30,0x1f,0xf0,0x7c,0xaf,0x80,0x32,0x9c,0x00,0xca,0x20,0x37,0xf0,0x18,0xc0,0xca,0x63,0x01,0x83,0x40,0x38,0x10,0x0f,0xe7,0xfe,0xfe,0x67,0x40,}; +const uint8_t *_I_Down_25x27[] = {_I_Down_25x27_0}; + +const uint8_t _I_DolphinReadingSuccess_59x63_0[] = {0x01,0x00,0x19,0x01,0x00,0x1d,0x00,0x0f,0xd2,0x00,0x21,0xe0,0x3f,0xf0,0xf9,0x00,0x40,0xee,0x00,0x11,0x88,0x04,0x0e,0x18,0x11,0x18,0x8c,0x40,0x0e,0x50,0x30,0x10,0xc0,0xa1,0x01,0xe2,0x05,0x14,0x12,0x08,0x33,0x58,0x44,0x08,0x66,0xa1,0xe3,0x01,0x9c,0x83,0x00,0x24,0x11,0x11,0x06,0xc4,0x76,0x20,0x75,0x15,0x99,0x48,0xc0,0xe9,0x0f,0x03,0x95,0xfc,0x86,0x3c,0x09,0x80,0x1c,0x7c,0x00,0x91,0x81,0x48,0x2f,0xc1,0x41,0x8c,0xc0,0x20,0x30,0x1c,0x87,0xfc,0x0e,0x30,0x70,0x70,0x81,0xc7,0xe6,0x07,0x18,0x08,0x1c,0xb9,0x1e,0x38,0x0f,0x02,0x01,0xf0,0x03,0xa0,0xa4,0x7f,0x90,0x30,0x38,0xff,0xe0,0x28,0x21,0xff,0x06,0x44,0x0e,0x46,0xe1,0x01,0x8c,0x03,0x34,0x2f,0x25,0x18,0x80,0xc7,0x2a,0x03,0x2e,0x01,0x3c,0x70,0x12,0xa2,0x39,0x78,0x27,0xe0,0x31,0xea,0x82,0xc4,0x6c,0x31,0xf0,0x78,0xea,0xb0,0x22,0x31,0xfc,0x1a,0xc6,0x01,0x55,0x25,0x88,0xf8,0x4b,0x02,0x1f,0x13,0xe1,0x7f,0x97,0x85,0x15,0x03,0x90,0xf8,0xa0,0x10,0xa1,0xb1,0x0e,0x88,0x00,0x7f,0x0f,0xc0,0x7c,0x57,0x27,0x3c,0xb0,0x7f,0x5f,0xa9,0x1f,0xc0,0x6a,0xc5,0x05,0xc0,0xf0,0x11,0x46,0xac,0x18,0x3f,0xf9,0x54,0x75,0x00,0x73,0x1f,0x0f,0xfe,0xfe,0xc6,0x30,0x01,0xbc,0x48,0x00,0x84,0x82,0x00,0x1b,0x64,0xc0,0x07,0x60,0x03,0xb4,0x70,0x0c,0xbf,0x82,0x31,0x01,0x8d,0x0c,0x40,0x02,0x37,0x08,0x1d,0x74,0x00,0x76,0xa0,0x01,0xdb,0x01,0xfe,0x85,0x8b,0x96,0xaa,0x9b,0x30,0x01,0x6a,0xa3,0x40,0x75,0xaa,0x03,0xdb,0x50,0xbb,0x30,0x01,0x54,0x24,0x25,0xe6,0x51,0x08,0x1f,0x68,0x00,0x7f,0x03,0xf2,0x79,0xc0,0xf4,}; +const uint8_t *_I_DolphinReadingSuccess_59x63[] = {_I_DolphinReadingSuccess_59x63_0}; + +const uint8_t _I_IrdaSendShort_128x34_0[] = {0x01,0x00,0x42,0x01,0xfe,0x7f,0xc0,0x07,0x03,0x07,0xc4,0x10,0x0a,0x90,0x20,0x7f,0x83,0xfc,0x04,0x3c,0x01,0xc2,0x7f,0xf8,0x80,0x43,0x9f,0x83,0xca,0x40,0x1f,0x5e,0x27,0x7e,0xab,0x55,0xee,0x83,0xce,0x38,0x0f,0x6d,0x50,0x00,0xa5,0xc0,0xf2,0x89,0x03,0xda,0xfe,0x1f,0x1f,0xa8,0x7c,0x48,0xc3,0x09,0x07,0xb6,0xae,0x54,0x1f,0x19,0xd4,0x08,0x40,0x30,0x5f,0x81,0x1c,0x63,0xfe,0x08,0x1f,0x12,0xbe,0x3f,0x49,0x0e,0x02,0x09,0x58,0x04,0x0c,0xd7,0xf1,0x0f,0x1f,0x8e,0x2b,0x11,0xaa,0x95,0x40,0xa2,0x34,0x08,0x16,0xa0,0x4e,0x32,0xab,0xe4,0x7f,0x89,0x77,0x0b,0x0d,0xd6,0x7f,0x82,0x84,0x50,0x20,0x3d,0x81,0x48,0xcd,0x67,0xd3,0xe1,0xf8,0xc8,0xb4,0x43,0xf1,0xc1,0x62,0x24,0x10,0x1b,0x46,0x80,0x3e,0x3f,0xe9,0xf8,0xfc,0xfa,0xa1,0xf1,0xa4,0x68,0x20,0x13,0x8a,0x00,0x7c,0x67,0xf7,0xe3,0xfa,0x4a,0x81,0xe3,0x40,0x80,0x66,0x38,0x66,0xa1,0xeb,0xdd,0x47,0xec,0x0f,0x2c,0x47,0x0e,0xa9,0x35,0xe9,0xd9,0x47,0xe2,0x1f,0x21,0xf8,0xd2,0x17,0xc3,0x88,0x91,0xeb,0x83,0xe6,0xbf,0x42,0x78,0xc4,0x20,0x10,0x88,0x05,0x5c,0x7e,0x7a,0xe1,0xfa,0x42,0x01,0xe5,0x84,0x1f,0x89,0x7c,0xbf,0xf7,0x7b,0xaf,0xdd,0x3e,0x31,0x10,0xe8,0xc2,0x3f,0x01,0xf1,0x3f,0x98,0x7c,0xa7,0x6a,0xf1,0x07,0x97,0x03,0x5e,0x9f,0x36,0x28,0xf7,0x7f,0xa1,0xf1,0x81,0x03,0xca,0x01,0x56,0x5f,0x9f,0xb8,0x3c,0x3e,0xa7,0xf8,0xc1,0x01,0xe5,0xf0,0x15,0x0f,0x85,0xbe,0x21,0xf1,0x00,0x08,0x7c,0x60,0x04,0xf1,0x77,0x96,0x7e,0x02,0xff,0x10,0x7c,0x00,0x16,0x08,0x05,0x40,0x78,0xa3,0xc4,0x00,0xb2,0x40,0x7b,0x2b,0xc4,0x00,0xb5,0x48,0x78,0x3d,0x70,0x01,0xf7,0x07,0xb4,0x00,0x94,0x23,0xfc,0x01,0x18,0x00,0xff,0x85,0xf3,0xff,0xc0,0xc3,0x0f,0x00,0xf0,0x09,0xce,0xf0,0x03,0x2f,0xc0,0x61,0x3f,0xe0,0xf8,0x00,0x30,0x3f,0xc0,}; +const uint8_t *_I_IrdaSendShort_128x34[] = {_I_IrdaSendShort_128x34_0}; + const uint8_t _I_IrdaLearn_128x64_0[] = {0x01,0x00,0xcc,0x01,0x00,0x78,0x03,0xc0,0x1e,0x00,0xf0,0x07,0x80,0x3f,0x01,0x07,0x82,0x41,0x21,0x20,0x73,0x00,0x8e,0x82,0x0f,0x00,0xa0,0x01,0x46,0x11,0x00,0x07,0xc0,0x28,0x41,0xe5,0xc8,0xba,0x63,0xa7,0x70,0x6b,0x3d,0xbb,0x99,0x19,0xee,0x68,0x71,0x16,0x3f,0x70,0x3c,0x64,0xf9,0x58,0x25,0x26,0x13,0x91,0xc9,0x64,0xa4,0x99,0x2d,0x06,0x1f,0x29,0x42,0x07,0x8c,0x80,0x1e,0x50,0xff,0x88,0x3c,0x67,0x80,0xf1,0xc1,0x03,0xde,0x03,0x11,0x07,0x8c,0x10,0x1e,0x38,0x40,0x79,0xf0,0x32,0x80,0xf1,0x83,0x58,0x72,0x58,0xc8,0xc6,0x73,0x40,0x3f,0x10,0x78,0x9e,0xf1,0x17,0xe9,0xcf,0x00,0x78,0x03,0xc0,0x1e,0x00,0xf0,0x02,0x44,0x18,0xa3,0x80,0x82,0x32,0x06,0x44,0x0f,0xf0,0x73,0x5d,0xe3,0x92,0x7e,0xcf,0x06,0x3b,0xc3,0xa4,0xdd,0xfc,0xc8,0x35,0xca,0x44,0xa5,0x34,0x5c,0x16,0x92,0x89,0x4a,0x91,0x4a,0x60,0x20,0xf7,0xa4,0x83,0xc6,0x8e,0x0f,0xba,0x88,0x3c,0x68,0x00,0xf7,0x80,0x65,0xe3,0x9c,0x7a,0x6e,0x0a,0x49,0xc3,0xb8,0xc8,0xa4,0xc0,0xf5,0x00,0x08,0x1d,0xc0,0x0e,0x0f,0xf0,0x07,0x80,0x3c,0x01,0xe0,0x0f,0x00,0x2f,0xfb,0xfe,0x00,0x38,0x39,0x97,0xa1,0x00,0xe7,0xf0,0x3b,0x1c,0x00,0xd9,0x00,0x32,0xc8,0x01,0xef,0x48,0x03,0x2d,0x03,0xe0,0x45,0x38,0x0d,0x02,0x01,0x28,0xc0,0x01,0xca,0x01,0x1f,0xa0,0x10,0x12,0x05,0x80,0x80,0x49,0x38,0x1a,0xa0,0x00,0xf0,0x6f,0xf8,0x08,0x20,0x38,0xac,0x10,0x48,0x44,0x06,0x25,0x40,0xaa,0x80,0x07,0xc3,0xfb,0x80,0x41,0x21,0x9b,0x0b,0x6e,0x4e,0x09,0x10,0x80,0xc2,0xb8,0x1f,0xe0,0xf8,0xfc,0x7e,0x30,0x10,0x7a,0xc8,0x20,0x50,0x9a,0x04,0x0c,0x3e,0x3f,0x12,0x48,0x83,0xc6,0x60,0x2f,0x29,0x14,0x0a,0x0b,0xc0,0x80,0x87,0xc7,0xf3,0xf1,0x81,0x8f,0xc7,0x01,0x6d,0x81,0xc7,0x24,0x90,0x28,0x17,0x02,0x39,0x5e,0xaa,0xee,0x75,0xd0,0x3e,0x27,0xb4,0x5e,0x30,0x39,0x20,0x3c,0xa8,0x11,0xcd,0x36,0xab,0x33,0x2e,0x07,0x90,0xbc,0x4d,0x82,0x0f,0x14,0x10,0xc7,0x2e,0x21,0xf3,0x17,0x88,0x7c,0x85,0xe3,0x82,0x4c,0x8c,0x03,0x70,0x3f,0x2b,0x19,0x3c,0x47,0xe2,0x04,0x19,0x10,0x3c,0xa4,0x15,0xc2,0xf9,0x7c,0x41,0xe2,0x2e,0x1f,0x81,0xbc,0x68,0x40,0xf1,0xe0,0x6f,0xcf,0xe5,0xf9,0x82,0x63,0x3e,0xfd,0xef,0x9a,0x3c,0x68,0x22,0xf2,0xbf,0x27,0xcb,0xf1,0x04,0xc0,0x03,0xc4,0x5e,0x30,0x80,0x79,0xec,0x17,0xe5,0xf0,0x67,0xb0,0x34,0x68,0x18,0x0a,0xfd,0x56,0x1b,0x1f,0xb0,0x3b,0xd9,0xc0,0x2e,0xf3,0x25,0x90,0x01,0x81,0xe2,0x00,0xe8,0x08,0x3f,0xa0,0x40,0xfe,0x53,0x88,0x03,0x4c,0xe8,0x00,0xa8,0x80,0x3f,0xa4,0x00,0xfe,0xe0,0x21,0xcc,0x00,0x47,0x7f,0x00,0x78,}; const uint8_t *_I_IrdaLearn_128x64[] = {_I_IrdaLearn_128x64_0}; +const uint8_t _I_Mute_hvr_25x27_0[] = {0x01,0x00,0x4a,0x00,0xfc,0x7f,0xe7,0xf0,0x0f,0xe7,0xfe,0xff,0x00,0xff,0x7f,0xff,0xf0,0x00,0x10,0xff,0xe0,0x20,0x21,0xfe,0x40,0x7b,0xf7,0xff,0x5c,0x07,0x7f,0xbf,0xf9,0xc0,0x6f,0xfd,0xff,0xd8,0x3c,0x7c,0x1f,0x90,0x38,0xff,0x7f,0x40,0x31,0xbd,0x82,0xc6,0xff,0xb7,0x01,0x97,0x3c,0x06,0xc0,0xb3,0x09,0x98,0x6c,0x84,0x68,0x2b,0x21,0x99,0x8e,0xcc,0x86,0x64,0xb5,0x01,0x89,0x5c,0xcb,0xe6,0x67,0x30,}; +const uint8_t *_I_Mute_hvr_25x27[] = {_I_Mute_hvr_25x27_0}; + +const uint8_t _I_IrdaSend_128x64_0[] = {0x01,0x00,0xe2,0x01,0x00,0x78,0x03,0xc0,0x1e,0x00,0xfe,0x04,0x0e,0x05,0x82,0xd7,0x81,0xca,0x21,0x08,0x01,0x8c,0x10,0x0e,0x54,0x00,0x20,0xe0,0xa4,0x00,0xfb,0xb2,0x4e,0xb0,0xfa,0x0e,0x74,0xc7,0x0f,0x3b,0xce,0x4e,0xec,0xf0,0xe1,0x79,0xe4,0xe9,0x58,0x2d,0x3d,0x4a,0x95,0x41,0x89,0x52,0x31,0x59,0x40,0xfa,0x64,0x01,0xe3,0xa0,0xa9,0x5e,0x81,0xe7,0xf4,0x07,0xcc,0x28,0x1e,0x71,0x40,0x7a,0x58,0x01,0xe4,0x3f,0x1c,0x0c,0x4f,0x11,0x0b,0xb3,0x83,0xcc,0x00,0x94,0x20,0x2a,0x03,0xa0,0x1e,0xd0,0x34,0xdf,0x80,0x3c,0x01,0xe0,0x0f,0x00,0x4c,0xf0,0x17,0x4c,0x81,0xa0,0x18,0x18,0x1f,0x39,0x90,0x6c,0x60,0x27,0x70,0xe9,0x3f,0x67,0x03,0x3c,0x80,0x83,0xde,0x81,0x4a,0x84,0xca,0x68,0xb8,0x2b,0xf0,0x3f,0x29,0x20,0xfe,0xa8,0xe0,0x85,0xf3,0x80,0xa5,0xc3,0xb8,0xf4,0xd8,0x11,0x3e,0x40,0x04,0x1b,0x23,0x7d,0x83,0xcd,0x1f,0x60,0x0f,0x00,0x78,0x03,0x7f,0x9f,0xf0,0x01,0xc0,0xc1,0xf1,0x04,0x02,0xa4,0x08,0x1f,0xe0,0xff,0x01,0x0f,0x00,0x70,0x9f,0xfe,0x20,0x10,0xe7,0xe0,0xf2,0x90,0x07,0xd7,0x89,0xdf,0xaa,0xd5,0x7b,0xa0,0xf3,0x8e,0x03,0xdb,0x54,0x00,0x29,0x70,0x3c,0xa2,0x40,0xf6,0xbf,0x87,0xc7,0xea,0x1f,0x12,0x30,0xc2,0x41,0xed,0xab,0x95,0x07,0xc6,0x75,0x02,0x10,0x0c,0x17,0xe0,0x47,0x18,0xff,0x82,0x07,0xc4,0xaf,0x8f,0xd2,0x43,0x80,0x82,0x56,0x01,0x03,0x35,0xfc,0x43,0xc7,0xe3,0x8a,0xc4,0x6a,0xa5,0x50,0x28,0x8d,0x02,0x05,0xa8,0x13,0x8c,0xaa,0xf9,0x1f,0xe2,0x5d,0xc2,0xc3,0x75,0x9f,0xe0,0xa1,0x14,0x08,0x0f,0x60,0x52,0x33,0x59,0xf4,0xf8,0x7e,0x32,0x2d,0x10,0xfc,0x70,0x58,0x89,0x04,0x06,0xd1,0xa0,0x0f,0x8f,0xfa,0x7e,0x3f,0x3e,0xa8,0x7c,0x69,0x1a,0x08,0x04,0xe2,0x80,0x1f,0x19,0xfd,0xf8,0xfe,0x92,0xa0,0x78,0xd0,0x20,0x19,0x8e,0x19,0xa8,0x7a,0xf7,0x51,0xfb,0x03,0xcb,0x11,0xc3,0xaa,0x4d,0x7a,0x76,0x51,0xf8,0x87,0xc8,0x7e,0x34,0x85,0xf0,0xe2,0x24,0x7a,0xe0,0xf9,0xaf,0xd0,0x9e,0x31,0x08,0x04,0x22,0x01,0x57,0x1f,0x9e,0xb8,0x7e,0x90,0x80,0x79,0x61,0x07,0xe2,0x5f,0x2f,0xfd,0xde,0xeb,0xf7,0x4f,0x8c,0x44,0x3a,0x30,0x8f,0xc0,0x7c,0x4f,0xe6,0x1f,0x29,0xda,0xbc,0x41,0xe5,0xc0,0xd7,0xa7,0xcd,0x8a,0x3d,0xdf,0xe8,0x7c,0x60,0x40,0xf2,0x80,0x55,0x97,0xe7,0xee,0x0f,0x0f,0xa9,0xfe,0x30,0x40,0x79,0x7c,0x05,0x43,0xe1,0x6f,0x88,0x7c,0x40,0x02,0x1f,0x18,0x01,0x3c,0x5d,0xe5,0x9f,0x80,0xbf,0xc4,0x1f,0x00,0x05,0x82,0x01,0x50,0x1e,0x28,0xf1,0x00,0x2c,0x90,0x1e,0xca,0xf1,0x00,0x2d,0x52,0x1e,0x0f,0x5c,0x00,0x7d,0xc1,0xed,0x00,0x25,0x08,0xff,0x00,0x46,0x00,0x3f,0xe1,0x7c,0xff,0xf0,0x30,0xc3,0xc0,0x3c,0x02,0x73,0xbc,0x00,0xcb,0xf0,0x18,0x4f,0xf8,0x3e,0x00,0x0c,0x0f,0xf0,}; +const uint8_t *_I_IrdaSend_128x64[] = {_I_IrdaSend_128x64_0}; + const uint8_t _I_Power_hvr_25x27_0[] = {0x01,0x00,0x4b,0x00,0xfc,0x7f,0xe7,0xf0,0x0f,0xe7,0xfe,0xff,0x00,0xff,0x7f,0xff,0xf0,0x00,0x10,0xff,0xe0,0x3f,0xff,0x78,0x0c,0xb8,0xe0,0x35,0xbf,0xf1,0xbf,0x90,0x19,0xff,0x1b,0xf1,0x01,0x8f,0xf1,0xfe,0x30,0x1c,0xff,0x1f,0xe6,0x03,0x5f,0x78,0x0c,0xbf,0xe0,0x39,0x8f,0xff,0xc3,0x63,0x3f,0xff,0x08,0xc6,0xff,0x7c,0x15,0x89,0x04,0x7f,0xc0,0x31,0xc1,0x8e,0xc8,0x8e,0x60,0x36,0x2b,0x99,0x7c,0xcc,0xe6,}; const uint8_t *_I_Power_hvr_25x27[] = {_I_Power_hvr_25x27_0}; +const uint8_t _I_Back_15x10_0[] = {0x00,0x04,0x00,0x06,0x00,0xFF,0x0F,0x06,0x10,0x04,0x20,0x00,0x40,0x00,0x40,0x00,0x20,0x00,0x10,0xFE,0x0F,}; +const uint8_t *_I_Back_15x10[] = {_I_Back_15x10_0}; + const uint8_t _I_KeySaveSelected_24x11_0[] = {0x01,0x00,0x1a,0x00,0xff,0x7f,0xc0,0x0d,0xcf,0xb4,0x7c,0xee,0xf6,0xbf,0x6d,0xbe,0xd7,0xe1,0xaf,0xda,0xff,0xbe,0x7c,0xc7,0xcc,0x28,0xa1,0xd1,0xbf,0x80,}; const uint8_t *_I_KeySaveSelected_24x11[] = {_I_KeySaveSelected_24x11_0}; -const uint8_t _I_KeyBackspace_16x9_0[] = {0x00,0xFE,0x7F,0x01,0x80,0x11,0x80,0x19,0x80,0xFD,0xBF,0x19,0x80,0x11,0x80,0x01,0x80,0xFE,0x7F,}; -const uint8_t *_I_KeyBackspace_16x9[] = {_I_KeyBackspace_16x9_0}; +const uint8_t _I_KeySave_24x11_0[] = {0x01,0x00,0x1e,0x00,0xff,0x7f,0xff,0xf0,0x18,0x06,0x00,0x04,0x53,0x1c,0xbe,0x33,0x13,0x94,0xc9,0x64,0x72,0x99,0xed,0x0e,0x53,0x05,0x19,0xb3,0xe3,0x02,0x8a,0x1d,0x1b,0xf8,}; +const uint8_t *_I_KeySave_24x11[] = {_I_KeySave_24x11_0}; const uint8_t _I_KeyBackspaceSelected_16x9_0[] = {0x00,0xFE,0x7F,0xFF,0xFF,0xEF,0xFF,0xE7,0xFF,0x03,0xC0,0xE7,0xFF,0xEF,0xFF,0xFF,0xFF,0xFE,0x7F,}; const uint8_t *_I_KeyBackspaceSelected_16x9[] = {_I_KeyBackspaceSelected_16x9_0}; -const uint8_t _I_KeySave_24x11_0[] = {0x01,0x00,0x1e,0x00,0xff,0x7f,0xff,0xf0,0x18,0x06,0x00,0x04,0x53,0x1c,0xbe,0x33,0x13,0x94,0xc9,0x64,0x72,0x99,0xed,0x0e,0x53,0x05,0x19,0xb3,0xe3,0x02,0x8a,0x1d,0x1b,0xf8,}; -const uint8_t *_I_KeySave_24x11[] = {_I_KeySave_24x11_0}; +const uint8_t _I_KeyBackspace_16x9_0[] = {0x00,0xFE,0x7F,0x01,0x80,0x11,0x80,0x19,0x80,0xFD,0xBF,0x19,0x80,0x11,0x80,0x01,0x80,0xFE,0x7F,}; +const uint8_t *_I_KeyBackspace_16x9[] = {_I_KeyBackspace_16x9_0}; const uint8_t _A_125khz_14_0[] = {0x00,0x80,0x07,0x00,0x08,0x00,0x13,0x00,0x24,0x0E,0x28,0x71,0x28,0x85,0x21,0x01,0x02,0x62,0x02,0x92,0x02,0x92,0x02,0x64,0x02,0x04,0x01,0xF8,0x00,}; const uint8_t _A_125khz_14_1[] = {0x00,0x80,0x07,0x00,0x08,0x00,0x10,0x00,0x20,0x0E,0x20,0x71,0x20,0x85,0x21,0x01,0x02,0x62,0x02,0x92,0x02,0x92,0x02,0x64,0x02,0x04,0x01,0xF8,0x00,}; @@ -341,23 +353,26 @@ const uint8_t _A_iButton_14_5[] = {0x01,0x00,0x1a,0x00,0x00,0x14,0xe2,0x01,0x24, const uint8_t _A_iButton_14_6[] = {0x00,0x00,0x00,0x00,0x38,0x00,0x24,0x00,0x23,0x80,0x20,0xF0,0x10,0x0C,0x0D,0xE2,0x02,0x91,0x01,0x69,0x01,0x15,0x01,0x8D,0x00,0x4D,0x00,0x3E,0x00,}; const uint8_t *_A_iButton_14[] = {_A_iButton_14_0,_A_iButton_14_1,_A_iButton_14_2,_A_iButton_14_3,_A_iButton_14_4,_A_iButton_14_5,_A_iButton_14_6}; -const uint8_t _I_Detailed_chip_17x13_0[] = {0x01,0x00,0x1e,0x00,0xfe,0x5f,0xe0,0x10,0x2c,0x04,0x02,0x23,0x11,0x80,0xe4,0x62,0x50,0x1a,0xff,0xc2,0x03,0x21,0x84,0x00,0x9a,0xbf,0xf4,0x08,0x98,0x5c,0x83,0xa4,0x23,0x20,}; -const uint8_t *_I_Detailed_chip_17x13[] = {_I_Detailed_chip_17x13_0}; - const uint8_t _I_Medium_chip_22x21_0[] = {0x01,0x00,0x35,0x00,0xfe,0x7f,0xe1,0xf0,0x28,0x04,0x43,0xf3,0xff,0x93,0xe1,0x6a,0x52,0x8e,0x2f,0xfe,0x51,0x25,0x80,0x4a,0x72,0xb6,0x79,0x55,0x76,0xc1,0x2e,0xaa,0xc0,0x25,0x51,0xdc,0x00,0x14,0x70,0x00,0x56,0xae,0x81,0x47,0x2b,0x7d,0x95,0x07,0x48,0x46,0x42,0x92,0x17,0x90,0xd4,0x87,0x64,}; const uint8_t *_I_Medium_chip_22x21[] = {_I_Medium_chip_22x21_0}; -const uint8_t _I_BatteryBody_52x28_0[] = {0x01,0x00,0x45,0x00,0xe0,0x7f,0x3f,0xe0,0x02,0x87,0xf0,0x21,0xe0,0xc3,0x84,0x50,0x39,0xbf,0xff,0x27,0xfe,0xf3,0x09,0xe0,0x42,0x81,0xab,0x0d,0x03,0x1c,0x2b,0xfc,0x0d,0x48,0x55,0xdc,0x1a,0x90,0x8f,0x18,0x6d,0x41,0xaa,0x1b,0x71,0x4b,0x0d,0xd4,0x1b,0xe0,0xdf,0x1b,0xd5,0xfc,0x1a,0xa5,0x36,0x06,0xac,0x20,0xa7,0xe0,0xdc,0xa5,0x7c,0x7c,0xb7,0xff,0xb4,0x21,0x5c,0xcb,0xc6,}; -const uint8_t *_I_BatteryBody_52x28[] = {_I_BatteryBody_52x28_0}; - -const uint8_t _I_FaceCharging_29x14_0[] = {0x01,0x00,0x28,0x00,0xa0,0x00,0x86,0x05,0x60,0x01,0x8c,0x0e,0x61,0x00,0xc0,0x40,0x63,0x10,0x0e,0x04,0x03,0xf9,0x00,0xf0,0x41,0xc0,0x66,0x13,0xb8,0x40,0x94,0xc0,0x07,0x04,0x82,0x00,0xc6,0x11,0x02,0x01,0x8f,0xc2,0x03,0x00,}; -const uint8_t *_I_FaceCharging_29x14[] = {_I_FaceCharging_29x14_0}; +const uint8_t _I_Detailed_chip_17x13_0[] = {0x01,0x00,0x1e,0x00,0xfe,0x5f,0xe0,0x10,0x2c,0x04,0x02,0x23,0x11,0x80,0xe4,0x62,0x50,0x1a,0xff,0xc2,0x03,0x21,0x84,0x00,0x9a,0xbf,0xf4,0x08,0x98,0x5c,0x83,0xa4,0x23,0x20,}; +const uint8_t *_I_Detailed_chip_17x13[] = {_I_Detailed_chip_17x13_0}; const uint8_t _I_Health_16x16_0[] = {0x01,0x00,0x12,0x00,0x00,0x2f,0x02,0x03,0x40,0x00,0x95,0xe2,0x1f,0x08,0x84,0x00,0xc4,0x12,0x60,0xf1,0x0c,0xb8,}; const uint8_t *_I_Health_16x16[] = {_I_Health_16x16_0}; -const uint8_t _I_Temperature_16x16_0[] = {0x01,0x00,0x12,0x00,0x00,0x1e,0x02,0x01,0x40,0x80,0x80,0x66,0x41,0x02,0xf0,0x40,0xc0,0x23,0xc0,0x80,0x86,0xd4,}; -const uint8_t *_I_Temperature_16x16[] = {_I_Temperature_16x16_0}; +const uint8_t _I_Voltage_16x16_0[] = {0x01,0x00,0x1a,0x00,0x00,0x24,0x0a,0x01,0x03,0xc0,0x40,0x78,0x10,0x1f,0x04,0x03,0xe1,0x07,0xc0,0x40,0xc0,0xe3,0xc0,0x80,0x58,0x20,0x12,0x00,0xd3,0x00,}; +const uint8_t *_I_Voltage_16x16[] = {_I_Voltage_16x16_0}; + +const uint8_t _I_BatteryBody_52x28_0[] = {0x01,0x00,0x45,0x00,0xe0,0x7f,0x3f,0xe0,0x02,0x87,0xf0,0x21,0xe0,0xc3,0x84,0x50,0x39,0xbf,0xff,0x27,0xfe,0xf3,0x09,0xe0,0x42,0x81,0xab,0x0d,0x03,0x1c,0x2b,0xfc,0x0d,0x48,0x55,0xdc,0x1a,0x90,0x8f,0x18,0x6d,0x41,0xaa,0x1b,0x71,0x4b,0x0d,0xd4,0x1b,0xe0,0xdf,0x1b,0xd5,0xfc,0x1a,0xa5,0x36,0x06,0xac,0x20,0xa7,0xe0,0xdc,0xa5,0x7c,0x7c,0xb7,0xff,0xb4,0x21,0x5c,0xcb,0xc6,}; +const uint8_t *_I_BatteryBody_52x28[] = {_I_BatteryBody_52x28_0}; + +const uint8_t _I_FaceNormal_29x14_0[] = {0x01,0x00,0x1e,0x00,0x00,0x1c,0xf2,0x01,0x80,0x83,0xd7,0xa0,0x1c,0x08,0x5d,0xf8,0x06,0x30,0xf0,0x1b,0x84,0xcc,0x41,0x10,0x88,0x10,0x0e,0x62,0x10,0x10,0x18,0xf8,0x00,0x42,}; +const uint8_t *_I_FaceNormal_29x14[] = {_I_FaceNormal_29x14_0}; + +const uint8_t _I_FaceCharging_29x14_0[] = {0x01,0x00,0x28,0x00,0xa0,0x00,0x86,0x05,0x60,0x01,0x8c,0x0e,0x61,0x00,0xc0,0x40,0x63,0x10,0x0e,0x04,0x03,0xf9,0x00,0xf0,0x41,0xc0,0x66,0x13,0xb8,0x40,0x94,0xc0,0x07,0x04,0x82,0x00,0xc6,0x11,0x02,0x01,0x8f,0xc2,0x03,0x00,}; +const uint8_t *_I_FaceCharging_29x14[] = {_I_FaceCharging_29x14_0}; const uint8_t _I_Battery_16x16_0[] = {0x01,0x00,0x12,0x00,0x00,0x1e,0x02,0x03,0xc0,0x81,0xc8,0x20,0x80,0x11,0xd0,0x41,0x40,0x72,0x11,0x10,0xda,0x80,}; const uint8_t *_I_Battery_16x16[] = {_I_Battery_16x16_0}; @@ -365,63 +380,36 @@ const uint8_t *_I_Battery_16x16[] = {_I_Battery_16x16_0}; const uint8_t _I_FaceConfused_29x14_0[] = {0x01,0x00,0x30,0x00,0xc0,0x00,0x46,0x1f,0x38,0x80,0xd0,0x22,0x14,0x48,0x0c,0x82,0x0f,0x52,0x80,0xe8,0x21,0x14,0xa0,0x18,0xc2,0xa6,0x59,0x19,0x24,0x27,0x09,0x48,0xa1,0x41,0x2f,0x12,0x4c,0x0c,0x0c,0x51,0x1f,0xc8,0x78,0x0c,0x7f,0xd1,0xf0,0x18,0xc3,0xa3,0x00,0x74,}; const uint8_t *_I_FaceConfused_29x14[] = {_I_FaceConfused_29x14_0}; -const uint8_t _I_FaceNormal_29x14_0[] = {0x01,0x00,0x1e,0x00,0x00,0x1c,0xf2,0x01,0x80,0x83,0xd7,0xa0,0x1c,0x08,0x5d,0xf8,0x06,0x30,0xf0,0x1b,0x84,0xcc,0x41,0x10,0x88,0x10,0x0e,0x62,0x10,0x10,0x18,0xf8,0x00,0x42,}; -const uint8_t *_I_FaceNormal_29x14[] = {_I_FaceNormal_29x14_0}; - -const uint8_t _I_Voltage_16x16_0[] = {0x01,0x00,0x1a,0x00,0x00,0x24,0x0a,0x01,0x03,0xc0,0x40,0x78,0x10,0x1f,0x04,0x03,0xe1,0x07,0xc0,0x40,0xc0,0xe3,0xc0,0x80,0x58,0x20,0x12,0x00,0xd3,0x00,}; -const uint8_t *_I_Voltage_16x16[] = {_I_Voltage_16x16_0}; +const uint8_t _I_Temperature_16x16_0[] = {0x01,0x00,0x12,0x00,0x00,0x1e,0x02,0x01,0x40,0x80,0x80,0x66,0x41,0x02,0xf0,0x40,0xc0,0x23,0xc0,0x80,0x86,0xd4,}; +const uint8_t *_I_Temperature_16x16[] = {_I_Temperature_16x16_0}; const uint8_t _I_FaceNopower_29x14_0[] = {0x01,0x00,0x24,0x00,0x00,0x1f,0x02,0x01,0x60,0x01,0xa7,0x80,0x02,0x57,0xe0,0x48,0xc3,0xe7,0xd0,0x0c,0x04,0x3c,0x39,0x1f,0x88,0x18,0x0c,0x61,0x90,0x60,0x18,0xff,0x82,0x44,0x03,0x38,0x74,0x38,0x2c,0x80,}; const uint8_t *_I_FaceNopower_29x14[] = {_I_FaceNopower_29x14_0}; -const uint8_t _I_RFIDDolphinSend_97x61_0[] = {0x01,0x00,0x8d,0x01,0x00,0x0f,0xfa,0x3e,0x04,0x2a,0x00,0x2d,0x78,0x10,0x1f,0x04,0x04,0x0a,0x38,0x00,0x62,0xcc,0x00,0x43,0x06,0x06,0x44,0x30,0x04,0x31,0x80,0x31,0x07,0x48,0x00,0x50,0x20,0x10,0xc8,0x01,0x64,0x0c,0x1d,0x04,0x28,0x24,0x83,0xd2,0x81,0x04,0xc4,0x18,0x42,0xc3,0x01,0x90,0x30,0xbe,0x05,0x51,0x29,0xa0,0x74,0x60,0x80,0xc1,0x84,0x0b,0x44,0x5e,0x43,0x73,0x82,0x41,0x20,0x1e,0x4a,0x68,0x31,0x27,0x90,0x48,0x84,0x20,0x18,0x31,0x7e,0x64,0x06,0x20,0x0c,0x2a,0x14,0x12,0x40,0x0c,0x28,0xa0,0xc4,0x41,0x87,0x81,0x17,0x08,0x30,0xa0,0xfd,0x08,0x0c,0x20,0xfc,0x38,0x08,0xc4,0x24,0x32,0x95,0x02,0x18,0xc2,0x61,0x18,0x09,0x20,0x31,0x03,0x25,0x84,0x1d,0x88,0x30,0x62,0x21,0x96,0xe2,0x44,0x22,0x00,0xc2,0x26,0xa0,0x64,0x68,0x80,0xc4,0x33,0x9e,0x92,0x9f,0x00,0xa3,0x48,0x24,0x00,0xc4,0x40,0xa4,0xa8,0x18,0xa9,0xb5,0x9b,0x48,0x28,0x05,0xa1,0x06,0x22,0xd4,0xa3,0x7e,0x05,0x98,0xe0,0x4f,0x22,0xcf,0x58,0x6f,0x80,0x10,0x34,0x24,0x31,0x3a,0x52,0x0f,0xe0,0x03,0x0c,0xf1,0xee,0x2d,0x63,0x00,0x0c,0x0f,0xe0,0x13,0x28,0xa0,0x31,0xa0,0x3f,0x08,0x18,0x10,0x45,0xa2,0xe3,0x40,0x00,0xf4,0x3f,0xe1,0xa1,0x84,0x02,0x94,0x18,0xb0,0xc0,0x63,0xc6,0x3f,0xe0,0x31,0x87,0x03,0x1e,0x11,0x3c,0x80,0x47,0xc1,0x90,0x56,0x1b,0x06,0x01,0xc0,0x20,0x06,0x17,0x88,0xf8,0x60,0xa0,0xc7,0x31,0x8a,0x58,0x60,0xe1,0x99,0x00,0x08,0x9a,0x01,0x06,0xd9,0x10,0x03,0x1f,0x44,0x19,0x43,0xc3,0x40,0xc4,0x2c,0x19,0x58,0x08,0x29,0xa0,0x60,0x0c,0xf2,0x00,0x27,0x02,0x05,0x20,0x06,0x4d,0x02,0x0b,0xc0,0x02,0x08,0x3c,0x80,0x09,0xa0,0x39,0x0a,0xd4,0x41,0x8f,0x50,0x05,0x09,0xa4,0x5b,0x4d,0x00,0xd8,0x23,0xc4,0x96,0x20,0xc7,0xac,0x40,0x2d,0x53,0x00,0x64,0x6b,0x20,0x1d,0x4a,0x08,0x32,0x2a,0x90,0x0d,0x46,0x0e,0x02,0x0c,0x79,0x51,0x08,0x61,0xf0,0x20,0x63,0xc5,0x4b,0x83,0x1e,0xfe,0x57,0xd3,0x51,0x40,0xbe,0xc0,0x08,0x42,0x00,0x53,0x30,0xe8,0x3f,0x50,0x14,0x73,0x80,0x0b,0xeb,0x07,0x61,0x40,0x00,0x7d,0x5f,0xf8,0x38,0x32,0x7a,0x03,0xf7,0x55,0xa6,0x78,0x19,0x54,0x0c,0xa8,0x32,0xa0,0x19,0xa0,0x65,0xc4,0x0b,0xe2,0x00,0x98,0x40,0x33,0xc1,0x92,0xfa,0x10,0x67,0x80,0x08,}; -const uint8_t *_I_RFIDDolphinSend_97x61[] = {_I_RFIDDolphinSend_97x61_0}; - const uint8_t _I_RFIDDolphinSuccess_108x57_0[] = {0x01,0x00,0xe7,0x01,0x00,0x0f,0x03,0xff,0x1f,0x06,0xd4,0xe2,0x01,0xe0,0x06,0xd4,0x18,0x04,0x30,0x30,0x64,0x60,0x20,0x20,0x31,0x86,0x03,0x62,0x80,0x03,0x28,0x80,0x36,0x24,0x00,0x36,0x00,0x28,0x5c,0xc3,0xe6,0x00,0x58,0x40,0xec,0xc1,0xb1,0x04,0x02,0x19,0x24,0x80,0x0b,0x02,0x02,0x40,0x37,0xc4,0x8c,0x2e,0x40,0x6f,0x93,0x8b,0x81,0x07,0x06,0xdc,0xc2,0x38,0x66,0x50,0x6a,0xe2,0x27,0xe0,0xd2,0xfc,0x08,0x09,0x0c,0x9c,0x4b,0x98,0x34,0xa0,0xe1,0xd5,0x06,0x8f,0x92,0xc2,0x05,0x1e,0x42,0xe1,0x81,0xa3,0xe2,0xf0,0xbc,0x4c,0x1a,0xff,0x2f,0x9b,0x80,0xd8,0xca,0x05,0x1f,0x97,0xfd,0xf8,0x60,0xd2,0x01,0x1e,0x00,0x1a,0x5c,0x00,0x08,0xc9,0xc1,0xab,0x40,0xf9,0x83,0x46,0x61,0x00,0xd8,0x4a,0x81,0xab,0xa0,0xf3,0x5f,0xc6,0x05,0x58,0x8a,0xa4,0x09,0x76,0x21,0xb1,0xf2,0x83,0x4f,0x5d,0x1a,0x01,0x8c,0x90,0x1a,0x31,0x0d,0x07,0xa9,0x16,0x50,0x0a,0xac,0x34,0xba,0x42,0xa1,0x88,0x50,0x23,0xaa,0x72,0xe0,0x6a,0xa1,0x4a,0x32,0x39,0x88,0x6c,0x60,0xc7,0x82,0xb0,0x55,0x60,0xa2,0x92,0x80,0xc0,0x43,0x63,0x03,0x25,0x96,0xe3,0x54,0x33,0x18,0xc4,0x90,0x22,0x21,0x81,0x81,0x03,0x4a,0xa9,0x55,0x7a,0x17,0xf3,0x82,0x9f,0x6d,0x5e,0xa9,0xb6,0x50,0x38,0x70,0x35,0x70,0x15,0x5a,0xa9,0xb8,0xa3,0x46,0x12,0x06,0x9f,0x83,0x54,0x8a,0x28,0x80,0x34,0xfc,0x08,0x93,0xaa,0xc7,0x40,0x83,0x83,0x81,0xd3,0xa1,0xd1,0x08,0x84,0x0c,0x24,0x3f,0xed,0x54,0x18,0x26,0x50,0x20,0xd9,0x42,0x21,0x90,0x4c,0x07,0xff,0xae,0x52,0x20,0x6a,0xc4,0x23,0x1f,0x88,0x3f,0xf0,0x1a,0x45,0x31,0xe7,0x03,0x4a,0x41,0xe0,0x69,0x0f,0xc2,0x1e,0x0d,0x19,0x80,0x48,0xa2,0x10,0xc5,0x68,0xdf,0x0a,0x82,0xb9,0x28,0x22,0x2c,0xe3,0x0a,0xd1,0x2b,0x0f,0x00,0x3c,0x22,0x91,0x53,0x9c,0x50,0x1a,0x30,0x08,0x39,0x1c,0x60,0x6d,0x12,0x3d,0x8c,0xc2,0x51,0x00,0x17,0x0c,0xe2,0x01,0xff,0x83,0x84,0xc6,0x40,0xb0,0x19,0x84,0xd0,0x1a,0x5c,0x08,0x1f,0xf8,0x8c,0x50,0x43,0x08,0xce,0x2d,0x06,0x71,0x5f,0x17,0xfe,0x12,0xdf,0x20,0x69,0x55,0x01,0xa6,0x00,0x18,0x40,0xa4,0x80,0x63,0x3c,0xb5,0x03,0x56,0x08,0x8b,0x20,0x10,0xcf,0x03,0x62,0x08,0x20,0x00,0x94,0xc6,0x01,0x70,0x01,0x0c,0xe8,0x36,0x20,0xd3,0xe0,0x00,0xcb,0x10,0x02,0x19,0xf3,0x9c,0x41,0xa3,0x15,0x31,0x90,0x00,0x70,0xc0,0x21,0xdd,0x86,0xc4,0x78,0x3e,0xa3,0x71,0xe0,0x30,0x20,0x31,0xbe,0x86,0xc4,0x1a,0x35,0x40,0x20,0x8d,0x89,0x28,0x5b,0xa0,0xd9,0xea,0x3d,0x44,0x42,0x87,0x83,0x48,0x36,0x49,0xe1,0xa0,0x75,0x67,0x8d,0x41,0x54,0x14,0x03,0xf5,0x2a,0x06,0x96,0x03,0x54,0xc4,0x14,0xd0,0x83,0x4a,0xfb,0x35,0x06,0x90,0x38,0x4e,0x46,0xb4,0x10,0xd9,0x81,0x49,0x72,0x40,0x01,0x0a,0x95,0xd4,0x36,0x20,0xd7,0x55,0x10,}; const uint8_t *_I_RFIDDolphinSuccess_108x57[] = {_I_RFIDDolphinSuccess_108x57_0}; -const uint8_t _I_RFIDDolphinReceive_97x61_0[] = {0x01,0x00,0x87,0x01,0x00,0x0f,0xfa,0x3e,0x04,0x28,0x08,0x2d,0x78,0x10,0x1f,0x00,0x24,0x70,0x01,0x86,0x98,0x00,0x86,0x0c,0x0c,0x88,0x60,0x08,0x63,0x10,0x0a,0x00,0x31,0xa0,0x40,0x21,0x90,0x03,0x04,0x1a,0x5a,0x08,0x50,0xe9,0x01,0x23,0x20,0x07,0x88,0x30,0xc5,0xa6,0x03,0x10,0x61,0xfc,0x0a,0xa2,0x2d,0x48,0x0c,0x82,0x20,0x04,0x18,0x40,0x40,0x42,0x44,0x37,0x28,0x80,0x30,0xbc,0x94,0xd0,0x62,0x4f,0x20,0x91,0x08,0x44,0x12,0x01,0x17,0xe6,0x40,0x42,0x45,0x00,0xa1,0x03,0x08,0xa8,0x31,0x41,0x88,0x83,0x0f,0x03,0x08,0x06,0x1c,0x1f,0xa1,0x01,0x84,0x1f,0x8a,0x31,0x09,0x0c,0xa5,0x40,0x86,0x30,0x98,0x46,0x02,0x48,0x0c,0x40,0xc9,0x61,0x00,0xe2,0x0c,0x18,0x88,0x65,0xb8,0x85,0x51,0x06,0x21,0x34,0x83,0x23,0x44,0x06,0x29,0x1c,0xb4,0x94,0xf8,0x05,0x19,0x12,0x20,0xc2,0x40,0xb4,0xa8,0x18,0xa9,0xb5,0x9b,0x48,0x28,0x05,0xa1,0x06,0x22,0xd4,0xa3,0x7e,0x05,0x98,0xe0,0x62,0x0c,0xf6,0x86,0xf8,0x16,0x63,0x42,0x06,0x0b,0xa1,0x60,0xfe,0x06,0xe8,0xcf,0x23,0x0d,0x53,0x00,0x14,0x0f,0xe0,0xea,0x28,0xa0,0x31,0xa0,0x3f,0x08,0x18,0x10,0x45,0xa2,0x11,0x20,0x01,0xf4,0x3f,0xe0,0x81,0x84,0x02,0x94,0x18,0xb0,0xc0,0x63,0xc6,0x3f,0xe0,0x31,0x87,0x03,0x1e,0x11,0x3c,0x80,0x47,0xc1,0x91,0x18,0x80,0x58,0x30,0x0e,0x01,0x00,0x30,0xbc,0x47,0xc3,0x05,0x06,0x3c,0x52,0x00,0xe4,0x20,0xcc,0x80,0x04,0x4d,0x00,0x83,0x73,0x08,0x01,0x8f,0xa2,0x0c,0xa1,0xe1,0xa0,0x62,0x16,0x0c,0xac,0x04,0x14,0xd0,0x30,0x08,0x80,0x31,0xb8,0x10,0x27,0x89,0x03,0x1e,0x81,0x05,0xe0,0x01,0x04,0x1e,0x40,0x04,0xd0,0x1c,0x85,0x6a,0x20,0xc7,0xa8,0x02,0x84,0xd2,0x34,0x00,0x63,0x6c,0x11,0xe2,0x4b,0x10,0x63,0xd6,0x20,0x16,0xa9,0x80,0x32,0x35,0x90,0x0e,0xa5,0x04,0x19,0x15,0x48,0x06,0xa3,0x07,0x01,0x06,0x3c,0xa8,0x84,0x30,0xf8,0x10,0x31,0xe2,0xa5,0xc1,0x8f,0x7f,0x2b,0xe9,0xa8,0xa0,0x5f,0x60,0x04,0x21,0x00,0x29,0x98,0x74,0x1f,0xa8,0x0a,0x39,0xc0,0x05,0xf5,0x83,0xb0,0xa0,0x00,0x3e,0xaf,0xfc,0x1c,0x19,0x3d,0x01,0xfb,0xaa,0xd3,0x3c,0x0c,0xaa,0x06,0x54,0x19,0x50,0x0c,0xd0,0x32,0xe2,0x05,0xf1,0x00,0x4c,0x20,0x19,0xe0,0xc9,0x7d,0x08,0x33,0xc0,0x04,}; -const uint8_t *_I_RFIDDolphinReceive_97x61[] = {_I_RFIDDolphinReceive_97x61_0}; - const uint8_t _I_RFIDBigChip_37x36_0[] = {0x01,0x00,0x6e,0x00,0x83,0x01,0x0f,0xcd,0xff,0x00,0x0c,0x1e,0x24,0x08,0x28,0x47,0x24,0x12,0x51,0x39,0x28,0x24,0xa2,0x91,0x5e,0x07,0xab,0xfe,0x04,0x1c,0x04,0xaa,0x01,0x15,0x02,0x28,0x4c,0x81,0x2c,0x04,0x4e,0x05,0xfc,0x08,0x35,0x59,0x06,0x02,0x81,0x15,0xca,0xe4,0x26,0xf2,0x10,0x70,0xd7,0x66,0x11,0x70,0x70,0xd4,0x20,0x14,0x10,0x70,0xc7,0x68,0x13,0x70,0x70,0xd4,0x28,0x10,0x10,0x4a,0x84,0xc6,0x80,0x13,0x10,0xe8,0xd0,0x03,0xa2,0x27,0x19,0xf0,0x9c,0x46,0x28,0x3b,0x42,0xcf,0x96,0x6a,0xd4,0x13,0x6f,0x2a,0x2c,0xa2,0x90,0x54,0x59,0xfe,0x52,0xa7,0x02,0x4f,0x9f,0xf1,0x52,0x60,}; const uint8_t *_I_RFIDBigChip_37x36[] = {_I_RFIDBigChip_37x36_0}; -const uint8_t _I_SDQuestion_35x43_0[] = {0x01,0x00,0x67,0x00,0xf8,0x7f,0xc0,0x03,0x03,0xfc,0x01,0x0a,0x0f,0x38,0xa4,0xe4,0xa4,0x80,0x4f,0x0c,0x20,0x13,0xc0,0x9f,0x80,0x02,0x15,0xfe,0x00,0x04,0x29,0xfc,0x03,0xfd,0x07,0xfa,0x47,0xe7,0xdf,0xc8,0x3f,0xea,0x1f,0x7f,0xfc,0x41,0xff,0xb8,0xff,0xf8,0x10,0x7f,0xe0,0x4e,0xef,0x86,0x08,0x68,0x33,0xf1,0x10,0xff,0x3f,0xf1,0xf1,0x60,0x81,0x06,0x1e,0x36,0x10,0x20,0xe1,0xc0,0x87,0xc7,0x02,0x0f,0xd3,0xff,0xe3,0x02,0x0f,0xe8,0x08,0x7f,0xd0,0x21,0x89,0xc4,0x08,0x9f,0x70,0x21,0x9a,0x08,0x08,0xc1,0x89,0x02,0x20,0x62,0x40,0x8f,0xfe,0x68,0x98,}; -const uint8_t *_I_SDQuestion_35x43[] = {_I_SDQuestion_35x43_0}; +const uint8_t _I_RFIDDolphinReceive_97x61_0[] = {0x01,0x00,0x87,0x01,0x00,0x0f,0xfa,0x3e,0x04,0x28,0x08,0x2d,0x78,0x10,0x1f,0x00,0x24,0x70,0x01,0x86,0x98,0x00,0x86,0x0c,0x0c,0x88,0x60,0x08,0x63,0x10,0x0a,0x00,0x31,0xa0,0x40,0x21,0x90,0x03,0x04,0x1a,0x5a,0x08,0x50,0xe9,0x01,0x23,0x20,0x07,0x88,0x30,0xc5,0xa6,0x03,0x10,0x61,0xfc,0x0a,0xa2,0x2d,0x48,0x0c,0x82,0x20,0x04,0x18,0x40,0x40,0x42,0x44,0x37,0x28,0x80,0x30,0xbc,0x94,0xd0,0x62,0x4f,0x20,0x91,0x08,0x44,0x12,0x01,0x17,0xe6,0x40,0x42,0x45,0x00,0xa1,0x03,0x08,0xa8,0x31,0x41,0x88,0x83,0x0f,0x03,0x08,0x06,0x1c,0x1f,0xa1,0x01,0x84,0x1f,0x8a,0x31,0x09,0x0c,0xa5,0x40,0x86,0x30,0x98,0x46,0x02,0x48,0x0c,0x40,0xc9,0x61,0x00,0xe2,0x0c,0x18,0x88,0x65,0xb8,0x85,0x51,0x06,0x21,0x34,0x83,0x23,0x44,0x06,0x29,0x1c,0xb4,0x94,0xf8,0x05,0x19,0x12,0x20,0xc2,0x40,0xb4,0xa8,0x18,0xa9,0xb5,0x9b,0x48,0x28,0x05,0xa1,0x06,0x22,0xd4,0xa3,0x7e,0x05,0x98,0xe0,0x62,0x0c,0xf6,0x86,0xf8,0x16,0x63,0x42,0x06,0x0b,0xa1,0x60,0xfe,0x06,0xe8,0xcf,0x23,0x0d,0x53,0x00,0x14,0x0f,0xe0,0xea,0x28,0xa0,0x31,0xa0,0x3f,0x08,0x18,0x10,0x45,0xa2,0x11,0x20,0x01,0xf4,0x3f,0xe0,0x81,0x84,0x02,0x94,0x18,0xb0,0xc0,0x63,0xc6,0x3f,0xe0,0x31,0x87,0x03,0x1e,0x11,0x3c,0x80,0x47,0xc1,0x91,0x18,0x80,0x58,0x30,0x0e,0x01,0x00,0x30,0xbc,0x47,0xc3,0x05,0x06,0x3c,0x52,0x00,0xe4,0x20,0xcc,0x80,0x04,0x4d,0x00,0x83,0x73,0x08,0x01,0x8f,0xa2,0x0c,0xa1,0xe1,0xa0,0x62,0x16,0x0c,0xac,0x04,0x14,0xd0,0x30,0x08,0x80,0x31,0xb8,0x10,0x27,0x89,0x03,0x1e,0x81,0x05,0xe0,0x01,0x04,0x1e,0x40,0x04,0xd0,0x1c,0x85,0x6a,0x20,0xc7,0xa8,0x02,0x84,0xd2,0x34,0x00,0x63,0x6c,0x11,0xe2,0x4b,0x10,0x63,0xd6,0x20,0x16,0xa9,0x80,0x32,0x35,0x90,0x0e,0xa5,0x04,0x19,0x15,0x48,0x06,0xa3,0x07,0x01,0x06,0x3c,0xa8,0x84,0x30,0xf8,0x10,0x31,0xe2,0xa5,0xc1,0x8f,0x7f,0x2b,0xe9,0xa8,0xa0,0x5f,0x60,0x04,0x21,0x00,0x29,0x98,0x74,0x1f,0xa8,0x0a,0x39,0xc0,0x05,0xf5,0x83,0xb0,0xa0,0x00,0x3e,0xaf,0xfc,0x1c,0x19,0x3d,0x01,0xfb,0xaa,0xd3,0x3c,0x0c,0xaa,0x06,0x54,0x19,0x50,0x0c,0xd0,0x32,0xe2,0x05,0xf1,0x00,0x4c,0x20,0x19,0xe0,0xc9,0x7d,0x08,0x33,0xc0,0x04,}; +const uint8_t *_I_RFIDDolphinReceive_97x61[] = {_I_RFIDDolphinReceive_97x61_0}; + +const uint8_t _I_RFIDDolphinSend_97x61_0[] = {0x01,0x00,0x8d,0x01,0x00,0x0f,0xfa,0x3e,0x04,0x2a,0x00,0x2d,0x78,0x10,0x1f,0x04,0x04,0x0a,0x38,0x00,0x62,0xcc,0x00,0x43,0x06,0x06,0x44,0x30,0x04,0x31,0x80,0x31,0x07,0x48,0x00,0x50,0x20,0x10,0xc8,0x01,0x64,0x0c,0x1d,0x04,0x28,0x24,0x83,0xd2,0x81,0x04,0xc4,0x18,0x42,0xc3,0x01,0x90,0x30,0xbe,0x05,0x51,0x29,0xa0,0x74,0x60,0x80,0xc1,0x84,0x0b,0x44,0x5e,0x43,0x73,0x82,0x41,0x20,0x1e,0x4a,0x68,0x31,0x27,0x90,0x48,0x84,0x20,0x18,0x31,0x7e,0x64,0x06,0x20,0x0c,0x2a,0x14,0x12,0x40,0x0c,0x28,0xa0,0xc4,0x41,0x87,0x81,0x17,0x08,0x30,0xa0,0xfd,0x08,0x0c,0x20,0xfc,0x38,0x08,0xc4,0x24,0x32,0x95,0x02,0x18,0xc2,0x61,0x18,0x09,0x20,0x31,0x03,0x25,0x84,0x1d,0x88,0x30,0x62,0x21,0x96,0xe2,0x44,0x22,0x00,0xc2,0x26,0xa0,0x64,0x68,0x80,0xc4,0x33,0x9e,0x92,0x9f,0x00,0xa3,0x48,0x24,0x00,0xc4,0x40,0xa4,0xa8,0x18,0xa9,0xb5,0x9b,0x48,0x28,0x05,0xa1,0x06,0x22,0xd4,0xa3,0x7e,0x05,0x98,0xe0,0x4f,0x22,0xcf,0x58,0x6f,0x80,0x10,0x34,0x24,0x31,0x3a,0x52,0x0f,0xe0,0x03,0x0c,0xf1,0xee,0x2d,0x63,0x00,0x0c,0x0f,0xe0,0x13,0x28,0xa0,0x31,0xa0,0x3f,0x08,0x18,0x10,0x45,0xa2,0xe3,0x40,0x00,0xf4,0x3f,0xe1,0xa1,0x84,0x02,0x94,0x18,0xb0,0xc0,0x63,0xc6,0x3f,0xe0,0x31,0x87,0x03,0x1e,0x11,0x3c,0x80,0x47,0xc1,0x90,0x56,0x1b,0x06,0x01,0xc0,0x20,0x06,0x17,0x88,0xf8,0x60,0xa0,0xc7,0x31,0x8a,0x58,0x60,0xe1,0x99,0x00,0x08,0x9a,0x01,0x06,0xd9,0x10,0x03,0x1f,0x44,0x19,0x43,0xc3,0x40,0xc4,0x2c,0x19,0x58,0x08,0x29,0xa0,0x60,0x0c,0xf2,0x00,0x27,0x02,0x05,0x20,0x06,0x4d,0x02,0x0b,0xc0,0x02,0x08,0x3c,0x80,0x09,0xa0,0x39,0x0a,0xd4,0x41,0x8f,0x50,0x05,0x09,0xa4,0x5b,0x4d,0x00,0xd8,0x23,0xc4,0x96,0x20,0xc7,0xac,0x40,0x2d,0x53,0x00,0x64,0x6b,0x20,0x1d,0x4a,0x08,0x32,0x2a,0x90,0x0d,0x46,0x0e,0x02,0x0c,0x79,0x51,0x08,0x61,0xf0,0x20,0x63,0xc5,0x4b,0x83,0x1e,0xfe,0x57,0xd3,0x51,0x40,0xbe,0xc0,0x08,0x42,0x00,0x53,0x30,0xe8,0x3f,0x50,0x14,0x73,0x80,0x0b,0xeb,0x07,0x61,0x40,0x00,0x7d,0x5f,0xf8,0x38,0x32,0x7a,0x03,0xf7,0x55,0xa6,0x78,0x19,0x54,0x0c,0xa8,0x32,0xa0,0x19,0xa0,0x65,0xc4,0x0b,0xe2,0x00,0x98,0x40,0x33,0xc1,0x92,0xfa,0x10,0x67,0x80,0x08,}; +const uint8_t *_I_RFIDDolphinSend_97x61[] = {_I_RFIDDolphinSend_97x61_0}; const uint8_t _I_SDError_43x35_0[] = {0x01,0x00,0x6f,0x00,0xff,0x7f,0xc0,0x05,0x03,0x80,0x82,0x8e,0x08,0x05,0x59,0xe8,0x16,0x82,0x2d,0x30,0x8c,0x43,0x20,0xc0,0x51,0xb0,0x43,0x23,0x10,0x30,0x88,0xf0,0x20,0xdb,0x08,0x08,0x2c,0x70,0x10,0x3f,0x00,0x5c,0x80,0xa8,0x11,0x60,0xea,0x0a,0x54,0x8f,0xe5,0x99,0xfe,0x4f,0xc0,0xa6,0x70,0x10,0x89,0x60,0x23,0xff,0x91,0xa9,0x70,0x25,0xff,0x21,0xa9,0x70,0x2b,0xfe,0x42,0xc9,0x60,0x30,0x7e,0x40,0x89,0x42,0x30,0x12,0x08,0x80,0x14,0xa0,0x11,0x10,0x28,0xc0,0x66,0x10,0x08,0x74,0x30,0x8f,0xe0,0x58,0x5c,0x88,0x14,0xc0,0x43,0x01,0x8f,0x81,0x4f,0x05,0x20,0x02,0x9f,0xf3,0x80,0xcb,0x10,}; const uint8_t *_I_SDError_43x35[] = {_I_SDError_43x35_0}; +const uint8_t _I_SDQuestion_35x43_0[] = {0x01,0x00,0x67,0x00,0xf8,0x7f,0xc0,0x03,0x03,0xfc,0x01,0x0a,0x0f,0x38,0xa4,0xe4,0xa4,0x80,0x4f,0x0c,0x20,0x13,0xc0,0x9f,0x80,0x02,0x15,0xfe,0x00,0x04,0x29,0xfc,0x03,0xfd,0x07,0xfa,0x47,0xe7,0xdf,0xc8,0x3f,0xea,0x1f,0x7f,0xfc,0x41,0xff,0xb8,0xff,0xf8,0x10,0x7f,0xe0,0x4e,0xef,0x86,0x08,0x68,0x33,0xf1,0x10,0xff,0x3f,0xf1,0xf1,0x60,0x81,0x06,0x1e,0x36,0x10,0x20,0xe1,0xc0,0x87,0xc7,0x02,0x0f,0xd3,0xff,0xe3,0x02,0x0f,0xe8,0x08,0x7f,0xd0,0x21,0x89,0xc4,0x08,0x9f,0x70,0x21,0x9a,0x08,0x08,0xc1,0x89,0x02,0x20,0x62,0x40,0x8f,0xfe,0x68,0x98,}; +const uint8_t *_I_SDQuestion_35x43[] = {_I_SDQuestion_35x43_0}; + const uint8_t _I_Cry_dolph_55x52_0[] = {0x01,0x00,0xe8,0x00,0x00,0x0f,0xe3,0xff,0x01,0x03,0x1f,0xfb,0xff,0x0f,0x02,0x96,0x02,0x0f,0x00,0x9f,0x01,0x8b,0xc0,0x12,0x1f,0x80,0x18,0xae,0x00,0x21,0xe0,0x07,0x0a,0x30,0x0a,0x28,0x18,0x08,0x61,0x80,0x62,0x83,0x00,0x90,0x14,0x61,0x02,0x0c,0x16,0x00,0x76,0x60,0x66,0x98,0x0b,0x04,0x90,0x60,0x66,0xb0,0x00,0x48,0x0d,0x21,0x21,0x03,0x30,0x74,0x40,0xd3,0x80,0x03,0x34,0x04,0xc0,0x52,0x00,0x32,0xc7,0xa0,0x18,0x80,0x31,0x80,0x07,0xe1,0x01,0x37,0x18,0x50,0x80,0xc2,0x92,0x10,0x31,0xe8,0x23,0xe9,0x63,0x86,0x54,0x3f,0xe0,0xe1,0x0d,0x96,0x83,0xfc,0x06,0x40,0x69,0x6c,0x3c,0x60,0xd2,0xfc,0xc0,0x60,0x58,0x48,0x0c,0x1b,0x81,0x08,0x14,0x9c,0x1a,0x81,0x04,0x03,0x46,0x80,0x0c,0x50,0x26,0x21,0xc1,0x94,0x26,0x14,0x27,0x8a,0x40,0xc0,0xc2,0xe7,0x26,0x40,0x81,0x86,0xc0,0x6b,0x28,0x64,0x0f,0x01,0x10,0x4e,0x14,0x60,0x0c,0x29,0x02,0x48,0x8b,0x5c,0x45,0x22,0x01,0x10,0x31,0x3a,0x4c,0x0c,0x34,0x06,0xf1,0xd8,0x00,0xc5,0x1a,0x64,0x94,0x0c,0xc0,0x37,0x52,0x20,0x81,0x84,0x26,0x3e,0x88,0x0c,0x38,0x28,0x54,0x0e,0xac,0x1f,0xe1,0x3f,0x06,0x96,0x82,0x7e,0x29,0x4a,0xaf,0xfd,0x76,0x30,0x3a,0x41,0x14,0x7f,0xd0,0xf8,0x78,0x18,0xaa,0x9f,0xd4,0xe0,0x83,0x4f,0xf5,0xf7,0x38,0x0b,0x9c,0x6a,0x1f,0x5b,0x5c,0x00,}; const uint8_t *_I_Cry_dolph_55x52[] = {_I_Cry_dolph_55x52_0}; -const uint8_t _I_Background_128x11_0[] = {0x01,0x00,0x70,0x00,0xff,0x40,0x40,0xc9,0xe0,0xff,0x80,0x06,0x1e,0x08,0x38,0x0c,0x0c,0x1e,0x93,0x00,0x19,0x46,0x01,0x07,0x7d,0x83,0x03,0xd2,0x31,0xff,0xdb,0xd5,0x66,0x20,0x83,0xc0,0xff,0x05,0x24,0x00,0x1c,0x78,0x28,0xbc,0x40,0x72,0xbf,0xcf,0x47,0xeb,0x40,0xdb,0x7a,0xbf,0xf0,0x40,0x39,0x60,0x28,0x3f,0xe0,0xa0,0xea,0x80,0x63,0x3f,0x0b,0x17,0xe4,0x3e,0x5a,0xbc,0xf9,0x99,0x70,0x1f,0x81,0x50,0xc0,0x80,0xe7,0x3e,0x1e,0x9d,0x57,0xfb,0x7f,0x23,0x15,0xb0,0x12,0x5b,0x5b,0x02,0x1d,0x8c,0xc3,0x80,0x24,0x9e,0x03,0x80,0x5e,0x40,0x00,0xa1,0x88,0x0e,0x98,0x00,0x7b,0x07,0x08,0xb2,0x44,0x41,}; -const uint8_t *_I_Background_128x11[] = {_I_Background_128x11_0}; - -const uint8_t _I_Lock_8x8_0[] = {0x00,0x3C,0x42,0x42,0xFF,0xFF,0xE7,0xFF,0xFF,}; -const uint8_t *_I_Lock_8x8[] = {_I_Lock_8x8_0}; - -const uint8_t _I_Battery_26x8_0[] = {0x01,0x00,0x13,0x00,0xff,0x7f,0xef,0xf0,0x08,0x0c,0x03,0x00,0x03,0x38,0x18,0x0c,0xa0,0x40,0x36,0x05,0x98,0x6d,0x00,}; -const uint8_t *_I_Battery_26x8[] = {_I_Battery_26x8_0}; - const uint8_t _I_Battery_19x8_0[] = {0x01,0x00,0x0f,0x00,0xff,0x7f,0xe0,0x30,0x18,0x04,0x08,0x04,0x90,0x60,0x12,0x02,0xcc,0x28,0x40,}; const uint8_t *_I_Battery_19x8[] = {_I_Battery_19x8_0}; -const uint8_t _I_USBConnected_15x8_0[] = {0x00,0xF0,0x07,0x08,0x7C,0x04,0x44,0x07,0x54,0x07,0x54,0x04,0x44,0x08,0x7C,0xF0,0x07,}; -const uint8_t *_I_USBConnected_15x8[] = {_I_USBConnected_15x8_0}; - -const uint8_t _I_Background_128x8_0[] = {0x01,0x00,0x43,0x00,0xff,0x7f,0xc0,0x19,0x7f,0x80,0x87,0xb7,0x01,0x3d,0xfd,0xff,0x74,0xff,0xdf,0x7f,0x87,0x87,0xfd,0xfb,0xd3,0xe7,0xf7,0x9d,0xbf,0xff,0x35,0x41,0x09,0x8c,0x20,0x04,0x31,0xc8,0xe0,0x0c,0x62,0x18,0x08,0x10,0x10,0x70,0x99,0xde,0xfe,0xde,0xe7,0xf7,0xff,0x70,0xfc,0x3f,0x6d,0x7f,0x9e,0x6f,0xd9,0xfd,0xd9,0xf3,0x43,0xff,0x2f,0x68,0x00,0x4d,0xfe,}; -const uint8_t *_I_Background_128x8[] = {_I_Background_128x8_0}; - -const uint8_t _I_BadUsb_9x8_0[] = {0x00,0x01,0x01,0xBB,0x01,0xFE,0x00,0xFE,0x00,0xD6,0x00,0xD6,0x00,0x7C,0x00,0x38,0x00,}; -const uint8_t *_I_BadUsb_9x8[] = {_I_BadUsb_9x8_0}; - -const uint8_t _I_BT_Pair_9x8_0[] = {0x00,0x11,0x01,0x35,0x00,0x58,0x01,0x31,0x00,0x30,0x01,0x59,0x00,0x34,0x01,0x11,0x01,}; -const uint8_t *_I_BT_Pair_9x8[] = {_I_BT_Pair_9x8_0}; - -const uint8_t _I_PlaceholderL_11x13_0[] = {0x01,0x00,0x10,0x00,0xfe,0x40,0x60,0x50,0x28,0x0c,0x10,0x03,0xb0,0x38,0x37,0xfe,0x07,0xfe,0x80,0x80,}; -const uint8_t *_I_PlaceholderL_11x13[] = {_I_PlaceholderL_11x13_0}; - const uint8_t _I_SDcardFail_11x8_0[] = {0x00,0xFF,0x07,0xB7,0x07,0xFF,0x07,0x87,0x07,0x7B,0x07,0xFF,0x07,0xFF,0x07,0x67,0x00,}; const uint8_t *_I_SDcardFail_11x8[] = {_I_SDcardFail_11x8_0}; @@ -431,38 +419,47 @@ const uint8_t *_I_Bluetooth_5x8[] = {_I_Bluetooth_5x8_0}; const uint8_t _I_PlaceholderR_30x13_0[] = {0x01,0x00,0x19,0x00,0xfe,0x7f,0xff,0xf0,0xf8,0x10,0x18,0x62,0x10,0x10,0x18,0xc8,0x00,0x7e,0x03,0xb8,0x18,0x0c,0x66,0x1f,0xe1,0x58,0xc7,0xc5,0xe6,}; const uint8_t *_I_PlaceholderR_30x13[] = {_I_PlaceholderR_30x13_0}; +const uint8_t _I_Battery_26x8_0[] = {0x01,0x00,0x13,0x00,0xff,0x7f,0xef,0xf0,0x08,0x0c,0x03,0x00,0x03,0x38,0x18,0x0c,0xa0,0x40,0x36,0x05,0x98,0x6d,0x00,}; +const uint8_t *_I_Battery_26x8[] = {_I_Battery_26x8_0}; + +const uint8_t _I_Lock_8x8_0[] = {0x00,0x3C,0x42,0x42,0xFF,0xFF,0xE7,0xFF,0xFF,}; +const uint8_t *_I_Lock_8x8[] = {_I_Lock_8x8_0}; + const uint8_t _I_SDcardMounted_11x8_0[] = {0x01,0x00,0x09,0x00,0xff,0xc1,0xff,0xf0,0x40,0x1c,0xd9,0xe0,0x00,}; const uint8_t *_I_SDcardMounted_11x8[] = {_I_SDcardMounted_11x8_0}; +const uint8_t _I_BadUsb_9x8_0[] = {0x00,0x01,0x01,0xBB,0x01,0xFE,0x00,0xFE,0x00,0xD6,0x00,0xD6,0x00,0x7C,0x00,0x38,0x00,}; +const uint8_t *_I_BadUsb_9x8[] = {_I_BadUsb_9x8_0}; + +const uint8_t _I_BT_Pair_9x8_0[] = {0x00,0x11,0x01,0x35,0x00,0x58,0x01,0x31,0x00,0x30,0x01,0x59,0x00,0x34,0x01,0x11,0x01,}; +const uint8_t *_I_BT_Pair_9x8[] = {_I_BT_Pair_9x8_0}; + +const uint8_t _I_PlaceholderL_11x13_0[] = {0x01,0x00,0x10,0x00,0xfe,0x40,0x60,0x50,0x28,0x0c,0x10,0x03,0xb0,0x38,0x37,0xfe,0x07,0xfe,0x80,0x80,}; +const uint8_t *_I_PlaceholderL_11x13[] = {_I_PlaceholderL_11x13_0}; + +const uint8_t _I_Background_128x11_0[] = {0x01,0x00,0x70,0x00,0xff,0x40,0x40,0xc9,0xe0,0xff,0x80,0x06,0x1e,0x08,0x38,0x0c,0x0c,0x1e,0x93,0x00,0x19,0x46,0x01,0x07,0x7d,0x83,0x03,0xd2,0x31,0xff,0xdb,0xd5,0x66,0x20,0x83,0xc0,0xff,0x05,0x24,0x00,0x1c,0x78,0x28,0xbc,0x40,0x72,0xbf,0xcf,0x47,0xeb,0x40,0xdb,0x7a,0xbf,0xf0,0x40,0x39,0x60,0x28,0x3f,0xe0,0xa0,0xea,0x80,0x63,0x3f,0x0b,0x17,0xe4,0x3e,0x5a,0xbc,0xf9,0x99,0x70,0x1f,0x81,0x50,0xc0,0x80,0xe7,0x3e,0x1e,0x9d,0x57,0xfb,0x7f,0x23,0x15,0xb0,0x12,0x5b,0x5b,0x02,0x1d,0x8c,0xc3,0x80,0x24,0x9e,0x03,0x80,0x5e,0x40,0x00,0xa1,0x88,0x0e,0x98,0x00,0x7b,0x07,0x08,0xb2,0x44,0x41,}; +const uint8_t *_I_Background_128x11[] = {_I_Background_128x11_0}; + +const uint8_t _I_Background_128x8_0[] = {0x01,0x00,0x43,0x00,0xff,0x7f,0xc0,0x19,0x7f,0x80,0x87,0xb7,0x01,0x3d,0xfd,0xff,0x74,0xff,0xdf,0x7f,0x87,0x87,0xfd,0xfb,0xd3,0xe7,0xf7,0x9d,0xbf,0xff,0x35,0x41,0x09,0x8c,0x20,0x04,0x31,0xc8,0xe0,0x0c,0x62,0x18,0x08,0x10,0x10,0x70,0x99,0xde,0xfe,0xde,0xe7,0xf7,0xff,0x70,0xfc,0x3f,0x6d,0x7f,0x9e,0x6f,0xd9,0xfd,0xd9,0xf3,0x43,0xff,0x2f,0x68,0x00,0x4d,0xfe,}; +const uint8_t *_I_Background_128x8[] = {_I_Background_128x8_0}; + +const uint8_t _I_USBConnected_15x8_0[] = {0x00,0xF0,0x07,0x08,0x7C,0x04,0x44,0x07,0x54,0x07,0x54,0x04,0x44,0x08,0x7C,0xF0,0x07,}; +const uint8_t *_I_USBConnected_15x8[] = {_I_USBConnected_15x8_0}; + const uint8_t _I_Quest_7x8_0[] = {0x00,0x1E,0x33,0x33,0x30,0x18,0x0C,0x00,0x0C,}; const uint8_t *_I_Quest_7x8[] = {_I_Quest_7x8_0}; -const uint8_t _I_Lock_7x8_0[] = {0x00,0x1C,0x22,0x22,0x7F,0x7F,0x77,0x7F,0x3E,}; -const uint8_t *_I_Lock_7x8[] = {_I_Lock_7x8_0}; +const uint8_t _I_MHz_25x11_0[] = {0x01,0x00,0x21,0x00,0xe1,0xe1,0xa0,0x30,0x0f,0x38,0x0c,0xbf,0xe0,0x34,0xfe,0xc0,0x7b,0x7f,0xe0,0x19,0xf0,0x60,0x1d,0xbc,0x35,0x84,0x36,0x53,0x10,0x19,0x46,0x40,0x64,0x13,0x10,0x19,0x80,}; +const uint8_t *_I_MHz_25x11[] = {_I_MHz_25x11_0}; const uint8_t _I_Scanning_123x52_0[] = {0x01,0x00,0xd3,0x01,0x00,0x78,0x03,0xc0,0x1f,0x00,0xe0,0x7f,0xc1,0xfb,0xf0,0x80,0x41,0xc0,0xc7,0x03,0x07,0xbe,0xb2,0x07,0x18,0x07,0xc4,0x40,0x06,0x55,0x68,0x2d,0x80,0x0a,0x58,0x08,0x10,0x3c,0xe1,0x00,0x32,0xc0,0xc2,0xb0,0x00,0xf8,0x82,0x02,0x0a,0x01,0x15,0x80,0x40,0x40,0xc3,0x40,0x07,0xa0,0x10,0xa8,0x10,0x09,0xc0,0x19,0x01,0xe9,0x82,0x01,0x0c,0x82,0x01,0x74,0x13,0x1d,0x03,0x04,0x24,0x28,0x05,0x04,0x1e,0x76,0x80,0x79,0xc8,0x30,0x50,0x28,0x30,0x14,0x64,0x26,0x23,0xe8,0x78,0x21,0xe0,0xf4,0x85,0x43,0x30,0x12,0x03,0x00,0x83,0xc7,0x41,0x1c,0x3b,0x10,0x3c,0xe2,0x98,0x08,0x80,0xa4,0x61,0x1e,0x0e,0x9c,0x0c,0x1e,0x51,0x00,0x7a,0x95,0x46,0x11,0x90,0xd3,0xd0,0x24,0x80,0xfb,0xe4,0x5f,0xf0,0x92,0x80,0x79,0x61,0x01,0xe3,0xff,0x07,0x9e,0x22,0xcf,0x3e,0xc4,0x03,0xd3,0xf5,0xff,0x07,0xa5,0x12,0xc9,0x2e,0x07,0xa7,0xf3,0x5f,0xff,0x8a,0x93,0xce,0x89,0xe4,0x97,0xe2,0x25,0x40,0xf1,0x8c,0x75,0x3b,0xf1,0xf1,0xf8,0x9b,0xc8,0x1e,0x55,0x0f,0xfc,0x03,0xfd,0x1f,0xf6,0x4f,0xc9,0xe2,0x8f,0x3a,0x27,0x12,0x5f,0xea,0x68,0x0c,0x06,0x35,0xfc,0x2f,0x92,0xbc,0xf0,0x98,0x89,0x7c,0x75,0x8e,0x37,0xd8,0xf1,0x7c,0xa3,0x0c,0xf3,0xc3,0x47,0xf8,0xcb,0x81,0xc2,0x5f,0x62,0xc0,0xf2,0x77,0xa5,0x1b,0xeb,0xc3,0x6c,0x8d,0x12,0x03,0x22,0x07,0x8c,0x30,0x18,0x2d,0x82,0xc3,0xc2,0xaf,0x84,0x42,0x81,0xc8,0xb1,0x01,0xb2,0x4e,0x08,0x08,0x68,0xb0,0x50,0x20,0xdf,0xb4,0x90,0x3a,0x10,0x3d,0x19,0x05,0x86,0x1e,0x8f,0x03,0x03,0xa5,0x83,0xd0,0xa1,0x10,0x30,0x79,0x00,0x0a,0x0a,0x02,0x19,0x84,0x03,0xa5,0xff,0xc0,0x8a,0x88,0x00,0x81,0xe1,0x80,0x12,0x07,0xa5,0x1f,0xc0,0x03,0xde,0x0b,0x80,0x80,0x0a,0x47,0xa3,0x1f,0x80,0x42,0x43,0xf1,0xe1,0x80,0x60,0x3d,0x30,0xf8,0x04,0x48,0x3e,0xf0,0x08,0xf1,0x40,0x7d,0x00,0xf1,0x56,0x08,0xfe,0x20,0x17,0x0f,0x70,0x3c,0x55,0x82,0x00,0x58,0x38,0x0c,0xa7,0x9f,0x90,0x78,0x80,0x1c,0xec,0x5a,0xac,0xff,0xc0,0x1f,0x30,0x1a,0x05,0x57,0xfb,0x5f,0xf8,0x45,0xc3,0xf3,0x80,0xf5,0x7f,0xe7,0xfe,0x00,0x7c,0x87,0xc7,0xab,0xff,0x8f,0x83,0xea,0x05,0x80,0xd5,0x7f,0xe1,0xfe,0x08,0x98,0x7e,0x60,0x15,0x5a,0xac,0x0f,0xe1,0x15,0x0f,0xc9,0x78,0x75,0x50,0x0d,0x84,0x28,0x3f,0x55,0x4b,0xac,0x02,0xb1,0x0d,0x0f,0xd6,0xa0,0xf8,0x3a,0x85,0x29,0xaf,0xde,0xf8,0x04,0x1a,0xe2,0x54,0x83,0xf0,0x00,0x2d,0x70,0xd4,0x43,0xf2,0x00,0x2e,0xb8,0x3a,0x20,0x05,0x93,0xc0,0x5e,0xc1,0xf2,0x79,0x3e,0x04,0x7c,0x1f,0x32,0xa0,0x19,0x7c,0x1e,0x86,0x00,0x6a,0xa8,0x0c,0xbf,0x84,0xe9,0x4e,0x88,0x0c,0x85,0xd5,0x00,}; const uint8_t *_I_Scanning_123x52[] = {_I_Scanning_123x52_0}; -const uint8_t _I_MHz_25x11_0[] = {0x01,0x00,0x21,0x00,0xe1,0xe1,0xa0,0x30,0x0f,0x38,0x0c,0xbf,0xe0,0x34,0xfe,0xc0,0x7b,0x7f,0xe0,0x19,0xf0,0x60,0x1d,0xbc,0x35,0x84,0x36,0x53,0x10,0x19,0x46,0x40,0x64,0x13,0x10,0x19,0x80,}; -const uint8_t *_I_MHz_25x11[] = {_I_MHz_25x11_0}; - const uint8_t _I_Unlock_7x8_0[] = {0x00,0x1C,0x22,0x02,0x4F,0x67,0x73,0x79,0x3C,}; const uint8_t *_I_Unlock_7x8[] = {_I_Unlock_7x8_0}; -const uint8_t _I_iButtonKey_49x44_0[] = {0x01,0x00,0xb4,0x00,0x00,0x24,0xfc,0x0a,0x9c,0x0e,0x00,0x19,0x26,0x18,0x00,0x32,0x43,0x20,0x10,0x10,0x31,0xc0,0x80,0xc9,0x80,0x02,0x08,0x18,0xec,0x00,0x21,0x03,0x1c,0x40,0x1e,0x22,0x15,0xa0,0x08,0x56,0x40,0x06,0x30,0xc0,0x85,0x84,0x86,0x40,0x21,0x84,0x10,0xcc,0x04,0x30,0x40,0x31,0x02,0x88,0x3a,0x20,0x01,0x83,0x0d,0x94,0x06,0x26,0x03,0xf8,0x43,0xc5,0xe9,0x0c,0x11,0x08,0xbc,0xe0,0x64,0x21,0x23,0x09,0x38,0x80,0x22,0x28,0x20,0x58,0x99,0xc4,0x50,0x41,0xe1,0xc0,0x60,0xcc,0xab,0x47,0x21,0xa6,0x02,0x9e,0x06,0x22,0x70,0xf0,0x00,0xcb,0x40,0x03,0x18,0xb0,0x78,0x14,0xe0,0x32,0x58,0x28,0xa5,0x84,0xd0,0x51,0x80,0xc9,0x30,0x06,0xae,0x62,0x84,0x06,0x48,0x64,0x88,0x0c,0x90,0x29,0x08,0x19,0x30,0x31,0x13,0x71,0xb8,0xc4,0xea,0x70,0x6b,0xc5,0x01,0x4a,0x7f,0xc8,0x7c,0x81,0x4a,0x77,0x8a,0xac,0x45,0x4a,0x7f,0x08,0x54,0x39,0x4a,0x7e,0x0e,0xa9,0xf0,0xcb,0xe3,0x7f,0x6e,0x22,0x5c,0x59,0x44,0x00,0x28,0x7a,0xd4,0x40,0x07,0xf0,0x02,0xa0,}; -const uint8_t *_I_iButtonKey_49x44[] = {_I_iButtonKey_49x44_0}; - -const uint8_t _I_DolphinExcited_64x63_0[] = {0x01,0x00,0x36,0x01,0x00,0x25,0x00,0x0f,0xd2,0x00,0x3b,0xe0,0x00,0xeb,0x10,0x0c,0x34,0x40,0x30,0xd0,0x88,0x80,0x1d,0xa1,0x00,0x42,0xfc,0x7f,0xc0,0x63,0x04,0x01,0x0e,0x02,0x0f,0x00,0x00,0x8c,0x08,0x0e,0x37,0x00,0x10,0xc6,0x20,0x10,0x10,0xd9,0x11,0x92,0x1c,0x1a,0x3e,0x00,0x04,0x42,0x02,0x1a,0x20,0xb0,0xce,0x00,0x64,0x07,0x20,0x59,0x16,0x50,0x36,0x45,0x94,0x84,0x78,0x20,0x60,0x75,0x8e,0x43,0x06,0x63,0x3c,0x33,0x94,0x0c,0xd2,0x5c,0x30,0x38,0xe4,0x08,0x43,0x10,0xc0,0x5e,0x06,0x22,0x53,0x1a,0x02,0x08,0x7f,0xd0,0x32,0xc1,0x50,0x21,0x14,0x0e,0x70,0x1c,0x46,0xe2,0x07,0x19,0x06,0x3c,0xdc,0x20,0x91,0xae,0x01,0xcc,0xbe,0x30,0x09,0xfc,0x12,0x41,0xff,0x83,0xcc,0x0a,0xa3,0x1f,0x03,0x99,0xe8,0x7c,0x10,0xf8,0x25,0xa0,0x5e,0x50,0x0f,0x84,0x1e,0x09,0x54,0x03,0x9f,0xf2,0x07,0x02,0xd5,0x11,0xca,0x01,0xfe,0x80,0xc0,0xaa,0x9f,0xf0,0x39,0x5f,0xd0,0x43,0xaa,0x83,0x41,0x92,0xc3,0x1f,0x03,0x8d,0x52,0x02,0x2e,0x25,0xc9,0x6a,0x99,0x46,0xa6,0x2a,0xa0,0x1c,0xaf,0xca,0x62,0x94,0x28,0xcb,0x7e,0x0f,0x15,0x71,0xf8,0x3c,0x22,0x71,0x03,0x8a,0x84,0x67,0x18,0x0f,0xac,0x1c,0x0e,0x38,0x08,0x0c,0x3e,0x01,0xae,0xbd,0x13,0x0c,0x0e,0x35,0x8e,0xa8,0x1c,0xb0,0x1f,0xf8,0x06,0x83,0xf4,0x27,0x38,0x07,0xff,0xff,0x8f,0x03,0xa0,0x4c,0x80,0xed,0x60,0x03,0xb4,0x60,0x0e,0xd0,0x60,0x3a,0x87,0x84,0x0e,0xb7,0xc2,0xfa,0x18,0x05,0x44,0x20,0x73,0xff,0xf7,0xce,0xe4,0x07,0x2d,0x52,0x2c,0x80,0xe7,0x54,0xea,0x81,0xd7,0x50,0x0f,0x7a,0xaa,0x3d,0x41,0xe2,0x07,0x5a,0x80,0x3c,0xa0,0x40,0x72,0xd0,0x6a,0x80,0xa2,0x07,0x3a,0x05,0x54,0x8e,0x20,0x73,0xc0,0x03,0xd8,0x60,0x30,0x40,0x3a,0xc0,0x00,0xee,0xea,0x10,0x3b,0x80,}; -const uint8_t *_I_DolphinExcited_64x63[] = {_I_DolphinExcited_64x63_0}; - -const uint8_t _I_DolphinWait_61x59_0[] = {0x01,0x00,0x56,0x01,0x00,0x17,0xfa,0x1e,0x06,0x4f,0x84,0x06,0xe0,0x07,0x48,0x64,0x03,0x01,0x01,0x03,0x9c,0x0c,0x04,0x30,0x60,0x31,0x70,0x00,0x65,0x08,0x01,0x94,0xc0,0x06,0x51,0x00,0x5b,0x48,0x00,0x65,0x04,0x01,0x95,0x00,0x82,0xd8,0x00,0x19,0x40,0x7e,0x00,0x75,0x1f,0x88,0xe0,0x88,0x02,0x1a,0x1f,0x94,0x14,0x0e,0xbf,0x98,0x58,0x5c,0x42,0x45,0x00,0x9e,0x99,0x87,0x01,0x02,0x11,0x94,0xf2,0x2e,0x03,0x18,0x39,0x28,0x70,0x1f,0xc0,0x3e,0x42,0x00,0xe5,0x80,0xff,0xdf,0xc0,0xe5,0xf8,0x85,0xd8,0x10,0x27,0x40,0xf9,0xc2,0x63,0x88,0x12,0x82,0x6a,0x20,0x50,0x41,0xe9,0x42,0x20,0x95,0x48,0x6e,0x0c,0xfa,0x9a,0xaf,0xf9,0x90,0xe2,0x10,0x2e,0xac,0xe0,0x0e,0x98,0x29,0x52,0x11,0x13,0x23,0x15,0x3e,0x20,0x3c,0x61,0x40,0x52,0xfc,0x4f,0xe2,0x10,0x38,0x68,0x1c,0xa0,0xfc,0x08,0xbe,0x04,0x1e,0x5e,0x01,0xb9,0x03,0xc5,0x60,0x24,0xf2,0x84,0x60,0x63,0x40,0x71,0x27,0x9c,0x0e,0x2b,0x04,0x6c,0xa4,0x06,0x15,0x08,0x6c,0x99,0x8c,0xa6,0x0f,0x81,0x00,0x0c,0x08,0xf0,0x3c,0x05,0x61,0xc0,0x40,0x86,0xd0,0x30,0x78,0x80,0x0c,0xc6,0x2b,0x92,0x00,0x0d,0x51,0xf0,0x2d,0x42,0x0a,0x8e,0xaa,0x34,0x0f,0x4a,0x85,0x55,0x6e,0x20,0xf3,0xd5,0x6a,0x84,0xa2,0x66,0x2a,0x05,0xf7,0xaa,0x07,0x18,0xaf,0xfb,0x7f,0xea,0xc1,0xef,0xc0,0xe3,0xea,0x80,0xf8,0x27,0xf0,0x0a,0xc0,0x1c,0x67,0xa2,0xd1,0xb1,0xc0,0x34,0x00,0x71,0x14,0x8f,0x00,0x98,0x34,0x02,0x69,0xd0,0x37,0x90,0x16,0xf1,0x00,0x06,0xe1,0x84,0x31,0x89,0x14,0xe9,0xdc,0x40,0x38,0xa4,0xc4,0x4c,0x3c,0x1f,0x88,0x8c,0x5b,0xc3,0x01,0xbc,0x40,0x3f,0xf0,0xf6,0x71,0x0c,0x0b,0xe0,0x07,0x3c,0x0a,0xf8,0xa3,0xf0,0x03,0xb8,0xd8,0x80,0xe8,0x87,0x1b,0xa8,0x1c,0x78,0x1f,0xf8,0x0e,0x7e,0x01,0x6a,0x03,0x94,0x0f,0xfd,0xa0,0x80,0x7d,0x49,0x04,0x4d,0x12,0xc0,0xfa,0x83,0x83,0xbe,0x26,0x8d,0x02,0x05,0xd5,0xff,0xff,0xeb,0xe9,0x31,0x90,0x40,0x80,}; -const uint8_t *_I_DolphinWait_61x59[] = {_I_DolphinWait_61x59_0}; - -const uint8_t _I_iButtonDolphinVerySuccess_108x52_0[] = {0x01,0x00,0xc2,0x01,0x00,0x0f,0xe2,0xfe,0x0d,0xb8,0x3e,0x02,0x06,0x0c,0x9f,0x00,0x08,0x61,0x80,0xd9,0x8c,0x00,0x86,0x60,0x0d,0x98,0x30,0x08,0x6a,0x00,0xd9,0x80,0x80,0x87,0x40,0x0c,0x8c,0x00,0x0c,0xa8,0x01,0x12,0x00,0x2d,0x00,0x22,0x70,0x20,0x6b,0xc8,0x02,0x26,0x62,0x88,0x80,0x6c,0xc9,0x24,0x0d,0x9a,0x07,0x17,0xfe,0x1d,0x68,0x40,0x6c,0xe7,0x48,0x04,0x28,0x10,0x34,0xe8,0x10,0xd1,0x11,0xc4,0x01,0xa5,0x04,0x06,0x96,0xa0,0xa6,0x24,0xc2,0x88,0x17,0x88,0x1a,0x7d,0x43,0x78,0x82,0x4a,0x40,0x03,0x20,0xb0,0xff,0x20,0x16,0xa3,0xb2,0x48,0x03,0xe4,0x0d,0x1f,0xfc,0x06,0x3a,0x0d,0x4a,0x00,0x34,0xf8,0x00,0xd1,0x37,0x0f,0x82,0x9e,0x95,0x58,0x17,0x83,0xff,0x81,0x1b,0x0f,0xf1,0xfe,0x71,0xe0,0x69,0x7c,0x3f,0xe0,0x82,0xff,0xcf,0xc0,0x85,0x61,0x80,0x43,0xb0,0x5f,0xa8,0x79,0xdc,0x81,0xa5,0x70,0xc0,0x68,0x3c,0x10,0x1a,0x17,0xd5,0x28,0x42,0xd1,0x8f,0x84,0x46,0x83,0xb0,0x8e,0x40,0x34,0x5f,0xa8,0x38,0x34,0x45,0xa2,0x0d,0x18,0x04,0x9b,0x50,0x03,0x1a,0x14,0x35,0x36,0x5f,0x8f,0xf8,0xb8,0xa4,0x19,0x40,0x18,0xe8,0xa0,0xca,0x22,0xfe,0x7f,0xc4,0x05,0x20,0xa5,0x80,0xc6,0x82,0xcb,0x3f,0xf3,0x44,0xfc,0x12,0x40,0x18,0xe8,0x51,0x82,0x52,0x28,0xfc,0x38,0x0a,0x3e,0x48,0x98,0x6c,0x8f,0x43,0x00,0xe0,0x63,0xe0,0x62,0xe2,0x91,0x90,0x0a,0x02,0x0d,0x2f,0x82,0x50,0x41,0xa3,0x80,0x90,0x41,0x04,0xc3,0x01,0xc0,0x83,0x46,0x71,0x30,0x06,0x95,0x82,0x21,0x02,0x6e,0x88,0x6c,0x43,0x83,0x1f,0x2f,0x88,0x34,0x62,0x00,0xd1,0x15,0x08,0x2c,0x60,0xcc,0x51,0x0f,0x08,0xcc,0x81,0xa2,0x12,0x10,0x68,0xc6,0x3f,0x06,0xc2,0x06,0x8e,0x02,0x16,0x41,0x20,0x10,0xf8,0x01,0x85,0x00,0x19,0x0d,0x82,0x18,0x07,0x20,0x81,0x00,0x0c,0x9c,0x31,0x08,0x42,0x74,0x81,0xab,0x80,0x03,0x0c,0x32,0x11,0x0b,0x06,0xb9,0xc0,0x43,0xa3,0x10,0x8b,0x83,0x5c,0xe0,0x20,0x81,0xc8,0x26,0x49,0x4c,0x40,0x02,0x86,0x0a,0xc5,0x22,0x32,0x50,0x6b,0x93,0x86,0xc0,0x0d,0x19,0x18,0x35,0x8c,0x84,0x79,0x1a,0x84,0x84,0x1a,0xdf,0xc2,0xe0,0x8a,0xc7,0x51,0x22,0x06,0xb5,0x5e,0x3f,0x00,0x77,0x0d,0x60,0x36,0xfa,0xa9,0xd7,0x00,0x08,0x3a,0xc9,0x02,0x48,0xc0,0x05,0x54,0xba,0x98,0x8a,0xa8,0xf1,0x20,0x6a,0x6a,0x3d,0x43,0x61,0x80,0x4a,0x81,0xaf,0x40,0xea,0x8d,0x86,0x01,0x56,0x06,0x93,0x60,0x80,0x05,0xea,0x01,0x94,0xac,0x1b,0x11,0x80,0x19,0x45,0x41,0x44,0x0d,0x58,0x33,0x18,0xa1,0x4f,0xf3,0x06,0x1f,0x01,0x76,0x58,0x00,0xd9,0x83,0x52,0x7c,0x11,0x38,0x51,0x40,0x80,}; -const uint8_t *_I_iButtonDolphinVerySuccess_108x52[] = {_I_iButtonDolphinVerySuccess_108x52_0}; - -const uint8_t _I_DolphinMafia_115x62_0[] = {0x01,0x00,0x21,0x02,0x00,0x1e,0x02,0x06,0x0e,0xcb,0x04,0x10,0x1d,0x91,0x88,0x40,0x3b,0x20,0xc0,0xec,0xc0,0x40,0x62,0x03,0xac,0x80,0x03,0xb2,0x31,0x00,0x90,0x03,0xae,0x5e,0x0e,0xcf,0xc4,0x56,0x01,0x40,0x07,0x56,0xbe,0x14,0x0e,0x2f,0xf1,0x5e,0x2a,0xa1,0xd1,0xc0,0x7c,0x3f,0xf0,0x70,0x73,0x70,0x35,0x41,0xd1,0xc0,0x7f,0xff,0xf0,0xf0,0x73,0x50,0x03,0xa4,0x0d,0x10,0x74,0x07,0x46,0x55,0xe0,0x07,0x10,0xb1,0xc3,0xa3,0x55,0xfe,0x03,0x88,0x94,0xe1,0xd1,0xd5,0x03,0x4a,0x3e,0x59,0x9e,0xaf,0xfe,0xff,0x05,0x60,0x4e,0xab,0xf5,0xff,0x95,0xb4,0xa4,0x3a,0x3f,0xd0,0xe0,0xfa,0x20,0x20,0xf8,0xd5,0xff,0xb5,0xf0,0x0f,0x88,0x3a,0x6a,0xbf,0xf8,0xaf,0x82,0x6f,0x03,0x07,0x47,0xaf,0xff,0x0a,0xfe,0x5f,0xc1,0xd3,0xf6,0xbf,0xe0,0x7f,0xfe,0xf0,0x73,0x41,0x00,0x43,0xfa,0xd7,0xf8,0x27,0xfe,0xe0,0x73,0x40,0x80,0x43,0xfe,0xab,0xfe,0x21,0xfc,0xe5,0x9b,0x05,0x48,0xea,0x3f,0xc8,0xfa,0xc4,0x66,0x07,0x44,0x0e,0x8f,0x00,0xb0,0x2b,0x31,0x07,0x0f,0x00,0x1c,0x72,0x00,0x70,0xf8,0x37,0xe5,0x81,0xff,0x89,0x08,0xf2,0x71,0x80,0x20,0xfe,0x2b,0xf0,0x5f,0xc0,0x38,0xc8,0xa5,0x60,0xc3,0x00,0xc7,0xf9,0xaf,0x81,0x2d,0x04,0x34,0x40,0xe1,0x98,0x47,0x68,0x04,0x92,0xab,0xc0,0x7e,0xb7,0xf7,0x39,0x03,0x85,0x8e,0x24,0xf1,0xc0,0x7f,0xf5,0x78,0x0f,0x53,0xb4,0xbc,0x1f,0xb8,0x1a,0x0c,0x61,0xc5,0x82,0xab,0xc0,0x3e,0xa3,0xa2,0xfc,0x07,0x46,0x09,0x60,0x19,0x8f,0x80,0xec,0x38,0x08,0x52,0x6c,0xb8,0xdc,0x28,0x7c,0x10,0x2a,0x5f,0x0f,0xfc,0x5a,0x01,0x05,0x1a,0x8e,0x02,0x02,0x1d,0x1f,0x81,0xa8,0xbe,0x13,0xf8,0x52,0x2c,0x8c,0x62,0x77,0x42,0x11,0x40,0xe0,0xca,0x93,0x8e,0x03,0x8a,0x30,0x10,0x48,0x54,0x03,0x04,0xbb,0x2c,0x00,0x0c,0x64,0x80,0xe4,0x0e,0x88,0x38,0x7c,0x10,0x04,0x09,0x48,0x83,0xac,0x1b,0x18,0xf3,0x44,0xc1,0xca,0x1d,0x15,0x40,0x8e,0x05,0x02,0x20,0xe6,0x24,0x12,0x8c,0x8b,0x05,0x21,0x07,0x24,0x14,0x08,0x73,0x80,0x19,0x78,0x43,0xb2,0xff,0x15,0x30,0xc4,0x01,0x26,0x8f,0x14,0x61,0xa9,0x8a,0x09,0x10,0x02,0x12,0x1c,0x80,0x84,0xaf,0x10,0x71,0xaa,0xc4,0x00,0x3b,0x04,0xea,0x24,0x48,0x1c,0xbd,0x8f,0xf8,0x00,0x67,0xf0,0x09,0x40,0x20,0x61,0x00,0xe4,0xf6,0x07,0x4b,0xc1,0x1f,0x07,0x14,0x40,0x1c,0x9d,0x66,0x79,0x24,0xc6,0xa0,0x0e,0x32,0x51,0xfa,0xce,0xe7,0x50,0x07,0x1c,0x80,0x30,0x58,0x0e,0xa2,0xcc,0xa0,0x19,0x00,0x71,0x42,0x13,0x27,0x40,0xf5,0x45,0x41,0xc5,0x08,0xb0,0x80,0xc6,0x18,0xf2,0x28,0x04,0x83,0xe8,0x58,0x10,0x30,0xc2,0x2c,0x40,0x91,0x89,0x3c,0x88,0x62,0x21,0xd2,0xff,0x03,0x87,0xc8,0x12,0x19,0x08,0x39,0x3e,0x83,0xb2,0x4a,0x0e,0xa2,0x0d,0xc0,0xe0,0x50,0x06,0xa7,0xe8,0x2c,0x94,0xc2,0x09,0x50,0x8c,0xce,0x20,0x34,0x70,0x71,0x41,0x3e,0x85,0xe2,0xe0,0x41,0x38,0x1e,0x28,0x3c,0x19,0xc8,0x70,0x4f,0xc1,0xdc,0xe0,0x74,0x01,0xd8,0xc6,0x24,0x00,0x82,0x81,0x7c,0x12,0xa6,0x7e,0x10,0x28,0xd8,0x22,0x00,0xe3,0xfc,0x34,0x53,0x00,0x23,0x1c,0x04,0x44,0x0e,0x50,0x10,0xeb,0x17,0xca,0x1c,0x07,0x20,}; -const uint8_t *_I_DolphinMafia_115x62[] = {_I_DolphinMafia_115x62_0}; +const uint8_t _I_Lock_7x8_0[] = {0x00,0x1C,0x22,0x22,0x7F,0x7F,0x77,0x7F,0x3E,}; +const uint8_t *_I_Lock_7x8[] = {_I_Lock_7x8_0}; const uint8_t _I_DolphinNice_96x59_0[] = {0x01,0x00,0x8a,0x01,0x00,0x37,0xfa,0x3e,0x0a,0x8f,0x04,0x04,0x02,0x20,0xb7,0x8c,0x00,0x86,0x1c,0x0b,0x78,0x20,0x08,0x66,0x00,0xb7,0x81,0x00,0x86,0x80,0x0b,0x71,0x61,0x60,0x01,0x4c,0x07,0x41,0xe3,0x07,0xd0,0x4e,0x40,0xb8,0x1f,0x90,0x00,0xe4,0x00,0xba,0x88,0x01,0x0e,0x10,0x0a,0x48,0xf9,0x6c,0xbe,0x10,0x70,0x82,0x78,0x3c,0x15,0x82,0x18,0xc2,0x21,0x00,0xb4,0x02,0x0e,0xbc,0x86,0x30,0x48,0x80,0xd1,0x05,0x03,0x78,0x82,0xc0,0x3e,0x52,0x32,0x63,0x70,0x20,0x70,0x09,0xd4,0x98,0xb0,0xf0,0x60,0x58,0xc9,0xce,0x12,0x0b,0xbf,0xd4,0x9d,0x28,0x9e,0x24,0xa9,0x82,0xda,0x24,0x2d,0x10,0x00,0xfd,0x2a,0x60,0xb4,0x85,0x4e,0x00,0x85,0xf8,0xd4,0x82,0xd2,0x09,0xc0,0x12,0x14,0x12,0xad,0x81,0x29,0xa8,0x90,0xf5,0x01,0x75,0x80,0x46,0x00,0xa5,0x50,0x0b,0x90,0x1c,0x41,0x63,0x60,0x05,0x96,0xc0,0x2e,0x52,0x44,0x79,0x60,0x06,0x05,0x50,0x05,0x94,0x89,0x88,0x63,0x02,0x98,0x02,0xc7,0xc1,0x21,0x6a,0x98,0xa0,0x62,0x11,0x00,0x58,0xc6,0x02,0xe2,0xb8,0x21,0x80,0xc3,0x05,0x02,0x38,0x11,0x78,0xa5,0x0b,0x01,0x81,0x5a,0x88,0x2c,0x60,0x40,0xb1,0xc0,0x27,0x0a,0xfc,0x0f,0x28,0x04,0x06,0x50,0x05,0x18,0xa9,0x94,0xc1,0x67,0x48,0x02,0x8c,0xb8,0x16,0xf8,0x80,0x28,0xd6,0x16,0x86,0x0b,0x38,0x40,0xd4,0x76,0x0c,0xd4,0x05,0x94,0x10,0x9a,0x34,0x01,0x82,0x1f,0x06,0x05,0x02,0x98,0x01,0x47,0x54,0x18,0x35,0xc8,0xff,0x20,0x3c,0x00,0x58,0xd5,0x6a,0xa0,0xb3,0x81,0xa3,0x0a,0x0f,0x80,0xd5,0xea,0x81,0x67,0x07,0x46,0x14,0xe3,0xe1,0x55,0x18,0x18,0x2c,0x51,0x85,0xc0,0xef,0x85,0x8c,0x0c,0x30,0xf4,0x61,0x40,0x2d,0x46,0xb4,0x05,0x8b,0x04,0xb0,0x15,0x40,0x5a,0x50,0x23,0xe6,0x01,0x02,0x8c,0xa8,0x2e,0xb1,0xe5,0x40,0x81,0x46,0x6a,0x17,0x59,0xeb,0xe4,0xa8,0x11,0xa0,0x5a,0x68,0x27,0x4e,0xd3,0x59,0xad,0x82,0xfa,0xed,0x2a,0x04,0x28,0x2e,0xb7,0xa7,0x69,0xc3,0x42,0xeb,0xf5,0x1f,0x09,0x4c,0x42,0xed,0xea,0x01,0x8c,0x06,0x41,0x05,0x0b,0xbc,0x02,0x0d,0x80,0x83,0x05,0xe2,0x11,0x40,0x0b,0xb7,0x14,0x06,0x33,0x0c,0x83,0x89,0x02,0xe3,0xca,0x3d,0x95,0x01,0xe2,0x21,0x74,0xc2,0x81,0x0b,0x0e,0x17,0x6c,0x10,0x10,0xaf,0x09,0xe2,0x0b,0xbb,0xd0,0x42,0xeb,0x02,}; const uint8_t *_I_DolphinNice_96x59[] = {_I_DolphinNice_96x59_0}; @@ -470,70 +467,89 @@ const uint8_t *_I_DolphinNice_96x59[] = {_I_DolphinNice_96x59_0}; const uint8_t _I_iButtonDolphinSuccess_109x60_0[] = {0x01,0x00,0xac,0x01,0x00,0x17,0xfe,0x1e,0x0c,0xaf,0x04,0x02,0xe0,0x0d,0xa8,0xf4,0x03,0x01,0x03,0x06,0x46,0x02,0x02,0x03,0x18,0xe0,0x36,0x2c,0x00,0x36,0x00,0x2c,0x40,0x3e,0x60,0xd8,0x84,0x01,0x0c,0x5a,0x40,0x05,0x82,0x01,0x0e,0x04,0x0d,0x70,0x42,0x04,0x90,0x49,0x02,0xe4,0x20,0x41,0x28,0xc0,0x07,0x40,0x06,0xf8,0x00,0xa4,0x00,0xd6,0x03,0xa8,0x37,0x44,0x2a,0x31,0x74,0xd3,0x83,0x57,0x80,0x0d,0xc7,0x18,0xa9,0xa8,0x36,0x2a,0x86,0x06,0x8d,0xfc,0x36,0x60,0xd7,0xc0,0x3b,0x8c,0x36,0xf0,0x4a,0x05,0xf9,0x6e,0x5e,0x06,0x23,0x41,0x24,0x1f,0xf6,0x01,0x74,0x01,0xb1,0xe3,0x82,0x81,0x47,0x40,0x0d,0x7c,0x87,0x8e,0x12,0x05,0x1a,0x84,0x0d,0xb6,0xa0,0xd2,0x85,0x86,0xc8,0x1a,0x50,0x40,0x69,0x40,0xb2,0x1f,0xf0,0x69,0x50,0x01,0xa5,0x08,0xfc,0x03,0x5f,0x60,0x0d,0x28,0x84,0x1a,0x07,0x18,0x06,0xaf,0x00,0x1a,0x3c,0x03,0xb8,0xc3,0x20,0xd0,0x28,0x87,0xfc,0x8a,0x50,0x08,0x78,0x08,0x70,0x77,0x0c,0x44,0x06,0x05,0x30,0xff,0x18,0x4a,0x01,0x30,0x01,0x0d,0x33,0x19,0x11,0x1b,0x8c,0xa2,0xf8,0x7d,0x27,0x71,0xd0,0x20,0x51,0x20,0x68,0xd5,0x00,0x42,0x0d,0x2c,0x00,0x08,0x64,0x10,0x19,0x20,0x28,0x75,0x07,0x53,0x3d,0x18,0x35,0x2a,0x9f,0xf4,0x9a,0x41,0x90,0x23,0x00,0x94,0x43,0xe0,0x5e,0xae,0x03,0x9d,0xb4,0xe0,0xd1,0x0d,0x8c,0xd0,0x52,0xb1,0x00,0xd9,0x83,0x46,0x34,0x45,0x41,0xa8,0x9f,0x86,0x01,0x14,0x05,0x08,0x08,0x81,0xa6,0x62,0x10,0x68,0xe5,0x20,0x70,0x41,0x80,0x80,0x10,0xc4,0x34,0x48,0x04,0x2a,0x38,0x0d,0x99,0x16,0x02,0x1a,0xd5,0x10,0x6c,0x5e,0x2e,0x0b,0xa1,0x4b,0x0a,0x60,0xc1,0xa7,0x84,0xfc,0x58,0x01,0xb5,0x02,0x82,0xb4,0xc4,0x16,0x22,0xa5,0x06,0x96,0x19,0x20,0x20,0xd7,0x30,0x8c,0x0f,0x08,0x05,0x10,0x68,0xa1,0x44,0x1a,0x98,0x08,0x14,0x11,0x28,0x21,0x91,0x1d,0x8f,0x83,0xfe,0x07,0x1b,0x00,0x34,0x61,0x00,0xd3,0x1d,0x8c,0x7a,0x01,0x7e,0x80,0x56,0x30,0x06,0xb1,0x4a,0x08,0xd4,0xbf,0xc1,0x31,0xc0,0x7f,0xe8,0xf0,0x08,0x3c,0x40,0x1a,0x80,0x04,0x5a,0x8c,0x10,0x80,0x40,0xd7,0x05,0x08,0x36,0xc0,0xe2,0x0d,0xb8,0x30,0x34,0x45,0x82,0x0d,0x72,0x49,0x03,0x5a,0x41,0x55,0xf8,0x7f,0xff,0xe8,0x72,0x06,0xae,0x03,0xf4,0x0c,0x1d,0xf8,0x18,0x60,0x40,0xd2,0x4b,0x9f,0xd0,0x1a,0x35,0x71,0x48,0xc0,0x95,0x42,0x0d,0x4d,0x50,0x70,0x75,0x40,0xd1,0x80,0x83,0x5a,0xa1,0x55,0x00,0x0c,0x05,0xa4,0x20,0xd2,}; const uint8_t *_I_iButtonDolphinSuccess_109x60[] = {_I_iButtonDolphinSuccess_109x60_0}; +const uint8_t _I_DolphinExcited_64x63_0[] = {0x01,0x00,0x36,0x01,0x00,0x25,0x00,0x0f,0xd2,0x00,0x3b,0xe0,0x00,0xeb,0x10,0x0c,0x34,0x40,0x30,0xd0,0x88,0x80,0x1d,0xa1,0x00,0x42,0xfc,0x7f,0xc0,0x63,0x04,0x01,0x0e,0x02,0x0f,0x00,0x00,0x8c,0x08,0x0e,0x37,0x00,0x10,0xc6,0x20,0x10,0x10,0xd9,0x11,0x92,0x1c,0x1a,0x3e,0x00,0x04,0x42,0x02,0x1a,0x20,0xb0,0xce,0x00,0x64,0x07,0x20,0x59,0x16,0x50,0x36,0x45,0x94,0x84,0x78,0x20,0x60,0x75,0x8e,0x43,0x06,0x63,0x3c,0x33,0x94,0x0c,0xd2,0x5c,0x30,0x38,0xe4,0x08,0x43,0x10,0xc0,0x5e,0x06,0x22,0x53,0x1a,0x02,0x08,0x7f,0xd0,0x32,0xc1,0x50,0x21,0x14,0x0e,0x70,0x1c,0x46,0xe2,0x07,0x19,0x06,0x3c,0xdc,0x20,0x91,0xae,0x01,0xcc,0xbe,0x30,0x09,0xfc,0x12,0x41,0xff,0x83,0xcc,0x0a,0xa3,0x1f,0x03,0x99,0xe8,0x7c,0x10,0xf8,0x25,0xa0,0x5e,0x50,0x0f,0x84,0x1e,0x09,0x54,0x03,0x9f,0xf2,0x07,0x02,0xd5,0x11,0xca,0x01,0xfe,0x80,0xc0,0xaa,0x9f,0xf0,0x39,0x5f,0xd0,0x43,0xaa,0x83,0x41,0x92,0xc3,0x1f,0x03,0x8d,0x52,0x02,0x2e,0x25,0xc9,0x6a,0x99,0x46,0xa6,0x2a,0xa0,0x1c,0xaf,0xca,0x62,0x94,0x28,0xcb,0x7e,0x0f,0x15,0x71,0xf8,0x3c,0x22,0x71,0x03,0x8a,0x84,0x67,0x18,0x0f,0xac,0x1c,0x0e,0x38,0x08,0x0c,0x3e,0x01,0xae,0xbd,0x13,0x0c,0x0e,0x35,0x8e,0xa8,0x1c,0xb0,0x1f,0xf8,0x06,0x83,0xf4,0x27,0x38,0x07,0xff,0xff,0x8f,0x03,0xa0,0x4c,0x80,0xed,0x60,0x03,0xb4,0x60,0x0e,0xd0,0x60,0x3a,0x87,0x84,0x0e,0xb7,0xc2,0xfa,0x18,0x05,0x44,0x20,0x73,0xff,0xf7,0xce,0xe4,0x07,0x2d,0x52,0x2c,0x80,0xe7,0x54,0xea,0x81,0xd7,0x50,0x0f,0x7a,0xaa,0x3d,0x41,0xe2,0x07,0x5a,0x80,0x3c,0xa0,0x40,0x72,0xd0,0x6a,0x80,0xa2,0x07,0x3a,0x05,0x54,0x8e,0x20,0x73,0xc0,0x03,0xd8,0x60,0x30,0x40,0x3a,0xc0,0x00,0xee,0xea,0x10,0x3b,0x80,}; +const uint8_t *_I_DolphinExcited_64x63[] = {_I_DolphinExcited_64x63_0}; + +const uint8_t _I_iButtonKey_49x44_0[] = {0x01,0x00,0xb4,0x00,0x00,0x24,0xfc,0x0a,0x9c,0x0e,0x00,0x19,0x26,0x18,0x00,0x32,0x43,0x20,0x10,0x10,0x31,0xc0,0x80,0xc9,0x80,0x02,0x08,0x18,0xec,0x00,0x21,0x03,0x1c,0x40,0x1e,0x22,0x15,0xa0,0x08,0x56,0x40,0x06,0x30,0xc0,0x85,0x84,0x86,0x40,0x21,0x84,0x10,0xcc,0x04,0x30,0x40,0x31,0x02,0x88,0x3a,0x20,0x01,0x83,0x0d,0x94,0x06,0x26,0x03,0xf8,0x43,0xc5,0xe9,0x0c,0x11,0x08,0xbc,0xe0,0x64,0x21,0x23,0x09,0x38,0x80,0x22,0x28,0x20,0x58,0x99,0xc4,0x50,0x41,0xe1,0xc0,0x60,0xcc,0xab,0x47,0x21,0xa6,0x02,0x9e,0x06,0x22,0x70,0xf0,0x00,0xcb,0x40,0x03,0x18,0xb0,0x78,0x14,0xe0,0x32,0x58,0x28,0xa5,0x84,0xd0,0x51,0x80,0xc9,0x30,0x06,0xae,0x62,0x84,0x06,0x48,0x64,0x88,0x0c,0x90,0x29,0x08,0x19,0x30,0x31,0x13,0x71,0xb8,0xc4,0xea,0x70,0x6b,0xc5,0x01,0x4a,0x7f,0xc8,0x7c,0x81,0x4a,0x77,0x8a,0xac,0x45,0x4a,0x7f,0x08,0x54,0x39,0x4a,0x7e,0x0e,0xa9,0xf0,0xcb,0xe3,0x7f,0x6e,0x22,0x5c,0x59,0x44,0x00,0x28,0x7a,0xd4,0x40,0x07,0xf0,0x02,0xa0,}; +const uint8_t *_I_iButtonKey_49x44[] = {_I_iButtonKey_49x44_0}; + +const uint8_t _I_iButtonDolphinVerySuccess_108x52_0[] = {0x01,0x00,0xc2,0x01,0x00,0x0f,0xe2,0xfe,0x0d,0xb8,0x3e,0x02,0x06,0x0c,0x9f,0x00,0x08,0x61,0x80,0xd9,0x8c,0x00,0x86,0x60,0x0d,0x98,0x30,0x08,0x6a,0x00,0xd9,0x80,0x80,0x87,0x40,0x0c,0x8c,0x00,0x0c,0xa8,0x01,0x12,0x00,0x2d,0x00,0x22,0x70,0x20,0x6b,0xc8,0x02,0x26,0x62,0x88,0x80,0x6c,0xc9,0x24,0x0d,0x9a,0x07,0x17,0xfe,0x1d,0x68,0x40,0x6c,0xe7,0x48,0x04,0x28,0x10,0x34,0xe8,0x10,0xd1,0x11,0xc4,0x01,0xa5,0x04,0x06,0x96,0xa0,0xa6,0x24,0xc2,0x88,0x17,0x88,0x1a,0x7d,0x43,0x78,0x82,0x4a,0x40,0x03,0x20,0xb0,0xff,0x20,0x16,0xa3,0xb2,0x48,0x03,0xe4,0x0d,0x1f,0xfc,0x06,0x3a,0x0d,0x4a,0x00,0x34,0xf8,0x00,0xd1,0x37,0x0f,0x82,0x9e,0x95,0x58,0x17,0x83,0xff,0x81,0x1b,0x0f,0xf1,0xfe,0x71,0xe0,0x69,0x7c,0x3f,0xe0,0x82,0xff,0xcf,0xc0,0x85,0x61,0x80,0x43,0xb0,0x5f,0xa8,0x79,0xdc,0x81,0xa5,0x70,0xc0,0x68,0x3c,0x10,0x1a,0x17,0xd5,0x28,0x42,0xd1,0x8f,0x84,0x46,0x83,0xb0,0x8e,0x40,0x34,0x5f,0xa8,0x38,0x34,0x45,0xa2,0x0d,0x18,0x04,0x9b,0x50,0x03,0x1a,0x14,0x35,0x36,0x5f,0x8f,0xf8,0xb8,0xa4,0x19,0x40,0x18,0xe8,0xa0,0xca,0x22,0xfe,0x7f,0xc4,0x05,0x20,0xa5,0x80,0xc6,0x82,0xcb,0x3f,0xf3,0x44,0xfc,0x12,0x40,0x18,0xe8,0x51,0x82,0x52,0x28,0xfc,0x38,0x0a,0x3e,0x48,0x98,0x6c,0x8f,0x43,0x00,0xe0,0x63,0xe0,0x62,0xe2,0x91,0x90,0x0a,0x02,0x0d,0x2f,0x82,0x50,0x41,0xa3,0x80,0x90,0x41,0x04,0xc3,0x01,0xc0,0x83,0x46,0x71,0x30,0x06,0x95,0x82,0x21,0x02,0x6e,0x88,0x6c,0x43,0x83,0x1f,0x2f,0x88,0x34,0x62,0x00,0xd1,0x15,0x08,0x2c,0x60,0xcc,0x51,0x0f,0x08,0xcc,0x81,0xa2,0x12,0x10,0x68,0xc6,0x3f,0x06,0xc2,0x06,0x8e,0x02,0x16,0x41,0x20,0x10,0xf8,0x01,0x85,0x00,0x19,0x0d,0x82,0x18,0x07,0x20,0x81,0x00,0x0c,0x9c,0x31,0x08,0x42,0x74,0x81,0xab,0x80,0x03,0x0c,0x32,0x11,0x0b,0x06,0xb9,0xc0,0x43,0xa3,0x10,0x8b,0x83,0x5c,0xe0,0x20,0x81,0xc8,0x26,0x49,0x4c,0x40,0x02,0x86,0x0a,0xc5,0x22,0x32,0x50,0x6b,0x93,0x86,0xc0,0x0d,0x19,0x18,0x35,0x8c,0x84,0x79,0x1a,0x84,0x84,0x1a,0xdf,0xc2,0xe0,0x8a,0xc7,0x51,0x22,0x06,0xb5,0x5e,0x3f,0x00,0x77,0x0d,0x60,0x36,0xfa,0xa9,0xd7,0x00,0x08,0x3a,0xc9,0x02,0x48,0xc0,0x05,0x54,0xba,0x98,0x8a,0xa8,0xf1,0x20,0x6a,0x6a,0x3d,0x43,0x61,0x80,0x4a,0x81,0xaf,0x40,0xea,0x8d,0x86,0x01,0x56,0x06,0x93,0x60,0x80,0x05,0xea,0x01,0x94,0xac,0x1b,0x11,0x80,0x19,0x45,0x41,0x44,0x0d,0x58,0x33,0x18,0xa1,0x4f,0xf3,0x06,0x1f,0x01,0x76,0x58,0x00,0xd9,0x83,0x52,0x7c,0x11,0x38,0x51,0x40,0x80,}; +const uint8_t *_I_iButtonDolphinVerySuccess_108x52[] = {_I_iButtonDolphinVerySuccess_108x52_0}; + +const uint8_t _I_DolphinWait_61x59_0[] = {0x01,0x00,0x56,0x01,0x00,0x17,0xfa,0x1e,0x06,0x4f,0x84,0x06,0xe0,0x07,0x48,0x64,0x03,0x01,0x01,0x03,0x9c,0x0c,0x04,0x30,0x60,0x31,0x70,0x00,0x65,0x08,0x01,0x94,0xc0,0x06,0x51,0x00,0x5b,0x48,0x00,0x65,0x04,0x01,0x95,0x00,0x82,0xd8,0x00,0x19,0x40,0x7e,0x00,0x75,0x1f,0x88,0xe0,0x88,0x02,0x1a,0x1f,0x94,0x14,0x0e,0xbf,0x98,0x58,0x5c,0x42,0x45,0x00,0x9e,0x99,0x87,0x01,0x02,0x11,0x94,0xf2,0x2e,0x03,0x18,0x39,0x28,0x70,0x1f,0xc0,0x3e,0x42,0x00,0xe5,0x80,0xff,0xdf,0xc0,0xe5,0xf8,0x85,0xd8,0x10,0x27,0x40,0xf9,0xc2,0x63,0x88,0x12,0x82,0x6a,0x20,0x50,0x41,0xe9,0x42,0x20,0x95,0x48,0x6e,0x0c,0xfa,0x9a,0xaf,0xf9,0x90,0xe2,0x10,0x2e,0xac,0xe0,0x0e,0x98,0x29,0x52,0x11,0x13,0x23,0x15,0x3e,0x20,0x3c,0x61,0x40,0x52,0xfc,0x4f,0xe2,0x10,0x38,0x68,0x1c,0xa0,0xfc,0x08,0xbe,0x04,0x1e,0x5e,0x01,0xb9,0x03,0xc5,0x60,0x24,0xf2,0x84,0x60,0x63,0x40,0x71,0x27,0x9c,0x0e,0x2b,0x04,0x6c,0xa4,0x06,0x15,0x08,0x6c,0x99,0x8c,0xa6,0x0f,0x81,0x00,0x0c,0x08,0xf0,0x3c,0x05,0x61,0xc0,0x40,0x86,0xd0,0x30,0x78,0x80,0x0c,0xc6,0x2b,0x92,0x00,0x0d,0x51,0xf0,0x2d,0x42,0x0a,0x8e,0xaa,0x34,0x0f,0x4a,0x85,0x55,0x6e,0x20,0xf3,0xd5,0x6a,0x84,0xa2,0x66,0x2a,0x05,0xf7,0xaa,0x07,0x18,0xaf,0xfb,0x7f,0xea,0xc1,0xef,0xc0,0xe3,0xea,0x80,0xf8,0x27,0xf0,0x0a,0xc0,0x1c,0x67,0xa2,0xd1,0xb1,0xc0,0x34,0x00,0x71,0x14,0x8f,0x00,0x98,0x34,0x02,0x69,0xd0,0x37,0x90,0x16,0xf1,0x00,0x06,0xe1,0x84,0x31,0x89,0x14,0xe9,0xdc,0x40,0x38,0xa4,0xc4,0x4c,0x3c,0x1f,0x88,0x8c,0x5b,0xc3,0x01,0xbc,0x40,0x3f,0xf0,0xf6,0x71,0x0c,0x0b,0xe0,0x07,0x3c,0x0a,0xf8,0xa3,0xf0,0x03,0xb8,0xd8,0x80,0xe8,0x87,0x1b,0xa8,0x1c,0x78,0x1f,0xf8,0x0e,0x7e,0x01,0x6a,0x03,0x94,0x0f,0xfd,0xa0,0x80,0x7d,0x49,0x04,0x4d,0x12,0xc0,0xfa,0x83,0x83,0xbe,0x26,0x8d,0x02,0x05,0xd5,0xff,0xff,0xeb,0xe9,0x31,0x90,0x40,0x80,}; +const uint8_t *_I_DolphinWait_61x59[] = {_I_DolphinWait_61x59_0}; + +const uint8_t _I_DolphinMafia_115x62_0[] = {0x01,0x00,0x21,0x02,0x00,0x1e,0x02,0x06,0x0e,0xcb,0x04,0x10,0x1d,0x91,0x88,0x40,0x3b,0x20,0xc0,0xec,0xc0,0x40,0x62,0x03,0xac,0x80,0x03,0xb2,0x31,0x00,0x90,0x03,0xae,0x5e,0x0e,0xcf,0xc4,0x56,0x01,0x40,0x07,0x56,0xbe,0x14,0x0e,0x2f,0xf1,0x5e,0x2a,0xa1,0xd1,0xc0,0x7c,0x3f,0xf0,0x70,0x73,0x70,0x35,0x41,0xd1,0xc0,0x7f,0xff,0xf0,0xf0,0x73,0x50,0x03,0xa4,0x0d,0x10,0x74,0x07,0x46,0x55,0xe0,0x07,0x10,0xb1,0xc3,0xa3,0x55,0xfe,0x03,0x88,0x94,0xe1,0xd1,0xd5,0x03,0x4a,0x3e,0x59,0x9e,0xaf,0xfe,0xff,0x05,0x60,0x4e,0xab,0xf5,0xff,0x95,0xb4,0xa4,0x3a,0x3f,0xd0,0xe0,0xfa,0x20,0x20,0xf8,0xd5,0xff,0xb5,0xf0,0x0f,0x88,0x3a,0x6a,0xbf,0xf8,0xaf,0x82,0x6f,0x03,0x07,0x47,0xaf,0xff,0x0a,0xfe,0x5f,0xc1,0xd3,0xf6,0xbf,0xe0,0x7f,0xfe,0xf0,0x73,0x41,0x00,0x43,0xfa,0xd7,0xf8,0x27,0xfe,0xe0,0x73,0x40,0x80,0x43,0xfe,0xab,0xfe,0x21,0xfc,0xe5,0x9b,0x05,0x48,0xea,0x3f,0xc8,0xfa,0xc4,0x66,0x07,0x44,0x0e,0x8f,0x00,0xb0,0x2b,0x31,0x07,0x0f,0x00,0x1c,0x72,0x00,0x70,0xf8,0x37,0xe5,0x81,0xff,0x89,0x08,0xf2,0x71,0x80,0x20,0xfe,0x2b,0xf0,0x5f,0xc0,0x38,0xc8,0xa5,0x60,0xc3,0x00,0xc7,0xf9,0xaf,0x81,0x2d,0x04,0x34,0x40,0xe1,0x98,0x47,0x68,0x04,0x92,0xab,0xc0,0x7e,0xb7,0xf7,0x39,0x03,0x85,0x8e,0x24,0xf1,0xc0,0x7f,0xf5,0x78,0x0f,0x53,0xb4,0xbc,0x1f,0xb8,0x1a,0x0c,0x61,0xc5,0x82,0xab,0xc0,0x3e,0xa3,0xa2,0xfc,0x07,0x46,0x09,0x60,0x19,0x8f,0x80,0xec,0x38,0x08,0x52,0x6c,0xb8,0xdc,0x28,0x7c,0x10,0x2a,0x5f,0x0f,0xfc,0x5a,0x01,0x05,0x1a,0x8e,0x02,0x02,0x1d,0x1f,0x81,0xa8,0xbe,0x13,0xf8,0x52,0x2c,0x8c,0x62,0x77,0x42,0x11,0x40,0xe0,0xca,0x93,0x8e,0x03,0x8a,0x30,0x10,0x48,0x54,0x03,0x04,0xbb,0x2c,0x00,0x0c,0x64,0x80,0xe4,0x0e,0x88,0x38,0x7c,0x10,0x04,0x09,0x48,0x83,0xac,0x1b,0x18,0xf3,0x44,0xc1,0xca,0x1d,0x15,0x40,0x8e,0x05,0x02,0x20,0xe6,0x24,0x12,0x8c,0x8b,0x05,0x21,0x07,0x24,0x14,0x08,0x73,0x80,0x19,0x78,0x43,0xb2,0xff,0x15,0x30,0xc4,0x01,0x26,0x8f,0x14,0x61,0xa9,0x8a,0x09,0x10,0x02,0x12,0x1c,0x80,0x84,0xaf,0x10,0x71,0xaa,0xc4,0x00,0x3b,0x04,0xea,0x24,0x48,0x1c,0xbd,0x8f,0xf8,0x00,0x67,0xf0,0x09,0x40,0x20,0x61,0x00,0xe4,0xf6,0x07,0x4b,0xc1,0x1f,0x07,0x14,0x40,0x1c,0x9d,0x66,0x79,0x24,0xc6,0xa0,0x0e,0x32,0x51,0xfa,0xce,0xe7,0x50,0x07,0x1c,0x80,0x30,0x58,0x0e,0xa2,0xcc,0xa0,0x19,0x00,0x71,0x42,0x13,0x27,0x40,0xf5,0x45,0x41,0xc5,0x08,0xb0,0x80,0xc6,0x18,0xf2,0x28,0x04,0x83,0xe8,0x58,0x10,0x30,0xc2,0x2c,0x40,0x91,0x89,0x3c,0x88,0x62,0x21,0xd2,0xff,0x03,0x87,0xc8,0x12,0x19,0x08,0x39,0x3e,0x83,0xb2,0x4a,0x0e,0xa2,0x0d,0xc0,0xe0,0x50,0x06,0xa7,0xe8,0x2c,0x94,0xc2,0x09,0x50,0x8c,0xce,0x20,0x34,0x70,0x71,0x41,0x3e,0x85,0xe2,0xe0,0x41,0x38,0x1e,0x28,0x3c,0x19,0xc8,0x70,0x4f,0xc1,0xdc,0xe0,0x74,0x01,0xd8,0xc6,0x24,0x00,0x82,0x81,0x7c,0x12,0xa6,0x7e,0x10,0x28,0xd8,0x22,0x00,0xe3,0xfc,0x34,0x53,0x00,0x23,0x1c,0x04,0x44,0x0e,0x50,0x10,0xeb,0x17,0xca,0x1c,0x07,0x20,}; +const uint8_t *_I_DolphinMafia_115x62[] = {_I_DolphinMafia_115x62_0}; + const Icon I_Certification2_119x30 = {.width=119,.height=30,.frame_count=1,.frame_rate=0,.frames=_I_Certification2_119x30}; const Icon I_Certification1_103x23 = {.width=103,.height=23,.frame_count=1,.frame_rate=0,.frames=_I_Certification1_103x23}; const Icon A_WatchingTV_128x64 = {.width=128,.height=64,.frame_count=4,.frame_rate=1,.frames=_A_WatchingTV_128x64}; const Icon A_Wink_128x64 = {.width=128,.height=64,.frame_count=9,.frame_rate=1,.frames=_A_Wink_128x64}; -const Icon I_sub1_10px = {.width=10,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_sub1_10px}; -const Icon I_ir_10px = {.width=10,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_ir_10px}; -const Icon I_unknown_10px = {.width=10,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_unknown_10px}; -const Icon I_ibutt_10px = {.width=10,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_ibutt_10px}; -const Icon I_Nfc_10px = {.width=10,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_Nfc_10px}; const Icon I_ble_10px = {.width=10,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_ble_10px}; +const Icon I_ibutt_10px = {.width=10,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_ibutt_10px}; const Icon I_125_10px = {.width=10,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_125_10px}; +const Icon I_sub1_10px = {.width=10,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_sub1_10px}; const Icon I_dir_10px = {.width=10,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_dir_10px}; +const Icon I_ir_10px = {.width=10,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_ir_10px}; +const Icon I_Nfc_10px = {.width=10,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_Nfc_10px}; +const Icon I_unknown_10px = {.width=10,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_unknown_10px}; const Icon I_BLE_Pairing_128x64 = {.width=128,.height=64,.frame_count=1,.frame_rate=0,.frames=_I_BLE_Pairing_128x64}; -const Icon I_ButtonDown_7x4 = {.width=7,.height=4,.frame_count=1,.frame_rate=0,.frames=_I_ButtonDown_7x4}; -const Icon I_ButtonCenter_7x7 = {.width=7,.height=7,.frame_count=1,.frame_rate=0,.frames=_I_ButtonCenter_7x7}; -const Icon I_ButtonLeft_4x7 = {.width=4,.height=7,.frame_count=1,.frame_rate=0,.frames=_I_ButtonLeft_4x7}; -const Icon I_ButtonUp_7x4 = {.width=7,.height=4,.frame_count=1,.frame_rate=0,.frames=_I_ButtonUp_7x4}; -const Icon I_DFU_128x50 = {.width=128,.height=50,.frame_count=1,.frame_rate=0,.frames=_I_DFU_128x50}; -const Icon I_ButtonLeftSmall_3x5 = {.width=3,.height=5,.frame_count=1,.frame_rate=0,.frames=_I_ButtonLeftSmall_3x5}; const Icon I_ButtonRightSmall_3x5 = {.width=3,.height=5,.frame_count=1,.frame_rate=0,.frames=_I_ButtonRightSmall_3x5}; +const Icon I_ButtonLeftSmall_3x5 = {.width=3,.height=5,.frame_count=1,.frame_rate=0,.frames=_I_ButtonLeftSmall_3x5}; +const Icon I_ButtonCenter_7x7 = {.width=7,.height=7,.frame_count=1,.frame_rate=0,.frames=_I_ButtonCenter_7x7}; +const Icon I_ButtonDown_7x4 = {.width=7,.height=4,.frame_count=1,.frame_rate=0,.frames=_I_ButtonDown_7x4}; const Icon I_ButtonRight_4x7 = {.width=4,.height=7,.frame_count=1,.frame_rate=0,.frames=_I_ButtonRight_4x7}; +const Icon I_DFU_128x50 = {.width=128,.height=50,.frame_count=1,.frame_rate=0,.frames=_I_DFU_128x50}; +const Icon I_ButtonUp_7x4 = {.width=7,.height=4,.frame_count=1,.frame_rate=0,.frames=_I_ButtonUp_7x4}; const Icon I_Warning_30x23 = {.width=30,.height=23,.frame_count=1,.frame_rate=0,.frames=_I_Warning_30x23}; -const Icon I_DolphinFirstStart2_59x51 = {.width=59,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart2_59x51}; -const Icon I_DolphinFirstStart5_54x49 = {.width=54,.height=49,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart5_54x49}; -const Icon I_DolphinFirstStart6_58x54 = {.width=58,.height=54,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart6_58x54}; -const Icon I_Flipper_young_80x60 = {.width=80,.height=60,.frame_count=1,.frame_rate=0,.frames=_I_Flipper_young_80x60}; -const Icon I_DolphinFirstStart8_56x51 = {.width=56,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart8_56x51}; -const Icon I_DolphinFirstStart1_59x53 = {.width=59,.height=53,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart1_59x53}; -const Icon I_DolphinOkay_41x43 = {.width=41,.height=43,.frame_count=1,.frame_rate=0,.frames=_I_DolphinOkay_41x43}; -const Icon I_DolphinFirstStart3_57x48 = {.width=57,.height=48,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart3_57x48}; +const Icon I_ButtonLeft_4x7 = {.width=4,.height=7,.frame_count=1,.frame_rate=0,.frames=_I_ButtonLeft_4x7}; const Icon I_DolphinFirstStart7_61x51 = {.width=61,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart7_61x51}; +const Icon I_DolphinOkay_41x43 = {.width=41,.height=43,.frame_count=1,.frame_rate=0,.frames=_I_DolphinOkay_41x43}; +const Icon I_DolphinFirstStart5_54x49 = {.width=54,.height=49,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart5_54x49}; +const Icon I_Flipper_young_80x60 = {.width=80,.height=60,.frame_count=1,.frame_rate=0,.frames=_I_Flipper_young_80x60}; +const Icon I_DolphinFirstStart2_59x51 = {.width=59,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart2_59x51}; +const Icon I_DolphinFirstStart8_56x51 = {.width=56,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart8_56x51}; +const Icon I_DolphinFirstStart3_57x48 = {.width=57,.height=48,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart3_57x48}; const Icon I_DolphinFirstStart0_70x53 = {.width=70,.height=53,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart0_70x53}; const Icon I_DolphinFirstStart4_67x53 = {.width=67,.height=53,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart4_67x53}; -const Icon I_PassportBottom_128x17 = {.width=128,.height=17,.frame_count=1,.frame_rate=0,.frames=_I_PassportBottom_128x17}; -const Icon I_DoorLeft_70x55 = {.width=70,.height=55,.frame_count=1,.frame_rate=0,.frames=_I_DoorLeft_70x55}; -const Icon I_DoorRight_70x55 = {.width=70,.height=55,.frame_count=1,.frame_rate=0,.frames=_I_DoorRight_70x55}; +const Icon I_DolphinFirstStart6_58x54 = {.width=58,.height=54,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart6_58x54}; +const Icon I_DolphinFirstStart1_59x53 = {.width=59,.height=53,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart1_59x53}; +const Icon I_ArrowDownFilled_14x15 = {.width=14,.height=15,.frame_count=1,.frame_rate=0,.frames=_I_ArrowDownFilled_14x15}; +const Icon I_ArrowUpEmpty_14x15 = {.width=14,.height=15,.frame_count=1,.frame_rate=0,.frames=_I_ArrowUpEmpty_14x15}; +const Icon I_ArrowUpFilled_14x15 = {.width=14,.height=15,.frame_count=1,.frame_rate=0,.frames=_I_ArrowUpFilled_14x15}; +const Icon I_ArrowDownEmpty_14x15 = {.width=14,.height=15,.frame_count=1,.frame_rate=0,.frames=_I_ArrowDownEmpty_14x15}; const Icon I_DoorLocked_10x56 = {.width=10,.height=56,.frame_count=1,.frame_rate=0,.frames=_I_DoorLocked_10x56}; +const Icon I_PassportBottom_128x17 = {.width=128,.height=17,.frame_count=1,.frame_rate=0,.frames=_I_PassportBottom_128x17}; const Icon I_PassportLeft_6x47 = {.width=6,.height=47,.frame_count=1,.frame_rate=0,.frames=_I_PassportLeft_6x47}; +const Icon I_DoorLeft_70x55 = {.width=70,.height=55,.frame_count=1,.frame_rate=0,.frames=_I_DoorLeft_70x55}; const Icon I_LockPopup_100x49 = {.width=100,.height=49,.frame_count=1,.frame_rate=0,.frames=_I_LockPopup_100x49}; -const Icon I_Down_hvr_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Down_hvr_25x27}; -const Icon I_Vol_down_hvr_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Vol_down_hvr_25x27}; -const Icon I_Down_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Down_25x27}; -const Icon I_Fill_marker_7x7 = {.width=7,.height=7,.frame_count=1,.frame_rate=0,.frames=_I_Fill_marker_7x7}; -const Icon I_Vol_down_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Vol_down_25x27}; -const Icon I_Vol_up_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Vol_up_25x27}; -const Icon I_Up_hvr_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Up_hvr_25x27}; -const Icon I_Vol_up_hvr_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Vol_up_hvr_25x27}; -const Icon I_IrdaLearnShort_128x31 = {.width=128,.height=31,.frame_count=1,.frame_rate=0,.frames=_I_IrdaLearnShort_128x31}; -const Icon I_IrdaSend_128x64 = {.width=128,.height=64,.frame_count=1,.frame_rate=0,.frames=_I_IrdaSend_128x64}; -const Icon I_DolphinReadingSuccess_59x63 = {.width=59,.height=63,.frame_count=1,.frame_rate=0,.frames=_I_DolphinReadingSuccess_59x63}; -const Icon I_Mute_hvr_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Mute_hvr_25x27}; -const Icon I_Back_15x10 = {.width=15,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_Back_15x10}; -const Icon I_Up_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Up_25x27}; -const Icon I_IrdaArrowUp_4x8 = {.width=8,.height=4,.frame_count=1,.frame_rate=0,.frames=_I_IrdaArrowUp_4x8}; -const Icon I_Mute_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Mute_25x27}; -const Icon I_Power_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Power_25x27}; -const Icon I_IrdaSendShort_128x34 = {.width=128,.height=34,.frame_count=1,.frame_rate=0,.frames=_I_IrdaSendShort_128x34}; +const Icon I_DoorRight_70x55 = {.width=70,.height=55,.frame_count=1,.frame_rate=0,.frames=_I_DoorRight_70x55}; const Icon I_IrdaArrowDown_4x8 = {.width=8,.height=4,.frame_count=1,.frame_rate=0,.frames=_I_IrdaArrowDown_4x8}; +const Icon I_Power_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Power_25x27}; +const Icon I_Mute_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Mute_25x27}; +const Icon I_Down_hvr_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Down_hvr_25x27}; +const Icon I_Vol_up_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Vol_up_25x27}; +const Icon I_IrdaLearnShort_128x31 = {.width=128,.height=31,.frame_count=1,.frame_rate=0,.frames=_I_IrdaLearnShort_128x31}; +const Icon I_Up_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Up_25x27}; +const Icon I_Vol_down_hvr_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Vol_down_hvr_25x27}; +const Icon I_Vol_down_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Vol_down_25x27}; +const Icon I_Vol_up_hvr_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Vol_up_hvr_25x27}; +const Icon I_Fill_marker_7x7 = {.width=7,.height=7,.frame_count=1,.frame_rate=0,.frames=_I_Fill_marker_7x7}; +const Icon I_Up_hvr_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Up_hvr_25x27}; +const Icon I_IrdaArrowUp_4x8 = {.width=8,.height=4,.frame_count=1,.frame_rate=0,.frames=_I_IrdaArrowUp_4x8}; +const Icon I_Down_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Down_25x27}; +const Icon I_DolphinReadingSuccess_59x63 = {.width=59,.height=63,.frame_count=1,.frame_rate=0,.frames=_I_DolphinReadingSuccess_59x63}; +const Icon I_IrdaSendShort_128x34 = {.width=128,.height=34,.frame_count=1,.frame_rate=0,.frames=_I_IrdaSendShort_128x34}; const Icon I_IrdaLearn_128x64 = {.width=128,.height=64,.frame_count=1,.frame_rate=0,.frames=_I_IrdaLearn_128x64}; +const Icon I_Mute_hvr_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Mute_hvr_25x27}; +const Icon I_IrdaSend_128x64 = {.width=128,.height=64,.frame_count=1,.frame_rate=0,.frames=_I_IrdaSend_128x64}; const Icon I_Power_hvr_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Power_hvr_25x27}; +const Icon I_Back_15x10 = {.width=15,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_Back_15x10}; const Icon I_KeySaveSelected_24x11 = {.width=24,.height=11,.frame_count=1,.frame_rate=0,.frames=_I_KeySaveSelected_24x11}; -const Icon I_KeyBackspace_16x9 = {.width=16,.height=9,.frame_count=1,.frame_rate=0,.frames=_I_KeyBackspace_16x9}; -const Icon I_KeyBackspaceSelected_16x9 = {.width=16,.height=9,.frame_count=1,.frame_rate=0,.frames=_I_KeyBackspaceSelected_16x9}; const Icon I_KeySave_24x11 = {.width=24,.height=11,.frame_count=1,.frame_rate=0,.frames=_I_KeySave_24x11}; +const Icon I_KeyBackspaceSelected_16x9 = {.width=16,.height=9,.frame_count=1,.frame_rate=0,.frames=_I_KeyBackspaceSelected_16x9}; +const Icon I_KeyBackspace_16x9 = {.width=16,.height=9,.frame_count=1,.frame_rate=0,.frames=_I_KeyBackspace_16x9}; const Icon A_125khz_14 = {.width=14,.height=14,.frame_count=4,.frame_rate=3,.frames=_A_125khz_14}; const Icon A_Bluetooth_14 = {.width=14,.height=14,.frame_count=6,.frame_rate=3,.frames=_A_Bluetooth_14}; const Icon A_Debug_14 = {.width=14,.height=14,.frame_count=4,.frame_rate=3,.frames=_A_Debug_14}; @@ -550,47 +566,47 @@ const Icon A_Sub1ghz_14 = {.width=14,.height=14,.frame_count=6,.frame_rate=3,.fr const Icon A_Tamagotchi_14 = {.width=14,.height=14,.frame_count=6,.frame_rate=3,.frames=_A_Tamagotchi_14}; const Icon A_U2F_14 = {.width=14,.height=14,.frame_count=4,.frame_rate=3,.frames=_A_U2F_14}; const Icon A_iButton_14 = {.width=14,.height=14,.frame_count=7,.frame_rate=3,.frames=_A_iButton_14}; -const Icon I_Detailed_chip_17x13 = {.width=17,.height=13,.frame_count=1,.frame_rate=0,.frames=_I_Detailed_chip_17x13}; const Icon I_Medium_chip_22x21 = {.width=22,.height=21,.frame_count=1,.frame_rate=0,.frames=_I_Medium_chip_22x21}; -const Icon I_BatteryBody_52x28 = {.width=52,.height=28,.frame_count=1,.frame_rate=0,.frames=_I_BatteryBody_52x28}; -const Icon I_FaceCharging_29x14 = {.width=29,.height=14,.frame_count=1,.frame_rate=0,.frames=_I_FaceCharging_29x14}; +const Icon I_Detailed_chip_17x13 = {.width=17,.height=13,.frame_count=1,.frame_rate=0,.frames=_I_Detailed_chip_17x13}; const Icon I_Health_16x16 = {.width=16,.height=16,.frame_count=1,.frame_rate=0,.frames=_I_Health_16x16}; -const Icon I_Temperature_16x16 = {.width=16,.height=16,.frame_count=1,.frame_rate=0,.frames=_I_Temperature_16x16}; +const Icon I_Voltage_16x16 = {.width=16,.height=16,.frame_count=1,.frame_rate=0,.frames=_I_Voltage_16x16}; +const Icon I_BatteryBody_52x28 = {.width=52,.height=28,.frame_count=1,.frame_rate=0,.frames=_I_BatteryBody_52x28}; +const Icon I_FaceNormal_29x14 = {.width=29,.height=14,.frame_count=1,.frame_rate=0,.frames=_I_FaceNormal_29x14}; +const Icon I_FaceCharging_29x14 = {.width=29,.height=14,.frame_count=1,.frame_rate=0,.frames=_I_FaceCharging_29x14}; const Icon I_Battery_16x16 = {.width=16,.height=16,.frame_count=1,.frame_rate=0,.frames=_I_Battery_16x16}; const Icon I_FaceConfused_29x14 = {.width=29,.height=14,.frame_count=1,.frame_rate=0,.frames=_I_FaceConfused_29x14}; -const Icon I_FaceNormal_29x14 = {.width=29,.height=14,.frame_count=1,.frame_rate=0,.frames=_I_FaceNormal_29x14}; -const Icon I_Voltage_16x16 = {.width=16,.height=16,.frame_count=1,.frame_rate=0,.frames=_I_Voltage_16x16}; +const Icon I_Temperature_16x16 = {.width=16,.height=16,.frame_count=1,.frame_rate=0,.frames=_I_Temperature_16x16}; const Icon I_FaceNopower_29x14 = {.width=29,.height=14,.frame_count=1,.frame_rate=0,.frames=_I_FaceNopower_29x14}; -const Icon I_RFIDDolphinSend_97x61 = {.width=97,.height=61,.frame_count=1,.frame_rate=0,.frames=_I_RFIDDolphinSend_97x61}; const Icon I_RFIDDolphinSuccess_108x57 = {.width=108,.height=57,.frame_count=1,.frame_rate=0,.frames=_I_RFIDDolphinSuccess_108x57}; -const Icon I_RFIDDolphinReceive_97x61 = {.width=97,.height=61,.frame_count=1,.frame_rate=0,.frames=_I_RFIDDolphinReceive_97x61}; const Icon I_RFIDBigChip_37x36 = {.width=37,.height=36,.frame_count=1,.frame_rate=0,.frames=_I_RFIDBigChip_37x36}; -const Icon I_SDQuestion_35x43 = {.width=35,.height=43,.frame_count=1,.frame_rate=0,.frames=_I_SDQuestion_35x43}; +const Icon I_RFIDDolphinReceive_97x61 = {.width=97,.height=61,.frame_count=1,.frame_rate=0,.frames=_I_RFIDDolphinReceive_97x61}; +const Icon I_RFIDDolphinSend_97x61 = {.width=97,.height=61,.frame_count=1,.frame_rate=0,.frames=_I_RFIDDolphinSend_97x61}; const Icon I_SDError_43x35 = {.width=43,.height=35,.frame_count=1,.frame_rate=0,.frames=_I_SDError_43x35}; +const Icon I_SDQuestion_35x43 = {.width=35,.height=43,.frame_count=1,.frame_rate=0,.frames=_I_SDQuestion_35x43}; const Icon I_Cry_dolph_55x52 = {.width=55,.height=52,.frame_count=1,.frame_rate=0,.frames=_I_Cry_dolph_55x52}; -const Icon I_Background_128x11 = {.width=128,.height=11,.frame_count=1,.frame_rate=0,.frames=_I_Background_128x11}; -const Icon I_Lock_8x8 = {.width=8,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Lock_8x8}; -const Icon I_Battery_26x8 = {.width=26,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Battery_26x8}; const Icon I_Battery_19x8 = {.width=19,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Battery_19x8}; -const Icon I_USBConnected_15x8 = {.width=15,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_USBConnected_15x8}; -const Icon I_Background_128x8 = {.width=128,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Background_128x8}; -const Icon I_BadUsb_9x8 = {.width=9,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_BadUsb_9x8}; -const Icon I_BT_Pair_9x8 = {.width=9,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_BT_Pair_9x8}; -const Icon I_PlaceholderL_11x13 = {.width=11,.height=13,.frame_count=1,.frame_rate=0,.frames=_I_PlaceholderL_11x13}; const Icon I_SDcardFail_11x8 = {.width=11,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_SDcardFail_11x8}; const Icon I_Bluetooth_5x8 = {.width=5,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Bluetooth_5x8}; const Icon I_PlaceholderR_30x13 = {.width=30,.height=13,.frame_count=1,.frame_rate=0,.frames=_I_PlaceholderR_30x13}; +const Icon I_Battery_26x8 = {.width=26,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Battery_26x8}; +const Icon I_Lock_8x8 = {.width=8,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Lock_8x8}; const Icon I_SDcardMounted_11x8 = {.width=11,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_SDcardMounted_11x8}; +const Icon I_BadUsb_9x8 = {.width=9,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_BadUsb_9x8}; +const Icon I_BT_Pair_9x8 = {.width=9,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_BT_Pair_9x8}; +const Icon I_PlaceholderL_11x13 = {.width=11,.height=13,.frame_count=1,.frame_rate=0,.frames=_I_PlaceholderL_11x13}; +const Icon I_Background_128x11 = {.width=128,.height=11,.frame_count=1,.frame_rate=0,.frames=_I_Background_128x11}; +const Icon I_Background_128x8 = {.width=128,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Background_128x8}; +const Icon I_USBConnected_15x8 = {.width=15,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_USBConnected_15x8}; const Icon I_Quest_7x8 = {.width=7,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Quest_7x8}; -const Icon I_Lock_7x8 = {.width=7,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Lock_7x8}; -const Icon I_Scanning_123x52 = {.width=123,.height=52,.frame_count=1,.frame_rate=0,.frames=_I_Scanning_123x52}; const Icon I_MHz_25x11 = {.width=25,.height=11,.frame_count=1,.frame_rate=0,.frames=_I_MHz_25x11}; +const Icon I_Scanning_123x52 = {.width=123,.height=52,.frame_count=1,.frame_rate=0,.frames=_I_Scanning_123x52}; const Icon I_Unlock_7x8 = {.width=7,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Unlock_7x8}; -const Icon I_iButtonKey_49x44 = {.width=49,.height=44,.frame_count=1,.frame_rate=0,.frames=_I_iButtonKey_49x44}; -const Icon I_DolphinExcited_64x63 = {.width=64,.height=63,.frame_count=1,.frame_rate=0,.frames=_I_DolphinExcited_64x63}; -const Icon I_DolphinWait_61x59 = {.width=61,.height=59,.frame_count=1,.frame_rate=0,.frames=_I_DolphinWait_61x59}; -const Icon I_iButtonDolphinVerySuccess_108x52 = {.width=108,.height=52,.frame_count=1,.frame_rate=0,.frames=_I_iButtonDolphinVerySuccess_108x52}; -const Icon I_DolphinMafia_115x62 = {.width=115,.height=62,.frame_count=1,.frame_rate=0,.frames=_I_DolphinMafia_115x62}; +const Icon I_Lock_7x8 = {.width=7,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Lock_7x8}; const Icon I_DolphinNice_96x59 = {.width=96,.height=59,.frame_count=1,.frame_rate=0,.frames=_I_DolphinNice_96x59}; const Icon I_iButtonDolphinSuccess_109x60 = {.width=109,.height=60,.frame_count=1,.frame_rate=0,.frames=_I_iButtonDolphinSuccess_109x60}; +const Icon I_DolphinExcited_64x63 = {.width=64,.height=63,.frame_count=1,.frame_rate=0,.frames=_I_DolphinExcited_64x63}; +const Icon I_iButtonKey_49x44 = {.width=49,.height=44,.frame_count=1,.frame_rate=0,.frames=_I_iButtonKey_49x44}; +const Icon I_iButtonDolphinVerySuccess_108x52 = {.width=108,.height=52,.frame_count=1,.frame_rate=0,.frames=_I_iButtonDolphinVerySuccess_108x52}; +const Icon I_DolphinWait_61x59 = {.width=61,.height=59,.frame_count=1,.frame_rate=0,.frames=_I_DolphinWait_61x59}; +const Icon I_DolphinMafia_115x62 = {.width=115,.height=62,.frame_count=1,.frame_rate=0,.frames=_I_DolphinMafia_115x62}; diff --git a/assets/compiled/assets_icons.h b/assets/compiled/assets_icons.h index e0c18aff..0146aee8 100644 --- a/assets/compiled/assets_icons.h +++ b/assets/compiled/assets_icons.h @@ -5,66 +5,70 @@ extern const Icon I_Certification2_119x30; extern const Icon I_Certification1_103x23; extern const Icon A_WatchingTV_128x64; extern const Icon A_Wink_128x64; -extern const Icon I_sub1_10px; -extern const Icon I_ir_10px; -extern const Icon I_unknown_10px; -extern const Icon I_ibutt_10px; -extern const Icon I_Nfc_10px; extern const Icon I_ble_10px; +extern const Icon I_ibutt_10px; extern const Icon I_125_10px; +extern const Icon I_sub1_10px; extern const Icon I_dir_10px; +extern const Icon I_ir_10px; +extern const Icon I_Nfc_10px; +extern const Icon I_unknown_10px; extern const Icon I_BLE_Pairing_128x64; -extern const Icon I_ButtonDown_7x4; -extern const Icon I_ButtonCenter_7x7; -extern const Icon I_ButtonLeft_4x7; -extern const Icon I_ButtonUp_7x4; -extern const Icon I_DFU_128x50; -extern const Icon I_ButtonLeftSmall_3x5; extern const Icon I_ButtonRightSmall_3x5; +extern const Icon I_ButtonLeftSmall_3x5; +extern const Icon I_ButtonCenter_7x7; +extern const Icon I_ButtonDown_7x4; extern const Icon I_ButtonRight_4x7; +extern const Icon I_DFU_128x50; +extern const Icon I_ButtonUp_7x4; extern const Icon I_Warning_30x23; -extern const Icon I_DolphinFirstStart2_59x51; -extern const Icon I_DolphinFirstStart5_54x49; -extern const Icon I_DolphinFirstStart6_58x54; -extern const Icon I_Flipper_young_80x60; -extern const Icon I_DolphinFirstStart8_56x51; -extern const Icon I_DolphinFirstStart1_59x53; -extern const Icon I_DolphinOkay_41x43; -extern const Icon I_DolphinFirstStart3_57x48; +extern const Icon I_ButtonLeft_4x7; extern const Icon I_DolphinFirstStart7_61x51; +extern const Icon I_DolphinOkay_41x43; +extern const Icon I_DolphinFirstStart5_54x49; +extern const Icon I_Flipper_young_80x60; +extern const Icon I_DolphinFirstStart2_59x51; +extern const Icon I_DolphinFirstStart8_56x51; +extern const Icon I_DolphinFirstStart3_57x48; extern const Icon I_DolphinFirstStart0_70x53; extern const Icon I_DolphinFirstStart4_67x53; -extern const Icon I_PassportBottom_128x17; -extern const Icon I_DoorLeft_70x55; -extern const Icon I_DoorRight_70x55; +extern const Icon I_DolphinFirstStart6_58x54; +extern const Icon I_DolphinFirstStart1_59x53; +extern const Icon I_ArrowDownFilled_14x15; +extern const Icon I_ArrowUpEmpty_14x15; +extern const Icon I_ArrowUpFilled_14x15; +extern const Icon I_ArrowDownEmpty_14x15; extern const Icon I_DoorLocked_10x56; +extern const Icon I_PassportBottom_128x17; extern const Icon I_PassportLeft_6x47; +extern const Icon I_DoorLeft_70x55; extern const Icon I_LockPopup_100x49; -extern const Icon I_Down_hvr_25x27; -extern const Icon I_Vol_down_hvr_25x27; -extern const Icon I_Down_25x27; -extern const Icon I_Fill_marker_7x7; -extern const Icon I_Vol_down_25x27; -extern const Icon I_Vol_up_25x27; -extern const Icon I_Up_hvr_25x27; -extern const Icon I_Vol_up_hvr_25x27; -extern const Icon I_IrdaLearnShort_128x31; -extern const Icon I_IrdaSend_128x64; -extern const Icon I_DolphinReadingSuccess_59x63; -extern const Icon I_Mute_hvr_25x27; -extern const Icon I_Back_15x10; -extern const Icon I_Up_25x27; -extern const Icon I_IrdaArrowUp_4x8; -extern const Icon I_Mute_25x27; -extern const Icon I_Power_25x27; -extern const Icon I_IrdaSendShort_128x34; +extern const Icon I_DoorRight_70x55; extern const Icon I_IrdaArrowDown_4x8; +extern const Icon I_Power_25x27; +extern const Icon I_Mute_25x27; +extern const Icon I_Down_hvr_25x27; +extern const Icon I_Vol_up_25x27; +extern const Icon I_IrdaLearnShort_128x31; +extern const Icon I_Up_25x27; +extern const Icon I_Vol_down_hvr_25x27; +extern const Icon I_Vol_down_25x27; +extern const Icon I_Vol_up_hvr_25x27; +extern const Icon I_Fill_marker_7x7; +extern const Icon I_Up_hvr_25x27; +extern const Icon I_IrdaArrowUp_4x8; +extern const Icon I_Down_25x27; +extern const Icon I_DolphinReadingSuccess_59x63; +extern const Icon I_IrdaSendShort_128x34; extern const Icon I_IrdaLearn_128x64; +extern const Icon I_Mute_hvr_25x27; +extern const Icon I_IrdaSend_128x64; extern const Icon I_Power_hvr_25x27; +extern const Icon I_Back_15x10; extern const Icon I_KeySaveSelected_24x11; -extern const Icon I_KeyBackspace_16x9; -extern const Icon I_KeyBackspaceSelected_16x9; extern const Icon I_KeySave_24x11; +extern const Icon I_KeyBackspaceSelected_16x9; +extern const Icon I_KeyBackspace_16x9; extern const Icon A_125khz_14; extern const Icon A_Bluetooth_14; extern const Icon A_Debug_14; @@ -81,46 +85,46 @@ extern const Icon A_Sub1ghz_14; extern const Icon A_Tamagotchi_14; extern const Icon A_U2F_14; extern const Icon A_iButton_14; -extern const Icon I_Detailed_chip_17x13; extern const Icon I_Medium_chip_22x21; -extern const Icon I_BatteryBody_52x28; -extern const Icon I_FaceCharging_29x14; +extern const Icon I_Detailed_chip_17x13; extern const Icon I_Health_16x16; -extern const Icon I_Temperature_16x16; +extern const Icon I_Voltage_16x16; +extern const Icon I_BatteryBody_52x28; +extern const Icon I_FaceNormal_29x14; +extern const Icon I_FaceCharging_29x14; extern const Icon I_Battery_16x16; extern const Icon I_FaceConfused_29x14; -extern const Icon I_FaceNormal_29x14; -extern const Icon I_Voltage_16x16; +extern const Icon I_Temperature_16x16; extern const Icon I_FaceNopower_29x14; -extern const Icon I_RFIDDolphinSend_97x61; extern const Icon I_RFIDDolphinSuccess_108x57; -extern const Icon I_RFIDDolphinReceive_97x61; extern const Icon I_RFIDBigChip_37x36; -extern const Icon I_SDQuestion_35x43; +extern const Icon I_RFIDDolphinReceive_97x61; +extern const Icon I_RFIDDolphinSend_97x61; extern const Icon I_SDError_43x35; +extern const Icon I_SDQuestion_35x43; extern const Icon I_Cry_dolph_55x52; -extern const Icon I_Background_128x11; -extern const Icon I_Lock_8x8; -extern const Icon I_Battery_26x8; extern const Icon I_Battery_19x8; -extern const Icon I_USBConnected_15x8; -extern const Icon I_Background_128x8; -extern const Icon I_BadUsb_9x8; -extern const Icon I_BT_Pair_9x8; -extern const Icon I_PlaceholderL_11x13; extern const Icon I_SDcardFail_11x8; extern const Icon I_Bluetooth_5x8; extern const Icon I_PlaceholderR_30x13; +extern const Icon I_Battery_26x8; +extern const Icon I_Lock_8x8; extern const Icon I_SDcardMounted_11x8; +extern const Icon I_BadUsb_9x8; +extern const Icon I_BT_Pair_9x8; +extern const Icon I_PlaceholderL_11x13; +extern const Icon I_Background_128x11; +extern const Icon I_Background_128x8; +extern const Icon I_USBConnected_15x8; extern const Icon I_Quest_7x8; -extern const Icon I_Lock_7x8; -extern const Icon I_Scanning_123x52; extern const Icon I_MHz_25x11; +extern const Icon I_Scanning_123x52; extern const Icon I_Unlock_7x8; -extern const Icon I_iButtonKey_49x44; -extern const Icon I_DolphinExcited_64x63; -extern const Icon I_DolphinWait_61x59; -extern const Icon I_iButtonDolphinVerySuccess_108x52; -extern const Icon I_DolphinMafia_115x62; +extern const Icon I_Lock_7x8; extern const Icon I_DolphinNice_96x59; extern const Icon I_iButtonDolphinSuccess_109x60; +extern const Icon I_DolphinExcited_64x63; +extern const Icon I_iButtonKey_49x44; +extern const Icon I_iButtonDolphinVerySuccess_108x52; +extern const Icon I_DolphinWait_61x59; +extern const Icon I_DolphinMafia_115x62; diff --git a/assets/icons/GPIO/ArrowDownEmpty_14x15.png b/assets/icons/GPIO/ArrowDownEmpty_14x15.png new file mode 100644 index 0000000000000000000000000000000000000000..8c6d54f9cbee1fa08f30d7d8d309fcf0eae24dc3 GIT binary patch literal 654 zcmeAS@N?(olHy`uVBq!ia0vp^d_c_4!3-oHpW<@^QfvV}A+G=b{|7Qd4_&SUQk(@I zk;M!QLM0%~crQ)90w^e1;u=vBoS#-wo>-L1;Fyx1l&avFo0y&&l$w}QS$HzlhJk_c zLS{%rNrbPDRdRl=ULr`1UPW#J10zFdh?}kj1E!3|#M((0^KL7Mw8gVtob5Y{ciZEr z1y!L*+oSYtLL-;F6-&Og;7UV-PF~zv@#-ae4;4hEUsjo}eeU6ZzUK$(OKl~Nl^<#j zv+)W&bYFkJ!h~4P{m*&xd{no6I(@M#|M+_8x;urJ4!%DBAZvkhe$_)siC^kZUj#T^ zdl`0NgZyQVrpZU%d+m_nKhXb7F60(hz!A?QhQ}5t6dsQ{cKe&KN8v1mJq{<84$Vkw z(Gz=+d$3^cTe%mz_SNpzaZ$Zfm9OE{ept~iW#hJf4aF9PIg3nso0N*qpW3V#^e$;t z0Qd2=CUIG;$7XD;dhgA#T(YWIZ*@$~EcIu*+?kCvIt_oh-!OUa{rlgVvN~P4d*Qp! zZWheYopUc*ujx-x3-8)B330c3ulZj#zL&rCdfsYYkINS9@>0i^N*T-hdtAO?{nREn z=FU}Bo|zG+`X1?MbF2)%c{X*biuqNo^Q%`y=)T^w%crZyCui-?ed4G5bG}bsn|AXe z-})^ZJ}rNdxAxt^%q*?v)rz0@?%8y=M*noASZmsa`g+@?O^wIi-rS{VF*|<6g9_<2 zf7vTDzg+!NYwQP10J@$ojv*W~lM{fTg^7(L!DZo!W3D$C(hg2JAY!oS!-O9_H#ACI fU$`~sG+tm3J;R{=vM6pJP$Pq-L1;Fyx1l&avFo0y&&l$w}QS$HzlhJk_c zVrEE0NrbPDRdRl=ULr`1UPW#J10zFdh?}kj1E!3|#M((0^KL7Mw8gVtob5Y{@phrj z;;PW>?NRzMp_xnGiY4D#aHXL^Coe8nyn4yrLj_UkmsO@~pL_V9@A-lHIzx$L+YdE| z*?5K?x^G|asIXh8?zGgU8D2S0t~ZPFx9>K!&#An4uv`B@%>w8As)v#iztW$+2ynXg zGVHdK%QDtj zoddU<9$MYDy%bvexh%57YsbfX0X^S;+umC4aa&zR+_llOX|f7e*NMFv=i5AXZeHo6 zE3^Gl#Y$0$MPDkdvSK)%Gbe*RMOz4@)|?HAcpI8PmDZ!27R?96fHOD12!EYFLG zZ!hI^X7jumIB8jB;FZd%y=xx**tP4_rd6lb>%CqRb*wVVCui-?b>gS|bG}diYje7< ztYT^FRC|~5(O2No3raw??{Y^3PVTzU>EZ z)icCw`?A5F(eXDh1z3B!IEHY{OiloT7A7{11eb*kCJ}ryPd6M&Rqzu_;!^IaOknJY s?cqo_P+H?E(ff=iBss+_DwdCiO;ROJI-wJ7l zVyyzKTacTB^&D>%umAvF1RjB~w?ZI5WD3a}AAkb@+Ca8L2s&v^!f<#EC+KY2zwjh2 z;1U2hq;sufcAb=ib3I-nV19LyD47q^*;-n!-pg(_qF*gv)2BaUfRAM)N1$a1JLaDLW z)dRTkBPQ_K0dOAUF=4AZY9XM5LRlwF97|>;U3`Xa@(#nj;t5Q#(@Z zPL8TTvH^8%DIIAidbGtVQr^jgEG>+TDU8(zJTb*c9uo5AnE+>{Wh#myr#Y-U_W^*+ zdiU#{qecnSQxl_8-qQihAC37t{tG0qp~B+uPSs6zPC&@Ei#gyvIoZcSZen{JRO?@S z8W?Z}e23TFv1^~0%ONSqu?A`ZTj8P|$^;)i~ zPLdt7$IN)2Qk{X2>7I#*{k(ZnsV35nb+CTU=Z`sLa)mQSh00!Q9_61N5jk^dmMpo) zLn^0Us_H5ar%5xnC`JJmE$kWB5ANiaOpoIPV~{$xA__q>(PAgTjm?xo_F_}NL^q`3 zk~&39KlY6AM#5k-NbAPdjVepcYjvD5@@+KVauzaoSuQJnLE`$079 z&M7NGZm>PX;aah%PEdw&N2Ua#tx&z7_gx0w2fyYEnW0wle2zR|p7t)S$N%fzndzCx zA0hkrukuGWAw3UD`%9mfE|MyjhNN5H<9eT#-s}kds3n{3b6fB>$q9XU^>CPYVyj3B zEX6q`JZ1WUqf?-hQ7`=gpW{O(!G~v^FWj?mdS*Xf%=1CwVQ;aV)2m{=(oR$eD&D^9 zqiTT+9W)L~sI9n}y1xA3a1@TnsRi3PjsvHdJ`eyhZJ4>J8S!rDnnEBjoxkC6+ zup;@5*~jdbKLXX^)=Q8M&^(G=Xiva?^}mg;=w7%odSAHBw=%K8x1igq;I9gm@7H|B zb!n1@-VD-yPlnDH+>pNk#uKkKSlCe5I8k$`BiTR0yRy6NJ+-~PS#5~X&uE#8)9=ml z&%xAusv6vijk;@|)p$HcFQzGVAT_LwE7c}-jd9!A(3$SM;{1_e)purAZI;mI5@0Xu zlDRJvmf7~=eo1CYLvSWxSZquz{!q`M6$j#g=G@jC?_9>*o_YOM%&PJ#VYN%HeZPoY z-!ba3FbXxOJve||HCs5U^QO3=_|1%qkE~B#VD_@EIKZ6ayGX_5|vq8mlTJE3hU zlQQ2cd!D~vDad@4IaKnA@Zobiyz#=rO&g6&*%r4qaHh$Rg*Eipx%TnwqRgWD<%DU- z+2FITXE&=4*geZq$?1aU_m9u$lqis9>XYD9`Nn+8K%Y*GT+az1{C7DalIQ%)}Inz1s?$zar<$ARTvd>W5 zbRQ4Dt2`x%R42J4yN=Z!@=?p^7H{Rw7C$As0c}^YKF}u|ceRUqSSXxyZ{2#P{RMaQ zh-E-@g*;w5U2^?`*rCH(4>Z1=EOVfqqpqp-F(zC$eX8RYI~sLcB<-ouWF*Mc9wKEoSwysv6J5HJ8D(c)lOLOZ@=1Bcaf4e^+0H4e zM?W9CfY|W8YG)DjR-4BTrAkkfzV%XZ*~Zzd?+c^r)45OT`pH?zSp_J5d}^8MM`-!M zayxHT)g=B2`V^s6HtAaH+JxeI;PRk&K$LZNK^dylUO>Vca$l8pTIw{d0$Ghb^+9{s zd*|D_BHv|+u$a!VVr^v9`}SaD2>mlM-3t@pI^#lw;*?hG>He(BH0 z78O%tF1GHyVJmdPz`&Q|<*oCx$l1bKB4f?9_R;ZbKa<{fR~Pt8WEW#6W!(wKzfki+ z{Z`^S$~sy*ICL?(^QYTiFb0?M^a@r(voE@}Id7LdEU)>bGSFB1IpqAZK%|`bu`kTz zxvJ-?G#CGB^9w7)p6{1G$IE!iR@P31f3C0$v1`nUKY#c9-c@tvtRIyWF!ZRl_9+hm zr5Aeu2_sKtMvw+F=QBc{lTRHMs5hB>{nzllu=C^gU-LTO487?XPQO^b!aa+mtMS14Dm{0v^5mkitZSRKQw~J*vPjGdFk)IxQ9$jx-1(^ao*K&4}f4#pp+GE*n*{f)w z7#p80FE7h4Q@!NXnKWATv`Dn8HQf0ZeKzpn^zioB=7}!!R{sLudQ4YsDZO}^!hBf# z2-c+7Bwy7@hcDjSD(M`&z^q_a4mVZHrytxh-mzcq-oQ2$y|Y_0oDSRBf~;Lx-i**! z7H0ibN>k0zR0onbH3UP!0VZA~PaMdKfbqeha2PN8xfYxO0C1?_9nn;@jWrBQB4}WC zV>D<4G7Aj=21Yb82J4Tbf;@3Pcp@Ckd{qku;l1Es7hM~u4H<#+#Un#0IEPSMM{KA+ zR^JP3WC${#!B_+Y92Eni5dw&TFd7{EH!qB3@46vi(BC0ce>nI*MWJo%K?o8B2Rfpm zsg8w0p`auB8eSMr4A#?A4WtFt(u6>DAeuVrP$*1WAEu)N`sV_((owv;VJI_;f0D6w zaIi0xN`^roAt50eA=(-wiVs9nUtb>r)q-egsk0)~1L;I6hNeyoRQ%0gh6}_}@MJ2U zLVM8aApc8C4E(20td2ow7&1gt1G;;r-+?wZ|9>cf@NaY=6@~k6 zz5ge1pd+1(gP?GMq#z2GH92p^-Be^4f`Y?PNfbvCDd2Y-?R`m9QlKx14ARol&;=c| z!C>*kUC*JvAvQKJD`FrOL&V~&%-~=ai3T3;1%qm9AJNx0Gu1ZNLuhK6BTRL55r`wE zCT6+_J}P)G#O-=~J*|6Ggy zANl^ldi}W;lRsi1tYRR$v;AMQ{_SE3XxIE#x~$E=;>QtLil?xo?Vc;=&-yI(*jqcA z|N8ZdWjfWr4`(e9D>D;E+JL7Az+qvrN2!k60%@RRsHn&5CR`~D5>QlZ7m?!Y*yl&d d1DZLxp@7f`psMbvsmg)^R_3;5rKTR2{|5)YPeT9z literal 0 HcmV?d00001 diff --git a/assets/icons/GPIO/ArrowUpFilled_14x15.png b/assets/icons/GPIO/ArrowUpFilled_14x15.png new file mode 100644 index 0000000000000000000000000000000000000000..fa35eb2f827bbf3b125673521e94c40ace83f035 GIT binary patch literal 3628 zcmaJ@c{r49+rMpP$&!5uW5m;f8CzvCwjra)G`3MGV+;nfGzK%0l$4S!Th@d~4QwO&8b<}ZdQDH@4002a7kd|of zD#m@q1^Kw&k!GdqqOhtUfYI*jZX;XC~6A?sAtfGAn90XAjHU{6^HtXs6SMzN_{Z zKEDvcnVDJrxLPrhIkDEpXcrIPDXEz-p6d%3p(Bl9J*si`$hxM=a9$bYAU{ZAoL%cJ zP!9mJd<=RR?Xl?^&m%Ix3sAarc1t!4ZAO%%G+h8t0x$@coDkuOM+1#Ij*Zelqdf4~ z;hCo}kOTn!j8F?O@IVxp{%K<(0Q3|k_R9f1xx0!4ffybjZIAVCUb9z#yVE7K7H>^0 zki#?s>+si<@Pxa*(6i7KOHN+Yn^R3$7fK8k1(;XuYmUFz{+#V!6ZV~lH(CtS83dSx&1>IO6iEOi zybbgiO8}5qy&Pw@p9g47%^v}Pim&pg?&A`dib9|=2OhsnLZ>@`dasp=)|Dp=}S`-xoz(9 z*|qW&SB3b^8wI7XYOtuC9(HbJ?xSbi`TX>cn%A2b;yeF9wHNX_RhvhYoCL#qGK zrb-*doHkpD?`s6<-B`O(VXd2V>FEi+54?e9FYl`=-gui6&_Od0cMDI+_3Kb9Re^`U z$Sv$R_BD_OT(}X73-8bs^Sb#7d-~=zEBEUdMa>3T+!)5tInEHLj5!!2qg0cP`@CL(u>HQgFLF07^zuV*7-}+YUexTn{-MLGHo@d;)zXPMg^aS zGeM~dW%1(i_P17>-i($>!|J1kZH01oqw|v_j~e1l$N2Bv(X&X)d2ph&DEoupgDBXY zlQzVhAQZ&mT9K4NV7f+YhAe`eubtQRE}h^_Sn`2P(#nNCN2pk(zDw=&`?`H{Vlv`q z@D9V4v zAoq>a&FN4*2sIEq5U=2`dk8n%5|8`pcbmZKn7uM|e<$0gJfY4fufrzqFP7%_Yu+P< zbU70*CV7_!)8Grf-_IE9LD1{Vugk9=t=ij~ZfHK0T#1MeKI*M=7~v z?8ty+uwUFS&M2-6${-F%4@<}G?cBTIK0~H1xxImN%zw@kdl` z+rE~)dU%Ds9`~zyi19;q?zn(E&ugABp2|y#m!9$Y@u~8s@!#8SC=es?Y8zySiHyY# zAyHRVY9hHt?uXJcPQTwaczMUv_pq-;FX>~J4U01y;W9Qt~LpJEqWZC1d@$FXhH3+t}H` z#;%60@u7zzZ%d{=H64opS)d^D_G5)4J7uXKS27~)t*UZka!))dV;wcVHJ;_1ym;vI z;R}crpR4vq0^jNj*`xO}5)^K|RG+tVw(S1GZ2xrbleSS(W>RJzT9lAdy8k1zY)_fJ z*Z%#9qN9v)VzW}>wdSQ!_2q#1J{kW=+m5_abO}mK))sPqKmC;aDLM;Ti9Gp1f52Q>eV$l(u_wFI~Uv@D_E=p=*lS+P`e2J66CVM(@d{etlIbYl-mwc8^?2B4mUXaweRkaWd*`<=T5+a)X=MNYN7dC&g^1__ zF)BzHWh^6{+?z3z9{ikga-UeO`Pl2f1`0yYkD$KZZF|%Irgb3gV%dV=6q2#O6ILC_ z)XpR3!0%RazTV8sQa+<>T~)Rj#?c+Y1vVJQxn$>L?SaoNk6un3DfBGN&N^-i|B%+t zSh8J9^K(1lR_Tps&o-5#eYY(;yVNxQWg^aPwu15#yyVfRQFg2tUIMocqpS}hADtpk z;g{GmF2*IapLSD+J2>wzuK3n;1$_MVQOE5LqmuJ>TB(er`FR&hqkQ34(Bh0-u<&== zez%Y~`lGd~-t}+WSH!yfFaqX%ZYUG>n}s3`ZvFV7F{^ z=tK$^4FJZbbP5*dho^x&@ZJOx9L#xD4F(ZB;b0d-JE$E6f%hRGL#TL%kmHWH5I>xe zC)m^kWK4%~35a+a7DOldlLBCLIQVZ~7+2m>L%^WFO=x~_@PC5B*r7lOG8GRxsH3Zm zgF>O8gGM@@SPv}D!$S+C2i4PsKn)55d^9S(bLoBT4)C_NHi>6n-rk_o52zvfTI#9Gy<6f z+G50dkOOIOFgMiyRKTz3=I*8gBIqN zhKK{Y2lb79V=c+JKq8(*`;GPdFZR$Mv0LLnq;Nf3;;Donyyp=rnF#tjYZ&3ru^9f5 z?;ot^pJO@jM=XRJ3}maf|Et%(RonsE68{}t?&ja&$CJ1dPvwrb(7l^v?r*UTW$S3Q zxw**|ooe5QahJn3mgbK1-Yc;k!T?l|w{mlHGUlX@ePRyxMtL+x!l_{DmM2M3#dlob pSvNf~;vDtN$}5p)%c7HlP++$_;B=kyp@2&R*jOF6EU|FE{67WAU$+1N literal 0 HcmV?d00001 diff --git a/core/furi/log.c b/core/furi/log.c index c1b5560d..d30e1202 100644 --- a/core/furi/log.c +++ b/core/furi/log.c @@ -1,12 +1,11 @@ #include "log.h" -#include #include "check.h" #include +#include typedef struct { FuriLogLevel log_level; - FuriLogPrint print; - FuriLogVPrint vprint; + FuriLogPuts puts; FuriLogTimestamp timetamp; osMutexId_t mutex; } FuriLogParams; @@ -16,8 +15,7 @@ static FuriLogParams furi_log; void furi_log_init() { // Set default logging parameters furi_log.log_level = FURI_LOG_LEVEL; - furi_log.print = printf; - furi_log.vprint = vprintf; + furi_log.puts = furi_hal_console_puts; furi_log.timetamp = HAL_GetTick; furi_log.mutex = osMutexNew(NULL); } @@ -25,10 +23,22 @@ void furi_log_init() { void furi_log_print(FuriLogLevel level, const char* format, ...) { va_list args; va_start(args, format); - if(level <= furi_log.log_level) { - osMutexAcquire(furi_log.mutex, osWaitForever); - furi_log.print("%lu ", furi_log.timetamp()); - furi_log.vprint(format, args); + if(level <= furi_log.log_level && osMutexAcquire(furi_log.mutex, osWaitForever) == osOK) { + string_t string; + + // Timestamp + string_init_printf(string, "%lu ", furi_log.timetamp()); + furi_log.puts(string_get_cstr(string)); + string_clear(string); + + va_list args; + va_start(args, format); + string_init_vprintf(string, format, args); + va_end(args); + + furi_log.puts(string_get_cstr(string)); + string_clear(string); + osMutexRelease(furi_log.mutex); } va_end(args); @@ -42,16 +52,12 @@ FuriLogLevel furi_log_get_level(void) { return furi_log.log_level; } -void furi_log_set_print(FuriLogPrint print, FuriLogVPrint vprint) { - furi_assert(print); - furi_assert(vprint); - - furi_log.print = print; - furi_log.vprint = vprint; +void furi_log_set_puts(FuriLogPuts puts) { + furi_assert(puts); + furi_log.puts = puts; } void furi_log_set_timestamp(FuriLogTimestamp timestamp) { furi_assert(timestamp); - furi_log.timetamp = timestamp; } diff --git a/core/furi/log.h b/core/furi/log.h index e5573a50..69c3dfde 100644 --- a/core/furi/log.h +++ b/core/furi/log.h @@ -30,8 +30,7 @@ extern "C" { #define FURI_LOG_CLR_D FURI_LOG_CLR(FURI_LOG_CLR_BLUE) #define FURI_LOG_CLR_V -typedef int (*FuriLogPrint)(const char*, ...); -typedef int (*FuriLogVPrint)(const char*, va_list); +typedef void (*FuriLogPuts)(const char* data); typedef uint32_t (*FuriLogTimestamp)(void); typedef enum { @@ -47,7 +46,7 @@ void furi_log_init(); void furi_log_print(FuriLogLevel level, const char* format, ...); void furi_log_set_level(FuriLogLevel level); FuriLogLevel furi_log_get_level(); -void furi_log_set_print(FuriLogPrint print, FuriLogVPrint vprint); +void furi_log_set_puts(FuriLogPuts puts); void furi_log_set_timestamp(FuriLogTimestamp timestamp); #define FURI_LOG_FORMAT(log_letter, tag, format) \ diff --git a/firmware/targets/f6/furi-hal/furi-hal-usb-cdc.c b/firmware/targets/f6/furi-hal/furi-hal-usb-cdc.c index e1f5de7d..918298d2 100644 --- a/firmware/targets/f6/furi-hal/furi-hal-usb-cdc.c +++ b/firmware/targets/f6/furi-hal/furi-hal-usb-cdc.c @@ -1,5 +1,6 @@ #include "furi-hal-version.h" #include "furi-hal-usb_i.h" +#include "furi-hal-usb.h" #include "furi-hal-usb-cdc_i.h" #include @@ -347,7 +348,7 @@ static const struct CdcConfigDescriptorDual cdc_cfg_desc_dual = { static struct usb_cdc_line_coding cdc_config[IF_NUM_MAX] = {}; static uint8_t cdc_ctrl_line_state[IF_NUM_MAX]; -static void cdc_init(usbd_device* dev, struct UsbInterface* intf); +static void cdc_init(usbd_device* dev, UsbInterface* intf); static void cdc_deinit(usbd_device *dev); static void cdc_on_wakeup(usbd_device *dev); static void cdc_on_suspend(usbd_device *dev); @@ -355,10 +356,12 @@ static void cdc_on_suspend(usbd_device *dev); static usbd_respond cdc_ep_config (usbd_device *dev, uint8_t cfg); static usbd_respond cdc_control (usbd_device *dev, usbd_ctlreq *req, usbd_rqc_callback *callback); static usbd_device* usb_dev; -static struct UsbInterface* cdc_if_cur = NULL; +static UsbInterface* cdc_if_cur = NULL; +static bool connected = false; static CdcCallbacks* callbacks[IF_NUM_MAX] = {NULL}; +static void* cb_ctx[IF_NUM_MAX]; -struct UsbInterface usb_cdc_single = { +UsbInterface usb_cdc_single = { .init = cdc_init, .deinit = cdc_deinit, .wakeup = cdc_on_wakeup, @@ -373,7 +376,7 @@ struct UsbInterface usb_cdc_single = { .cfg_descr = (void*)&cdc_cfg_desc_single, }; -struct UsbInterface usb_cdc_dual = { +UsbInterface usb_cdc_dual = { .init = cdc_init, .deinit = cdc_deinit, .wakeup = cdc_on_wakeup, @@ -388,7 +391,7 @@ struct UsbInterface usb_cdc_dual = { .cfg_descr = (void*)&cdc_cfg_desc_dual, }; -static void cdc_init(usbd_device* dev, struct UsbInterface* intf) { +static void cdc_init(usbd_device* dev, UsbInterface* intf) { usb_dev = dev; cdc_if_cur = intf; @@ -428,21 +431,35 @@ static void cdc_deinit(usbd_device *dev) { cdc_if_cur = NULL; } -void furi_hal_cdc_set_callbacks(uint8_t if_num, CdcCallbacks* cb) { - if (if_num < 2) - callbacks[if_num] = cb; +void furi_hal_cdc_set_callbacks(uint8_t if_num, CdcCallbacks* cb, void* context) { + furi_assert(if_num < IF_NUM_MAX); + + if (callbacks[if_num] != NULL) { + if (callbacks[if_num]->state_callback != NULL) { + if (connected == true) + callbacks[if_num]->state_callback(cb_ctx[if_num], 0); + } + } + + callbacks[if_num] = cb; + cb_ctx[if_num] = context; + + if (callbacks[if_num] != NULL) { + if (callbacks[if_num]->state_callback != NULL) { + if (connected == true) + callbacks[if_num]->state_callback(cb_ctx[if_num], 1); + } + } } struct usb_cdc_line_coding* furi_hal_cdc_get_port_settings(uint8_t if_num) { - if (if_num < 2) - return &cdc_config[if_num]; - return NULL; + furi_assert(if_num < IF_NUM_MAX); + return &cdc_config[if_num]; } uint8_t furi_hal_cdc_get_ctrl_line_state(uint8_t if_num) { - if (if_num < 2) - return cdc_ctrl_line_state[if_num]; - return 0; + furi_assert(if_num < IF_NUM_MAX); + return cdc_ctrl_line_state[if_num]; } void furi_hal_cdc_send(uint8_t if_num, uint8_t* buf, uint16_t len) { @@ -462,20 +479,22 @@ int32_t furi_hal_cdc_receive(uint8_t if_num, uint8_t* buf, uint16_t max_len) { } static void cdc_on_wakeup(usbd_device *dev) { + connected = true; for (uint8_t i = 0; i < IF_NUM_MAX; i++) { if (callbacks[i] != NULL) { if (callbacks[i]->state_callback != NULL) - callbacks[i]->state_callback(1); + callbacks[i]->state_callback(cb_ctx[i], 1); } } } static void cdc_on_suspend(usbd_device *dev) { + connected = false; for (uint8_t i = 0; i < IF_NUM_MAX; i++) { cdc_ctrl_line_state[i] = 0; if (callbacks[i] != NULL) { if (callbacks[i]->state_callback != NULL) - callbacks[i]->state_callback(0); + callbacks[i]->state_callback(cb_ctx[i], 0); } } } @@ -489,7 +508,7 @@ static void cdc_rx_ep_callback (usbd_device *dev, uint8_t event, uint8_t ep) { if (callbacks[if_num] != NULL) { if (callbacks[if_num]->rx_ep_callback != NULL) - callbacks[if_num]->rx_ep_callback(); + callbacks[if_num]->rx_ep_callback(cb_ctx[if_num]); } } @@ -502,7 +521,7 @@ static void cdc_tx_ep_callback (usbd_device *dev, uint8_t event, uint8_t ep) { if (callbacks[if_num] != NULL) { if (callbacks[if_num]->tx_ep_callback != NULL) - callbacks[if_num]->tx_ep_callback(); + callbacks[if_num]->tx_ep_callback(cb_ctx[if_num]); } } @@ -590,14 +609,14 @@ static usbd_respond cdc_control(usbd_device* dev, usbd_ctlreq* req, usbd_rqc_cal if (callbacks[if_num] != NULL) { cdc_ctrl_line_state[if_num] = req->wValue; if (callbacks[if_num]->ctrl_line_callback != NULL) - callbacks[if_num]->ctrl_line_callback(cdc_ctrl_line_state[if_num]); + callbacks[if_num]->ctrl_line_callback(cb_ctx[if_num], cdc_ctrl_line_state[if_num]); } return usbd_ack; case USB_CDC_SET_LINE_CODING: memcpy(&cdc_config[if_num], req->data, sizeof(cdc_config[0])); if (callbacks[if_num] != NULL) { if (callbacks[if_num]->config_callback != NULL) - callbacks[if_num]->config_callback(&cdc_config[if_num]); + callbacks[if_num]->config_callback(cb_ctx[if_num], &cdc_config[if_num]); } return usbd_ack; case USB_CDC_GET_LINE_CODING: diff --git a/firmware/targets/f6/furi-hal/furi-hal-usb-cdc_i.h b/firmware/targets/f6/furi-hal/furi-hal-usb-cdc_i.h index c4859e69..9af1e76a 100644 --- a/firmware/targets/f6/furi-hal/furi-hal-usb-cdc_i.h +++ b/firmware/targets/f6/furi-hal/furi-hal-usb-cdc_i.h @@ -6,14 +6,14 @@ #define CDC_DATA_SZ 64 typedef struct { - void (*tx_ep_callback)(void); - void (*rx_ep_callback)(void); - void (*state_callback)(uint8_t state); - void (*ctrl_line_callback)(uint8_t state); - void (*config_callback)(struct usb_cdc_line_coding* config); + void (*tx_ep_callback)(void* context); + void (*rx_ep_callback)(void* context); + void (*state_callback)(void* context, uint8_t state); + void (*ctrl_line_callback)(void* context, uint8_t state); + void (*config_callback)(void* context, struct usb_cdc_line_coding* config); } CdcCallbacks; -void furi_hal_cdc_set_callbacks(uint8_t if_num, CdcCallbacks* cb); +void furi_hal_cdc_set_callbacks(uint8_t if_num, CdcCallbacks* cb, void* context); struct usb_cdc_line_coding* furi_hal_cdc_get_port_settings(uint8_t if_num); diff --git a/firmware/targets/f6/furi-hal/furi-hal-usb-hid.c b/firmware/targets/f6/furi-hal/furi-hal-usb-hid.c index d390c7b5..1e35f7f7 100644 --- a/firmware/targets/f6/furi-hal/furi-hal-usb-hid.c +++ b/firmware/targets/f6/furi-hal/furi-hal-usb-hid.c @@ -1,5 +1,6 @@ #include "furi-hal-version.h" #include "furi-hal-usb_i.h" +#include "furi-hal-usb.h" #include #include "usb.h" @@ -182,7 +183,7 @@ static struct HidReport { struct HidReportMouse mouse; } __attribute__((packed)) hid_report; -static void hid_init(usbd_device* dev, struct UsbInterface* intf); +static void hid_init(usbd_device* dev, UsbInterface* intf); static void hid_deinit(usbd_device *dev); static void hid_on_wakeup(usbd_device *dev); static void hid_on_suspend(usbd_device *dev); @@ -254,7 +255,7 @@ bool furi_hal_hid_mouse_scroll(int8_t delta) { return state; } -struct UsbInterface usb_hid = { +UsbInterface usb_hid = { .init = hid_init, .deinit = hid_deinit, .wakeup = hid_on_wakeup, @@ -269,7 +270,7 @@ struct UsbInterface usb_hid = { .cfg_descr = (void*)&hid_cfg_desc, }; -static void hid_init(usbd_device* dev, struct UsbInterface* intf) { +static void hid_init(usbd_device* dev, UsbInterface* intf) { if (hid_semaphore == NULL) hid_semaphore = osSemaphoreNew(1, 1, NULL); usb_dev = dev; diff --git a/firmware/targets/f6/furi-hal/furi-hal-usb.c b/firmware/targets/f6/furi-hal/furi-hal-usb.c index 45a6177e..513c718c 100644 --- a/firmware/targets/f6/furi-hal/furi-hal-usb.c +++ b/firmware/targets/f6/furi-hal/furi-hal-usb.c @@ -9,17 +9,8 @@ #define USB_RECONNECT_DELAY 500 -extern struct UsbInterface usb_cdc_single; -extern struct UsbInterface usb_cdc_dual; -extern struct UsbInterface usb_hid; - -static struct UsbInterface* const usb_if_modes[UsbModesNum] = { - NULL, - &usb_cdc_single, - &usb_cdc_dual, - &usb_hid, - NULL,//&usb_hid_u2f, -}; +static UsbInterface* usb_if_cur; +static UsbInterface* usb_if_next; static const struct usb_string_descriptor dev_lang_desc = USB_ARRAY_DESC(USB_LANGID_ENG_US); @@ -32,8 +23,6 @@ static void wkup_evt(usbd_device *dev, uint8_t event, uint8_t ep); struct UsbCfg{ osTimerId_t reconnect_tmr; - UsbMode mode_cur; - UsbMode mode_next; bool enabled; bool connected; } usb_config; @@ -69,30 +58,30 @@ void furi_hal_usb_init(void) { FURI_LOG_I(TAG, "Init OK"); } -void furi_hal_usb_set_config(UsbMode new_mode) { - if (new_mode != usb_config.mode_cur) { +void furi_hal_usb_set_config(UsbInterface* new_if) { + if (new_if != usb_if_cur) { if (usb_config.enabled) { - usb_config.mode_next = new_mode; + usb_if_next = new_if; if (usb_config.reconnect_tmr == NULL) usb_config.reconnect_tmr = osTimerNew(furi_hal_usb_tmr_cb, osTimerOnce, NULL, NULL); furi_hal_usb_disable(); osTimerStart(usb_config.reconnect_tmr, USB_RECONNECT_DELAY); } else { - if (usb_if_modes[usb_config.mode_cur] != NULL) - usb_if_modes[usb_config.mode_cur]->deinit(&udev); - if (usb_if_modes[new_mode] != NULL) { - usb_if_modes[new_mode]->init(&udev, usb_if_modes[new_mode]); - FURI_LOG_I(TAG, "USB mode change %u -> %u", usb_config.mode_cur, new_mode); + if (usb_if_cur != NULL) + usb_if_cur->deinit(&udev); + if (new_if != NULL) { + new_if->init(&udev, new_if); + FURI_LOG_I(TAG, "USB mode change"); usb_config.enabled = true; - usb_config.mode_cur = new_mode; + usb_if_cur = new_if; } } } } -UsbMode furi_hal_usb_get_config() { - return usb_config.mode_cur; +UsbInterface* furi_hal_usb_get_config() { + return usb_if_cur; } void furi_hal_usb_disable() { @@ -105,7 +94,7 @@ void furi_hal_usb_disable() { } void furi_hal_usb_enable() { - if ((!usb_config.enabled) && (usb_if_modes[usb_config.mode_cur] != NULL)) { + if ((!usb_config.enabled) && (usb_if_cur != NULL)) { usbd_connect(&udev, true); usb_config.enabled = true; FURI_LOG_I(TAG, "USB Enable"); @@ -113,35 +102,35 @@ void furi_hal_usb_enable() { } static void furi_hal_usb_tmr_cb(void* context) { - furi_hal_usb_set_config(usb_config.mode_next); + furi_hal_usb_set_config(usb_if_next); } /* Get device / configuration descriptors */ -static usbd_respond usb_descriptor_get (usbd_ctlreq *req, void **address, uint16_t *length) { +static usbd_respond usb_descriptor_get(usbd_ctlreq *req, void **address, uint16_t *length) { const uint8_t dtype = req->wValue >> 8; const uint8_t dnumber = req->wValue & 0xFF; const void* desc; uint16_t len = 0; - if (usb_if_modes[usb_config.mode_cur] == NULL) + if (usb_if_cur == NULL) return usbd_fail; switch (dtype) { case USB_DTYPE_DEVICE: - desc = usb_if_modes[usb_config.mode_cur]->dev_descr; + desc = usb_if_cur->dev_descr; break; case USB_DTYPE_CONFIGURATION: - desc = usb_if_modes[usb_config.mode_cur]->cfg_descr; - len = ((struct usb_string_descriptor*)(usb_if_modes[usb_config.mode_cur]->cfg_descr))->wString[0]; + desc = usb_if_cur->cfg_descr; + len = ((struct usb_string_descriptor*)(usb_if_cur->cfg_descr))->wString[0]; break; case USB_DTYPE_STRING: if (dnumber == UsbDevLang) { desc = &dev_lang_desc; } else if (dnumber == UsbDevManuf) { - desc = usb_if_modes[usb_config.mode_cur]->str_manuf_descr; + desc = usb_if_cur->str_manuf_descr; } else if (dnumber == UsbDevProduct) { - desc = usb_if_modes[usb_config.mode_cur]->str_prod_descr; + desc = usb_if_cur->str_prod_descr; } else if (dnumber == UsbDevSerial) { - desc = usb_if_modes[usb_config.mode_cur]->str_serial_descr; + desc = usb_if_cur->str_serial_descr; } else return usbd_fail; break; @@ -160,15 +149,15 @@ static usbd_respond usb_descriptor_get (usbd_ctlreq *req, void **address, uint16 } static void susp_evt(usbd_device *dev, uint8_t event, uint8_t ep) { - if ((usb_if_modes[usb_config.mode_cur] != NULL) && (usb_config.connected == true)) { + if ((usb_if_cur != NULL) && (usb_config.connected == true)) { usb_config.connected = false; - usb_if_modes[usb_config.mode_cur]->suspend(&udev); + usb_if_cur->suspend(&udev); } } static void wkup_evt(usbd_device *dev, uint8_t event, uint8_t ep) { - if ((usb_if_modes[usb_config.mode_cur] != NULL) && (usb_config.connected == false)) { + if ((usb_if_cur != NULL) && (usb_config.connected == false)) { usb_config.connected = true; - usb_if_modes[usb_config.mode_cur]->wakeup(&udev); + usb_if_cur->wakeup(&udev); } } diff --git a/firmware/targets/f6/furi-hal/furi-hal-usb_i.h b/firmware/targets/f6/furi-hal/furi-hal-usb_i.h index b329c51f..a3ef8e05 100644 --- a/firmware/targets/f6/furi-hal/furi-hal-usb_i.h +++ b/firmware/targets/f6/furi-hal/furi-hal-usb_i.h @@ -11,18 +11,3 @@ enum UsbDevDescStr{ UsbDevProduct = 2, UsbDevSerial = 3, }; - -struct UsbInterface { - void (*init)(usbd_device *dev, struct UsbInterface* intf); - void (*deinit)(usbd_device *dev); - void (*wakeup)(usbd_device *dev); - void (*suspend)(usbd_device *dev); - - struct usb_device_descriptor* dev_descr; - - void* str_manuf_descr; - void* str_prod_descr; - void* str_serial_descr; - - void* cfg_descr; -}; diff --git a/firmware/targets/f6/furi-hal/furi-hal-vcp.c b/firmware/targets/f6/furi-hal/furi-hal-vcp.c index 039481f1..ce3cda49 100644 --- a/firmware/targets/f6/furi-hal/furi-hal-vcp.c +++ b/firmware/targets/f6/furi-hal/furi-hal-vcp.c @@ -13,17 +13,17 @@ typedef enum { VcpEvtReserved = (1 << 0), // Reserved for StreamBuffer internal event - VcpEvtConnect = (1 << 1), - VcpEvtDisconnect = (1 << 2), - VcpEvtEnable = (1 << 3), - VcpEvtDisable = (1 << 4), - VcpEvtRx = (1 << 5), - VcpEvtTx = (1 << 6), - VcpEvtStreamRx = (1 << 7), - VcpEvtStreamTx = (1 << 8), + VcpEvtEnable = (1 << 1), + VcpEvtDisable = (1 << 2), + VcpEvtConnect = (1 << 3), + VcpEvtDisconnect = (1 << 4), + VcpEvtStreamRx = (1 << 5), + VcpEvtRx = (1 << 6), + VcpEvtStreamTx = (1 << 7), + VcpEvtTx = (1 << 8), } WorkerEvtFlags; -#define VCP_THREAD_FLAG_ALL (VcpEvtConnect | VcpEvtDisconnect | VcpEvtEnable | VcpEvtDisable | VcpEvtRx | VcpEvtTx | VcpEvtStreamRx | VcpEvtStreamTx) +#define VCP_THREAD_FLAG_ALL (VcpEvtEnable | VcpEvtDisable | VcpEvtConnect | VcpEvtDisconnect | VcpEvtRx | VcpEvtTx | VcpEvtStreamRx | VcpEvtStreamTx) typedef struct { FuriThread* thread; @@ -37,10 +37,10 @@ typedef struct { } FuriHalVcp; static int32_t vcp_worker(void* context); -static void vcp_on_cdc_tx_complete(); -static void vcp_on_cdc_rx(); -static void vcp_state_callback(uint8_t state); -static void vcp_on_cdc_control_line(uint8_t state); +static void vcp_on_cdc_tx_complete(void* context); +static void vcp_on_cdc_rx(void* context); +static void vcp_state_callback(void* context, uint8_t state); +static void vcp_on_cdc_control_line(void* context, uint8_t state); static CdcCallbacks cdc_cb = { vcp_on_cdc_tx_complete, @@ -76,93 +76,19 @@ static int32_t vcp_worker(void* context) { bool tx_idle = false; size_t missed_rx = 0; - furi_hal_cdc_set_callbacks(VCP_IF_NUM, &cdc_cb); + furi_hal_cdc_set_callbacks(VCP_IF_NUM, &cdc_cb, NULL); while (1) { uint32_t flags = osThreadFlagsWait(VCP_THREAD_FLAG_ALL, osFlagsWaitAny, osWaitForever); furi_assert((flags & osFlagsError) == 0); - // New data received - if((flags & VcpEvtStreamRx) && enabled && missed_rx > 0) { -#ifdef FURI_HAL_USB_VCP_DEBUG - furi_hal_console_puts("VCP StreamRx\r\n"); -#endif - if (xStreamBufferSpacesAvailable(vcp->rx_stream) >= USB_CDC_PKT_LEN) { - flags |= VcpEvtRx; - missed_rx--; - } - } - - // Rx buffer was read, maybe there is enough space for new data? - if((flags & VcpEvtRx)) { - if (xStreamBufferSpacesAvailable(vcp->rx_stream) >= USB_CDC_PKT_LEN) { - int32_t len = furi_hal_cdc_receive(VCP_IF_NUM, vcp->data_buffer, USB_CDC_PKT_LEN); -#ifdef FURI_HAL_USB_VCP_DEBUG - furi_hal_console_printf("VCP Rx %d\r\n", len); -#endif - if (len > 0) { - furi_check(xStreamBufferSend(vcp->rx_stream, vcp->data_buffer, len, osWaitForever) == len); - } - } else { -#ifdef FURI_HAL_USB_VCP_DEBUG - furi_hal_console_puts("VCP Rx missed\r\n"); -#endif - missed_rx++; - } - } - - // New data in Tx buffer - if((flags & VcpEvtStreamTx) && enabled) { -#ifdef FURI_HAL_USB_VCP_DEBUG - furi_hal_console_puts("VCP StreamTx\r\n"); -#endif - if (tx_idle) { - flags |= VcpEvtTx; - } - } - - // CDC write transfer done - if((flags & VcpEvtTx) && enabled) { - size_t len = xStreamBufferReceive(vcp->tx_stream, vcp->data_buffer, USB_CDC_PKT_LEN, 0); -#ifdef FURI_HAL_USB_VCP_DEBUG - furi_hal_console_printf("VCP Tx %d\r\n", len); -#endif - if (len > 0) { // Some data left in Tx buffer. Sending it now - tx_idle = false; - furi_hal_cdc_send(VCP_IF_NUM, vcp->data_buffer, len); - } else { // There is nothing to send. Set flag to start next transfer instantly - tx_idle = true; - } - } - - // VCP session opened - if((flags & VcpEvtConnect) && enabled) { -#ifdef FURI_HAL_USB_VCP_DEBUG - furi_hal_console_puts("VCP Connect\r\n"); -#endif - if (vcp->connected == false) { - vcp->connected = true; - xStreamBufferSend(vcp->rx_stream, &ascii_soh, 1, osWaitForever); - } - } - - // VCP session closed - if((flags & VcpEvtDisconnect) && enabled) { -#ifdef FURI_HAL_USB_VCP_DEBUG - furi_hal_console_puts("VCP Disconnect\r\n"); -#endif - if (vcp->connected == true) { - vcp->connected = false; - xStreamBufferSend(vcp->rx_stream, &ascii_eot, 1, osWaitForever); - } - } - // VCP enabled if((flags & VcpEvtEnable) && !enabled){ #ifdef FURI_HAL_USB_VCP_DEBUG - furi_hal_console_puts("VCP Enable\r\n"); -#endif - furi_hal_cdc_set_callbacks(VCP_IF_NUM, &cdc_cb); + FURI_LOG_D(TAG, "Enable"); +#endif + flags |= VcpEvtTx; + furi_hal_cdc_set_callbacks(VCP_IF_NUM, &cdc_cb, NULL); enabled = true; furi_hal_cdc_receive(VCP_IF_NUM, vcp->data_buffer, USB_CDC_PKT_LEN); // flush Rx buffer if (furi_hal_cdc_get_ctrl_line_state(VCP_IF_NUM) & (1 << 0)) { @@ -173,13 +99,90 @@ static int32_t vcp_worker(void* context) { // VCP disabled if((flags & VcpEvtDisable) && enabled) { -#ifdef FURI_HAL_USB_VCP_DEBUG - furi_hal_console_puts("VCP Disable\r\n"); -#endif +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "Disable"); +#endif enabled = false; vcp->connected = false; + xStreamBufferReceive(vcp->tx_stream, vcp->data_buffer, USB_CDC_PKT_LEN, 0); xStreamBufferSend(vcp->rx_stream, &ascii_eot, 1, osWaitForever); } + + // VCP session opened + if((flags & VcpEvtConnect) && enabled) { +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "Connect"); +#endif + if (vcp->connected == false) { + vcp->connected = true; + xStreamBufferSend(vcp->rx_stream, &ascii_soh, 1, osWaitForever); + } + } + + // VCP session closed + if((flags & VcpEvtDisconnect) && enabled) { +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "Disconnect"); +#endif + if (vcp->connected == true) { + vcp->connected = false; + xStreamBufferReceive(vcp->tx_stream, vcp->data_buffer, USB_CDC_PKT_LEN, 0); + xStreamBufferSend(vcp->rx_stream, &ascii_eot, 1, osWaitForever); + } + } + + // Rx buffer was read, maybe there is enough space for new data? + if((flags & VcpEvtStreamRx) && enabled && missed_rx > 0) { +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "StreamRx"); +#endif + if (xStreamBufferSpacesAvailable(vcp->rx_stream) >= USB_CDC_PKT_LEN) { + flags |= VcpEvtRx; + missed_rx--; + } + } + + // New data received + if((flags & VcpEvtRx)) { + if (xStreamBufferSpacesAvailable(vcp->rx_stream) >= USB_CDC_PKT_LEN) { + int32_t len = furi_hal_cdc_receive(VCP_IF_NUM, vcp->data_buffer, USB_CDC_PKT_LEN); +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "Rx %d", len); +#endif + if (len > 0) { + furi_check(xStreamBufferSend(vcp->rx_stream, vcp->data_buffer, len, osWaitForever) == len); + } + } else { +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "Rx missed"); +#endif + missed_rx++; + } + } + + // New data in Tx buffer + if((flags & VcpEvtStreamTx) && enabled) { +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "StreamTx"); +#endif + if (tx_idle) { + flags |= VcpEvtTx; + } + } + + // CDC write transfer done + if((flags & VcpEvtTx) && enabled) { + size_t len = xStreamBufferReceive(vcp->tx_stream, vcp->data_buffer, USB_CDC_PKT_LEN, 0); +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "Tx %d", len); +#endif + if (len > 0) { // Some data left in Tx buffer. Sending it now + tx_idle = false; + furi_hal_cdc_send(VCP_IF_NUM, vcp->data_buffer, len); + } else { // There is nothing to send. Set flag to start next transfer instantly + tx_idle = true; + } + } } return 0; } @@ -196,6 +199,10 @@ size_t furi_hal_vcp_rx_with_timeout(uint8_t* buffer, size_t size, uint32_t timeo furi_assert(vcp); furi_assert(buffer); +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "rx %u start", size); +#endif + size_t rx_cnt = 0; while (size > 0) { @@ -204,6 +211,9 @@ size_t furi_hal_vcp_rx_with_timeout(uint8_t* buffer, size_t size, uint32_t timeo batch_size = VCP_RX_BUF_SIZE; size_t len = xStreamBufferReceive(vcp->rx_stream, buffer, batch_size, timeout); +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "%u ", batch_size); +#endif if (len == 0) break; osThreadFlagsSet(furi_thread_get_thread_id(vcp->thread), VcpEvtStreamRx); @@ -211,6 +221,10 @@ size_t furi_hal_vcp_rx_with_timeout(uint8_t* buffer, size_t size, uint32_t timeo buffer += len; rx_cnt += len; } + +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "rx %u end", size); +#endif return rx_cnt; } @@ -223,34 +237,40 @@ void furi_hal_vcp_tx(const uint8_t* buffer, size_t size) { furi_assert(vcp); furi_assert(buffer); - while (size > 0) { +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "tx %u start", size); +#endif + + while (size > 0 && vcp->connected) { size_t batch_size = size; - if (batch_size > VCP_TX_BUF_SIZE) - batch_size = VCP_TX_BUF_SIZE; + if (batch_size > USB_CDC_PKT_LEN) + batch_size = USB_CDC_PKT_LEN; xStreamBufferSend(vcp->tx_stream, buffer, batch_size, osWaitForever); osThreadFlagsSet(furi_thread_get_thread_id(vcp->thread), VcpEvtStreamTx); +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "%u ", batch_size); +#endif size -= batch_size; buffer += batch_size; } + +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "tx %u end", size); +#endif } -static void vcp_state_callback(uint8_t state) { -#ifdef FURI_HAL_USB_VCP_DEBUG - furi_hal_console_puts("VCP State\r\n"); -#endif +static void vcp_state_callback(void* context, uint8_t state) { if (state == 0) { osThreadFlagsSet(furi_thread_get_thread_id(vcp->thread), VcpEvtDisconnect); } } -static void vcp_on_cdc_control_line(uint8_t state) { +static void vcp_on_cdc_control_line(void* context, uint8_t state) { // bit 0: DTR state, bit 1: RTS state bool dtr = state & (1 << 0); -#ifdef FURI_HAL_USB_VCP_DEBUG - furi_hal_console_puts("VCP CtrlLine\r\n"); -#endif + if (dtr == true) { osThreadFlagsSet(furi_thread_get_thread_id(vcp->thread), VcpEvtConnect); } else { @@ -258,12 +278,12 @@ static void vcp_on_cdc_control_line(uint8_t state) { } } -static void vcp_on_cdc_rx() { +static void vcp_on_cdc_rx(void* context) { uint32_t ret = osThreadFlagsSet(furi_thread_get_thread_id(vcp->thread), VcpEvtRx); furi_assert((ret & osFlagsError) == 0); } -static void vcp_on_cdc_tx_complete() { +static void vcp_on_cdc_tx_complete(void* context) { osThreadFlagsSet(furi_thread_get_thread_id(vcp->thread), VcpEvtTx); } @@ -271,4 +291,3 @@ bool furi_hal_vcp_is_connected(void) { furi_assert(vcp); return vcp->connected; } - diff --git a/firmware/targets/f6/furi-hal/furi-hal.c b/firmware/targets/f6/furi-hal/furi-hal.c index d435c5f2..491cdf0d 100644 --- a/firmware/targets/f6/furi-hal/furi-hal.c +++ b/firmware/targets/f6/furi-hal/furi-hal.c @@ -40,7 +40,7 @@ void furi_hal_init() { // VCP + USB furi_hal_usb_init(); - furi_hal_usb_set_config(UsbModeVcpSingle); + furi_hal_usb_set_config(&usb_cdc_single); furi_hal_vcp_init(); FURI_LOG_I(TAG, "USB OK"); diff --git a/firmware/targets/f7/furi-hal/furi-hal-usb-cdc.c b/firmware/targets/f7/furi-hal/furi-hal-usb-cdc.c index e1f5de7d..918298d2 100644 --- a/firmware/targets/f7/furi-hal/furi-hal-usb-cdc.c +++ b/firmware/targets/f7/furi-hal/furi-hal-usb-cdc.c @@ -1,5 +1,6 @@ #include "furi-hal-version.h" #include "furi-hal-usb_i.h" +#include "furi-hal-usb.h" #include "furi-hal-usb-cdc_i.h" #include @@ -347,7 +348,7 @@ static const struct CdcConfigDescriptorDual cdc_cfg_desc_dual = { static struct usb_cdc_line_coding cdc_config[IF_NUM_MAX] = {}; static uint8_t cdc_ctrl_line_state[IF_NUM_MAX]; -static void cdc_init(usbd_device* dev, struct UsbInterface* intf); +static void cdc_init(usbd_device* dev, UsbInterface* intf); static void cdc_deinit(usbd_device *dev); static void cdc_on_wakeup(usbd_device *dev); static void cdc_on_suspend(usbd_device *dev); @@ -355,10 +356,12 @@ static void cdc_on_suspend(usbd_device *dev); static usbd_respond cdc_ep_config (usbd_device *dev, uint8_t cfg); static usbd_respond cdc_control (usbd_device *dev, usbd_ctlreq *req, usbd_rqc_callback *callback); static usbd_device* usb_dev; -static struct UsbInterface* cdc_if_cur = NULL; +static UsbInterface* cdc_if_cur = NULL; +static bool connected = false; static CdcCallbacks* callbacks[IF_NUM_MAX] = {NULL}; +static void* cb_ctx[IF_NUM_MAX]; -struct UsbInterface usb_cdc_single = { +UsbInterface usb_cdc_single = { .init = cdc_init, .deinit = cdc_deinit, .wakeup = cdc_on_wakeup, @@ -373,7 +376,7 @@ struct UsbInterface usb_cdc_single = { .cfg_descr = (void*)&cdc_cfg_desc_single, }; -struct UsbInterface usb_cdc_dual = { +UsbInterface usb_cdc_dual = { .init = cdc_init, .deinit = cdc_deinit, .wakeup = cdc_on_wakeup, @@ -388,7 +391,7 @@ struct UsbInterface usb_cdc_dual = { .cfg_descr = (void*)&cdc_cfg_desc_dual, }; -static void cdc_init(usbd_device* dev, struct UsbInterface* intf) { +static void cdc_init(usbd_device* dev, UsbInterface* intf) { usb_dev = dev; cdc_if_cur = intf; @@ -428,21 +431,35 @@ static void cdc_deinit(usbd_device *dev) { cdc_if_cur = NULL; } -void furi_hal_cdc_set_callbacks(uint8_t if_num, CdcCallbacks* cb) { - if (if_num < 2) - callbacks[if_num] = cb; +void furi_hal_cdc_set_callbacks(uint8_t if_num, CdcCallbacks* cb, void* context) { + furi_assert(if_num < IF_NUM_MAX); + + if (callbacks[if_num] != NULL) { + if (callbacks[if_num]->state_callback != NULL) { + if (connected == true) + callbacks[if_num]->state_callback(cb_ctx[if_num], 0); + } + } + + callbacks[if_num] = cb; + cb_ctx[if_num] = context; + + if (callbacks[if_num] != NULL) { + if (callbacks[if_num]->state_callback != NULL) { + if (connected == true) + callbacks[if_num]->state_callback(cb_ctx[if_num], 1); + } + } } struct usb_cdc_line_coding* furi_hal_cdc_get_port_settings(uint8_t if_num) { - if (if_num < 2) - return &cdc_config[if_num]; - return NULL; + furi_assert(if_num < IF_NUM_MAX); + return &cdc_config[if_num]; } uint8_t furi_hal_cdc_get_ctrl_line_state(uint8_t if_num) { - if (if_num < 2) - return cdc_ctrl_line_state[if_num]; - return 0; + furi_assert(if_num < IF_NUM_MAX); + return cdc_ctrl_line_state[if_num]; } void furi_hal_cdc_send(uint8_t if_num, uint8_t* buf, uint16_t len) { @@ -462,20 +479,22 @@ int32_t furi_hal_cdc_receive(uint8_t if_num, uint8_t* buf, uint16_t max_len) { } static void cdc_on_wakeup(usbd_device *dev) { + connected = true; for (uint8_t i = 0; i < IF_NUM_MAX; i++) { if (callbacks[i] != NULL) { if (callbacks[i]->state_callback != NULL) - callbacks[i]->state_callback(1); + callbacks[i]->state_callback(cb_ctx[i], 1); } } } static void cdc_on_suspend(usbd_device *dev) { + connected = false; for (uint8_t i = 0; i < IF_NUM_MAX; i++) { cdc_ctrl_line_state[i] = 0; if (callbacks[i] != NULL) { if (callbacks[i]->state_callback != NULL) - callbacks[i]->state_callback(0); + callbacks[i]->state_callback(cb_ctx[i], 0); } } } @@ -489,7 +508,7 @@ static void cdc_rx_ep_callback (usbd_device *dev, uint8_t event, uint8_t ep) { if (callbacks[if_num] != NULL) { if (callbacks[if_num]->rx_ep_callback != NULL) - callbacks[if_num]->rx_ep_callback(); + callbacks[if_num]->rx_ep_callback(cb_ctx[if_num]); } } @@ -502,7 +521,7 @@ static void cdc_tx_ep_callback (usbd_device *dev, uint8_t event, uint8_t ep) { if (callbacks[if_num] != NULL) { if (callbacks[if_num]->tx_ep_callback != NULL) - callbacks[if_num]->tx_ep_callback(); + callbacks[if_num]->tx_ep_callback(cb_ctx[if_num]); } } @@ -590,14 +609,14 @@ static usbd_respond cdc_control(usbd_device* dev, usbd_ctlreq* req, usbd_rqc_cal if (callbacks[if_num] != NULL) { cdc_ctrl_line_state[if_num] = req->wValue; if (callbacks[if_num]->ctrl_line_callback != NULL) - callbacks[if_num]->ctrl_line_callback(cdc_ctrl_line_state[if_num]); + callbacks[if_num]->ctrl_line_callback(cb_ctx[if_num], cdc_ctrl_line_state[if_num]); } return usbd_ack; case USB_CDC_SET_LINE_CODING: memcpy(&cdc_config[if_num], req->data, sizeof(cdc_config[0])); if (callbacks[if_num] != NULL) { if (callbacks[if_num]->config_callback != NULL) - callbacks[if_num]->config_callback(&cdc_config[if_num]); + callbacks[if_num]->config_callback(cb_ctx[if_num], &cdc_config[if_num]); } return usbd_ack; case USB_CDC_GET_LINE_CODING: diff --git a/firmware/targets/f7/furi-hal/furi-hal-usb-cdc_i.h b/firmware/targets/f7/furi-hal/furi-hal-usb-cdc_i.h index c4859e69..9af1e76a 100644 --- a/firmware/targets/f7/furi-hal/furi-hal-usb-cdc_i.h +++ b/firmware/targets/f7/furi-hal/furi-hal-usb-cdc_i.h @@ -6,14 +6,14 @@ #define CDC_DATA_SZ 64 typedef struct { - void (*tx_ep_callback)(void); - void (*rx_ep_callback)(void); - void (*state_callback)(uint8_t state); - void (*ctrl_line_callback)(uint8_t state); - void (*config_callback)(struct usb_cdc_line_coding* config); + void (*tx_ep_callback)(void* context); + void (*rx_ep_callback)(void* context); + void (*state_callback)(void* context, uint8_t state); + void (*ctrl_line_callback)(void* context, uint8_t state); + void (*config_callback)(void* context, struct usb_cdc_line_coding* config); } CdcCallbacks; -void furi_hal_cdc_set_callbacks(uint8_t if_num, CdcCallbacks* cb); +void furi_hal_cdc_set_callbacks(uint8_t if_num, CdcCallbacks* cb, void* context); struct usb_cdc_line_coding* furi_hal_cdc_get_port_settings(uint8_t if_num); diff --git a/firmware/targets/f7/furi-hal/furi-hal-usb-hid.c b/firmware/targets/f7/furi-hal/furi-hal-usb-hid.c index d390c7b5..1e35f7f7 100644 --- a/firmware/targets/f7/furi-hal/furi-hal-usb-hid.c +++ b/firmware/targets/f7/furi-hal/furi-hal-usb-hid.c @@ -1,5 +1,6 @@ #include "furi-hal-version.h" #include "furi-hal-usb_i.h" +#include "furi-hal-usb.h" #include #include "usb.h" @@ -182,7 +183,7 @@ static struct HidReport { struct HidReportMouse mouse; } __attribute__((packed)) hid_report; -static void hid_init(usbd_device* dev, struct UsbInterface* intf); +static void hid_init(usbd_device* dev, UsbInterface* intf); static void hid_deinit(usbd_device *dev); static void hid_on_wakeup(usbd_device *dev); static void hid_on_suspend(usbd_device *dev); @@ -254,7 +255,7 @@ bool furi_hal_hid_mouse_scroll(int8_t delta) { return state; } -struct UsbInterface usb_hid = { +UsbInterface usb_hid = { .init = hid_init, .deinit = hid_deinit, .wakeup = hid_on_wakeup, @@ -269,7 +270,7 @@ struct UsbInterface usb_hid = { .cfg_descr = (void*)&hid_cfg_desc, }; -static void hid_init(usbd_device* dev, struct UsbInterface* intf) { +static void hid_init(usbd_device* dev, UsbInterface* intf) { if (hid_semaphore == NULL) hid_semaphore = osSemaphoreNew(1, 1, NULL); usb_dev = dev; diff --git a/firmware/targets/f7/furi-hal/furi-hal-usb.c b/firmware/targets/f7/furi-hal/furi-hal-usb.c index 45a6177e..513c718c 100644 --- a/firmware/targets/f7/furi-hal/furi-hal-usb.c +++ b/firmware/targets/f7/furi-hal/furi-hal-usb.c @@ -9,17 +9,8 @@ #define USB_RECONNECT_DELAY 500 -extern struct UsbInterface usb_cdc_single; -extern struct UsbInterface usb_cdc_dual; -extern struct UsbInterface usb_hid; - -static struct UsbInterface* const usb_if_modes[UsbModesNum] = { - NULL, - &usb_cdc_single, - &usb_cdc_dual, - &usb_hid, - NULL,//&usb_hid_u2f, -}; +static UsbInterface* usb_if_cur; +static UsbInterface* usb_if_next; static const struct usb_string_descriptor dev_lang_desc = USB_ARRAY_DESC(USB_LANGID_ENG_US); @@ -32,8 +23,6 @@ static void wkup_evt(usbd_device *dev, uint8_t event, uint8_t ep); struct UsbCfg{ osTimerId_t reconnect_tmr; - UsbMode mode_cur; - UsbMode mode_next; bool enabled; bool connected; } usb_config; @@ -69,30 +58,30 @@ void furi_hal_usb_init(void) { FURI_LOG_I(TAG, "Init OK"); } -void furi_hal_usb_set_config(UsbMode new_mode) { - if (new_mode != usb_config.mode_cur) { +void furi_hal_usb_set_config(UsbInterface* new_if) { + if (new_if != usb_if_cur) { if (usb_config.enabled) { - usb_config.mode_next = new_mode; + usb_if_next = new_if; if (usb_config.reconnect_tmr == NULL) usb_config.reconnect_tmr = osTimerNew(furi_hal_usb_tmr_cb, osTimerOnce, NULL, NULL); furi_hal_usb_disable(); osTimerStart(usb_config.reconnect_tmr, USB_RECONNECT_DELAY); } else { - if (usb_if_modes[usb_config.mode_cur] != NULL) - usb_if_modes[usb_config.mode_cur]->deinit(&udev); - if (usb_if_modes[new_mode] != NULL) { - usb_if_modes[new_mode]->init(&udev, usb_if_modes[new_mode]); - FURI_LOG_I(TAG, "USB mode change %u -> %u", usb_config.mode_cur, new_mode); + if (usb_if_cur != NULL) + usb_if_cur->deinit(&udev); + if (new_if != NULL) { + new_if->init(&udev, new_if); + FURI_LOG_I(TAG, "USB mode change"); usb_config.enabled = true; - usb_config.mode_cur = new_mode; + usb_if_cur = new_if; } } } } -UsbMode furi_hal_usb_get_config() { - return usb_config.mode_cur; +UsbInterface* furi_hal_usb_get_config() { + return usb_if_cur; } void furi_hal_usb_disable() { @@ -105,7 +94,7 @@ void furi_hal_usb_disable() { } void furi_hal_usb_enable() { - if ((!usb_config.enabled) && (usb_if_modes[usb_config.mode_cur] != NULL)) { + if ((!usb_config.enabled) && (usb_if_cur != NULL)) { usbd_connect(&udev, true); usb_config.enabled = true; FURI_LOG_I(TAG, "USB Enable"); @@ -113,35 +102,35 @@ void furi_hal_usb_enable() { } static void furi_hal_usb_tmr_cb(void* context) { - furi_hal_usb_set_config(usb_config.mode_next); + furi_hal_usb_set_config(usb_if_next); } /* Get device / configuration descriptors */ -static usbd_respond usb_descriptor_get (usbd_ctlreq *req, void **address, uint16_t *length) { +static usbd_respond usb_descriptor_get(usbd_ctlreq *req, void **address, uint16_t *length) { const uint8_t dtype = req->wValue >> 8; const uint8_t dnumber = req->wValue & 0xFF; const void* desc; uint16_t len = 0; - if (usb_if_modes[usb_config.mode_cur] == NULL) + if (usb_if_cur == NULL) return usbd_fail; switch (dtype) { case USB_DTYPE_DEVICE: - desc = usb_if_modes[usb_config.mode_cur]->dev_descr; + desc = usb_if_cur->dev_descr; break; case USB_DTYPE_CONFIGURATION: - desc = usb_if_modes[usb_config.mode_cur]->cfg_descr; - len = ((struct usb_string_descriptor*)(usb_if_modes[usb_config.mode_cur]->cfg_descr))->wString[0]; + desc = usb_if_cur->cfg_descr; + len = ((struct usb_string_descriptor*)(usb_if_cur->cfg_descr))->wString[0]; break; case USB_DTYPE_STRING: if (dnumber == UsbDevLang) { desc = &dev_lang_desc; } else if (dnumber == UsbDevManuf) { - desc = usb_if_modes[usb_config.mode_cur]->str_manuf_descr; + desc = usb_if_cur->str_manuf_descr; } else if (dnumber == UsbDevProduct) { - desc = usb_if_modes[usb_config.mode_cur]->str_prod_descr; + desc = usb_if_cur->str_prod_descr; } else if (dnumber == UsbDevSerial) { - desc = usb_if_modes[usb_config.mode_cur]->str_serial_descr; + desc = usb_if_cur->str_serial_descr; } else return usbd_fail; break; @@ -160,15 +149,15 @@ static usbd_respond usb_descriptor_get (usbd_ctlreq *req, void **address, uint16 } static void susp_evt(usbd_device *dev, uint8_t event, uint8_t ep) { - if ((usb_if_modes[usb_config.mode_cur] != NULL) && (usb_config.connected == true)) { + if ((usb_if_cur != NULL) && (usb_config.connected == true)) { usb_config.connected = false; - usb_if_modes[usb_config.mode_cur]->suspend(&udev); + usb_if_cur->suspend(&udev); } } static void wkup_evt(usbd_device *dev, uint8_t event, uint8_t ep) { - if ((usb_if_modes[usb_config.mode_cur] != NULL) && (usb_config.connected == false)) { + if ((usb_if_cur != NULL) && (usb_config.connected == false)) { usb_config.connected = true; - usb_if_modes[usb_config.mode_cur]->wakeup(&udev); + usb_if_cur->wakeup(&udev); } } diff --git a/firmware/targets/f7/furi-hal/furi-hal-usb_i.h b/firmware/targets/f7/furi-hal/furi-hal-usb_i.h index b329c51f..a3ef8e05 100644 --- a/firmware/targets/f7/furi-hal/furi-hal-usb_i.h +++ b/firmware/targets/f7/furi-hal/furi-hal-usb_i.h @@ -11,18 +11,3 @@ enum UsbDevDescStr{ UsbDevProduct = 2, UsbDevSerial = 3, }; - -struct UsbInterface { - void (*init)(usbd_device *dev, struct UsbInterface* intf); - void (*deinit)(usbd_device *dev); - void (*wakeup)(usbd_device *dev); - void (*suspend)(usbd_device *dev); - - struct usb_device_descriptor* dev_descr; - - void* str_manuf_descr; - void* str_prod_descr; - void* str_serial_descr; - - void* cfg_descr; -}; diff --git a/firmware/targets/f7/furi-hal/furi-hal-vcp.c b/firmware/targets/f7/furi-hal/furi-hal-vcp.c index 039481f1..ce3cda49 100644 --- a/firmware/targets/f7/furi-hal/furi-hal-vcp.c +++ b/firmware/targets/f7/furi-hal/furi-hal-vcp.c @@ -13,17 +13,17 @@ typedef enum { VcpEvtReserved = (1 << 0), // Reserved for StreamBuffer internal event - VcpEvtConnect = (1 << 1), - VcpEvtDisconnect = (1 << 2), - VcpEvtEnable = (1 << 3), - VcpEvtDisable = (1 << 4), - VcpEvtRx = (1 << 5), - VcpEvtTx = (1 << 6), - VcpEvtStreamRx = (1 << 7), - VcpEvtStreamTx = (1 << 8), + VcpEvtEnable = (1 << 1), + VcpEvtDisable = (1 << 2), + VcpEvtConnect = (1 << 3), + VcpEvtDisconnect = (1 << 4), + VcpEvtStreamRx = (1 << 5), + VcpEvtRx = (1 << 6), + VcpEvtStreamTx = (1 << 7), + VcpEvtTx = (1 << 8), } WorkerEvtFlags; -#define VCP_THREAD_FLAG_ALL (VcpEvtConnect | VcpEvtDisconnect | VcpEvtEnable | VcpEvtDisable | VcpEvtRx | VcpEvtTx | VcpEvtStreamRx | VcpEvtStreamTx) +#define VCP_THREAD_FLAG_ALL (VcpEvtEnable | VcpEvtDisable | VcpEvtConnect | VcpEvtDisconnect | VcpEvtRx | VcpEvtTx | VcpEvtStreamRx | VcpEvtStreamTx) typedef struct { FuriThread* thread; @@ -37,10 +37,10 @@ typedef struct { } FuriHalVcp; static int32_t vcp_worker(void* context); -static void vcp_on_cdc_tx_complete(); -static void vcp_on_cdc_rx(); -static void vcp_state_callback(uint8_t state); -static void vcp_on_cdc_control_line(uint8_t state); +static void vcp_on_cdc_tx_complete(void* context); +static void vcp_on_cdc_rx(void* context); +static void vcp_state_callback(void* context, uint8_t state); +static void vcp_on_cdc_control_line(void* context, uint8_t state); static CdcCallbacks cdc_cb = { vcp_on_cdc_tx_complete, @@ -76,93 +76,19 @@ static int32_t vcp_worker(void* context) { bool tx_idle = false; size_t missed_rx = 0; - furi_hal_cdc_set_callbacks(VCP_IF_NUM, &cdc_cb); + furi_hal_cdc_set_callbacks(VCP_IF_NUM, &cdc_cb, NULL); while (1) { uint32_t flags = osThreadFlagsWait(VCP_THREAD_FLAG_ALL, osFlagsWaitAny, osWaitForever); furi_assert((flags & osFlagsError) == 0); - // New data received - if((flags & VcpEvtStreamRx) && enabled && missed_rx > 0) { -#ifdef FURI_HAL_USB_VCP_DEBUG - furi_hal_console_puts("VCP StreamRx\r\n"); -#endif - if (xStreamBufferSpacesAvailable(vcp->rx_stream) >= USB_CDC_PKT_LEN) { - flags |= VcpEvtRx; - missed_rx--; - } - } - - // Rx buffer was read, maybe there is enough space for new data? - if((flags & VcpEvtRx)) { - if (xStreamBufferSpacesAvailable(vcp->rx_stream) >= USB_CDC_PKT_LEN) { - int32_t len = furi_hal_cdc_receive(VCP_IF_NUM, vcp->data_buffer, USB_CDC_PKT_LEN); -#ifdef FURI_HAL_USB_VCP_DEBUG - furi_hal_console_printf("VCP Rx %d\r\n", len); -#endif - if (len > 0) { - furi_check(xStreamBufferSend(vcp->rx_stream, vcp->data_buffer, len, osWaitForever) == len); - } - } else { -#ifdef FURI_HAL_USB_VCP_DEBUG - furi_hal_console_puts("VCP Rx missed\r\n"); -#endif - missed_rx++; - } - } - - // New data in Tx buffer - if((flags & VcpEvtStreamTx) && enabled) { -#ifdef FURI_HAL_USB_VCP_DEBUG - furi_hal_console_puts("VCP StreamTx\r\n"); -#endif - if (tx_idle) { - flags |= VcpEvtTx; - } - } - - // CDC write transfer done - if((flags & VcpEvtTx) && enabled) { - size_t len = xStreamBufferReceive(vcp->tx_stream, vcp->data_buffer, USB_CDC_PKT_LEN, 0); -#ifdef FURI_HAL_USB_VCP_DEBUG - furi_hal_console_printf("VCP Tx %d\r\n", len); -#endif - if (len > 0) { // Some data left in Tx buffer. Sending it now - tx_idle = false; - furi_hal_cdc_send(VCP_IF_NUM, vcp->data_buffer, len); - } else { // There is nothing to send. Set flag to start next transfer instantly - tx_idle = true; - } - } - - // VCP session opened - if((flags & VcpEvtConnect) && enabled) { -#ifdef FURI_HAL_USB_VCP_DEBUG - furi_hal_console_puts("VCP Connect\r\n"); -#endif - if (vcp->connected == false) { - vcp->connected = true; - xStreamBufferSend(vcp->rx_stream, &ascii_soh, 1, osWaitForever); - } - } - - // VCP session closed - if((flags & VcpEvtDisconnect) && enabled) { -#ifdef FURI_HAL_USB_VCP_DEBUG - furi_hal_console_puts("VCP Disconnect\r\n"); -#endif - if (vcp->connected == true) { - vcp->connected = false; - xStreamBufferSend(vcp->rx_stream, &ascii_eot, 1, osWaitForever); - } - } - // VCP enabled if((flags & VcpEvtEnable) && !enabled){ #ifdef FURI_HAL_USB_VCP_DEBUG - furi_hal_console_puts("VCP Enable\r\n"); -#endif - furi_hal_cdc_set_callbacks(VCP_IF_NUM, &cdc_cb); + FURI_LOG_D(TAG, "Enable"); +#endif + flags |= VcpEvtTx; + furi_hal_cdc_set_callbacks(VCP_IF_NUM, &cdc_cb, NULL); enabled = true; furi_hal_cdc_receive(VCP_IF_NUM, vcp->data_buffer, USB_CDC_PKT_LEN); // flush Rx buffer if (furi_hal_cdc_get_ctrl_line_state(VCP_IF_NUM) & (1 << 0)) { @@ -173,13 +99,90 @@ static int32_t vcp_worker(void* context) { // VCP disabled if((flags & VcpEvtDisable) && enabled) { -#ifdef FURI_HAL_USB_VCP_DEBUG - furi_hal_console_puts("VCP Disable\r\n"); -#endif +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "Disable"); +#endif enabled = false; vcp->connected = false; + xStreamBufferReceive(vcp->tx_stream, vcp->data_buffer, USB_CDC_PKT_LEN, 0); xStreamBufferSend(vcp->rx_stream, &ascii_eot, 1, osWaitForever); } + + // VCP session opened + if((flags & VcpEvtConnect) && enabled) { +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "Connect"); +#endif + if (vcp->connected == false) { + vcp->connected = true; + xStreamBufferSend(vcp->rx_stream, &ascii_soh, 1, osWaitForever); + } + } + + // VCP session closed + if((flags & VcpEvtDisconnect) && enabled) { +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "Disconnect"); +#endif + if (vcp->connected == true) { + vcp->connected = false; + xStreamBufferReceive(vcp->tx_stream, vcp->data_buffer, USB_CDC_PKT_LEN, 0); + xStreamBufferSend(vcp->rx_stream, &ascii_eot, 1, osWaitForever); + } + } + + // Rx buffer was read, maybe there is enough space for new data? + if((flags & VcpEvtStreamRx) && enabled && missed_rx > 0) { +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "StreamRx"); +#endif + if (xStreamBufferSpacesAvailable(vcp->rx_stream) >= USB_CDC_PKT_LEN) { + flags |= VcpEvtRx; + missed_rx--; + } + } + + // New data received + if((flags & VcpEvtRx)) { + if (xStreamBufferSpacesAvailable(vcp->rx_stream) >= USB_CDC_PKT_LEN) { + int32_t len = furi_hal_cdc_receive(VCP_IF_NUM, vcp->data_buffer, USB_CDC_PKT_LEN); +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "Rx %d", len); +#endif + if (len > 0) { + furi_check(xStreamBufferSend(vcp->rx_stream, vcp->data_buffer, len, osWaitForever) == len); + } + } else { +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "Rx missed"); +#endif + missed_rx++; + } + } + + // New data in Tx buffer + if((flags & VcpEvtStreamTx) && enabled) { +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "StreamTx"); +#endif + if (tx_idle) { + flags |= VcpEvtTx; + } + } + + // CDC write transfer done + if((flags & VcpEvtTx) && enabled) { + size_t len = xStreamBufferReceive(vcp->tx_stream, vcp->data_buffer, USB_CDC_PKT_LEN, 0); +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "Tx %d", len); +#endif + if (len > 0) { // Some data left in Tx buffer. Sending it now + tx_idle = false; + furi_hal_cdc_send(VCP_IF_NUM, vcp->data_buffer, len); + } else { // There is nothing to send. Set flag to start next transfer instantly + tx_idle = true; + } + } } return 0; } @@ -196,6 +199,10 @@ size_t furi_hal_vcp_rx_with_timeout(uint8_t* buffer, size_t size, uint32_t timeo furi_assert(vcp); furi_assert(buffer); +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "rx %u start", size); +#endif + size_t rx_cnt = 0; while (size > 0) { @@ -204,6 +211,9 @@ size_t furi_hal_vcp_rx_with_timeout(uint8_t* buffer, size_t size, uint32_t timeo batch_size = VCP_RX_BUF_SIZE; size_t len = xStreamBufferReceive(vcp->rx_stream, buffer, batch_size, timeout); +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "%u ", batch_size); +#endif if (len == 0) break; osThreadFlagsSet(furi_thread_get_thread_id(vcp->thread), VcpEvtStreamRx); @@ -211,6 +221,10 @@ size_t furi_hal_vcp_rx_with_timeout(uint8_t* buffer, size_t size, uint32_t timeo buffer += len; rx_cnt += len; } + +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "rx %u end", size); +#endif return rx_cnt; } @@ -223,34 +237,40 @@ void furi_hal_vcp_tx(const uint8_t* buffer, size_t size) { furi_assert(vcp); furi_assert(buffer); - while (size > 0) { +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "tx %u start", size); +#endif + + while (size > 0 && vcp->connected) { size_t batch_size = size; - if (batch_size > VCP_TX_BUF_SIZE) - batch_size = VCP_TX_BUF_SIZE; + if (batch_size > USB_CDC_PKT_LEN) + batch_size = USB_CDC_PKT_LEN; xStreamBufferSend(vcp->tx_stream, buffer, batch_size, osWaitForever); osThreadFlagsSet(furi_thread_get_thread_id(vcp->thread), VcpEvtStreamTx); +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "%u ", batch_size); +#endif size -= batch_size; buffer += batch_size; } + +#ifdef FURI_HAL_USB_VCP_DEBUG + FURI_LOG_D(TAG, "tx %u end", size); +#endif } -static void vcp_state_callback(uint8_t state) { -#ifdef FURI_HAL_USB_VCP_DEBUG - furi_hal_console_puts("VCP State\r\n"); -#endif +static void vcp_state_callback(void* context, uint8_t state) { if (state == 0) { osThreadFlagsSet(furi_thread_get_thread_id(vcp->thread), VcpEvtDisconnect); } } -static void vcp_on_cdc_control_line(uint8_t state) { +static void vcp_on_cdc_control_line(void* context, uint8_t state) { // bit 0: DTR state, bit 1: RTS state bool dtr = state & (1 << 0); -#ifdef FURI_HAL_USB_VCP_DEBUG - furi_hal_console_puts("VCP CtrlLine\r\n"); -#endif + if (dtr == true) { osThreadFlagsSet(furi_thread_get_thread_id(vcp->thread), VcpEvtConnect); } else { @@ -258,12 +278,12 @@ static void vcp_on_cdc_control_line(uint8_t state) { } } -static void vcp_on_cdc_rx() { +static void vcp_on_cdc_rx(void* context) { uint32_t ret = osThreadFlagsSet(furi_thread_get_thread_id(vcp->thread), VcpEvtRx); furi_assert((ret & osFlagsError) == 0); } -static void vcp_on_cdc_tx_complete() { +static void vcp_on_cdc_tx_complete(void* context) { osThreadFlagsSet(furi_thread_get_thread_id(vcp->thread), VcpEvtTx); } @@ -271,4 +291,3 @@ bool furi_hal_vcp_is_connected(void) { furi_assert(vcp); return vcp->connected; } - diff --git a/firmware/targets/f7/furi-hal/furi-hal.c b/firmware/targets/f7/furi-hal/furi-hal.c index d435c5f2..491cdf0d 100644 --- a/firmware/targets/f7/furi-hal/furi-hal.c +++ b/firmware/targets/f7/furi-hal/furi-hal.c @@ -40,7 +40,7 @@ void furi_hal_init() { // VCP + USB furi_hal_usb_init(); - furi_hal_usb_set_config(UsbModeVcpSingle); + furi_hal_usb_set_config(&usb_cdc_single); furi_hal_vcp_init(); FURI_LOG_I(TAG, "USB OK"); diff --git a/firmware/targets/furi-hal-include/furi-hal-usb.h b/firmware/targets/furi-hal-include/furi-hal-usb.h index f0bd9c91..b11ddcf1 100644 --- a/firmware/targets/furi-hal-include/furi-hal-usb.h +++ b/firmware/targets/furi-hal-include/furi-hal-usb.h @@ -2,16 +2,27 @@ #include "usb.h" -/** USB device modes */ -typedef enum { - UsbModeNone, - UsbModeVcpSingle, - UsbModeVcpDual, - UsbModeHid, - UsbModeU2F, +typedef struct UsbInterface UsbInterface; - UsbModesNum, -} UsbMode; +struct UsbInterface { + void (*init)(usbd_device *dev, UsbInterface* intf); + void (*deinit)(usbd_device *dev); + void (*wakeup)(usbd_device *dev); + void (*suspend)(usbd_device *dev); + + struct usb_device_descriptor* dev_descr; + + void* str_manuf_descr; + void* str_prod_descr; + void* str_serial_descr; + + void* cfg_descr; +}; + +/** USB device interface modes */ +extern UsbInterface usb_cdc_single; +extern UsbInterface usb_cdc_dual; +extern UsbInterface usb_hid; /** USB device low-level initialization */ @@ -21,13 +32,13 @@ void furi_hal_usb_init(); * * @param mode new USB device mode */ -void furi_hal_usb_set_config(UsbMode mode); +void furi_hal_usb_set_config(UsbInterface* new_if); /** Get USB device configuration * * @return current USB device mode */ -UsbMode furi_hal_usb_get_config(); +UsbInterface* furi_hal_usb_get_config(); /** Disable USB device */