From 1232defcf10edabe7540518c988727a5b641011a Mon Sep 17 00:00:00 2001 From: Skorpionm <85568270+Skorpionm@users.noreply.github.com> Date: Mon, 13 Dec 2021 16:21:37 +0400 Subject: [PATCH 01/13] [FL-2129] SubGhz: Fix Duty cycle at 433/868 (#892) * [FL-2129] SubGhz: Fix Duty cycle at 433/868 * SubGhz: fix syntax * SubGhz: increased silence time in the 868 range * SubGhz: added build flag LAB_TESTS * SubGhz: better LAB_TESTS flag handling * NFC: LAB_TESTS flag handling Co-authored-by: DrZlo13 --- applications/applications.mk | 6 ++ applications/nfc/scenes/nfc_scene_start.c | 6 ++ .../subghz/scenes/subghz_scene_start.c | 7 +- .../subghz/views/subghz_test_packet.c | 9 ++- .../subghz/views/subghz_test_static.c | 6 +- .../protocols/subghz_protocol_princeton.c | 78 ++++++++++++++----- .../protocols/subghz_protocol_princeton.h | 9 ++- 7 files changed, 96 insertions(+), 25 deletions(-) diff --git a/applications/applications.mk b/applications/applications.mk index e067faef..e98e4fb9 100644 --- a/applications/applications.mk +++ b/applications/applications.mk @@ -316,3 +316,9 @@ SRV_STORAGE ?= 0 ifeq ($(SRV_STORAGE), 1) CFLAGS += -DSRV_STORAGE endif + + +LAB_TESTS ?= 0 +ifeq ($(LAB_TESTS), 1) +CFLAGS += -DLAB_TESTS +endif \ No newline at end of file diff --git a/applications/nfc/scenes/nfc_scene_start.c b/applications/nfc/scenes/nfc_scene_start.c index bfeb494b..18780dfe 100755 --- a/applications/nfc/scenes/nfc_scene_start.c +++ b/applications/nfc/scenes/nfc_scene_start.c @@ -5,7 +5,9 @@ enum SubmenuIndex { SubmenuIndexRunScript, SubmenuIndexSaved, SubmenuIndexAddManualy, +#ifdef LAB_TESTS SubmenuIndexDebug, +#endif }; void nfc_scene_start_submenu_callback(void* context, uint32_t index) { @@ -30,7 +32,9 @@ void nfc_scene_start_on_enter(void* context) { submenu, "Saved cards", SubmenuIndexSaved, nfc_scene_start_submenu_callback, nfc); submenu_add_item( submenu, "Add manually", SubmenuIndexAddManualy, nfc_scene_start_submenu_callback, nfc); +#ifdef LAB_TESTS submenu_add_item(submenu, "Debug", SubmenuIndexDebug, nfc_scene_start_submenu_callback, nfc); +#endif submenu_set_selected_item( submenu, scene_manager_get_scene_state(nfc->scene_manager, NfcSceneStart)); @@ -61,10 +65,12 @@ bool nfc_scene_start_on_event(void* context, SceneManagerEvent event) { nfc->scene_manager, NfcSceneStart, SubmenuIndexAddManualy); scene_manager_next_scene(nfc->scene_manager, NfcSceneSetType); consumed = true; +#ifdef LAB_TESTS } else if(event.event == SubmenuIndexDebug) { scene_manager_set_scene_state(nfc->scene_manager, NfcSceneStart, SubmenuIndexDebug); scene_manager_next_scene(nfc->scene_manager, NfcSceneEmulateApduSequence); consumed = true; +#endif } } return consumed; diff --git a/applications/subghz/scenes/subghz_scene_start.c b/applications/subghz/scenes/subghz_scene_start.c index ecdfde12..afc9117e 100644 --- a/applications/subghz/scenes/subghz_scene_start.c +++ b/applications/subghz/scenes/subghz_scene_start.c @@ -3,7 +3,9 @@ enum SubmenuIndex { SubmenuIndexRead = 10, SubmenuIndexSaved, +#ifdef LAB_TESTS SubmenuIndexTest, +#endif SubmenuIndexAddManualy, SubmenuIndexFrequencyAnalyzer, SubmenuIndexReadRAW, @@ -41,9 +43,10 @@ void subghz_scene_start_on_enter(void* context) { SubmenuIndexFrequencyAnalyzer, subghz_scene_start_submenu_callback, subghz); +#ifdef LAB_TESTS submenu_add_item( subghz->submenu, "Test", SubmenuIndexTest, subghz_scene_start_submenu_callback, subghz); - +#endif submenu_set_selected_item( subghz->submenu, scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneStart)); @@ -80,11 +83,13 @@ bool subghz_scene_start_on_event(void* context, SceneManagerEvent event) { subghz->scene_manager, SubGhzSceneStart, SubmenuIndexFrequencyAnalyzer); scene_manager_next_scene(subghz->scene_manager, SubGhzSceneFrequencyAnalyzer); return true; +#ifdef LAB_TESTS } else if(event.event == SubmenuIndexTest) { scene_manager_set_scene_state( subghz->scene_manager, SubGhzSceneStart, SubmenuIndexTest); scene_manager_next_scene(subghz->scene_manager, SubGhzSceneTest); return true; +#endif } } return false; diff --git a/applications/subghz/views/subghz_test_packet.c b/applications/subghz/views/subghz_test_packet.c index 0fb05717..01c4bbff 100644 --- a/applications/subghz/views/subghz_test_packet.c +++ b/applications/subghz/views/subghz_test_packet.c @@ -8,7 +8,7 @@ #include #include -#define SUBGHZ_TEST_PACKET_COUNT 1000 +#define SUBGHZ_TEST_PACKET_COUNT 500 struct SubghzTestPacket { View* view; @@ -137,6 +137,7 @@ static bool subghz_test_packet_input(InputEvent* event, void* context) { if(model->status == SubghzTestPacketModelStatusRx) { furi_hal_subghz_stop_async_rx(); } else if(model->status == SubghzTestPacketModelStatusTx) { + subghz_encoder_princeton_stop(instance->encoder, millis()); furi_hal_subghz_stop_async_tx(); } @@ -164,7 +165,10 @@ static bool subghz_test_packet_input(InputEvent* event, void* context) { furi_hal_subghz_start_async_rx(subghz_test_packet_rx_callback, instance); } else { subghz_encoder_princeton_set( - instance->encoder, 0x00AABBCC, SUBGHZ_TEST_PACKET_COUNT); + instance->encoder, + 0x00AABBCC, + SUBGHZ_TEST_PACKET_COUNT, + subghz_frequencies[model->frequency]); if(!furi_hal_subghz_start_async_tx( subghz_encoder_princeton_yield, instance->encoder)) { model->status = SubghzTestPacketModelStatusOnlyRx; @@ -213,6 +217,7 @@ void subghz_test_packet_exit(void* context) { if(model->status == SubghzTestPacketModelStatusRx) { furi_hal_subghz_stop_async_rx(); } else if(model->status == SubghzTestPacketModelStatusTx) { + subghz_encoder_princeton_stop(instance->encoder, millis()); furi_hal_subghz_stop_async_tx(); } return true; diff --git a/applications/subghz/views/subghz_test_static.c b/applications/subghz/views/subghz_test_static.c index bc672406..9e924a3f 100644 --- a/applications/subghz/views/subghz_test_static.c +++ b/applications/subghz/views/subghz_test_static.c @@ -104,7 +104,10 @@ bool subghz_test_static_input(InputEvent* event, void* context) { FURI_LOG_I(TAG, "TX Start"); subghz_encoder_princeton_set( - instance->encoder, subghz_test_static_keys[model->button], 10000); + instance->encoder, + subghz_test_static_keys[model->button], + 10000, + subghz_frequencies[model->frequency]); furi_hal_subghz_start_async_tx( subghz_encoder_princeton_yield, instance->encoder); @@ -113,6 +116,7 @@ bool subghz_test_static_input(InputEvent* event, void* context) { } else if(event->type == InputTypeRelease) { if(instance->satus_tx == SubghzTestStaticStatusTX) { FURI_LOG_I(TAG, "TX Stop"); + subghz_encoder_princeton_stop(instance->encoder, millis()); subghz_encoder_princeton_print_log(instance->encoder); furi_hal_subghz_stop_async_tx(); notification_message(notification, &sequence_reset_red); diff --git a/lib/subghz/protocols/subghz_protocol_princeton.c b/lib/subghz/protocols/subghz_protocol_princeton.c index 0f2fdf77..b026a611 100644 --- a/lib/subghz/protocols/subghz_protocol_princeton.c +++ b/lib/subghz/protocols/subghz_protocol_princeton.c @@ -5,11 +5,13 @@ * */ -#define SUBGHZ_PT_SHORT 400 +#define SUBGHZ_PT_SHORT 300 #define SUBGHZ_PT_LONG (SUBGHZ_PT_SHORT * 3) #define SUBGHZ_PT_GUARD (SUBGHZ_PT_SHORT * 30) -#define SUBGHZ_PT_COUNT_KEY 5 -#define SUBGHZ_PT_TIMEOUT 320 +#define SUBGHZ_PT_COUNT_KEY_433 9 +#define SUBGHZ_PT_TIMEOUT_433 900 +#define SUBGHZ_PT_COUNT_KEY_868 9 +#define SUBGHZ_PT_TIMEOUT_868 14000 #define TAG "SubghzPrinceton" @@ -19,8 +21,11 @@ struct SubGhzEncoderPrinceton { size_t repeat; size_t front; size_t count_key; + size_t count_key_package; uint32_t time_high; uint32_t time_low; + uint32_t timeout; + uint32_t time_stop; }; typedef enum { @@ -48,15 +53,37 @@ void subghz_encoder_princeton_set_te(SubGhzEncoderPrinceton* instance, void* dec } } -void subghz_encoder_princeton_set(SubGhzEncoderPrinceton* instance, uint32_t key, size_t repeat) { +void subghz_encoder_princeton_stop(SubGhzEncoderPrinceton* instance, uint32_t time_stop) { + instance->time_stop = time_stop; +} + +void subghz_encoder_princeton_set( + SubGhzEncoderPrinceton* instance, + uint32_t key, + size_t repeat, + uint32_t frequency) { furi_assert(instance); instance->te = SUBGHZ_PT_SHORT; instance->key = key; instance->repeat = repeat + 1; instance->front = 48; - instance->count_key = SUBGHZ_PT_COUNT_KEY + 7; instance->time_high = 0; instance->time_low = 0; + if(frequency < 700000000) { + instance->count_key_package = SUBGHZ_PT_COUNT_KEY_433; + instance->timeout = SUBGHZ_PT_TIMEOUT_433; + } else { + instance->count_key_package = SUBGHZ_PT_COUNT_KEY_868; + instance->timeout = SUBGHZ_PT_TIMEOUT_868; + } + + instance->count_key = instance->count_key_package + 3; + + if((millis() - instance->time_stop) < instance->timeout) { + instance->time_stop = (instance->timeout - (millis() - instance->time_stop)) * 1000; + } else { + instance->time_stop = 0; + } } size_t subghz_encoder_princeton_get_repeat_left(SubGhzEncoderPrinceton* instance) { @@ -70,7 +97,8 @@ void subghz_encoder_princeton_print_log(void* context) { ((float)instance->time_high / (instance->time_high + instance->time_low)) * 100; FURI_LOG_I( TAG "Encoder", - "Radio ON=%dus, OFF=%dus, DutyCycle=%d,%d%%", + "Radio tx_time=%dus ON=%dus, OFF=%dus, DutyCycle=%d,%d%%", + instance->time_high + instance->time_low, instance->time_high, instance->time_low, (uint32_t)duty_cycle, @@ -106,20 +134,31 @@ LevelDuration subghz_encoder_princeton_yield(void* context) { instance->time_low += instance->te * 3; } } else { - if(--instance->count_key != 0) { - ret = level_duration_make(level, level ? instance->te : instance->te * 30); + if(instance->time_stop) { + ret = level_duration_make(level, level ? instance->te : instance->time_stop); if(level) instance->time_high += instance->te; - else - instance->time_low += instance->te * 30; + else { + instance->time_low += instance->time_stop; + instance->time_stop = 0; + instance->front = 47; + } } else { - instance->count_key = SUBGHZ_PT_COUNT_KEY + 6; - instance->front = 48; - ret = level_duration_make(level, level ? instance->te : SUBGHZ_PT_TIMEOUT * 1000); - if(level) - instance->time_high += instance->te; - else - instance->time_low += SUBGHZ_PT_TIMEOUT * 1000; + if(--instance->count_key != 0) { + ret = level_duration_make(level, level ? instance->te : instance->te * 30); + if(level) + instance->time_high += instance->te; + else + instance->time_low += instance->te * 30; + } else { + instance->count_key = instance->count_key_package + 2; + instance->front = 48; + ret = level_duration_make(level, level ? instance->te : instance->timeout * 1000); + if(level) + instance->time_high += instance->te; + else + instance->time_low += instance->timeout * 1000; + } } } @@ -128,7 +167,6 @@ LevelDuration subghz_encoder_princeton_yield(void* context) { instance->repeat--; instance->front = 0; } - return ret; } @@ -138,8 +176,8 @@ SubGhzDecoderPrinceton* subghz_decoder_princeton_alloc(void) { instance->te = SUBGHZ_PT_SHORT; instance->common.name = "Princeton"; instance->common.code_min_count_bit_for_found = 24; - instance->common.te_short = SUBGHZ_PT_SHORT; //150; - instance->common.te_long = SUBGHZ_PT_LONG; //450; + instance->common.te_short = 400; //150; + instance->common.te_long = 1200; //450; instance->common.te_delta = 250; //50; instance->common.type_protocol = SubGhzProtocolCommonTypeStatic; instance->common.to_string = (SubGhzProtocolCommonToStr)subghz_decoder_princeton_to_str; diff --git a/lib/subghz/protocols/subghz_protocol_princeton.h b/lib/subghz/protocols/subghz_protocol_princeton.h index bc9bf54e..44224be5 100644 --- a/lib/subghz/protocols/subghz_protocol_princeton.h +++ b/lib/subghz/protocols/subghz_protocol_princeton.h @@ -20,12 +20,19 @@ SubGhzEncoderPrinceton* subghz_encoder_princeton_alloc(); */ void subghz_encoder_princeton_free(SubGhzEncoderPrinceton* instance); +void subghz_encoder_princeton_stop(SubGhzEncoderPrinceton* instance, uint32_t time_stop); + /** Set new encoder params * @param instance - SubGhzEncoderPrinceton instance * @param key - 24bit key * @param repeat - how many times to repeat + * @param frequency - frequency */ -void subghz_encoder_princeton_set(SubGhzEncoderPrinceton* instance, uint32_t key, size_t repeat); +void subghz_encoder_princeton_set( + SubGhzEncoderPrinceton* instance, + uint32_t key, + size_t repeat, + uint32_t frequency); /** Get repeat count left * @param instance - SubGhzEncoderPrinceton instance From 965067b5bd7fb3fbb77d0459cc9ea10492168ad7 Mon Sep 17 00:00:00 2001 From: Albert Kharisov Date: Tue, 14 Dec 2021 03:52:13 +0400 Subject: [PATCH 02/13] [FL-2132] IRDA: fix crush in Saved Remote (OK + back) (#894) Pressing Back button before releasing OK on Saved Remote scene freezes application, because it doesn't expect that button is pressed when leaving Saved Remote scene. Issue: 893 --- applications/irda/scene/irda-app-scene-remote.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/applications/irda/scene/irda-app-scene-remote.cpp b/applications/irda/scene/irda-app-scene-remote.cpp index 94cf61ec..7a176a8b 100644 --- a/applications/irda/scene/irda-app-scene-remote.cpp +++ b/applications/irda/scene/irda-app-scene-remote.cpp @@ -115,8 +115,10 @@ bool IrdaAppSceneRemote::on_event(IrdaApp* app, IrdaAppEvent* event) { break; } } else if(event->type == IrdaAppEvent::Type::Back) { - app->search_and_switch_to_previous_scene( - {IrdaApp::Scene::Start, IrdaApp::Scene::RemoteList}); + if(!button_pressed) { + app->search_and_switch_to_previous_scene( + {IrdaApp::Scene::Start, IrdaApp::Scene::RemoteList}); + } } else { consumed = false; } From 6579368053a0572d1fff38ca3a91ab209df1a1d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=81=8F?= Date: Wed, 15 Dec 2021 01:39:59 +0300 Subject: [PATCH 03/13] [FL-1818] System setting and debug options. RTC HAL refactoring. (#902) * FuriHal: RTC API refactoring. System Setting application. FuriCore: adjustable log levels. Minor code cleanup. * Storage: change logging levels for internal storage. * FuriCore: fix broken trace logging level --- applications/applications.c | 5 + applications/applications.mk | 6 - applications/cli/cli_commands.c | 76 +- applications/dolphin/helpers/dolphin_state.c | 19 +- applications/dolphin/helpers/dolphin_state.h | 1 - applications/nfc/nfc_i.h | 1 + applications/nfc/scenes/nfc_scene_start.c | 13 +- applications/rpc/rpc_system.c | 5 +- applications/snake-game/snake-game.c | 2 +- applications/storage/storage-cli.c | 2 +- applications/storage/storages/storage-int.c | 11 +- .../storage_settings_scene_factory_reset.c | 2 +- .../subghz/scenes/subghz_scene_start.c | 12 +- applications/system/system_settings.c | 121 +++ applications/system/system_settings.h | 18 + core/furi/log.c | 10 +- core/furi/log.h | 38 +- firmware/targets/f6/Inc/rtc.h | 52 - firmware/targets/f6/Inc/stm32wbxx_hal_conf.h | 2 +- firmware/targets/f6/Src/rtc.c | 123 --- firmware/targets/f6/Src/stm32wbxx_it.c | 5 - firmware/targets/f6/ble-glue/hw_if.h | 159 ---- firmware/targets/f6/ble-glue/hw_timerserver.c | 893 ------------------ .../targets/f6/furi-hal/furi-hal-bootloader.c | 8 - firmware/targets/f6/furi-hal/furi-hal-clock.c | 9 - .../targets/f6/furi-hal/furi-hal-interrupt.c | 3 - firmware/targets/f6/furi-hal/furi-hal-rtc.c | 122 +++ firmware/targets/f6/furi-hal/furi-hal.c | 10 +- firmware/targets/f6/target.mk | 4 +- firmware/targets/f7/Inc/rtc.h | 52 - firmware/targets/f7/Inc/stm32wbxx_hal_conf.h | 2 +- firmware/targets/f7/Src/rtc.c | 123 --- firmware/targets/f7/Src/stm32wbxx_it.c | 5 - firmware/targets/f7/ble-glue/hw_if.h | 159 ---- firmware/targets/f7/ble-glue/hw_timerserver.c | 893 ------------------ .../targets/f7/furi-hal/furi-hal-bootloader.c | 8 - firmware/targets/f7/furi-hal/furi-hal-clock.c | 9 - .../targets/f7/furi-hal/furi-hal-interrupt.c | 3 - firmware/targets/f7/furi-hal/furi-hal-rtc.c | 122 +++ firmware/targets/f7/furi-hal/furi-hal.c | 10 +- firmware/targets/f7/target.mk | 2 +- .../furi-hal-include/furi-hal-bootloader.h | 18 - .../targets/furi-hal-include/furi-hal-rtc.h | 52 + firmware/targets/furi-hal-include/furi-hal.h | 1 + lib/lfs_config.h | 4 +- 45 files changed, 543 insertions(+), 2652 deletions(-) mode change 100755 => 100644 applications/nfc/scenes/nfc_scene_start.c create mode 100644 applications/system/system_settings.c create mode 100755 applications/system/system_settings.h delete mode 100644 firmware/targets/f6/Inc/rtc.h delete mode 100644 firmware/targets/f6/Src/rtc.c delete mode 100644 firmware/targets/f6/ble-glue/hw_timerserver.c create mode 100644 firmware/targets/f6/furi-hal/furi-hal-rtc.c delete mode 100644 firmware/targets/f7/Inc/rtc.h delete mode 100644 firmware/targets/f7/Src/rtc.c delete mode 100644 firmware/targets/f7/ble-glue/hw_timerserver.c create mode 100644 firmware/targets/f7/furi-hal/furi-hal-rtc.c create mode 100644 firmware/targets/furi-hal-include/furi-hal-rtc.h diff --git a/applications/applications.c b/applications/applications.c index 82a0c833..76a13b86 100644 --- a/applications/applications.c +++ b/applications/applications.c @@ -65,6 +65,7 @@ extern int32_t bt_settings_app(void* p); extern int32_t desktop_settings_app(void* p); extern int32_t about_settings_app(void* p); extern int32_t power_settings_app(void* p); +extern int32_t system_settings_app(void* p); const FlipperApplication FLIPPER_SERVICES[] = { /* Services */ @@ -312,6 +313,10 @@ const FlipperApplication FLIPPER_SETTINGS_APPS[] = { {.app = passport_app, .name = "Passport", .stack_size = 1024, .icon = NULL}, #endif +#ifdef SRV_GUI + {.app = system_settings_app, .name = "System", .stack_size = 1024, .icon = NULL}, +#endif + #ifdef APP_ABOUT {.app = about_settings_app, .name = "About", .stack_size = 1024, .icon = NULL}, #endif diff --git a/applications/applications.mk b/applications/applications.mk index e98e4fb9..e067faef 100644 --- a/applications/applications.mk +++ b/applications/applications.mk @@ -316,9 +316,3 @@ SRV_STORAGE ?= 0 ifeq ($(SRV_STORAGE), 1) CFLAGS += -DSRV_STORAGE endif - - -LAB_TESTS ?= 0 -ifeq ($(LAB_TESTS), 1) -CFLAGS += -DLAB_TESTS -endif \ No newline at end of file diff --git a/applications/cli/cli_commands.c b/applications/cli/cli_commands.c index c3e51656..7f194220 100644 --- a/applications/cli/cli_commands.c +++ b/applications/cli/cli_commands.c @@ -2,7 +2,6 @@ #include #include #include -#include #include #include #include @@ -58,46 +57,40 @@ void cli_command_help(Cli* cli, string_t args, void* context) { } void cli_command_date(Cli* cli, string_t args, void* context) { - RTC_TimeTypeDef time; - RTC_DateTypeDef date; + FuriHalRtcDateTime datetime = {0}; if(string_size(args) > 0) { - uint16_t Hours, Minutes, Seconds, Month, Date, Year, WeekDay; + uint16_t hours, minutes, seconds, month, day, year, weekday; int ret = sscanf( string_get_cstr(args), "%hu:%hu:%hu %hu-%hu-%hu %hu", - &Hours, - &Minutes, - &Seconds, - &Month, - &Date, - &Year, - &WeekDay); + &hours, + &minutes, + &seconds, + &month, + &day, + &year, + &weekday); if(ret == 7) { - time.Hours = Hours; - time.Minutes = Minutes; - time.Seconds = Seconds; - time.DayLightSaving = RTC_DAYLIGHTSAVING_NONE; - time.StoreOperation = RTC_STOREOPERATION_RESET; - date.WeekDay = WeekDay; - date.Month = Month; - date.Date = Date; - date.Year = Year - 2000; - HAL_RTC_SetTime(&hrtc, &time, RTC_FORMAT_BIN); - HAL_RTC_SetDate(&hrtc, &date, RTC_FORMAT_BIN); - + datetime.hour = hours; + datetime.minute = minutes; + datetime.second = seconds; + datetime.weekday = weekday; + datetime.month = month; + datetime.day = day; + datetime.year = year; + furi_hal_rtc_set_datetime(&datetime); // Verification - HAL_RTC_GetTime(&hrtc, &time, RTC_FORMAT_BIN); - HAL_RTC_GetDate(&hrtc, &date, RTC_FORMAT_BIN); + furi_hal_rtc_get_datetime(&datetime); printf( "New time is: %.2d:%.2d:%.2d %.2d-%.2d-%.2d %d", - time.Hours, - time.Minutes, - time.Seconds, - date.Month, - date.Date, - 2000 + date.Year, - date.WeekDay); + datetime.hour, + datetime.minute, + datetime.second, + datetime.month, + datetime.day, + datetime.year, + datetime.weekday); } else { printf( "Invalid time format, use `hh:mm:ss MM-DD-YYYY WD`. sscanf %d %s", @@ -106,19 +99,16 @@ void cli_command_date(Cli* cli, string_t args, void* context) { return; } } else { - // TODO add get_datetime to core, not use HAL here - // READ ORDER MATTERS! Time then date. - HAL_RTC_GetTime(&hrtc, &time, RTC_FORMAT_BIN); - HAL_RTC_GetDate(&hrtc, &date, RTC_FORMAT_BIN); + furi_hal_rtc_get_datetime(&datetime); printf( "%.2d:%.2d:%.2d %.2d-%.2d-%.2d %d", - time.Hours, - time.Minutes, - time.Seconds, - date.Month, - date.Date, - 2000 + date.Year, - date.WeekDay); + datetime.hour, + datetime.minute, + datetime.second, + datetime.month, + datetime.day, + datetime.year, + datetime.weekday); } } diff --git a/applications/dolphin/helpers/dolphin_state.c b/applications/dolphin/helpers/dolphin_state.c index 016d8a50..9efdecb8 100644 --- a/applications/dolphin/helpers/dolphin_state.c +++ b/applications/dolphin/helpers/dolphin_state.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include @@ -70,20 +71,18 @@ bool dolphin_state_load(DolphinState* dolphin_state) { } uint64_t dolphin_state_timestamp() { - RTC_TimeTypeDef time; - RTC_DateTypeDef date; + FuriHalRtcDateTime datetime; struct tm current; - HAL_RTC_GetTime(&hrtc, &time, RTC_FORMAT_BIN); - HAL_RTC_GetDate(&hrtc, &date, RTC_FORMAT_BIN); + furi_hal_rtc_get_datetime(&datetime); - current.tm_year = date.Year + 100; - current.tm_mday = date.Date; - current.tm_mon = date.Month - 1; + current.tm_year = datetime.year - 1900; + current.tm_mday = datetime.day; + current.tm_mon = datetime.month - 1; - current.tm_hour = time.Hours; - current.tm_min = time.Minutes; - current.tm_sec = time.Seconds; + current.tm_hour = datetime.hour; + current.tm_min = datetime.minute; + current.tm_sec = datetime.second; return mktime(¤t); } diff --git a/applications/dolphin/helpers/dolphin_state.h b/applications/dolphin/helpers/dolphin_state.h index 1196e256..8c9f3aa9 100644 --- a/applications/dolphin/helpers/dolphin_state.h +++ b/applications/dolphin/helpers/dolphin_state.h @@ -3,7 +3,6 @@ #include "dolphin_deed.h" #include #include -#include #include typedef struct DolphinState DolphinState; diff --git a/applications/nfc/nfc_i.h b/applications/nfc/nfc_i.h index 61a11ce8..2563ee01 100755 --- a/applications/nfc/nfc_i.h +++ b/applications/nfc/nfc_i.h @@ -6,6 +6,7 @@ #include "nfc_device.h" #include +#include #include #include diff --git a/applications/nfc/scenes/nfc_scene_start.c b/applications/nfc/scenes/nfc_scene_start.c old mode 100755 new mode 100644 index 18780dfe..b99580d2 --- a/applications/nfc/scenes/nfc_scene_start.c +++ b/applications/nfc/scenes/nfc_scene_start.c @@ -5,9 +5,7 @@ enum SubmenuIndex { SubmenuIndexRunScript, SubmenuIndexSaved, SubmenuIndexAddManualy, -#ifdef LAB_TESTS SubmenuIndexDebug, -#endif }; void nfc_scene_start_submenu_callback(void* context, uint32_t index) { @@ -32,9 +30,12 @@ void nfc_scene_start_on_enter(void* context) { submenu, "Saved cards", SubmenuIndexSaved, nfc_scene_start_submenu_callback, nfc); submenu_add_item( submenu, "Add manually", SubmenuIndexAddManualy, nfc_scene_start_submenu_callback, nfc); -#ifdef LAB_TESTS - submenu_add_item(submenu, "Debug", SubmenuIndexDebug, nfc_scene_start_submenu_callback, nfc); -#endif + + if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) { + submenu_add_item( + submenu, "Debug", SubmenuIndexDebug, nfc_scene_start_submenu_callback, nfc); + } + submenu_set_selected_item( submenu, scene_manager_get_scene_state(nfc->scene_manager, NfcSceneStart)); @@ -65,12 +66,10 @@ bool nfc_scene_start_on_event(void* context, SceneManagerEvent event) { nfc->scene_manager, NfcSceneStart, SubmenuIndexAddManualy); scene_manager_next_scene(nfc->scene_manager, NfcSceneSetType); consumed = true; -#ifdef LAB_TESTS } else if(event.event == SubmenuIndexDebug) { scene_manager_set_scene_state(nfc->scene_manager, NfcSceneStart, SubmenuIndexDebug); scene_manager_next_scene(nfc->scene_manager, NfcSceneEmulateApduSequence); consumed = true; -#endif } } return consumed; diff --git a/applications/rpc/rpc_system.c b/applications/rpc/rpc_system.c index 2ce23129..01cb3145 100644 --- a/applications/rpc/rpc_system.c +++ b/applications/rpc/rpc_system.c @@ -2,8 +2,7 @@ #include "rpc_i.h" #include "status.pb.h" -#include -#include +#include #include void rpc_system_system_ping_process(const PB_Main* msg_request, void* context) { @@ -104,7 +103,7 @@ void rpc_system_system_factory_reset_process(const PB_Main* request, void* conte furi_assert(request->which_content == PB_Main_system_factory_reset_request_tag); furi_assert(context); - furi_hal_bootloader_set_flags(FuriHalBootloaderFlagFactoryReset); + furi_hal_rtc_set_flag(FuriHalRtcFlagFactoryReset); power_reboot(PowerBootModeNormal); } diff --git a/applications/snake-game/snake-game.c b/applications/snake-game/snake-game.c index c1debed2..e3fde566 100644 --- a/applications/snake-game/snake-game.c +++ b/applications/snake-game/snake-game.c @@ -322,7 +322,7 @@ int32_t snake_game_app(void* p) { ValueMutex state_mutex; if(!init_mutex(&state_mutex, snake_state, sizeof(SnakeState))) { - furi_log_print(FURI_LOG_ERROR, "cannot create mutex\r\n"); + FURI_LOG_E("SnakeGame", "cannot create mutex\r\n"); free(snake_state); return 255; } diff --git a/applications/storage/storage-cli.c b/applications/storage/storage-cli.c index fc80864b..c66a965d 100644 --- a/applications/storage/storage-cli.c +++ b/applications/storage/storage-cli.c @@ -526,7 +526,7 @@ static void storage_cli_factory_reset(Cli* cli, string_t args, void* context) { 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); + furi_hal_rtc_set_flag(FuriHalRtcFlagFactoryReset); power_reboot(PowerBootModeNormal); } else { printf("Safe choice.\r\n"); diff --git a/applications/storage/storages/storage-int.c b/applications/storage/storages/storage-int.c index 69ffe15e..097934b6 100644 --- a/applications/storage/storages/storage-int.c +++ b/applications/storage/storages/storage-int.c @@ -69,7 +69,7 @@ static int storage_int_device_read( LFSData* lfs_data = c->context; size_t address = lfs_data->start_address + block * c->block_size + off; - FURI_LOG_D( + FURI_LOG_T( TAG, "Device read: block %d, off %d, buffer: %p, size %d, translated address: %p", block, @@ -92,7 +92,7 @@ static int storage_int_device_prog( LFSData* lfs_data = c->context; size_t address = lfs_data->start_address + block * c->block_size + off; - FURI_LOG_D( + FURI_LOG_T( TAG, "Device prog: block %d, off %d, buffer: %p, size %d, translated address: %p", block, @@ -163,15 +163,14 @@ static LFSData* storage_int_lfs_data_alloc() { static void storage_int_lfs_mount(LFSData* lfs_data, StorageData* storage) { int err; - FuriHalBootloaderFlag bootloader_flags = furi_hal_bootloader_get_flags(); lfs_t* lfs = &lfs_data->lfs; - if(bootloader_flags & FuriHalBootloaderFlagFactoryReset) { + if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagFactoryReset)) { // Factory reset err = lfs_format(lfs, &lfs_data->config); if(err == 0) { FURI_LOG_I(TAG, "Factory reset: Format successful, trying to mount"); - furi_hal_bootloader_set_flags(bootloader_flags & ~FuriHalBootloaderFlagFactoryReset); + furi_hal_rtc_reset_flag(FuriHalRtcFlagFactoryReset); err = lfs_mount(lfs, &lfs_data->config); if(err == 0) { FURI_LOG_I(TAG, "Factory reset: Mounted"); @@ -687,4 +686,4 @@ void storage_int_init(StorageData* storage) { storage->fs_api.common.rename = storage_int_common_rename; storage->fs_api.common.remove = storage_int_common_remove; storage->fs_api.common.fs_info = storage_int_common_fs_info; -} \ No newline at end of file +} diff --git a/applications/storage_settings/scenes/storage_settings_scene_factory_reset.c b/applications/storage_settings/scenes/storage_settings_scene_factory_reset.c index 5409a33e..0318612f 100644 --- a/applications/storage_settings/scenes/storage_settings_scene_factory_reset.c +++ b/applications/storage_settings/scenes/storage_settings_scene_factory_reset.c @@ -63,7 +63,7 @@ bool storage_settings_scene_factory_reset_on_event(void* context, SceneManagerEv scene_manager_set_scene_state( app->scene_manager, StorageSettingsFactoryReset, counter); } else { - furi_hal_bootloader_set_flags(FuriHalBootloaderFlagFactoryReset); + furi_hal_rtc_set_flag(FuriHalRtcFlagFactoryReset); power_reboot(PowerBootModeNormal); } diff --git a/applications/subghz/scenes/subghz_scene_start.c b/applications/subghz/scenes/subghz_scene_start.c index afc9117e..640c42ca 100644 --- a/applications/subghz/scenes/subghz_scene_start.c +++ b/applications/subghz/scenes/subghz_scene_start.c @@ -3,9 +3,7 @@ enum SubmenuIndex { SubmenuIndexRead = 10, SubmenuIndexSaved, -#ifdef LAB_TESTS SubmenuIndexTest, -#endif SubmenuIndexAddManualy, SubmenuIndexFrequencyAnalyzer, SubmenuIndexReadRAW, @@ -43,10 +41,10 @@ void subghz_scene_start_on_enter(void* context) { SubmenuIndexFrequencyAnalyzer, subghz_scene_start_submenu_callback, subghz); -#ifdef LAB_TESTS - submenu_add_item( - subghz->submenu, "Test", SubmenuIndexTest, subghz_scene_start_submenu_callback, subghz); -#endif + if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) { + submenu_add_item( + subghz->submenu, "Test", SubmenuIndexTest, subghz_scene_start_submenu_callback, subghz); + } submenu_set_selected_item( subghz->submenu, scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneStart)); @@ -83,13 +81,11 @@ bool subghz_scene_start_on_event(void* context, SceneManagerEvent event) { subghz->scene_manager, SubGhzSceneStart, SubmenuIndexFrequencyAnalyzer); scene_manager_next_scene(subghz->scene_manager, SubGhzSceneFrequencyAnalyzer); return true; -#ifdef LAB_TESTS } else if(event.event == SubmenuIndexTest) { scene_manager_set_scene_state( subghz->scene_manager, SubGhzSceneStart, SubmenuIndexTest); scene_manager_next_scene(subghz->scene_manager, SubGhzSceneTest); return true; -#endif } } return false; diff --git a/applications/system/system_settings.c b/applications/system/system_settings.c new file mode 100644 index 00000000..f820645e --- /dev/null +++ b/applications/system/system_settings.c @@ -0,0 +1,121 @@ +#include "system_settings.h" + +static uint8_t + uint32_value_index(const uint32_t value, const uint32_t values[], uint8_t values_count) { + int64_t last_value = INT64_MIN; + uint8_t index = 0; + for(uint8_t i = 0; i < values_count; i++) { + if((value >= last_value) && (value <= values[i])) { + index = i; + break; + } + last_value = values[i]; + } + return index; +} + +const char* const log_level_text[] = { + "Default", + "None", + "Error", + "Warning", + "Info", + "Debug", + "Trace", +}; + +const uint32_t log_level_value[] = { + FuriLogLevelDefault, + FuriLogLevelNone, + FuriLogLevelError, + FuriLogLevelWarn, + FuriLogLevelInfo, + FuriLogLevelDebug, + FuriLogLevelTrace, +}; + +static void log_level_changed(VariableItem* item) { + // SystemSettings* app = variable_item_get_context(item); + uint8_t index = variable_item_get_current_value_index(item); + variable_item_set_current_value_text(item, log_level_text[index]); + furi_hal_rtc_set_log_level(log_level_value[index]); +} + +const char* const debug_text[] = { + "Disable", + "Enable", +}; + +static void debug_changed(VariableItem* item) { + uint8_t index = variable_item_get_current_value_index(item); + variable_item_set_current_value_text(item, debug_text[index]); + if(index) { + furi_hal_rtc_set_flag(FuriHalRtcFlagDebug); + } else { + furi_hal_rtc_reset_flag(FuriHalRtcFlagDebug); + } +} + +static uint32_t system_settings_exit(void* context) { + return VIEW_NONE; +} + +SystemSettings* system_settings_alloc() { + SystemSettings* app = furi_alloc(sizeof(SystemSettings)); + + // Load settings + app->gui = furi_record_open("gui"); + + app->view_dispatcher = view_dispatcher_alloc(); + view_dispatcher_enable_queue(app->view_dispatcher); + view_dispatcher_set_event_callback_context(app->view_dispatcher, app); + + view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen); + + VariableItem* item; + uint8_t value_index; + app->var_item_list = variable_item_list_alloc(); + + item = variable_item_list_add( + app->var_item_list, "Log Level", COUNT_OF(log_level_text), log_level_changed, app); + value_index = uint32_value_index( + furi_hal_rtc_get_log_level(), log_level_value, COUNT_OF(log_level_text)); + variable_item_set_current_value_index(item, value_index); + variable_item_set_current_value_text(item, log_level_text[value_index]); + + item = variable_item_list_add( + app->var_item_list, "Debug", COUNT_OF(debug_text), debug_changed, app); + value_index = furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug) ? 1 : 0; + variable_item_set_current_value_index(item, value_index); + variable_item_set_current_value_text(item, debug_text[value_index]); + + view_set_previous_callback( + variable_item_list_get_view(app->var_item_list), system_settings_exit); + view_dispatcher_add_view( + app->view_dispatcher, + SystemSettingsViewVarItemList, + variable_item_list_get_view(app->var_item_list)); + + view_dispatcher_switch_to_view(app->view_dispatcher, SystemSettingsViewVarItemList); + + return app; +} + +void system_settings_free(SystemSettings* app) { + furi_assert(app); + // Variable item list + view_dispatcher_remove_view(app->view_dispatcher, SystemSettingsViewVarItemList); + variable_item_list_free(app->var_item_list); + // View dispatcher + view_dispatcher_free(app->view_dispatcher); + // Records + furi_record_close("gui"); + free(app); +} + +int32_t system_settings_app(void* p) { + SystemSettings* app = system_settings_alloc(); + view_dispatcher_run(app->view_dispatcher); + system_settings_free(app); + return 0; +} diff --git a/applications/system/system_settings.h b/applications/system/system_settings.h new file mode 100755 index 00000000..e2475a1e --- /dev/null +++ b/applications/system/system_settings.h @@ -0,0 +1,18 @@ +#pragma once + +#include +#include + +#include +#include +#include + +typedef struct { + Gui* gui; + ViewDispatcher* view_dispatcher; + VariableItemList* var_item_list; +} SystemSettings; + +typedef enum { + SystemSettingsViewVarItemList, +} SystemSettingsView; diff --git a/core/furi/log.c b/core/furi/log.c index d30e1202..3cf68a18 100644 --- a/core/furi/log.c +++ b/core/furi/log.c @@ -3,6 +3,8 @@ #include #include +#define FURI_LOG_LEVEL_DEFAULT FuriLogLevelInfo + typedef struct { FuriLogLevel log_level; FuriLogPuts puts; @@ -14,15 +16,13 @@ static FuriLogParams furi_log; void furi_log_init() { // Set default logging parameters - furi_log.log_level = FURI_LOG_LEVEL; + furi_log.log_level = FURI_LOG_LEVEL_DEFAULT; furi_log.puts = furi_hal_console_puts; furi_log.timetamp = HAL_GetTick; furi_log.mutex = osMutexNew(NULL); } 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) == osOK) { string_t string; @@ -41,10 +41,12 @@ void furi_log_print(FuriLogLevel level, const char* format, ...) { osMutexRelease(furi_log.mutex); } - va_end(args); } void furi_log_set_level(FuriLogLevel level) { + if(level == FuriLogLevelDefault) { + level = FURI_LOG_LEVEL_DEFAULT; + } furi_log.log_level = level; } diff --git a/core/furi/log.h b/core/furi/log.h index 69c3dfde..3c86698b 100644 --- a/core/furi/log.h +++ b/core/furi/log.h @@ -8,11 +8,15 @@ extern "C" { #endif -#define FURI_LOG_LEVEL_DEFAULT 3 - -#ifndef FURI_LOG_LEVEL -#define FURI_LOG_LEVEL FURI_LOG_LEVEL_DEFAULT -#endif +typedef enum { + FuriLogLevelDefault = 0, + FuriLogLevelNone = 1, + FuriLogLevelError = 2, + FuriLogLevelWarn = 3, + FuriLogLevelInfo = 4, + FuriLogLevelDebug = 5, + FuriLogLevelTrace = 6, +} FuriLogLevel; #define FURI_LOG_CLR(clr) "\033[0;" clr "m" #define FURI_LOG_CLR_RESET "\033[0m" @@ -28,20 +32,11 @@ extern "C" { #define FURI_LOG_CLR_W FURI_LOG_CLR(FURI_LOG_CLR_BROWN) #define FURI_LOG_CLR_I FURI_LOG_CLR(FURI_LOG_CLR_GREEN) #define FURI_LOG_CLR_D FURI_LOG_CLR(FURI_LOG_CLR_BLUE) -#define FURI_LOG_CLR_V +#define FURI_LOG_CLR_T FURI_LOG_CLR(FURI_LOG_CLR_PURPLE) typedef void (*FuriLogPuts)(const char* data); typedef uint32_t (*FuriLogTimestamp)(void); -typedef enum { - FURI_LOG_NONE = 0, - FURI_LOG_ERROR = 1, - FURI_LOG_WARN = 2, - FURI_LOG_INFO = 3, - FURI_LOG_DEBUG = 4, - FURI_LOG_VERBOSE = 5, -} FuriLogLevel; - void furi_log_init(); void furi_log_print(FuriLogLevel level, const char* format, ...); void furi_log_set_level(FuriLogLevel level); @@ -54,11 +49,14 @@ void furi_log_set_timestamp(FuriLogTimestamp timestamp); #define FURI_LOG_SHOW(tag, format, log_level, log_letter, ...) \ furi_log_print(log_level, FURI_LOG_FORMAT(log_letter, tag, format), ##__VA_ARGS__) -#define FURI_LOG_E(tag, format, ...) FURI_LOG_SHOW(tag, format, FURI_LOG_ERROR, E, ##__VA_ARGS__) -#define FURI_LOG_W(tag, format, ...) FURI_LOG_SHOW(tag, format, FURI_LOG_WARN, W, ##__VA_ARGS__) -#define FURI_LOG_I(tag, format, ...) FURI_LOG_SHOW(tag, format, FURI_LOG_INFO, I, ##__VA_ARGS__) -#define FURI_LOG_D(tag, format, ...) FURI_LOG_SHOW(tag, format, FURI_LOG_DEBUG, D, ##__VA_ARGS__) -#define FURI_LOG_V(tag, format, ...) FURI_LOG_SHOW(tag, format, FURI_LOG_VERBOSE, V, ##__VA_ARGS__) +#define FURI_LOG_E(tag, format, ...) \ + FURI_LOG_SHOW(tag, format, FuriLogLevelError, E, ##__VA_ARGS__) +#define FURI_LOG_W(tag, format, ...) FURI_LOG_SHOW(tag, format, FuriLogLevelWarn, W, ##__VA_ARGS__) +#define FURI_LOG_I(tag, format, ...) FURI_LOG_SHOW(tag, format, FuriLogLevelInfo, I, ##__VA_ARGS__) +#define FURI_LOG_D(tag, format, ...) \ + FURI_LOG_SHOW(tag, format, FuriLogLevelDebug, D, ##__VA_ARGS__) +#define FURI_LOG_T(tag, format, ...) \ + FURI_LOG_SHOW(tag, format, FuriLogLevelTrace, T, ##__VA_ARGS__) #ifdef __cplusplus } diff --git a/firmware/targets/f6/Inc/rtc.h b/firmware/targets/f6/Inc/rtc.h deleted file mode 100644 index 6dd24df4..00000000 --- a/firmware/targets/f6/Inc/rtc.h +++ /dev/null @@ -1,52 +0,0 @@ -/** - ****************************************************************************** - * @file rtc.h - * @brief This file contains all the function prototypes for - * the rtc.c file - ****************************************************************************** - * @attention - * - *

© Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

- * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ -/* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __RTC_H__ -#define __RTC_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -/* Includes ------------------------------------------------------------------*/ -#include "main.h" - -/* USER CODE BEGIN Includes */ - -/* USER CODE END Includes */ - -extern RTC_HandleTypeDef hrtc; - -/* USER CODE BEGIN Private defines */ - -/* USER CODE END Private defines */ - -void MX_RTC_Init(void); - -/* USER CODE BEGIN Prototypes */ - -/* USER CODE END Prototypes */ - -#ifdef __cplusplus -} -#endif - -#endif /* __RTC_H__ */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/firmware/targets/f6/Inc/stm32wbxx_hal_conf.h b/firmware/targets/f6/Inc/stm32wbxx_hal_conf.h index 4d5ad791..dc6a7ae4 100644 --- a/firmware/targets/f6/Inc/stm32wbxx_hal_conf.h +++ b/firmware/targets/f6/Inc/stm32wbxx_hal_conf.h @@ -48,7 +48,7 @@ #define HAL_PKA_MODULE_ENABLED /*#define HAL_QSPI_MODULE_ENABLED */ #define HAL_RNG_MODULE_ENABLED -#define HAL_RTC_MODULE_ENABLED +/*#define HAL_RTC_MODULE_ENABLED */ /*#define HAL_SAI_MODULE_ENABLED */ /*#define HAL_SMBUS_MODULE_ENABLED */ /*#define HAL_SMARTCARD_MODULE_ENABLED */ diff --git a/firmware/targets/f6/Src/rtc.c b/firmware/targets/f6/Src/rtc.c deleted file mode 100644 index 8487c1e0..00000000 --- a/firmware/targets/f6/Src/rtc.c +++ /dev/null @@ -1,123 +0,0 @@ -/** - ****************************************************************************** - * @file rtc.c - * @brief This file provides code for the configuration - * of the RTC instances. - ****************************************************************************** - * @attention - * - *

© Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

- * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ - -/* Includes ------------------------------------------------------------------*/ -#include "rtc.h" - -/* USER CODE BEGIN 0 */ - -/* USER CODE END 0 */ - -RTC_HandleTypeDef hrtc; - -/* RTC init function */ -void MX_RTC_Init(void) -{ - RTC_TimeTypeDef sTime = {0}; - RTC_DateTypeDef sDate = {0}; - - /** Initialize RTC Only - */ - hrtc.Instance = RTC; - hrtc.Init.HourFormat = RTC_HOURFORMAT_24; - hrtc.Init.AsynchPrediv = 127; - hrtc.Init.SynchPrediv = 255; - hrtc.Init.OutPut = RTC_OUTPUT_DISABLE; - hrtc.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH; - hrtc.Init.OutPutType = RTC_OUTPUT_TYPE_OPENDRAIN; - hrtc.Init.OutPutRemap = RTC_OUTPUT_REMAP_NONE; - if (HAL_RTC_Init(&hrtc) != HAL_OK) - { - Error_Handler(); - } - - /* USER CODE BEGIN Check_RTC_BKUP */ - return; - /* USER CODE END Check_RTC_BKUP */ - - /** Initialize RTC and set the Time and Date - */ - sTime.Hours = 0x0; - sTime.Minutes = 0x0; - sTime.Seconds = 0x0; - sTime.SubSeconds = 0x0; - sTime.DayLightSaving = RTC_DAYLIGHTSAVING_NONE; - sTime.StoreOperation = RTC_STOREOPERATION_RESET; - if (HAL_RTC_SetTime(&hrtc, &sTime, RTC_FORMAT_BCD) != HAL_OK) - { - Error_Handler(); - } - sDate.WeekDay = RTC_WEEKDAY_MONDAY; - sDate.Month = RTC_MONTH_JANUARY; - sDate.Date = 0x1; - sDate.Year = 0x0; - - if (HAL_RTC_SetDate(&hrtc, &sDate, RTC_FORMAT_BCD) != HAL_OK) - { - Error_Handler(); - } - -} - -void HAL_RTC_MspInit(RTC_HandleTypeDef* rtcHandle) -{ - - if(rtcHandle->Instance==RTC) - { - /* USER CODE BEGIN RTC_MspInit 0 */ - - /* USER CODE END RTC_MspInit 0 */ - /* RTC clock enable */ - __HAL_RCC_RTC_ENABLE(); - __HAL_RCC_RTCAPB_CLK_ENABLE(); - - /* RTC interrupt Init */ - HAL_NVIC_SetPriority(TAMP_STAMP_LSECSS_IRQn, 5, 0); - HAL_NVIC_EnableIRQ(TAMP_STAMP_LSECSS_IRQn); - /* USER CODE BEGIN RTC_MspInit 1 */ - - /* USER CODE END RTC_MspInit 1 */ - } -} - -void HAL_RTC_MspDeInit(RTC_HandleTypeDef* rtcHandle) -{ - - if(rtcHandle->Instance==RTC) - { - /* USER CODE BEGIN RTC_MspDeInit 0 */ - - /* USER CODE END RTC_MspDeInit 0 */ - /* Peripheral clock disable */ - __HAL_RCC_RTC_DISABLE(); - __HAL_RCC_RTCAPB_CLK_DISABLE(); - - /* RTC interrupt Deinit */ - HAL_NVIC_DisableIRQ(TAMP_STAMP_LSECSS_IRQn); - /* USER CODE BEGIN RTC_MspDeInit 1 */ - - /* USER CODE END RTC_MspDeInit 1 */ - } -} - -/* USER CODE BEGIN 1 */ - -/* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/firmware/targets/f6/Src/stm32wbxx_it.c b/firmware/targets/f6/Src/stm32wbxx_it.c index 1051e074..d4f71267 100644 --- a/firmware/targets/f6/Src/stm32wbxx_it.c +++ b/firmware/targets/f6/Src/stm32wbxx_it.c @@ -6,7 +6,6 @@ extern usbd_device udev; extern COMP_HandleTypeDef hcomp1; -extern RTC_HandleTypeDef hrtc; extern TIM_HandleTypeDef htim1; extern TIM_HandleTypeDef htim2; extern TIM_HandleTypeDef htim16; @@ -40,10 +39,6 @@ void HSEM_IRQHandler(void) { HAL_HSEM_IRQHandler(); } -void RTC_WKUP_IRQHandler(void){ - HW_TS_RTC_Wakeup_Handler(); -} - void IPCC_C1_TX_IRQHandler(void){ HW_IPCC_Tx_Handler(); } diff --git a/firmware/targets/f6/ble-glue/hw_if.h b/firmware/targets/f6/ble-glue/hw_if.h index 271a222a..f9dc0a6d 100644 --- a/firmware/targets/f6/ble-glue/hw_if.h +++ b/firmware/targets/f6/ble-glue/hw_if.h @@ -82,165 +82,6 @@ extern "C" { void HW_UART_Interrupt_Handler(hw_uart_id_t hw_uart_id); void HW_UART_DMA_Interrupt_Handler(hw_uart_id_t hw_uart_id); - /****************************************************************************** - * HW TimerServer - ******************************************************************************/ - /* Exported types ------------------------------------------------------------*/ - /** - * This setting is used when standby mode is supported. - * hw_ts_InitMode_Limited should be used when the device restarts from Standby Mode. In that case, the Timer Server does - * not re-initialized its context. Only the Hardware register which content has been lost is reconfigured - * Otherwise, hw_ts_InitMode_Full should be requested (Start from Power ON) and everything is re-initialized. - */ - typedef enum - { - hw_ts_InitMode_Full, - hw_ts_InitMode_Limited, - } HW_TS_InitMode_t; - - /** - * When a Timer is created as a SingleShot timer, it is not automatically restarted when the timeout occurs. However, - * the timer is kept reserved in the list and could be restarted at anytime with HW_TS_Start() - * - * When a Timer is created as a Repeated timer, it is automatically restarted when the timeout occurs. - */ - typedef enum - { - hw_ts_SingleShot, - hw_ts_Repeated - } HW_TS_Mode_t; - - /** - * hw_ts_Successful is returned when a Timer has been successfully created with HW_TS_Create(). Otherwise, hw_ts_Failed - * is returned. When hw_ts_Failed is returned, that means there are not enough free slots in the list to create a - * Timer. In that case, CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER should be increased - */ - typedef enum - { - hw_ts_Successful, - hw_ts_Failed, - }HW_TS_ReturnStatus_t; - - typedef void (*HW_TS_pTimerCb_t)(void); - - /** - * @brief Initialize the timer server - * This API shall be called by the application before any timer is requested to the timer server. It - * configures the RTC module to be connected to the LSI input clock. - * - * @param TimerInitMode: When the device restarts from Standby, it should request hw_ts_InitMode_Limited so that the - * Timer context is not re-initialized. Otherwise, hw_ts_InitMode_Full should be requested - * @param hrtc: RTC Handle - * @retval None - */ - void HW_TS_Init(HW_TS_InitMode_t TimerInitMode, RTC_HandleTypeDef *hrtc); - - /** - * @brief Interface to create a virtual timer - * The user shall call this API to create a timer. Once created, the timer is reserved to the module until it - * has been deleted. When creating a timer, the user shall specify the mode (single shot or repeated), the - * callback to be notified when the timer expires and a module ID to identify in the timer interrupt handler - * which module is concerned. In return, the user gets a timer ID to handle it. - * - * @param TimerProcessID: This is an identifier provided by the user and returned in the callback to allow - * identification of the requester - * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) - * @param TimerMode: Mode of the virtual timer (Single shot or repeated) - * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not - */ - HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); - - /** - * @brief Stop a virtual timer - * This API may be used to stop a running timer. A timer which is stopped is move to the pending state. - * A pending timer may be restarted at any time with a different timeout value but the mode cannot be changed. - * Nothing is done when it is called to stop a timer which has been already stopped - * - * @param TimerID: Id of the timer to stop - * @retval None - */ - void HW_TS_Stop(uint8_t TimerID); - - /** - * @brief Start a virtual timer - * This API shall be used to start a timer. The timeout value is specified and may be different each time. - * When the timer is in the single shot mode, it will move to the pending state when it expires. The user may - * restart it at any time with a different timeout value. When the timer is in the repeated mode, it always - * stay in the running state. When the timer expires, it will be restarted with the same timeout value. - * This API shall not be called on a running timer. - * - * @param TimerID: The ID Id of the timer to start - * @param timeout_ticks: Number of ticks of the virtual timer (Maximum value is (0xFFFFFFFF-0xFFFF = 0xFFFF0000) - * @retval None - */ - void HW_TS_Start(uint8_t TimerID, uint32_t timeout_ticks); - - /** - * @brief Delete a virtual timer from the list - * This API should be used when a timer is not needed anymore by the user. A deleted timer is removed from - * the timer list managed by the timer server. It cannot be restarted again. The user has to go with the - * creation of a new timer if required and may get a different timer id - * - * @param TimerID: The ID of the timer to remove from the list - * @retval None - */ - void HW_TS_Delete(uint8_t TimerID); - - /** - * @brief Schedule the timer list on the timer interrupt handler - * This interrupt handler shall be called by the application in the RTC interrupt handler. This handler takes - * care of clearing all status flag required in the RTC and EXTI peripherals - * - * @param None - * @retval None - */ - void HW_TS_RTC_Wakeup_Handler(void); - - /** - * @brief Return the number of ticks to count before the interrupt - * This API returns the number of ticks left to be counted before an interrupt is generated by the - * Timer Server. This API may be used by the application for power management optimization. When the system - * enters low power mode, the mode selection is a tradeoff between the wakeup time where the CPU is running - * and the time while the CPU will be kept in low power mode before next wakeup. The deeper is the - * low power mode used, the longer is the wakeup time. The low power mode management considering wakeup time - * versus time in low power mode is implementation specific - * When the timer is disabled (No timer in the list), it returns 0xFFFF - * - * @param None - * @retval The number of ticks left to count - */ - uint16_t HW_TS_RTC_ReadLeftTicksToCount(void); - - /** - * @brief Notify the application that a registered timer has expired - * This API shall be implemented by the user application. - * This API notifies the application that a timer expires. This API is running in the RTC Wakeup interrupt - * context. The application may implement an Operating System to change the context priority where the timer - * callback may be handled. This API provides the module ID to identify which module is concerned and to allow - * sending the information to the correct task - * - * @param TimerProcessID: The TimerProcessId associated with the timer when it has been created - * @param TimerID: The TimerID of the expired timer - * @param pTimerCallBack: The Callback associated with the timer when it has been created - * @retval None - */ - void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS_pTimerCb_t pTimerCallBack); - - /** - * @brief Notify the application that the wakeupcounter has been updated - * This API should be implemented by the user application - * This API notifies the application that the counter has been updated. This is expected to be used along - * with the HW_TS_RTC_ReadLeftTicksToCount () API. It could be that the counter has been updated since the - * last call of HW_TS_RTC_ReadLeftTicksToCount () and before entering low power mode. This notification - * provides a way to the application to solve that race condition to reevaluate the counter value before - * entering low power mode - * - * @param None - * @retval None - */ - void HW_TS_RTC_CountUpdated_AppNot(void); - #ifdef __cplusplus } #endif diff --git a/firmware/targets/f6/ble-glue/hw_timerserver.c b/firmware/targets/f6/ble-glue/hw_timerserver.c deleted file mode 100644 index e0e4fcb5..00000000 --- a/firmware/targets/f6/ble-glue/hw_timerserver.c +++ /dev/null @@ -1,893 +0,0 @@ -/** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** - * @attention - * - *

© Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

- * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ - -/* Includes ------------------------------------------------------------------*/ -#include "app_common.h" -#include "hw_conf.h" - -/* Private typedef -----------------------------------------------------------*/ -typedef enum -{ - TimerID_Free, - TimerID_Created, - TimerID_Running -}TimerIDStatus_t; - -typedef enum -{ - SSR_Read_Requested, - SSR_Read_Not_Requested -}RequestReadSSR_t; - -typedef enum -{ - WakeupTimerValue_Overpassed, - WakeupTimerValue_LargeEnough -}WakeupTimerLimitation_Status_t; - -typedef struct -{ - HW_TS_pTimerCb_t pTimerCallBack; - uint32_t CounterInit; - uint32_t CountLeft; - TimerIDStatus_t TimerIDStatus; - HW_TS_Mode_t TimerMode; - uint32_t TimerProcessID; - uint8_t PreviousID; - uint8_t NextID; -}TimerContext_t; - -/* Private defines -----------------------------------------------------------*/ -#define SSR_FORBIDDEN_VALUE 0xFFFFFFFF -#define TIMER_LIST_EMPTY 0xFFFF - -/* Private macros ------------------------------------------------------------*/ -/* Private variables ---------------------------------------------------------*/ - -/** - * START of Section TIMERSERVER_CONTEXT - */ - -PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile TimerContext_t aTimerContext[CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER]; -PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint8_t CurrentRunningTimerID; -PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint8_t PreviousRunningTimerID; -PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint32_t SSRValueOnLastSetup; -PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile WakeupTimerLimitation_Status_t WakeupTimerLimitation; - -/** - * END of Section TIMERSERVER_CONTEXT - */ - -static RTC_HandleTypeDef *phrtc; /**< RTC handle */ -static uint8_t WakeupTimerDivider; -static uint8_t AsynchPrescalerUserConfig; -static uint16_t SynchPrescalerUserConfig; -static volatile uint16_t MaxWakeupTimerSetup; - -/* Global variables ----------------------------------------------------------*/ -/* Private function prototypes -----------------------------------------------*/ -static void RestartWakeupCounter(uint16_t Value); -static uint16_t ReturnTimeElapsed(void); -static void RescheduleTimerList(void); -static void UnlinkTimer(uint8_t TimerID, RequestReadSSR_t RequestReadSSR); -static void LinkTimerBefore(uint8_t TimerID, uint8_t RefTimerID); -static void LinkTimerAfter(uint8_t TimerID, uint8_t RefTimerID); -static uint16_t linkTimer(uint8_t TimerID); -static uint32_t ReadRtcSsrValue(void); - -__weak void HW_TS_RTC_CountUpdated_AppNot(void); - -/* Functions Definition ------------------------------------------------------*/ - -/** - * @brief Read the RTC_SSR value - * As described in the reference manual, the RTC_SSR shall be read twice to ensure - * reliability of the value - * @param None - * @retval SSR value read - */ -static uint32_t ReadRtcSsrValue(void) -{ - uint32_t first_read; - uint32_t second_read; - - first_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); - - second_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); - - while(first_read != second_read) - { - first_read = second_read; - - second_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); - } - - return second_read; -} - -/** - * @brief Insert a Timer in the list after the Timer ID specified - * @param TimerID: The ID of the Timer - * @param RefTimerID: The ID of the Timer to be linked after - * @retval None - */ -static void LinkTimerAfter(uint8_t TimerID, uint8_t RefTimerID) -{ - uint8_t next_id; - - next_id = aTimerContext[RefTimerID].NextID; - - if(next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) - { - aTimerContext[next_id].PreviousID = TimerID; - } - aTimerContext[TimerID].NextID = next_id; - aTimerContext[TimerID].PreviousID = RefTimerID ; - aTimerContext[RefTimerID].NextID = TimerID; - - return; -} - -/** - * @brief Insert a Timer in the list before the ID specified - * @param TimerID: The ID of the Timer - * @param RefTimerID: The ID of the Timer to be linked before - * @retval None - */ -static void LinkTimerBefore(uint8_t TimerID, uint8_t RefTimerID) -{ - uint8_t previous_id; - - if(RefTimerID != CurrentRunningTimerID) - { - previous_id = aTimerContext[RefTimerID].PreviousID; - - aTimerContext[previous_id].NextID = TimerID; - aTimerContext[TimerID].NextID = RefTimerID; - aTimerContext[TimerID].PreviousID = previous_id ; - aTimerContext[RefTimerID].PreviousID = TimerID; - } - else - { - aTimerContext[TimerID].NextID = RefTimerID; - aTimerContext[RefTimerID].PreviousID = TimerID; - } - - return; -} - -/** - * @brief Insert a Timer in the list - * @param TimerID: The ID of the Timer - * @retval None - */ -static uint16_t linkTimer(uint8_t TimerID) -{ - uint32_t time_left; - uint16_t time_elapsed; - uint8_t timer_id_lookup; - uint8_t next_id; - - if(CurrentRunningTimerID == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) - { - /** - * No timer in the list - */ - PreviousRunningTimerID = CurrentRunningTimerID; - CurrentRunningTimerID = TimerID; - aTimerContext[TimerID].NextID = CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; - - SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; - time_elapsed = 0; - } - else - { - time_elapsed = ReturnTimeElapsed(); - - /** - * update count of the timer to be linked - */ - aTimerContext[TimerID].CountLeft += time_elapsed; - time_left = aTimerContext[TimerID].CountLeft; - - /** - * Search for index where the new timer shall be linked - */ - if(aTimerContext[CurrentRunningTimerID].CountLeft <= time_left) - { - /** - * Search for the ID after the first one - */ - timer_id_lookup = CurrentRunningTimerID; - next_id = aTimerContext[timer_id_lookup].NextID; - while((next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (aTimerContext[next_id].CountLeft <= time_left)) - { - timer_id_lookup = aTimerContext[timer_id_lookup].NextID; - next_id = aTimerContext[timer_id_lookup].NextID; - } - - /** - * Link after the ID - */ - LinkTimerAfter(TimerID, timer_id_lookup); - } - else - { - /** - * Link before the first ID - */ - LinkTimerBefore(TimerID, CurrentRunningTimerID); - PreviousRunningTimerID = CurrentRunningTimerID; - CurrentRunningTimerID = TimerID; - } - } - - return time_elapsed; -} - -/** - * @brief Remove a Timer from the list - * @param TimerID: The ID of the Timer - * @param RequestReadSSR: Request to read the SSR register or not - * @retval None - */ -static void UnlinkTimer(uint8_t TimerID, RequestReadSSR_t RequestReadSSR) -{ - uint8_t previous_id; - uint8_t next_id; - - if(TimerID == CurrentRunningTimerID) - { - PreviousRunningTimerID = CurrentRunningTimerID; - CurrentRunningTimerID = aTimerContext[TimerID].NextID; - } - else - { - previous_id = aTimerContext[TimerID].PreviousID; - next_id = aTimerContext[TimerID].NextID; - - aTimerContext[previous_id].NextID = aTimerContext[TimerID].NextID; - if(next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) - { - aTimerContext[next_id].PreviousID = aTimerContext[TimerID].PreviousID; - } - } - - /** - * Timer is out of the list - */ - aTimerContext[TimerID].TimerIDStatus = TimerID_Created; - - if((CurrentRunningTimerID == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (RequestReadSSR == SSR_Read_Requested)) - { - SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; - } - - return; -} - -/** - * @brief Return the number of ticks counted by the wakeuptimer since it has been started - * @note The API is reading the SSR register to get how many ticks have been counted - * since the time the timer has been started - * @param None - * @retval Time expired in Ticks - */ -static uint16_t ReturnTimeElapsed(void) -{ - uint32_t return_value; - uint32_t wrap_counter; - - if(SSRValueOnLastSetup != SSR_FORBIDDEN_VALUE) - { - return_value = ReadRtcSsrValue(); /**< Read SSR register first */ - - if (SSRValueOnLastSetup >= return_value) - { - return_value = SSRValueOnLastSetup - return_value; - } - else - { - wrap_counter = SynchPrescalerUserConfig - return_value; - return_value = SSRValueOnLastSetup + wrap_counter; - } - - /** - * At this stage, ReturnValue holds the number of ticks counted by SSR - * Need to translate in number of ticks counted by the Wakeuptimer - */ - return_value = return_value*AsynchPrescalerUserConfig; - return_value = return_value >> WakeupTimerDivider; - } - else - { - return_value = 0; - } - - return (uint16_t)return_value; -} - -/** - * @brief Set the wakeup counter - * @note The API is writing the counter value so that the value is decreased by one to cope with the fact - * the interrupt is generated with 1 extra clock cycle (See RefManuel) - * It assumes all condition are met to be allowed to write the wakeup counter - * @param Value: Value to be written in the counter - * @retval None - */ -static void RestartWakeupCounter(uint16_t Value) -{ - /** - * The wakeuptimer has been disabled in the calling function to reduce the time to poll the WUTWF - * FLAG when the new value will have to be written - * __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); - */ - - if(Value == 0) - { - SSRValueOnLastSetup = ReadRtcSsrValue(); - - /** - * Simulate that the Timer expired - */ - HAL_NVIC_SetPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); - } - else - { - if((Value > 1) ||(WakeupTimerDivider != 1)) - { - Value -= 1; - } - - while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); - - /** - * make sure to clear the flags after checking the WUTWF. - * It takes 2 RTCCLK between the time the WUTE bit is disabled and the - * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable - * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between - * due to the autoreload feature - */ - __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ - __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ - HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ - - MODIFY_REG(RTC->WUTR, RTC_WUTR_WUT, Value); - - /** - * Update the value here after the WUTWF polling that may take some time - */ - SSRValueOnLastSetup = ReadRtcSsrValue(); - - __HAL_RTC_WAKEUPTIMER_ENABLE(phrtc); /**< Enable the Wakeup Timer */ - - HW_TS_RTC_CountUpdated_AppNot(); - } - - return ; -} - -/** - * @brief Reschedule the list of timer - * @note 1) Update the count left for each timer in the list - * 2) Setup the wakeuptimer - * @param None - * @retval None - */ -static void RescheduleTimerList(void) -{ - uint8_t localTimerID; - uint32_t timecountleft; - uint16_t wakeup_timer_value; - uint16_t time_elapsed; - - /** - * The wakeuptimer is disabled now to reduce the time to poll the WUTWF - * FLAG when the new value will have to be written - */ - if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) - { - /** - * Wait for the flag to be back to 0 when the wakeup timer is enabled - */ - while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == SET); - } - __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ - - localTimerID = CurrentRunningTimerID; - - /** - * Calculate what will be the value to write in the wakeuptimer - */ - timecountleft = aTimerContext[localTimerID].CountLeft; - - /** - * Read how much has been counted - */ - time_elapsed = ReturnTimeElapsed(); - - if(timecountleft < time_elapsed ) - { - /** - * There is no tick left to count - */ - wakeup_timer_value = 0; - WakeupTimerLimitation = WakeupTimerValue_LargeEnough; - } - else - { - if(timecountleft > (time_elapsed + MaxWakeupTimerSetup)) - { - /** - * The number of tick left is greater than the Wakeuptimer maximum value - */ - wakeup_timer_value = MaxWakeupTimerSetup; - - WakeupTimerLimitation = WakeupTimerValue_Overpassed; - } - else - { - wakeup_timer_value = timecountleft - time_elapsed; - WakeupTimerLimitation = WakeupTimerValue_LargeEnough; - } - - } - - /** - * update ticks left to be counted for each timer - */ - while(localTimerID != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) - { - if (aTimerContext[localTimerID].CountLeft < time_elapsed) - { - aTimerContext[localTimerID].CountLeft = 0; - } - else - { - aTimerContext[localTimerID].CountLeft -= time_elapsed; - } - localTimerID = aTimerContext[localTimerID].NextID; - } - - /** - * Write next count - */ - RestartWakeupCounter(wakeup_timer_value); - - return ; -} - -/* Public functions ----------------------------------------------------------*/ - -/** - * For all public interface except that may need write access to the RTC, the RTC - * shall be unlock at the beginning and locked at the output - * In order to ease maintainability, the unlock is done at the top and the lock at then end - * in case some new implementation is coming in the future - */ - -void HW_TS_RTC_Wakeup_Handler(void) -{ - HW_TS_pTimerCb_t ptimer_callback; - uint32_t timer_process_id; - uint8_t local_current_running_timer_id; -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - uint32_t primask_bit; -#endif - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ - __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ -#endif - -/* Disable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); - - /** - * Disable the Wakeup Timer - * This may speed up a bit the processing to wait the timer to be disabled - * The timer is still counting 2 RTCCLK - */ - __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); - - local_current_running_timer_id = CurrentRunningTimerID; - - if(aTimerContext[local_current_running_timer_id].TimerIDStatus == TimerID_Running) - { - ptimer_callback = aTimerContext[local_current_running_timer_id].pTimerCallBack; - timer_process_id = aTimerContext[local_current_running_timer_id].TimerProcessID; - - /** - * It should be good to check whether the TimeElapsed is greater or not than the tick left to be counted - * However, due to the inaccuracy of the reading of the time elapsed, it may return there is 1 tick - * to be left whereas the count is over - * A more secure implementation has been done with a flag to state whereas the full count has been written - * in the wakeuptimer or not - */ - if(WakeupTimerLimitation != WakeupTimerValue_Overpassed) - { - if(aTimerContext[local_current_running_timer_id].TimerMode == hw_ts_Repeated) - { - UnlinkTimer(local_current_running_timer_id, SSR_Read_Not_Requested); -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - HW_TS_Start(local_current_running_timer_id, aTimerContext[local_current_running_timer_id].CounterInit); - - /* Disable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); - } - else - { -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - HW_TS_Stop(local_current_running_timer_id); - - /* Disable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); - } - - HW_TS_RTC_Int_AppNot(timer_process_id, local_current_running_timer_id, ptimer_callback); - } - else - { - RescheduleTimerList(); -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - } - } - else - { - /** - * We should never end up in this case - * However, if due to any bug in the timer server this is the case, the mistake may not impact the user. - * We could just clean the interrupt flag and get out from this unexpected interrupt - */ - while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); - - /** - * make sure to clear the flags after checking the WUTWF. - * It takes 2 RTCCLK between the time the WUTE bit is disabled and the - * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable - * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between - * due to the autoreload feature - */ - __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ - __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - } - - /* Enable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); - - return; -} - -void HW_TS_Init(HW_TS_InitMode_t TimerInitMode, RTC_HandleTypeDef *hrtc) -{ - uint8_t loop; - uint32_t localmaxwakeuptimersetup; - - /** - * Get RTC handler - */ - phrtc = hrtc; - - /* Disable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); - - SET_BIT(RTC->CR, RTC_CR_BYPSHAD); - - /** - * Readout the user config - */ - WakeupTimerDivider = (4 - ((uint32_t)(READ_BIT(RTC->CR, RTC_CR_WUCKSEL)))); - - AsynchPrescalerUserConfig = (uint8_t)(READ_BIT(RTC->PRER, RTC_PRER_PREDIV_A) >> (uint32_t)POSITION_VAL(RTC_PRER_PREDIV_A)) + 1; - - SynchPrescalerUserConfig = (uint16_t)(READ_BIT(RTC->PRER, RTC_PRER_PREDIV_S)) + 1; - - /** - * Margin is taken to avoid wrong calculation when the wrap around is there and some - * application interrupts may have delayed the reading - */ - localmaxwakeuptimersetup = ((((SynchPrescalerUserConfig - 1)*AsynchPrescalerUserConfig) - CFG_HW_TS_RTC_HANDLER_MAX_DELAY) >> WakeupTimerDivider); - - if(localmaxwakeuptimersetup >= 0xFFFF) - { - MaxWakeupTimerSetup = 0xFFFF; - } - else - { - MaxWakeupTimerSetup = (uint16_t)localmaxwakeuptimersetup; - } - - /** - * Configure EXTI module - */ - LL_EXTI_EnableRisingTrig_0_31(RTC_EXTI_LINE_WAKEUPTIMER_EVENT); - LL_EXTI_EnableIT_0_31(RTC_EXTI_LINE_WAKEUPTIMER_EVENT); - - if(TimerInitMode == hw_ts_InitMode_Full) - { - WakeupTimerLimitation = WakeupTimerValue_LargeEnough; - SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; - - /** - * Initialize the timer server - */ - for(loop = 0; loop < CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; loop++) - { - aTimerContext[loop].TimerIDStatus = TimerID_Free; - } - - CurrentRunningTimerID = CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; /**< Set ID to non valid value */ - - __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ - __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ - __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ - HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ - __HAL_RTC_WAKEUPTIMER_ENABLE_IT(phrtc, RTC_IT_WUT); /**< Enable interrupt in RTC module */ - } - else - { - if(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTF) != RESET) - { - /** - * Simulate that the Timer expired - */ - HAL_NVIC_SetPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); - } - } - - /* Enable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); - - HAL_NVIC_SetPriority(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID, CFG_HW_TS_NVIC_RTC_WAKEUP_IT_PREEMPTPRIO, CFG_HW_TS_NVIC_RTC_WAKEUP_IT_SUBPRIO); /**< Set NVIC priority */ - HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ - - return; -} - -HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pftimeout_handler) -{ - HW_TS_ReturnStatus_t localreturnstatus; - uint8_t loop = 0; -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - uint32_t primask_bit; -#endif - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ - __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ -#endif - - while((loop < CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (aTimerContext[loop].TimerIDStatus != TimerID_Free)) - { - loop++; - } - - if(loop != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) - { - aTimerContext[loop].TimerIDStatus = TimerID_Created; - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - - aTimerContext[loop].TimerProcessID = TimerProcessID; - aTimerContext[loop].TimerMode = TimerMode; - aTimerContext[loop].pTimerCallBack = pftimeout_handler; - *pTimerId = loop; - - localreturnstatus = hw_ts_Successful; - } - else - { -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - - localreturnstatus = hw_ts_Failed; - } - - return(localreturnstatus); -} - -void HW_TS_Delete(uint8_t timer_id) -{ - HW_TS_Stop(timer_id); - - aTimerContext[timer_id].TimerIDStatus = TimerID_Free; /**< release ID */ - - return; -} - -void HW_TS_Stop(uint8_t timer_id) -{ - uint8_t localcurrentrunningtimerid; - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - uint32_t primask_bit; -#endif - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ - __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ -#endif - - HAL_NVIC_DisableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Disable NVIC */ - - /* Disable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); - - if(aTimerContext[timer_id].TimerIDStatus == TimerID_Running) - { - UnlinkTimer(timer_id, SSR_Read_Requested); - localcurrentrunningtimerid = CurrentRunningTimerID; - - if(localcurrentrunningtimerid == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) - { - /** - * List is empty - */ - - /** - * Disable the timer - */ - if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) - { - /** - * Wait for the flag to be back to 0 when the wakeup timer is enabled - */ - while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == SET); - } - __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ - - while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); - - /** - * make sure to clear the flags after checking the WUTWF. - * It takes 2 RTCCLK between the time the WUTE bit is disabled and the - * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable - * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between - * due to the autoreload feature - */ - __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ - __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ - HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ - } - else if(PreviousRunningTimerID != localcurrentrunningtimerid) - { - RescheduleTimerList(); - } - } - - /* Enable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); - - HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - - return; -} - -void HW_TS_Start(uint8_t timer_id, uint32_t timeout_ticks) -{ - uint16_t time_elapsed; - uint8_t localcurrentrunningtimerid; - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - uint32_t primask_bit; -#endif - - if(aTimerContext[timer_id].TimerIDStatus == TimerID_Running) - { - HW_TS_Stop( timer_id ); - } - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ - __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ -#endif - - HAL_NVIC_DisableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Disable NVIC */ - - /* Disable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); - - aTimerContext[timer_id].TimerIDStatus = TimerID_Running; - - aTimerContext[timer_id].CountLeft = timeout_ticks; - aTimerContext[timer_id].CounterInit = timeout_ticks; - - time_elapsed = linkTimer(timer_id); - - localcurrentrunningtimerid = CurrentRunningTimerID; - - if(PreviousRunningTimerID != localcurrentrunningtimerid) - { - RescheduleTimerList(); - } - else - { - aTimerContext[timer_id].CountLeft -= time_elapsed; - } - - /* Enable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); - - HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - - return; -} - -uint16_t HW_TS_RTC_ReadLeftTicksToCount(void) -{ - uint32_t primask_bit; - uint16_t return_value, auro_reload_value, elapsed_time_value; - - primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ - __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ - - if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) - { - auro_reload_value = (uint32_t)(READ_BIT(RTC->WUTR, RTC_WUTR_WUT)); - - elapsed_time_value = ReturnTimeElapsed(); - - if(auro_reload_value > elapsed_time_value) - { - return_value = auro_reload_value - elapsed_time_value; - } - else - { - return_value = 0; - } - } - else - { - return_value = TIMER_LIST_EMPTY; - } - - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ - - return (return_value); -} - -__weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS_pTimerCb_t pTimerCallBack) -{ - pTimerCallBack(); - - return; -} - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/firmware/targets/f6/furi-hal/furi-hal-bootloader.c b/firmware/targets/f6/furi-hal/furi-hal-bootloader.c index e8ea913e..b5e7cb5c 100644 --- a/firmware/targets/f6/furi-hal/furi-hal-bootloader.c +++ b/firmware/targets/f6/furi-hal/furi-hal-bootloader.c @@ -23,11 +23,3 @@ void furi_hal_bootloader_set_mode(FuriHalBootloaderMode mode) { LL_RTC_BAK_SetRegister(RTC, LL_RTC_BKP_DR0, BOOT_REQUEST_DFU); } } - -void furi_hal_bootloader_set_flags(FuriHalBootloaderFlag flags) { - LL_RTC_BAK_SetRegister(RTC, LL_RTC_BKP_DR2, flags); -} - -FuriHalBootloaderFlag furi_hal_bootloader_get_flags() { - return LL_RTC_BAK_GetRegister(RTC, LL_RTC_BKP_DR2); -} \ No newline at end of file diff --git a/firmware/targets/f6/furi-hal/furi-hal-clock.c b/firmware/targets/f6/furi-hal/furi-hal-clock.c index 7a124049..ddbeaa0b 100644 --- a/firmware/targets/f6/furi-hal/furi-hal-clock.c +++ b/firmware/targets/f6/furi-hal/furi-hal-clock.c @@ -77,14 +77,6 @@ void furi_hal_clock_init() { Error_Handler(); } - if(LL_RCC_GetRTCClockSource() != LL_RCC_RTC_CLKSOURCE_LSE) { - LL_RCC_ForceBackupDomainReset(); - LL_RCC_ReleaseBackupDomainReset(); - LL_RCC_SetRTCClockSource(LL_RCC_RTC_CLKSOURCE_LSE); - } - - LL_RCC_EnableRTC(); - LL_RCC_SetUSARTClockSource(LL_RCC_USART1_CLKSOURCE_PCLK2); LL_RCC_SetLPUARTClockSource(LL_RCC_LPUART1_CLKSOURCE_PCLK1); LL_RCC_SetADCClockSource(LL_RCC_ADC_CLKSOURCE_PLLSAI1); @@ -118,7 +110,6 @@ void furi_hal_clock_init() { LL_AHB3_GRP1_EnableClock(LL_AHB3_GRP1_PERIPH_AES2); // APB1 - LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_RTCAPB); LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_TIM2); LL_APB1_GRP2_EnableClock(LL_APB1_GRP2_PERIPH_LPUART1); diff --git a/firmware/targets/f6/furi-hal/furi-hal-interrupt.c b/firmware/targets/f6/furi-hal/furi-hal-interrupt.c index 2685edab..4ff2bc7b 100644 --- a/firmware/targets/f6/furi-hal/furi-hal-interrupt.c +++ b/firmware/targets/f6/furi-hal/furi-hal-interrupt.c @@ -158,7 +158,6 @@ void DMA2_Channel8_IRQHandler(void) { if (furi_hal_dma_channel_isr[1][7]) furi_hal_dma_channel_isr[1][7](); } - void TAMP_STAMP_LSECSS_IRQHandler(void) { if (LL_RCC_IsActiveFlag_LSECSS()) { LL_RCC_ClearFlag_LSECSS(); @@ -174,7 +173,6 @@ void TAMP_STAMP_LSECSS_IRQHandler(void) { void RCC_IRQHandler(void) { } - void NMI_Handler(void) { if (LL_RCC_IsActiveFlag_HSECSS()) { LL_RCC_ClearFlag_HSECSS(); @@ -206,5 +204,4 @@ void UsageFault_Handler(void) { } void DebugMon_Handler(void) { - } diff --git a/firmware/targets/f6/furi-hal/furi-hal-rtc.c b/firmware/targets/f6/furi-hal/furi-hal-rtc.c new file mode 100644 index 00000000..13bb17cb --- /dev/null +++ b/firmware/targets/f6/furi-hal/furi-hal-rtc.c @@ -0,0 +1,122 @@ +#include +#include +#include + +#include + +#define TAG "FuriHalRtc" + +#define FURI_HAL_RTC_BOOT_FLAGS_REG LL_RTC_BKP_DR0 +#define FURI_HAL_RTC_BOOT_VERSION_REG LL_RTC_BKP_DR1 +#define FURI_HAL_RTC_SYSTEM_REG LL_RTC_BKP_DR2 + +typedef struct { + uint8_t log_level:4; + uint8_t log_reserved:4; + uint8_t flags; + uint16_t reserved; +} DeveloperReg; + +void furi_hal_rtc_init() { + if(LL_RCC_GetRTCClockSource() != LL_RCC_RTC_CLKSOURCE_LSE) { + LL_RCC_ForceBackupDomainReset(); + LL_RCC_ReleaseBackupDomainReset(); + LL_RCC_SetRTCClockSource(LL_RCC_RTC_CLKSOURCE_LSE); + } + + LL_RCC_EnableRTC(); + LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_RTCAPB); + + LL_RTC_InitTypeDef RTC_InitStruct = {0}; + RTC_InitStruct.HourFormat = LL_RTC_HOURFORMAT_24HOUR; + RTC_InitStruct.AsynchPrescaler = 127; + RTC_InitStruct.SynchPrescaler = 255; + LL_RTC_Init(RTC, &RTC_InitStruct); + + furi_log_set_level(furi_hal_rtc_get_log_level()); + + FURI_LOG_I(TAG, "Init OK"); +} + +void furi_hal_rtc_set_log_level(uint8_t level) { + uint32_t data = LL_RTC_BAK_GetRegister(RTC, FURI_HAL_RTC_SYSTEM_REG); + ((DeveloperReg*)&data)->log_level = level; + LL_RTC_BAK_SetRegister(RTC, FURI_HAL_RTC_SYSTEM_REG, data); + furi_log_set_level(level); +} + +uint8_t furi_hal_rtc_get_log_level() { + uint32_t data = LL_RTC_BAK_GetRegister(RTC, FURI_HAL_RTC_SYSTEM_REG); + return ((DeveloperReg*)&data)->log_level; +} + +void furi_hal_rtc_set_flag(FuriHalRtcFlag flag) { + uint32_t data = LL_RTC_BAK_GetRegister(RTC, FURI_HAL_RTC_SYSTEM_REG); + ((DeveloperReg*)&data)->flags |= flag; + LL_RTC_BAK_SetRegister(RTC, FURI_HAL_RTC_SYSTEM_REG, data); +} + +void furi_hal_rtc_reset_flag(FuriHalRtcFlag flag) { + uint32_t data = LL_RTC_BAK_GetRegister(RTC, FURI_HAL_RTC_SYSTEM_REG); + ((DeveloperReg*)&data)->flags &= ~flag; + LL_RTC_BAK_SetRegister(RTC, FURI_HAL_RTC_SYSTEM_REG, data); +} + +bool furi_hal_rtc_is_flag_set(FuriHalRtcFlag flag) { + uint32_t data = LL_RTC_BAK_GetRegister(RTC, FURI_HAL_RTC_SYSTEM_REG); + return ((DeveloperReg*)&data)->flags & flag; +} + +void furi_hal_rtc_set_datetime(FuriHalRtcDateTime* datetime) { + furi_assert(datetime); + + /* Disable write protection */ + LL_RTC_DisableWriteProtection(RTC); + + /* Enter Initialization mode and wait for INIT flag to be set */ + LL_RTC_EnableInitMode(RTC); + while(!LL_RTC_IsActiveFlag_INIT(RTC)) {} + + /* Set time */ + LL_RTC_TIME_Config(RTC, + LL_RTC_TIME_FORMAT_AM_OR_24, + __LL_RTC_CONVERT_BIN2BCD(datetime->hour), + __LL_RTC_CONVERT_BIN2BCD(datetime->minute), + __LL_RTC_CONVERT_BIN2BCD(datetime->second) + ); + + /* Set date */ + LL_RTC_DATE_Config(RTC, + datetime->weekday, + __LL_RTC_CONVERT_BIN2BCD(datetime->day), + __LL_RTC_CONVERT_BIN2BCD(datetime->month), + __LL_RTC_CONVERT_BIN2BCD(datetime->year - 2000) + ); + + /* Exit Initialization mode */ + LL_RTC_DisableInitMode(RTC); + + /* If RTC_CR_BYPSHAD bit = 0, wait for synchro else this check is not needed */ + if (!LL_RTC_IsShadowRegBypassEnabled(RTC)) { + LL_RTC_ClearFlag_RS(RTC); + while(!LL_RTC_IsActiveFlag_RS(RTC)) {}; + } + + /* Enable write protection */ + LL_RTC_EnableWriteProtection(RTC); +} + +void furi_hal_rtc_get_datetime(FuriHalRtcDateTime* datetime) { + furi_assert(datetime); + + uint32_t time = LL_RTC_TIME_Get(RTC); // 0x00HHMMSS + uint32_t date = LL_RTC_DATE_Get(RTC); // 0xWWDDMMYY + + datetime->second = __LL_RTC_CONVERT_BCD2BIN((time>>0) & 0xFF); + datetime->minute = __LL_RTC_CONVERT_BCD2BIN((time>>8) & 0xFF); + datetime->hour = __LL_RTC_CONVERT_BCD2BIN((time>>16) & 0xFF); + datetime->year = __LL_RTC_CONVERT_BCD2BIN((date >> 0) & 0xFF) + 2000; + datetime->month = __LL_RTC_CONVERT_BCD2BIN((date >> 8) & 0xFF); + datetime->day = __LL_RTC_CONVERT_BCD2BIN((date >> 16) & 0xFF); + datetime->weekday = __LL_RTC_CONVERT_BCD2BIN((date >> 24) & 0xFF); +} diff --git a/firmware/targets/f6/furi-hal/furi-hal.c b/firmware/targets/f6/furi-hal/furi-hal.c index d213af95..3f41684f 100644 --- a/firmware/targets/f6/furi-hal/furi-hal.c +++ b/firmware/targets/f6/furi-hal/furi-hal.c @@ -1,7 +1,6 @@ #include #include -#include #include #include @@ -13,18 +12,14 @@ void furi_hal_init() { furi_hal_clock_init(); + furi_hal_rtc_init(); furi_hal_console_init(); furi_hal_interrupt_init(); furi_hal_delay_init(); - // FreeRTOS glue - furi_hal_os_init(); - MX_GPIO_Init(); FURI_LOG_I(TAG, "GPIO OK"); - MX_RTC_Init(); - FURI_LOG_I(TAG, "RTC OK"); furi_hal_bootloader_init(); furi_hal_version_init(); @@ -59,6 +54,9 @@ void furi_hal_init() { furi_hal_bt_init(); furi_hal_compress_icon_init(); + // FreeRTOS glue + furi_hal_os_init(); + // FatFS driver initialization MX_FATFS_Init(); FURI_LOG_I(TAG, "FATFS OK"); diff --git a/firmware/targets/f6/target.mk b/firmware/targets/f6/target.mk index cad7d33f..e642e2aa 100644 --- a/firmware/targets/f6/target.mk +++ b/firmware/targets/f6/target.mk @@ -24,7 +24,7 @@ LDFLAGS += $(MCU_FLAGS) -specs=nosys.specs -specs=nano.specs -u _printf_float CPPFLAGS += -fno-rtti -fno-use-cxa-atexit -fno-exceptions LDFLAGS += -Wl,--start-group -lstdc++ -lsupc++ -Wl,--end-group -HARDWARE_TARGET = 6 +HARDWARE_TARGET = 7 MXPROJECT_DIR = $(TARGET_DIR) @@ -57,7 +57,6 @@ C_SOURCES += \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c \ - $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c \ @@ -67,6 +66,7 @@ C_SOURCES += \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_i2c.c \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_lptim.c \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_rcc.c \ + $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_rtc.c \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_spi.c \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_tim.c \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_usart.c \ diff --git a/firmware/targets/f7/Inc/rtc.h b/firmware/targets/f7/Inc/rtc.h deleted file mode 100644 index 6dd24df4..00000000 --- a/firmware/targets/f7/Inc/rtc.h +++ /dev/null @@ -1,52 +0,0 @@ -/** - ****************************************************************************** - * @file rtc.h - * @brief This file contains all the function prototypes for - * the rtc.c file - ****************************************************************************** - * @attention - * - *

© Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

- * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ -/* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __RTC_H__ -#define __RTC_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -/* Includes ------------------------------------------------------------------*/ -#include "main.h" - -/* USER CODE BEGIN Includes */ - -/* USER CODE END Includes */ - -extern RTC_HandleTypeDef hrtc; - -/* USER CODE BEGIN Private defines */ - -/* USER CODE END Private defines */ - -void MX_RTC_Init(void); - -/* USER CODE BEGIN Prototypes */ - -/* USER CODE END Prototypes */ - -#ifdef __cplusplus -} -#endif - -#endif /* __RTC_H__ */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/firmware/targets/f7/Inc/stm32wbxx_hal_conf.h b/firmware/targets/f7/Inc/stm32wbxx_hal_conf.h index 4d5ad791..dc6a7ae4 100644 --- a/firmware/targets/f7/Inc/stm32wbxx_hal_conf.h +++ b/firmware/targets/f7/Inc/stm32wbxx_hal_conf.h @@ -48,7 +48,7 @@ #define HAL_PKA_MODULE_ENABLED /*#define HAL_QSPI_MODULE_ENABLED */ #define HAL_RNG_MODULE_ENABLED -#define HAL_RTC_MODULE_ENABLED +/*#define HAL_RTC_MODULE_ENABLED */ /*#define HAL_SAI_MODULE_ENABLED */ /*#define HAL_SMBUS_MODULE_ENABLED */ /*#define HAL_SMARTCARD_MODULE_ENABLED */ diff --git a/firmware/targets/f7/Src/rtc.c b/firmware/targets/f7/Src/rtc.c deleted file mode 100644 index 8487c1e0..00000000 --- a/firmware/targets/f7/Src/rtc.c +++ /dev/null @@ -1,123 +0,0 @@ -/** - ****************************************************************************** - * @file rtc.c - * @brief This file provides code for the configuration - * of the RTC instances. - ****************************************************************************** - * @attention - * - *

© Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

- * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ - -/* Includes ------------------------------------------------------------------*/ -#include "rtc.h" - -/* USER CODE BEGIN 0 */ - -/* USER CODE END 0 */ - -RTC_HandleTypeDef hrtc; - -/* RTC init function */ -void MX_RTC_Init(void) -{ - RTC_TimeTypeDef sTime = {0}; - RTC_DateTypeDef sDate = {0}; - - /** Initialize RTC Only - */ - hrtc.Instance = RTC; - hrtc.Init.HourFormat = RTC_HOURFORMAT_24; - hrtc.Init.AsynchPrediv = 127; - hrtc.Init.SynchPrediv = 255; - hrtc.Init.OutPut = RTC_OUTPUT_DISABLE; - hrtc.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH; - hrtc.Init.OutPutType = RTC_OUTPUT_TYPE_OPENDRAIN; - hrtc.Init.OutPutRemap = RTC_OUTPUT_REMAP_NONE; - if (HAL_RTC_Init(&hrtc) != HAL_OK) - { - Error_Handler(); - } - - /* USER CODE BEGIN Check_RTC_BKUP */ - return; - /* USER CODE END Check_RTC_BKUP */ - - /** Initialize RTC and set the Time and Date - */ - sTime.Hours = 0x0; - sTime.Minutes = 0x0; - sTime.Seconds = 0x0; - sTime.SubSeconds = 0x0; - sTime.DayLightSaving = RTC_DAYLIGHTSAVING_NONE; - sTime.StoreOperation = RTC_STOREOPERATION_RESET; - if (HAL_RTC_SetTime(&hrtc, &sTime, RTC_FORMAT_BCD) != HAL_OK) - { - Error_Handler(); - } - sDate.WeekDay = RTC_WEEKDAY_MONDAY; - sDate.Month = RTC_MONTH_JANUARY; - sDate.Date = 0x1; - sDate.Year = 0x0; - - if (HAL_RTC_SetDate(&hrtc, &sDate, RTC_FORMAT_BCD) != HAL_OK) - { - Error_Handler(); - } - -} - -void HAL_RTC_MspInit(RTC_HandleTypeDef* rtcHandle) -{ - - if(rtcHandle->Instance==RTC) - { - /* USER CODE BEGIN RTC_MspInit 0 */ - - /* USER CODE END RTC_MspInit 0 */ - /* RTC clock enable */ - __HAL_RCC_RTC_ENABLE(); - __HAL_RCC_RTCAPB_CLK_ENABLE(); - - /* RTC interrupt Init */ - HAL_NVIC_SetPriority(TAMP_STAMP_LSECSS_IRQn, 5, 0); - HAL_NVIC_EnableIRQ(TAMP_STAMP_LSECSS_IRQn); - /* USER CODE BEGIN RTC_MspInit 1 */ - - /* USER CODE END RTC_MspInit 1 */ - } -} - -void HAL_RTC_MspDeInit(RTC_HandleTypeDef* rtcHandle) -{ - - if(rtcHandle->Instance==RTC) - { - /* USER CODE BEGIN RTC_MspDeInit 0 */ - - /* USER CODE END RTC_MspDeInit 0 */ - /* Peripheral clock disable */ - __HAL_RCC_RTC_DISABLE(); - __HAL_RCC_RTCAPB_CLK_DISABLE(); - - /* RTC interrupt Deinit */ - HAL_NVIC_DisableIRQ(TAMP_STAMP_LSECSS_IRQn); - /* USER CODE BEGIN RTC_MspDeInit 1 */ - - /* USER CODE END RTC_MspDeInit 1 */ - } -} - -/* USER CODE BEGIN 1 */ - -/* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/firmware/targets/f7/Src/stm32wbxx_it.c b/firmware/targets/f7/Src/stm32wbxx_it.c index 1051e074..d4f71267 100644 --- a/firmware/targets/f7/Src/stm32wbxx_it.c +++ b/firmware/targets/f7/Src/stm32wbxx_it.c @@ -6,7 +6,6 @@ extern usbd_device udev; extern COMP_HandleTypeDef hcomp1; -extern RTC_HandleTypeDef hrtc; extern TIM_HandleTypeDef htim1; extern TIM_HandleTypeDef htim2; extern TIM_HandleTypeDef htim16; @@ -40,10 +39,6 @@ void HSEM_IRQHandler(void) { HAL_HSEM_IRQHandler(); } -void RTC_WKUP_IRQHandler(void){ - HW_TS_RTC_Wakeup_Handler(); -} - void IPCC_C1_TX_IRQHandler(void){ HW_IPCC_Tx_Handler(); } diff --git a/firmware/targets/f7/ble-glue/hw_if.h b/firmware/targets/f7/ble-glue/hw_if.h index 271a222a..f9dc0a6d 100644 --- a/firmware/targets/f7/ble-glue/hw_if.h +++ b/firmware/targets/f7/ble-glue/hw_if.h @@ -82,165 +82,6 @@ extern "C" { void HW_UART_Interrupt_Handler(hw_uart_id_t hw_uart_id); void HW_UART_DMA_Interrupt_Handler(hw_uart_id_t hw_uart_id); - /****************************************************************************** - * HW TimerServer - ******************************************************************************/ - /* Exported types ------------------------------------------------------------*/ - /** - * This setting is used when standby mode is supported. - * hw_ts_InitMode_Limited should be used when the device restarts from Standby Mode. In that case, the Timer Server does - * not re-initialized its context. Only the Hardware register which content has been lost is reconfigured - * Otherwise, hw_ts_InitMode_Full should be requested (Start from Power ON) and everything is re-initialized. - */ - typedef enum - { - hw_ts_InitMode_Full, - hw_ts_InitMode_Limited, - } HW_TS_InitMode_t; - - /** - * When a Timer is created as a SingleShot timer, it is not automatically restarted when the timeout occurs. However, - * the timer is kept reserved in the list and could be restarted at anytime with HW_TS_Start() - * - * When a Timer is created as a Repeated timer, it is automatically restarted when the timeout occurs. - */ - typedef enum - { - hw_ts_SingleShot, - hw_ts_Repeated - } HW_TS_Mode_t; - - /** - * hw_ts_Successful is returned when a Timer has been successfully created with HW_TS_Create(). Otherwise, hw_ts_Failed - * is returned. When hw_ts_Failed is returned, that means there are not enough free slots in the list to create a - * Timer. In that case, CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER should be increased - */ - typedef enum - { - hw_ts_Successful, - hw_ts_Failed, - }HW_TS_ReturnStatus_t; - - typedef void (*HW_TS_pTimerCb_t)(void); - - /** - * @brief Initialize the timer server - * This API shall be called by the application before any timer is requested to the timer server. It - * configures the RTC module to be connected to the LSI input clock. - * - * @param TimerInitMode: When the device restarts from Standby, it should request hw_ts_InitMode_Limited so that the - * Timer context is not re-initialized. Otherwise, hw_ts_InitMode_Full should be requested - * @param hrtc: RTC Handle - * @retval None - */ - void HW_TS_Init(HW_TS_InitMode_t TimerInitMode, RTC_HandleTypeDef *hrtc); - - /** - * @brief Interface to create a virtual timer - * The user shall call this API to create a timer. Once created, the timer is reserved to the module until it - * has been deleted. When creating a timer, the user shall specify the mode (single shot or repeated), the - * callback to be notified when the timer expires and a module ID to identify in the timer interrupt handler - * which module is concerned. In return, the user gets a timer ID to handle it. - * - * @param TimerProcessID: This is an identifier provided by the user and returned in the callback to allow - * identification of the requester - * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) - * @param TimerMode: Mode of the virtual timer (Single shot or repeated) - * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not - */ - HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); - - /** - * @brief Stop a virtual timer - * This API may be used to stop a running timer. A timer which is stopped is move to the pending state. - * A pending timer may be restarted at any time with a different timeout value but the mode cannot be changed. - * Nothing is done when it is called to stop a timer which has been already stopped - * - * @param TimerID: Id of the timer to stop - * @retval None - */ - void HW_TS_Stop(uint8_t TimerID); - - /** - * @brief Start a virtual timer - * This API shall be used to start a timer. The timeout value is specified and may be different each time. - * When the timer is in the single shot mode, it will move to the pending state when it expires. The user may - * restart it at any time with a different timeout value. When the timer is in the repeated mode, it always - * stay in the running state. When the timer expires, it will be restarted with the same timeout value. - * This API shall not be called on a running timer. - * - * @param TimerID: The ID Id of the timer to start - * @param timeout_ticks: Number of ticks of the virtual timer (Maximum value is (0xFFFFFFFF-0xFFFF = 0xFFFF0000) - * @retval None - */ - void HW_TS_Start(uint8_t TimerID, uint32_t timeout_ticks); - - /** - * @brief Delete a virtual timer from the list - * This API should be used when a timer is not needed anymore by the user. A deleted timer is removed from - * the timer list managed by the timer server. It cannot be restarted again. The user has to go with the - * creation of a new timer if required and may get a different timer id - * - * @param TimerID: The ID of the timer to remove from the list - * @retval None - */ - void HW_TS_Delete(uint8_t TimerID); - - /** - * @brief Schedule the timer list on the timer interrupt handler - * This interrupt handler shall be called by the application in the RTC interrupt handler. This handler takes - * care of clearing all status flag required in the RTC and EXTI peripherals - * - * @param None - * @retval None - */ - void HW_TS_RTC_Wakeup_Handler(void); - - /** - * @brief Return the number of ticks to count before the interrupt - * This API returns the number of ticks left to be counted before an interrupt is generated by the - * Timer Server. This API may be used by the application for power management optimization. When the system - * enters low power mode, the mode selection is a tradeoff between the wakeup time where the CPU is running - * and the time while the CPU will be kept in low power mode before next wakeup. The deeper is the - * low power mode used, the longer is the wakeup time. The low power mode management considering wakeup time - * versus time in low power mode is implementation specific - * When the timer is disabled (No timer in the list), it returns 0xFFFF - * - * @param None - * @retval The number of ticks left to count - */ - uint16_t HW_TS_RTC_ReadLeftTicksToCount(void); - - /** - * @brief Notify the application that a registered timer has expired - * This API shall be implemented by the user application. - * This API notifies the application that a timer expires. This API is running in the RTC Wakeup interrupt - * context. The application may implement an Operating System to change the context priority where the timer - * callback may be handled. This API provides the module ID to identify which module is concerned and to allow - * sending the information to the correct task - * - * @param TimerProcessID: The TimerProcessId associated with the timer when it has been created - * @param TimerID: The TimerID of the expired timer - * @param pTimerCallBack: The Callback associated with the timer when it has been created - * @retval None - */ - void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS_pTimerCb_t pTimerCallBack); - - /** - * @brief Notify the application that the wakeupcounter has been updated - * This API should be implemented by the user application - * This API notifies the application that the counter has been updated. This is expected to be used along - * with the HW_TS_RTC_ReadLeftTicksToCount () API. It could be that the counter has been updated since the - * last call of HW_TS_RTC_ReadLeftTicksToCount () and before entering low power mode. This notification - * provides a way to the application to solve that race condition to reevaluate the counter value before - * entering low power mode - * - * @param None - * @retval None - */ - void HW_TS_RTC_CountUpdated_AppNot(void); - #ifdef __cplusplus } #endif diff --git a/firmware/targets/f7/ble-glue/hw_timerserver.c b/firmware/targets/f7/ble-glue/hw_timerserver.c deleted file mode 100644 index e0e4fcb5..00000000 --- a/firmware/targets/f7/ble-glue/hw_timerserver.c +++ /dev/null @@ -1,893 +0,0 @@ -/** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** - * @attention - * - *

© Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

- * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ - -/* Includes ------------------------------------------------------------------*/ -#include "app_common.h" -#include "hw_conf.h" - -/* Private typedef -----------------------------------------------------------*/ -typedef enum -{ - TimerID_Free, - TimerID_Created, - TimerID_Running -}TimerIDStatus_t; - -typedef enum -{ - SSR_Read_Requested, - SSR_Read_Not_Requested -}RequestReadSSR_t; - -typedef enum -{ - WakeupTimerValue_Overpassed, - WakeupTimerValue_LargeEnough -}WakeupTimerLimitation_Status_t; - -typedef struct -{ - HW_TS_pTimerCb_t pTimerCallBack; - uint32_t CounterInit; - uint32_t CountLeft; - TimerIDStatus_t TimerIDStatus; - HW_TS_Mode_t TimerMode; - uint32_t TimerProcessID; - uint8_t PreviousID; - uint8_t NextID; -}TimerContext_t; - -/* Private defines -----------------------------------------------------------*/ -#define SSR_FORBIDDEN_VALUE 0xFFFFFFFF -#define TIMER_LIST_EMPTY 0xFFFF - -/* Private macros ------------------------------------------------------------*/ -/* Private variables ---------------------------------------------------------*/ - -/** - * START of Section TIMERSERVER_CONTEXT - */ - -PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile TimerContext_t aTimerContext[CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER]; -PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint8_t CurrentRunningTimerID; -PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint8_t PreviousRunningTimerID; -PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint32_t SSRValueOnLastSetup; -PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile WakeupTimerLimitation_Status_t WakeupTimerLimitation; - -/** - * END of Section TIMERSERVER_CONTEXT - */ - -static RTC_HandleTypeDef *phrtc; /**< RTC handle */ -static uint8_t WakeupTimerDivider; -static uint8_t AsynchPrescalerUserConfig; -static uint16_t SynchPrescalerUserConfig; -static volatile uint16_t MaxWakeupTimerSetup; - -/* Global variables ----------------------------------------------------------*/ -/* Private function prototypes -----------------------------------------------*/ -static void RestartWakeupCounter(uint16_t Value); -static uint16_t ReturnTimeElapsed(void); -static void RescheduleTimerList(void); -static void UnlinkTimer(uint8_t TimerID, RequestReadSSR_t RequestReadSSR); -static void LinkTimerBefore(uint8_t TimerID, uint8_t RefTimerID); -static void LinkTimerAfter(uint8_t TimerID, uint8_t RefTimerID); -static uint16_t linkTimer(uint8_t TimerID); -static uint32_t ReadRtcSsrValue(void); - -__weak void HW_TS_RTC_CountUpdated_AppNot(void); - -/* Functions Definition ------------------------------------------------------*/ - -/** - * @brief Read the RTC_SSR value - * As described in the reference manual, the RTC_SSR shall be read twice to ensure - * reliability of the value - * @param None - * @retval SSR value read - */ -static uint32_t ReadRtcSsrValue(void) -{ - uint32_t first_read; - uint32_t second_read; - - first_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); - - second_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); - - while(first_read != second_read) - { - first_read = second_read; - - second_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); - } - - return second_read; -} - -/** - * @brief Insert a Timer in the list after the Timer ID specified - * @param TimerID: The ID of the Timer - * @param RefTimerID: The ID of the Timer to be linked after - * @retval None - */ -static void LinkTimerAfter(uint8_t TimerID, uint8_t RefTimerID) -{ - uint8_t next_id; - - next_id = aTimerContext[RefTimerID].NextID; - - if(next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) - { - aTimerContext[next_id].PreviousID = TimerID; - } - aTimerContext[TimerID].NextID = next_id; - aTimerContext[TimerID].PreviousID = RefTimerID ; - aTimerContext[RefTimerID].NextID = TimerID; - - return; -} - -/** - * @brief Insert a Timer in the list before the ID specified - * @param TimerID: The ID of the Timer - * @param RefTimerID: The ID of the Timer to be linked before - * @retval None - */ -static void LinkTimerBefore(uint8_t TimerID, uint8_t RefTimerID) -{ - uint8_t previous_id; - - if(RefTimerID != CurrentRunningTimerID) - { - previous_id = aTimerContext[RefTimerID].PreviousID; - - aTimerContext[previous_id].NextID = TimerID; - aTimerContext[TimerID].NextID = RefTimerID; - aTimerContext[TimerID].PreviousID = previous_id ; - aTimerContext[RefTimerID].PreviousID = TimerID; - } - else - { - aTimerContext[TimerID].NextID = RefTimerID; - aTimerContext[RefTimerID].PreviousID = TimerID; - } - - return; -} - -/** - * @brief Insert a Timer in the list - * @param TimerID: The ID of the Timer - * @retval None - */ -static uint16_t linkTimer(uint8_t TimerID) -{ - uint32_t time_left; - uint16_t time_elapsed; - uint8_t timer_id_lookup; - uint8_t next_id; - - if(CurrentRunningTimerID == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) - { - /** - * No timer in the list - */ - PreviousRunningTimerID = CurrentRunningTimerID; - CurrentRunningTimerID = TimerID; - aTimerContext[TimerID].NextID = CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; - - SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; - time_elapsed = 0; - } - else - { - time_elapsed = ReturnTimeElapsed(); - - /** - * update count of the timer to be linked - */ - aTimerContext[TimerID].CountLeft += time_elapsed; - time_left = aTimerContext[TimerID].CountLeft; - - /** - * Search for index where the new timer shall be linked - */ - if(aTimerContext[CurrentRunningTimerID].CountLeft <= time_left) - { - /** - * Search for the ID after the first one - */ - timer_id_lookup = CurrentRunningTimerID; - next_id = aTimerContext[timer_id_lookup].NextID; - while((next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (aTimerContext[next_id].CountLeft <= time_left)) - { - timer_id_lookup = aTimerContext[timer_id_lookup].NextID; - next_id = aTimerContext[timer_id_lookup].NextID; - } - - /** - * Link after the ID - */ - LinkTimerAfter(TimerID, timer_id_lookup); - } - else - { - /** - * Link before the first ID - */ - LinkTimerBefore(TimerID, CurrentRunningTimerID); - PreviousRunningTimerID = CurrentRunningTimerID; - CurrentRunningTimerID = TimerID; - } - } - - return time_elapsed; -} - -/** - * @brief Remove a Timer from the list - * @param TimerID: The ID of the Timer - * @param RequestReadSSR: Request to read the SSR register or not - * @retval None - */ -static void UnlinkTimer(uint8_t TimerID, RequestReadSSR_t RequestReadSSR) -{ - uint8_t previous_id; - uint8_t next_id; - - if(TimerID == CurrentRunningTimerID) - { - PreviousRunningTimerID = CurrentRunningTimerID; - CurrentRunningTimerID = aTimerContext[TimerID].NextID; - } - else - { - previous_id = aTimerContext[TimerID].PreviousID; - next_id = aTimerContext[TimerID].NextID; - - aTimerContext[previous_id].NextID = aTimerContext[TimerID].NextID; - if(next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) - { - aTimerContext[next_id].PreviousID = aTimerContext[TimerID].PreviousID; - } - } - - /** - * Timer is out of the list - */ - aTimerContext[TimerID].TimerIDStatus = TimerID_Created; - - if((CurrentRunningTimerID == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (RequestReadSSR == SSR_Read_Requested)) - { - SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; - } - - return; -} - -/** - * @brief Return the number of ticks counted by the wakeuptimer since it has been started - * @note The API is reading the SSR register to get how many ticks have been counted - * since the time the timer has been started - * @param None - * @retval Time expired in Ticks - */ -static uint16_t ReturnTimeElapsed(void) -{ - uint32_t return_value; - uint32_t wrap_counter; - - if(SSRValueOnLastSetup != SSR_FORBIDDEN_VALUE) - { - return_value = ReadRtcSsrValue(); /**< Read SSR register first */ - - if (SSRValueOnLastSetup >= return_value) - { - return_value = SSRValueOnLastSetup - return_value; - } - else - { - wrap_counter = SynchPrescalerUserConfig - return_value; - return_value = SSRValueOnLastSetup + wrap_counter; - } - - /** - * At this stage, ReturnValue holds the number of ticks counted by SSR - * Need to translate in number of ticks counted by the Wakeuptimer - */ - return_value = return_value*AsynchPrescalerUserConfig; - return_value = return_value >> WakeupTimerDivider; - } - else - { - return_value = 0; - } - - return (uint16_t)return_value; -} - -/** - * @brief Set the wakeup counter - * @note The API is writing the counter value so that the value is decreased by one to cope with the fact - * the interrupt is generated with 1 extra clock cycle (See RefManuel) - * It assumes all condition are met to be allowed to write the wakeup counter - * @param Value: Value to be written in the counter - * @retval None - */ -static void RestartWakeupCounter(uint16_t Value) -{ - /** - * The wakeuptimer has been disabled in the calling function to reduce the time to poll the WUTWF - * FLAG when the new value will have to be written - * __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); - */ - - if(Value == 0) - { - SSRValueOnLastSetup = ReadRtcSsrValue(); - - /** - * Simulate that the Timer expired - */ - HAL_NVIC_SetPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); - } - else - { - if((Value > 1) ||(WakeupTimerDivider != 1)) - { - Value -= 1; - } - - while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); - - /** - * make sure to clear the flags after checking the WUTWF. - * It takes 2 RTCCLK between the time the WUTE bit is disabled and the - * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable - * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between - * due to the autoreload feature - */ - __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ - __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ - HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ - - MODIFY_REG(RTC->WUTR, RTC_WUTR_WUT, Value); - - /** - * Update the value here after the WUTWF polling that may take some time - */ - SSRValueOnLastSetup = ReadRtcSsrValue(); - - __HAL_RTC_WAKEUPTIMER_ENABLE(phrtc); /**< Enable the Wakeup Timer */ - - HW_TS_RTC_CountUpdated_AppNot(); - } - - return ; -} - -/** - * @brief Reschedule the list of timer - * @note 1) Update the count left for each timer in the list - * 2) Setup the wakeuptimer - * @param None - * @retval None - */ -static void RescheduleTimerList(void) -{ - uint8_t localTimerID; - uint32_t timecountleft; - uint16_t wakeup_timer_value; - uint16_t time_elapsed; - - /** - * The wakeuptimer is disabled now to reduce the time to poll the WUTWF - * FLAG when the new value will have to be written - */ - if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) - { - /** - * Wait for the flag to be back to 0 when the wakeup timer is enabled - */ - while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == SET); - } - __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ - - localTimerID = CurrentRunningTimerID; - - /** - * Calculate what will be the value to write in the wakeuptimer - */ - timecountleft = aTimerContext[localTimerID].CountLeft; - - /** - * Read how much has been counted - */ - time_elapsed = ReturnTimeElapsed(); - - if(timecountleft < time_elapsed ) - { - /** - * There is no tick left to count - */ - wakeup_timer_value = 0; - WakeupTimerLimitation = WakeupTimerValue_LargeEnough; - } - else - { - if(timecountleft > (time_elapsed + MaxWakeupTimerSetup)) - { - /** - * The number of tick left is greater than the Wakeuptimer maximum value - */ - wakeup_timer_value = MaxWakeupTimerSetup; - - WakeupTimerLimitation = WakeupTimerValue_Overpassed; - } - else - { - wakeup_timer_value = timecountleft - time_elapsed; - WakeupTimerLimitation = WakeupTimerValue_LargeEnough; - } - - } - - /** - * update ticks left to be counted for each timer - */ - while(localTimerID != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) - { - if (aTimerContext[localTimerID].CountLeft < time_elapsed) - { - aTimerContext[localTimerID].CountLeft = 0; - } - else - { - aTimerContext[localTimerID].CountLeft -= time_elapsed; - } - localTimerID = aTimerContext[localTimerID].NextID; - } - - /** - * Write next count - */ - RestartWakeupCounter(wakeup_timer_value); - - return ; -} - -/* Public functions ----------------------------------------------------------*/ - -/** - * For all public interface except that may need write access to the RTC, the RTC - * shall be unlock at the beginning and locked at the output - * In order to ease maintainability, the unlock is done at the top and the lock at then end - * in case some new implementation is coming in the future - */ - -void HW_TS_RTC_Wakeup_Handler(void) -{ - HW_TS_pTimerCb_t ptimer_callback; - uint32_t timer_process_id; - uint8_t local_current_running_timer_id; -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - uint32_t primask_bit; -#endif - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ - __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ -#endif - -/* Disable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); - - /** - * Disable the Wakeup Timer - * This may speed up a bit the processing to wait the timer to be disabled - * The timer is still counting 2 RTCCLK - */ - __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); - - local_current_running_timer_id = CurrentRunningTimerID; - - if(aTimerContext[local_current_running_timer_id].TimerIDStatus == TimerID_Running) - { - ptimer_callback = aTimerContext[local_current_running_timer_id].pTimerCallBack; - timer_process_id = aTimerContext[local_current_running_timer_id].TimerProcessID; - - /** - * It should be good to check whether the TimeElapsed is greater or not than the tick left to be counted - * However, due to the inaccuracy of the reading of the time elapsed, it may return there is 1 tick - * to be left whereas the count is over - * A more secure implementation has been done with a flag to state whereas the full count has been written - * in the wakeuptimer or not - */ - if(WakeupTimerLimitation != WakeupTimerValue_Overpassed) - { - if(aTimerContext[local_current_running_timer_id].TimerMode == hw_ts_Repeated) - { - UnlinkTimer(local_current_running_timer_id, SSR_Read_Not_Requested); -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - HW_TS_Start(local_current_running_timer_id, aTimerContext[local_current_running_timer_id].CounterInit); - - /* Disable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); - } - else - { -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - HW_TS_Stop(local_current_running_timer_id); - - /* Disable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); - } - - HW_TS_RTC_Int_AppNot(timer_process_id, local_current_running_timer_id, ptimer_callback); - } - else - { - RescheduleTimerList(); -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - } - } - else - { - /** - * We should never end up in this case - * However, if due to any bug in the timer server this is the case, the mistake may not impact the user. - * We could just clean the interrupt flag and get out from this unexpected interrupt - */ - while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); - - /** - * make sure to clear the flags after checking the WUTWF. - * It takes 2 RTCCLK between the time the WUTE bit is disabled and the - * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable - * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between - * due to the autoreload feature - */ - __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ - __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - } - - /* Enable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); - - return; -} - -void HW_TS_Init(HW_TS_InitMode_t TimerInitMode, RTC_HandleTypeDef *hrtc) -{ - uint8_t loop; - uint32_t localmaxwakeuptimersetup; - - /** - * Get RTC handler - */ - phrtc = hrtc; - - /* Disable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); - - SET_BIT(RTC->CR, RTC_CR_BYPSHAD); - - /** - * Readout the user config - */ - WakeupTimerDivider = (4 - ((uint32_t)(READ_BIT(RTC->CR, RTC_CR_WUCKSEL)))); - - AsynchPrescalerUserConfig = (uint8_t)(READ_BIT(RTC->PRER, RTC_PRER_PREDIV_A) >> (uint32_t)POSITION_VAL(RTC_PRER_PREDIV_A)) + 1; - - SynchPrescalerUserConfig = (uint16_t)(READ_BIT(RTC->PRER, RTC_PRER_PREDIV_S)) + 1; - - /** - * Margin is taken to avoid wrong calculation when the wrap around is there and some - * application interrupts may have delayed the reading - */ - localmaxwakeuptimersetup = ((((SynchPrescalerUserConfig - 1)*AsynchPrescalerUserConfig) - CFG_HW_TS_RTC_HANDLER_MAX_DELAY) >> WakeupTimerDivider); - - if(localmaxwakeuptimersetup >= 0xFFFF) - { - MaxWakeupTimerSetup = 0xFFFF; - } - else - { - MaxWakeupTimerSetup = (uint16_t)localmaxwakeuptimersetup; - } - - /** - * Configure EXTI module - */ - LL_EXTI_EnableRisingTrig_0_31(RTC_EXTI_LINE_WAKEUPTIMER_EVENT); - LL_EXTI_EnableIT_0_31(RTC_EXTI_LINE_WAKEUPTIMER_EVENT); - - if(TimerInitMode == hw_ts_InitMode_Full) - { - WakeupTimerLimitation = WakeupTimerValue_LargeEnough; - SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; - - /** - * Initialize the timer server - */ - for(loop = 0; loop < CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; loop++) - { - aTimerContext[loop].TimerIDStatus = TimerID_Free; - } - - CurrentRunningTimerID = CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; /**< Set ID to non valid value */ - - __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ - __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ - __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ - HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ - __HAL_RTC_WAKEUPTIMER_ENABLE_IT(phrtc, RTC_IT_WUT); /**< Enable interrupt in RTC module */ - } - else - { - if(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTF) != RESET) - { - /** - * Simulate that the Timer expired - */ - HAL_NVIC_SetPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); - } - } - - /* Enable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); - - HAL_NVIC_SetPriority(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID, CFG_HW_TS_NVIC_RTC_WAKEUP_IT_PREEMPTPRIO, CFG_HW_TS_NVIC_RTC_WAKEUP_IT_SUBPRIO); /**< Set NVIC priority */ - HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ - - return; -} - -HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pftimeout_handler) -{ - HW_TS_ReturnStatus_t localreturnstatus; - uint8_t loop = 0; -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - uint32_t primask_bit; -#endif - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ - __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ -#endif - - while((loop < CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (aTimerContext[loop].TimerIDStatus != TimerID_Free)) - { - loop++; - } - - if(loop != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) - { - aTimerContext[loop].TimerIDStatus = TimerID_Created; - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - - aTimerContext[loop].TimerProcessID = TimerProcessID; - aTimerContext[loop].TimerMode = TimerMode; - aTimerContext[loop].pTimerCallBack = pftimeout_handler; - *pTimerId = loop; - - localreturnstatus = hw_ts_Successful; - } - else - { -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - - localreturnstatus = hw_ts_Failed; - } - - return(localreturnstatus); -} - -void HW_TS_Delete(uint8_t timer_id) -{ - HW_TS_Stop(timer_id); - - aTimerContext[timer_id].TimerIDStatus = TimerID_Free; /**< release ID */ - - return; -} - -void HW_TS_Stop(uint8_t timer_id) -{ - uint8_t localcurrentrunningtimerid; - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - uint32_t primask_bit; -#endif - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ - __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ -#endif - - HAL_NVIC_DisableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Disable NVIC */ - - /* Disable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); - - if(aTimerContext[timer_id].TimerIDStatus == TimerID_Running) - { - UnlinkTimer(timer_id, SSR_Read_Requested); - localcurrentrunningtimerid = CurrentRunningTimerID; - - if(localcurrentrunningtimerid == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) - { - /** - * List is empty - */ - - /** - * Disable the timer - */ - if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) - { - /** - * Wait for the flag to be back to 0 when the wakeup timer is enabled - */ - while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == SET); - } - __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ - - while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); - - /** - * make sure to clear the flags after checking the WUTWF. - * It takes 2 RTCCLK between the time the WUTE bit is disabled and the - * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable - * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between - * due to the autoreload feature - */ - __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ - __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ - HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ - } - else if(PreviousRunningTimerID != localcurrentrunningtimerid) - { - RescheduleTimerList(); - } - } - - /* Enable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); - - HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - - return; -} - -void HW_TS_Start(uint8_t timer_id, uint32_t timeout_ticks) -{ - uint16_t time_elapsed; - uint8_t localcurrentrunningtimerid; - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - uint32_t primask_bit; -#endif - - if(aTimerContext[timer_id].TimerIDStatus == TimerID_Running) - { - HW_TS_Stop( timer_id ); - } - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ - __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ -#endif - - HAL_NVIC_DisableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Disable NVIC */ - - /* Disable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); - - aTimerContext[timer_id].TimerIDStatus = TimerID_Running; - - aTimerContext[timer_id].CountLeft = timeout_ticks; - aTimerContext[timer_id].CounterInit = timeout_ticks; - - time_elapsed = linkTimer(timer_id); - - localcurrentrunningtimerid = CurrentRunningTimerID; - - if(PreviousRunningTimerID != localcurrentrunningtimerid) - { - RescheduleTimerList(); - } - else - { - aTimerContext[timer_id].CountLeft -= time_elapsed; - } - - /* Enable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); - - HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - - return; -} - -uint16_t HW_TS_RTC_ReadLeftTicksToCount(void) -{ - uint32_t primask_bit; - uint16_t return_value, auro_reload_value, elapsed_time_value; - - primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ - __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ - - if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) - { - auro_reload_value = (uint32_t)(READ_BIT(RTC->WUTR, RTC_WUTR_WUT)); - - elapsed_time_value = ReturnTimeElapsed(); - - if(auro_reload_value > elapsed_time_value) - { - return_value = auro_reload_value - elapsed_time_value; - } - else - { - return_value = 0; - } - } - else - { - return_value = TIMER_LIST_EMPTY; - } - - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ - - return (return_value); -} - -__weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS_pTimerCb_t pTimerCallBack) -{ - pTimerCallBack(); - - return; -} - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/firmware/targets/f7/furi-hal/furi-hal-bootloader.c b/firmware/targets/f7/furi-hal/furi-hal-bootloader.c index e8ea913e..b5e7cb5c 100644 --- a/firmware/targets/f7/furi-hal/furi-hal-bootloader.c +++ b/firmware/targets/f7/furi-hal/furi-hal-bootloader.c @@ -23,11 +23,3 @@ void furi_hal_bootloader_set_mode(FuriHalBootloaderMode mode) { LL_RTC_BAK_SetRegister(RTC, LL_RTC_BKP_DR0, BOOT_REQUEST_DFU); } } - -void furi_hal_bootloader_set_flags(FuriHalBootloaderFlag flags) { - LL_RTC_BAK_SetRegister(RTC, LL_RTC_BKP_DR2, flags); -} - -FuriHalBootloaderFlag furi_hal_bootloader_get_flags() { - return LL_RTC_BAK_GetRegister(RTC, LL_RTC_BKP_DR2); -} \ No newline at end of file diff --git a/firmware/targets/f7/furi-hal/furi-hal-clock.c b/firmware/targets/f7/furi-hal/furi-hal-clock.c index 7a124049..ddbeaa0b 100644 --- a/firmware/targets/f7/furi-hal/furi-hal-clock.c +++ b/firmware/targets/f7/furi-hal/furi-hal-clock.c @@ -77,14 +77,6 @@ void furi_hal_clock_init() { Error_Handler(); } - if(LL_RCC_GetRTCClockSource() != LL_RCC_RTC_CLKSOURCE_LSE) { - LL_RCC_ForceBackupDomainReset(); - LL_RCC_ReleaseBackupDomainReset(); - LL_RCC_SetRTCClockSource(LL_RCC_RTC_CLKSOURCE_LSE); - } - - LL_RCC_EnableRTC(); - LL_RCC_SetUSARTClockSource(LL_RCC_USART1_CLKSOURCE_PCLK2); LL_RCC_SetLPUARTClockSource(LL_RCC_LPUART1_CLKSOURCE_PCLK1); LL_RCC_SetADCClockSource(LL_RCC_ADC_CLKSOURCE_PLLSAI1); @@ -118,7 +110,6 @@ void furi_hal_clock_init() { LL_AHB3_GRP1_EnableClock(LL_AHB3_GRP1_PERIPH_AES2); // APB1 - LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_RTCAPB); LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_TIM2); LL_APB1_GRP2_EnableClock(LL_APB1_GRP2_PERIPH_LPUART1); diff --git a/firmware/targets/f7/furi-hal/furi-hal-interrupt.c b/firmware/targets/f7/furi-hal/furi-hal-interrupt.c index 2685edab..4ff2bc7b 100644 --- a/firmware/targets/f7/furi-hal/furi-hal-interrupt.c +++ b/firmware/targets/f7/furi-hal/furi-hal-interrupt.c @@ -158,7 +158,6 @@ void DMA2_Channel8_IRQHandler(void) { if (furi_hal_dma_channel_isr[1][7]) furi_hal_dma_channel_isr[1][7](); } - void TAMP_STAMP_LSECSS_IRQHandler(void) { if (LL_RCC_IsActiveFlag_LSECSS()) { LL_RCC_ClearFlag_LSECSS(); @@ -174,7 +173,6 @@ void TAMP_STAMP_LSECSS_IRQHandler(void) { void RCC_IRQHandler(void) { } - void NMI_Handler(void) { if (LL_RCC_IsActiveFlag_HSECSS()) { LL_RCC_ClearFlag_HSECSS(); @@ -206,5 +204,4 @@ void UsageFault_Handler(void) { } void DebugMon_Handler(void) { - } diff --git a/firmware/targets/f7/furi-hal/furi-hal-rtc.c b/firmware/targets/f7/furi-hal/furi-hal-rtc.c new file mode 100644 index 00000000..13bb17cb --- /dev/null +++ b/firmware/targets/f7/furi-hal/furi-hal-rtc.c @@ -0,0 +1,122 @@ +#include +#include +#include + +#include + +#define TAG "FuriHalRtc" + +#define FURI_HAL_RTC_BOOT_FLAGS_REG LL_RTC_BKP_DR0 +#define FURI_HAL_RTC_BOOT_VERSION_REG LL_RTC_BKP_DR1 +#define FURI_HAL_RTC_SYSTEM_REG LL_RTC_BKP_DR2 + +typedef struct { + uint8_t log_level:4; + uint8_t log_reserved:4; + uint8_t flags; + uint16_t reserved; +} DeveloperReg; + +void furi_hal_rtc_init() { + if(LL_RCC_GetRTCClockSource() != LL_RCC_RTC_CLKSOURCE_LSE) { + LL_RCC_ForceBackupDomainReset(); + LL_RCC_ReleaseBackupDomainReset(); + LL_RCC_SetRTCClockSource(LL_RCC_RTC_CLKSOURCE_LSE); + } + + LL_RCC_EnableRTC(); + LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_RTCAPB); + + LL_RTC_InitTypeDef RTC_InitStruct = {0}; + RTC_InitStruct.HourFormat = LL_RTC_HOURFORMAT_24HOUR; + RTC_InitStruct.AsynchPrescaler = 127; + RTC_InitStruct.SynchPrescaler = 255; + LL_RTC_Init(RTC, &RTC_InitStruct); + + furi_log_set_level(furi_hal_rtc_get_log_level()); + + FURI_LOG_I(TAG, "Init OK"); +} + +void furi_hal_rtc_set_log_level(uint8_t level) { + uint32_t data = LL_RTC_BAK_GetRegister(RTC, FURI_HAL_RTC_SYSTEM_REG); + ((DeveloperReg*)&data)->log_level = level; + LL_RTC_BAK_SetRegister(RTC, FURI_HAL_RTC_SYSTEM_REG, data); + furi_log_set_level(level); +} + +uint8_t furi_hal_rtc_get_log_level() { + uint32_t data = LL_RTC_BAK_GetRegister(RTC, FURI_HAL_RTC_SYSTEM_REG); + return ((DeveloperReg*)&data)->log_level; +} + +void furi_hal_rtc_set_flag(FuriHalRtcFlag flag) { + uint32_t data = LL_RTC_BAK_GetRegister(RTC, FURI_HAL_RTC_SYSTEM_REG); + ((DeveloperReg*)&data)->flags |= flag; + LL_RTC_BAK_SetRegister(RTC, FURI_HAL_RTC_SYSTEM_REG, data); +} + +void furi_hal_rtc_reset_flag(FuriHalRtcFlag flag) { + uint32_t data = LL_RTC_BAK_GetRegister(RTC, FURI_HAL_RTC_SYSTEM_REG); + ((DeveloperReg*)&data)->flags &= ~flag; + LL_RTC_BAK_SetRegister(RTC, FURI_HAL_RTC_SYSTEM_REG, data); +} + +bool furi_hal_rtc_is_flag_set(FuriHalRtcFlag flag) { + uint32_t data = LL_RTC_BAK_GetRegister(RTC, FURI_HAL_RTC_SYSTEM_REG); + return ((DeveloperReg*)&data)->flags & flag; +} + +void furi_hal_rtc_set_datetime(FuriHalRtcDateTime* datetime) { + furi_assert(datetime); + + /* Disable write protection */ + LL_RTC_DisableWriteProtection(RTC); + + /* Enter Initialization mode and wait for INIT flag to be set */ + LL_RTC_EnableInitMode(RTC); + while(!LL_RTC_IsActiveFlag_INIT(RTC)) {} + + /* Set time */ + LL_RTC_TIME_Config(RTC, + LL_RTC_TIME_FORMAT_AM_OR_24, + __LL_RTC_CONVERT_BIN2BCD(datetime->hour), + __LL_RTC_CONVERT_BIN2BCD(datetime->minute), + __LL_RTC_CONVERT_BIN2BCD(datetime->second) + ); + + /* Set date */ + LL_RTC_DATE_Config(RTC, + datetime->weekday, + __LL_RTC_CONVERT_BIN2BCD(datetime->day), + __LL_RTC_CONVERT_BIN2BCD(datetime->month), + __LL_RTC_CONVERT_BIN2BCD(datetime->year - 2000) + ); + + /* Exit Initialization mode */ + LL_RTC_DisableInitMode(RTC); + + /* If RTC_CR_BYPSHAD bit = 0, wait for synchro else this check is not needed */ + if (!LL_RTC_IsShadowRegBypassEnabled(RTC)) { + LL_RTC_ClearFlag_RS(RTC); + while(!LL_RTC_IsActiveFlag_RS(RTC)) {}; + } + + /* Enable write protection */ + LL_RTC_EnableWriteProtection(RTC); +} + +void furi_hal_rtc_get_datetime(FuriHalRtcDateTime* datetime) { + furi_assert(datetime); + + uint32_t time = LL_RTC_TIME_Get(RTC); // 0x00HHMMSS + uint32_t date = LL_RTC_DATE_Get(RTC); // 0xWWDDMMYY + + datetime->second = __LL_RTC_CONVERT_BCD2BIN((time>>0) & 0xFF); + datetime->minute = __LL_RTC_CONVERT_BCD2BIN((time>>8) & 0xFF); + datetime->hour = __LL_RTC_CONVERT_BCD2BIN((time>>16) & 0xFF); + datetime->year = __LL_RTC_CONVERT_BCD2BIN((date >> 0) & 0xFF) + 2000; + datetime->month = __LL_RTC_CONVERT_BCD2BIN((date >> 8) & 0xFF); + datetime->day = __LL_RTC_CONVERT_BCD2BIN((date >> 16) & 0xFF); + datetime->weekday = __LL_RTC_CONVERT_BCD2BIN((date >> 24) & 0xFF); +} diff --git a/firmware/targets/f7/furi-hal/furi-hal.c b/firmware/targets/f7/furi-hal/furi-hal.c index d213af95..3f41684f 100644 --- a/firmware/targets/f7/furi-hal/furi-hal.c +++ b/firmware/targets/f7/furi-hal/furi-hal.c @@ -1,7 +1,6 @@ #include #include -#include #include #include @@ -13,18 +12,14 @@ void furi_hal_init() { furi_hal_clock_init(); + furi_hal_rtc_init(); furi_hal_console_init(); furi_hal_interrupt_init(); furi_hal_delay_init(); - // FreeRTOS glue - furi_hal_os_init(); - MX_GPIO_Init(); FURI_LOG_I(TAG, "GPIO OK"); - MX_RTC_Init(); - FURI_LOG_I(TAG, "RTC OK"); furi_hal_bootloader_init(); furi_hal_version_init(); @@ -59,6 +54,9 @@ void furi_hal_init() { furi_hal_bt_init(); furi_hal_compress_icon_init(); + // FreeRTOS glue + furi_hal_os_init(); + // FatFS driver initialization MX_FATFS_Init(); FURI_LOG_I(TAG, "FATFS OK"); diff --git a/firmware/targets/f7/target.mk b/firmware/targets/f7/target.mk index f54f3f25..e642e2aa 100644 --- a/firmware/targets/f7/target.mk +++ b/firmware/targets/f7/target.mk @@ -57,7 +57,6 @@ C_SOURCES += \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c \ - $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c \ @@ -67,6 +66,7 @@ C_SOURCES += \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_i2c.c \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_lptim.c \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_rcc.c \ + $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_rtc.c \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_spi.c \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_tim.c \ $(CUBE_DIR)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_usart.c \ diff --git a/firmware/targets/furi-hal-include/furi-hal-bootloader.h b/firmware/targets/furi-hal-include/furi-hal-bootloader.h index a1ef2c26..8dd2901f 100644 --- a/firmware/targets/furi-hal-include/furi-hal-bootloader.h +++ b/firmware/targets/furi-hal-include/furi-hal-bootloader.h @@ -17,12 +17,6 @@ typedef enum { FuriHalBootloaderModeDFU } FuriHalBootloaderMode; -/** Boot flags */ -typedef enum { - FuriHalBootloaderFlagDefault=0, - FuriHalBootloaderFlagFactoryReset=1, -} FuriHalBootloaderFlag; - /** Initialize boot subsystem */ void furi_hal_bootloader_init(); @@ -33,18 +27,6 @@ void furi_hal_bootloader_init(); */ void furi_hal_bootloader_set_mode(FuriHalBootloaderMode mode); -/** Set bootloader flags - * - * @param[in] flags FuriHalBootloaderFlag - */ -void furi_hal_bootloader_set_flags(FuriHalBootloaderFlag flags); - -/** Get boot flag - * - * @return FuriHalBootloaderFlag - */ -FuriHalBootloaderFlag furi_hal_bootloader_get_flags(); - #ifdef __cplusplus } #endif diff --git a/firmware/targets/furi-hal-include/furi-hal-rtc.h b/firmware/targets/furi-hal-include/furi-hal-rtc.h new file mode 100644 index 00000000..7c36aa09 --- /dev/null +++ b/firmware/targets/furi-hal-include/furi-hal-rtc.h @@ -0,0 +1,52 @@ +/** + * @file furi-hal-rtc.h + * Furi Hal RTC API + */ + +#pragma once + +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct { + // Time + uint8_t hour; /**< Hour in 24H format: 0-23 */ + uint8_t minute; /**< Minute: 0-59 */ + uint8_t second; /**< Second: 0-59 */ + // Date + uint8_t day; /**< Current day: 1-31 */ + uint8_t month; /**< Current month: 1-12 */ + uint16_t year; /**< Current year: 2000-2099 */ + uint8_t weekday;/**< Current weekday: 1-7 */ +} FuriHalRtcDateTime; + +typedef enum { + FuriHalRtcFlagDebug = (1<<0), + FuriHalRtcFlagFactoryReset = (1<<1), +} FuriHalRtcFlag; + +/** Initialize RTC subsystem */ +void furi_hal_rtc_init(); + +void furi_hal_rtc_set_log_level(uint8_t level); + +uint8_t furi_hal_rtc_get_log_level(); + +void furi_hal_rtc_set_flag(FuriHalRtcFlag flag); + +void furi_hal_rtc_reset_flag(FuriHalRtcFlag flag); + +bool furi_hal_rtc_is_flag_set(FuriHalRtcFlag flag); + +void furi_hal_rtc_set_datetime(FuriHalRtcDateTime* datetime); + +void furi_hal_rtc_get_datetime(FuriHalRtcDateTime* datetime); + +#ifdef __cplusplus +} +#endif diff --git a/firmware/targets/furi-hal-include/furi-hal.h b/firmware/targets/furi-hal-include/furi-hal.h index 4c223aab..f7613625 100644 --- a/firmware/targets/furi-hal-include/furi-hal.h +++ b/firmware/targets/furi-hal-include/furi-hal.h @@ -17,6 +17,7 @@ template struct STOP_EXTERNING_ME {}; #include "furi-hal-sd.h" #include "furi-hal-i2c.h" #include "furi-hal-resources.h" +#include "furi-hal-rtc.h" #include "furi-hal-gpio.h" #include "furi-hal-light.h" #include "furi-hal-delay.h" diff --git a/lib/lfs_config.h b/lib/lfs_config.h index 7a883982..a545551c 100644 --- a/lib/lfs_config.h +++ b/lib/lfs_config.h @@ -8,9 +8,9 @@ #define LFS_TAG "Lfs" -#define LFS_TRACE(...) FURI_LOG_D(LFS_TAG, __VA_ARGS__); +#define LFS_TRACE(...) FURI_LOG_T(LFS_TAG, __VA_ARGS__); -#define LFS_DEBUG(...) FURI_LOG_I(LFS_TAG, __VA_ARGS__); +#define LFS_DEBUG(...) FURI_LOG_D(LFS_TAG, __VA_ARGS__); #define LFS_WARN(...) FURI_LOG_W(LFS_TAG, __VA_ARGS__); From f6db5dd2a8a1a56295e1e13bf9cfd9c717569945 Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Wed, 15 Dec 2021 14:33:52 +0300 Subject: [PATCH 04/13] Create .editorconfig (#889) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: あく --- .editorconfig | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..a31ef8e7 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,13 @@ +root = true + +[*] +end_of_line = lf +insert_final_newline = true +charset = utf-8 + +[*.{cpp,h,c,py,sh}] +indent_style = space +indent_size = 4 + +[{Makefile,*.mk}] +indent_size = tab From 63642617eeb74cfce8b0531921af641b59a36498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=81=8F?= Date: Wed, 15 Dec 2021 15:23:16 +0300 Subject: [PATCH 05/13] Hide debug tools if debug is not enabled. Application: update debug tools code base. SubGhz: log duty cycle. (#903) * Application: clean debug_tools code base. * SubGhz: add duty cycle logging. * Application: hide debug tools if not enabled. Gui: move icon_animation allocation to menu module. --- applications/debug_tools/blink_test.c | 40 ++--- applications/debug_tools/keypad_test.c | 157 +++++++----------- applications/debug_tools/vibro_test.c | 41 ++--- applications/gui/modules/menu.c | 18 +- applications/gui/modules/menu.h | 2 +- applications/loader/loader.c | 31 ++-- applications/loader/loader.h | 3 + applications/system/system_settings.c | 2 + .../targets/f7/furi-hal/furi-hal-subghz.c | 32 +++- 9 files changed, 164 insertions(+), 162 deletions(-) diff --git a/applications/debug_tools/blink_test.c b/applications/debug_tools/blink_test.c index 36823b2e..7f813de0 100644 --- a/applications/debug_tools/blink_test.c +++ b/applications/debug_tools/blink_test.c @@ -9,20 +9,20 @@ #define BLINK_COLOR_COUNT 7 typedef enum { - EventTypeTick, - EventTypeKey, -} EventType; + BlinkEventTypeTick, + BlinkEventTypeInput, +} BlinkEventType; typedef struct { - EventType type; + BlinkEventType type; InputEvent input; } BlinkEvent; static void blink_test_update(void* ctx) { furi_assert(ctx); osMessageQueueId_t event_queue = ctx; - - BlinkEvent event = {.type = EventTypeTick}; + BlinkEvent event = {.type = BlinkEventTypeTick}; + // It's OK to loose this event if system overloaded osMessageQueuePut(event_queue, &event, 0, 0); } @@ -36,8 +36,8 @@ static void blink_test_input_callback(InputEvent* input_event, void* ctx) { furi_assert(ctx); osMessageQueueId_t event_queue = ctx; - BlinkEvent event = {.type = EventTypeKey, .input = *input_event}; - osMessageQueuePut(event_queue, &event, 0, 0); + BlinkEvent event = {.type = BlinkEventTypeInput, .input = *input_event}; + osMessageQueuePut(event_queue, &event, 0, osWaitForever); } int32_t blink_test_app(void* p) { @@ -45,7 +45,6 @@ int32_t blink_test_app(void* p) { // Configure view port ViewPort* view_port = view_port_alloc(); - furi_check(view_port); view_port_draw_callback_set(view_port, blink_test_draw_callback, NULL); view_port_input_callback_set(view_port, blink_test_input_callback, event_queue); osTimerId_t timer = osTimerNew(blink_test_update, osTimerPeriodic, event_queue, NULL); @@ -72,20 +71,12 @@ int32_t blink_test_app(void* p) { while(1) { furi_check(osMessageQueueGet(event_queue, &event, NULL, osWaitForever) == osOK); - if(event.type == EventTypeKey) { + if(event.type == BlinkEventTypeInput) { if((event.input.type == InputTypeShort) && (event.input.key == InputKeyBack)) { - furi_record_close("notification"); - view_port_enabled_set(view_port, false); - gui_remove_view_port(gui, view_port); - view_port_free(view_port); - osMessageQueueDelete(event_queue); - osTimerDelete(timer); - - return 0; + break; } } else { notification_message(notifications, colors[state]); - state++; if(state >= BLINK_COLOR_COUNT) { state = 0; @@ -93,5 +84,14 @@ int32_t blink_test_app(void* p) { } } + osTimerDelete(timer); + + gui_remove_view_port(gui, view_port); + view_port_free(view_port); + osMessageQueueDelete(event_queue); + + furi_record_close("notification"); + furi_record_close("gui"); + return 0; -} \ No newline at end of file +} diff --git a/applications/debug_tools/keypad_test.c b/applications/debug_tools/keypad_test.c index 20f259aa..ae980317 100644 --- a/applications/debug_tools/keypad_test.c +++ b/applications/debug_tools/keypad_test.c @@ -13,17 +13,6 @@ typedef struct { uint16_t ok; } KeypadTestState; -typedef enum { - EventTypeInput, -} EventType; - -typedef struct { - union { - InputEvent input; - }; - EventType type; -} KeypadTestEvent; - static void keypad_test_reset_state(KeypadTestState* state) { state->left = 0; state->right = 0; @@ -67,15 +56,11 @@ static void keypad_test_render_callback(Canvas* canvas, void* ctx) { static void keypad_test_input_callback(InputEvent* input_event, void* ctx) { osMessageQueueId_t event_queue = ctx; - - KeypadTestEvent event; - event.type = EventTypeInput; - event.input = *input_event; - osMessageQueuePut(event_queue, &event, 0, osWaitForever); + osMessageQueuePut(event_queue, input_event, 0, osWaitForever); } int32_t keypad_test_app(void* p) { - osMessageQueueId_t event_queue = osMessageQueueNew(32, sizeof(KeypadTestEvent), NULL); + osMessageQueueId_t event_queue = osMessageQueueNew(32, sizeof(InputEvent), NULL); furi_check(event_queue); KeypadTestState _state = {{false, false, false, false, false}, 0, 0, 0, 0, 0}; @@ -95,97 +80,75 @@ int32_t keypad_test_app(void* p) { Gui* gui = furi_record_open("gui"); gui_add_view_port(gui, view_port, GuiLayerFullscreen); - KeypadTestEvent event; - while(1) { - osStatus_t event_status = osMessageQueueGet(event_queue, &event, NULL, osWaitForever); + InputEvent event; + while(osMessageQueueGet(event_queue, &event, NULL, osWaitForever) == osOK) { KeypadTestState* state = (KeypadTestState*)acquire_mutex_block(&state_mutex); + FURI_LOG_I( + TAG, + "key: %s type: %s", + input_get_key_name(event.key), + input_get_type_name(event.type)); - if(event_status == osOK) { - if(event.type == EventTypeInput) { - FURI_LOG_I( - TAG, - "key: %s type: %s", - input_get_key_name(event.input.key), - input_get_type_name(event.input.type)); - - if(event.input.type == InputTypeLong && event.input.key == InputKeyBack) { - release_mutex(&state_mutex, state); - break; - } - - if(event.input.type == InputTypeShort && event.input.key == InputKeyBack) { - keypad_test_reset_state(state); - } - - if(event.input.key == InputKeyRight) { - if(event.input.type == InputTypePress) { - state->press[0] = true; - } else if(event.input.type == InputTypeRelease) { - state->press[0] = false; - } - - if(event.input.type == InputTypeShort) { - ++state->right; - } - } - - if(event.input.key == InputKeyLeft) { - if(event.input.type == InputTypePress) { - state->press[1] = true; - } else if(event.input.type == InputTypeRelease) { - state->press[1] = false; - } - - if(event.input.type == InputTypeShort) { - ++state->left; - } - } - - if(event.input.key == InputKeyUp) { - if(event.input.type == InputTypePress) { - state->press[2] = true; - } else if(event.input.type == InputTypeRelease) { - state->press[2] = false; - } - - if(event.input.type == InputTypeShort) { - ++state->up; - } - } - - if(event.input.key == InputKeyDown) { - if(event.input.type == InputTypePress) { - state->press[3] = true; - } else if(event.input.type == InputTypeRelease) { - state->press[3] = false; - } - - if(event.input.type == InputTypeShort) { - ++state->down; - } - } - - if(event.input.key == InputKeyOk) { - if(event.input.type == InputTypePress) { - state->press[4] = true; - } else if(event.input.type == InputTypeRelease) { - state->press[4] = false; - } - - if(event.input.type == InputTypeShort) { - ++state->ok; - } - } + if(event.key == InputKeyRight) { + if(event.type == InputTypePress) { + state->press[0] = true; + } else if(event.type == InputTypeRelease) { + state->press[0] = false; + } else if(event.type == InputTypeShort) { + ++state->right; + } + } else if(event.key == InputKeyLeft) { + if(event.type == InputTypePress) { + state->press[1] = true; + } else if(event.type == InputTypeRelease) { + state->press[1] = false; + } else if(event.type == InputTypeShort) { + ++state->left; + } + } else if(event.key == InputKeyUp) { + if(event.type == InputTypePress) { + state->press[2] = true; + } else if(event.type == InputTypeRelease) { + state->press[2] = false; + } else if(event.type == InputTypeShort) { + ++state->up; + } + } else if(event.key == InputKeyDown) { + if(event.type == InputTypePress) { + state->press[3] = true; + } else if(event.type == InputTypeRelease) { + state->press[3] = false; + } else if(event.type == InputTypeShort) { + ++state->down; + } + } else if(event.key == InputKeyOk) { + if(event.type == InputTypePress) { + state->press[4] = true; + } else if(event.type == InputTypeRelease) { + state->press[4] = false; + } else if(event.type == InputTypeShort) { + ++state->ok; + } + } else if(event.key == InputKeyBack) { + if(event.type == InputTypeLong) { + release_mutex(&state_mutex, state); + break; + } else if(event.type == InputTypeShort) { + keypad_test_reset_state(state); } } - view_port_update(view_port); + release_mutex(&state_mutex, state); + view_port_update(view_port); } + // remove & free all stuff created by app gui_remove_view_port(gui, view_port); view_port_free(view_port); osMessageQueueDelete(event_queue); delete_mutex(&state_mutex); + furi_record_close("gui"); + return 0; } diff --git a/applications/debug_tools/vibro_test.c b/applications/debug_tools/vibro_test.c index b5e9be63..25443088 100644 --- a/applications/debug_tools/vibro_test.c +++ b/applications/debug_tools/vibro_test.c @@ -5,10 +5,6 @@ #include #include -typedef struct { - InputEvent input; -} VibroEvent; - void vibro_test_draw_callback(Canvas* canvas, void* ctx) { canvas_clear(canvas); canvas_set_font(canvas, FontPrimary); @@ -22,17 +18,14 @@ void vibro_test_draw_callback(Canvas* canvas, void* ctx) { void vibro_test_input_callback(InputEvent* input_event, void* ctx) { furi_assert(ctx); osMessageQueueId_t event_queue = ctx; - - VibroEvent event = {.input = *input_event}; - osMessageQueuePut(event_queue, &event, 0, 0); + osMessageQueuePut(event_queue, input_event, 0, osWaitForever); } int32_t vibro_test_app(void* p) { - osMessageQueueId_t event_queue = osMessageQueueNew(8, sizeof(VibroEvent), NULL); + osMessageQueueId_t event_queue = osMessageQueueNew(8, sizeof(InputEvent), NULL); // Configure view port ViewPort* view_port = view_port_alloc(); - furi_check(view_port); view_port_draw_callback_set(view_port, vibro_test_draw_callback, NULL); view_port_input_callback_set(view_port, vibro_test_input_callback, event_queue); @@ -42,31 +35,31 @@ int32_t vibro_test_app(void* p) { NotificationApp* notification = furi_record_open("notification"); - VibroEvent event; + InputEvent event; - while(1) { - furi_check(osMessageQueueGet(event_queue, &event, NULL, osWaitForever) == osOK); - if(event.input.type == InputTypeShort && event.input.key == InputKeyBack) { + while(osMessageQueueGet(event_queue, &event, NULL, osWaitForever) == osOK) { + if(event.type == InputTypeShort && event.key == InputKeyBack) { notification_message(notification, &sequence_reset_vibro); notification_message(notification, &sequence_reset_green); - furi_record_close("notification"); - view_port_enabled_set(view_port, false); - gui_remove_view_port(gui, view_port); - view_port_free(view_port); - osMessageQueueDelete(event_queue); - - return 0; + break; } - if(event.input.key == InputKeyOk) { - if(event.input.type == InputTypePress) { + if(event.key == InputKeyOk) { + if(event.type == InputTypePress) { notification_message(notification, &sequence_set_vibro_on); notification_message(notification, &sequence_set_green_255); - } else if(event.input.type == InputTypeRelease) { + } else if(event.type == InputTypeRelease) { notification_message(notification, &sequence_reset_vibro); notification_message(notification, &sequence_reset_green); } } } + gui_remove_view_port(gui, view_port); + view_port_free(view_port); + osMessageQueueDelete(event_queue); + + furi_record_close("notification"); + furi_record_close("gui"); + return 0; -} \ No newline at end of file +} diff --git a/applications/gui/modules/menu.c b/applications/gui/modules/menu.c index 110ff0c1..2b551d55 100644 --- a/applications/gui/modules/menu.c +++ b/applications/gui/modules/menu.c @@ -18,6 +18,8 @@ typedef struct { ARRAY_DEF(MenuItemArray, MenuItem, M_POD_OPLIST); +#define M_OPL_MenuItemArray_t() ARRAY_OPLIST(MenuItemArray, M_POD_OPLIST) + typedef struct { MenuItemArray_t items; size_t position; @@ -136,11 +138,7 @@ Menu* menu_alloc() { void menu_free(Menu* menu) { furi_assert(menu); - with_view_model( - menu->view, (MenuModel * model) { - MenuItemArray_clear(model->items); - return true; - }); + menu_clean(menu); view_free(menu->view); free(menu); } @@ -153,7 +151,7 @@ View* menu_get_view(Menu* menu) { void menu_add_item( Menu* menu, const char* label, - IconAnimation* icon, + const Icon* icon, uint32_t index, MenuItemCallback callback, void* context) { @@ -165,7 +163,7 @@ void menu_add_item( menu->view, (MenuModel * model) { item = MenuItemArray_push_new(model->items); item->label = label; - item->icon = icon; + item->icon = icon ? icon_animation_alloc(icon) : icon_animation_alloc(&A_Plugins_14); view_tie_icon_animation(menu->view, item->icon); item->index = index; item->callback = callback; @@ -178,6 +176,12 @@ void menu_clean(Menu* menu) { furi_assert(menu); with_view_model( menu->view, (MenuModel * model) { + for + M_EACH(item, model->items, MenuItemArray_t) { + icon_animation_stop(item->icon); + icon_animation_free(item->icon); + } + MenuItemArray_reset(model->items); model->position = 0; return true; diff --git a/applications/gui/modules/menu.h b/applications/gui/modules/menu.h index e7d52c84..b41930fd 100755 --- a/applications/gui/modules/menu.h +++ b/applications/gui/modules/menu.h @@ -49,7 +49,7 @@ View* menu_get_view(Menu* menu); void menu_add_item( Menu* menu, const char* label, - IconAnimation* icon, + const Icon* icon, uint32_t index, MenuItemCallback callback, void* context); diff --git a/applications/loader/loader.c b/applications/loader/loader.c index 9d24f65d..7855cd20 100644 --- a/applications/loader/loader.c +++ b/applications/loader/loader.c @@ -279,7 +279,7 @@ static void loader_build_menu() { menu_add_item( loader_instance->primary_menu, FLIPPER_APPS[i].name, - FLIPPER_APPS[i].icon ? icon_animation_alloc(FLIPPER_APPS[i].icon) : NULL, + FLIPPER_APPS[i].icon, i, loader_menu_callback, (void*)&FLIPPER_APPS[i]); @@ -287,26 +287,31 @@ static void loader_build_menu() { menu_add_item( loader_instance->primary_menu, "Plugins", - icon_animation_alloc(&A_Plugins_14), + &A_Plugins_14, i++, loader_submenu_callback, (void*)LoaderMenuViewPlugins); - menu_add_item( - loader_instance->primary_menu, - "Debug tools", - icon_animation_alloc(&A_Debug_14), - i++, - loader_submenu_callback, - (void*)LoaderMenuViewDebug); + if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) { + menu_add_item( + loader_instance->primary_menu, + "Debug tools", + &A_Debug_14, + i++, + loader_submenu_callback, + (void*)LoaderMenuViewDebug); + } menu_add_item( loader_instance->primary_menu, "Settings", - icon_animation_alloc(&A_Settings_14), + &A_Settings_14, i++, loader_submenu_callback, (void*)LoaderMenuViewSettings); +} +static void loader_build_submenu() { FURI_LOG_I(TAG, "Building plugins menu"); + size_t i; for(i = 0; i < FLIPPER_PLUGINS_COUNT; i++) { loader_add_cli_command((FlipperApplication*)&FLIPPER_PLUGINS[i]); submenu_add_item( @@ -344,12 +349,18 @@ void loader_show_menu() { osThreadFlagsSet(loader_instance->loader_thread, LOADER_THREAD_FLAG_SHOW_MENU); } +void loader_update_menu() { + menu_clean(loader_instance->primary_menu); + loader_build_menu(); +} + int32_t loader_srv(void* p) { FURI_LOG_I(TAG, "Starting"); loader_instance = loader_alloc(); loader_build_menu(); + loader_build_submenu(); // Call on start hooks for(size_t i = 0; i < FLIPPER_ON_SYSTEM_START_COUNT; i++) { diff --git a/applications/loader/loader.h b/applications/loader/loader.h index 6c231b7a..705133c6 100644 --- a/applications/loader/loader.h +++ b/applications/loader/loader.h @@ -31,3 +31,6 @@ bool loader_is_locked(Loader* instance); /** Show primary loader */ void loader_show_menu(); + +/** Show primary loader */ +void loader_update_menu(); diff --git a/applications/system/system_settings.c b/applications/system/system_settings.c index f820645e..7d48451f 100644 --- a/applications/system/system_settings.c +++ b/applications/system/system_settings.c @@ -1,4 +1,5 @@ #include "system_settings.h" +#include static uint8_t uint32_value_index(const uint32_t value, const uint32_t values[], uint8_t values_count) { @@ -54,6 +55,7 @@ static void debug_changed(VariableItem* item) { } else { furi_hal_rtc_reset_flag(FuriHalRtcFlagDebug); } + loader_update_menu(); } static uint32_t system_settings_exit(void* context) { diff --git a/firmware/targets/f7/furi-hal/furi-hal-subghz.c b/firmware/targets/f7/furi-hal/furi-hal-subghz.c index 3e810880..1b794182 100644 --- a/firmware/targets/f7/furi-hal/furi-hal-subghz.c +++ b/firmware/targets/f7/furi-hal/furi-hal-subghz.c @@ -10,6 +10,9 @@ #include #include +#define __STDC_FORMAT_MACROS +#include + #define TAG "FuriHalSubGhz" static volatile SubGhzState furi_hal_subghz_state = SubGhzStateInit; @@ -808,6 +811,8 @@ typedef struct { bool flip_flop; FuriHalSubGhzAsyncTxCallback callback; void* callback_context; + uint64_t duty_high; + uint64_t duty_low; } FuriHalSubGhzAsyncTx; static FuriHalSubGhzAsyncTx furi_hal_subghz_async_tx = {0}; @@ -817,21 +822,30 @@ static void furi_hal_subghz_async_tx_refill(uint32_t* buffer, size_t samples) { bool is_odd = samples % 2; LevelDuration ld = furi_hal_subghz_async_tx.callback(furi_hal_subghz_async_tx.callback_context); - if(level_duration_is_wait(ld)) return; - if(level_duration_is_reset(ld)) { + + if(level_duration_is_wait(ld)) { + return; + } else if(level_duration_is_reset(ld)) { // One more even sample required to end at low level if(is_odd) { *buffer = API_HAL_SUBGHZ_ASYNC_TX_GUARD_TIME; buffer++; samples--; + furi_hal_subghz_async_tx.duty_low += API_HAL_SUBGHZ_ASYNC_TX_GUARD_TIME; } break; } else { // Inject guard time if level is incorrect - if(is_odd == level_duration_get_level(ld)) { + bool level = level_duration_get_level(ld); + if(is_odd == level) { *buffer = API_HAL_SUBGHZ_ASYNC_TX_GUARD_TIME; buffer++; samples--; + if (!level) { + furi_hal_subghz_async_tx.duty_high += API_HAL_SUBGHZ_ASYNC_TX_GUARD_TIME; + } else { + furi_hal_subghz_async_tx.duty_low += API_HAL_SUBGHZ_ASYNC_TX_GUARD_TIME; + } } uint32_t duration = level_duration_get_duration(ld); @@ -839,6 +853,12 @@ static void furi_hal_subghz_async_tx_refill(uint32_t* buffer, size_t samples) { *buffer = duration; buffer++; samples--; + + if (level) { + furi_hal_subghz_async_tx.duty_high += duration; + } else { + furi_hal_subghz_async_tx.duty_low += duration; + } } } @@ -888,6 +908,9 @@ bool furi_hal_subghz_start_async_tx(FuriHalSubGhzAsyncTxCallback callback, void* furi_hal_subghz_state = SubGhzStateAsyncTx; + furi_hal_subghz_async_tx.duty_low = 0; + furi_hal_subghz_async_tx.duty_high = 0; + furi_hal_subghz_async_tx.buffer = furi_alloc(API_HAL_SUBGHZ_ASYNC_TX_BUFFER_FULL * sizeof(uint32_t)); furi_hal_subghz_async_tx_refill( @@ -994,5 +1017,8 @@ void furi_hal_subghz_stop_async_tx() { free(furi_hal_subghz_async_tx.buffer); + float duty_cycle = 100.0f * (float)furi_hal_subghz_async_tx.duty_high / ((float)furi_hal_subghz_async_tx.duty_low + (float)furi_hal_subghz_async_tx.duty_high); + FURI_LOG_D(TAG, "Async TX Radio stats: on %0.0fus, off %0.0fus, DutyCycle: %0.0f%%", (float)furi_hal_subghz_async_tx.duty_high, (float)furi_hal_subghz_async_tx.duty_low, duty_cycle); + furi_hal_subghz_state = SubGhzStateIdle; } From f0d4584b4035a65c5fad7b45e526081235fad50b Mon Sep 17 00:00:00 2001 From: gornekich Date: Wed, 15 Dec 2021 20:39:06 +0300 Subject: [PATCH 06/13] [FL-2119] BT HID App (#888) * view_dispatcher: add default back processing for Long events * assets: add ble connected and disconnected assets * bt keyboard: introduce new application * bt keyboard: add logic to keyboard mode * bt: remove debug ble hid application * bt hid: introduce media controller * gui canvas: rename CanvasFontDirection -> CanvasDirection * gui canvas: add arrow element * assets: update finilized assets * bt hid: finalise keynote GUI * bt hid: finalise media player GUI * bt: add media key buttons support * bt: add exit confirm view * bt: change Clicker -> Remote * bt: support f6 target * bt: hopefully final bt hid design * bt hid: add blue led notification when device is connected * bt: leave only bt clicker for now * bt: add display notification on pin code show event --- applications/applications.c | 9 +- applications/applications.mk | 8 +- applications/bt/bt_hid_app/bt_hid.c | 169 +++++ applications/bt/bt_hid_app/bt_hid.h | 34 + .../bt/bt_hid_app/views/bt_hid_keynote.c | 192 +++++ .../bt/bt_hid_app/views/bt_hid_keynote.h | 13 + .../bt/bt_hid_app/views/bt_hid_media.c | 193 ++++++ .../bt/bt_hid_app/views/bt_hid_media.h | 13 + applications/bt/bt_service/bt.c | 9 + applications/bt/bt_service/bt.h | 19 +- applications/bt/bt_service/bt_api.c | 7 + applications/bt/bt_service/bt_i.h | 10 +- .../debug_tools/ble_keyboard/ble_keyboard.c | 138 ---- applications/gui/canvas.c | 31 +- applications/gui/canvas.h | 29 +- applications/gui/view_dispatcher.c | 2 +- assets/compiled/assets_icons.c | 656 +++++++++--------- assets/compiled/assets_icons.h | 177 ++--- .../icons/BLE/BLE_HID/Ble_connected_38x34.png | Bin 0 -> 3694 bytes .../BLE/BLE_HID/Ble_disconnected_24x34.png | Bin 0 -> 3656 bytes assets/icons/BLE/BLE_HID/Button_18x18.png | Bin 0 -> 3609 bytes assets/icons/BLE/BLE_HID/Circles_47x47.png | Bin 0 -> 3712 bytes assets/icons/BLE/BLE_HID/Ok_btn_9x9.png | Bin 0 -> 3605 bytes .../BLE/BLE_HID/Pressed_Button_13x13.png | Bin 0 -> 3606 bytes assets/icons/BLE/BLE_HID/Space_65x18.png | Bin 0 -> 3619 bytes assets/icons/BLE/BLE_HID/Voldwn_6x6.png | Bin 0 -> 3593 bytes assets/icons/BLE/BLE_HID/Volup_8x6.png | Bin 0 -> 3595 bytes firmware/targets/f6/ble-glue/gap.c | 8 +- firmware/targets/f6/ble-glue/hid_service.h | 4 +- .../targets/f6/furi-hal/furi-hal-bt-hid.c | 59 +- firmware/targets/f6/furi-hal/furi-hal-bt.c | 6 +- firmware/targets/f7/ble-glue/gap.c | 8 +- firmware/targets/f7/ble-glue/hid_service.h | 4 +- .../targets/f7/furi-hal/furi-hal-bt-hid.c | 59 +- firmware/targets/f7/furi-hal/furi-hal-bt.c | 6 +- .../furi-hal-include/furi-hal-bt-hid.h | 35 +- 36 files changed, 1319 insertions(+), 579 deletions(-) create mode 100755 applications/bt/bt_hid_app/bt_hid.c create mode 100644 applications/bt/bt_hid_app/bt_hid.h create mode 100755 applications/bt/bt_hid_app/views/bt_hid_keynote.c create mode 100644 applications/bt/bt_hid_app/views/bt_hid_keynote.h create mode 100755 applications/bt/bt_hid_app/views/bt_hid_media.c create mode 100644 applications/bt/bt_hid_app/views/bt_hid_media.h delete mode 100755 applications/debug_tools/ble_keyboard/ble_keyboard.c mode change 100644 => 100755 applications/gui/canvas.c mode change 100644 => 100755 applications/gui/canvas.h create mode 100644 assets/icons/BLE/BLE_HID/Ble_connected_38x34.png create mode 100644 assets/icons/BLE/BLE_HID/Ble_disconnected_24x34.png create mode 100644 assets/icons/BLE/BLE_HID/Button_18x18.png create mode 100644 assets/icons/BLE/BLE_HID/Circles_47x47.png create mode 100644 assets/icons/BLE/BLE_HID/Ok_btn_9x9.png create mode 100644 assets/icons/BLE/BLE_HID/Pressed_Button_13x13.png create mode 100644 assets/icons/BLE/BLE_HID/Space_65x18.png create mode 100644 assets/icons/BLE/BLE_HID/Voldwn_6x6.png create mode 100644 assets/icons/BLE/BLE_HID/Volup_8x6.png diff --git a/applications/applications.c b/applications/applications.c index 76a13b86..515ba33e 100644 --- a/applications/applications.c +++ b/applications/applications.c @@ -40,7 +40,7 @@ extern int32_t subghz_app(void* p); extern int32_t usb_mouse_app(void* p); extern int32_t usb_test_app(void* p); extern int32_t vibro_test_app(void* p); -extern int32_t ble_keyboard_app(void* p); +extern int32_t bt_hid_app(void* p); // Plugins extern int32_t music_player_app(void* p); @@ -206,6 +206,9 @@ const size_t FLIPPER_ON_SYSTEM_START_COUNT = // Plugin menu const FlipperApplication FLIPPER_PLUGINS[] = { +#ifdef APP_BLE_HID + {.app = bt_hid_app, .name = "Bluetooth remote", .stack_size = 1024, .icon = NULL}, +#endif #ifdef APP_MUSIC_PLAYER {.app = music_player_app, .name = "Music Player", .stack_size = 1024, .icon = &A_Plugins_14}, @@ -220,10 +223,6 @@ const size_t FLIPPER_PLUGINS_COUNT = sizeof(FLIPPER_PLUGINS) / sizeof(FlipperApp // Plugin menu const FlipperApplication FLIPPER_DEBUG_APPS[] = { -#ifdef APP_BLE_KEYBOARD - {.app = ble_keyboard_app, .name = "BLE keyboard demo", .stack_size = 1024, .icon = NULL}, -#endif - #ifdef APP_BLINK {.app = blink_test_app, .name = "Blink Test", .stack_size = 1024, .icon = NULL}, #endif diff --git a/applications/applications.mk b/applications/applications.mk index e067faef..35069882 100644 --- a/applications/applications.mk +++ b/applications/applications.mk @@ -47,7 +47,7 @@ APP_SD_TEST = 1 APP_VIBRO_TEST = 1 APP_USB_TEST = 1 APP_DISPLAY_TEST = 1 -APP_BLE_KEYBOARD = 1 +APP_BLE_HID = 1 APP_USB_MOUSE = 1 APP_BAD_USB = 1 APP_UART_ECHO = 1 @@ -167,9 +167,9 @@ CFLAGS += -DAPP_BAD_USB SRV_GUI = 1 endif -APP_BLE_KEYBOARD ?=0 -ifeq ($(APP_BLE_KEYBOARD), 1) -CFLAGS += -DAPP_BLE_KEYBOARD +APP_BLE_HID ?=0 +ifeq ($(APP_BLE_HID), 1) +CFLAGS += -DAPP_BLE_HID SRV_GUI = 1 endif diff --git a/applications/bt/bt_hid_app/bt_hid.c b/applications/bt/bt_hid_app/bt_hid.c new file mode 100755 index 00000000..6a93ce85 --- /dev/null +++ b/applications/bt/bt_hid_app/bt_hid.c @@ -0,0 +1,169 @@ +#include "bt_hid.h" +#include +#include + +#define TAG "BtHidApp" + +enum BtDebugSubmenuIndex { + BtHidSubmenuIndexKeynote, + BtHidSubmenuIndexMedia, +}; + +void bt_hid_submenu_callback(void* context, uint32_t index) { + furi_assert(context); + BtHid* app = context; + if(index == BtHidSubmenuIndexKeynote) { + app->view_id = BtHidViewKeynote; + view_dispatcher_switch_to_view(app->view_dispatcher, BtHidViewKeynote); + } else if(index == BtHidSubmenuIndexMedia) { + app->view_id = BtHidViewMedia; + view_dispatcher_switch_to_view(app->view_dispatcher, BtHidViewMedia); + } +} + +void bt_hid_dialog_callback(DialogExResult result, void* context) { + furi_assert(context); + BtHid* app = context; + if(result == DialogExResultLeft) { + // TODO switch to Submenu after Media is done + view_dispatcher_stop(app->view_dispatcher); + } else if(result == DialogExResultRight) { + view_dispatcher_switch_to_view(app->view_dispatcher, app->view_id); + } +} + +uint32_t bt_hid_exit_confirm_view(void* context) { + return BtHidViewExitConfirm; +} + +uint32_t bt_hid_exit(void* context) { + return VIEW_NONE; +} + +void bt_hid_connection_status_changed_callback(BtStatus status, void* context) { + furi_assert(context); + BtHid* bt_hid = context; + bool connected = (status == BtStatusConnected); + if(connected) { + notification_internal_message(bt_hid->notifications, &sequence_set_blue_255); + } else { + notification_internal_message(bt_hid->notifications, &sequence_reset_blue); + } + bt_hid_keynote_set_connected_status(bt_hid->bt_hid_keynote, connected); + bt_hid_media_set_connected_status(bt_hid->bt_hid_media, connected); +} + +BtHid* bt_hid_app_alloc() { + BtHid* app = furi_alloc(sizeof(BtHid)); + + // Load Bluetooth settings + bt_settings_load(&app->bt_settings); + + // Gui + app->gui = furi_record_open("gui"); + + // Bt + app->bt = furi_record_open("bt"); + + // Notifications + app->notifications = 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); + + // Submenu view + app->submenu = submenu_alloc(); + submenu_add_item( + app->submenu, "Keynote", BtHidSubmenuIndexKeynote, bt_hid_submenu_callback, app); + submenu_add_item( + app->submenu, "Media player", BtHidSubmenuIndexMedia, bt_hid_submenu_callback, app); + view_set_previous_callback(submenu_get_view(app->submenu), bt_hid_exit); + view_dispatcher_add_view( + app->view_dispatcher, BtHidViewSubmenu, submenu_get_view(app->submenu)); + + // Dialog view + app->dialog = dialog_ex_alloc(); + dialog_ex_set_result_callback(app->dialog, bt_hid_dialog_callback); + dialog_ex_set_context(app->dialog, app); + dialog_ex_set_left_button_text(app->dialog, "Exit"); + dialog_ex_set_right_button_text(app->dialog, "Stay"); + dialog_ex_set_header(app->dialog, "Close current app?", 16, 12, AlignLeft, AlignTop); + view_dispatcher_add_view( + app->view_dispatcher, BtHidViewExitConfirm, dialog_ex_get_view(app->dialog)); + + // Keynote view + app->bt_hid_keynote = bt_hid_keynote_alloc(); + view_set_previous_callback( + bt_hid_keynote_get_view(app->bt_hid_keynote), bt_hid_exit_confirm_view); + view_dispatcher_add_view( + app->view_dispatcher, BtHidViewKeynote, bt_hid_keynote_get_view(app->bt_hid_keynote)); + + // Media view + app->bt_hid_media = bt_hid_media_alloc(); + view_set_previous_callback(bt_hid_media_get_view(app->bt_hid_media), bt_hid_exit_confirm_view); + view_dispatcher_add_view( + app->view_dispatcher, BtHidViewMedia, bt_hid_media_get_view(app->bt_hid_media)); + + // TODO switch to menu after Media is done + view_dispatcher_switch_to_view(app->view_dispatcher, BtHidViewKeynote); + + return app; +} + +void bt_hid_app_free(BtHid* app) { + furi_assert(app); + + // Reset notification + notification_internal_message(app->notifications, &sequence_reset_blue); + + // Free views + view_dispatcher_remove_view(app->view_dispatcher, BtHidViewSubmenu); + submenu_free(app->submenu); + view_dispatcher_remove_view(app->view_dispatcher, BtHidViewExitConfirm); + dialog_ex_free(app->dialog); + view_dispatcher_remove_view(app->view_dispatcher, BtHidViewKeynote); + bt_hid_keynote_free(app->bt_hid_keynote); + view_dispatcher_remove_view(app->view_dispatcher, BtHidViewMedia); + bt_hid_media_free(app->bt_hid_media); + view_dispatcher_free(app->view_dispatcher); + + // Close records + furi_record_close("gui"); + app->gui = NULL; + furi_record_close("notification"); + app->notifications = NULL; + furi_record_close("bt"); + app->bt = NULL; + + // Free rest + free(app); +} + +int32_t bt_hid_app(void* p) { + // Switch profile to Hid + BtHid* app = bt_hid_app_alloc(); + bt_set_status_changed_callback(app->bt, bt_hid_connection_status_changed_callback, app); + // Change profile + if(!bt_set_profile(app->bt, BtProfileHidKeyboard)) { + FURI_LOG_E(TAG, "Failed to switch profile"); + bt_hid_app_free(app); + return -1; + } + furi_hal_bt_start_advertising(); + + view_dispatcher_run(app->view_dispatcher); + + bt_set_status_changed_callback(app->bt, NULL, NULL); + // Stop advertising if bt was off + if(app->bt_settings.enabled) { + furi_hal_bt_stop_advertising(); + } + // Change back profile to Serial + bt_set_profile(app->bt, BtProfileSerial); + + bt_hid_app_free(app); + + return 0; +} diff --git a/applications/bt/bt_hid_app/bt_hid.h b/applications/bt/bt_hid_app/bt_hid.h new file mode 100644 index 00000000..4156b44b --- /dev/null +++ b/applications/bt/bt_hid_app/bt_hid.h @@ -0,0 +1,34 @@ +#pragma once + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include "views/bt_hid_keynote.h" +#include "views/bt_hid_media.h" + +typedef struct { + BtSettings bt_settings; + Bt* bt; + Gui* gui; + NotificationApp* notifications; + ViewDispatcher* view_dispatcher; + Submenu* submenu; + DialogEx* dialog; + BtHidKeynote* bt_hid_keynote; + BtHidMedia* bt_hid_media; + uint32_t view_id; +} BtHid; + +typedef enum { + BtHidViewSubmenu, + BtHidViewKeynote, + BtHidViewMedia, + BtHidViewExitConfirm, +} BtHidView; diff --git a/applications/bt/bt_hid_app/views/bt_hid_keynote.c b/applications/bt/bt_hid_app/views/bt_hid_keynote.c new file mode 100755 index 00000000..caf4bc39 --- /dev/null +++ b/applications/bt/bt_hid_app/views/bt_hid_keynote.c @@ -0,0 +1,192 @@ +#include "bt_hid_keynote.h" +#include +#include +#include +#include + +struct BtHidKeynote { + View* view; +}; + +typedef struct { + bool left_pressed; + bool up_pressed; + bool right_pressed; + bool down_pressed; + bool ok_pressed; + bool connected; +} BtHidKeynoteModel; + +static void bt_hid_keynote_draw_arrow(Canvas* canvas, uint8_t x, uint8_t y, CanvasDirection dir) { + canvas_draw_triangle(canvas, x, y, 5, 3, dir); + if(dir == CanvasDirectionBottomToTop) { + canvas_draw_line(canvas, x, y + 6, x, y - 1); + } else if(dir == CanvasDirectionTopToBottom) { + canvas_draw_line(canvas, x, y - 6, x, y + 1); + } else if(dir == CanvasDirectionRightToLeft) { + canvas_draw_line(canvas, x + 6, y, x - 1, y); + } else if(dir == CanvasDirectionLeftToRight) { + canvas_draw_line(canvas, x - 6, y, x + 1, y); + } +} + +static void bt_hid_keynote_draw_callback(Canvas* canvas, void* context) { + furi_assert(context); + BtHidKeynoteModel* model = context; + + // Header + canvas_set_font(canvas, FontPrimary); + elements_multiline_text_aligned(canvas, 9, 3, AlignLeft, AlignTop, "Keynote"); + canvas_set_font(canvas, FontSecondary); + + // Connected status + if(model->connected) { + canvas_draw_icon(canvas, 18, 18, &I_Ble_connected_38x34); + elements_multiline_text_aligned(canvas, 9, 60, AlignLeft, AlignBottom, "Connected"); + } else { + canvas_draw_icon(canvas, 18, 18, &I_Ble_disconnected_24x34); + elements_multiline_text_aligned(canvas, 3, 60, AlignLeft, AlignBottom, "Disconnected"); + } + + // Up + canvas_draw_icon(canvas, 86, 4, &I_Button_18x18); + if(model->up_pressed) { + elements_slightly_rounded_box(canvas, 89, 6, 13, 13); + canvas_set_color(canvas, ColorWhite); + } + bt_hid_keynote_draw_arrow(canvas, 95, 10, CanvasDirectionBottomToTop); + canvas_set_color(canvas, ColorBlack); + + // Down + canvas_draw_icon(canvas, 86, 25, &I_Button_18x18); + if(model->down_pressed) { + elements_slightly_rounded_box(canvas, 89, 27, 13, 13); + canvas_set_color(canvas, ColorWhite); + } + bt_hid_keynote_draw_arrow(canvas, 95, 35, CanvasDirectionTopToBottom); + canvas_set_color(canvas, ColorBlack); + + // Left + canvas_draw_icon(canvas, 65, 25, &I_Button_18x18); + if(model->left_pressed) { + elements_slightly_rounded_box(canvas, 68, 27, 13, 13); + canvas_set_color(canvas, ColorWhite); + } + bt_hid_keynote_draw_arrow(canvas, 72, 33, CanvasDirectionRightToLeft); + canvas_set_color(canvas, ColorBlack); + + // Right + canvas_draw_icon(canvas, 107, 25, &I_Button_18x18); + if(model->right_pressed) { + elements_slightly_rounded_box(canvas, 110, 27, 13, 13); + canvas_set_color(canvas, ColorWhite); + } + bt_hid_keynote_draw_arrow(canvas, 118, 33, CanvasDirectionLeftToRight); + canvas_set_color(canvas, ColorBlack); + + // Ok + canvas_draw_icon(canvas, 63, 45, &I_Space_65x18); + if(model->ok_pressed) { + elements_slightly_rounded_box(canvas, 66, 47, 60, 13); + canvas_set_color(canvas, ColorWhite); + } + canvas_draw_icon(canvas, 74, 49, &I_Ok_btn_9x9); + elements_multiline_text_aligned(canvas, 91, 56, AlignLeft, AlignBottom, "Space"); +} + +static void bt_hid_keynote_process_press(BtHidKeynote* bt_hid_keynote, InputEvent* event) { + with_view_model( + bt_hid_keynote->view, (BtHidKeynoteModel * model) { + if(event->key == InputKeyUp) { + model->up_pressed = true; + furi_hal_bt_hid_kb_press(KEY_UP_ARROW); + } else if(event->key == InputKeyDown) { + model->down_pressed = true; + furi_hal_bt_hid_kb_press(KEY_DOWN_ARROW); + } else if(event->key == InputKeyLeft) { + model->left_pressed = true; + furi_hal_bt_hid_kb_press(KEY_LEFT_ARROW); + } else if(event->key == InputKeyRight) { + model->right_pressed = true; + furi_hal_bt_hid_kb_press(KEY_RIGHT_ARROW); + } else if(event->key == InputKeyOk) { + model->ok_pressed = true; + furi_hal_bt_hid_kb_press(KEY_SPACE); + } + return true; + }); +} + +static void bt_hid_keynote_process_release(BtHidKeynote* bt_hid_keynote, InputEvent* event) { + with_view_model( + bt_hid_keynote->view, (BtHidKeynoteModel * model) { + if(event->key == InputKeyUp) { + model->up_pressed = false; + furi_hal_bt_hid_kb_release(KEY_UP_ARROW); + } else if(event->key == InputKeyDown) { + model->down_pressed = false; + furi_hal_bt_hid_kb_release(KEY_DOWN_ARROW); + } else if(event->key == InputKeyLeft) { + model->left_pressed = false; + furi_hal_bt_hid_kb_release(KEY_LEFT_ARROW); + } else if(event->key == InputKeyRight) { + model->right_pressed = false; + furi_hal_bt_hid_kb_release(KEY_RIGHT_ARROW); + } else if(event->key == InputKeyOk) { + model->ok_pressed = false; + furi_hal_bt_hid_kb_release(KEY_SPACE); + } + return true; + }); +} + +static bool bt_hid_keynote_input_callback(InputEvent* event, void* context) { + furi_assert(context); + BtHidKeynote* bt_hid_keynote = context; + bool consumed = false; + + if(event->type == InputTypePress) { + bt_hid_keynote_process_press(bt_hid_keynote, event); + consumed = true; + } else if(event->type == InputTypeRelease) { + bt_hid_keynote_process_release(bt_hid_keynote, event); + consumed = true; + } else if(event->type == InputTypeShort) { + if(event->key == InputKeyBack) { + furi_hal_hid_kb_release_all(); + } + } + + return consumed; +} + +BtHidKeynote* bt_hid_keynote_alloc() { + BtHidKeynote* bt_hid_keynote = furi_alloc(sizeof(BtHidKeynote)); + bt_hid_keynote->view = view_alloc(); + view_set_context(bt_hid_keynote->view, bt_hid_keynote); + view_allocate_model(bt_hid_keynote->view, ViewModelTypeLocking, sizeof(BtHidKeynoteModel)); + view_set_draw_callback(bt_hid_keynote->view, bt_hid_keynote_draw_callback); + view_set_input_callback(bt_hid_keynote->view, bt_hid_keynote_input_callback); + + return bt_hid_keynote; +} + +void bt_hid_keynote_free(BtHidKeynote* bt_hid_keynote) { + furi_assert(bt_hid_keynote); + view_free(bt_hid_keynote->view); + free(bt_hid_keynote); +} + +View* bt_hid_keynote_get_view(BtHidKeynote* bt_hid_keynote) { + furi_assert(bt_hid_keynote); + return bt_hid_keynote->view; +} + +void bt_hid_keynote_set_connected_status(BtHidKeynote* bt_hid_keynote, bool connected) { + furi_assert(bt_hid_keynote); + with_view_model( + bt_hid_keynote->view, (BtHidKeynoteModel * model) { + model->connected = connected; + return true; + }); +} diff --git a/applications/bt/bt_hid_app/views/bt_hid_keynote.h b/applications/bt/bt_hid_app/views/bt_hid_keynote.h new file mode 100644 index 00000000..05b12145 --- /dev/null +++ b/applications/bt/bt_hid_app/views/bt_hid_keynote.h @@ -0,0 +1,13 @@ +#pragma once + +#include + +typedef struct BtHidKeynote BtHidKeynote; + +BtHidKeynote* bt_hid_keynote_alloc(); + +void bt_hid_keynote_free(BtHidKeynote* bt_hid_keynote); + +View* bt_hid_keynote_get_view(BtHidKeynote* bt_hid_keynote); + +void bt_hid_keynote_set_connected_status(BtHidKeynote* bt_hid_keynote, bool connected); diff --git a/applications/bt/bt_hid_app/views/bt_hid_media.c b/applications/bt/bt_hid_app/views/bt_hid_media.c new file mode 100755 index 00000000..054d941d --- /dev/null +++ b/applications/bt/bt_hid_app/views/bt_hid_media.c @@ -0,0 +1,193 @@ +#include "bt_hid_media.h" +#include +#include +#include +#include + +struct BtHidMedia { + View* view; +}; + +typedef struct { + bool left_pressed; + bool up_pressed; + bool right_pressed; + bool down_pressed; + bool ok_pressed; + bool connected; +} BtHidMediaModel; + +static void bt_hid_media_draw_arrow(Canvas* canvas, uint8_t x, uint8_t y, CanvasDirection dir) { + canvas_draw_triangle(canvas, x, y, 5, 3, dir); + if(dir == CanvasDirectionBottomToTop) { + canvas_draw_dot(canvas, x, y - 1); + } else if(dir == CanvasDirectionTopToBottom) { + canvas_draw_dot(canvas, x, y + 1); + } else if(dir == CanvasDirectionRightToLeft) { + canvas_draw_dot(canvas, x - 1, y); + } else if(dir == CanvasDirectionLeftToRight) { + canvas_draw_dot(canvas, x + 1, y); + } +} + +static void bt_hid_media_draw_callback(Canvas* canvas, void* context) { + furi_assert(context); + BtHidMediaModel* model = context; + + // Header + canvas_set_font(canvas, FontPrimary); + elements_multiline_text_aligned(canvas, 9, 3, AlignLeft, AlignTop, "Media player"); + canvas_set_font(canvas, FontSecondary); + + // Connected status + if(model->connected) { + canvas_draw_icon(canvas, 23, 17, &I_Ble_connected_38x34); + elements_multiline_text_aligned(canvas, 35, 61, AlignCenter, AlignBottom, "Connected"); + } else { + canvas_draw_icon(canvas, 23, 17, &I_Ble_disconnected_24x34); + elements_multiline_text_aligned(canvas, 35, 61, AlignCenter, AlignBottom, "Disconnected"); + } + + // Keypad circles + canvas_draw_icon(canvas, 76, 8, &I_Circles_47x47); + + // Up + if(model->up_pressed) { + canvas_draw_icon(canvas, 93, 9, &I_Pressed_Button_13x13); + canvas_set_color(canvas, ColorWhite); + } + canvas_draw_icon(canvas, 96, 12, &I_Volup_8x6); + canvas_set_color(canvas, ColorBlack); + + // Down + if(model->down_pressed) { + canvas_draw_icon(canvas, 93, 41, &I_Pressed_Button_13x13); + canvas_set_color(canvas, ColorWhite); + } + canvas_draw_icon(canvas, 96, 45, &I_Voldwn_6x6); + canvas_set_color(canvas, ColorBlack); + + // Left + if(model->left_pressed) { + canvas_draw_icon(canvas, 77, 25, &I_Pressed_Button_13x13); + canvas_set_color(canvas, ColorWhite); + } + bt_hid_media_draw_arrow(canvas, 82, 31, CanvasDirectionRightToLeft); + bt_hid_media_draw_arrow(canvas, 86, 31, CanvasDirectionRightToLeft); + canvas_set_color(canvas, ColorBlack); + + // Right + if(model->right_pressed) { + canvas_draw_icon(canvas, 109, 25, &I_Pressed_Button_13x13); + canvas_set_color(canvas, ColorWhite); + } + bt_hid_media_draw_arrow(canvas, 112, 31, CanvasDirectionLeftToRight); + bt_hid_media_draw_arrow(canvas, 116, 31, CanvasDirectionLeftToRight); + canvas_set_color(canvas, ColorBlack); + + // Ok + if(model->ok_pressed) { + canvas_draw_icon(canvas, 93, 25, &I_Pressed_Button_13x13); + canvas_set_color(canvas, ColorWhite); + } + bt_hid_media_draw_arrow(canvas, 96, 31, CanvasDirectionLeftToRight); + canvas_draw_line(canvas, 100, 29, 100, 33); + canvas_draw_line(canvas, 102, 29, 102, 33); +} + +static void bt_hid_media_process_press(BtHidMedia* bt_hid_media, InputEvent* event) { + with_view_model( + bt_hid_media->view, (BtHidMediaModel * model) { + if(event->key == InputKeyUp) { + model->up_pressed = true; + furi_hal_bt_hid_media_press(FuriHalBtHidMediaVolumeUp); + } else if(event->key == InputKeyDown) { + model->down_pressed = true; + furi_hal_bt_hid_media_press(FuriHalBtHidMediaVolumeDown); + } else if(event->key == InputKeyLeft) { + model->left_pressed = true; + furi_hal_bt_hid_media_press(FuriHalBtHidMediaScanPrevious); + } else if(event->key == InputKeyRight) { + model->right_pressed = true; + furi_hal_bt_hid_media_press(FuriHalBtHidMediaScanNext); + } else if(event->key == InputKeyOk) { + model->ok_pressed = true; + furi_hal_bt_hid_media_press(FuriHalBtHidMediaPlayPause); + } + return true; + }); +} + +static void bt_hid_media_process_release(BtHidMedia* bt_hid_media, InputEvent* event) { + with_view_model( + bt_hid_media->view, (BtHidMediaModel * model) { + if(event->key == InputKeyUp) { + model->up_pressed = false; + furi_hal_bt_hid_media_release(FuriHalBtHidMediaVolumeUp); + } else if(event->key == InputKeyDown) { + model->down_pressed = false; + furi_hal_bt_hid_media_release(FuriHalBtHidMediaVolumeDown); + } else if(event->key == InputKeyLeft) { + model->left_pressed = false; + furi_hal_bt_hid_media_release(FuriHalBtHidMediaScanPrevious); + } else if(event->key == InputKeyRight) { + model->right_pressed = false; + furi_hal_bt_hid_media_release(FuriHalBtHidMediaScanNext); + } else if(event->key == InputKeyOk) { + model->ok_pressed = false; + furi_hal_bt_hid_media_release(FuriHalBtHidMediaPlayPause); + } + return true; + }); +} + +static bool bt_hid_media_input_callback(InputEvent* event, void* context) { + furi_assert(context); + BtHidMedia* bt_hid_media = context; + bool consumed = false; + + if(event->type == InputTypePress) { + bt_hid_media_process_press(bt_hid_media, event); + consumed = true; + } else if(event->type == InputTypeRelease) { + bt_hid_media_process_release(bt_hid_media, event); + consumed = true; + } else if(event->type == InputTypeShort) { + if(event->key == InputKeyBack) { + furi_hal_bt_hid_media_release_all(); + } + } + + return consumed; +} + +BtHidMedia* bt_hid_media_alloc() { + BtHidMedia* bt_hid_media = furi_alloc(sizeof(BtHidMedia)); + bt_hid_media->view = view_alloc(); + view_set_context(bt_hid_media->view, bt_hid_media); + view_allocate_model(bt_hid_media->view, ViewModelTypeLocking, sizeof(BtHidMediaModel)); + view_set_draw_callback(bt_hid_media->view, bt_hid_media_draw_callback); + view_set_input_callback(bt_hid_media->view, bt_hid_media_input_callback); + + return bt_hid_media; +} + +void bt_hid_media_free(BtHidMedia* bt_hid_media) { + furi_assert(bt_hid_media); + view_free(bt_hid_media->view); + free(bt_hid_media); +} + +View* bt_hid_media_get_view(BtHidMedia* bt_hid_media) { + furi_assert(bt_hid_media); + return bt_hid_media->view; +} + +void bt_hid_media_set_connected_status(BtHidMedia* bt_hid_media, bool connected) { + furi_assert(bt_hid_media); + with_view_model( + bt_hid_media->view, (BtHidMediaModel * model) { + model->connected = connected; + return true; + }); +} diff --git a/applications/bt/bt_hid_app/views/bt_hid_media.h b/applications/bt/bt_hid_app/views/bt_hid_media.h new file mode 100644 index 00000000..804239dc --- /dev/null +++ b/applications/bt/bt_hid_app/views/bt_hid_media.h @@ -0,0 +1,13 @@ +#pragma once + +#include + +typedef struct BtHidMedia BtHidMedia; + +BtHidMedia* bt_hid_media_alloc(); + +void bt_hid_media_free(BtHidMedia* bt_hid_media); + +View* bt_hid_media_get_view(BtHidMedia* bt_hid_media); + +void bt_hid_media_set_connected_status(BtHidMedia* bt_hid_media, bool connected); diff --git a/applications/bt/bt_service/bt.c b/applications/bt/bt_service/bt.c index 97cc156b..4dfcdfb7 100755 --- a/applications/bt/bt_service/bt.c +++ b/applications/bt/bt_service/bt.c @@ -2,6 +2,8 @@ #include "battery_service.h" #include "bt_keys_storage.h" +#include + #define TAG "BtSrv" #define BT_RPC_EVENT_BUFF_SENT (1UL << 0) @@ -29,6 +31,7 @@ static ViewPort* bt_statusbar_view_port_alloc(Bt* bt) { static void bt_pin_code_show_event_handler(Bt* bt, uint32_t pin) { furi_assert(bt); + notification_message(bt->notification, &sequence_display_on); string_t pin_str; dialog_message_set_icon(bt->dialog_message, &I_BLE_Pairing_128x64, 0, 0); string_init_printf(pin_str, "Pairing code\n%06d", pin); @@ -41,6 +44,7 @@ static void bt_pin_code_show_event_handler(Bt* bt, uint32_t pin) { static bool bt_pin_code_verify_event_handler(Bt* bt, uint32_t pin) { furi_assert(bt); + notification_message(bt->notification, &sequence_display_on); string_t pin_str; dialog_message_set_icon(bt->dialog_message, &I_BLE_Pairing_128x64, 0, 0); string_init_printf(pin_str, "Verify code\n%06d", pin); @@ -80,6 +84,8 @@ Bt* bt_alloc() { // Setup statusbar view port bt->statusbar_view_port = bt_statusbar_view_port_alloc(bt); + // Notification + bt->notification = furi_record_open("notification"); // Gui bt->gui = furi_record_open("gui"); gui_add_view_port(bt->gui, bt->statusbar_view_port, GuiLayerStatusBarLeft); @@ -288,6 +294,9 @@ int32_t bt_srv() { if(message.type == BtMessageTypeUpdateStatusbar) { // Update statusbar bt_statusbar_update(bt); + if(bt->status_changed_cb) { + bt->status_changed_cb(bt->status, bt->status_changed_ctx); + } } else if(message.type == BtMessageTypeUpdateBatteryLevel) { // Update battery level furi_hal_bt_update_battery_level(message.data.battery_level); diff --git a/applications/bt/bt_service/bt.h b/applications/bt/bt_service/bt.h index 9f609937..2adf0176 100644 --- a/applications/bt/bt_service/bt.h +++ b/applications/bt/bt_service/bt.h @@ -9,13 +9,20 @@ extern "C" { typedef struct Bt Bt; +typedef enum { + BtStatusOff, + BtStatusAdvertising, + BtStatusConnected, +} BtStatus; + typedef enum { BtProfileSerial, BtProfileHidKeyboard, } BtProfile; -/** - * Change BLE Profile +typedef void (*BtStatusChangedCallback)(BtStatus status, void* context); + +/** Change BLE Profile * @note Call of this function leads to 2nd core restart * * @param bt Bt instance @@ -25,6 +32,14 @@ typedef enum { */ bool bt_set_profile(Bt* bt, BtProfile profile); +/** Set callback for Bluetooth status change notification + * + * @param bt Bt instance + * @param callback BtStatusChangedCallback instance + * @param context pointer to context + */ +void bt_set_status_changed_callback(Bt* bt, BtStatusChangedCallback callback, void* context); + #ifdef __cplusplus } #endif diff --git a/applications/bt/bt_service/bt_api.c b/applications/bt/bt_service/bt_api.c index 9ff9017a..a4f67e04 100755 --- a/applications/bt/bt_service/bt_api.c +++ b/applications/bt/bt_service/bt_api.c @@ -13,3 +13,10 @@ bool bt_set_profile(Bt* bt, BtProfile profile) { return result; } + +void bt_set_status_changed_callback(Bt* bt, BtStatusChangedCallback callback, void* context) { + furi_assert(bt); + + bt->status_changed_cb = callback; + bt->status_changed_ctx = context; +} diff --git a/applications/bt/bt_service/bt_i.h b/applications/bt/bt_service/bt_i.h index 4961f041..2dad0683 100644 --- a/applications/bt/bt_service/bt_i.h +++ b/applications/bt/bt_service/bt_i.h @@ -12,17 +12,12 @@ #include #include #include +#include #include "../bt_settings.h" #define BT_API_UNLOCK_EVENT (1UL << 0) -typedef enum { - BtStatusOff, - BtStatusAdvertising, - BtStatusConnected, -} BtStatus; - typedef enum { BtMessageTypeUpdateStatusbar, BtMessageTypeUpdateBatteryLevel, @@ -51,6 +46,7 @@ struct Bt { BtStatus status; BtProfile profile; osMessageQueueId_t message_queue; + NotificationApp* notification; Gui* gui; ViewPort* statusbar_view_port; DialogsApp* dialogs; @@ -60,4 +56,6 @@ struct Bt { RpcSession* rpc_session; osEventFlagsId_t rpc_event; osEventFlagsId_t api_event; + BtStatusChangedCallback status_changed_cb; + void* status_changed_ctx; }; diff --git a/applications/debug_tools/ble_keyboard/ble_keyboard.c b/applications/debug_tools/ble_keyboard/ble_keyboard.c deleted file mode 100755 index 07854382..00000000 --- a/applications/debug_tools/ble_keyboard/ble_keyboard.c +++ /dev/null @@ -1,138 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include - -#define TAG "BleKeyboardApp" - -typedef enum { - EventTypeInput, -} EventType; - -typedef struct { - union { - InputEvent input; - }; - EventType type; -} BleKeyboardEvent; - -static void ble_keyboard_render_callback(Canvas* canvas, void* ctx) { - canvas_clear(canvas); - - canvas_set_font(canvas, FontPrimary); - canvas_draw_str(canvas, 0, 10, "BLE keypad demo"); - - canvas_set_font(canvas, FontSecondary); - canvas_draw_str(canvas, 0, 63, "Hold [back] to exit"); -} - -static void ble_keyboard_input_callback(InputEvent* input_event, void* ctx) { - osMessageQueueId_t event_queue = ctx; - - BleKeyboardEvent event; - event.type = EventTypeInput; - event.input = *input_event; - osMessageQueuePut(event_queue, &event, 0, osWaitForever); -} - -int32_t ble_keyboard_app(void* p) { - Bt* bt = furi_record_open("bt"); - if(!bt_set_profile(bt, BtProfileHidKeyboard)) { - FURI_LOG_E(TAG, "Failed to switch profile"); - furi_record_close("bt"); - return -1; - } - bool bt_turned_on = furi_hal_bt_is_active(); - if(!bt_turned_on) { - furi_hal_bt_start_advertising(); - } - - osMessageQueueId_t event_queue = osMessageQueueNew(8, sizeof(BleKeyboardEvent), NULL); - furi_check(event_queue); - ViewPort* view_port = view_port_alloc(); - - view_port_draw_callback_set(view_port, ble_keyboard_render_callback, NULL); - view_port_input_callback_set(view_port, ble_keyboard_input_callback, event_queue); - - // Open GUI and register view_port - Gui* gui = furi_record_open("gui"); - gui_add_view_port(gui, view_port, GuiLayerFullscreen); - - BleKeyboardEvent event; - while(1) { - osStatus_t event_status = osMessageQueueGet(event_queue, &event, NULL, osWaitForever); - - if(event_status == osOK) { - if(event.type == EventTypeInput) { - if(event.input.type == InputTypeLong && event.input.key == InputKeyBack) { - furi_hal_bt_hid_kb_release_all(); - break; - } - - if(event.input.key == InputKeyBack) { - if(event.input.type == InputTypePress) { - furi_hal_bt_hid_kb_press(KEY_ESC); - } else if(event.input.type == InputTypeRelease) { - furi_hal_bt_hid_kb_release(KEY_ESC); - } - } - - if(event.input.key == InputKeyOk) { - if(event.input.type == InputTypePress) { - furi_hal_bt_hid_kb_press(KEY_ENTER); - } else if(event.input.type == InputTypeRelease) { - furi_hal_bt_hid_kb_release(KEY_ENTER); - } - } - - if(event.input.key == InputKeyRight) { - if(event.input.type == InputTypePress) { - furi_hal_bt_hid_kb_press(KEY_RIGHT_ARROW); - } else if(event.input.type == InputTypeRelease) { - furi_hal_bt_hid_kb_release(KEY_RIGHT_ARROW); - } - } - - if(event.input.key == InputKeyLeft) { - if(event.input.type == InputTypePress) { - furi_hal_bt_hid_kb_press(KEY_LEFT_ARROW); - } else if(event.input.type == InputTypeRelease) { - furi_hal_bt_hid_kb_release(KEY_LEFT_ARROW); - } - } - - if(event.input.key == InputKeyDown) { - if(event.input.type == InputTypePress) { - furi_hal_bt_hid_kb_press(KEY_DOWN_ARROW); - } else if(event.input.type == InputTypeRelease) { - furi_hal_bt_hid_kb_release(KEY_DOWN_ARROW); - } - } - - if(event.input.key == InputKeyUp) { - if(event.input.type == InputTypePress) { - furi_hal_bt_hid_kb_press(KEY_UP_ARROW); - } else if(event.input.type == InputTypeRelease) { - furi_hal_bt_hid_kb_release(KEY_UP_ARROW); - } - } - } - } - view_port_update(view_port); - } - - if(bt_turned_on) { - furi_hal_bt_stop_advertising(); - } - // remove & free all stuff created by app - gui_remove_view_port(gui, view_port); - view_port_free(view_port); - osMessageQueueDelete(event_queue); - furi_record_close("gui"); - bt_set_profile(bt, BtProfileSerial); - furi_record_close("bt"); - return 0; -} diff --git a/applications/gui/canvas.c b/applications/gui/canvas.c old mode 100644 new mode 100755 index 5ab42875..96308315 --- a/applications/gui/canvas.c +++ b/applications/gui/canvas.c @@ -47,7 +47,7 @@ void canvas_reset(Canvas* canvas) { canvas_set_color(canvas, ColorBlack); canvas_set_font(canvas, FontSecondary); - canvas_set_font_direction(canvas, CanvasFontDirectionLeftToRight); + canvas_set_font_direction(canvas, CanvasDirectionLeftToRight); } void canvas_commit(Canvas* canvas) { @@ -115,7 +115,7 @@ void canvas_set_color(Canvas* canvas, Color color) { u8g2_SetDrawColor(&canvas->fb, color); } -void canvas_set_font_direction(Canvas* canvas, CanvasFontDirection dir) { +void canvas_set_font_direction(Canvas* canvas, CanvasDirection dir) { furi_assert(canvas); u8g2_SetFontDirection(&canvas->fb, dir); } @@ -304,6 +304,33 @@ void canvas_draw_disc(Canvas* canvas, uint8_t x, uint8_t y, uint8_t radius) { u8g2_DrawDisc(&canvas->fb, x, y, radius, U8G2_DRAW_ALL); } +void canvas_draw_triangle( + Canvas* canvas, + uint8_t x, + uint8_t y, + uint8_t base, + uint8_t height, + CanvasDirection dir) { + furi_assert(canvas); + if(dir == CanvasDirectionBottomToTop) { + canvas_draw_line(canvas, x - base / 2, y, x + base / 2, y); + canvas_draw_line(canvas, x - base / 2, y, x, y - height + 1); + canvas_draw_line(canvas, x, y - height + 1, x + base / 2, y); + } else if(dir == CanvasDirectionTopToBottom) { + canvas_draw_line(canvas, x - base / 2, y, x + base / 2, y); + canvas_draw_line(canvas, x - base / 2, y, x, y + height - 1); + canvas_draw_line(canvas, x, y + height - 1, x + base / 2, y); + } else if(dir == CanvasDirectionRightToLeft) { + canvas_draw_line(canvas, x, y - base / 2, x, y + base / 2); + canvas_draw_line(canvas, x, y - base / 2, x - height + 1, y); + canvas_draw_line(canvas, x - height + 1, y, x, y + base / 2); + } else if(dir == CanvasDirectionLeftToRight) { + canvas_draw_line(canvas, x, y - base / 2, x, y + base / 2); + canvas_draw_line(canvas, x, y - base / 2, x + height - 1, y); + canvas_draw_line(canvas, x + height - 1, y, x, y + base / 2); + } +} + void canvas_draw_xbm( Canvas* canvas, uint8_t x, diff --git a/applications/gui/canvas.h b/applications/gui/canvas.h old mode 100644 new mode 100755 index b197e928..ec8cf433 --- a/applications/gui/canvas.h +++ b/applications/gui/canvas.h @@ -47,11 +47,11 @@ typedef enum { /** Font Direction */ typedef enum { - CanvasFontDirectionLeftToRight, - CanvasFontDirectionTopToDown, - CanvasFontDirectionRightToLeft, - CanvasFontDirectionDownToTop, -} CanvasFontDirection; + CanvasDirectionLeftToRight, + CanvasDirectionTopToBottom, + CanvasDirectionRightToLeft, + CanvasDirectionBottomToTop, +} CanvasDirection; /** Font parameters */ typedef struct { @@ -116,7 +116,7 @@ void canvas_set_color(Canvas* canvas, Color color); * @param canvas Canvas instance * @param dir Direction font */ -void canvas_set_font_direction(Canvas* canvas, CanvasFontDirection dir); +void canvas_set_font_direction(Canvas* canvas, CanvasDirection dir); /** Invert drawing color * @@ -273,6 +273,23 @@ void canvas_draw_circle(Canvas* canvas, uint8_t x, uint8_t y, uint8_t r); */ void canvas_draw_disc(Canvas* canvas, uint8_t x, uint8_t y, uint8_t r); +/** Draw triangle with given base and height lengths and their intersection coordinate + * + * @param canvas Canvas instance + * @param x x coordinate of base and height intersection + * @param y y coordinate of base and height intersection + * @param base length of triangle side + * @param height length of triangle height + * @param dir CanvasDirection triangle orientaion + */ +void canvas_draw_triangle( + Canvas* canvas, + uint8_t x, + uint8_t y, + uint8_t base, + uint8_t height, + CanvasDirection dir); + /** Draw glyph * * @param canvas Canvas instance diff --git a/applications/gui/view_dispatcher.c b/applications/gui/view_dispatcher.c index 3cc59262..5c7397a1 100644 --- a/applications/gui/view_dispatcher.c +++ b/applications/gui/view_dispatcher.c @@ -258,7 +258,7 @@ void view_dispatcher_handle_input(ViewDispatcher* view_dispatcher, InputEvent* e if(view_dispatcher->current_view) { is_consumed = view_input(view_dispatcher->current_view, event); } - if(!is_consumed && event->type == InputTypeShort) { + if(!is_consumed && (event->type == InputTypeShort || event->type == InputTypeLong)) { // TODO remove view navigation handlers uint32_t view_id = VIEW_IGNORE; if(event->key == InputKeyBack) { diff --git a/assets/compiled/assets_icons.c b/assets/compiled/assets_icons.c index cfe0e39a..a9ed30fa 100644 --- a/assets/compiled/assets_icons.c +++ b/assets/compiled/assets_icons.c @@ -16,10 +16,10 @@ const uint8_t _A_BoxActive_128x51_0[] = {0x01,0x00,0x61,0x01,0x00,0x78,0x03,0xe0 const uint8_t _A_BoxActive_128x51_1[] = {0x01,0x00,0x8d,0x01,0x00,0x78,0x03,0xe0,0x1f,0x08,0x08,0x26,0x20,0x00,0xa3,0x84,0x47,0x81,0xef,0x10,0x80,0x83,0xce,0x09,0xe0,0x10,0x3c,0x43,0x33,0x33,0x83,0x83,0xca,0x01,0x0e,0x80,0x70,0x2f,0xe2,0xf4,0x92,0x52,0x43,0x45,0x02,0x0b,0x8c,0x02,0x61,0x80,0x04,0x14,0x3e,0x21,0x3c,0xbc,0x83,0xd2,0x40,0x43,0x18,0x04,0x18,0x9a,0x51,0x08,0x24,0x24,0x1e,0x5f,0xf8,0x08,0x3c,0x46,0x62,0x11,0x11,0xa8,0xc4,0x23,0x13,0x10,0x79,0x40,0x61,0xc0,0xf1,0x19,0x90,0xc4,0xc0,0x09,0x01,0x98,0x03,0xce,0x41,0x40,0x07,0x36,0x00,0xb8,0x31,0x14,0x39,0x50,0x02,0x82,0x0f,0x78,0x04,0x58,0x1e,0x69,0x47,0x07,0x94,0x60,0x1e,0x40,0x62,0x07,0xc1,0x6c,0x41,0xe9,0x88,0x04,0x15,0x02,0x10,0x0f,0x60,0x11,0x52,0x01,0xe6,0x38,0x30,0x30,0xe0,0x4c,0x02,0x0f,0x19,0x47,0x33,0x97,0x24,0xac,0xc2,0x81,0xe9,0x55,0x8a,0xc0,0x19,0x23,0x18,0x89,0x4a,0xa4,0xb4,0x58,0x48,0x3d,0x35,0x72,0xa8,0x04,0x68,0x3e,0x39,0x29,0x4c,0x97,0x93,0x08,0x07,0x8e,0x01,0x5a,0x3f,0xf8,0xbc,0x02,0xc8,0x3f,0x1a,0x94,0xa2,0x4b,0x51,0x84,0xa1,0xc6,0x80,0x0f,0x29,0x7c,0x03,0x09,0x01,0xc4,0x0f,0xc7,0xb1,0x4c,0x85,0x03,0xc7,0x81,0x3f,0x80,0x7f,0x83,0xe3,0x08,0x29,0x08,0x01,0x01,0xe3,0x20,0xe0,0x40,0xff,0xd0,0xa7,0x61,0x03,0xe0,0x3c,0x35,0x78,0x28,0x3c,0x4a,0xa2,0x0f,0x69,0x83,0x78,0x4b,0xc2,0x07,0x18,0x80,0x3e,0x93,0xe4,0xe0,0x70,0x79,0x4a,0x01,0xfd,0x18,0xc1,0x24,0x8b,0x00,0xf1,0x60,0x79,0x42,0x01,0xe2,0x5c,0x10,0x7c,0xc8,0x21,0x18,0xe8,0x04,0x2c,0x10,0x38,0x10,0x7b,0xd8,0x3f,0x1f,0x3f,0x01,0xbc,0x41,0xf3,0xa0,0x6d,0x0f,0xfe,0x17,0x80,0x80,0x09,0x04,0x1e,0xc3,0xc2,0x80,0x41,0x41,0xe3,0x72,0x07,0xbb,0x3c,0xa0,0x18,0x2a,0x3a,0x10,0x43,0xf7,0x7e,0xbe,0x03,0xdc,0xcc,0x40,0xf2,0x81,0x20,0x04,0x1f,0x2c,0x92,0x80,0x83,0xfc,0x06,0x2b,0x32,0x07,0xf8,0x00,0xcd,0x02,0xfa,0x10,0x79,0x44,0x30,0x00,0xfe,0xb0,0x03,0xf3,0xc5,0x11,0x8e,0x03,0xd8,0x6e,0x48,0x22,0xc2,0x7f,0xb0,0x60,0xe6,0x07,0xad,0xe0,0x4e,0x60,0x05,0x3b,0x88,0xbc,0x8b,0xc2,0x0f,0xa8,0x60,0x3f,0x20,0x9c,0x08,0x18,0x3f,0x67,0x00,0x43,0x4b,0x98,0x01,0x63,0x10,0x70,0x7e,0xf8,0x08,0x8a,0x64,0x20,0x05,0x03,0xe4,}; const uint8_t *_A_BoxActive_128x51[] = {_A_BoxActive_128x51_0,_A_BoxActive_128x51_1}; -const uint8_t _A_Box_128x51_0[] = {0x01,0x00,0x1c,0x01,0x00,0x7c,0x03,0xf1,0xff,0x83,0x83,0xf2,0x09,0x00,0x84,0x03,0xf2,0x05,0x00,0x88,0x03,0xf2,0x03,0x00,0x90,0x03,0xfc,0x08,0x38,0x0b,0xf8,0x3f,0x6c,0x18,0x00,0x30,0x83,0xee,0x30,0x46,0x20,0x03,0x7f,0x7f,0xf2,0xf3,0x21,0x80,0x44,0x00,0xd0,0x38,0x04,0xc0,0xc8,0x67,0x48,0x17,0xa0,0x10,0x41,0xfe,0x84,0x80,0x7f,0x83,0xcf,0x00,0x06,0x10,0x7f,0xa9,0x20,0x1f,0xe0,0xf4,0xaa,0x83,0xfb,0x55,0x02,0x07,0xed,0xfe,0x0b,0x40,0x07,0xe7,0xfe,0x04,0x0f,0xce,0x07,0xfc,0x3f,0x9c,0x0f,0x87,0xfe,0x07,0xc0,0x07,0xd4,0x82,0x13,0x40,0x80,0x9c,0x88,0x1f,0x11,0x08,0x50,0x18,0x70,0x00,0x71,0x07,0xc4,0x22,0x18,0x0f,0x27,0x90,0x83,0xe2,0x09,0x1c,0x07,0x94,0x10,0x1f,0x30,0x29,0xd0,0x3c,0xa1,0x00,0xfa,0xef,0xc1,0xc1,0xe2,0xe0,0x70,0x79,0x60,0xbf,0xff,0xf2,0xf8,0xac,0x1c,0x1e,0x5c,0x29,0xfd,0x60,0x1f,0x9a,0x48,0xde,0x80,0x5e,0x2a,0x07,0x07,0x95,0x62,0x3b,0x60,0x0f,0x88,0x3e,0xb6,0x10,0xac,0x06,0x07,0x00,0xa0,0x70,0x79,0x58,0x21,0xb0,0x0a,0x10,0x3e,0xf0,0x10,0xf8,0x04,0xf8,0x1c,0x2b,0x06,0x77,0x9c,0x7e,0x01,0x02,0x07,0xe4,0x68,0x0a,0x38,0x08,0x38,0x3e,0xae,0x80,0x51,0xd0,0x46,0x01,0xf5,0xe8,0x16,0x8e,0x82,0x40,0x0f,0xaf,0x85,0x0e,0x01,0x90,0xe0,0x17,0xe6,0x01,0xc0,0x93,0x83,0xc4,0x1c,0xc0,0xf4,0x80,0x5f,0xa0,0x18,0x80,0x7e,0x6f,0xa0,0x38,0x40,0x7e,0x55,0xa0,0xd8,0x30,0x7e,0x4a,0xbf,0x0a,0xe7,0x07,0xac,0x59,0xde,0x20,0xfc,0x85,0x03,0xe6,0x05,0x00,0x88,0x01,0x0c,0x1f,0x10,0x48,0x04,0x20,0x1f,0x9f,0x8f,0xfc,0x1c,0x1f,0x83,0x46,0x07,0xb8,}; -const uint8_t _A_Box_128x51_1[] = {0x01,0x00,0x3f,0x01,0x00,0x78,0x03,0xe0,0x1f,0x08,0x08,0x3f,0x61,0x11,0xe0,0x7e,0xc1,0x3c,0x02,0x0d,0x82,0x40,0x21,0xd0,0x0e,0x05,0xfc,0x1f,0x30,0x28,0x04,0x42,0x01,0x30,0xc0,0x08,0xe4,0x1e,0x32,0x02,0x18,0xc0,0x20,0xc0,0xf8,0xff,0xc0,0x41,0xe2,0x33,0x10,0x88,0x80,0x1e,0x03,0x0e,0x07,0x88,0xcc,0xc1,0xf1,0x30,0x07,0x98,0x0c,0x40,0x0d,0x80,0x2e,0x0c,0x44,0x26,0x30,0x0a,0x00,0x3e,0x60,0x11,0x60,0x7f,0x46,0x01,0xe4,0x06,0x20,0x7c,0x16,0xc4,0x1f,0xe8,0xd2,0x48,0x38,0xe0,0x81,0xe3,0x81,0x30,0x08,0x3f,0x2a,0xb1,0x58,0x04,0x1c,0x1f,0x7a,0xb9,0x54,0x02,0x34,0x0f,0x8c,0x02,0xb4,0x7f,0xf1,0x78,0x05,0x90,0x1e,0xc9,0x81,0xa0,0x03,0xca,0x5f,0x00,0xc2,0x10,0x18,0x1e,0x3c,0x09,0xfc,0x03,0xfc,0x1f,0x18,0x41,0x48,0x41,0xed,0x20,0xe0,0x40,0xff,0xd0,0xa6,0x80,0x89,0x44,0x1e,0xe1,0xe1,0xab,0xc1,0x41,0xe2,0xf1,0x60,0x68,0xcc,0x1b,0xc2,0x5e,0x10,0x38,0xbc,0x58,0x1e,0x84,0xb2,0xa0,0x3c,0x58,0x1e,0x52,0x80,0x7f,0x46,0x30,0x49,0x22,0xc0,0x3c,0x58,0x1e,0x50,0x80,0x78,0x97,0x04,0x1f,0x32,0x08,0x46,0x3a,0x01,0x0b,0x04,0x0e,0x04,0x1e,0xf6,0x0f,0xc7,0xcf,0xc0,0x6f,0x10,0x7c,0xe8,0x1b,0x43,0xff,0x85,0xe0,0x20,0x02,0x41,0x07,0xb0,0xf0,0xa0,0x10,0x50,0x78,0xdc,0x99,0xf5,0x00,0xc1,0x51,0xd0,0x82,0x1f,0xbb,0xf5,0xf0,0x1e,0xe6,0x62,0x07,0x94,0x09,0x00,0x20,0xf9,0x64,0x94,0x04,0x1f,0xe0,0x31,0x59,0x90,0x3f,0xc0,0x06,0x68,0x17,0xd0,0x83,0xca,0x21,0x80,0x07,0xf5,0x80,0x1f,0x9e,0x28,0x8c,0x70,0x1e,0xc3,0x72,0x41,0x16,0x13,0xfd,0x83,0x07,0x30,0x3d,0x6f,0x02,0x73,0x00,0x29,0xdc,0x45,0xe4,0x5e,0x10,0x7d,0x43,0x01,0xf9,0x04,0xe0,0x40,0xc1,0xfb,0x38,0x02,0x1a,0x5c,0xc0,0x0b,0x18,0x83,0x83,0xf7,0xc0,0x44,0x53,0x21,0x00,0x28,0x1f,0x20,}; -const uint8_t _A_Box_128x51_2[] = {0x01,0x00,0xf6,0x00,0x00,0x7c,0x03,0xf1,0xff,0x83,0x83,0xf2,0x09,0x00,0x84,0x03,0xf2,0x05,0x00,0x88,0x03,0xf2,0x03,0x00,0x90,0x03,0xfc,0x08,0x38,0x0b,0xf8,0x3f,0x6c,0x18,0x00,0x30,0x83,0xee,0x30,0x46,0x20,0x03,0x7f,0x7f,0xf2,0xf3,0x21,0x80,0x44,0x00,0xd0,0x38,0x04,0xc0,0xc8,0x67,0x48,0x17,0xa0,0x10,0x41,0xfe,0x84,0x80,0x7f,0x83,0xcf,0x00,0x06,0x10,0x7f,0xa9,0x20,0x1f,0xe0,0xf4,0xaa,0x83,0xfb,0x54,0x0f,0xea,0xfc,0x06,0x80,0x0f,0xcd,0xfc,0x00,0x1f,0x9c,0x07,0x70,0x83,0xf2,0x61,0x54,0x31,0x18,0x3e,0x57,0x85,0xa0,0x07,0xf7,0x00,0x1f,0xc2,0xfb,0xc0,0x45,0xc0,0xe8,0x0f,0x8a,0x04,0xe0,0x0e,0x50,0x20,0x7c,0xc8,0x3c,0x10,0x70,0x38,0xc1,0x01,0xf3,0x10,0xa0,0x5f,0x80,0xe2,0x43,0x20,0x7c,0x60,0x2a,0xc0,0x71,0x88,0x03,0xe4,0x34,0x32,0xb0,0x7f,0x07,0xc9,0xc0,0xe0,0xf4,0x95,0x21,0x4c,0x7f,0x30,0x0e,0xb8,0x1c,0x5a,0x0e,0x0f,0x2d,0x06,0x01,0x00,0x40,0xfa,0xe0,0x50,0x40,0xe4,0xb0,0x71,0xc9,0xc8,0xc1,0xfd,0x37,0x07,0x16,0x0c,0x1f,0x51,0xf0,0x79,0x63,0x01,0xf5,0x3f,0x07,0x96,0x40,0x1f,0x4b,0xe1,0x79,0x8d,0x80,0x1f,0x5f,0x85,0x68,0x93,0x9c,0x1e,0x9e,0x08,0x0c,0x20,0x1f,0x90,0x08,0x3c,0x18,0x1f,0xbf,0xe8,0x08,0x3f,0x62,0xc8,0xe8,0x07,0xac,0x28,0x1f,0x30,0x22,0xd8,0x81,0x0c,0x1f,0x10,0x48,0x03,0xf8,0x41,0xf7,0xf8,0xff,0xc1,0xc1,0xf8,0x34,0x60,0x7b,0x80,}; -const uint8_t _A_Box_128x51_3[] = {0x01,0x00,0x37,0x01,0x00,0x78,0x03,0xe0,0x1f,0x08,0x08,0x3f,0x61,0x11,0xe0,0x7e,0xc1,0x3c,0x02,0x0d,0x82,0x40,0x21,0xd0,0x0e,0x05,0xfc,0x1f,0x30,0x28,0x04,0x42,0x01,0x30,0xc0,0x08,0xe4,0x1e,0x32,0x02,0x18,0xc0,0x20,0xc0,0xf8,0xff,0xc0,0x41,0xe2,0x33,0x10,0x88,0x80,0x1e,0x03,0x0e,0x07,0x88,0xcc,0xc1,0xf1,0x30,0x07,0x98,0x0c,0x40,0x0d,0x80,0x2e,0x0c,0x44,0x26,0x30,0x0a,0x00,0x3e,0x60,0x11,0x60,0x7f,0x46,0x01,0xe4,0x06,0x20,0x7c,0x16,0xc4,0x1f,0xe8,0xd2,0x48,0x38,0xe0,0x81,0xe3,0x81,0x30,0x08,0x3f,0x2a,0xb1,0x58,0x04,0x1c,0x1f,0x7a,0xb9,0x54,0x02,0x34,0x0f,0x8c,0x02,0xb4,0x7f,0xf1,0x78,0x05,0x90,0x1e,0xc9,0x81,0xa0,0x03,0xca,0x5f,0x00,0xc2,0x10,0x18,0x1e,0x3c,0x09,0xfc,0x03,0xfc,0x1f,0x18,0x41,0x48,0x41,0xed,0x20,0xe0,0x40,0xff,0xd0,0xa6,0x80,0x89,0x44,0x1e,0xe1,0xe1,0xff,0xdf,0xc1,0xe2,0xf1,0x60,0x68,0xcc,0x1b,0xc4,0x07,0x27,0x8b,0x03,0xde,0x80,0xf1,0x60,0x79,0x4a,0x01,0xfd,0x18,0x07,0x9e,0x01,0xe2,0xc0,0xf2,0x35,0x20,0x3e,0x64,0x10,0x88,0x70,0x20,0xf0,0x20,0xf7,0xb0,0x7e,0x3e,0x60,0xfc,0xd0,0x36,0x85,0x42,0x20,0x01,0xc7,0x83,0xde,0x00,0x99,0x15,0x08,0x81,0x46,0xe2,0xcf,0xa5,0x08,0x88,0xc5,0x9f,0x01,0xf2,0x80,0x55,0x20,0xa0,0xf7,0x33,0x10,0x3c,0x7c,0x1a,0xf3,0x90,0x83,0xe5,0x92,0x35,0x0a,0xf8,0x34,0x41,0xf7,0xb0,0x97,0x81,0x44,0x1f,0x75,0x88,0xf8,0x3e,0x30,0x00,0x21,0x74,0x8e,0xa2,0x54,0x0f,0xda,0xc4,0x74,0x3f,0xd1,0xa0,0x7c,0x01,0xc9,0x04,0x21,0xf2,0x0b,0x90,0x3e,0x76,0x11,0xe0,0x7c,0xa2,0x44,0x5e,0x3c,0x08,0x98,0x3e,0xe1,0x87,0x23,0x07,0xc4,0x11,0xb8,0x60,0xfb,0x9c,0x01,0x0d,0x2e,0x60,0x05,0x8c,0x3a,0x84,0x1f,0x9e,0x02,0x22,0xbd,0xc8,0x01,0x40,0xf9,}; +const uint8_t _A_Box_128x51_0[] = {0x01,0x00,0x1f,0x01,0x00,0x7c,0x03,0xf1,0xff,0x83,0x83,0xf2,0x09,0x00,0x84,0x03,0xf2,0x05,0x00,0x88,0x03,0xf2,0x03,0x00,0x90,0x03,0xfc,0x08,0x38,0x0b,0xf8,0x3f,0x6c,0x18,0x00,0x30,0x83,0xee,0x30,0x46,0x20,0x03,0x7f,0x7f,0xf2,0xf3,0x21,0x80,0x44,0x00,0xd0,0x38,0x04,0xc0,0xc8,0x67,0x48,0x17,0xa0,0x10,0x41,0xfe,0x84,0x80,0x7f,0x83,0xcf,0x00,0x06,0x10,0x7f,0xa9,0x20,0x1f,0xe0,0xf4,0xaa,0x83,0xfb,0x55,0x02,0x07,0xed,0xfe,0x0b,0x40,0x07,0xe7,0xfe,0x04,0x0f,0xce,0x07,0xfc,0x3f,0x9c,0x0f,0x87,0xfe,0x07,0xc0,0x07,0xd4,0x82,0x13,0x40,0x80,0x9c,0x88,0x1f,0x11,0x08,0x50,0x18,0x70,0x00,0x71,0x07,0xc4,0x22,0x18,0x0f,0x27,0x90,0x83,0xe2,0x09,0x1c,0x07,0x94,0x10,0x1f,0x30,0x29,0xd0,0x3c,0xa1,0x00,0xfa,0xef,0xc1,0xc1,0xe2,0xe0,0x70,0x79,0x60,0xbf,0xff,0xf2,0xf8,0xac,0x1c,0x1e,0x5c,0x29,0xfd,0x60,0x1f,0x9a,0x48,0xde,0x80,0x5e,0x2a,0x07,0x07,0x95,0x62,0x3b,0x60,0x0f,0x88,0x3e,0xb6,0x10,0xac,0x06,0x07,0x00,0xa0,0x70,0x79,0x58,0x21,0xb0,0x0a,0x10,0x3e,0xf0,0x10,0xf8,0x04,0xf8,0x1c,0x2b,0x06,0x77,0x9c,0x7e,0x01,0x02,0x07,0xe4,0x68,0x0a,0x38,0x08,0x38,0x3e,0xae,0x80,0x51,0xd0,0x46,0x01,0xf5,0xe8,0x16,0x8e,0x82,0x40,0x0f,0x30,0x19,0x03,0xcf,0xe1,0x43,0x80,0x64,0x38,0x05,0xf9,0x80,0x70,0x24,0xe0,0xf1,0x07,0x30,0x3d,0x20,0x17,0xe8,0x06,0x20,0x1f,0x9b,0xe8,0x0e,0x10,0x1f,0x95,0x68,0x36,0x0c,0x1f,0x92,0xaf,0xc2,0xb9,0xc1,0xeb,0x16,0x77,0x88,0x3f,0x21,0x40,0xf9,0x81,0x40,0x22,0x00,0x43,0x07,0xc4,0x12,0x01,0x08,0x07,0xe7,0xe3,0xff,0x07,0x07,0xe0,0xd1,0x81,0xee,}; +const uint8_t _A_Box_128x51_1[] = {0x01,0x00,0x40,0x01,0x00,0x78,0x03,0xe0,0x1f,0x08,0x08,0x3f,0x61,0x11,0xe0,0x7e,0xc1,0x3c,0x02,0x0d,0x82,0x40,0x21,0xd0,0x0e,0x05,0xfc,0x1f,0x30,0x28,0x04,0x42,0x01,0x30,0xc0,0x08,0xe4,0x1e,0x32,0x02,0x18,0xc0,0x20,0xc0,0xf8,0xff,0xc0,0x41,0xe2,0x33,0x10,0x88,0x80,0x1e,0x03,0x0e,0x07,0x88,0xcc,0xc1,0xf1,0x30,0x07,0x98,0x0c,0x40,0x0d,0x80,0x2e,0x0c,0x44,0x26,0x30,0x0a,0x00,0x3e,0x60,0x11,0x60,0x7f,0x46,0x01,0xe4,0x06,0x20,0x7c,0x16,0xc4,0x1f,0xe8,0xd2,0x48,0x38,0xe0,0x81,0xe3,0x81,0x30,0x08,0x3f,0x2a,0xb1,0x58,0x04,0x1c,0x1f,0x7a,0xb9,0x54,0x02,0x34,0x0f,0x8c,0x02,0xb4,0x7f,0xf1,0x78,0x05,0x90,0x1e,0xc9,0x81,0xa0,0x03,0xca,0x5f,0x00,0xc2,0x10,0x18,0x1e,0x3c,0x09,0xfc,0x03,0xfc,0x1f,0x18,0x41,0x48,0x41,0xed,0x20,0xe0,0x40,0xff,0xd0,0xa6,0x80,0x89,0x44,0x1e,0xe1,0xe1,0xab,0xc1,0x41,0xe2,0xf1,0x60,0x68,0xcc,0x1b,0xc2,0x5e,0x10,0x38,0xbc,0x58,0x1e,0x84,0xb2,0xa0,0x3c,0x58,0x1e,0x52,0x80,0x7f,0x46,0x30,0x49,0x22,0xc0,0x3c,0x58,0x1e,0x50,0x80,0x78,0x97,0x04,0x1f,0x32,0x08,0x46,0x3a,0x01,0x0b,0x04,0x0e,0x04,0x1e,0xf6,0x0f,0xc7,0xcf,0xc0,0x6f,0x10,0x7c,0xe8,0x1b,0x43,0xff,0x85,0xe0,0x20,0x02,0x41,0x07,0xb0,0xf0,0xa0,0x10,0x50,0x78,0xdc,0x99,0xf5,0x00,0xc1,0x51,0xd0,0x82,0x1f,0xbb,0xf5,0xf0,0x1e,0xe6,0x62,0x07,0x94,0x09,0x00,0x20,0xf9,0x64,0x94,0x04,0x1f,0xe0,0x31,0x59,0x90,0x3f,0xc1,0xa6,0x68,0x17,0xd0,0x83,0xca,0x21,0x80,0x0f,0xb0,0x3d,0xec,0x00,0xfc,0xf1,0x44,0x63,0x80,0xf6,0x1b,0x92,0x08,0xb0,0x9f,0xec,0x18,0x39,0x81,0xeb,0x78,0x13,0x98,0x01,0x4e,0xe2,0x2f,0x22,0xf0,0x83,0xea,0x18,0x0f,0xc8,0x27,0x02,0x06,0x0f,0xd9,0xc0,0x10,0xd2,0xe6,0x00,0x58,0xc4,0x1c,0x1f,0xbe,0x02,0x22,0x99,0x08,0x01,0x40,0xf9,}; +const uint8_t _A_Box_128x51_2[] = {0x01,0x00,0xf9,0x00,0x00,0x7c,0x03,0xf1,0xff,0x83,0x83,0xf2,0x09,0x00,0x84,0x03,0xf2,0x05,0x00,0x88,0x03,0xf2,0x03,0x00,0x90,0x03,0xfc,0x08,0x38,0x0b,0xf8,0x3f,0x6c,0x18,0x00,0x30,0x83,0xee,0x30,0x46,0x20,0x03,0x7f,0x7f,0xf2,0xf3,0x21,0x80,0x44,0x00,0xd0,0x38,0x04,0xc0,0xc8,0x67,0x48,0x17,0xa0,0x10,0x41,0xfe,0x84,0x80,0x7f,0x83,0xcf,0x00,0x06,0x10,0x7f,0xa9,0x20,0x1f,0xe0,0xf4,0xaa,0x83,0xfb,0x54,0x0f,0xea,0xfc,0x06,0x80,0x0f,0xcd,0xfc,0x00,0x1f,0x9c,0x07,0x70,0x83,0xf2,0x61,0x54,0x31,0x18,0x3e,0x57,0x85,0xa0,0x07,0xf7,0x00,0x1f,0xc2,0xfb,0xc0,0x45,0xc0,0xe8,0x0f,0x8a,0x04,0xe0,0x0e,0x50,0x20,0x7c,0xc8,0x3c,0x10,0x70,0x38,0xc1,0x01,0xf3,0x10,0xa0,0x5f,0x80,0xe2,0x43,0x20,0x7c,0x60,0x2a,0xc0,0x71,0x88,0x03,0xe4,0x34,0x32,0xb0,0x7f,0x07,0xc9,0xc0,0xe0,0xf4,0x95,0x21,0x4c,0x7f,0x30,0x0e,0xb8,0x1c,0x5a,0x0e,0x0f,0x2d,0x06,0x01,0x00,0x40,0xfa,0xe0,0x50,0x40,0xe4,0xb0,0x32,0x99,0x8e,0x4e,0x46,0x0f,0x66,0x7b,0xcd,0xc1,0xc5,0x83,0x07,0xd4,0x7c,0x1e,0x58,0xc0,0x7d,0x4f,0xc1,0xe5,0x90,0x07,0xd2,0xf8,0x5e,0x63,0x60,0x07,0xd7,0xe0,0xb2,0x24,0xe7,0x07,0xa7,0x82,0x03,0x08,0x07,0xe4,0x02,0x0f,0x06,0x07,0xef,0xfa,0x02,0x0f,0xd8,0xb2,0x3a,0x01,0xeb,0x0a,0x07,0xcc,0x09,0x6a,0x60,0x41,0x07,0xc4,0x12,0x00,0xfe,0x10,0x7d,0xfe,0x3f,0xf0,0x70,0x7e,0x0d,0x18,0x1e,0xe0,}; +const uint8_t _A_Box_128x51_3[] = {0x01,0x00,0x3c,0x01,0x00,0x78,0x03,0xe0,0x1f,0x08,0x08,0x3f,0x61,0x11,0xe0,0x7e,0xc1,0x3c,0x02,0x0d,0x82,0x40,0x21,0xd0,0x0e,0x05,0xfc,0x1f,0x30,0x28,0x04,0x42,0x01,0x30,0xc0,0x08,0xe4,0x1e,0x32,0x02,0x18,0xc0,0x20,0xc0,0xf8,0xff,0xc0,0x41,0xe2,0x33,0x10,0x88,0x80,0x1e,0x03,0x0e,0x07,0x88,0xcc,0xc1,0xf1,0x30,0x07,0x98,0x0c,0x40,0x0d,0x80,0x2e,0x0c,0x44,0x26,0x30,0x0a,0x00,0x3e,0x60,0x11,0x60,0x7f,0x46,0x01,0xe4,0x06,0x20,0x7c,0x16,0xc4,0x1f,0xe8,0xd2,0x48,0x38,0xe0,0x81,0xe3,0x81,0x30,0x08,0x3f,0x2a,0xb1,0x58,0x04,0x1c,0x1f,0x7a,0xb9,0x54,0x02,0x34,0x0f,0x8c,0x02,0xb4,0x7f,0xf1,0x78,0x05,0x90,0x1e,0xc9,0x81,0xa0,0x03,0xca,0x5f,0x00,0xc2,0x10,0x18,0x1e,0x3c,0x09,0xfc,0x03,0xfc,0x1f,0x18,0x41,0x48,0x41,0xed,0x20,0xe0,0x40,0xff,0xd0,0xa6,0x80,0x89,0x44,0x1e,0xe1,0xe1,0xff,0xdf,0xc1,0xe2,0xf1,0x60,0x68,0xcc,0x1b,0xc4,0x07,0x27,0x8b,0x03,0xde,0x80,0xf1,0x60,0x79,0x4a,0x01,0xfd,0x18,0x07,0x9e,0x01,0xe2,0xc0,0xf2,0x35,0x20,0x3e,0x64,0x10,0x88,0x70,0x20,0xf0,0x20,0xf7,0xb0,0x7e,0x3e,0x60,0xfc,0xd0,0x36,0x85,0x42,0x20,0x01,0xc7,0x83,0xde,0x00,0x99,0x15,0x08,0x81,0x46,0xe2,0xcf,0xa5,0x08,0x88,0xc5,0x9f,0x01,0xf2,0x80,0x55,0x20,0xa0,0xf7,0x33,0x10,0x3c,0x7c,0x1a,0xf3,0x90,0x83,0xe5,0x92,0x35,0x0a,0xf8,0x34,0x41,0xf7,0xb0,0x97,0x81,0x44,0x1f,0x75,0x88,0xf8,0x3d,0x81,0xa3,0x80,0x02,0x0b,0xa4,0x75,0x12,0xa0,0xfc,0x03,0xd2,0xb1,0x1d,0x07,0xee,0xa2,0x34,0x0f,0x80,0x39,0x20,0x84,0x3e,0x41,0x72,0x07,0xce,0xc2,0x3c,0x0f,0x94,0x48,0x8b,0xc7,0x81,0x13,0x07,0xdc,0x30,0xe4,0x60,0xf8,0x82,0x37,0x0c,0x1f,0x73,0x80,0x21,0xa5,0xcc,0x00,0xb1,0x87,0x50,0x83,0xf3,0xc0,0x44,0x57,0xb9,0x00,0x28,0x1f,0x20,}; const uint8_t *_A_Box_128x51[] = {_A_Box_128x51_0,_A_Box_128x51_1,_A_Box_128x51_2,_A_Box_128x51_3}; const uint8_t _A_CardBad_128x51_0[] = {0x01,0x00,0x01,0x01,0x00,0x78,0x03,0xc0,0x1e,0x00,0xf8,0x07,0xfc,0x00,0x33,0xf0,0x75,0x60,0x01,0xe5,0x7f,0x07,0xde,0x4e,0x49,0x49,0xb9,0x03,0xfe,0x01,0x82,0x04,0x0c,0x4a,0x01,0x70,0x8f,0x01,0x46,0x08,0x0f,0x5e,0x30,0x24,0x60,0x50,0x0c,0x44,0x88,0x1f,0x1a,0xaa,0x64,0xeb,0xaf,0x71,0x84,0x48,0xb1,0x93,0xb8,0x39,0x3d,0x72,0x55,0x2a,0x50,0x04,0x6e,0x12,0x2a,0x96,0x28,0x3e,0x20,0xf4,0xc1,0x03,0xcf,0x01,0x22,0xa1,0x03,0xf0,0x7e,0x21,0xf9,0xc6,0x52,0xea,0x57,0x22,0xf8,0xe3,0x21,0x63,0xf6,0x00,0x1d,0x01,0x3f,0xd3,0x05,0x7f,0x83,0xfc,0x1f,0xe0,0xf5,0xcf,0xfc,0xee,0x77,0xe0,0x5b,0x7e,0x28,0x10,0x18,0x25,0x02,0x7f,0xf9,0x93,0x87,0xde,0x11,0x00,0x07,0x8e,0x82,0xff,0xfc,0xc7,0x83,0xe2,0xb9,0x19,0x83,0xf4,0x01,0xf5,0x78,0xa9,0x69,0x60,0x9f,0x01,0x7d,0xd4,0xb7,0xa0,0xf1,0x27,0xd0,0x3c,0x70,0xa0,0xf1,0x37,0xd0,0xfc,0xc1,0xf6,0x00,0x30,0x7f,0xf0,0x01,0xff,0xff,0x83,0xfe,0x01,0xfb,0xf9,0xf0,0x83,0xf6,0x19,0xc6,0x07,0xb0,0xe8,0xe0,0x34,0x0f,0xfc,0x1b,0x90,0x0f,0x69,0x80,0x0c,0xa0,0x5a,0x0f,0xfc,0xd8,0x1e,0xf1,0x80,0x19,0x41,0x3a,0x05,0xd1,0xfe,0x03,0xec,0xff,0x51,0x8b,0x84,0x8a,0x04,0x0f,0xcc,0x44,0x4a,0x0c,0x0f,0xd8,0x54,0x38,0x1f,0xb0,0x68,0xf0,0x7f,0xc7,0xfe,0x5f,0xf0,0x7e,0x1f,0xfc,0x1f,0xd3,0x85,0xf9,0x83,0xe8,0x14,0x70,0x1f,0x00,0x10,0xa7,0xe0,0xf5,0x05,0x18,0x25,0x40,0x1e,0x00,0xf0,0x07,0x80,0x28,}; @@ -107,8 +107,8 @@ const uint8_t _A_Level1ReadActive_128x51_0[] = {0x01,0x00,0x06,0x02,0x00,0x2e,0x const uint8_t _A_Level1ReadActive_128x51_1[] = {0x01,0x00,0x06,0x02,0x00,0x2e,0x03,0xff,0x03,0x07,0xe7,0x82,0x01,0x30,0x07,0xe4,0x72,0x01,0xc0,0x07,0xe4,0x18,0x04,0x30,0x10,0x10,0xfe,0x3f,0xff,0xfb,0xf8,0x3d,0x47,0xa5,0x07,0x21,0x8c,0x7c,0x0a,0x3b,0x82,0x72,0xc0,0x84,0x44,0x31,0x41,0xb2,0xf0,0x05,0x85,0x0c,0xa0,0x06,0x50,0x1e,0x96,0x00,0x19,0x43,0x2c,0x12,0x02,0x74,0x06,0x8e,0x11,0x20,0x90,0x83,0xe0,0xf8,0x71,0x89,0x07,0x83,0xb8,0x00,0x10,0x7a,0xc4,0x00,0x67,0x30,0x90,0x49,0x40,0x02,0x48,0x20,0xd9,0xf0,0x0d,0x43,0x10,0x88,0x03,0xea,0x40,0x4b,0x10,0xfd,0xc3,0x03,0x62,0x43,0x12,0xf8,0x83,0xca,0xaa,0x0f,0x69,0x70,0x3c,0x6f,0x0b,0xe9,0x07,0x8c,0xf6,0x01,0x38,0x9e,0x03,0xe6,0x09,0x90,0x9f,0x83,0xc7,0xdc,0x03,0x14,0xc0,0xa7,0xd6,0x09,0xf0,0x07,0x97,0xfe,0x1e,0xf7,0x2f,0xe0,0x3d,0x60,0x13,0xe6,0xc8,0xdf,0xfe,0x0e,0xe1,0xff,0xc1,0xc1,0xeb,0xe0,0x80,0xf8,0x25,0xfc,0x09,0xfb,0xf5,0xc1,0xe3,0x18,0x83,0xc7,0xae,0x84,0xe9,0x07,0x8c,0x22,0x19,0x00,0xf0,0x03,0xed,0xba,0x2f,0x91,0x4d,0x28,0x01,0x20,0x40,0x43,0x25,0x28,0x3e,0x44,0x82,0x00,0x88,0x18,0xf8,0x40,0x03,0x06,0x05,0xaf,0xfb,0xc2,0xeb,0x18,0x1c,0x78,0x48,0xb2,0x01,0x98,0xe0,0x20,0x73,0xf6,0xd8,0xc0,0x62,0x7d,0x84,0xe0,0xc0,0xd1,0xe5,0x30,0x07,0x8a,0xd0,0xe0,0x31,0x18,0x07,0xeb,0x8f,0x03,0xa0,0x02,0x86,0x4e,0x0f,0x3a,0x06,0x03,0x03,0xf1,0x8f,0xe6,0x3f,0xf0,0x1b,0x00,0x68,0x81,0xe7,0xc0,0xe0,0x01,0x06,0xa1,0x1b,0xe7,0x8f,0x44,0x34,0x40,0xf2,0xfc,0x7f,0xdc,0xa5,0x10,0x87,0xdf,0x3f,0xd2,0x10,0x78,0xe8,0x01,0xe3,0xe7,0xff,0xd0,0xc1,0xe5,0xa4,0x83,0xdc,0x3c,0x60,0xf2,0xa8,0x0b,0x07,0xfe,0x34,0x1b,0x07,0x02,0x01,0xf4,0xff,0xfa,0x7f,0xa0,0xf2,0x94,0x0f,0xcf,0x31,0x77,0x1b,0x0f,0xf3,0xf3,0xff,0xc3,0xd8,0x47,0x22,0x44,0x1e,0x07,0x88,0xea,0x37,0x20,0x78,0xf1,0x02,0x23,0x83,0xe0,0xcf,0xe0,0x17,0x06,0xa0,0xa9,0x8a,0xaa,0x0f,0x1f,0x23,0xbc,0x78,0x30,0x18,0x1b,0x90,0xd4,0xc5,0x59,0x01,0x08,0x7c,0x7c,0x16,0x18,0x38,0x28,0x41,0xeb,0xd1,0x01,0x0e,0x10,0x1e,0x33,0x18,0x20,0xa8,0x41,0xeb,0x81,0x01,0x0f,0x18,0x1e,0x31,0x08,0x44,0x13,0xff,0x7f,0x07,0x9e,0x00,0xc6,0x5c,0x20,0x79,0xff,0xe0,0xf2,0x08,0x0e,0x00,0xbc,0x37,0xf0,0x79,0x7a,0x01,0xe3,0x30,0x84,0x07,0x05,0x10,0x20,0x01,0xfe,0x45,0x46,0xa4,0x88,0x1d,0x04,0xc3,0x10,0xbf,0x4f,0xec,0x0d,0x68,0x20,0xf1,0x94,0x83,0xe1,0xc8,0x50,0x10,0x78,0xce,0x5b,0xa2,0x0f,0x37,0x7a,0x58,0x21,0x28,0x81,0x96,0xc0,0x26,0x15,0x00,0x79,0x28,0x44,0x82,0x56,0x08,0x54,0x09,0xca,0x2d,0xa1,0xb0,0x61,0x37,0x7f,0xf9,0x8a,0x04,0xf4,0x10,0xd8,0x37,0x03,0x85,0x01,0xa8,0x54,0x30,0x81,0xd1,0x00,0x14,0x0d,0xe2,0x30,0xb8,0x67,0xc3,0x81,0x37,0xa8,0x57,0x13,0x24,0x00,0x23,0xf8,0x88,0x47,0xf1,0x7c,0x03,0x0f,0x46,0xde,0x0f,0x50,0x01,0xf8,0x1d,0x25,0xff,0xf0,0x85,0xc4,0x00,0x40,}; const uint8_t *_A_Level1ReadActive_128x51[] = {_A_Level1ReadActive_128x51_0,_A_Level1ReadActive_128x51_1}; -const uint8_t _A_Level1Read_128x51_0[] = {0x01,0x00,0xa4,0x01,0x00,0x2e,0x03,0xff,0x03,0x07,0xe7,0x82,0x01,0x30,0x07,0xe4,0x72,0x01,0xc0,0x07,0xe4,0x18,0x04,0x30,0x10,0x7d,0x8f,0x4a,0x0e,0x4e,0xb8,0x10,0x89,0x00,0x11,0xc0,0x16,0x14,0x30,0x1f,0x56,0x00,0x19,0x03,0xee,0x80,0x03,0x28,0x40,0x3e,0x8f,0x87,0x18,0x07,0xd4,0x40,0x06,0xc0,0x07,0x8c,0x70,0x21,0xe0,0xfd,0xb0,0x03,0x44,0x1f,0x70,0xc9,0x04,0x81,0x81,0x90,0xc8,0x84,0xb8,0x1f,0xd3,0xd8,0x04,0xe0,0x1f,0x50,0x4c,0x84,0xfc,0x1f,0xe0,0xff,0x07,0xed,0x82,0x3f,0xe0,0x97,0x83,0xee,0x31,0x07,0x8f,0x5d,0x01,0xf7,0x08,0x6e,0x8f,0x80,0x1f,0x6d,0xd2,0xc0,0x40,0x41,0xf3,0x02,0x02,0x1c,0x1c,0x1f,0xc2,0x41,0x00,0x44,0x0c,0x08,0x70,0x60,0x5a,0xff,0xbc,0x31,0xf0,0x7a,0x89,0x0a,0x40,0x33,0x1c,0x04,0x0e,0x7e,0xdb,0x12,0x50,0xf6,0x21,0xe1,0x41,0xf8,0x7f,0xff,0xed,0x41,0xc0,0x05,0x46,0xc0,0x5a,0x3f,0xd7,0x1e,0x07,0x40,0x02,0x8c,0x9c,0x1e,0x74,0x03,0x52,0x7f,0xe0,0x36,0x00,0xd1,0x03,0xcf,0x81,0xc0,0x09,0x90,0x14,0x47,0xa2,0x06,0x30,0x78,0xfe,0x3f,0xe1,0x82,0x0f,0x0d,0xff,0xfd,0x21,0x02,0x8e,0x80,0x1e,0x3e,0x7f,0xfd,0x0c,0x1e,0x58,0x0c,0x3c,0x3f,0xc6,0x0f,0x2a,0x80,0x98,0x7f,0xe3,0x41,0x07,0x96,0xc3,0xfd,0xff,0xfe,0x83,0xca,0x50,0x3f,0x3c,0xc4,0xdc,0x86,0x58,0x0f,0xfe,0x1e,0xc2,0x39,0x1e,0x78,0x20,0x7c,0x47,0x51,0x99,0x12,0x0a,0x71,0xf8,0xc1,0xf0,0x67,0xf0,0x0b,0x81,0xa4,0x54,0xc5,0x15,0x01,0x0f,0x82,0x7f,0xe0,0xe0,0xc0,0x54,0xc2,0x79,0x25,0x31,0x46,0x41,0xe5,0x20,0xf0,0x58,0x60,0xe0,0xa1,0x07,0xac,0x44,0x04,0x33,0x00,0x78,0xcc,0x60,0x82,0xa1,0x07,0xac,0x06,0xe1,0x00,0x8e,0x03,0xc6,0x21,0x08,0x82,0x21,0x04,0x1e,0x66,0x21,0xe0,0x70,0x60,0xe0,0xf3,0xff,0x81,0x46,0x02,0x67,0x10,0xa0,0xa7,0x49,0x58,0x3e,0x09,0x84,0x20,0x38,0x2b,0x92,0x80,0x7f,0x0b,0xc4,0x40,0x2d,0x04,0xc3,0x10,0xbf,0x4f,0xec,0x0f,0x41,0x08,0x07,0xdb,0x90,0xa1,0x20,0xf2,0x86,0x48,0x01,0xe6,0xef,0x40,0x7a,0x42,0xa6,0x15,0x00,0x79,0x28,0x44,0x82,0x56,0x08,0x53,0x7c,0xa0,0xb5,0x0b,0x06,0x13,0x77,0xff,0x98,0xa0,0x4f,0x41,0x0d,0x07,0x94,0x1e,0xa1,0x50,0xc2,0x07,0x44,0x00,0x50,0x37,0x88,0xc2,0xdb,0xe4,0x2e,0x1a,0xe2,0x64,0x80,0x04,0x7f,0x18,0x0c,0x40,0x66,0x5f,0x8e,0x8d,0xbc,0x1e,0xa0,0x02,0xf8,0x00,0x86,0x70,0x17,0x1f,0x08,0xe4,0x40,0x04,}; -const uint8_t _A_Level1Read_128x51_1[] = {0x01,0x00,0xb0,0x01,0x00,0x2e,0x03,0xff,0x03,0x07,0xe7,0x82,0x01,0x30,0x07,0xe4,0x72,0x01,0xc0,0x07,0xe4,0x18,0x04,0x30,0x10,0x7d,0x8f,0x4a,0x0e,0x4e,0xb8,0x10,0x89,0x00,0x11,0xc0,0x16,0x14,0x30,0x1f,0x56,0x00,0x19,0x03,0xee,0x80,0x03,0x28,0x40,0x3e,0x8f,0x87,0x18,0x07,0xd4,0x40,0x06,0xc0,0x07,0x8c,0x70,0x23,0xe0,0xfd,0x90,0x48,0x01,0xf9,0x0c,0x88,0x03,0xc5,0x81,0x70,0xcc,0x84,0x9c,0x1f,0xbd,0x09,0x74,0x02,0x70,0x0f,0xa8,0x27,0x42,0x5e,0x0f,0xdf,0x80,0x3f,0xe7,0xe0,0xfd,0xf0,0x47,0xfc,0x02,0x11,0x07,0xd4,0x62,0x0f,0x1e,0xba,0x03,0xee,0x10,0xdd,0x1f,0x00,0x3e,0xdb,0xa5,0x80,0x80,0x83,0xe6,0x04,0x04,0x38,0x38,0x3f,0x84,0x82,0x00,0x88,0x18,0x10,0xe0,0xc0,0xb5,0xff,0x78,0x5d,0x62,0x0f,0x41,0x21,0x48,0x06,0x63,0x80,0x81,0xcf,0xdb,0x62,0x4a,0x1e,0xc4,0x3c,0x28,0x3f,0x0f,0xff,0xfd,0xa8,0x38,0x00,0xa8,0xd8,0x0b,0x47,0xfa,0xe3,0xc0,0xe8,0x00,0x51,0x73,0x08,0x3c,0xa8,0x00,0xf3,0xcc,0x7f,0xe0,0x36,0x00,0xd1,0x03,0xcf,0x81,0xc0,0x09,0x94,0x6f,0x9e,0x3d,0x10,0x31,0x03,0xcb,0xf1,0xff,0x0c,0x14,0x02,0x1f,0x7c,0xff,0x48,0x40,0xa3,0xa0,0x07,0x8f,0x9f,0xff,0x43,0x07,0x96,0x02,0x0f,0x70,0xf1,0x83,0xca,0xa0,0x2c,0x1f,0xf8,0xd0,0x41,0xe4,0x5b,0x1f,0x4f,0xf4,0x1e,0x52,0x81,0xf9,0xe6,0x2e,0xe0,0x31,0xfe,0x7e,0x7f,0xf8,0x7b,0x08,0xe4,0x48,0x83,0xc0,0xf1,0x1d,0x46,0xe4,0x15,0x1e,0x38,0x44,0x70,0x7c,0x19,0xfc,0x02,0xe0,0x69,0x15,0x31,0x55,0x42,0xa2,0xed,0x1f,0x07,0x06,0x02,0xa6,0x13,0xc9,0x29,0x8a,0xb3,0x00,0x9c,0x1c,0x87,0xc1,0x61,0x83,0x82,0x84,0x1e,0xbd,0x13,0x68,0x91,0x87,0xc1,0x31,0x82,0x0a,0x84,0x1e,0xb8,0x14,0x99,0x03,0xc6,0x21,0x08,0x82,0x7f,0xef,0xe0,0xf3,0xc0,0x28,0xcc,0x1e,0x7f,0xf8,0x3c,0x82,0x03,0x80,0x2f,0x0d,0xfc,0x1e,0x44,0xf2,0x98,0x42,0x03,0x82,0xb9,0x23,0x40,0xc5,0x46,0xa4,0xbb,0x1d,0x04,0xc3,0x10,0xbf,0x4f,0xec,0x0d,0x68,0x20,0xfb,0x72,0x14,0x04,0x1e,0x33,0x80,0x88,0x83,0xcd,0xde,0x96,0x08,0x4a,0x20,0x65,0x90,0x09,0x85,0x40,0x1e,0x4a,0x11,0x20,0x95,0x82,0x14,0x63,0x1f,0x33,0x68,0x6c,0x18,0x4d,0xdf,0xfe,0x62,0x81,0x3d,0x04,0x35,0x10,0x3c,0x38,0x0d,0x42,0xa1,0x84,0x0e,0x88,0x00,0xa0,0x6f,0x11,0x85,0xc3,0x38,0x1c,0x19,0xbd,0x42,0xb8,0x99,0x20,0x01,0x1f,0xc4,0x9a,0x57,0x00,0x30,0xf4,0x6d,0xe0,0xf5,0x00,0x1f,0x82,0x3e,0xe9,0x1f,0xff,0x84,0x2e,0x20,0x02,}; +const uint8_t _A_Level1Read_128x51_0[] = {0x01,0x00,0xa4,0x01,0x00,0x2e,0x03,0xff,0x03,0x07,0xe7,0x82,0x01,0x30,0x07,0xe4,0x72,0x01,0xc0,0x07,0xe4,0x18,0x04,0x30,0x10,0x7d,0x8f,0x4a,0x0e,0x4e,0xb8,0x10,0x89,0x00,0x11,0xc0,0x16,0x14,0x30,0x1f,0x56,0x00,0x19,0x03,0xee,0x80,0x03,0x28,0x40,0x3e,0x8f,0x87,0x18,0x07,0xd4,0x40,0x06,0xc0,0x07,0x8c,0x70,0x21,0xe0,0xfd,0xb0,0x03,0x44,0x1f,0x70,0xc9,0x04,0x81,0x81,0x90,0xc8,0x84,0xb8,0x1f,0xd3,0xd8,0x04,0xe0,0x1f,0x50,0x4c,0x80,0x3f,0xe7,0xe0,0xff,0x07,0xed,0x82,0x3f,0xe0,0x97,0x83,0xee,0x31,0x07,0x8f,0x5d,0x01,0xf7,0x08,0x6e,0x8f,0x80,0x1f,0x6d,0xd2,0xc0,0x40,0x41,0xf3,0x02,0x02,0x1c,0x1c,0x1f,0xc2,0x41,0x00,0x44,0x0c,0x08,0x70,0x60,0x5a,0xff,0xbc,0x31,0xf0,0x7a,0x89,0x0a,0x40,0x33,0x1c,0x04,0x0e,0x7e,0xdb,0x12,0x50,0xf6,0x21,0xe1,0x41,0xf8,0x7f,0xff,0xed,0x41,0xc0,0x05,0x46,0xc0,0x5a,0x3f,0xd7,0x1e,0x07,0x40,0x02,0x8c,0x9c,0x1e,0x74,0x03,0x52,0x7f,0xe0,0x36,0x00,0xd1,0x03,0xcf,0x81,0xc0,0x09,0x90,0x14,0x47,0xa2,0x06,0x30,0x78,0xfe,0x3f,0xe1,0x82,0x0f,0x0d,0xff,0xfd,0x21,0x02,0x8e,0x80,0x1e,0x3e,0x7f,0xfd,0x0c,0x1e,0x58,0x0c,0x3c,0x3f,0xc6,0x0f,0x2a,0x80,0x98,0x7f,0xe3,0x41,0x07,0x96,0xc3,0xfd,0xff,0xfe,0x83,0xca,0x50,0x3f,0x3c,0xc4,0xdc,0x86,0x58,0x0f,0xfe,0x1e,0xc2,0x39,0x1e,0x78,0x20,0x7c,0x47,0x51,0x99,0x12,0x0a,0x71,0xf8,0xc1,0xf0,0x67,0xf0,0x0b,0x81,0xa4,0x54,0xc5,0x15,0x01,0x0f,0x82,0x7f,0xe0,0xe0,0xc0,0x54,0xc2,0x79,0x25,0x31,0x46,0x41,0xe5,0x20,0xf0,0x58,0x60,0xe0,0xa1,0x07,0xac,0x44,0x04,0x33,0x00,0x78,0xcc,0x60,0x82,0xa1,0x07,0xac,0x06,0xe1,0x00,0x8e,0x03,0xc6,0x21,0x08,0x82,0x21,0x04,0x1e,0x66,0x21,0xe0,0x70,0x60,0xe0,0xf3,0xff,0x81,0x46,0x02,0x67,0x10,0xa0,0xa7,0x49,0x58,0x3e,0x09,0x84,0x20,0x38,0x2b,0x92,0x80,0x7f,0x0b,0xc4,0x40,0x2d,0x04,0xc3,0x10,0xbf,0x4f,0xec,0x0f,0x41,0x08,0x07,0xdb,0x90,0xa1,0x20,0xf2,0x86,0x48,0x01,0xe6,0xef,0x40,0x7a,0x42,0xa6,0x15,0x00,0x79,0x28,0x44,0x82,0x56,0x08,0x53,0x7c,0xa0,0xb5,0x0b,0x06,0x13,0x77,0xff,0x98,0xa0,0x4f,0x41,0x0d,0x07,0x94,0x1e,0xa1,0x50,0xc2,0x07,0x44,0x00,0x50,0x37,0x88,0xc2,0xdb,0xe4,0x2e,0x1a,0xe2,0x64,0x80,0x04,0x7f,0x18,0x0c,0x40,0x66,0x5f,0x8e,0x8d,0xbc,0x1e,0xa0,0x02,0xf8,0x00,0x86,0x70,0x17,0x1f,0x08,0xe4,0x40,0x04,}; +const uint8_t _A_Level1Read_128x51_1[] = {0x01,0x00,0xb2,0x01,0x00,0x2e,0x03,0xff,0x03,0x07,0xe7,0x82,0x01,0x30,0x07,0xe4,0x72,0x01,0xc0,0x07,0xe4,0x18,0x04,0x30,0x10,0x7d,0x8f,0x4a,0x0e,0x4e,0xb8,0x10,0x89,0x00,0x11,0xc0,0x16,0x14,0x30,0x1f,0x56,0x00,0x19,0x03,0xee,0x80,0x03,0x28,0x40,0x3e,0x8f,0x87,0x18,0x07,0xd4,0x40,0x06,0xc0,0x07,0x8c,0x70,0x23,0xe0,0xfd,0x90,0x48,0x01,0xf9,0x0c,0x88,0x03,0xc5,0x81,0x70,0xcc,0x84,0x9c,0x1f,0xbd,0x09,0x74,0x02,0x70,0x0f,0xa8,0x27,0x42,0x5e,0x0f,0xdf,0x80,0x7f,0xbe,0x13,0xf0,0x7e,0xf8,0x23,0xfe,0x01,0x88,0x83,0xea,0x31,0x07,0x8f,0x5d,0x01,0xf7,0x08,0x6e,0x8f,0x80,0x1f,0x6d,0xd2,0xc0,0x40,0x41,0xf3,0x02,0x02,0x1c,0x1c,0x1f,0xc2,0x41,0x00,0x44,0x0c,0x08,0x70,0x60,0x5a,0xff,0xbc,0x2e,0xb1,0x07,0xa0,0x90,0xa4,0x03,0x31,0xc0,0x40,0xe7,0xed,0xb1,0x25,0x0f,0x62,0x1e,0x14,0x1f,0x87,0xff,0xfe,0xd4,0x1c,0x00,0x54,0x6c,0x05,0xa3,0xfd,0x71,0xe0,0x74,0x00,0x28,0xb9,0x84,0x1e,0x54,0x00,0x79,0xe6,0x3f,0xf0,0x1b,0x00,0x68,0x81,0xe7,0xc0,0xe0,0x04,0xca,0x37,0xcf,0x1e,0x88,0x18,0x81,0xe5,0xf8,0xff,0x86,0x0a,0x01,0x0f,0xbe,0x7f,0xa4,0x20,0x51,0xd0,0x03,0xc7,0xcf,0xff,0xa1,0x83,0xcb,0x01,0x07,0xb8,0x78,0xc1,0xe5,0x50,0x16,0x0f,0xfc,0x68,0x20,0xf2,0x2d,0x8f,0xa7,0xfa,0x0f,0x29,0x40,0xfc,0xf3,0x17,0x70,0x18,0xff,0x3f,0x3f,0xfc,0x3d,0x84,0x72,0x24,0x41,0xe0,0x78,0x8e,0xa3,0x72,0x0a,0x8f,0x1c,0x22,0x38,0x3e,0x0c,0xfe,0x01,0x70,0x34,0x8a,0x98,0xaa,0xa1,0x51,0x76,0x8f,0x83,0x83,0x01,0x53,0x09,0xe4,0x94,0xc5,0x59,0x80,0x4e,0x0e,0x43,0xe0,0xb0,0xc1,0xc1,0x42,0x0f,0x5e,0x89,0xb4,0x48,0xc3,0xe0,0x98,0xc1,0x05,0x42,0x0f,0x5c,0x0a,0x4c,0x81,0xe3,0x10,0x84,0x41,0x3f,0xf7,0xf0,0x79,0xe0,0x14,0x66,0x0f,0x3f,0xfc,0x1e,0x41,0x01,0xc0,0x17,0x86,0xfe,0x0f,0x22,0x79,0x4c,0x21,0x01,0xc1,0x5c,0x91,0xa0,0x62,0xa3,0x52,0x5d,0x8e,0x82,0x61,0x88,0x5f,0xa7,0xf6,0x06,0xb4,0x10,0x7d,0xb9,0x0a,0x02,0x0f,0x19,0xc0,0x44,0x41,0xe6,0xef,0x4b,0x04,0x25,0x10,0x32,0xc8,0x04,0xc2,0xa0,0x0f,0x25,0x08,0x90,0x4a,0xc1,0x0a,0x31,0x8f,0x99,0xb4,0x36,0x0c,0x26,0xef,0xff,0x31,0x40,0x9e,0x82,0x1a,0x88,0x1e,0x1c,0x06,0xa1,0x50,0xc2,0x07,0x44,0x00,0x50,0x37,0x88,0xc2,0xe1,0x9c,0x0e,0x0c,0xde,0xa1,0x5c,0x4c,0x90,0x00,0x8f,0xe2,0x4d,0x2b,0x80,0x18,0x7a,0x36,0xf0,0x7a,0x80,0x0f,0xc1,0x1f,0x74,0x8f,0xff,0xc2,0x17,0x10,0x01,0x00,}; const uint8_t *_A_Level1Read_128x51[] = {_A_Level1Read_128x51_0,_A_Level1Read_128x51_1}; const uint8_t _A_Level1ToysActive_128x51_0[] = {0x01,0x00,0xe5,0x01,0x00,0x78,0x03,0xc0,0x0d,0xf0,0xff,0x80,0x16,0x7e,0x0f,0x68,0x40,0x1d,0xa8,0x00,0x21,0xff,0x04,0xcc,0x1f,0x3c,0x08,0x1f,0x82,0x02,0x0f,0xbb,0x80,0x10,0x60,0xe0,0xf2,0xf1,0xcb,0x3c,0x31,0x8b,0x3c,0x24,0x1e,0x51,0xc0,0x60,0xc3,0x00,0x43,0x88,0xca,0x48,0xa4,0x3a,0x58,0xa0,0x3c,0xe0,0xc0,0xc1,0x09,0x16,0x23,0x2f,0x24,0x90,0xef,0x64,0x80,0xf3,0x81,0x83,0x06,0x60,0x0f,0x2c,0x84,0xa2,0x43,0x85,0xa2,0x03,0xcb,0x00,0x4c,0x2b,0x00,0xfc,0xf8,0xc3,0xf1,0x9b,0xc3,0x81,0xe3,0xc0,0x3a,0x29,0x7c,0xa4,0x20,0x53,0xa0,0x06,0xc8,0xe4,0x20,0x93,0xe0,0x48,0x00,0xa2,0x4b,0x1a,0x00,0x14,0xa0,0x18,0x03,0xfd,0x03,0xd0,0x86,0x20,0xf8,0x2d,0x90,0x00,0x41,0xe3,0x88,0x07,0xbc,0x40,0x1f,0xd1,0x81,0x68,0xab,0x86,0x04,0x0f,0x1e,0x66,0x36,0x73,0x30,0xcb,0xe3,0x2f,0x34,0x91,0xc0,0xc8,0x02,0x42,0x0f,0x2a,0x95,0x4a,0x94,0xb3,0x1a,0x95,0x08,0x1e,0x5f,0x08,0x88,0x3c,0xeb,0xc0,0xf1,0xc8,0x65,0x3b,0xd3,0x30,0x79,0x5e,0x24,0x47,0x72,0xc4,0x50,0x81,0xe3,0xa0,0xca,0x50,0xa1,0x00,0xf3,0x93,0x40,0x3c,0xd0,0xfc,0x45,0x33,0x25,0x49,0x8c,0x79,0xc7,0xe3,0x4e,0x07,0x8f,0xe2,0xcf,0x00,0xfe,0x46,0x0f,0xe9,0x04,0x01,0x0d,0x21,0xf6,0x20,0xf1,0xc0,0x47,0xe4,0x00,0xa2,0x07,0xa5,0x18,0x06,0x3f,0x89,0x3f,0xc1,0xc2,0x25,0x11,0x3f,0xb0,0x3c,0xa6,0x69,0x31,0x9c,0x3d,0x48,0x1e,0xe6,0xf2,0x80,0x6f,0xff,0xe0,0x06,0x9f,0x83,0xc6,0xc0,0x42,0x1e,0x04,0x7e,0x09,0xe0,0x83,0x6c,0x35,0x58,0x1b,0x5e,0x02,0x0c,0x0c,0x1c,0x04,0x3e,0x01,0xe0,0x87,0xc0,0xac,0x10,0x5a,0x85,0x56,0x83,0xd5,0xc0,0x41,0x51,0x43,0xc0,0x57,0x8f,0xc2,0x07,0x02,0xd8,0x41,0xb7,0x1a,0xae,0x06,0xa8,0x3e,0x20,0xf1,0xa0,0x48,0x0f,0xe2,0xb1,0x1a,0x84,0x36,0xb1,0xd5,0xb0,0xd5,0x70,0x21,0xf2,0x07,0x0c,0x03,0xfc,0x0f,0x1d,0x44,0x2b,0x51,0xaa,0xd0,0x10,0x46,0x0c,0xec,0x19,0x05,0x03,0x01,0xff,0x8f,0xc0,0x6a,0x81,0xf2,0xb0,0x07,0xca,0x0a,0x74,0x2e,0x04,0x04,0x1e,0x3a,0xa0,0xfb,0x0b,0xc5,0x4c,0x3f,0x0c,0x04,0x5e,0x03,0x56,0x8a,0x87,0xce,0x83,0x05,0x54,0x14,0x13,0xfd,0xff,0x8c,0x40,0x75,0x71,0xa0,0xf8,0x97,0xc7,0x81,0x0a,0x07,0x97,0xe3,0xff,0x00,0xc6,0x14,0x86,0x3e,0x1f,0x1c,0x05,0x56,0x81,0x0d,0x81,0xad,0x93,0x1c,0x03,0x20,0xb1,0x4f,0xc3,0xe2,0xc8,0x5c,0x3b,0x39,0xe1,0xa0,0xf4,0xc0,0x60,0x41,0xec,0x1f,0x6f,0x85,0x00,0x3f,0xb3,0xe0,0x7b,0xf0,0x20,0xc0,0xf3,0xe8,0x47,0xc3,0xf0,0x5e,0x4f,0xc4,0x7f,0x80,0xb1,0x10,0xfa,0x83,0xd3,0xc0,0x0c,0x2f,0x07,0xfc,0x00,0x2c,0xb1,0xe0,0x05,0x56,0x7e,0x2d,0x54,0x08,0xdf,0xc1,0x0b,0x3c,0x1f,0x30,0x01,0xef,0x00,0xfe,0xb8,0x03,0xfb,0xc0,0x0f,0xee,0x03,0x15,0x40,0x06,}; @@ -186,12 +186,6 @@ const uint8_t _A_Level3Lab_128x51_1[] = {0x01,0x00,0x9f,0x02,0x00,0x1e,0x20,0x04 const uint8_t _A_Level3Lab_128x51_2[] = {0x01,0x00,0xa6,0x02,0x00,0x1e,0x20,0x04,0x34,0x00,0x39,0xfc,0x3f,0xff,0xf9,0xff,0xf8,0x06,0x3f,0xfc,0xb8,0x3c,0xff,0x10,0x1d,0x84,0x04,0x26,0x59,0xef,0x27,0xe7,0xf7,0xbf,0x07,0x9c,0x1a,0x0d,0xb0,0xc4,0xc4,0x28,0x58,0x80,0x79,0x08,0x04,0x1e,0x70,0x18,0x40,0xdc,0x41,0xeb,0x07,0xfe,0x43,0xc1,0xe3,0x80,0xf8,0x44,0x03,0xef,0x81,0xe1,0xdf,0xc1,0xe3,0x40,0x86,0x48,0xc1,0xe5,0x47,0xc4,0x13,0xc6,0xfe,0x4b,0x3a,0x04,0x82,0x05,0x44,0x17,0x90,0x3c,0xe7,0xf2,0x08,0x07,0x02,0x07,0xf0,0x90,0x40,0x69,0x01,0xf4,0xcf,0x4f,0x23,0xe0,0xf1,0x80,0x41,0xe1,0x11,0x1b,0x0e,0x20,0x7e,0xb3,0xc8,0x7c,0x40,0x1e,0x31,0xe8,0x46,0x47,0x21,0x90,0x2f,0xac,0xf2,0x0e,0x0f,0x2f,0xe4,0x27,0x23,0x68,0xc8,0x83,0xcf,0x39,0x9e,0xde,0x40,0xcf,0x03,0x40,0xfa,0xc2,0xc1,0xe5,0xfc,0xe4,0xc4,0x41,0xe2,0x4f,0x14,0x41,0x6a,0x21,0xff,0x71,0x70,0x8b,0xc7,0x90,0x0f,0x5f,0xe4,0x02,0xeb,0x00,0xa7,0x44,0x09,0xe3,0xf0,0x0f,0x91,0xbc,0x41,0xa3,0x03,0xd1,0xc3,0xa0,0x14,0xc3,0x79,0x0f,0xcb,0xc4,0x0f,0x2c,0x07,0xe2,0xa9,0x07,0x07,0x92,0x3c,0x7f,0x86,0xf1,0x07,0x95,0xf2,0x81,0x04,0xd4,0xc6,0x01,0xe2,0xaf,0x20,0xfa,0x83,0xc7,0xe5,0x5a,0x48,0x8d,0x31,0x9e,0x5e,0x04,0x79,0xff,0xaf,0xf2,0x08,0x4c,0xd5,0x82,0x34,0xc7,0x79,0x5f,0x11,0xe6,0x0f,0x1d,0x04,0x52,0x35,0x80,0x81,0x03,0xc6,0x0d,0x06,0xff,0x63,0xc1,0xe5,0x92,0x9b,0xe4,0x2c,0x51,0xbc,0x00,0x7c,0x9c,0x63,0x03,0xfe,0x03,0xd7,0x24,0x1f,0x15,0x80,0xc0,0x56,0x83,0x03,0xf4,0x43,0xc0,0x83,0x92,0xff,0x83,0xcf,0x01,0xff,0x39,0x09,0x04,0x40,0xa2,0xfc,0x1c,0x94,0x7f,0x2f,0xea,0x07,0x8d,0x82,0x01,0x3f,0x80,0x60,0x04,0x43,0x80,0x8f,0xc0,0x3f,0xd1,0xfc,0xd4,0x12,0x33,0x80,0xbf,0x40,0x2f,0x0b,0xd1,0x19,0x17,0xfa,0x43,0x01,0x86,0x49,0x7f,0x30,0xcc,0x06,0x06,0x03,0xe0,0x80,0x78,0x01,0xe4,0x20,0x1f,0xf4,0x3e,0x55,0x02,0x83,0x5f,0x20,0x11,0x2e,0x04,0x07,0xd1,0x71,0x07,0x8c,0x02,0x11,0x08,0x83,0x51,0x7f,0x9f,0x32,0x60,0xc1,0x07,0xa3,0xc8,0xe0,0x7f,0xcb,0xe3,0x0c,0x07,0x8e,0x0a,0x0f,0x06,0x0b,0x90,0x3c,0x6d,0x00,0x51,0x75,0x88,0x3c,0x95,0x24,0x0f,0x24,0x00,0xda,0x22,0x10,0x08,0xf4,0x0e,0x09,0x08,0x83,0xa3,0x04,0x00,0x59,0x8e,0x38,0x3c,0x4e,0x83,0x1f,0x25,0x0c,0xfa,0x06,0x0f,0x4f,0x81,0x3c,0x67,0xc8,0xe1,0x3f,0x0c,0x1a,0x45,0x03,0x32,0x08,0x3c,0xa7,0x1e,0x0c,0x0c,0xd6,0x00,0x50,0x18,0x1c,0x1a,0x54,0x0f,0x58,0x77,0xc2,0x83,0x18,0x80,0x71,0x23,0x30,0xe8,0x18,0x7c,0x8a,0x02,0x12,0x18,0x1f,0xc2,0x40,0x0f,0x1f,0x44,0x65,0xa6,0x23,0xf1,0x07,0x8c,0x08,0x7c,0x23,0x01,0x90,0x19,0x47,0xe1,0x0c,0x07,0x8e,0x20,0x1e,0x51,0xc2,0xc0,0xc0,0x27,0xd1,0x08,0x64,0xc2,0xf1,0xc6,0x07,0xaf,0x83,0xfe,0x31,0x18,0x78,0x3c,0x7b,0x17,0x8c,0x36,0x1e,0x03,0x88,0x82,0x9b,0x8c,0x24,0x30,0x78,0x44,0x13,0x0d,0x3c,0x81,0x29,0x44,0x1e,0xdf,0xc1,0x40,0xc1,0xf8,0x79,0xf8,0x7e,0x02,0x3b,0x88,0x29,0x88,0x00,0xff,0xe5,0xc1,0x81,0xdc,0x3f,0xd1,0x8c,0x04,0x4f,0x11,0x61,0x17,0x21,0x40,0x6f,0x10,0x29,0x85,0xfe,0x60,0x0f,0x1c,0x86,0x84,0x96,0x20,0x01,0xfc,0x3c,0x44,0x78,0x39,0x8f,0x3d,0x83,0x81,0x12,0xc8,0x50,0x5d,0xa4,0xb9,0x10,0x18,0x83,0xc7,0xb1,0xc3,0xe0,0xd0,0x23,0xda,0x08,0x0c,0x24,0x9a,0x40,0xf2,0x8f,0x40,0xbf,0x1c,0x0c,0x0d,0x86,0x28,0x0f,0x18,0x90,0x2c,0x7f,0xc0,0xf2,0x87,0x40,0xaf,0x1c,0x08,0x1c,0x82,0x18,0xe7,0x18,0xa0,0x2c,0x7d,0x00,0xf2,0x87,0xc0,0x6e,0x2c,0x51,0x5a,0x0a,0x04,0x41,0xe5,0x54,0xee,0xc0,0x78,0x50,0x78,0x0d,0xe0,0x1e,0x33,0x03,0x08,0x83,0xcf,0x51,0xaa,0x80,0xec,0x20,0x60,0xf4,0xe0,0x07,0xd7,0xab,0x81,0xc1,0xc0,0x60,0x33,0xcc,0x04,0xfe,0x60,0x6a,0x10,0xfa,0xc0,0xff,0x0d,0x31,0x8e,0x07,0xc7,0xe1,0xff,}; const uint8_t *_A_Level3Lab_128x51[] = {_A_Level3Lab_128x51_0,_A_Level3Lab_128x51_1,_A_Level3Lab_128x51_2}; -const uint8_t _I_LevelUp2_07_0[] = {0x01,0x00,0xf1,0x00,0x00,0x37,0xf2,0x02,0x0f,0xd8,0x3c,0xfc,0x1d,0x9c,0x0e,0x0f,0x84,0x1f,0x96,0x0b,0x86,0x00,0x61,0x91,0x88,0xc4,0x02,0x06,0x0f,0xb8,0x24,0x32,0x01,0x02,0x07,0xe4,0x1a,0x00,0x01,0x10,0x05,0x41,0xbc,0x70,0xf1,0x08,0x80,0x2a,0x05,0x19,0x88,0x42,0x01,0xf7,0x83,0xe6,0xc9,0xca,0x22,0x00,0xaf,0xfe,0x92,0xdf,0x10,0x07,0xde,0x07,0xaf,0x5f,0x98,0x03,0xee,0x03,0xd4,0xef,0x48,0x01,0xfb,0x9f,0x07,0xe5,0x24,0x1e,0x34,0x00,0x7e,0x65,0x3a,0xe0,0xfc,0xa5,0xcb,0x29,0x00,0xfc,0x81,0x76,0x2f,0xf8,0x00,0x7e,0x4f,0xe8,0x60,0xfc,0xfd,0x7c,0x70,0x20,0xfc,0x86,0x03,0x4a,0x02,0xdf,0xb4,0x19,0x83,0xea,0x07,0x00,0x6f,0x08,0x3e,0xb0,0x00,0xb1,0x7f,0x08,0x3e,0xb8,0x00,0x21,0x83,0x83,0xed,0x76,0x3e,0x01,0xfe,0x4c,0x30,0x11,0xf0,0x7e,0x44,0x2f,0xc5,0xfd,0xf8,0x17,0xc4,0x5f,0xa3,0xfe,0xb0,0x40,0x27,0x80,0xfc,0xe0,0x7f,0xc6,0x04,0x9f,0xb8,0x82,0xbf,0xa3,0x00,0xfe,0x5e,0x88,0x3f,0xc1,0xfa,0xcd,0x10,0x7e,0xc1,0x01,0x74,0x0f,0xf0,0x07,0x80,0x3c,0x00,0x38,0x8d,0xf4,0x92,0x09,0x5f,0xfa,0x41,0x62,0xa0,0xf8,0xc1,0x03,0xc6,0x83,0x14,0x82,0x03,0xe3,0x30,0x0f,0xed,0x46,0x78,0x1e,0x38,0xff,0x90,0x3e,0x79,0x01,0xf2,0xc0,0xc4,0x81,0xf2,0x3f,0x38,0x0c,0x45,0x07,0x38,0x89,0xf4,0x6e,0xf9,0x1f,0xf8,0xdf,0x43,0xf0,0x00,0xf0,0x07,0x80,0x2c,}; -const uint8_t *_I_LevelUp2_07[] = {_I_LevelUp2_07_0}; - -const uint8_t _I_LevelUp2_06_0[] = {0x01,0x00,0x11,0x01,0x00,0x37,0xf2,0x02,0x0f,0xd8,0x3c,0xfc,0x1d,0x9c,0x0e,0x0f,0x84,0x17,0x18,0x00,0x19,0x58,0x2e,0x18,0x01,0x84,0xc1,0x80,0x43,0x18,0x8c,0x40,0x20,0x60,0xf8,0x86,0x00,0x86,0x08,0x03,0x18,0x10,0xfe,0xe0,0x82,0x31,0x12,0x95,0xe0,0x65,0x3e,0x38,0x78,0x94,0xa1,0xc0,0xf8,0x81,0x46,0x62,0x10,0x80,0x29,0x03,0xe3,0x07,0xcd,0x93,0x94,0x44,0x01,0x5f,0xfd,0x25,0xbe,0x20,0x0f,0xbc,0x0f,0x5e,0xbf,0x30,0x07,0xdc,0x07,0xa9,0xde,0x90,0x03,0xf7,0x3e,0x0f,0xca,0x48,0x3c,0x68,0x00,0xfc,0xca,0x75,0xc1,0xf9,0x4b,0x96,0x52,0x01,0xf9,0x02,0xec,0x5f,0xdc,0xc6,0x0f,0x99,0xfd,0x0c,0x1e,0x5c,0x00,0x7c,0x7e,0xbe,0x38,0x10,0xf9,0xac,0xc8,0x00,0x36,0x07,0x91,0x83,0x4a,0x02,0x2f,0xa7,0x61,0x03,0xe1,0xaa,0x70,0x31,0x51,0x07,0xeb,0x00,0x0b,0x17,0xf0,0x83,0xe8,0xb0,0x50,0x70,0x7d,0xae,0xc7,0xc0,0x4f,0xc9,0x86,0x02,0x3e,0x0f,0xc8,0x85,0xf8,0xbf,0x40,0x02,0xf8,0x17,0xc4,0x5f,0xa3,0xfe,0x51,0x0c,0xf0,0x1f,0x9c,0x0f,0xf8,0xc0,0x81,0xf0,0xc5,0x28,0x80,0xfd,0x19,0xc8,0x00,0x48,0xc0,0x3e,0xd8,0x04,0x09,0x31,0x7c,0x0e,0xc8,0x1e,0xaa,0x61,0x66,0x23,0xfc,0xcf,0xfb,0x00,0x82,0x02,0xe8,0x1f,0xe0,0x0f,0x00,0x78,0x00,0x71,0x1b,0xe9,0x24,0x12,0xbf,0xf4,0x82,0xc5,0x41,0xf1,0x82,0x07,0x8d,0x06,0x29,0x04,0x07,0xc6,0x60,0x1f,0xda,0x8c,0xf0,0x3c,0x71,0xff,0x20,0x7c,0xf2,0x03,0xe5,0x81,0x89,0x03,0xe4,0x7e,0x70,0x18,0x8a,0x0e,0x71,0x13,0xe8,0xdd,0xf2,0x3f,0xf1,0xbe,0x87,0xe0,0x01,0xe0,0x0f,0x00,0x58,}; -const uint8_t *_I_LevelUp2_06[] = {_I_LevelUp2_06_0}; - const uint8_t _I_LevelUp2_04_0[] = {0x01,0x00,0x16,0x01,0x00,0x37,0xf2,0x02,0x0f,0xda,0xbc,0xfc,0x1d,0x9c,0x0f,0x5f,0xac,0x1f,0x97,0x0b,0xaf,0x54,0x61,0x9b,0x8d,0xd6,0xaa,0x06,0x0f,0xba,0xa5,0x76,0xaa,0x0f,0xcd,0x66,0xbb,0x55,0x06,0x07,0xdd,0x5b,0xef,0x5f,0x86,0x83,0xef,0x55,0xbb,0xdd,0x42,0x81,0xf7,0xd7,0xee,0xdd,0xe3,0xa0,0xfb,0xff,0xeb,0xbd,0xf1,0xa0,0x7d,0xf5,0x7a,0xf5,0xf9,0xa8,0x36,0x60,0x90,0x0d,0x5f,0xfb,0xfd,0x2a,0xb0,0x03,0xe2,0x39,0x00,0xaa,0xf5,0x7b,0xf7,0x59,0xc0,0x3e,0x26,0x10,0x0f,0x5f,0xfb,0x7f,0x6a,0x84,0x0f,0xea,0xba,0x40,0x1a,0xa9,0x3e,0xfd,0x7a,0xef,0x57,0xa9,0x3f,0x9d,0xdb,0xff,0x55,0x3f,0x9b,0xff,0x5e,0xa8,0x1f,0x7f,0xef,0xaf,0x57,0xab,0xf1,0x07,0xd3,0x78,0x40,0x03,0x01,0x06,0xc4,0x08,0x7e,0x35,0x50,0x00,0x83,0xe6,0x1c,0x9f,0x10,0xfe,0x46,0x30,0x01,0xd1,0xae,0x87,0xea,0x01,0xc0,0x0e,0x8e,0xbc,0x3f,0x50,0x0b,0x05,0x57,0xea,0x21,0x1e,0x08,0x3e,0x76,0x07,0xf1,0x10,0x8e,0x06,0x06,0x0f,0x8a,0x85,0xfc,0xbf,0x90,0x0f,0x81,0x7f,0x60,0x17,0x01,0xf9,0x83,0xe7,0x81,0xe1,0xd5,0x6f,0x83,0xf7,0x70,0xe0,0x7f,0xea,0xe3,0xfc,0x30,0x10,0xff,0x20,0x15,0x82,0xfe,0xc0,0x35,0x01,0xff,0x0f,0xf6,0xb0,0x3f,0xd5,0x40,0xff,0x87,0xc8,0x1d,0x40,0x0f,0x00,0x76,0x23,0x7d,0x24,0x82,0x57,0xfe,0x90,0x58,0xa8,0x3e,0x30,0x40,0xf1,0xa0,0xc5,0x20,0x80,0xf8,0xcc,0x03,0xfb,0x51,0x9e,0x07,0x8e,0x3f,0xe4,0x0f,0x9e,0x40,0x7c,0xb0,0x31,0x20,0x7c,0x8f,0xce,0x03,0x11,0x82,0x17,0xe6,0x7d,0x1b,0xbe,0x47,0xfe,0x37,0xd0,0xfc,0x00,0x3c,0x01,0xe0,0x0b,}; const uint8_t *_I_LevelUp2_04[] = {_I_LevelUp2_04_0}; @@ -201,33 +195,39 @@ const uint8_t *_I_LevelUp2_05[] = {_I_LevelUp2_05_0}; const uint8_t _I_LevelUp2_01_0[] = {0x01,0x00,0xdc,0x00,0x00,0x37,0xe2,0x02,0x0f,0xd8,0x3c,0xfc,0x1d,0x9c,0x08,0x0f,0x80,0x1f,0x96,0x08,0x06,0x00,0x61,0x91,0x80,0x10,0xc0,0xc1,0xf7,0x04,0x01,0x0c,0x08,0x1f,0xd0,0x60,0x7d,0x83,0x0a,0x18,0x0f,0xb1,0x61,0x42,0x01,0xf7,0x03,0xf8,0x41,0xca,0x44,0x00,0x98,0x0f,0x62,0x09,0x10,0x07,0xe5,0xa2,0x19,0x30,0x07,0xe7,0xb2,0x11,0x20,0x07,0xe7,0x92,0x1e,0x0f,0xe8,0x5d,0x00,0x1f,0x9a,0x48,0x78,0x3f,0x20,0x7e,0xc0,0x7e,0xc0,0xbf,0x10,0x7c,0x00,0x3f,0x3c,0x10,0x30,0x7e,0x80,0x84,0x1f,0x85,0x34,0x6f,0xe8,0x3f,0x20,0x60,0xfd,0xc0,0x02,0xcc,0x1f,0x5c,0x08,0x03,0x34,0x81,0xf4,0xbb,0x18,0x70,0x3f,0x26,0x18,0x02,0x01,0x03,0xea,0x21,0x7e,0x1f,0xef,0xc2,0x07,0x10,0x17,0xec,0x02,0x3c,0x0f,0xcb,0x07,0x00,0x18,0x46,0xfb,0xbf,0xa7,0xf8,0x7c,0x40,0xfc,0x8c,0x03,0xfa,0x10,0x0f,0xf0,0x7f,0x43,0x01,0xfd,0x04,0x05,0xd0,0x3f,0xc0,0x1e,0x00,0xf0,0x00,0xe2,0x37,0xd2,0x48,0x25,0x7f,0xe9,0x05,0x8a,0x83,0xe3,0x04,0x0f,0x1a,0x0c,0x52,0x08,0x0f,0x8c,0xc0,0x3f,0xb5,0x19,0xe0,0x78,0xe3,0xfe,0x40,0xf9,0xe4,0x07,0xcb,0x03,0x12,0x07,0xc8,0xfc,0xe0,0x31,0x14,0x1c,0xe2,0x27,0xd1,0xbb,0xe4,0x7f,0xe3,0x7d,0x0f,0xc0,0x03,0xc0,0x1e,0x00,0xb0,}; const uint8_t *_I_LevelUp2_01[] = {_I_LevelUp2_01_0}; -const uint8_t _I_LevelUp2_02_0[] = {0x01,0x00,0xe1,0x00,0x00,0x37,0xe2,0x02,0x0f,0xda,0xbc,0xfc,0x1d,0x9c,0x0d,0x5f,0xa8,0x1f,0x97,0x0a,0xaf,0x54,0x61,0x9b,0x8d,0x56,0xaa,0x06,0x0f,0xba,0xa5,0x56,0xaa,0x0f,0xcd,0x60,0x7c,0x60,0xc0,0xfb,0xab,0x07,0xc6,0x1a,0x0f,0xb0,0xf0,0xea,0xa1,0x47,0xec,0xfa,0xd5,0xe3,0xa0,0xfb,0xd5,0xfe,0xb5,0xd1,0xa0,0x7d,0xd5,0x6f,0xb5,0xd9,0xa8,0x7f,0x3d,0xda,0xa9,0x50,0x7f,0x3e,0xb5,0xfb,0xa8,0x7f,0x75,0x76,0xa0,0xff,0x55,0x43,0xfb,0xaf,0x70,0x65,0x5b,0xfb,0x57,0xea,0xa7,0xf3,0xd5,0xab,0xd5,0x2f,0xfb,0xab,0x01,0x5f,0xee,0xa8,0x1f,0x61,0xf2,0xaa,0x83,0xec,0x7a,0x21,0xfc,0xc0,0x07,0x88,0x3f,0x7c,0x0d,0x56,0xe8,0x3f,0x96,0x0a,0xaa,0x78,0x43,0xf7,0xb0,0xd5,0x10,0x08,0x1f,0x55,0x0b,0xf8,0xff,0x7e,0x1a,0xb1,0xfe,0xdc,0x07,0xfd,0xe0,0x5f,0x10,0x7e,0xf8,0x03,0xfe,0x30,0x12,0xff,0x6b,0x01,0xfe,0xd4,0x07,0xfc,0x3f,0xda,0xc0,0xff,0x55,0x03,0xfe,0x1f,0x20,0x75,0x00,0x3c,0x01,0xd8,0x8d,0xf4,0x92,0x09,0x5f,0xfa,0x41,0x62,0xa0,0xf8,0xc1,0x03,0xc6,0x83,0x14,0x82,0x03,0xe3,0x30,0x0f,0xed,0x46,0x78,0x1e,0x38,0xff,0x90,0x3e,0x79,0x01,0xf2,0xc0,0xc4,0x81,0xf2,0x3f,0x38,0x0c,0x46,0x08,0x5f,0x99,0xf4,0x6e,0xf9,0x1f,0xf8,0xdf,0x43,0xf0,0x00,0xf0,0x07,0x80,0x2c,}; -const uint8_t *_I_LevelUp2_02[] = {_I_LevelUp2_02_0}; - const uint8_t _I_LevelUp2_03_0[] = {0x01,0x00,0xa3,0x00,0x00,0x37,0xf2,0x02,0x0f,0xdf,0xfc,0xfc,0x1d,0x9c,0x0f,0xff,0xfc,0x1f,0x9f,0x00,0x78,0x8c,0x33,0xf0,0x0f,0x18,0x19,0x3b,0x01,0xfe,0x0f,0x18,0x38,0x3e,0xff,0xc0,0xf1,0x87,0x83,0xfc,0xfd,0x80,0x01,0x8f,0x83,0xfc,0x1f,0xca,0x0c,0x07,0xf8,0x3c,0xaf,0xe0,0xff,0x07,0xf8,0x3f,0x9c,0x18,0x8f,0x20,0x7f,0x83,0xff,0xff,0x01,0x07,0xf8,0x3f,0xcb,0xfc,0x0f,0xac,0x00,0x3f,0xb8,0x00,0xfe,0xf0,0x03,0xfb,0xe0,0x0f,0xf0,0x7f,0x83,0xfc,0x9f,0xe6,0xff,0x07,0xf0,0xc1,0x01,0xf7,0xf8,0x07,0xf8,0x3f,0xc1,0xfd,0xfc,0x07,0xf8,0x3f,0xc1,0xfc,0x00,0xf0,0x06,0xe2,0x37,0xd2,0x48,0x25,0x7f,0xe9,0x05,0x8a,0x83,0xe3,0x04,0x0f,0x1a,0x0c,0x52,0x08,0x0f,0x8c,0xc0,0x3f,0xb5,0x19,0xe0,0x78,0xe3,0xfe,0x40,0xf9,0xe4,0x07,0xcb,0x03,0x12,0x07,0xc8,0xfc,0xe0,0x31,0x18,0x21,0x7e,0x67,0xd1,0xbb,0xe4,0x7f,0xe3,0x7d,0x0f,0xc0,0x03,0xc0,0x1e,0x00,0xb0,}; const uint8_t *_I_LevelUp2_03[] = {_I_LevelUp2_03_0}; -const uint8_t _I_LevelUp3_05_0[] = {0x01,0x00,0x34,0x01,0x00,0x37,0xf2,0x0e,0x0f,0xd8,0x3c,0xe0,0x1d,0x9c,0x08,0x6f,0xc0,0x1f,0x96,0x08,0xc6,0x42,0x02,0x0f,0xb8,0xc4,0xc2,0x21,0x03,0x07,0xdc,0x12,0x41,0x10,0x81,0x03,0xfa,0x0c,0x0f,0xb8,0x37,0x82,0x3f,0x0c,0x06,0x45,0x00,0x04,0x30,0x28,0xc4,0x42,0x10,0x6c,0x90,0x10,0xc0,0xf9,0x92,0x78,0xc0,0x5c,0xc0,0x09,0x80,0x35,0x0f,0xfe,0x49,0x69,0x88,0x40,0x2f,0x82,0x07,0x35,0x0f,0x06,0x2f,0x51,0x98,0x60,0x16,0x50,0x5a,0x1a,0x0e,0x53,0xa7,0x20,0x1b,0x11,0xb5,0xc1,0xe3,0xf4,0xcf,0x48,0x0d,0xf6,0x1f,0x1c,0x99,0x35,0xc1,0xeb,0x14,0xe8,0xd0,0xc1,0xf9,0x2c,0xa4,0xd1,0x01,0xf7,0xc2,0xec,0x5f,0xf9,0x00,0xfb,0xc1,0x4f,0xe8,0x7e,0x80,0x7d,0xfe,0xbe,0x78,0x1d,0x3c,0x03,0xfd,0x0f,0x06,0x2c,0x70,0x04,0x30,0xcc,0x16,0x02,0x60,0xa5,0x10,0x03,0x5c,0x12,0x24,0x0c,0x18,0xc0,0x3e,0x13,0x05,0x83,0x80,0x42,0x21,0x80,0xf8,0x68,0x95,0x04,0x62,0x22,0x22,0x78,0xcd,0x82,0x01,0x07,0x81,0x03,0xea,0x41,0x20,0xf0,0x40,0x01,0xf7,0x30,0xd0,0x47,0xc1,0xf9,0x10,0xbf,0x18,0x90,0x01,0x1f,0x08,0x1b,0xd0,0xa0,0x33,0x01,0x7c,0xc0,0x07,0xe2,0x6f,0x10,0x18,0x80,0x1c,0xbc,0x33,0xc8,0x04,0x3e,0x03,0x80,0x18,0xb7,0x82,0x3f,0xc0,0xff,0xc0,0xf8,0x10,0x11,0xfc,0x4e,0x0a,0x04,0xb4,0x22,0x7d,0x2f,0x04,0x02,0x40,0xfb,0x84,0x00,0x48,0x1f,0xe0,0xfb,0x86,0x03,0xfa,0x08,0x0f,0x20,0x05,0x83,0xfc,0x01,0xe0,0x0d,0xc4,0x6f,0xa4,0x90,0x4a,0xff,0xd2,0x0b,0x15,0x07,0xc6,0x08,0x1e,0x34,0x18,0xa4,0x10,0x1f,0x19,0x80,0x7f,0x6a,0x33,0xc0,0xf1,0xc7,0xfc,0x81,0xf3,0xc8,0x0f,0x96,0x06,0x24,0x0f,0x91,0xf9,0xc0,0x62,0x28,0x31,0x07,0xc4,0xfa,0x37,0x7c,0x8f,0xfc,0x6f,0xa1,0xf8,0x00,0x78,0x03,0xc0,0x16,}; -const uint8_t *_I_LevelUp3_05[] = {_I_LevelUp3_05_0}; +const uint8_t _I_LevelUp2_02_0[] = {0x01,0x00,0xe1,0x00,0x00,0x37,0xe2,0x02,0x0f,0xda,0xbc,0xfc,0x1d,0x9c,0x0d,0x5f,0xa8,0x1f,0x97,0x0a,0xaf,0x54,0x61,0x9b,0x8d,0x56,0xaa,0x06,0x0f,0xba,0xa5,0x56,0xaa,0x0f,0xcd,0x60,0x7c,0x60,0xc0,0xfb,0xab,0x07,0xc6,0x1a,0x0f,0xb0,0xf0,0xea,0xa1,0x47,0xec,0xfa,0xd5,0xe3,0xa0,0xfb,0xd5,0xfe,0xb5,0xd1,0xa0,0x7d,0xd5,0x6f,0xb5,0xd9,0xa8,0x7f,0x3d,0xda,0xa9,0x50,0x7f,0x3e,0xb5,0xfb,0xa8,0x7f,0x75,0x76,0xa0,0xff,0x55,0x43,0xfb,0xaf,0x70,0x65,0x5b,0xfb,0x57,0xea,0xa7,0xf3,0xd5,0xab,0xd5,0x2f,0xfb,0xab,0x01,0x5f,0xee,0xa8,0x1f,0x61,0xf2,0xaa,0x83,0xec,0x7a,0x21,0xfc,0xc0,0x07,0x88,0x3f,0x7c,0x0d,0x56,0xe8,0x3f,0x96,0x0a,0xaa,0x78,0x43,0xf7,0xb0,0xd5,0x10,0x08,0x1f,0x55,0x0b,0xf8,0xff,0x7e,0x1a,0xb1,0xfe,0xdc,0x07,0xfd,0xe0,0x5f,0x10,0x7e,0xf8,0x03,0xfe,0x30,0x12,0xff,0x6b,0x01,0xfe,0xd4,0x07,0xfc,0x3f,0xda,0xc0,0xff,0x55,0x03,0xfe,0x1f,0x20,0x75,0x00,0x3c,0x01,0xd8,0x8d,0xf4,0x92,0x09,0x5f,0xfa,0x41,0x62,0xa0,0xf8,0xc1,0x03,0xc6,0x83,0x14,0x82,0x03,0xe3,0x30,0x0f,0xed,0x46,0x78,0x1e,0x38,0xff,0x90,0x3e,0x79,0x01,0xf2,0xc0,0xc4,0x81,0xf2,0x3f,0x38,0x0c,0x46,0x08,0x5f,0x99,0xf4,0x6e,0xf9,0x1f,0xf8,0xdf,0x43,0xf0,0x00,0xf0,0x07,0x80,0x2c,}; +const uint8_t *_I_LevelUp2_02[] = {_I_LevelUp2_02_0}; -const uint8_t _I_LevelUp3_04_0[] = {0x01,0x00,0x21,0x01,0x00,0x37,0xf2,0x0e,0x0f,0xda,0xbc,0xf4,0x1d,0x9c,0x0d,0x7f,0xe8,0x1f,0x97,0x0a,0xef,0x56,0x02,0x0f,0xbd,0xc6,0xeb,0x75,0x03,0x07,0xdd,0x52,0xeb,0x55,0x07,0xe6,0xb3,0x55,0xba,0x83,0x03,0xee,0xad,0xf5,0xaf,0xc3,0x41,0xf6,0x1e,0x1d,0xd4,0x28,0xfd,0x9d,0xdb,0xbc,0x74,0x1f,0x7f,0xfd,0x77,0xae,0x34,0x0f,0xbe,0xad,0x5e,0xab,0x35,0x06,0xcc,0x12,0x01,0xeb,0xdf,0x7e,0xe5,0x56,0x00,0x7c,0x47,0x20,0x15,0x5f,0xaf,0x7e,0xeb,0x38,0x07,0xc4,0xc0,0x3e,0x5b,0xbb,0x54,0x20,0x7f,0x55,0x5a,0xa9,0x04,0x49,0xf7,0xeb,0x2f,0x8f,0xb8,0x1f,0x7d,0x6e,0xed,0xff,0xba,0x9f,0xcd,0xff,0xaf,0xd4,0x0f,0xbf,0xf7,0xdf,0xab,0xf7,0xf8,0x83,0xeb,0x5d,0xaa,0x60,0x8c,0x04,0x1b,0x10,0x26,0xf8,0x98,0x06,0xba,0x0f,0x98,0x74,0x03,0x56,0x1f,0x1d,0x70,0x3e,0x63,0x18,0x00,0xf1,0x55,0xc1,0xf3,0x00,0xe0,0x7a,0xb5,0x5a,0xfd,0x50,0x3e,0xac,0x17,0x5f,0xad,0x56,0xaf,0xc1,0x07,0xce,0xc0,0xfe,0x24,0x01,0xc0,0xc0,0xc1,0xf1,0x50,0xbf,0x90,0x04,0x7f,0x7f,0x02,0xfe,0xc0,0x2e,0x0f,0xf1,0x3f,0xdf,0x03,0xc3,0xaa,0xdf,0x18,0x04,0x1f,0x37,0x0e,0x07,0xfe,0xaf,0xd5,0xaa,0x8b,0xe8,0xc0,0x5f,0xa3,0xfd,0xc0,0x2b,0x03,0xe1,0x0f,0xe6,0xa0,0xbe,0x21,0xff,0x0f,0xe6,0xb0,0x3f,0xd5,0x40,0xff,0x87,0xc8,0x1d,0x40,0x0f,0x00,0x76,0x23,0x7d,0x24,0x82,0x57,0xfe,0x90,0x58,0xa8,0x3e,0x30,0x40,0xf1,0xa0,0xc5,0x20,0x80,0xf8,0xcc,0x03,0xfb,0x51,0x9e,0x07,0x8e,0x3f,0xe4,0x0f,0x9e,0x40,0x7c,0xb0,0x31,0x20,0x7c,0x8f,0xce,0x03,0x11,0x82,0x17,0xe6,0x7d,0x1b,0xbe,0x47,0xfe,0x37,0xd0,0xfc,0x00,0x3c,0x01,0xe0,0x0b,}; -const uint8_t *_I_LevelUp3_04[] = {_I_LevelUp3_04_0}; +const uint8_t _I_LevelUp2_06_0[] = {0x01,0x00,0x11,0x01,0x00,0x37,0xf2,0x02,0x0f,0xd8,0x3c,0xfc,0x1d,0x9c,0x0e,0x0f,0x84,0x17,0x18,0x00,0x19,0x58,0x2e,0x18,0x01,0x84,0xc1,0x80,0x43,0x18,0x8c,0x40,0x20,0x60,0xf8,0x86,0x00,0x86,0x08,0x03,0x18,0x10,0xfe,0xe0,0x82,0x31,0x12,0x95,0xe0,0x65,0x3e,0x38,0x78,0x94,0xa1,0xc0,0xf8,0x81,0x46,0x62,0x10,0x80,0x29,0x03,0xe3,0x07,0xcd,0x93,0x94,0x44,0x01,0x5f,0xfd,0x25,0xbe,0x20,0x0f,0xbc,0x0f,0x5e,0xbf,0x30,0x07,0xdc,0x07,0xa9,0xde,0x90,0x03,0xf7,0x3e,0x0f,0xca,0x48,0x3c,0x68,0x00,0xfc,0xca,0x75,0xc1,0xf9,0x4b,0x96,0x52,0x01,0xf9,0x02,0xec,0x5f,0xdc,0xc6,0x0f,0x99,0xfd,0x0c,0x1e,0x5c,0x00,0x7c,0x7e,0xbe,0x38,0x10,0xf9,0xac,0xc8,0x00,0x36,0x07,0x91,0x83,0x4a,0x02,0x2f,0xa7,0x61,0x03,0xe1,0xaa,0x70,0x31,0x51,0x07,0xeb,0x00,0x0b,0x17,0xf0,0x83,0xe8,0xb0,0x50,0x70,0x7d,0xae,0xc7,0xc0,0x4f,0xc9,0x86,0x02,0x3e,0x0f,0xc8,0x85,0xf8,0xbf,0x40,0x02,0xf8,0x17,0xc4,0x5f,0xa3,0xfe,0x51,0x0c,0xf0,0x1f,0x9c,0x0f,0xf8,0xc0,0x81,0xf0,0xc5,0x28,0x80,0xfd,0x19,0xc8,0x00,0x48,0xc0,0x3e,0xd8,0x04,0x09,0x31,0x7c,0x0e,0xc8,0x1e,0xaa,0x61,0x66,0x23,0xfc,0xcf,0xfb,0x00,0x82,0x02,0xe8,0x1f,0xe0,0x0f,0x00,0x78,0x00,0x71,0x1b,0xe9,0x24,0x12,0xbf,0xf4,0x82,0xc5,0x41,0xf1,0x82,0x07,0x8d,0x06,0x29,0x04,0x07,0xc6,0x60,0x1f,0xda,0x8c,0xf0,0x3c,0x71,0xff,0x20,0x7c,0xf2,0x03,0xe5,0x81,0x89,0x03,0xe4,0x7e,0x70,0x18,0x8a,0x0e,0x71,0x13,0xe8,0xdd,0xf2,0x3f,0xf1,0xbe,0x87,0xe0,0x01,0xe0,0x0f,0x00,0x58,}; +const uint8_t *_I_LevelUp2_06[] = {_I_LevelUp2_06_0}; -const uint8_t _I_LevelUp3_06_0[] = {0x01,0x00,0x30,0x01,0x00,0x37,0xf2,0x0e,0x0f,0xd8,0x3c,0xe0,0x1d,0x9c,0x08,0x6f,0xc0,0x17,0x18,0x00,0x19,0x58,0x23,0x19,0x08,0x08,0x42,0x20,0xc0,0x21,0x8c,0x4c,0x22,0x10,0x30,0x7c,0x43,0x00,0x43,0x04,0x90,0x44,0x20,0x43,0xfb,0x07,0x90,0x94,0xaf,0x03,0x29,0xf0,0x47,0xc4,0xa5,0x0e,0x07,0xc4,0x0a,0x31,0x10,0x84,0x01,0x48,0x1f,0x10,0x3e,0x64,0x9e,0x30,0x3f,0xbf,0xfc,0x92,0xd3,0x10,0x07,0xdf,0x06,0x2f,0x51,0x98,0x03,0xee,0x83,0x94,0xe9,0xc8,0x01,0xf9,0xf4,0xcf,0x03,0xf7,0x29,0x93,0xa0,0x03,0xf2,0x29,0xd1,0xa1,0x83,0xf2,0x59,0x49,0xa2,0x03,0xef,0x85,0xd8,0xbf,0xf2,0x01,0xf7,0x82,0x9f,0xd0,0xfd,0x00,0x51,0xe0,0x03,0xe3,0xf5,0xf3,0xc0,0xe9,0xc0,0xc4,0xb3,0x20,0x00,0xd8,0x1e,0x47,0x82,0xc0,0x4c,0x20,0x22,0xfa,0x83,0x03,0x06,0x30,0x0f,0x76,0xa9,0xe0,0xc5,0x43,0x0c,0x0f,0xd6,0x02,0x82,0x31,0x11,0x11,0x00,0x23,0x80,0x43,0x18,0x3c,0x08,0x1f,0x52,0x09,0x07,0x80,0x6c,0x20,0xfa,0x98,0x68,0x23,0xe0,0xfc,0x88,0x5f,0x8c,0x48,0x00,0x8f,0x84,0x0c,0x06,0x30,0x41,0x7d,0xc0,0x07,0xe2,0x6f,0xb2,0xf0,0xcf,0x20,0x10,0xf3,0x7d,0xff,0xe0,0x7c,0x08,0x08,0x3e,0x18,0xa5,0x10,0x80,0x5c,0x20,0x00,0xf1,0x67,0x20,0x01,0x23,0x00,0x12,0x07,0xc3,0x00,0x81,0x22,0x01,0x11,0x7c,0x1b,0x08,0x1e,0xb2,0x06,0x62,0xbf,0xcc,0x3f,0x60,0x02,0x82,0x12,0xe8,0x1f,0xe0,0x0f,0x00,0x78,0x00,0x71,0x1b,0xe9,0x24,0x12,0xbf,0xf4,0x82,0xc5,0x41,0xf1,0x82,0x07,0x8d,0x06,0x29,0x04,0x07,0xc6,0x60,0x1f,0xda,0x8c,0xf0,0x3c,0x71,0xff,0x20,0x7c,0xf2,0x03,0xe5,0x81,0x89,0x03,0xe4,0x7e,0x70,0x18,0x8a,0x0c,0x41,0xf1,0x3e,0x8d,0xdf,0x23,0xff,0x1b,0xe8,0x7e,0x00,0x1e,0x00,0xf0,0x05,0x80,}; -const uint8_t *_I_LevelUp3_06[] = {_I_LevelUp3_06_0}; - -const uint8_t _I_LevelUp3_07_0[] = {0x01,0x00,0x0b,0x01,0x00,0x37,0xf2,0x0e,0x0f,0xd8,0x3c,0xe0,0x1d,0x9c,0x08,0x6f,0xc0,0x1f,0x96,0x08,0xc6,0x42,0x02,0x0f,0xb8,0xc4,0xc2,0x21,0x03,0x07,0xdc,0x12,0x41,0x10,0x81,0x03,0xfa,0x0c,0x0f,0xb8,0x37,0x82,0x3f,0x0c,0x07,0xdc,0x0a,0x31,0x10,0x84,0x03,0xee,0x07,0xcc,0x93,0xc6,0x01,0xf7,0xff,0x92,0x5a,0x62,0x00,0xfb,0xe0,0xc5,0xea,0x33,0x00,0x7d,0xd0,0x72,0x9d,0x39,0x00,0x3f,0x3e,0x99,0xe0,0x7e,0xe5,0x32,0x74,0x00,0x7e,0x45,0x3a,0x34,0x30,0x7e,0x4b,0x29,0x34,0x40,0x7d,0xf0,0xbb,0x17,0xfe,0x40,0x3e,0xf0,0x53,0xfa,0x1f,0xa0,0x1f,0x7f,0xaf,0x9e,0x07,0x4e,0x0f,0xb8,0x66,0x0b,0x01,0x30,0x80,0xb7,0xec,0x18,0x31,0x80,0x7d,0xe0,0xe0,0x10,0x88,0x60,0x3e,0xb0,0x14,0x11,0x88,0x88,0x88,0x01,0x1c,0x0b,0x04,0x02,0x0f,0x02,0x07,0xd4,0x82,0x41,0xe0,0x80,0x03,0xee,0x61,0xa0,0x8f,0x83,0xf2,0x21,0x7e,0x31,0x20,0x02,0x3e,0x10,0x30,0x18,0xc1,0x05,0xf7,0x00,0x1f,0x89,0xbe,0xcb,0xc3,0x3c,0x80,0x43,0xcd,0xf7,0xff,0x81,0xf0,0x20,0x29,0xfb,0x88,0x40,0x2e,0x10,0x00,0x7d,0xc6,0x00,0x24,0x0f,0xb8,0x40,0x04,0x81,0xfe,0x0f,0xb8,0x60,0x3f,0xa0,0x80,0xf2,0x00,0x58,0x3f,0xc0,0x1e,0x00,0xdc,0x46,0xfa,0x49,0x04,0xaf,0xfd,0x20,0xb1,0x50,0x7c,0x60,0x81,0xe3,0x41,0x8a,0x41,0x01,0xf1,0x98,0x07,0xf6,0xa3,0x3c,0x0f,0x1c,0x7f,0xc8,0x1f,0x3c,0x80,0xf9,0x60,0x62,0x40,0xf9,0x1f,0x9c,0x06,0x22,0x83,0x10,0x7c,0x4f,0xa3,0x77,0xc8,0xff,0xc6,0xfa,0x1f,0x80,0x07,0x80,0x3c,0x01,0x60,}; -const uint8_t *_I_LevelUp3_07[] = {_I_LevelUp3_07_0}; +const uint8_t _I_LevelUp2_07_0[] = {0x01,0x00,0xf1,0x00,0x00,0x37,0xf2,0x02,0x0f,0xd8,0x3c,0xfc,0x1d,0x9c,0x0e,0x0f,0x84,0x1f,0x96,0x0b,0x86,0x00,0x61,0x91,0x88,0xc4,0x02,0x06,0x0f,0xb8,0x24,0x32,0x01,0x02,0x07,0xe4,0x1a,0x00,0x01,0x10,0x05,0x41,0xbc,0x70,0xf1,0x08,0x80,0x2a,0x05,0x19,0x88,0x42,0x01,0xf7,0x83,0xe6,0xc9,0xca,0x22,0x00,0xaf,0xfe,0x92,0xdf,0x10,0x07,0xde,0x07,0xaf,0x5f,0x98,0x03,0xee,0x03,0xd4,0xef,0x48,0x01,0xfb,0x9f,0x07,0xe5,0x24,0x1e,0x34,0x00,0x7e,0x65,0x3a,0xe0,0xfc,0xa5,0xcb,0x29,0x00,0xfc,0x81,0x76,0x2f,0xf8,0x00,0x7e,0x4f,0xe8,0x60,0xfc,0xfd,0x7c,0x70,0x20,0xfc,0x86,0x03,0x4a,0x02,0xdf,0xb4,0x19,0x83,0xea,0x07,0x00,0x6f,0x08,0x3e,0xb0,0x00,0xb1,0x7f,0x08,0x3e,0xb8,0x00,0x21,0x83,0x83,0xed,0x76,0x3e,0x01,0xfe,0x4c,0x30,0x11,0xf0,0x7e,0x44,0x2f,0xc5,0xfd,0xf8,0x17,0xc4,0x5f,0xa3,0xfe,0xb0,0x40,0x27,0x80,0xfc,0xe0,0x7f,0xc6,0x04,0x9f,0xb8,0x82,0xbf,0xa3,0x00,0xfe,0x5e,0x88,0x3f,0xc1,0xfa,0xcd,0x10,0x7e,0xc1,0x01,0x74,0x0f,0xf0,0x07,0x80,0x3c,0x00,0x38,0x8d,0xf4,0x92,0x09,0x5f,0xfa,0x41,0x62,0xa0,0xf8,0xc1,0x03,0xc6,0x83,0x14,0x82,0x03,0xe3,0x30,0x0f,0xed,0x46,0x78,0x1e,0x38,0xff,0x90,0x3e,0x79,0x01,0xf2,0xc0,0xc4,0x81,0xf2,0x3f,0x38,0x0c,0x45,0x07,0x38,0x89,0xf4,0x6e,0xf9,0x1f,0xf8,0xdf,0x43,0xf0,0x00,0xf0,0x07,0x80,0x2c,}; +const uint8_t *_I_LevelUp2_07[] = {_I_LevelUp2_07_0}; const uint8_t _I_LevelUp3_03_0[] = {0x01,0x00,0xa3,0x00,0x00,0x37,0xf2,0x02,0x0f,0xdf,0xfc,0xfc,0x1d,0x9c,0x0f,0xff,0xfc,0x1f,0x9f,0x00,0x78,0x8c,0x33,0xf0,0x0f,0x18,0x19,0x3b,0x01,0xfe,0x0f,0x18,0x38,0x3e,0xff,0xc0,0xf1,0x87,0x83,0xfc,0xfd,0x80,0x01,0x8f,0x83,0xfc,0x1f,0xca,0x0c,0x07,0xf8,0x3c,0xaf,0xe0,0xff,0x07,0xf8,0x3f,0x9c,0x18,0x8f,0x20,0x7f,0x83,0xff,0xff,0x01,0x07,0xf8,0x3f,0xcb,0xfc,0x0f,0xac,0x00,0x3f,0xb8,0x00,0xfe,0xf0,0x03,0xfb,0xe0,0x0f,0xf0,0x7f,0x83,0xfc,0x9f,0xe6,0xff,0x07,0xf0,0xc1,0x01,0xf7,0xf8,0x07,0xf8,0x3f,0xc1,0xfd,0xfc,0x07,0xf8,0x3f,0xc1,0xfc,0x00,0xf0,0x06,0xe2,0x37,0xd2,0x48,0x25,0x7f,0xe9,0x05,0x8a,0x83,0xe3,0x04,0x0f,0x1a,0x0c,0x52,0x08,0x0f,0x8c,0xc0,0x3f,0xb5,0x19,0xe0,0x78,0xe3,0xfe,0x40,0xf9,0xe4,0x07,0xcb,0x03,0x12,0x07,0xc8,0xfc,0xe0,0x31,0x18,0x21,0x7e,0x67,0xd1,0xbb,0xe4,0x7f,0xe3,0x7d,0x0f,0xc0,0x03,0xc0,0x1e,0x00,0xb0,}; const uint8_t *_I_LevelUp3_03[] = {_I_LevelUp3_03_0}; -const uint8_t _I_LevelUp3_02_0[] = {0x01,0x00,0xf4,0x00,0x00,0x37,0xf2,0x02,0x0f,0xda,0xbc,0xfc,0x1d,0x9c,0x0f,0x5f,0xac,0x1f,0x97,0x0b,0xaf,0x54,0x61,0x9b,0x8d,0xd6,0xaa,0x06,0x0f,0xba,0xa5,0x76,0xaa,0x0f,0xcd,0x66,0xbb,0x55,0x06,0x07,0xdd,0x5b,0xef,0x5f,0x86,0x83,0xef,0x55,0xbb,0xdd,0x42,0x81,0xf7,0xd7,0xee,0xdd,0xe3,0xa0,0xfb,0xff,0xeb,0xbd,0xf1,0xa0,0x7d,0xf5,0x7a,0xf5,0xf9,0xa8,0x3e,0xf5,0x7f,0xef,0xf4,0xa8,0x1f,0x75,0x5e,0xaf,0x7e,0xea,0x0f,0xbf,0x5f,0xfb,0x7f,0x6a,0x07,0xdd,0x74,0x80,0x35,0x50,0xfe,0x6b,0xbd,0x5e,0xa4,0xfe,0x77,0x6f,0xfd,0x54,0xfe,0x6f,0xfd,0x7a,0xa0,0x7d,0xff,0xbe,0xbd,0x5e,0xac,0x04,0x1f,0x4d,0xe1,0x00,0x08,0x3e,0xea,0xd5,0x50,0x00,0x83,0xef,0x56,0x1f,0xdc,0x00,0x74,0x6b,0xa1,0xfb,0xe0,0x07,0x47,0x5e,0x1f,0xbb,0x05,0x57,0xea,0x3f,0xcd,0x81,0xfc,0x47,0xf9,0x50,0xbf,0x97,0xf7,0xe0,0x5f,0xeb,0x80,0xff,0xbc,0x1a,0xad,0xf0,0x7f,0x38,0x1f,0xfa,0xba,0x7f,0x4c,0x02,0xbf,0xda,0xc2,0xff,0xb5,0x01,0xff,0x0f,0xf6,0xb0,0x3f,0xd5,0x40,0xff,0x87,0xc8,0x1d,0x40,0x0f,0x00,0x76,0x23,0x7d,0x24,0x82,0x57,0xfe,0x90,0x58,0xa8,0x3e,0x30,0x40,0xf1,0xa0,0xc5,0x20,0x80,0xf8,0xcc,0x03,0xfb,0x51,0x9e,0x07,0x8e,0x3f,0xe4,0x0f,0x9e,0x40,0x7c,0xb0,0x31,0x20,0x7c,0x8f,0xce,0x03,0x11,0x82,0x17,0xe6,0x7d,0x1b,0xbe,0x47,0xfe,0x37,0xd0,0xfc,0x00,0x3c,0x01,0xe0,0x0b,}; -const uint8_t *_I_LevelUp3_02[] = {_I_LevelUp3_02_0}; +const uint8_t _I_LevelUp3_07_0[] = {0x01,0x00,0x0b,0x01,0x00,0x37,0xf2,0x0e,0x0f,0xd8,0x3c,0xe0,0x1d,0x9c,0x08,0x6f,0xc0,0x1f,0x96,0x08,0xc6,0x42,0x02,0x0f,0xb8,0xc4,0xc2,0x21,0x03,0x07,0xdc,0x12,0x41,0x10,0x81,0x03,0xfa,0x0c,0x0f,0xb8,0x37,0x82,0x3f,0x0c,0x07,0xdc,0x0a,0x31,0x10,0x84,0x03,0xee,0x07,0xcc,0x93,0xc6,0x01,0xf7,0xff,0x92,0x5a,0x62,0x00,0xfb,0xe0,0xc5,0xea,0x33,0x00,0x7d,0xd0,0x72,0x9d,0x39,0x00,0x3f,0x3e,0x99,0xe0,0x7e,0xe5,0x32,0x74,0x00,0x7e,0x45,0x3a,0x34,0x30,0x7e,0x4b,0x29,0x34,0x40,0x7d,0xf0,0xbb,0x17,0xfe,0x40,0x3e,0xf0,0x53,0xfa,0x1f,0xa0,0x1f,0x7f,0xaf,0x9e,0x07,0x4e,0x0f,0xb8,0x66,0x0b,0x01,0x30,0x80,0xb7,0xec,0x18,0x31,0x80,0x7d,0xe0,0xe0,0x10,0x88,0x60,0x3e,0xb0,0x14,0x11,0x88,0x88,0x88,0x01,0x1c,0x0b,0x04,0x02,0x0f,0x02,0x07,0xd4,0x82,0x41,0xe0,0x80,0x03,0xee,0x61,0xa0,0x8f,0x83,0xf2,0x21,0x7e,0x31,0x20,0x02,0x3e,0x10,0x30,0x18,0xc1,0x05,0xf7,0x00,0x1f,0x89,0xbe,0xcb,0xc3,0x3c,0x80,0x43,0xcd,0xf7,0xff,0x81,0xf0,0x20,0x29,0xfb,0x88,0x40,0x2e,0x10,0x00,0x7d,0xc6,0x00,0x24,0x0f,0xb8,0x40,0x04,0x81,0xfe,0x0f,0xb8,0x60,0x3f,0xa0,0x80,0xf2,0x00,0x58,0x3f,0xc0,0x1e,0x00,0xdc,0x46,0xfa,0x49,0x04,0xaf,0xfd,0x20,0xb1,0x50,0x7c,0x60,0x81,0xe3,0x41,0x8a,0x41,0x01,0xf1,0x98,0x07,0xf6,0xa3,0x3c,0x0f,0x1c,0x7f,0xc8,0x1f,0x3c,0x80,0xf9,0x60,0x62,0x40,0xf9,0x1f,0x9c,0x06,0x22,0x83,0x10,0x7c,0x4f,0xa3,0x77,0xc8,0xff,0xc6,0xfa,0x1f,0x80,0x07,0x80,0x3c,0x01,0x60,}; +const uint8_t *_I_LevelUp3_07[] = {_I_LevelUp3_07_0}; const uint8_t _I_LevelUp3_01_0[] = {0x01,0x00,0xf1,0x00,0x00,0x37,0xf2,0x02,0x0f,0xd8,0x3c,0xfc,0x1d,0x9c,0x0e,0x0f,0x84,0x1f,0x96,0x0b,0x86,0x00,0x61,0x91,0x88,0xc4,0x02,0x06,0x0f,0xb8,0x24,0x32,0x01,0x02,0x07,0xe4,0x1a,0x00,0x01,0x10,0x05,0x41,0xbc,0x70,0xf1,0x08,0x80,0x2a,0x05,0x19,0x88,0x42,0x01,0xf7,0x83,0xe6,0xc9,0xca,0x22,0x00,0xaf,0xfe,0x92,0xdf,0x10,0x07,0xde,0x07,0xaf,0x5f,0x98,0x03,0xee,0x03,0xd4,0xef,0x48,0x01,0xfb,0x9f,0x07,0xe5,0x24,0x1e,0x34,0x00,0x7e,0x65,0x3a,0xe0,0xfc,0xa5,0xcb,0x29,0x00,0xfc,0x81,0x76,0x2f,0xf8,0x00,0x7e,0x4f,0xe8,0x60,0xfc,0xfd,0x7c,0x70,0x20,0xfc,0x86,0x03,0x4a,0x02,0xdf,0xb4,0x19,0x83,0xea,0x07,0x00,0x6f,0x08,0x3e,0xb0,0x00,0xb1,0x7f,0x08,0x3e,0xb8,0x00,0x21,0x83,0x83,0xed,0x76,0x3e,0x01,0xfe,0x4c,0x30,0x11,0xf0,0x7e,0x44,0x2f,0xc5,0xfd,0xf8,0x17,0xc4,0x5f,0xa3,0xfe,0xb0,0x40,0x27,0x80,0xfc,0xe0,0x7f,0xc6,0x04,0x9f,0xb8,0x82,0xbf,0xa3,0x00,0xfe,0x5e,0x88,0x3f,0xc1,0xfa,0xcd,0x10,0x7e,0xc1,0x01,0x74,0x0f,0xf0,0x07,0x80,0x3c,0x00,0x38,0x8d,0xf4,0x92,0x09,0x5f,0xfa,0x41,0x62,0xa0,0xf8,0xc1,0x03,0xc6,0x83,0x14,0x82,0x03,0xe3,0x30,0x0f,0xed,0x46,0x78,0x1e,0x38,0xff,0x90,0x3e,0x79,0x01,0xf2,0xc0,0xc4,0x81,0xf2,0x3f,0x38,0x0c,0x45,0x07,0x38,0x89,0xf4,0x6e,0xf9,0x1f,0xf8,0xdf,0x43,0xf0,0x00,0xf0,0x07,0x80,0x2c,}; const uint8_t *_I_LevelUp3_01[] = {_I_LevelUp3_01_0}; +const uint8_t _I_LevelUp3_06_0[] = {0x01,0x00,0x30,0x01,0x00,0x37,0xf2,0x0e,0x0f,0xd8,0x3c,0xe0,0x1d,0x9c,0x08,0x6f,0xc0,0x17,0x18,0x00,0x19,0x58,0x23,0x19,0x08,0x08,0x42,0x20,0xc0,0x21,0x8c,0x4c,0x22,0x10,0x30,0x7c,0x43,0x00,0x43,0x04,0x90,0x44,0x20,0x43,0xfb,0x07,0x90,0x94,0xaf,0x03,0x29,0xf0,0x47,0xc4,0xa5,0x0e,0x07,0xc4,0x0a,0x31,0x10,0x84,0x01,0x48,0x1f,0x10,0x3e,0x64,0x9e,0x30,0x3f,0xbf,0xfc,0x92,0xd3,0x10,0x07,0xdf,0x06,0x2f,0x51,0x98,0x03,0xee,0x83,0x94,0xe9,0xc8,0x01,0xf9,0xf4,0xcf,0x03,0xf7,0x29,0x93,0xa0,0x03,0xf2,0x29,0xd1,0xa1,0x83,0xf2,0x59,0x49,0xa2,0x03,0xef,0x85,0xd8,0xbf,0xf2,0x01,0xf7,0x82,0x9f,0xd0,0xfd,0x00,0x51,0xe0,0x03,0xe3,0xf5,0xf3,0xc0,0xe9,0xc0,0xc4,0xb3,0x20,0x00,0xd8,0x1e,0x47,0x82,0xc0,0x4c,0x20,0x22,0xfa,0x83,0x03,0x06,0x30,0x0f,0x76,0xa9,0xe0,0xc5,0x43,0x0c,0x0f,0xd6,0x02,0x82,0x31,0x11,0x11,0x00,0x23,0x80,0x43,0x18,0x3c,0x08,0x1f,0x52,0x09,0x07,0x80,0x6c,0x20,0xfa,0x98,0x68,0x23,0xe0,0xfc,0x88,0x5f,0x8c,0x48,0x00,0x8f,0x84,0x0c,0x06,0x30,0x41,0x7d,0xc0,0x07,0xe2,0x6f,0xb2,0xf0,0xcf,0x20,0x10,0xf3,0x7d,0xff,0xe0,0x7c,0x08,0x08,0x3e,0x18,0xa5,0x10,0x80,0x5c,0x20,0x00,0xf1,0x67,0x20,0x01,0x23,0x00,0x12,0x07,0xc3,0x00,0x81,0x22,0x01,0x11,0x7c,0x1b,0x08,0x1e,0xb2,0x06,0x62,0xbf,0xcc,0x3f,0x60,0x02,0x82,0x12,0xe8,0x1f,0xe0,0x0f,0x00,0x78,0x00,0x71,0x1b,0xe9,0x24,0x12,0xbf,0xf4,0x82,0xc5,0x41,0xf1,0x82,0x07,0x8d,0x06,0x29,0x04,0x07,0xc6,0x60,0x1f,0xda,0x8c,0xf0,0x3c,0x71,0xff,0x20,0x7c,0xf2,0x03,0xe5,0x81,0x89,0x03,0xe4,0x7e,0x70,0x18,0x8a,0x0c,0x41,0xf1,0x3e,0x8d,0xdf,0x23,0xff,0x1b,0xe8,0x7e,0x00,0x1e,0x00,0xf0,0x05,0x80,}; +const uint8_t *_I_LevelUp3_06[] = {_I_LevelUp3_06_0}; + +const uint8_t _I_LevelUp3_04_0[] = {0x01,0x00,0x21,0x01,0x00,0x37,0xf2,0x0e,0x0f,0xda,0xbc,0xf4,0x1d,0x9c,0x0d,0x7f,0xe8,0x1f,0x97,0x0a,0xef,0x56,0x02,0x0f,0xbd,0xc6,0xeb,0x75,0x03,0x07,0xdd,0x52,0xeb,0x55,0x07,0xe6,0xb3,0x55,0xba,0x83,0x03,0xee,0xad,0xf5,0xaf,0xc3,0x41,0xf6,0x1e,0x1d,0xd4,0x28,0xfd,0x9d,0xdb,0xbc,0x74,0x1f,0x7f,0xfd,0x77,0xae,0x34,0x0f,0xbe,0xad,0x5e,0xab,0x35,0x06,0xcc,0x12,0x01,0xeb,0xdf,0x7e,0xe5,0x56,0x00,0x7c,0x47,0x20,0x15,0x5f,0xaf,0x7e,0xeb,0x38,0x07,0xc4,0xc0,0x3e,0x5b,0xbb,0x54,0x20,0x7f,0x55,0x5a,0xa9,0x04,0x49,0xf7,0xeb,0x2f,0x8f,0xb8,0x1f,0x7d,0x6e,0xed,0xff,0xba,0x9f,0xcd,0xff,0xaf,0xd4,0x0f,0xbf,0xf7,0xdf,0xab,0xf7,0xf8,0x83,0xeb,0x5d,0xaa,0x60,0x8c,0x04,0x1b,0x10,0x26,0xf8,0x98,0x06,0xba,0x0f,0x98,0x74,0x03,0x56,0x1f,0x1d,0x70,0x3e,0x63,0x18,0x00,0xf1,0x55,0xc1,0xf3,0x00,0xe0,0x7a,0xb5,0x5a,0xfd,0x50,0x3e,0xac,0x17,0x5f,0xad,0x56,0xaf,0xc1,0x07,0xce,0xc0,0xfe,0x24,0x01,0xc0,0xc0,0xc1,0xf1,0x50,0xbf,0x90,0x04,0x7f,0x7f,0x02,0xfe,0xc0,0x2e,0x0f,0xf1,0x3f,0xdf,0x03,0xc3,0xaa,0xdf,0x18,0x04,0x1f,0x37,0x0e,0x07,0xfe,0xaf,0xd5,0xaa,0x8b,0xe8,0xc0,0x5f,0xa3,0xfd,0xc0,0x2b,0x03,0xe1,0x0f,0xe6,0xa0,0xbe,0x21,0xff,0x0f,0xe6,0xb0,0x3f,0xd5,0x40,0xff,0x87,0xc8,0x1d,0x40,0x0f,0x00,0x76,0x23,0x7d,0x24,0x82,0x57,0xfe,0x90,0x58,0xa8,0x3e,0x30,0x40,0xf1,0xa0,0xc5,0x20,0x80,0xf8,0xcc,0x03,0xfb,0x51,0x9e,0x07,0x8e,0x3f,0xe4,0x0f,0x9e,0x40,0x7c,0xb0,0x31,0x20,0x7c,0x8f,0xce,0x03,0x11,0x82,0x17,0xe6,0x7d,0x1b,0xbe,0x47,0xfe,0x37,0xd0,0xfc,0x00,0x3c,0x01,0xe0,0x0b,}; +const uint8_t *_I_LevelUp3_04[] = {_I_LevelUp3_04_0}; + +const uint8_t _I_LevelUp3_02_0[] = {0x01,0x00,0xf4,0x00,0x00,0x37,0xf2,0x02,0x0f,0xda,0xbc,0xfc,0x1d,0x9c,0x0f,0x5f,0xac,0x1f,0x97,0x0b,0xaf,0x54,0x61,0x9b,0x8d,0xd6,0xaa,0x06,0x0f,0xba,0xa5,0x76,0xaa,0x0f,0xcd,0x66,0xbb,0x55,0x06,0x07,0xdd,0x5b,0xef,0x5f,0x86,0x83,0xef,0x55,0xbb,0xdd,0x42,0x81,0xf7,0xd7,0xee,0xdd,0xe3,0xa0,0xfb,0xff,0xeb,0xbd,0xf1,0xa0,0x7d,0xf5,0x7a,0xf5,0xf9,0xa8,0x3e,0xf5,0x7f,0xef,0xf4,0xa8,0x1f,0x75,0x5e,0xaf,0x7e,0xea,0x0f,0xbf,0x5f,0xfb,0x7f,0x6a,0x07,0xdd,0x74,0x80,0x35,0x50,0xfe,0x6b,0xbd,0x5e,0xa4,0xfe,0x77,0x6f,0xfd,0x54,0xfe,0x6f,0xfd,0x7a,0xa0,0x7d,0xff,0xbe,0xbd,0x5e,0xac,0x04,0x1f,0x4d,0xe1,0x00,0x08,0x3e,0xea,0xd5,0x50,0x00,0x83,0xef,0x56,0x1f,0xdc,0x00,0x74,0x6b,0xa1,0xfb,0xe0,0x07,0x47,0x5e,0x1f,0xbb,0x05,0x57,0xea,0x3f,0xcd,0x81,0xfc,0x47,0xf9,0x50,0xbf,0x97,0xf7,0xe0,0x5f,0xeb,0x80,0xff,0xbc,0x1a,0xad,0xf0,0x7f,0x38,0x1f,0xfa,0xba,0x7f,0x4c,0x02,0xbf,0xda,0xc2,0xff,0xb5,0x01,0xff,0x0f,0xf6,0xb0,0x3f,0xd5,0x40,0xff,0x87,0xc8,0x1d,0x40,0x0f,0x00,0x76,0x23,0x7d,0x24,0x82,0x57,0xfe,0x90,0x58,0xa8,0x3e,0x30,0x40,0xf1,0xa0,0xc5,0x20,0x80,0xf8,0xcc,0x03,0xfb,0x51,0x9e,0x07,0x8e,0x3f,0xe4,0x0f,0x9e,0x40,0x7c,0xb0,0x31,0x20,0x7c,0x8f,0xce,0x03,0x11,0x82,0x17,0xe6,0x7d,0x1b,0xbe,0x47,0xfe,0x37,0xd0,0xfc,0x00,0x3c,0x01,0xe0,0x0b,}; +const uint8_t *_I_LevelUp3_02[] = {_I_LevelUp3_02_0}; + +const uint8_t _I_LevelUp3_05_0[] = {0x01,0x00,0x34,0x01,0x00,0x37,0xf2,0x0e,0x0f,0xd8,0x3c,0xe0,0x1d,0x9c,0x08,0x6f,0xc0,0x1f,0x96,0x08,0xc6,0x42,0x02,0x0f,0xb8,0xc4,0xc2,0x21,0x03,0x07,0xdc,0x12,0x41,0x10,0x81,0x03,0xfa,0x0c,0x0f,0xb8,0x37,0x82,0x3f,0x0c,0x06,0x45,0x00,0x04,0x30,0x28,0xc4,0x42,0x10,0x6c,0x90,0x10,0xc0,0xf9,0x92,0x78,0xc0,0x5c,0xc0,0x09,0x80,0x35,0x0f,0xfe,0x49,0x69,0x88,0x40,0x2f,0x82,0x07,0x35,0x0f,0x06,0x2f,0x51,0x98,0x60,0x16,0x50,0x5a,0x1a,0x0e,0x53,0xa7,0x20,0x1b,0x11,0xb5,0xc1,0xe3,0xf4,0xcf,0x48,0x0d,0xf6,0x1f,0x1c,0x99,0x35,0xc1,0xeb,0x14,0xe8,0xd0,0xc1,0xf9,0x2c,0xa4,0xd1,0x01,0xf7,0xc2,0xec,0x5f,0xf9,0x00,0xfb,0xc1,0x4f,0xe8,0x7e,0x80,0x7d,0xfe,0xbe,0x78,0x1d,0x3c,0x03,0xfd,0x0f,0x06,0x2c,0x70,0x04,0x30,0xcc,0x16,0x02,0x60,0xa5,0x10,0x03,0x5c,0x12,0x24,0x0c,0x18,0xc0,0x3e,0x13,0x05,0x83,0x80,0x42,0x21,0x80,0xf8,0x68,0x95,0x04,0x62,0x22,0x22,0x78,0xcd,0x82,0x01,0x07,0x81,0x03,0xea,0x41,0x20,0xf0,0x40,0x01,0xf7,0x30,0xd0,0x47,0xc1,0xf9,0x10,0xbf,0x18,0x90,0x01,0x1f,0x08,0x1b,0xd0,0xa0,0x33,0x01,0x7c,0xc0,0x07,0xe2,0x6f,0x10,0x18,0x80,0x1c,0xbc,0x33,0xc8,0x04,0x3e,0x03,0x80,0x18,0xb7,0x82,0x3f,0xc0,0xff,0xc0,0xf8,0x10,0x11,0xfc,0x4e,0x0a,0x04,0xb4,0x22,0x7d,0x2f,0x04,0x02,0x40,0xfb,0x84,0x00,0x48,0x1f,0xe0,0xfb,0x86,0x03,0xfa,0x08,0x0f,0x20,0x05,0x83,0xfc,0x01,0xe0,0x0d,0xc4,0x6f,0xa4,0x90,0x4a,0xff,0xd2,0x0b,0x15,0x07,0xc6,0x08,0x1e,0x34,0x18,0xa4,0x10,0x1f,0x19,0x80,0x7f,0x6a,0x33,0xc0,0xf1,0xc7,0xfc,0x81,0xf3,0xc8,0x0f,0x96,0x06,0x24,0x0f,0x91,0xf9,0xc0,0x62,0x28,0x31,0x07,0xc4,0xfa,0x37,0x7c,0x8f,0xfc,0x6f,0xa1,0xf8,0x00,0x78,0x03,0xc0,0x16,}; +const uint8_t *_I_LevelUp3_05[] = {_I_LevelUp3_05_0}; + const uint8_t _A_LevelUpPending_128x51_0[] = {0x01,0x00,0xa9,0x01,0x00,0x1c,0xfc,0x1d,0xbf,0x0e,0x04,0x04,0x1f,0x90,0xc8,0x04,0x18,0x1f,0x90,0x28,0x04,0x20,0x1d,0x62,0xd2,0x98,0x03,0xfe,0x01,0x80,0xf9,0xdf,0x39,0xd8,0x7f,0x45,0x2e,0xe4,0x2b,0x18,0x04,0x80,0x04,0x34,0x00,0x08,0xc5,0x20,0xb1,0x1c,0x0c,0xa2,0x91,0x8a,0x07,0x94,0x40,0x04,0x38,0x00,0x78,0xc4,0x01,0xe5,0x29,0xa4,0x42,0x81,0xe7,0xf8,0x07,0x8c,0x06,0x81,0xf6,0x9e,0x47,0xf0,0x3e,0xaa,0x48,0xbc,0xe1,0x10,0x48,0x0e,0x02,0x07,0x40,0xaa,0x41,0x03,0xe3,0x2c,0xa4,0x60,0x81,0xe5,0x00,0xba,0x40,0xbe,0x1d,0xfa,0x06,0x50,0x1e,0x43,0xf2,0x07,0x16,0x13,0x77,0x02,0x86,0x70,0x30,0x31,0x3b,0xe8,0x3c,0x7d,0x1b,0x3b,0x88,0x7c,0xa8,0x9f,0xa8,0x14,0x0e,0x00,0xb1,0xad,0x17,0xef,0x84,0x04,0x10,0x7d,0x78,0xae,0x72,0x20,0x7f,0x83,0xf3,0xf3,0x07,0x88,0xc0,0x3f,0xe0,0xf4,0x53,0x08,0x00,0xe8,0xb8,0xc2,0xf0,0xd5,0x60,0x1f,0x09,0xe6,0x7f,0xc7,0xc0,0x07,0x1e,0x03,0x09,0x79,0x81,0xfe,0x35,0x4a,0x51,0xa2,0xd0,0x62,0x9c,0x11,0x29,0xe0,0x30,0x42,0xe1,0xae,0x07,0xc4,0x1e,0x51,0x0e,0x01,0xdc,0x41,0xe6,0x15,0x1d,0x7d,0xa8,0x5e,0x58,0xf1,0x78,0x83,0xce,0xc1,0x81,0x5f,0x0d,0x56,0x6a,0x1f,0x18,0xa4,0x06,0x08,0x2f,0x40,0x78,0xc0,0xf8,0x1a,0xa8,0xd0,0x3c,0x64,0x83,0xf2,0x27,0x9f,0x81,0xb8,0x3e,0x0a,0xbc,0x74,0x1e,0x34,0x42,0xf8,0x9b,0xd3,0xe1,0x80,0x83,0xfe,0x35,0xf1,0xf4,0x74,0xdc,0x20,0x10,0xaf,0xf7,0xfe,0x66,0x0f,0xbf,0xd7,0xfc,0x1f,0xbc,0x20,0x78,0xc8,0x41,0xf3,0x18,0x80,0x40,0xa7,0xfc,0x09,0x18,0x3f,0x2f,0xd0,0x0f,0x78,0x3f,0x3f,0x90,0x1e,0xe0,0x3e,0x61,0x00,0xf2,0x83,0xfc,0x01,0xf9,0xa8,0x8f,0xf0,0x1f,0xe8,0x0f,0x7a,0x87,0xff,0xc2,0x0f,0x98,0x20,0x3c,0x74,0x1f,0xad,0xfb,0x64,0xc1,0xed,0x80,0x80,0xd0,0x2a,0xb8,0x70,0x7e,0x60,0x35,0x70,0x60,0x7c,0xc0,0x81,0xe3,0x00,0xab,0x41,0x60,0xc0,0xfb,0x84,0x6f,0x21,0xc4,0x51,0x00,0x38,0xb4,0x60,0x37,0x0f,0x84,0x3c,0x1f,0x03,0xd2,0x27,0x8a,0x90,0x61,0x80,0xf8,0x08,0x9c,0x0e,0x18,0xb5,0x10,0x03,0x70,0x20,0x01,0xd1,0x80,0x77,0xa1,0xf1,0x00,0x7b,0x83,0x44,0x1e,0x5f,0x08,0x3c,0xc0,0x1f,0x83,0x01,0x90,0x03,0xde,0xc0,0x0f,0x33,0xa0,0x81,0x0c,0x00,0x81,0x81,0x07,0xa1,0x18,0x40,0x0c,0x38,0x11,0x51,0xc1,0x8c,0xc2,0x00,0x62,0xc0,0x83,0xcd,0x1c,0x2f,0x07,0x3c,0x08,0x3f,0x61,0x00,0xf4,0x02,0x8b,0x81,0xc0,}; const uint8_t _A_LevelUpPending_128x51_1[] = {0x01,0x00,0xad,0x01,0x00,0x1c,0xfc,0x1d,0xbf,0x0e,0x04,0x04,0x1f,0x90,0xc8,0x04,0x18,0x1f,0x90,0x28,0x04,0x20,0x1d,0x62,0xd2,0x98,0x03,0xfe,0x01,0x80,0xf9,0xdf,0x39,0xd8,0x7f,0x45,0x2e,0xe4,0x2b,0x18,0x04,0x80,0x04,0x34,0x00,0x08,0xc5,0x20,0xb1,0x1c,0x0c,0xa2,0x91,0x8a,0x07,0x94,0x40,0x04,0x38,0x00,0x78,0xc4,0x01,0xe5,0x29,0xa4,0x42,0x81,0xe7,0xf8,0x07,0x8c,0x06,0x81,0xf6,0x9e,0x47,0xf0,0x3e,0xaa,0x48,0xbc,0xe1,0x10,0x48,0x0e,0x02,0x07,0x40,0xaa,0x41,0x03,0xe3,0x2c,0xa4,0x60,0x81,0xe5,0x00,0xba,0x40,0xbe,0x1d,0xfa,0x06,0x50,0x1e,0x43,0xf2,0x07,0x16,0x13,0x75,0x02,0x86,0x70,0x30,0x31,0x3b,0xe8,0x3c,0x7d,0x1b,0x3b,0x88,0x7c,0xa8,0x9f,0xa8,0x14,0x0e,0x00,0xb1,0xad,0x17,0xeb,0x84,0x04,0x10,0x7d,0x50,0xae,0x72,0x20,0x7e,0x68,0x81,0xfd,0x81,0x83,0xc4,0x60,0x1f,0xf0,0x7a,0x29,0x84,0x00,0x74,0x1c,0x61,0x78,0x6a,0xb0,0x0f,0x84,0xf3,0x3f,0xe3,0xe0,0x03,0x8f,0x01,0x3c,0xbc,0x40,0xff,0x1a,0xa5,0x28,0xd1,0x68,0x31,0x4e,0x08,0x94,0xf0,0x16,0x26,0x00,0xd7,0x03,0xe2,0x0f,0x28,0x87,0x00,0xee,0x20,0xf2,0x36,0x96,0xbe,0xd4,0x2f,0x2c,0x78,0xbc,0x41,0xe9,0x82,0x01,0x0d,0x56,0x6a,0x1f,0x18,0xa4,0x06,0x08,0x2f,0x4e,0x00,0x3c,0x78,0x1a,0xa8,0xd0,0x3c,0x64,0x83,0xf2,0x27,0x98,0x3c,0x60,0x3e,0x0a,0xbc,0x34,0x1e,0x34,0x42,0xf8,0x9b,0xd3,0x81,0x83,0x82,0xfe,0x35,0xf0,0xf4,0x74,0xf0,0x20,0x30,0x9f,0xf7,0xfe,0x16,0x0f,0x9f,0x04,0x07,0xf3,0xff,0x07,0xe4,0x03,0x82,0x0f,0x15,0x88,0x83,0xea,0x03,0x0f,0xe0,0x24,0x84,0x01,0x17,0x00,0x78,0xcf,0xa0,0x13,0x30,0x7e,0x7c,0x20,0x13,0x60,0x7e,0x70,0x21,0xf7,0xc0,0x7c,0xca,0x01,0xe3,0x00,0xff,0x5f,0xc1,0xf3,0x38,0x07,0x97,0xc3,0xa6,0x0f,0x98,0xc0,0x3c,0xa8,0x1b,0x00,0x7c,0xc2,0x30,0x10,0x18,0x64,0x03,0x30,0x0f,0xc1,0x90,0xc4,0x1d,0x26,0x00,0x58,0x20,0x3c,0x7c,0x10,0x78,0xe0,0x3f,0x30,0x1f,0xd8,0x38,0xbe,0x60,0x40,0xf1,0x80,0x00,0x86,0x04,0x0f,0x88,0x18,0x3c,0x8c,0x43,0x04,0x07,0xc0,0xb4,0x43,0xe6,0x0f,0x80,0x50,0xd0,0x00,0x83,0xc0,0x81,0xc2,0x01,0xef,0xc0,0x46,0x08,0x10,0x64,0x10,0x20,0x7c,0x03,0x44,0x1e,0x58,0x08,0x1a,0x94,0x40,0x0d,0x60,0x07,0x99,0x90,0x66,0x00,0xf7,0x90,0x03,0xd4,0x0c,0x20,0x06,0x0c,0x08,0x28,0xe0,0xc4,0x61,0x00,0x34,0x40,0x1e,0x8a,0x41,0x77,0x48,0x3d,0x58,0x0e,0x68,0x10,0x79,0x81,0x46,0x06,0x0f,0x60,}; const uint8_t *_A_LevelUpPending_128x51[] = {_A_LevelUpPending_128x51_0,_A_LevelUpPending_128x51_1}; @@ -276,26 +276,26 @@ const uint8_t _A_Waves_128x52_0[] = {0x01,0x00,0xba,0x01,0x00,0x78,0x03,0xc0,0x0 const uint8_t _A_Waves_128x52_1[] = {0x01,0x00,0xbf,0x01,0x00,0x78,0x03,0xc0,0x0f,0xe0,0xf3,0xc0,0xc0,0x83,0xf8,0x07,0xce,0x03,0xff,0x0f,0x0a,0x10,0x4c,0x80,0x0f,0xfe,0x8e,0x01,0x08,0x1f,0x57,0xc0,0x19,0x7c,0x20,0xe0,0xf9,0xff,0xc0,0x47,0xe5,0xff,0x1f,0xce,0x7c,0x36,0x51,0xcf,0xf8,0xc2,0x30,0x11,0x92,0x79,0x61,0x23,0xe3,0x08,0xe0,0x46,0x61,0x00,0x42,0x9e,0x8b,0xe2,0x81,0x18,0x42,0x1c,0xe0,0x08,0x62,0x34,0x07,0xa7,0xc2,0xe0,0x04,0x2c,0x81,0x60,0x80,0x04,0x0f,0x3b,0x87,0x00,0x32,0x60,0xf5,0x15,0x1d,0xe3,0x00,0x0f,0xbf,0xf4,0x7e,0xf0,0x06,0x11,0xe1,0x40,0x81,0xeb,0xc0,0xff,0xff,0xc1,0xe5,0x7a,0x07,0x9f,0xf8,0x14,0x20,0x02,0x81,0xfc,0x3f,0x60,0xc1,0xea,0x88,0x06,0x05,0xff,0xaa,0x80,0x0e,0xfa,0xe3,0x20,0x78,0xea,0xa7,0xfe,0x0f,0xfe,0xa8,0x00,0x91,0xe0,0x60,0xef,0xa1,0xfe,0x0a,0xaf,0xfe,0xbe,0x1c,0x3a,0xa5,0x56,0xa2,0xaf,0x2b,0xc7,0xd6,0xbf,0xea,0x0e,0x9e,0x2b,0x55,0x2a,0xff,0x6a,0xcb,0x25,0xe0,0xd5,0xea,0x87,0x48,0x00,0x2f,0xff,0x5d,0xb4,0x5c,0x0a,0xbd,0x54,0x76,0xa0,0x01,0x81,0xef,0xd0,0xc7,0xaf,0x0f,0xa7,0x56,0xac,0x02,0x18,0x0f,0xf0,0x1e,0x75,0xe0,0xfa,0x4a,0xb5,0x1a,0xaf,0x53,0x2c,0x52,0x87,0xbc,0x0f,0x9f,0xd7,0xff,0x7f,0xaa,0xdd,0x47,0x62,0x0f,0x3b,0xc5,0x44,0x3c,0x50,0xe0,0x58,0xeb,0xed,0x48,0xc1,0x17,0x9f,0xc0,0x3e,0x34,0x5e,0xa9,0x60,0x8f,0x02,0x0d,0x16,0x31,0xd8,0x07,0xe4,0xc1,0x21,0x00,0xfb,0xcf,0xa3,0x0c,0x03,0x97,0x80,0x7e,0x49,0x72,0x10,0x10,0x34,0x66,0x01,0x73,0x43,0x8f,0xfd,0xfc,0x93,0x00,0x68,0xd0,0x01,0xe7,0xab,0x7d,0xa0,0x3c,0x8b,0xc7,0x3e,0x2a,0x0d,0x54,0x1e,0xf0,0x01,0x31,0x3b,0x85,0xe2,0x60,0x04,0xb8,0x17,0x8c,0x74,0x46,0xb2,0x00,0x27,0x82,0x01,0x04,0x3e,0x90,0x34,0x5c,0x84,0x00,0x4e,0x04,0x06,0x30,0x04,0x20,0x78,0xc1,0x81,0xed,0x80,0x81,0xc8,0x01,0xe4,0x1d,0x10,0x7b,0xff,0x20,0xe6,0x02,0xc0,0x03,0xc7,0xfc,0x1e,0x76,0x20,0x8b,0x04,0x1e,0x50,0xc2,0x82,0xde,0x20,0x11,0xc2,0x81,0x03,0xce,0xf8,0x6b,0x32,0xb1,0x4e,0x20,0x05,0x01,0x12,0x88,0x58,0x70,0x17,0xf8,0x03,0x01,0x02,0x83,0x60,0x58,0x8c,0x14,0x4c,0x49,0x26,0x40,0x0e,0x03,0x03,0xa0,0x85,0x09,0x09,0x01,0x10,0x0b,0xf0,0x7c,0x86,0xc2,0x80,0x74,0xc9,0x07,0xc8,0x1f,0x10,0x03,0x80,0x8f,0xcf,0xf0,0x0f,0x89,0xe0,0x15,0x39,0x00,0xf8,0xfe,0x7f,0xff,0xe6,0xa1,0x80,0x42,0x07,0xcf,0xff,0x4c,0x16,0x02,0x3e,0x0f,0x6f,0x84,0x07,0xf8,0x74,0x60,0xfb,0x7f,0x96,0xcb,0x00,0xbf,0xe2,0x07,0xf0,0x36,0x5b,0xf8,}; const uint8_t *_A_Waves_128x52[] = {_A_Waves_128x52_0,_A_Waves_128x52_1}; -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_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_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_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_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_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_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_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}; @@ -303,95 +303,119 @@ const uint8_t *_I_125_10px[] = {_I_125_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_UsbTree_48x22_0[] = {0x01,0x00,0x3c,0x00,0x00,0x14,0x3c,0x08,0x78,0x08,0xf8,0x10,0xff,0xe0,0x59,0xb0,0x04,0x52,0xc0,0x1d,0x48,0xc0,0x9d,0x00,0xa7,0x02,0x80,0x41,0x80,0xa5,0x0e,0x02,0xa4,0xfb,0xfe,0x00,0xa1,0x49,0x04,0x48,0x0a,0x81,0xd1,0xc0,0x40,0x45,0x26,0x05,0x30,0x01,0x41,0xbe,0x10,0x30,0x2c,0x7e,0x3f,0xe0,0x59,0x80,0x04,0x50,0x0a,0x60,}; -const uint8_t *_I_UsbTree_48x22[] = {_I_UsbTree_48x22_0}; +const uint8_t _I_Voldwn_6x6_0[] = {0x00,0x08,0x0C,0x2F,0x2F,0x0C,0x08,}; +const uint8_t *_I_Voldwn_6x6[] = {_I_Voldwn_6x6_0}; -const uint8_t _I_EviWaiting2_18x21_0[] = {0x01,0x00,0x31,0x00,0x86,0x70,0x20,0x10,0x6c,0x04,0x06,0x0f,0x80,0x81,0xf3,0xf9,0xf0,0x3f,0xff,0xfc,0x04,0x7f,0xef,0xfc,0x04,0x04,0xa0,0xb2,0xeb,0xed,0xe0,0x7f,0x7f,0xb8,0x08,0xf1,0xf8,0xf0,0xd4,0xff,0x3f,0xf0,0x0f,0xc5,0xfe,0x01,0xf0,0x9f,0xc0,0x38,0x10,0xf8,0x00,}; -const uint8_t *_I_EviWaiting2_18x21[] = {_I_EviWaiting2_18x21_0}; +const uint8_t _I_Volup_8x6_0[] = {0x00,0x48,0x8C,0xAF,0xAF,0x8C,0x48,}; +const uint8_t *_I_Volup_8x6[] = {_I_Volup_8x6_0}; + +const uint8_t _I_Button_18x18_0[] = {0x01,0x00,0x19,0x00,0xfc,0x7f,0xe0,0x10,0x68,0x04,0x06,0x07,0x00,0x81,0x00,0xbc,0x05,0xe0,0x23,0x83,0xc0,0x20,0x7f,0xef,0xfc,0x07,0xf8,0x32,0x10,}; +const uint8_t *_I_Button_18x18[] = {_I_Button_18x18_0}; + +const uint8_t _I_Pressed_Button_13x13_0[] = {0x01,0x00,0x12,0x00,0xf8,0x40,0x7f,0x90,0x7f,0xf4,0x3c,0x02,0x3f,0xf8,0xf8,0x05,0xc1,0xa6,0x13,0x10,0xb8,0x80,}; +const uint8_t *_I_Pressed_Button_13x13[] = {_I_Pressed_Button_13x13_0}; + +const uint8_t _I_Ble_disconnected_24x34_0[] = {0x01,0x00,0x3c,0x00,0x80,0x7f,0xe0,0x1c,0x08,0x04,0x0e,0x61,0x00,0x86,0x42,0x20,0x11,0x08,0x24,0x02,0x40,0x02,0x28,0x14,0x32,0x80,0x02,0x28,0x0c,0xf3,0x00,0x02,0x3e,0x60,0x08,0xf8,0x30,0xcc,0x18,0x08,0xa0,0x3c,0xf0,0x58,0x80,0x88,0x2e,0xa0,0xb4,0x0b,0xb0,0x8d,0x02,0xea,0x3b,0x52,0x3a,0x94,0x08,0xac,0x45,0xc2,0x31,0x10,}; +const uint8_t *_I_Ble_disconnected_24x34[] = {_I_Ble_disconnected_24x34_0}; + +const uint8_t _I_Space_65x18_0[] = {0x01,0x00,0x26,0x00,0xfc,0x7f,0xc0,0x09,0x7f,0x80,0x41,0x81,0xeb,0x80,0x80,0x40,0xc3,0x2d,0x01,0x04,0x78,0x23,0xc1,0x1e,0x08,0xf0,0x47,0x82,0x3c,0x11,0x70,0x73,0xeb,0x40,0x7f,0xc8,0xf5,0xff,0xc0,0x3f,0x89,0x87,}; +const uint8_t *_I_Space_65x18[] = {_I_Space_65x18_0}; + +const uint8_t _I_Circles_47x47_0[] = {0x01,0x00,0x7e,0x00,0x00,0x0f,0xe2,0x3e,0x04,0x2c,0x04,0x1f,0xc0,0x05,0x2b,0x00,0x08,0x60,0x60,0x21,0x8c,0x00,0x86,0x18,0x02,0x18,0x20,0x08,0x62,0x00,0xe4,0x0a,0x0e,0x00,0x40,0x70,0x0a,0x00,0xb0,0xe0,0x32,0x00,0x29,0xc0,0x80,0xaa,0x1f,0x21,0x39,0x42,0x00,0xa7,0x08,0x02,0xa8,0xd0,0x86,0xc4,0x05,0x1f,0x84,0x1c,0x0a,0x30,0x22,0x28,0x92,0x46,0x40,0x05,0x11,0x61,0x01,0x4a,0x02,0x3e,0x10,0x28,0x91,0x04,0x02,0x32,0x08,0x08,0x14,0xe8,0x00,0xf2,0x09,0x90,0x17,0xc0,0xbe,0x05,0x41,0x7a,0x0e,0xd4,0x8e,0xc5,0x36,0x2f,0x99,0xad,0x4e,0xea,0x89,0xb4,0xda,0xab,0x6d,0x7e,0xac,0xb5,0x6b,0xab,0x8d,0x9d,0xea,0xfb,0x5c,0x04,0x1f,0xe0,0x26,0x3f,0xc4,0x3c,0x06,0x20,}; +const uint8_t *_I_Circles_47x47[] = {_I_Circles_47x47_0}; + +const uint8_t _I_Ok_btn_9x9_0[] = {0x01,0x00,0x0f,0x00,0xbe,0x40,0x30,0x50,0x09,0xcc,0x06,0xfa,0x01,0x40,0x38,0x82,0xc4,0x1e,0x20,}; +const uint8_t *_I_Ok_btn_9x9[] = {_I_Ok_btn_9x9_0}; + +const uint8_t _I_Ble_connected_38x34_0[] = {0x01,0x00,0x60,0x00,0x80,0x7f,0xc0,0x65,0xc0,0xff,0xc0,0xc0,0x83,0xf0,0xff,0xc3,0xc0,0x83,0xf8,0xff,0xc7,0xc0,0x83,0xfc,0xff,0xcf,0xc0,0x8d,0xfe,0xf9,0xdf,0xe0,0x10,0x30,0x21,0xc1,0xff,0xfc,0x31,0x40,0xc3,0x80,0x87,0x0c,0xff,0xcc,0xc0,0x83,0x1c,0x02,0x1c,0x62,0x7f,0xf3,0xfe,0x4c,0x27,0x00,0x42,0xb8,0x4e,0x3f,0xf3,0x0f,0xff,0x80,0x04,0x20,0x11,0xe0,0x00,0x84,0x44,0x20,0x47,0x07,0x20,0x60,0xc4,0x48,0x2c,0x41,0xb2,0x10,0x14,0x94,0x85,0x43,0x2f,0x21,0xa1,0x0e,0xf2,0x86,0x44,0x82,0x26,0x91,0x48,0x80,}; +const uint8_t *_I_Ble_connected_38x34[] = {_I_Ble_connected_38x34_0}; const uint8_t _I_Clock_18x18_0[] = {0x01,0x00,0x31,0x00,0xe0,0x43,0xe0,0x1f,0x09,0xfc,0x03,0xf1,0x7f,0x80,0x47,0x3c,0x10,0x0d,0xf7,0xde,0x02,0x02,0x2d,0xff,0xde,0x07,0x7f,0xfd,0xc0,0xff,0xff,0xc0,0x11,0xdf,0xff,0x30,0x3d,0xff,0xca,0x07,0x3e,0xfa,0x85,0xc7,0xe5,0x01,0x10,0x10,0x98,0x85,0x84,0x32,0x20,}; const uint8_t *_I_Clock_18x18[] = {_I_Clock_18x18_0}; -const uint8_t _I_Smile_18x18_0[] = {0x01,0x00,0x2d,0x00,0xe0,0x43,0xe0,0x1f,0x09,0xfc,0x03,0xf1,0x7f,0x80,0x7f,0x3f,0xf0,0x0f,0xf7,0xfe,0x02,0x02,0x2f,0xff,0xfe,0x07,0xcf,0xe7,0xc0,0xf0,0xf8,0x70,0x11,0x82,0x08,0x1c,0x41,0x42,0xdf,0x7d,0xe0,0x37,0xcf,0xc0,0x98,0xc5,0x84,0x32,0x20,}; -const uint8_t *_I_Smile_18x18[] = {_I_Smile_18x18_0}; - -const uint8_t _I_EviSmile1_18x21_0[] = {0x01,0x00,0x39,0x00,0x86,0x70,0x20,0x10,0x6c,0x04,0x06,0x0f,0x80,0x81,0xf3,0xf9,0xf0,0x3f,0xff,0xfc,0x04,0x7f,0xef,0xfc,0x04,0x04,0xbf,0x7d,0xfc,0x0f,0xcf,0x9f,0x81,0xf1,0xf1,0xf0,0x3c,0x3e,0x1e,0x07,0x8f,0xe3,0x86,0x9b,0xbd,0xef,0x80,0xef,0x3e,0x90,0x0b,0xc5,0xe2,0x01,0xf0,0x9f,0xc0,0x38,0x10,0xf8,0x00,}; -const uint8_t *_I_EviSmile1_18x21[] = {_I_EviSmile1_18x21_0}; - -const uint8_t _I_Percent_10x14_0[] = {0x00,0x0C,0x03,0x1E,0x03,0x33,0x03,0xB3,0x03,0xDE,0x01,0xEC,0x00,0x70,0x00,0x38,0x00,0xDC,0x00,0xEE,0x01,0x37,0x03,0x33,0x03,0xE3,0x01,0xC3,0x00,}; -const uint8_t *_I_Percent_10x14[] = {_I_Percent_10x14_0}; - const uint8_t _I_Error_18x18_0[] = {0x01,0x00,0x2c,0x00,0xe0,0x43,0xe0,0x1f,0x09,0xfc,0x03,0xf1,0x7f,0x80,0x7f,0x3f,0xf0,0x0e,0x77,0x3e,0x03,0x8e,0xe3,0xc0,0x63,0xfe,0x38,0x1c,0xff,0xe1,0x03,0xbf,0xfe,0x00,0x46,0x08,0x20,0x71,0x05,0x08,0x34,0x42,0x02,0x13,0x10,0xb0,0x86,0x44,}; const uint8_t *_I_Error_18x18[] = {_I_Error_18x18_0}; -const uint8_t _I_EviWaiting1_18x21_0[] = {0x01,0x00,0x34,0x00,0x86,0x70,0x20,0x10,0x6c,0x04,0x06,0x0f,0x80,0x81,0xf3,0xf9,0xf0,0x3f,0xff,0xfc,0x04,0x7f,0xef,0xfc,0x04,0x04,0xa0,0xb2,0xdb,0xeb,0xe0,0x7b,0xfd,0xfc,0x0f,0x3f,0x9f,0x81,0xf1,0xf8,0xe1,0xa9,0xfe,0x7f,0xe0,0x1f,0x8b,0xfc,0x03,0xe1,0x3f,0x80,0x70,0x21,0xf0,0x00,}; -const uint8_t *_I_EviWaiting1_18x21[] = {_I_EviWaiting1_18x21_0}; - const uint8_t _I_EviSmile2_18x21_0[] = {0x01,0x00,0x37,0x00,0x00,0x14,0x3b,0x81,0x01,0x83,0xe0,0x20,0x7c,0xfe,0x7c,0x0f,0xff,0xff,0x01,0x1f,0xfb,0xff,0x01,0x01,0x2f,0x9f,0x3f,0x03,0xe3,0xe3,0xe0,0x78,0x7c,0x3c,0x0f,0x1f,0xc7,0x0d,0x37,0x3b,0x99,0x01,0xcf,0x79,0x20,0x33,0xcf,0x84,0x03,0xf1,0x7f,0x80,0x7c,0x27,0xf0,0x0e,0x04,0x3e,0x00,}; const uint8_t *_I_EviSmile2_18x21[] = {_I_EviSmile2_18x21_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_EviWaiting1_18x21_0[] = {0x01,0x00,0x34,0x00,0x86,0x70,0x20,0x10,0x6c,0x04,0x06,0x0f,0x80,0x81,0xf3,0xf9,0xf0,0x3f,0xff,0xfc,0x04,0x7f,0xef,0xfc,0x04,0x04,0xa0,0xb2,0xdb,0xeb,0xe0,0x7b,0xfd,0xfc,0x0f,0x3f,0x9f,0x81,0xf1,0xf8,0xe1,0xa9,0xfe,0x7f,0xe0,0x1f,0x8b,0xfc,0x03,0xe1,0x3f,0x80,0x70,0x21,0xf0,0x00,}; +const uint8_t *_I_EviWaiting1_18x21[] = {_I_EviWaiting1_18x21_0}; + +const uint8_t _I_EviSmile1_18x21_0[] = {0x01,0x00,0x39,0x00,0x86,0x70,0x20,0x10,0x6c,0x04,0x06,0x0f,0x80,0x81,0xf3,0xf9,0xf0,0x3f,0xff,0xfc,0x04,0x7f,0xef,0xfc,0x04,0x04,0xbf,0x7d,0xfc,0x0f,0xcf,0x9f,0x81,0xf1,0xf1,0xf0,0x3c,0x3e,0x1e,0x07,0x8f,0xe3,0x86,0x9b,0xbd,0xef,0x80,0xef,0x3e,0x90,0x0b,0xc5,0xe2,0x01,0xf0,0x9f,0xc0,0x38,0x10,0xf8,0x00,}; +const uint8_t *_I_EviSmile1_18x21[] = {_I_EviSmile1_18x21_0}; + +const uint8_t _I_EviWaiting2_18x21_0[] = {0x01,0x00,0x31,0x00,0x86,0x70,0x20,0x10,0x6c,0x04,0x06,0x0f,0x80,0x81,0xf3,0xf9,0xf0,0x3f,0xff,0xfc,0x04,0x7f,0xef,0xfc,0x04,0x04,0xa0,0xb2,0xeb,0xed,0xe0,0x7f,0x7f,0xb8,0x08,0xf1,0xf8,0xf0,0xd4,0xff,0x3f,0xf0,0x0f,0xc5,0xfe,0x01,0xf0,0x9f,0xc0,0x38,0x10,0xf8,0x00,}; +const uint8_t *_I_EviWaiting2_18x21[] = {_I_EviWaiting2_18x21_0}; + +const uint8_t _I_UsbTree_48x22_0[] = {0x01,0x00,0x3c,0x00,0x00,0x14,0x3c,0x08,0x78,0x08,0xf8,0x10,0xff,0xe0,0x59,0xb0,0x04,0x52,0xc0,0x1d,0x48,0xc0,0x9d,0x00,0xa7,0x02,0x80,0x41,0x80,0xa5,0x0e,0x02,0xa4,0xfb,0xfe,0x00,0xa1,0x49,0x04,0x48,0x0a,0x81,0xd1,0xc0,0x40,0x45,0x26,0x05,0x30,0x01,0x41,0xbe,0x10,0x30,0x2c,0x7e,0x3f,0xe0,0x59,0x80,0x04,0x50,0x0a,0x60,}; +const uint8_t *_I_UsbTree_48x22[] = {_I_UsbTree_48x22_0}; + +const uint8_t _I_Smile_18x18_0[] = {0x01,0x00,0x2d,0x00,0xe0,0x43,0xe0,0x1f,0x09,0xfc,0x03,0xf1,0x7f,0x80,0x7f,0x3f,0xf0,0x0f,0xf7,0xfe,0x02,0x02,0x2f,0xff,0xfe,0x07,0xcf,0xe7,0xc0,0xf0,0xf8,0x70,0x11,0x82,0x08,0x1c,0x41,0x42,0xdf,0x7d,0xe0,0x37,0xcf,0xc0,0x98,0xc5,0x84,0x32,0x20,}; +const uint8_t *_I_Smile_18x18[] = {_I_Smile_18x18_0}; + +const uint8_t _I_Percent_10x14_0[] = {0x00,0x0C,0x03,0x1E,0x03,0x33,0x03,0xB3,0x03,0xDE,0x01,0xEC,0x00,0x70,0x00,0x38,0x00,0xDC,0x00,0xEE,0x01,0x37,0x03,0x33,0x03,0xE3,0x01,0xC3,0x00,}; +const uint8_t *_I_Percent_10x14[] = {_I_Percent_10x14_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_ButtonLeftSmall_3x5_0[] = {0x00,0x04,0x06,0x07,0x06,0x04,}; -const uint8_t *_I_ButtonLeftSmall_3x5[] = {_I_ButtonLeftSmall_3x5_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_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_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_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_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_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_ButtonRightSmall_3x5_0[] = {0x00,0x01,0x03,0x07,0x03,0x01,}; +const uint8_t *_I_ButtonRightSmall_3x5[] = {_I_ButtonRightSmall_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_ButtonUp_7x4_0[] = {0x00,0x08,0x1C,0x3E,0x7F,}; -const uint8_t *_I_ButtonUp_7x4[] = {_I_ButtonUp_7x4_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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}; @@ -402,8 +426,11 @@ const uint8_t *_I_ArrowDownEmpty_14x15[] = {_I_ArrowDownEmpty_14x15_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_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_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_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_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}; @@ -414,81 +441,81 @@ const uint8_t *_I_DoorLeft_70x55[] = {_I_DoorLeft_70x55_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_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_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_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_IrdaArrowUp_4x8_0[] = {0x00,0x18,0x3C,0x7E,0xFF,}; -const uint8_t *_I_IrdaArrowUp_4x8[] = {_I_IrdaArrowUp_4x8_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_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_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_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_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_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_IrdaArrowDown_4x8_0[] = {0x00,0xFF,0x7E,0x3C,0x18,}; -const uint8_t *_I_IrdaArrowDown_4x8[] = {_I_IrdaArrowDown_4x8_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_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_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_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_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_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_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_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_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_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_IrdaArrowUp_4x8_0[] = {0x00,0x18,0x3C,0x7E,0xFF,}; +const uint8_t *_I_IrdaArrowUp_4x8[] = {_I_IrdaArrowUp_4x8_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_IrdaArrowDown_4x8_0[] = {0x00,0xFF,0x7E,0x3C,0x18,}; +const uint8_t *_I_IrdaArrowDown_4x8[] = {_I_IrdaArrowDown_4x8_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_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}; @@ -644,15 +671,18 @@ 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_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_passport_happy1_46x49_0[] = {0x01,0x00,0x09,0x01,0xff,0x7f,0xc0,0x05,0x1f,0x02,0x1f,0xfe,0x7f,0xff,0x87,0xe0,0x00,0xa7,0xf1,0xbf,0x85,0x04,0x0a,0x30,0xec,0x07,0xe4,0x0a,0x37,0xf8,0x0c,0x03,0xec,0x05,0x1d,0xf8,0x98,0x7d,0x00,0x51,0xaf,0x81,0x47,0xa0,0x05,0x19,0x78,0x14,0xa0,0x73,0xf8,0xb8,0x14,0x74,0x1f,0xc9,0xf0,0x14,0xa4,0x10,0x39,0xec,0x2c,0x0a,0x3c,0x08,0x04,0xe8,0x0a,0x52,0x00,0x28,0xc1,0x7c,0x10,0x08,0x87,0x82,0x77,0x05,0xfc,0x40,0xe1,0x1f,0x80,0x28,0xff,0x20,0x70,0x4f,0xe4,0xf6,0x07,0xfe,0x80,0xc0,0xbf,0xd3,0xe8,0x1e,0x7a,0x0f,0x00,0xbf,0xcf,0xe0,0x74,0xe8,0x46,0x03,0x7e,0x05,0x19,0x70,0xbc,0x7b,0xe0,0x51,0x8a,0x40,0x3c,0x1e,0xf0,0x28,0xc4,0x20,0x1f,0x0f,0xb8,0x14,0xff,0x1f,0xb9,0xf9,0xa8,0x60,0x3f,0xcf,0xc8,0x14,0xff,0xde,0x70,0x29,0x61,0xb0,0xf9,0xf0,0x29,0x12,0x06,0xfd,0x3e,0x02,0x8f,0x82,0x0f,0xf8,0x9c,0x81,0x44,0x80,0x3e,0x09,0xb8,0x14,0x94,0x43,0x2b,0x80,0xcc,0x20,0xc0,0x71,0x94,0x40,0x69,0x10,0x90,0x29,0xe2,0x21,0x00,0x51,0x9b,0x01,0x4f,0xc0,0x23,0x1c,0x24,0x43,0xf5,0x1f,0x17,0x88,0x14,0x7e,0x1e,0x31,0xd8,0xe0,0xa4,0x18,0x02,0x99,0x01,0x46,0x01,0xfa,0x02,0x8e,0x06,0x80,0x05,0x6f,0xa4,0xff,0x03,0x80,0xc0,0x01,0x4a,0x82,0x04,0x18,0x08,0x14,0xb8,0x10,0x18,0x0f,0xa2,0x7f,0x21,0x02,0x8c,0x08,0x0a,0x31,0x10,0x28,0xc1,0x3a,0x13,0xf8,0x6f,0x82,0x07,0x18,0x02,0x8c,0x0c,0x0a,0x3e,0x0d,0x00,0xbc,0x7e,0x0b,0x31,0xb3,0xcf,0xff,0xdf,0xf0,0x01,0x47,0xc0,}; const uint8_t *_I_passport_happy1_46x49[] = {_I_passport_happy1_46x49_0}; +const uint8_t _I_passport_happy2_46x49_0[] = {0x01,0x00,0x16,0x01,0xff,0x7f,0xc0,0x05,0x1f,0x02,0x1f,0xfe,0x7f,0xff,0x87,0xe0,0x00,0xa7,0xf1,0xbf,0x85,0x04,0x0a,0x30,0xec,0x07,0x84,0x0a,0x37,0xf8,0x0c,0x03,0xbe,0x05,0x1d,0xfc,0xfb,0x81,0xa0,0x02,0x8f,0x7f,0x83,0x21,0xa4,0x43,0xe7,0xf2,0xf8,0x06,0x4a,0xa1,0xf3,0x9f,0x45,0xe0,0x10,0xcc,0x8c,0x32,0x7b,0x17,0xb8,0x42,0x30,0x50,0x39,0xd4,0x2f,0x19,0x25,0xe1,0x40,0x26,0x90,0xb8,0x15,0x1a,0x40,0x05,0x18,0x2f,0x86,0x89,0x18,0xf0,0x4d,0xe0,0xbf,0x98,0x2c,0x13,0xf1,0x3b,0xc2,0xff,0x20,0xb0,0x2f,0xe4,0xf7,0x07,0xfe,0x82,0xc0,0x7f,0xd3,0xec,0x1e,0x7b,0x8f,0x00,0xbf,0xcf,0xf0,0x74,0xc9,0xc6,0x03,0x7f,0x3f,0x81,0xc8,0x60,0x1c,0x0e,0xf8,0x14,0x62,0xd0,0x0f,0x07,0xbc,0x0a,0x31,0x88,0x07,0xc3,0xee,0x05,0x18,0x84,0x03,0xf1,0xfb,0x9f,0x9a,0x86,0x03,0xfc,0xfc,0x81,0x4f,0xfd,0xe7,0x02,0x96,0x1b,0x0f,0x9f,0x02,0x97,0xe2,0x07,0x7e,0x9f,0x01,0x47,0xc1,0x07,0xfc,0x4c,0x40,0xa2,0x40,0x1f,0x04,0xbc,0x0a,0x4a,0x21,0x95,0xc0,0x66,0x10,0x60,0x38,0xca,0x20,0x34,0x88,0x48,0x14,0xf1,0x10,0x80,0x28,0xcd,0x80,0xa7,0xe0,0x9c,0xc0,0x70,0x91,0x0f,0xd4,0x7c,0x5e,0x20,0x51,0xf8,0x78,0xc7,0x63,0x82,0x90,0x60,0x0a,0x64,0x05,0x18,0x07,0xe8,0x0a,0x38,0x1a,0x00,0x15,0xbe,0x93,0xfc,0x0e,0x03,0x00,0x05,0x2a,0x08,0x10,0x60,0x20,0x52,0xe0,0x40,0x60,0x3e,0x89,0xfc,0x84,0x0a,0x30,0x20,0x28,0xc4,0x40,0xa3,0x04,0xe8,0x4f,0xe1,0xbe,0x04,0x88,0x81,0x46,0x06,0x05,0x1f,0x06,0x80,0x5e,0x3f,0x08,0x3c,0x02,0xcf,0x3f,0xff,0x7f,0xc0,0x05,0x1f,}; +const uint8_t *_I_passport_happy2_46x49[] = {_I_passport_happy2_46x49_0}; + const uint8_t _I_passport_bad3_46x49_0[] = {0x01,0x00,0x07,0x01,0xff,0x7f,0xc0,0x05,0x1f,0x02,0x1f,0xfe,0x7e,0x02,0x18,0x0f,0xc0,0x0a,0x57,0xff,0xf7,0xbc,0x0a,0x59,0xf8,0x0f,0x40,0x0a,0x56,0xf8,0x04,0xe0,0x0a,0x51,0x78,0x07,0x1b,0xfc,0x05,0x18,0x5c,0x02,0x03,0xfd,0x02,0x8c,0x37,0x01,0x00,0xfd,0x01,0x46,0x15,0x40,0x80,0x7d,0x27,0xf7,0xf8,0x48,0x14,0xf7,0xf0,0x80,0x28,0xfa,0x00,0xa5,0x20,0x80,0x72,0x27,0xf5,0xf8,0x80,0x14,0x76,0x00,0x52,0x9f,0xc0,0x2f,0xd3,0xf9,0x7e,0x82,0x81,0xc0,0xc8,0xcf,0xa5,0xf6,0x0d,0x3c,0xe3,0x20,0x05,0x1d,0x05,0x32,0x4b,0xa0,0x9f,0x45,0xec,0x11,0xc9,0x18,0x14,0xe6,0x94,0x10,0x29,0xd7,0x00,0xa9,0x62,0x02,0x9f,0x02,0x83,0x41,0x11,0x88,0x14,0x77,0xf2,0x00,0x29,0x48,0x39,0x92,0x7a,0x84,0xfe,0x27,0x10,0x9c,0x7e,0x2f,0xf3,0xf8,0xea,0x78,0x68,0x18,0x09,0xf4,0x7c,0x0a,0x27,0x21,0x9e,0xc6,0xd5,0x65,0x01,0x9d,0x44,0xe0,0x10,0xe8,0x04,0x0a,0x69,0x63,0x80,0x4c,0x60,0x10,0x49,0xa6,0x0e,0x03,0xc0,0x80,0x42,0x25,0x10,0x38,0x34,0x02,0x06,0x05,0x28,0x44,0x02,0x19,0x10,0x02,0x8c,0x42,0x01,0x30,0xf8,0x4b,0xe0,0x71,0x48,0x07,0x02,0x3f,0x2c,0x05,0x8e,0x02,0x03,0x00,0x94,0x43,0xc2,0x22,0x30,0x19,0xa5,0xc4,0x0a,0x3f,0xc8,0x04,0xef,0x02,0x3c,0x16,0xe8,0xcf,0x60,0x31,0xc0,0xe8,0xdf,0xe7,0xd0,0x1b,0x01,0x34,0x77,0xf3,0xf8,0x08,0x88,0xb7,0x80,0x51,0x80,0x10,0x87,0x40,0x05,0x22,0x10,0xd8,0x00,0xa5,0x0a,0x05,0x88,0x74,0x41,0x64,0x05,0x7f,0xf7,0xfc,0x00,0x51,0xf0,}; const uint8_t *_I_passport_bad3_46x49[] = {_I_passport_bad3_46x49_0}; @@ -662,35 +692,44 @@ const uint8_t *_I_passport_okay2_46x49[] = {_I_passport_okay2_46x49_0}; const uint8_t _I_passport_bad2_46x49_0[] = {0x01,0x00,0xee,0x00,0xff,0x7f,0xc0,0x05,0x1f,0x02,0x1f,0xfe,0x7e,0x02,0x18,0x0f,0xe0,0x0a,0x57,0xff,0xf7,0x9c,0x0a,0x59,0xf8,0x0e,0x60,0x0a,0x5e,0xf8,0xfd,0x83,0xfc,0x05,0x18,0xbd,0x83,0x01,0xfd,0x02,0x8c,0x2f,0x01,0x01,0xfd,0x01,0x46,0x0b,0x00,0x81,0x7d,0x00,0xa3,0x02,0x80,0x41,0x3d,0x13,0xfb,0xfc,0x04,0x0a,0x3d,0x09,0xfe,0xfc,0x88,0x30,0x80,0x2a,0xea,0xa7,0xf5,0xf8,0x04,0x7e,0xa1,0xb5,0x02,0x8f,0x02,0xc1,0xb8,0xbf,0x4f,0xe5,0xf2,0x0e,0x07,0x53,0x03,0x3e,0x02,0x8e,0x9e,0x75,0x80,0x02,0x8e,0x42,0x9d,0x05,0xd1,0x4f,0xa2,0xf5,0x08,0xf4,0x0c,0x0a,0x73,0x69,0x08,0x14,0xab,0x17,0xe0,0x29,0xd4,0x2f,0x80,0x53,0xcc,0x50,0x24,0x22,0x31,0x8b,0xfc,0x08,0x62,0x05,0x29,0x07,0x32,0x0f,0x40,0x9f,0xc5,0xe2,0x13,0x8f,0xc5,0xfe,0x7f,0x1b,0x4f,0x90,0x44,0x40,0xa7,0x00,0x9e,0x81,0x52,0x75,0x1d,0x80,0x43,0x80,0xa3,0x34,0x86,0xc0,0x26,0x20,0x54,0xe0,0x01,0x46,0x51,0x0b,0x01,0x8c,0x0c,0x0a,0x90,0xc0,0x2a,0x4c,0x3e,0x12,0xb0,0x28,0xcc,0x38,0x10,0xf9,0x64,0x24,0x3a,0x29,0xd1,0x94,0x01,0x47,0x00,0x30,0x19,0xa0,0x14,0x60,0x1f,0xd8,0x04,0xec,0x0a,0x5f,0xaf,0xfc,0xf4,0x0a,0x5f,0x4b,0xfc,0xf8,0x0a,0x5a,0x8d,0xfc,0xfc,0x0a,0x54,0x00,0x2a,0x60,0x37,0x40,0x53,0x80,0x2e,0x44,0x0a,0x7a,0x00,0x2e,0x7f,0xbf,0xe0,0x02,0x8f,0x80,}; const uint8_t *_I_passport_bad2_46x49[] = {_I_passport_bad2_46x49_0}; -const uint8_t _I_passport_okay3_46x49_0[] = {0x01,0x00,0x06,0x01,0xff,0x7f,0xc0,0x05,0x1f,0x02,0x1f,0xfe,0x7e,0x02,0x2c,0x00,0x14,0xfb,0xf7,0xff,0xe0,0x14,0xa4,0xf8,0x0f,0x18,0x14,0xaf,0x30,0x0c,0xe0,0x14,0x6f,0xf8,0x68,0x05,0xa0,0x0a,0x3b,0xf8,0x0c,0x07,0x11,0x3e,0xff,0xd7,0xe0,0x10,0x28,0x44,0xf7,0xff,0x2f,0x02,0x8c,0x12,0x75,0xff,0x8b,0xc0,0x20,0x80,0x52,0x85,0x81,0x4a,0x68,0x05,0x28,0x44,0x08,0x0a,0x30,0x50,0x29,0x4a,0x00,0xa5,0xfc,0x81,0x81,0x4e,0x05,0x06,0x98,0x01,0x4b,0xf3,0x04,0x02,0x8f,0xfb,0x07,0x04,0x84,0xcc,0x2f,0xf0,0x1c,0xee,0x2a,0x15,0x28,0x02,0x8f,0x86,0xe4,0x05,0x1d,0xfe,0x03,0x01,0x52,0x02,0xa0,0x2c,0x64,0x80,0x52,0xc5,0x43,0x80,0xa7,0x07,0x87,0x81,0x4a,0x01,0xff,0x83,0xc8,0xb7,0xf0,0x08,0x0c,0x3a,0x09,0x22,0x14,0x94,0x16,0x11,0x21,0xbf,0xe0,0x6f,0xf0,0x40,0x28,0xff,0xef,0xd1,0x45,0x60,0xc8,0x67,0xf0,0x38,0x58,0x7c,0x64,0x5d,0xfe,0x04,0x18,0x0a,0x33,0xc9,0x7e,0x82,0x03,0x40,0x80,0x48,0x22,0xf5,0x08,0x00,0x14,0xa1,0x60,0x51,0x90,0x40,0x26,0x10,0x59,0x44,0x02,0x21,0x00,0x94,0x01,0x4a,0x1d,0x00,0x92,0x01,0x47,0x81,0x01,0x02,0x8f,0x96,0x57,0x3c,0x1a,0x8c,0x8a,0x36,0x8d,0x10,0x29,0x2b,0x04,0x00,0x52,0x15,0xc0,0x80,0x07,0x00,0x41,0x18,0x07,0x82,0x1f,0x80,0x92,0x37,0x88,0x30,0x32,0x9f,0xff,0x83,0xfe,0x12,0x19,0x97,0xff,0xdf,0x1f,0x02,0x8c,0x90,0x0a,0x30,0xf0,0x28,0xae,0x47,0xde,0x3a,0x12,0x68,0xb8,0xc8,0x00,0x32,0x0f,0xf0,0x8c,0x40,0x03,0x1f,}; -const uint8_t *_I_passport_okay3_46x49[] = {_I_passport_okay3_46x49_0}; +const uint8_t _I_passport_bad1_46x49_0[] = {0x01,0x00,0xd2,0x00,0xff,0x7f,0xc0,0x05,0x1f,0x02,0x1f,0xfe,0x7e,0x02,0x18,0x0f,0xe0,0x0a,0x57,0xff,0xf7,0x9c,0x0a,0x59,0xf8,0x0e,0x60,0x0a,0x56,0xf8,0x05,0x83,0xfc,0x05,0x18,0xbc,0x03,0x01,0xfd,0x02,0x8c,0x2c,0x5a,0x3f,0xa0,0x28,0xc1,0x40,0xa3,0xf4,0x02,0x8c,0x08,0x0a,0x77,0xf8,0x08,0x14,0x7d,0x13,0xfd,0xf9,0x14,0x80,0xab,0xd0,0x9f,0xd7,0xe0,0x10,0x60,0x2a,0x42,0x20,0x1a,0x09,0xfc,0xbe,0x01,0x10,0x02,0xa5,0x9c,0x0a,0x78,0x0e,0x74,0x04,0x0a,0x31,0x7a,0x06,0x7a,0x06,0x05,0x39,0xb0,0x44,0x80,0xa3,0x7e,0x02,0xa5,0xf0,0x0a,0x78,0x0a,0x00,0x14,0xf8,0x13,0xf0,0x29,0xc8,0x07,0x66,0x70,0x11,0xd8,0xea,0xa7,0xf1,0xb2,0x99,0x4c,0x00,0xa9,0xc0,0x9f,0x01,0x4e,0x01,0x3d,0x02,0x8c,0x38,0x0a,0x33,0xa8,0x6c,0x02,0x62,0x05,0x19,0xa0,0x14,0x78,0x00,0x51,0x94,0x01,0x46,0x01,0x03,0x02,0xa4,0x30,0x0a,0x2a,0x02,0x98,0x7c,0x25,0x60,0x52,0xe0,0x43,0xe5,0x80,0x51,0xc0,0x27,0x46,0x51,0x09,0x05,0x88,0xc0,0x66,0x80,0x52,0xfe,0x40,0x27,0x60,0x52,0xf8,0x7f,0xe7,0xa0,0x52,0xe0,0x5f,0xe7,0xc0,0x52,0x80,0x6f,0xe7,0xe0,0x53,0xde,0x01,0x50,0xe2,0x20,0x5f,0x02,0xbf,0xfb,0xfe,0x00,0x28,0xf8,}; +const uint8_t *_I_passport_bad1_46x49[] = {_I_passport_bad1_46x49_0}; const uint8_t _I_passport_bottom_128x18_0[] = {0x01,0x00,0x54,0x00,0x99,0x01,0x97,0xf1,0xff,0x00,0x2e,0x1c,0x1e,0xdf,0xc0,0x7b,0x63,0xe6,0xc0,0xfe,0x9e,0x03,0xfa,0x70,0x0f,0xe9,0x80,0x7f,0xc1,0xfd,0x04,0x37,0xf7,0xc9,0x1d,0xb8,0x08,0x4c,0x04,0x1f,0xb0,0x58,0x10,0x3f,0x38,0x00,0xfe,0xb0,0x41,0x7e,0x44,0x96,0x00,0x2c,0xfe,0x0b,0xfa,0x07,0xe4,0x7e,0x13,0x79,0x1d,0xce,0x02,0x03,0xc0,0x80,0x7c,0xf9,0x83,0xb9,0x80,0x40,0xc0,0x43,0x06,0xc3,0x0e,0xe6,0x01,0xfe,0x01,0x0f,0xf2,0x06,0x90,0xd0,}; const uint8_t *_I_passport_bottom_128x18[] = {_I_passport_bottom_128x18_0}; -const uint8_t _I_passport_bad1_46x49_0[] = {0x01,0x00,0xd2,0x00,0xff,0x7f,0xc0,0x05,0x1f,0x02,0x1f,0xfe,0x7e,0x02,0x18,0x0f,0xe0,0x0a,0x57,0xff,0xf7,0x9c,0x0a,0x59,0xf8,0x0e,0x60,0x0a,0x56,0xf8,0x05,0x83,0xfc,0x05,0x18,0xbc,0x03,0x01,0xfd,0x02,0x8c,0x2c,0x5a,0x3f,0xa0,0x28,0xc1,0x40,0xa3,0xf4,0x02,0x8c,0x08,0x0a,0x77,0xf8,0x08,0x14,0x7d,0x13,0xfd,0xf9,0x14,0x80,0xab,0xd0,0x9f,0xd7,0xe0,0x10,0x60,0x2a,0x42,0x20,0x1a,0x09,0xfc,0xbe,0x01,0x10,0x02,0xa5,0x9c,0x0a,0x78,0x0e,0x74,0x04,0x0a,0x31,0x7a,0x06,0x7a,0x06,0x05,0x39,0xb0,0x44,0x80,0xa3,0x7e,0x02,0xa5,0xf0,0x0a,0x78,0x0a,0x00,0x14,0xf8,0x13,0xf0,0x29,0xc8,0x07,0x66,0x70,0x11,0xd8,0xea,0xa7,0xf1,0xb2,0x99,0x4c,0x00,0xa9,0xc0,0x9f,0x01,0x4e,0x01,0x3d,0x02,0x8c,0x38,0x0a,0x33,0xa8,0x6c,0x02,0x62,0x05,0x19,0xa0,0x14,0x78,0x00,0x51,0x94,0x01,0x46,0x01,0x03,0x02,0xa4,0x30,0x0a,0x2a,0x02,0x98,0x7c,0x25,0x60,0x52,0xe0,0x43,0xe5,0x80,0x51,0xc0,0x27,0x46,0x51,0x09,0x05,0x88,0xc0,0x66,0x80,0x52,0xfe,0x40,0x27,0x60,0x52,0xf8,0x7f,0xe7,0xa0,0x52,0xe0,0x5f,0xe7,0xc0,0x52,0x80,0x6f,0xe7,0xe0,0x53,0xde,0x01,0x50,0xe2,0x20,0x5f,0x02,0xbf,0xfb,0xfe,0x00,0x28,0xf8,}; -const uint8_t *_I_passport_bad1_46x49[] = {_I_passport_bad1_46x49_0}; - const uint8_t _I_passport_happy3_46x49_0[] = {0x01,0x00,0x23,0x01,0xff,0x7f,0xc0,0x05,0x1f,0x02,0x1f,0xfe,0x7f,0xff,0x81,0xe0,0x00,0xa7,0xfc,0xbf,0xff,0x00,0xa3,0x7f,0x85,0xe0,0x3e,0x60,0x51,0xdf,0xc1,0x38,0x1e,0xc0,0x28,0xd7,0xe0,0x52,0x0e,0x98,0x14,0x65,0xf0,0x28,0x86,0x92,0x1f,0x3f,0x8b,0xc0,0xa1,0x14,0x8f,0x9c,0xfa,0x2f,0x04,0x84,0x64,0x21,0x93,0xd8,0x5f,0xf2,0x6b,0xa0,0x81,0xce,0xa1,0x70,0x2a,0x37,0x82,0x05,0x34,0x82,0xfe,0x70,0x92,0x08,0x24,0xd3,0x1b,0x04,0x82,0xc4,0x7d,0x13,0x7c,0xbf,0xca,0x0b,0x0d,0xfc,0x4e,0xf4,0x7f,0xa8,0x2c,0x0f,0xf9,0x3d,0xe1,0xe7,0xa0,0xf0,0x1f,0xf4,0xfb,0x07,0x8e,0xe3,0xc0,0x2f,0xf3,0xfc,0x0d,0xd2,0x71,0x80,0xdf,0x81,0x46,0x73,0x00,0xe0,0x77,0xe7,0xf0,0x18,0x9c,0x03,0xc1,0xef,0x02,0x8c,0x7a,0x01,0xf0,0xfb,0x81,0x46,0x21,0x00,0xfc,0x7e,0xe7,0xf0,0x38,0x04,0x07,0xf9,0xf9,0x9f,0xc1,0x40,0xa3,0xfe,0xf3,0xcf,0xe1,0x30,0x0c,0x36,0x1f,0x3f,0x3f,0x88,0x85,0x86,0x07,0x7e,0x9f,0x48,0x45,0x03,0x07,0xfc,0x4c,0x68,0x2a,0xa1,0xbf,0xf8,0x25,0xf4,0x30,0x28,0xa8,0x86,0x57,0x47,0x98,0x41,0x80,0xe3,0x28,0x96,0xd2,0x04,0xa2,0x05,0x18,0xce,0x22,0x10,0x05,0x19,0xb4,0xc4,0x0a,0x5e,0x09,0xcd,0x87,0x09,0x10,0xfd,0x47,0xe7,0xdc,0x10,0x28,0xfc,0x3c,0x66,0x51,0xc1,0x48,0x30,0x05,0x31,0x02,0x94,0x03,0xf4,0x05,0x1c,0x0d,0x00,0x0a,0xdf,0x40,0x28,0xe0,0x30,0x00,0x52,0xa0,0x81,0x06,0x02,0x05,0x2e,0x04,0x06,0x03,0xe8,0x9f,0xc8,0x40,0xa3,0x02,0x02,0x8c,0x44,0x0a,0x30,0x4e,0x84,0xfe,0x1b,0xe0,0x81,0xc6,0x00,0xa3,0x03,0x02,0x8f,0x83,0x40,0x95,0x1f,0x84,0x1e,0x01,0x67,0x9f,0xff,0xbf,0xe0,0x02,0x8f,0x80,}; const uint8_t *_I_passport_happy3_46x49[] = {_I_passport_happy3_46x49_0}; -const uint8_t _I_passport_happy2_46x49_0[] = {0x01,0x00,0x16,0x01,0xff,0x7f,0xc0,0x05,0x1f,0x02,0x1f,0xfe,0x7f,0xff,0x87,0xe0,0x00,0xa7,0xf1,0xbf,0x85,0x04,0x0a,0x30,0xec,0x07,0x84,0x0a,0x37,0xf8,0x0c,0x03,0xbe,0x05,0x1d,0xfc,0xfb,0x81,0xa0,0x02,0x8f,0x7f,0x83,0x21,0xa4,0x43,0xe7,0xf2,0xf8,0x06,0x4a,0xa1,0xf3,0x9f,0x45,0xe0,0x10,0xcc,0x8c,0x32,0x7b,0x17,0xb8,0x42,0x30,0x50,0x39,0xd4,0x2f,0x19,0x25,0xe1,0x40,0x26,0x90,0xb8,0x15,0x1a,0x40,0x05,0x18,0x2f,0x86,0x89,0x18,0xf0,0x4d,0xe0,0xbf,0x98,0x2c,0x13,0xf1,0x3b,0xc2,0xff,0x20,0xb0,0x2f,0xe4,0xf7,0x07,0xfe,0x82,0xc0,0x7f,0xd3,0xec,0x1e,0x7b,0x8f,0x00,0xbf,0xcf,0xf0,0x74,0xc9,0xc6,0x03,0x7f,0x3f,0x81,0xc8,0x60,0x1c,0x0e,0xf8,0x14,0x62,0xd0,0x0f,0x07,0xbc,0x0a,0x31,0x88,0x07,0xc3,0xee,0x05,0x18,0x84,0x03,0xf1,0xfb,0x9f,0x9a,0x86,0x03,0xfc,0xfc,0x81,0x4f,0xfd,0xe7,0x02,0x96,0x1b,0x0f,0x9f,0x02,0x97,0xe2,0x07,0x7e,0x9f,0x01,0x47,0xc1,0x07,0xfc,0x4c,0x40,0xa2,0x40,0x1f,0x04,0xbc,0x0a,0x4a,0x21,0x95,0xc0,0x66,0x10,0x60,0x38,0xca,0x20,0x34,0x88,0x48,0x14,0xf1,0x10,0x80,0x28,0xcd,0x80,0xa7,0xe0,0x9c,0xc0,0x70,0x91,0x0f,0xd4,0x7c,0x5e,0x20,0x51,0xf8,0x78,0xc7,0x63,0x82,0x90,0x60,0x0a,0x64,0x05,0x18,0x07,0xe8,0x0a,0x38,0x1a,0x00,0x15,0xbe,0x93,0xfc,0x0e,0x03,0x00,0x05,0x2a,0x08,0x10,0x60,0x20,0x52,0xe0,0x40,0x60,0x3e,0x89,0xfc,0x84,0x0a,0x30,0x20,0x28,0xc4,0x40,0xa3,0x04,0xe8,0x4f,0xe1,0xbe,0x04,0x88,0x81,0x46,0x06,0x05,0x1f,0x06,0x80,0x5e,0x3f,0x08,0x3c,0x02,0xcf,0x3f,0xff,0x7f,0xc0,0x05,0x1f,}; -const uint8_t *_I_passport_happy2_46x49[] = {_I_passport_happy2_46x49_0}; - -const uint8_t _I_passport_okay1_46x49_0[] = {0x01,0x00,0xcc,0x00,0xff,0x7f,0xc0,0x05,0x1f,0x02,0x1f,0xfe,0x7e,0x02,0x1b,0xfc,0x00,0x0a,0x78,0xff,0xff,0xe0,0x0a,0x57,0x38,0x07,0x9c,0x0a,0x50,0xc8,0x06,0x60,0x0a,0x37,0xf8,0x1c,0x02,0xc0,0x05,0x1d,0xf8,0xb4,0x70,0x13,0xef,0xfd,0x7c,0x68,0x53,0xdf,0xfc,0xbc,0x0a,0x53,0xaf,0xfc,0x5c,0x0b,0x13,0x4f,0xfc,0x2c,0x0b,0x12,0x8f,0xfc,0x14,0x0a,0xdf,0x08,0x0c,0xc3,0xff,0x02,0x80,0x7a,0x20,0x60,0x53,0xfa,0x41,0xc0,0xa7,0x12,0x87,0xc8,0x00,0xa5,0x92,0x02,0xa7,0xc8,0x0b,0x5e,0x28,0x58,0x14,0xe0,0x90,0xc0,0x29,0xfa,0x20,0xe0,0x51,0x1d,0x8c,0x42,0x10,0x05,0x38,0x44,0x40,0x0a,0x38,0x58,0x78,0x30,0x40,0xa3,0x7d,0x29,0x94,0x82,0xff,0x06,0x02,0x9e,0x7e,0x02,0x88,0x10,0x28,0xdb,0xd1,0xc4,0x05,0x13,0xe1,0x50,0x00,0xa2,0x76,0x29,0x00,0x15,0x22,0x00,0x51,0x3e,0x14,0x38,0x0a,0x7c,0x01,0x28,0xc8,0x3c,0xb0,0xf9,0xe0,0x64,0xa3,0x7f,0x05,0xf8,0x8a,0x50,0x0a,0x4b,0x83,0x02,0x8f,0x7e,0x01,0xe0,0x2a,0x0c,0x81,0xbc,0x41,0x81,0x2c,0x8f,0x83,0xfe,0x11,0x2f,0xff,0xbe,0x3e,0x05,0x40,0xb0,0x81,0x4c,0x74,0x20,0x52,0x15,0x1c,0x83,0xfc,0x23,0x10,0x00,0xc7,0xc0,}; -const uint8_t *_I_passport_okay1_46x49[] = {_I_passport_okay1_46x49_0}; - const uint8_t _I_passport_left_6x46_0[] = {0x01,0x00,0x1b,0x00,0x9e,0x40,0xa3,0x32,0x59,0x2c,0x66,0x03,0x01,0x82,0xc2,0x62,0x32,0x50,0x16,0xc8,0x60,0x30,0x28,0x34,0x3a,0x3d,0x3e,0x9d,0x4c,0x80,0x14,}; const uint8_t *_I_passport_left_6x46[] = {_I_passport_left_6x46_0}; +const uint8_t _I_passport_okay3_46x49_0[] = {0x01,0x00,0x06,0x01,0xff,0x7f,0xc0,0x05,0x1f,0x02,0x1f,0xfe,0x7e,0x02,0x2c,0x00,0x14,0xfb,0xf7,0xff,0xe0,0x14,0xa4,0xf8,0x0f,0x18,0x14,0xaf,0x30,0x0c,0xe0,0x14,0x6f,0xf8,0x68,0x05,0xa0,0x0a,0x3b,0xf8,0x0c,0x07,0x11,0x3e,0xff,0xd7,0xe0,0x10,0x28,0x44,0xf7,0xff,0x2f,0x02,0x8c,0x12,0x75,0xff,0x8b,0xc0,0x20,0x80,0x52,0x85,0x81,0x4a,0x68,0x05,0x28,0x44,0x08,0x0a,0x30,0x50,0x29,0x4a,0x00,0xa5,0xfc,0x81,0x81,0x4e,0x05,0x06,0x98,0x01,0x4b,0xf3,0x04,0x02,0x8f,0xfb,0x07,0x04,0x84,0xcc,0x2f,0xf0,0x1c,0xee,0x2a,0x15,0x28,0x02,0x8f,0x86,0xe4,0x05,0x1d,0xfe,0x03,0x01,0x52,0x02,0xa0,0x2c,0x64,0x80,0x52,0xc5,0x43,0x80,0xa7,0x07,0x87,0x81,0x4a,0x01,0xff,0x83,0xc8,0xb7,0xf0,0x08,0x0c,0x3a,0x09,0x22,0x14,0x94,0x16,0x11,0x21,0xbf,0xe0,0x6f,0xf0,0x40,0x28,0xff,0xef,0xd1,0x45,0x60,0xc8,0x67,0xf0,0x38,0x58,0x7c,0x64,0x5d,0xfe,0x04,0x18,0x0a,0x33,0xc9,0x7e,0x82,0x03,0x40,0x80,0x48,0x22,0xf5,0x08,0x00,0x14,0xa1,0x60,0x51,0x90,0x40,0x26,0x10,0x59,0x44,0x02,0x21,0x00,0x94,0x01,0x4a,0x1d,0x00,0x92,0x01,0x47,0x81,0x01,0x02,0x8f,0x96,0x57,0x3c,0x1a,0x8c,0x8a,0x36,0x8d,0x10,0x29,0x2b,0x04,0x00,0x52,0x15,0xc0,0x80,0x07,0x00,0x41,0x18,0x07,0x82,0x1f,0x80,0x92,0x37,0x88,0x30,0x32,0x9f,0xff,0x83,0xfe,0x12,0x19,0x97,0xff,0xdf,0x1f,0x02,0x8c,0x90,0x0a,0x30,0xf0,0x28,0xae,0x47,0xde,0x3a,0x12,0x68,0xb8,0xc8,0x00,0x32,0x0f,0xf0,0x8c,0x40,0x03,0x1f,}; +const uint8_t *_I_passport_okay3_46x49[] = {_I_passport_okay3_46x49_0}; + +const uint8_t _I_passport_okay1_46x49_0[] = {0x01,0x00,0xcc,0x00,0xff,0x7f,0xc0,0x05,0x1f,0x02,0x1f,0xfe,0x7e,0x02,0x1b,0xfc,0x00,0x0a,0x78,0xff,0xff,0xe0,0x0a,0x57,0x38,0x07,0x9c,0x0a,0x50,0xc8,0x06,0x60,0x0a,0x37,0xf8,0x1c,0x02,0xc0,0x05,0x1d,0xf8,0xb4,0x70,0x13,0xef,0xfd,0x7c,0x68,0x53,0xdf,0xfc,0xbc,0x0a,0x53,0xaf,0xfc,0x5c,0x0b,0x13,0x4f,0xfc,0x2c,0x0b,0x12,0x8f,0xfc,0x14,0x0a,0xdf,0x08,0x0c,0xc3,0xff,0x02,0x80,0x7a,0x20,0x60,0x53,0xfa,0x41,0xc0,0xa7,0x12,0x87,0xc8,0x00,0xa5,0x92,0x02,0xa7,0xc8,0x0b,0x5e,0x28,0x58,0x14,0xe0,0x90,0xc0,0x29,0xfa,0x20,0xe0,0x51,0x1d,0x8c,0x42,0x10,0x05,0x38,0x44,0x40,0x0a,0x38,0x58,0x78,0x30,0x40,0xa3,0x7d,0x29,0x94,0x82,0xff,0x06,0x02,0x9e,0x7e,0x02,0x88,0x10,0x28,0xdb,0xd1,0xc4,0x05,0x13,0xe1,0x50,0x00,0xa2,0x76,0x29,0x00,0x15,0x22,0x00,0x51,0x3e,0x14,0x38,0x0a,0x7c,0x01,0x28,0xc8,0x3c,0xb0,0xf9,0xe0,0x64,0xa3,0x7f,0x05,0xf8,0x8a,0x50,0x0a,0x4b,0x83,0x02,0x8f,0x7e,0x01,0xe0,0x2a,0x0c,0x81,0xbc,0x41,0x81,0x2c,0x8f,0x83,0xfe,0x11,0x2f,0xff,0xbe,0x3e,0x05,0x40,0xb0,0x81,0x4c,0x74,0x20,0x52,0x15,0x1c,0x83,0xfc,0x23,0x10,0x00,0xc7,0xc0,}; +const uint8_t *_I_passport_okay1_46x49[] = {_I_passport_okay1_46x49_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_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_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}; + +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_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_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_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_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}; @@ -698,29 +737,17 @@ 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_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_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}; - -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_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_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_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_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_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_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}; @@ -731,75 +758,75 @@ const uint8_t *_I_SDError_43x35[] = {_I_SDError_43x35_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_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_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_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_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_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_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_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}; - -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_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_Bluetooth_5x8_0[] = {0x00,0x04,0x0D,0x16,0x0C,0x0C,0x16,0x0D,0x04,}; const uint8_t *_I_Bluetooth_5x8[] = {_I_Bluetooth_5x8_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_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_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_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_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_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_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_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_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}; -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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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}; +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_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}; @@ -838,20 +865,20 @@ const Icon A_Level3HijackActive_128x51 = {.width=128,.height=51,.frame_count=2,. const Icon A_Level3Hijack_128x51 = {.width=128,.height=51,.frame_count=3,.frame_rate=2,.frames=_A_Level3Hijack_128x51}; const Icon A_Level3LabActive_128x51 = {.width=128,.height=51,.frame_count=2,.frame_rate=2,.frames=_A_Level3LabActive_128x51}; const Icon A_Level3Lab_128x51 = {.width=128,.height=51,.frame_count=3,.frame_rate=2,.frames=_A_Level3Lab_128x51}; -const Icon I_LevelUp2_07 = {.width=128,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_LevelUp2_07}; -const Icon I_LevelUp2_06 = {.width=128,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_LevelUp2_06}; const Icon I_LevelUp2_04 = {.width=128,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_LevelUp2_04}; const Icon I_LevelUp2_05 = {.width=128,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_LevelUp2_05}; const Icon I_LevelUp2_01 = {.width=128,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_LevelUp2_01}; -const Icon I_LevelUp2_02 = {.width=128,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_LevelUp2_02}; const Icon I_LevelUp2_03 = {.width=128,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_LevelUp2_03}; -const Icon I_LevelUp3_05 = {.width=128,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_LevelUp3_05}; -const Icon I_LevelUp3_04 = {.width=128,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_LevelUp3_04}; -const Icon I_LevelUp3_06 = {.width=128,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_LevelUp3_06}; -const Icon I_LevelUp3_07 = {.width=128,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_LevelUp3_07}; +const Icon I_LevelUp2_02 = {.width=128,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_LevelUp2_02}; +const Icon I_LevelUp2_06 = {.width=128,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_LevelUp2_06}; +const Icon I_LevelUp2_07 = {.width=128,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_LevelUp2_07}; const Icon I_LevelUp3_03 = {.width=128,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_LevelUp3_03}; -const Icon I_LevelUp3_02 = {.width=128,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_LevelUp3_02}; +const Icon I_LevelUp3_07 = {.width=128,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_LevelUp3_07}; const Icon I_LevelUp3_01 = {.width=128,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_LevelUp3_01}; +const Icon I_LevelUp3_06 = {.width=128,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_LevelUp3_06}; +const Icon I_LevelUp3_04 = {.width=128,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_LevelUp3_04}; +const Icon I_LevelUp3_02 = {.width=128,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_LevelUp3_02}; +const Icon I_LevelUp3_05 = {.width=128,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_LevelUp3_05}; const Icon A_LevelUpPending_128x51 = {.width=128,.height=51,.frame_count=2,.frame_rate=2,.frames=_A_LevelUpPending_128x51}; const Icon A_NoSdCard_128x51 = {.width=128,.height=51,.frame_count=2,.frame_rate=2,.frames=_A_NoSdCard_128x51}; const Icon A_SleepActive_128x52 = {.width=128,.height=52,.frame_count=5,.frame_rate=2,.frames=_A_SleepActive_128x52}; @@ -860,77 +887,86 @@ const Icon A_TvActive_128x52 = {.width=128,.height=52,.frame_count=6,.frame_rate const Icon A_Tv_128x52 = {.width=128,.height=52,.frame_count=6,.frame_rate=2,.frames=_A_Tv_128x52}; const Icon A_WavesActive_128x52 = {.width=128,.height=52,.frame_count=7,.frame_rate=2,.frames=_A_WavesActive_128x52}; const Icon A_Waves_128x52 = {.width=128,.height=52,.frame_count=2,.frame_rate=2,.frames=_A_Waves_128x52}; -const Icon I_dir_10px = {.width=10,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_dir_10px}; const Icon I_Nfc_10px = {.width=10,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_Nfc_10px}; -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_ibutt_10px = {.width=10,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_ibutt_10px}; -const Icon I_unknown_10px = {.width=10,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_unknown_10px}; const Icon I_ble_10px = {.width=10,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_ble_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_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_125_10px = {.width=10,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_125_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_UsbTree_48x22 = {.width=48,.height=22,.frame_count=1,.frame_rate=0,.frames=_I_UsbTree_48x22}; -const Icon I_EviWaiting2_18x21 = {.width=18,.height=21,.frame_count=1,.frame_rate=0,.frames=_I_EviWaiting2_18x21}; +const Icon I_Voldwn_6x6 = {.width=6,.height=6,.frame_count=1,.frame_rate=0,.frames=_I_Voldwn_6x6}; +const Icon I_Volup_8x6 = {.width=8,.height=6,.frame_count=1,.frame_rate=0,.frames=_I_Volup_8x6}; +const Icon I_Button_18x18 = {.width=18,.height=18,.frame_count=1,.frame_rate=0,.frames=_I_Button_18x18}; +const Icon I_Pressed_Button_13x13 = {.width=13,.height=13,.frame_count=1,.frame_rate=0,.frames=_I_Pressed_Button_13x13}; +const Icon I_Ble_disconnected_24x34 = {.width=24,.height=34,.frame_count=1,.frame_rate=0,.frames=_I_Ble_disconnected_24x34}; +const Icon I_Space_65x18 = {.width=65,.height=18,.frame_count=1,.frame_rate=0,.frames=_I_Space_65x18}; +const Icon I_Circles_47x47 = {.width=47,.height=47,.frame_count=1,.frame_rate=0,.frames=_I_Circles_47x47}; +const Icon I_Ok_btn_9x9 = {.width=9,.height=9,.frame_count=1,.frame_rate=0,.frames=_I_Ok_btn_9x9}; +const Icon I_Ble_connected_38x34 = {.width=38,.height=34,.frame_count=1,.frame_rate=0,.frames=_I_Ble_connected_38x34}; const Icon I_Clock_18x18 = {.width=18,.height=18,.frame_count=1,.frame_rate=0,.frames=_I_Clock_18x18}; -const Icon I_Smile_18x18 = {.width=18,.height=18,.frame_count=1,.frame_rate=0,.frames=_I_Smile_18x18}; -const Icon I_EviSmile1_18x21 = {.width=18,.height=21,.frame_count=1,.frame_rate=0,.frames=_I_EviSmile1_18x21}; -const Icon I_Percent_10x14 = {.width=10,.height=14,.frame_count=1,.frame_rate=0,.frames=_I_Percent_10x14}; const Icon I_Error_18x18 = {.width=18,.height=18,.frame_count=1,.frame_rate=0,.frames=_I_Error_18x18}; -const Icon I_EviWaiting1_18x21 = {.width=18,.height=21,.frame_count=1,.frame_rate=0,.frames=_I_EviWaiting1_18x21}; const Icon I_EviSmile2_18x21 = {.width=18,.height=21,.frame_count=1,.frame_rate=0,.frames=_I_EviSmile2_18x21}; -const Icon I_ButtonRightSmall_3x5 = {.width=3,.height=5,.frame_count=1,.frame_rate=0,.frames=_I_ButtonRightSmall_3x5}; +const Icon I_EviWaiting1_18x21 = {.width=18,.height=21,.frame_count=1,.frame_rate=0,.frames=_I_EviWaiting1_18x21}; +const Icon I_EviSmile1_18x21 = {.width=18,.height=21,.frame_count=1,.frame_rate=0,.frames=_I_EviSmile1_18x21}; +const Icon I_EviWaiting2_18x21 = {.width=18,.height=21,.frame_count=1,.frame_rate=0,.frames=_I_EviWaiting2_18x21}; +const Icon I_UsbTree_48x22 = {.width=48,.height=22,.frame_count=1,.frame_rate=0,.frames=_I_UsbTree_48x22}; +const Icon I_Smile_18x18 = {.width=18,.height=18,.frame_count=1,.frame_rate=0,.frames=_I_Smile_18x18}; +const Icon I_Percent_10x14 = {.width=10,.height=14,.frame_count=1,.frame_rate=0,.frames=_I_Percent_10x14}; const Icon I_ButtonLeft_4x7 = {.width=4,.height=7,.frame_count=1,.frame_rate=0,.frames=_I_ButtonLeft_4x7}; -const Icon I_ButtonLeftSmall_3x5 = {.width=3,.height=5,.frame_count=1,.frame_rate=0,.frames=_I_ButtonLeftSmall_3x5}; -const Icon I_DFU_128x50 = {.width=128,.height=50,.frame_count=1,.frame_rate=0,.frames=_I_DFU_128x50}; -const Icon I_Warning_30x23 = {.width=30,.height=23,.frame_count=1,.frame_rate=0,.frames=_I_Warning_30x23}; -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_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_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_DFU_128x50 = {.width=128,.height=50,.frame_count=1,.frame_rate=0,.frames=_I_DFU_128x50}; +const Icon I_ButtonRightSmall_3x5 = {.width=3,.height=5,.frame_count=1,.frame_rate=0,.frames=_I_ButtonRightSmall_3x5}; +const Icon I_ButtonCenter_7x7 = {.width=7,.height=7,.frame_count=1,.frame_rate=0,.frames=_I_ButtonCenter_7x7}; +const Icon I_ButtonLeftSmall_3x5 = {.width=3,.height=5,.frame_count=1,.frame_rate=0,.frames=_I_ButtonLeftSmall_3x5}; const Icon I_DolphinOkay_41x43 = {.width=41,.height=43,.frame_count=1,.frame_rate=0,.frames=_I_DolphinOkay_41x43}; -const Icon I_DolphinFirstStart4_67x53 = {.width=67,.height=53,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart4_67x53}; -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_DolphinFirstStart0_70x53 = {.width=70,.height=53,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart0_70x53}; -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_DolphinFirstStart8_56x51 = {.width=56,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart8_56x51}; const Icon I_DolphinFirstStart7_61x51 = {.width=61,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart7_61x51}; -const Icon I_Flipper_young_80x60 = {.width=80,.height=60,.frame_count=1,.frame_rate=0,.frames=_I_Flipper_young_80x60}; +const Icon I_DolphinFirstStart4_67x53 = {.width=67,.height=53,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart4_67x53}; const Icon I_DolphinFirstStart3_57x48 = {.width=57,.height=48,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart3_57x48}; -const Icon I_ArrowUpFilled_14x15 = {.width=14,.height=15,.frame_count=1,.frame_rate=0,.frames=_I_ArrowUpFilled_14x15}; +const Icon I_Flipper_young_80x60 = {.width=80,.height=60,.frame_count=1,.frame_rate=0,.frames=_I_Flipper_young_80x60}; +const Icon I_DolphinFirstStart0_70x53 = {.width=70,.height=53,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart0_70x53}; +const Icon I_DolphinFirstStart2_59x51 = {.width=59,.height=51,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart2_59x51}; +const Icon I_DolphinFirstStart6_58x54 = {.width=58,.height=54,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart6_58x54}; +const Icon I_DolphinFirstStart5_54x49 = {.width=54,.height=49,.frame_count=1,.frame_rate=0,.frames=_I_DolphinFirstStart5_54x49}; +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_ArrowUpEmpty_14x15 = {.width=14,.height=15,.frame_count=1,.frame_rate=0,.frames=_I_ArrowUpEmpty_14x15}; const Icon I_ArrowDownEmpty_14x15 = {.width=14,.height=15,.frame_count=1,.frame_rate=0,.frames=_I_ArrowDownEmpty_14x15}; const Icon I_ArrowDownFilled_14x15 = {.width=14,.height=15,.frame_count=1,.frame_rate=0,.frames=_I_ArrowDownFilled_14x15}; -const Icon I_PassportBottom_128x17 = {.width=128,.height=17,.frame_count=1,.frame_rate=0,.frames=_I_PassportBottom_128x17}; +const Icon I_ArrowUpFilled_14x15 = {.width=14,.height=15,.frame_count=1,.frame_rate=0,.frames=_I_ArrowUpFilled_14x15}; +const Icon I_DoorRight_70x55 = {.width=70,.height=55,.frame_count=1,.frame_rate=0,.frames=_I_DoorRight_70x55}; const Icon I_DoorLocked_10x56 = {.width=10,.height=56,.frame_count=1,.frame_rate=0,.frames=_I_DoorLocked_10x56}; const Icon I_DoorLeft_70x55 = {.width=70,.height=55,.frame_count=1,.frame_rate=0,.frames=_I_DoorLeft_70x55}; const Icon I_PassportLeft_6x47 = {.width=6,.height=47,.frame_count=1,.frame_rate=0,.frames=_I_PassportLeft_6x47}; -const Icon I_DoorRight_70x55 = {.width=70,.height=55,.frame_count=1,.frame_rate=0,.frames=_I_DoorRight_70x55}; const Icon I_LockPopup_100x49 = {.width=100,.height=49,.frame_count=1,.frame_rate=0,.frames=_I_LockPopup_100x49}; -const Icon I_Mute_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Mute_25x27}; -const Icon I_IrdaArrowUp_4x8 = {.width=8,.height=4,.frame_count=1,.frame_rate=0,.frames=_I_IrdaArrowUp_4x8}; -const Icon I_Up_hvr_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Up_hvr_25x27}; -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_Vol_down_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Vol_down_25x27}; -const Icon I_Down_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Down_25x27}; -const Icon I_Power_hvr_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Power_hvr_25x27}; -const Icon I_IrdaLearnShort_128x31 = {.width=128,.height=31,.frame_count=1,.frame_rate=0,.frames=_I_IrdaLearnShort_128x31}; -const Icon I_IrdaArrowDown_4x8 = {.width=8,.height=4,.frame_count=1,.frame_rate=0,.frames=_I_IrdaArrowDown_4x8}; -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_IrdaLearn_128x64 = {.width=128,.height=64,.frame_count=1,.frame_rate=0,.frames=_I_IrdaLearn_128x64}; -const Icon I_Down_hvr_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Down_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_Power_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Power_25x27}; +const Icon I_PassportBottom_128x17 = {.width=128,.height=17,.frame_count=1,.frame_rate=0,.frames=_I_PassportBottom_128x17}; 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_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Up_25x27}; -const Icon I_Back_15x10 = {.width=15,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_Back_15x10}; -const Icon I_IrdaSend_128x64 = {.width=128,.height=64,.frame_count=1,.frame_rate=0,.frames=_I_IrdaSend_128x64}; -const Icon I_IrdaSendShort_128x34 = {.width=128,.height=34,.frame_count=1,.frame_rate=0,.frames=_I_IrdaSendShort_128x34}; +const Icon I_Fill_marker_7x7 = {.width=7,.height=7,.frame_count=1,.frame_rate=0,.frames=_I_Fill_marker_7x7}; +const Icon I_IrdaArrowUp_4x8 = {.width=8,.height=4,.frame_count=1,.frame_rate=0,.frames=_I_IrdaArrowUp_4x8}; +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_hvr_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Vol_up_hvr_25x27}; -const Icon I_KeySave_24x11 = {.width=24,.height=11,.frame_count=1,.frame_rate=0,.frames=_I_KeySave_24x11}; +const Icon I_Power_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Power_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_IrdaSend_128x64 = {.width=128,.height=64,.frame_count=1,.frame_rate=0,.frames=_I_IrdaSend_128x64}; +const Icon I_Up_hvr_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Up_hvr_25x27}; +const Icon I_Back_15x10 = {.width=15,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_Back_15x10}; +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_Mute_hvr_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Mute_hvr_25x27}; +const Icon I_IrdaLearnShort_128x31 = {.width=128,.height=31,.frame_count=1,.frame_rate=0,.frames=_I_IrdaLearnShort_128x31}; +const Icon I_Down_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Down_25x27}; +const Icon I_Up_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Up_25x27}; +const Icon I_Mute_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Mute_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_Power_hvr_25x27 = {.width=25,.height=27,.frame_count=1,.frame_rate=0,.frames=_I_Power_hvr_25x27}; +const Icon I_IrdaLearn_128x64 = {.width=128,.height=64,.frame_count=1,.frame_rate=0,.frames=_I_IrdaLearn_128x64}; +const Icon I_IrdaArrowDown_4x8 = {.width=8,.height=4,.frame_count=1,.frame_rate=0,.frames=_I_IrdaArrowDown_4x8}; 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_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 A_125khz_14 = {.width=14,.height=14,.frame_count=4,.frame_rate=3,.frames=_A_125khz_14}; @@ -950,57 +986,57 @@ 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_Detailed_chip_17x13 = {.width=17,.height=13,.frame_count=1,.frame_rate=0,.frames=_I_Detailed_chip_17x13}; const Icon I_passport_happy1_46x49 = {.width=46,.height=49,.frame_count=1,.frame_rate=0,.frames=_I_passport_happy1_46x49}; +const Icon I_passport_happy2_46x49 = {.width=46,.height=49,.frame_count=1,.frame_rate=0,.frames=_I_passport_happy2_46x49}; const Icon I_passport_bad3_46x49 = {.width=46,.height=49,.frame_count=1,.frame_rate=0,.frames=_I_passport_bad3_46x49}; const Icon I_passport_okay2_46x49 = {.width=46,.height=49,.frame_count=1,.frame_rate=0,.frames=_I_passport_okay2_46x49}; const Icon I_passport_bad2_46x49 = {.width=46,.height=49,.frame_count=1,.frame_rate=0,.frames=_I_passport_bad2_46x49}; -const Icon I_passport_okay3_46x49 = {.width=46,.height=49,.frame_count=1,.frame_rate=0,.frames=_I_passport_okay3_46x49}; -const Icon I_passport_bottom_128x18 = {.width=128,.height=18,.frame_count=1,.frame_rate=0,.frames=_I_passport_bottom_128x18}; const Icon I_passport_bad1_46x49 = {.width=46,.height=49,.frame_count=1,.frame_rate=0,.frames=_I_passport_bad1_46x49}; +const Icon I_passport_bottom_128x18 = {.width=128,.height=18,.frame_count=1,.frame_rate=0,.frames=_I_passport_bottom_128x18}; const Icon I_passport_happy3_46x49 = {.width=46,.height=49,.frame_count=1,.frame_rate=0,.frames=_I_passport_happy3_46x49}; -const Icon I_passport_happy2_46x49 = {.width=46,.height=49,.frame_count=1,.frame_rate=0,.frames=_I_passport_happy2_46x49}; -const Icon I_passport_okay1_46x49 = {.width=46,.height=49,.frame_count=1,.frame_rate=0,.frames=_I_passport_okay1_46x49}; const Icon I_passport_left_6x46 = {.width=6,.height=46,.frame_count=1,.frame_rate=0,.frames=_I_passport_left_6x46}; +const Icon I_passport_okay3_46x49 = {.width=46,.height=49,.frame_count=1,.frame_rate=0,.frames=_I_passport_okay3_46x49}; +const Icon I_passport_okay1_46x49 = {.width=46,.height=49,.frame_count=1,.frame_rate=0,.frames=_I_passport_okay1_46x49}; const Icon I_Health_16x16 = {.width=16,.height=16,.frame_count=1,.frame_rate=0,.frames=_I_Health_16x16}; -const Icon I_FaceCharging_29x14 = {.width=29,.height=14,.frame_count=1,.frame_rate=0,.frames=_I_FaceCharging_29x14}; +const Icon I_FaceNopower_29x14 = {.width=29,.height=14,.frame_count=1,.frame_rate=0,.frames=_I_FaceNopower_29x14}; +const Icon I_Battery_16x16 = {.width=16,.height=16,.frame_count=1,.frame_rate=0,.frames=_I_Battery_16x16}; const Icon I_BatteryBody_52x28 = {.width=52,.height=28,.frame_count=1,.frame_rate=0,.frames=_I_BatteryBody_52x28}; +const Icon I_FaceConfused_29x14 = {.width=29,.height=14,.frame_count=1,.frame_rate=0,.frames=_I_FaceConfused_29x14}; +const Icon I_FaceCharging_29x14 = {.width=29,.height=14,.frame_count=1,.frame_rate=0,.frames=_I_FaceCharging_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_FaceNormal_29x14 = {.width=29,.height=14,.frame_count=1,.frame_rate=0,.frames=_I_FaceNormal_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_RFIDDolphinSuccess_108x57 = {.width=108,.height=57,.frame_count=1,.frame_rate=0,.frames=_I_RFIDDolphinSuccess_108x57}; -const Icon I_RFIDBigChip_37x36 = {.width=37,.height=36,.frame_count=1,.frame_rate=0,.frames=_I_RFIDBigChip_37x36}; -const Icon I_RFIDDolphinSend_97x61 = {.width=97,.height=61,.frame_count=1,.frame_rate=0,.frames=_I_RFIDDolphinSend_97x61}; 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_RFIDBigChip_37x36 = {.width=37,.height=36,.frame_count=1,.frame_rate=0,.frames=_I_RFIDBigChip_37x36}; +const Icon I_RFIDDolphinSuccess_108x57 = {.width=108,.height=57,.frame_count=1,.frame_rate=0,.frames=_I_RFIDDolphinSuccess_108x57}; const Icon I_SDQuestion_35x43 = {.width=35,.height=43,.frame_count=1,.frame_rate=0,.frames=_I_SDQuestion_35x43}; const Icon I_SDError_43x35 = {.width=43,.height=35,.frame_count=1,.frame_rate=0,.frames=_I_SDError_43x35}; const Icon I_Cry_dolph_55x52 = {.width=55,.height=52,.frame_count=1,.frame_rate=0,.frames=_I_Cry_dolph_55x52}; -const Icon I_BadUsb_9x8 = {.width=9,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_BadUsb_9x8}; -const Icon I_PlaceholderR_30x13 = {.width=30,.height=13,.frame_count=1,.frame_rate=0,.frames=_I_PlaceholderR_30x13}; -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_PlaceholderL_11x13 = {.width=11,.height=13,.frame_count=1,.frame_rate=0,.frames=_I_PlaceholderL_11x13}; -const Icon I_Battery_19x8 = {.width=19,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Battery_19x8}; -const Icon I_SDcardMounted_11x8 = {.width=11,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_SDcardMounted_11x8}; -const Icon I_SDcardFail_11x8 = {.width=11,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_SDcardFail_11x8}; -const Icon I_USBConnected_15x8 = {.width=15,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_USBConnected_15x8}; -const Icon I_Bluetooth_5x8 = {.width=5,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Bluetooth_5x8}; const Icon I_BT_Pair_9x8 = {.width=9,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_BT_Pair_9x8}; +const Icon I_Bluetooth_5x8 = {.width=5,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Bluetooth_5x8}; +const Icon I_BadUsb_9x8 = {.width=9,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_BadUsb_9x8}; +const Icon I_PlaceholderR_30x13 = {.width=30,.height=13,.frame_count=1,.frame_rate=0,.frames=_I_PlaceholderR_30x13}; +const Icon I_USBConnected_15x8 = {.width=15,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_USBConnected_15x8}; +const Icon I_Battery_19x8 = {.width=19,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Battery_19x8}; +const Icon I_Lock_8x8 = {.width=8,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Lock_8x8}; const Icon I_Background_128x11 = {.width=128,.height=11,.frame_count=1,.frame_rate=0,.frames=_I_Background_128x11}; -const Icon I_Scanning_123x52 = {.width=123,.height=52,.frame_count=1,.frame_rate=0,.frames=_I_Scanning_123x52}; -const Icon I_Quest_7x8 = {.width=7,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Quest_7x8}; -const Icon I_Unlock_7x8 = {.width=7,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Unlock_7x8}; -const Icon I_MHz_25x11 = {.width=25,.height=11,.frame_count=1,.frame_rate=0,.frames=_I_MHz_25x11}; +const Icon I_SDcardFail_11x8 = {.width=11,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_SDcardFail_11x8}; +const Icon I_SDcardMounted_11x8 = {.width=11,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_SDcardMounted_11x8}; const Icon I_Lock_7x8 = {.width=7,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Lock_7x8}; -const Icon I_DolphinMafia_115x62 = {.width=115,.height=62,.frame_count=1,.frame_rate=0,.frames=_I_DolphinMafia_115x62}; -const Icon I_DolphinExcited_64x63 = {.width=64,.height=63,.frame_count=1,.frame_rate=0,.frames=_I_DolphinExcited_64x63}; -const Icon I_iButtonDolphinSuccess_109x60 = {.width=109,.height=60,.frame_count=1,.frame_rate=0,.frames=_I_iButtonDolphinSuccess_109x60}; +const Icon I_Quest_7x8 = {.width=7,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Quest_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_Unlock_7x8 = {.width=7,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Unlock_7x8}; const Icon I_iButtonDolphinVerySuccess_108x52 = {.width=108,.height=52,.frame_count=1,.frame_rate=0,.frames=_I_iButtonDolphinVerySuccess_108x52}; -const Icon I_iButtonKey_49x44 = {.width=49,.height=44,.frame_count=1,.frame_rate=0,.frames=_I_iButtonKey_49x44}; +const Icon I_DolphinMafia_115x62 = {.width=115,.height=62,.frame_count=1,.frame_rate=0,.frames=_I_DolphinMafia_115x62}; +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_DolphinNice_96x59 = {.width=96,.height=59,.frame_count=1,.frame_rate=0,.frames=_I_DolphinNice_96x59}; +const Icon I_iButtonKey_49x44 = {.width=49,.height=44,.frame_count=1,.frame_rate=0,.frames=_I_iButtonKey_49x44}; const Icon I_DolphinWait_61x59 = {.width=61,.height=59,.frame_count=1,.frame_rate=0,.frames=_I_DolphinWait_61x59}; diff --git a/assets/compiled/assets_icons.h b/assets/compiled/assets_icons.h index 7ae01304..fcc22147 100644 --- a/assets/compiled/assets_icons.h +++ b/assets/compiled/assets_icons.h @@ -36,20 +36,20 @@ extern const Icon A_Level3HijackActive_128x51; extern const Icon A_Level3Hijack_128x51; extern const Icon A_Level3LabActive_128x51; extern const Icon A_Level3Lab_128x51; -extern const Icon I_LevelUp2_07; -extern const Icon I_LevelUp2_06; extern const Icon I_LevelUp2_04; extern const Icon I_LevelUp2_05; extern const Icon I_LevelUp2_01; -extern const Icon I_LevelUp2_02; extern const Icon I_LevelUp2_03; -extern const Icon I_LevelUp3_05; -extern const Icon I_LevelUp3_04; -extern const Icon I_LevelUp3_06; -extern const Icon I_LevelUp3_07; +extern const Icon I_LevelUp2_02; +extern const Icon I_LevelUp2_06; +extern const Icon I_LevelUp2_07; extern const Icon I_LevelUp3_03; -extern const Icon I_LevelUp3_02; +extern const Icon I_LevelUp3_07; extern const Icon I_LevelUp3_01; +extern const Icon I_LevelUp3_06; +extern const Icon I_LevelUp3_04; +extern const Icon I_LevelUp3_02; +extern const Icon I_LevelUp3_05; extern const Icon A_LevelUpPending_128x51; extern const Icon A_NoSdCard_128x51; extern const Icon A_SleepActive_128x52; @@ -58,77 +58,86 @@ extern const Icon A_TvActive_128x52; extern const Icon A_Tv_128x52; extern const Icon A_WavesActive_128x52; extern const Icon A_Waves_128x52; -extern const Icon I_dir_10px; extern const Icon I_Nfc_10px; -extern const Icon I_sub1_10px; extern const Icon I_ir_10px; -extern const Icon I_ibutt_10px; -extern const Icon I_unknown_10px; extern const Icon I_ble_10px; +extern const Icon I_sub1_10px; +extern const Icon I_dir_10px; +extern const Icon I_unknown_10px; +extern const Icon I_ibutt_10px; extern const Icon I_125_10px; extern const Icon I_BLE_Pairing_128x64; -extern const Icon I_UsbTree_48x22; -extern const Icon I_EviWaiting2_18x21; +extern const Icon I_Voldwn_6x6; +extern const Icon I_Volup_8x6; +extern const Icon I_Button_18x18; +extern const Icon I_Pressed_Button_13x13; +extern const Icon I_Ble_disconnected_24x34; +extern const Icon I_Space_65x18; +extern const Icon I_Circles_47x47; +extern const Icon I_Ok_btn_9x9; +extern const Icon I_Ble_connected_38x34; extern const Icon I_Clock_18x18; -extern const Icon I_Smile_18x18; -extern const Icon I_EviSmile1_18x21; -extern const Icon I_Percent_10x14; extern const Icon I_Error_18x18; -extern const Icon I_EviWaiting1_18x21; extern const Icon I_EviSmile2_18x21; -extern const Icon I_ButtonRightSmall_3x5; +extern const Icon I_EviWaiting1_18x21; +extern const Icon I_EviSmile1_18x21; +extern const Icon I_EviWaiting2_18x21; +extern const Icon I_UsbTree_48x22; +extern const Icon I_Smile_18x18; +extern const Icon I_Percent_10x14; extern const Icon I_ButtonLeft_4x7; -extern const Icon I_ButtonLeftSmall_3x5; -extern const Icon I_DFU_128x50; -extern const Icon I_Warning_30x23; -extern const Icon I_ButtonDown_7x4; extern const Icon I_ButtonRight_4x7; -extern const Icon I_ButtonCenter_7x7; +extern const Icon I_ButtonDown_7x4; extern const Icon I_ButtonUp_7x4; +extern const Icon I_Warning_30x23; +extern const Icon I_DFU_128x50; +extern const Icon I_ButtonRightSmall_3x5; +extern const Icon I_ButtonCenter_7x7; +extern const Icon I_ButtonLeftSmall_3x5; extern const Icon I_DolphinOkay_41x43; -extern const Icon I_DolphinFirstStart4_67x53; -extern const Icon I_DolphinFirstStart2_59x51; -extern const Icon I_DolphinFirstStart5_54x49; -extern const Icon I_DolphinFirstStart0_70x53; -extern const Icon I_DolphinFirstStart6_58x54; -extern const Icon I_DolphinFirstStart1_59x53; -extern const Icon I_DolphinFirstStart8_56x51; extern const Icon I_DolphinFirstStart7_61x51; -extern const Icon I_Flipper_young_80x60; +extern const Icon I_DolphinFirstStart4_67x53; extern const Icon I_DolphinFirstStart3_57x48; -extern const Icon I_ArrowUpFilled_14x15; +extern const Icon I_Flipper_young_80x60; +extern const Icon I_DolphinFirstStart0_70x53; +extern const Icon I_DolphinFirstStart2_59x51; +extern const Icon I_DolphinFirstStart6_58x54; +extern const Icon I_DolphinFirstStart5_54x49; +extern const Icon I_DolphinFirstStart8_56x51; +extern const Icon I_DolphinFirstStart1_59x53; extern const Icon I_ArrowUpEmpty_14x15; extern const Icon I_ArrowDownEmpty_14x15; extern const Icon I_ArrowDownFilled_14x15; -extern const Icon I_PassportBottom_128x17; +extern const Icon I_ArrowUpFilled_14x15; +extern const Icon I_DoorRight_70x55; extern const Icon I_DoorLocked_10x56; extern const Icon I_DoorLeft_70x55; extern const Icon I_PassportLeft_6x47; -extern const Icon I_DoorRight_70x55; extern const Icon I_LockPopup_100x49; -extern const Icon I_Mute_25x27; -extern const Icon I_IrdaArrowUp_4x8; -extern const Icon I_Up_hvr_25x27; -extern const Icon I_DolphinReadingSuccess_59x63; -extern const Icon I_Mute_hvr_25x27; -extern const Icon I_Vol_down_25x27; -extern const Icon I_Down_25x27; -extern const Icon I_Power_hvr_25x27; -extern const Icon I_IrdaLearnShort_128x31; -extern const Icon I_IrdaArrowDown_4x8; -extern const Icon I_Vol_down_hvr_25x27; -extern const Icon I_IrdaLearn_128x64; -extern const Icon I_Down_hvr_25x27; -extern const Icon I_Fill_marker_7x7; -extern const Icon I_Power_25x27; +extern const Icon I_PassportBottom_128x17; extern const Icon I_Vol_up_25x27; -extern const Icon I_Up_25x27; -extern const Icon I_Back_15x10; -extern const Icon I_IrdaSend_128x64; -extern const Icon I_IrdaSendShort_128x34; +extern const Icon I_Fill_marker_7x7; +extern const Icon I_IrdaArrowUp_4x8; +extern const Icon I_Down_hvr_25x27; extern const Icon I_Vol_up_hvr_25x27; -extern const Icon I_KeySave_24x11; +extern const Icon I_Power_25x27; +extern const Icon I_Vol_down_25x27; +extern const Icon I_IrdaSend_128x64; +extern const Icon I_Up_hvr_25x27; +extern const Icon I_Back_15x10; +extern const Icon I_DolphinReadingSuccess_59x63; +extern const Icon I_IrdaSendShort_128x34; +extern const Icon I_Mute_hvr_25x27; +extern const Icon I_IrdaLearnShort_128x31; +extern const Icon I_Down_25x27; +extern const Icon I_Up_25x27; +extern const Icon I_Mute_25x27; +extern const Icon I_Vol_down_hvr_25x27; +extern const Icon I_Power_hvr_25x27; +extern const Icon I_IrdaLearn_128x64; +extern const Icon I_IrdaArrowDown_4x8; extern const Icon I_KeyBackspaceSelected_16x9; +extern const Icon I_KeySave_24x11; extern const Icon I_KeySaveSelected_24x11; extern const Icon I_KeyBackspace_16x9; extern const Icon A_125khz_14; @@ -148,56 +157,56 @@ 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_Detailed_chip_17x13; extern const Icon I_passport_happy1_46x49; +extern const Icon I_passport_happy2_46x49; extern const Icon I_passport_bad3_46x49; extern const Icon I_passport_okay2_46x49; extern const Icon I_passport_bad2_46x49; -extern const Icon I_passport_okay3_46x49; -extern const Icon I_passport_bottom_128x18; extern const Icon I_passport_bad1_46x49; +extern const Icon I_passport_bottom_128x18; extern const Icon I_passport_happy3_46x49; -extern const Icon I_passport_happy2_46x49; -extern const Icon I_passport_okay1_46x49; extern const Icon I_passport_left_6x46; +extern const Icon I_passport_okay3_46x49; +extern const Icon I_passport_okay1_46x49; extern const Icon I_Health_16x16; -extern const Icon I_FaceCharging_29x14; +extern const Icon I_FaceNopower_29x14; +extern const Icon I_Battery_16x16; extern const Icon I_BatteryBody_52x28; +extern const Icon I_FaceConfused_29x14; +extern const Icon I_FaceCharging_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_FaceNormal_29x14; -extern const Icon I_Battery_16x16; -extern const Icon I_FaceConfused_29x14; -extern const Icon I_RFIDDolphinSuccess_108x57; -extern const Icon I_RFIDBigChip_37x36; -extern const Icon I_RFIDDolphinSend_97x61; extern const Icon I_RFIDDolphinReceive_97x61; +extern const Icon I_RFIDDolphinSend_97x61; +extern const Icon I_RFIDBigChip_37x36; +extern const Icon I_RFIDDolphinSuccess_108x57; extern const Icon I_SDQuestion_35x43; extern const Icon I_SDError_43x35; extern const Icon I_Cry_dolph_55x52; -extern const Icon I_BadUsb_9x8; -extern const Icon I_PlaceholderR_30x13; -extern const Icon I_Lock_8x8; extern const Icon I_Battery_26x8; extern const Icon I_PlaceholderL_11x13; -extern const Icon I_Battery_19x8; -extern const Icon I_SDcardMounted_11x8; -extern const Icon I_SDcardFail_11x8; -extern const Icon I_USBConnected_15x8; -extern const Icon I_Bluetooth_5x8; extern const Icon I_BT_Pair_9x8; +extern const Icon I_Bluetooth_5x8; +extern const Icon I_BadUsb_9x8; +extern const Icon I_PlaceholderR_30x13; +extern const Icon I_USBConnected_15x8; +extern const Icon I_Battery_19x8; +extern const Icon I_Lock_8x8; extern const Icon I_Background_128x11; -extern const Icon I_Scanning_123x52; -extern const Icon I_Quest_7x8; -extern const Icon I_Unlock_7x8; -extern const Icon I_MHz_25x11; +extern const Icon I_SDcardFail_11x8; +extern const Icon I_SDcardMounted_11x8; extern const Icon I_Lock_7x8; -extern const Icon I_DolphinMafia_115x62; -extern const Icon I_DolphinExcited_64x63; -extern const Icon I_iButtonDolphinSuccess_109x60; +extern const Icon I_Quest_7x8; +extern const Icon I_Scanning_123x52; +extern const Icon I_MHz_25x11; +extern const Icon I_Unlock_7x8; extern const Icon I_iButtonDolphinVerySuccess_108x52; -extern const Icon I_iButtonKey_49x44; +extern const Icon I_DolphinMafia_115x62; +extern const Icon I_iButtonDolphinSuccess_109x60; +extern const Icon I_DolphinExcited_64x63; extern const Icon I_DolphinNice_96x59; +extern const Icon I_iButtonKey_49x44; extern const Icon I_DolphinWait_61x59; diff --git a/assets/icons/BLE/BLE_HID/Ble_connected_38x34.png b/assets/icons/BLE/BLE_HID/Ble_connected_38x34.png new file mode 100644 index 0000000000000000000000000000000000000000..ed5514df827fb0e917789ed422ff57839899d0ed GIT binary patch literal 3694 zcmaJ^XH*kwyB&&3k=_IZLJ*Eh2?<4sgkFMDLkl8e2mwM!F$s_$Ac`o8G-*<$ifF)w zf=E+QK$@T+Qlv-`0Rz%RiZ`C`c)t7NdS|Vfx9z>3{l3pLYt3ACw6_)#kP`p^K*$DZ zf#S4koEyx?!+G*jJ+AODT=rsUyK~&u2WlXGqo1~Oj4$`&he6Ij9H+DRKf3?5qmDuBPt|tzE zRT?UN6cNUrpWk@DQ9GS8z1hj^5{VKMS4*BM3 z_S}ERO8{8lVKO4=_l!5W?vep+fYPhAPrP~TXLOCDnmYhW21dc+(}G+{D4<2lr9~2G z*#q2je&{Ozqyj(?Gu#Xe+!g}nmTio70R3etLoz^r;odSnAf5}z+;6>)+vF*5%Jm#d zgS+uLkk2v!YwS;CW?6ljxB}?dj$jq=T&_Q>a;(_8U555Bag;K zu5wnl2g4SC(^)2&<&8zrTc_Z%qOU13+2|daq*e6utlZxE&h~HA%Jz!q0#>Fu19S_jgeouxZ{M;Jt2TeUG!!-4IT5v2pkPnBsjN#Qyr1{cJs!Dyv8*xC%4g8SLerz-C(g}M zWOkm~llOd2?L~fG(-uAnj50h{%qO8A+{q`CnZOIiAa$=r6@zACC7r-8Td2j{WoCiN zUPzU1np8=H_!A~Sk_KBquq&HaYOSHE=N>rmyyFfwd2&lh?#iotS~p!+#49SjkkBnx zsfdVrTv*zD>~k<3h`5q~jp~L9`(6EjIdS!p<*CbPIkjeK>?B&xEm04vfIbu=CEu8b zVe{?dj*F6*<2!jl^m)+vq$F#!E!zB+>YPfYcnzOBfAj_D^S{6;w;U=}!^GE{7(Vd( zNoXsU+E-;o*FF!+#jv{SiLsPl{_kEXHa{l36*zw*fPLjz$0 z^#eZh)OqRo*#UMiCD$ZZBX+zHEZ9CHK($`qm-HhCrZYyr@SvGwqW;JGseeOYy z^6uHYv*Fook8hP{mp6rE6GtS+B@++y99VHC4M68M=LF`m=622-tYTJGSBa}#3hjHv z75a|QkAzd{!R;YIl-k+iG2ItsO=T};-2LVK3uw7ZdNMbUCAEoXgk;D#6HBj@l5T{x zrA^9xt?7C6cBLr$Y4%Y02jaWocErnwI~#Ud+48MkFA!|g<%Ko$`04gfxuw~q&zF*> zAtysldYs&-Q*?Nkqn6jFO>7x#@*J&eJ97$dguwmioZ&HgWyF0W?8c?~oAuxkM7>I6 zUu0(FuFbrSBR|@<62CW$F~3PK+V42U^^9whtL~iKxraOi9wpvP-jZEgi4yPB1@jjHT2N)ND4n3b6q^+f$?NC$jlM4$6>ORWTznU?Lu~pgJpeTe4*3*s_LVL*QRpa z(pC=-ABiyk5pdDLD)^NSzXM90nJjzliOQ0ln?>J8R@aBqA2bb8b5e7PP(t|hO7-{J zRr{+P{M6M`geI6%#MkmEmtL<;sI1eL2Bm^xY`cppQ5BBD(zcLW>I~04o{VZ_9rE}) zoe{t7FY79T=cU8zlI}TH-+S0!&G1+p1vgkel~##!mI>8@dZB838Tf^sh_-;X2kBdm z<7kxYw?O95w**vlPf3Zn`gwQVw6fIJHd4j%@h4a*Oq#DNJ20cy)9vg*nKW+}g>|dq z`#r1bsd0CE@80kgCUIck-ZvK)gv#X?<0s|4iAO)u z3&H|d5;`h7UU%^5Vf5xb+aI$AzZK{gt%l{E^=fn5D!)@z|3Ph_uVFa!%#v`lg4B_Z z?9{p1N9qiBLY-yA3aRJo`Qb!4ANiVwsmS4K>rjW6d5LFA&g@#XWX}fD$w5PR8yX() z6H)r{ibyzRGCPVqkUgIj`iOG;pzw3k$!C9!+zdbS$?^R0vmg2@4vs-^18vSW51e{uOg`p@2ys?S@|BaIxiC{ z@YQz6D=d+5ce8$A>&vbmB45r{Zr{f>5=XzEYCP5T!b5~D%zr6wJN4(=OJhCO?bf|2 zRx0s{xk^g%LUMKAd^=OdN*|O;biIyr`^lW8-I*TQ8s9k9h2HF65L}PzYN%kAEm7Hb z%I?CORhpG*JDG^Zo15jGgAwd%cFjn0ol@rhO_OcMrS2ct=F&F~Yev)I+nbQJ3ribO z2C8D5uS!|EC7SL`_M?Yls5rpXm+XTB*$^@QI1~=!%RJqRGXwx0WxNZTj<&OfW64A< z%rA@HP#TOY1t0Q%`F$_%-P35o%miDhL{RZ0E{r^xR@n1BJj>7%d z@Bb-Gb74|&5EPC^4yIx`iStwW6^a5kr{XYlGS!7l4*GqHjsavknHE5%fH;2;``z&* zUvenzz~68?JGc#rM#qq_I2#KDm?NNt$NR!{55W%WnweVand_KAp_b-mW>A==j@2Pc zPHO?x)&9-3AY+4xI1>Fg*Z03%t3PsoRRWR1iEM$R;zMx0R#Y+(^!JY8_&<9w|D)bN zT;D%?vG^kw!Z8E+mDm53=igJD;`!D6w`w_qf9oDc;uJfTQ`MdM`PVpa#7;+B7fVk2 z^XJc!4>yK6z4JB}rY?*D);m+-C~ZCqr>X6X5R6dC)m4HoZn-4Qj6XhB?17ln@H2Gs zB~0q+F_+Nmb~kd4C~94VvGCE zLzV{`dCoNp#;x35zL%^xAg*sv2mATa8NT=Pt%7KR@lFx0oq#Bf+p{$g`;_Abu(7na Ks4zQq{(k^B*?y@2 literal 0 HcmV?d00001 diff --git a/assets/icons/BLE/BLE_HID/Ble_disconnected_24x34.png b/assets/icons/BLE/BLE_HID/Ble_disconnected_24x34.png new file mode 100644 index 0000000000000000000000000000000000000000..6f135c1162b8fdd943e46c617e16e6e855349b16 GIT binary patch literal 3656 zcmaJ^XH*kiw;q}TN|6=;kq`tMkc3Vov`~VEVrW4{4Iw~)6q5i6DxwG$q)C%1O%V;) zP!MS<3P=+aL_jH0L`osb_85$Vz9u46Bc%8fMKTU<0sLb@OS6t&41SIWSx!os*hdTvmb$ky3 ztNja)0^P2FZ{L!KPLD|T5z%)cOHpjYRkNL0Iga(lN;^ciY?)N^%&CNZjWXHL8KCw@ zg)Z=R*Ly;yfm3N_sYNw;;cKVxl%Qg4%xI&a1)Q=ts=8hmac(VUZ`+{m!($q(xJxw>E{KTAj}(K0IYYkmS$Ub)fh`!Y#IvNA)2#2*<9Ya2GJ$>ph<+z@Du=dr}s}(lz#Pg313w+=YG<$YOS>fuNY(^VXSHdGKIoH2U zp=2jA>}hU6+o5lPOyKO*7(!SZT-^KGC;YK%m#j`+!6~TM$q|Nedakj01SOn7kgQ@& z7M?4-i$5w%dP4a4Mah=|7vkb z!#JEZM}10Vr%IOE@!jImClb)R#2c;;*^8>E#cA7avGqsypf&TI@=e+$Nf{XR@i=nB zmm%RtVH|Kud}*9SoWu2%hF3$SGKklg2QebKyRi9*QU~>jro)1_ZfaYkX5T&BT$uGi z`0i!I%_Fwt>>x*|)1^Xb-M}=p=5#q!W4>ly$GbF=4{6aCI>sy)`5eB}D&<{DyZ^V% zW20l?KZ3W4MT&*jp*{D=`^%q}FW6ox4^73~7J8qOTJH?|sI8dlb3@_=)djb2Vc!|q z__tC?h$Ppf(4^73&MpiW(+>9CEzb8`B<>w|J$u{Q<+0<}LXi)0_c{udT%H%|7q?)8 zv9XS=hfm~HomjiDOb~k%8DX6riOzE-l)jOVR*`$7O`O45bkbb~#x?wJ*m)j(v^0SU z5?WCVf}X}Wp%{0)Io|Q!nIor~`NZEm?4LIJlyR^{rA4gew5EWjspi8@zasCV&?1BG zknXB(&q?~E+~jySH;|TTmZ_0Bk02u!14YX9%MX`Fl=lR-em8kf7-x@(%)gx%AN$;9 zGf)1JHxK&G?c}y88^Cmh_2c9N;D&_hrZ~bk{~M&Tw&{xlceXY9mdDrn=C#@8?JiTF zy5#d!j|DRE=1_Nda&*5Cd;N{^o+Ry_{M!82Lsfg56aCY?%iBucGn<;~HF`N+oQ8=Q zqmB&!EPU0cik{Wzh+9?}uMbA)N7W^FC!c8)O14X0&CyME-@b{-qo7$3a?O8CFX9GIHGR!2NH2If z7dHw$9(3IO_)6tYhsPP}S)DL)eNXMt{>sMFClMw{;&RKFfXN#Z{+l5;FIC;Hg7hJ) zR6{#MQ$sheX004pZd{A~Sv|m>m7B2_I?4BfZnoFVrWpURk-*urbi4)pjvr3d+N z`~t86go*UBu(G>l=UJD2TFs=E)?#e_?57l%}r7;`C)9q&)eH$Mo zuQ?9lur9NH?B3ZJYDyj-|`DIG^$&+P*xo#4Lur3=JbhAIvab})P?(Y6_u=MTZIC?yPoWfajufBh<($Bo(UF5V_k>X7Bu;K~w z!7t355Wo4D=91>O%>sIOy~(3ZPdPoaIr@1EA(`hq8eP|l?v+-3Qt$4p{v3RIPCQ&m z_P`fz;zY%h{VX^CN~^Q;l=i6$pJNp~70atfLO++;1UtOWiamYn^yURC?zkV58qj;c zy84j_8LJxi9rx>Adhb zn!UdrQ60$9%p+$bb1J#tuH|Ja9aplcD%}X>!oLy%>-1vXva&PxAZM0_E+l*{@G8j4 zv^Pb5NbO}WVpdcAJq~+R`k-2~OhL>kOzDZmhPf}Ju^!VEv>%W~&mOhXLq*79q)jMo zZ2*1$D0Q5;*f{BCT+IAoH-4av`~KXrUrh(&y#^6*vOgNt3@q6XSrqE^1ixC<yl;1HnQ<{?SG7>|e`J2>2fe(;o@>Z%{ZpM=**? zCxZ2~^fd`^U2U*|krrGZW~8mF0oI1W4WKXsC|pMq21mg35jsZTe=i8n8{Nwrfwi>$ z*B5Vwg!nRV}o{~iZ`EI}Xb2RYh-Xsi&Qxl^?^AU2r821uUn&jE`-9ly zMxuC8gBg4Of!o<3Y$*&Tokrou_E+w&P9W2Go-K)VQV`M0nocEy|H&9Z`g<&v zf7Sb!>-E=I46Odjh4O-d{;KQ$s`Kw9Ui17i|8y;H@~7{K6kfB_d0l<1Gs}(lMr?A# zI9qLOZ17B%m+wP)!!cV+b7xj}MuNE%02byS*tj``P0+{Y*mQdC5%NAIM<=V~^n%i8 zS)k?XGJD8uK1+;LJxKT?@`YT3=>yId36a$u#WuSyt+?8YZ?q~hZrM0XJUJfjcPbJP Z0CWd{XVjKN@*W(G4tN=nI=Eo(wa4Q%8vkx{u?zYHw>PBq%Eg0DzDc z(hS9!#kL=Q9?lyh8i4}IOAwh8Gn{vj+=2WcHX}wv6 z{-S5$q3oHN^-t@S6WJ3RZH#u2$UR~zN#ptcfIceP0M?_BV27-0s*2>6L=N(TM8}(7 z`|{NTz#I>Q9zlC#w88a|1aJf7E{y|X4MV@8D(qEU08kPz2o{^z#g&Kx8Z{gnC4k1g zz$1sJ-hx0100c6^Ou@i?Az=E4l_4L{Q=Hr{4fN#iE9M8{xPXj4 zwXcCZrZHH9x3-ik()GEPC3j>M9}pamP82cr1R^s`)mi|M9yfs4FW$-nvgXNycGe6Q zdyu19NG_nZIkh$YM5nd{EA_o>$im#H=N(jFoW#zri2 zzHaq}&H-mLjWbGW3!*m9Vu-<|sQ8IyUQrUuD^Y zZ5kLaP)TNrO{v3TljpVO71A~Zl0$?5=4HED+vhu;fXTOrK ztd-`*>@YLleW2Dr)O5#aVKIBW;(Net{L&fmykHDc=SE~9Xfj6PB)GnjQpjCw>YwC} zR9aA{Na)9%HeO5YYXoUs+qhO~shM)&$w{7%+(E`K?kUJ#dz(k?py`OXN2cWmbjX(N zhetloFX}k)Erp$Yef^5L=T)?gtyCsf!S5mvbxHH}AK>JBc4f+;Vyks@FWBQm zv;|XTR&l>#uJV~bgvC9Qkq3mEZj9OrDk>*xS?#h4K=vWk3mpm#J4Nx?)+$qpgr={f z{7)j8p!B5jM3F?h8|zJPM$08&^)bWN0{I6}g(+gkb#X>xymxMCnP%kOKiOKG`;q^C z4D8k^D?(ndJ;dQkvA9l9rgCeR6r#CMy`bxTCf*mn;s=?eRS0~E+HaozKD{&G+s?^} z$*3P8yM-F2nbx$W4+H`tb7MFv+BM zVyUoH=hTSQiTjRDR41b@#{FH651d3EoN*4nYvJ_Nexz97qtt`0VtJ>R#YalpP$8%U z`}UI_1=Sv#7uT>tPcBDWD+@7pXTL<&4 z%LPNuSvw%8_kEZ?Nj^E_XIr_1-##9k)Bl`(yiKu9sO_9OkGhfi<8J>FpOT1@qrIWM z)xBOblo_d+sa|#vImb9hEoTWvfUN`xR2-=|SrJ{)7u5dU@B?;=F)6V0Zb^9ZONZqW z;YY!e^mleQyF=k9REPgaqD-Ks9(JxJ5&JFRCZ5$XcWLO}o@T#_q&mNX4y%GcSSqtu zd`EQY(uO`v(mpSy&R1N2fC0t}uhmyrS6DwQhyL`(& zG5PLev}0iuT2M=HAh~j?a7gD(ab5A7Nf%!^-`mujMP2E;ClZ^*(u32b9SB9&iio#D zn^VVRXDd3NeOM~UdYRQ<@|p1QOAEX{{K2}7MwVQY`x`jhf8pan$LN{4B@!7wn-ktw}#xeLT_EEzFQ3*fLAL; zbVp=F?A*v*KepDqneek_h_N6wZ_DS&^@?kZtLlR6g{M3LJPN!Symxl$^2PDJ+yU8b zC~3M|K*&{rl1!?VUXWYGYWMr9Wp+ruL) z{+L0_z!;VSUM53&HC*D*VXgZb-%pk~(9Y6U)Vi6YuIs*4@$(7A*Iyj#^M6hW_GS79 zq5`qgS*%Fbebxo~m7nJG>0&hT0|GNwN9%g(;8#be+!KMB+S#L-j%hS(=~#dM3+eI6 zw&vUr16N(w#4x?+n_}rtjK-osruLA%c4I|E8+q}COIgu&=GFOe`6nNjvyL0w7|(G| zUDo?@EF7`sciGM&=&iPZ9ZHpvBy;11(xQ#CS@&0F`{%Qt)%8=dQ?d(CLin^Y)lbm! zgXMNUs;bFCql|IFJGta5?^Z^YR;i19l7Z3I9R+2mQhQ-3YsfuSy4zkiIty8aJoQm~ zz-R0Gs?x5DQejnzkL+2Gp7yZluJeQ78uOP@O0f>oAsU+Qs0wd7ey%gT*{}IY+NS+5 z8s)U$&*)!>M@4nsxr0!>=%SNaoYK@xEd6on1y&N1>g~k#Pw#SbK7Uv`)q_c9-Yfn2 z$bvOK>|*QD6}H46^!9!|UjA-o3OQ9cMP#nH);v63nqiQIhLn4AaU_*dHP zQ2(X)*0R=jtvtFI-5Ix*=ghu^+eZqPLvzl%H#={ZJSeaJtkT5nouAA$Ik-3Fq#d+qrDcp7N)W0{b7<)I1R& zppL}tN5aTsS&^jPteMP^XXI0dgjgRTXXGub%YQ|%HAk>P4Y~;~xp_GU;q$Ab7n4Vdyo+*kY>nU_ zGx`}T)*BfC?kC-=d=c%rM$)ud>vE5krp2!l3GQ>1E|a6_gjoA_Sa-zzYeJtgQrJupeGtwb~ zv)29Yp$YVd8`Zs=-*>Kwd_P~d^%z%682ss3>)HOsRfH`pa3yyu<=2NRL!Fi_mR(8~ zN^uD}3JP*UvQ-P-ZOKDLPm09b-$gk8VoXsVObl!eub*f~Z}iOVT8(Y5DP-hN@s|B!#~QYw=)K*F;Y8Th24v;Z;(DaM z@*d7#r3}p+O>-dm&_Xa29AM&2^1^|v2pC@+3WxD#oNdAx0055)-Vseh+gQV}B!UKJ z+ed>=Aal?FU|>WiW3T}@8psRhizmXt?3XoQ5Z)UOcG0zg+K>@AKRhy&f^!J9b;O1S zVD-JhMus2*I*da=z|k-uIw6oqh0)>QKY3xC^|l!T2L0(m3xI?F5{0(02O&rl9O$Tq zraBf1g@TUiYj|V4Fjy}yHINomOA`XsfoSTeL!mHjeVC38=&Lss+)~Qs;Q6QyD}WhOSPeD*a|K!%?vmJeh_k z5kcFG7%x%~4G!i={VN9o`5#&$_3v}yoEU_TAwx7ZpxZh9cC@ki|6K`$f4r$Q6z;!z z|CN~P$ROh&C>)g(M8R?@=cBY8iVQ=&_Npv z7Ej!^9QqStV*|4yQfU|>7H4G!2Xja?@OW<+RM*_}sEH{;SI0tMQ_~z_s%xQZenj8Y z#MBIGc2r;QH`a`V4IPoKl5_wQQ%!g~LUmcOwk{}T)0h=FX^_W#uSw~5n0+sl7im$Uh&`Ef)}$5S}1 zy?{b{ajwM@~ literal 0 HcmV?d00001 diff --git a/assets/icons/BLE/BLE_HID/Circles_47x47.png b/assets/icons/BLE/BLE_HID/Circles_47x47.png new file mode 100644 index 0000000000000000000000000000000000000000..6a16ebf7bbe999fa143c683bef713a6e2f466cbb GIT binary patch literal 3712 zcmaJ^c|26@-#)fNS+a&?jCd-`%-Bu#v5X=b+o)7y3;Soh36 zP7A&OfYn&SO_E-Dk~aX%Wl1T^hNu`(4;k4VSxEQ#i(R6~?3m%)z2*K^*J6&wx*s>5 zQRy#yb}pPVJ-zyIwQ@Xbe65YqE)lsyN+WSBFAy+6MVZ2TR1%z#_03h0{IbYFL6GDa zyUt&z0RUzN81x9*Ba1b@ha`X>Ab08Pk!l>;yj0<$;R%2efkCj;_%=Q!3TV=CYmxz) zb^?!FpZbad$p8?{IBN|C?u!9a3l8Q&Ku=LpzdX>Bx2s4Ph~op&_uB8_w|ohla=(Dm z;;*d(a#@yO9l_cXzDTdU+DkufA$`U++&Ha;kI{K6zz ze#@zyIdwZLqeTR*nuMh>s_>W{KJh)^HevbnctJ1*sedD~05lOJa|GPbL@D4evJOo2 zMymbLrpTDY9k*Oz_BDZYudQ9Hw1*{McydJG1AmC+i+d`H*WTn(J81e6-jS(!K^=;v zyUik>=M{Dw`W8Y1&RvVgMs~o&{jPt)9KU|W_S99hqDG?}b`)*kkzjyTMjM67D%Iv- zIKq4QV`K)N6KX24Kc%xB6)jI1<6te4R98tf_HA|TBqmUKhj#1^FjE2 z4E)wn2SRSB3&izGk+gnDhI(tJ9D-e-o!|8?1MiRL20$ig6(XN6?Y2#Om)05dZR^DN z#HEF>?PAelml}~idliBd&L|Y_EK`7_JKhy~pO)U_2K}h3lRCkLm#{F$>58NdlobWhz*UtT^%hw{24{{H>ij>`778#bbp~6rJ zF6~E7=2xFwzqo=GdlDUGmm7`Dcf*#wQHWEOd!vh+LtA%KJOn1Sf^Itb9DA}neX0@@bZkGlhl{fZ-sje5g- zt9yN>DbsS(lf9e}a<*l*R`w#C0Oy8?R2WtqsfeoR3u*su{vJEYm=IZfyC^>Kxx;>u zu#mqf|DDs#=}<9(>I)k(6@p>L*x42)_FK?Re0j(0<)M2!*Z~!Z^#S=E4*7qTYs_5n z|7t*&H}_+acKNXMzu@|VOff!q-M)hQf`*ameXYqs8GaQVrSEAiElpbetR7bLRJ=)7 zR!|P6`cq}!T3pl}+pLCzv4*jYslBOZ*+QvKsa)1g4|5NO$D+qamP7aPNv%mjw`Z`6 zl4s`jOn4^y`Mu)I;`-1`!hp=MOv1j-eT%NdUf9&yl;~8()Rt+JCCrlg5@D%bxn-A> za`yq+fwL4^NK0rixpJ~#NdI+FebMU)Pk$x<+tloN1Npm$m~5%E&@_2hLgBSS;;nFY z%BbQ@Md!2ki}{%^Gy97_5k7owF>5&YVAV+{Q>oeewHe21VU~*?KHc&)yD+n`Zk{;~ zIT3oo>%?l+Zs(_28adriLQ`M;vB4_#nNx6cGu%qsgn;=QbN*Z5x2{y*tp*R6RjWmG zN2Et=UCUWLu)_stbx2o(cpBs0gMD-q~s(6esj@3uL>w zto3#gF)tNL5~)`Hhte`uuisxQqeJ$saJKAGr4?w4hU4z;9r4la!UK{Kq`S+G6D`k$ zV+QSmW6D+V3hDC8=VbQn*S)Xv{Ya@R?KF+6)y*35TJ^7rpGzpZ{^CGi;B!i-KPxa8 z6^xzAERQU|Uw(mp<)`gjniNfXkI3}Zk@}u`v#VdJ{NuqHdRZeGZmBeE$!LGx3;D5$ zHg-;!sh5El^Q>{yO{uge7NeIy)-I5p&ZC7yCuQj$mouZBZL9O*@{T+%D?ey@V=UVv zWy$#SfpdtJfM{pCkT-fF&L~YrqQZ?AYV%GWHr-!X?VnD6(l$xXO3unhiQ!XAH9tbj z_Le#OX=)~kjWEUtZs9mcU{#=1*SqLhv0|mUxKX8(go9sb zx5EP$<6BEx-?j=EU<{^@wLE9_{kUzIzZ9N*-ka^QUi_e}`jbX)cg^RpGxOq?lw}Wm z;UrI0KGURo236UfTO@YQT>PA%=%Z9oGZyi=+&;{?At&L?oikgPY&nyGG*WQ?!dlC^;licR{FXIW`vz6opFxRI~z3fo2S&5l_1bKZ3 z`S2KN631mvdzzNe7Mvyzba39EUkR-3qJI4OQOElhql)upN~w&f@p)Iddd1?;(4}el zFwq&ue(&%E`op#A-u3TWS0uilFWq>It0fHnJXL$D{k4|_M_lAe&PMX)`zu48_AT~Z zYIbUI3E3(tN@9vtKYZJgh6ox=o`Wr$EG6Vm|6xzuJgdkCH zAOjskZ7fV*7i46j12cr0=;~{MbfGXK2-FAy)6<5+;7~)jo(brm1I(*N@%4kFZ0!E2 z#T%J{186id90Cao3)2bH(;-p(AutmY69`lnqN}UTLugYOL>h*!O{A**R+HbD!f4PQ#alUpG5&`u0jN$k{d(r!& z-alO5KYP*tBNxIm1NpVD|7)Lr-{OVmSNGr4@&^Cr9!KPbox)4C?9}%J-W##S#nH`n zb90l|b+3CL!E2HoY^>bqy;G?sQngTFfsRd!?EP0Hv_eg1tl7i-zBctc!@fr=HS*x6(|+l1S)TBgWjCP}EhD_i3C!C# zW_0QGnT2_!N{&S~=WfI!^Wu$(&ALtQg88e}>7UgNt17G8mLO9J{pTOoNN^F;BQaeJ biU<_Yn+9Io=xs3K`2!qm58ISjpSt)z2v?8| literal 0 HcmV?d00001 diff --git a/assets/icons/BLE/BLE_HID/Ok_btn_9x9.png b/assets/icons/BLE/BLE_HID/Ok_btn_9x9.png new file mode 100644 index 0000000000000000000000000000000000000000..9a1539da2049f12f7b25f96b11a9c40cd8227302 GIT binary patch literal 3605 zcmaJ@c{r5q+kR|?vSeS9G2*Q(Gqz$f_GQ#q8r!JE7=ytqjlqnNNGaK}Wlbolp-q`& zs|bxHiiEP0&{#s&zVZIv-rx7f*Y_O9^W67+-RF5;*L_{ra~$^-2RmyaK{-JH0EBE1 z7AVdru>JD$aK0bym%#uaXpT2Gcd#)x2azcxAABGV0BC)Aj-lw(6)B^^6`Y8RS?}DV z%)ko(See1!Eb3M$dL6)A6csaRjExg?k&xVzi*Rm;?iNJk#f=mkVEUR~jXN3dd|Lmz z;y}sMh%ol-?E1&`>dD;6jdps6NYoxN)s%@sf4~40YY6LAOtMEbwA4g#OCpANL823^ zSH66W05Hcxr$tg98gFntAOYL}xm$C;Skv&Ym?{TVR{)d(41vWacX1`7fM!jnW(lBK z26*WB#9I(Z1Ast!xEUC@Cj`v=urcBTdP`FWq=DYTy`}s>0vC{VzHdNRvxNFy}ir1|g=xDsrFP&l1P<-Sv zXLqYVYz{b^ZIV@1Ulg->7DEgvM*Min&Y8{8QW! z$_pA434?^wCTq$4%^>Zo8&|8XwbCv;KEd;WJJ{s;T}8R8Zwi7ssk$QWQ5l5+opKfX z;8D*COFEB#4W^*FIrRU%PDSc?B(}+9ZV?N9(yH>0uSnM?xg!>+>;e z{{7tXQQ|ZFXD*7q3XD!pwnih-=66+Qlqtl9;N-D|PHoI&B5d8>^V#i{mE>V0gQgu3+(DG%B z|8W!pl$lbQERt-0eZA%NSfvE4F>VAYP`DpeoF;Zm4`)2id;6xgSysWl6K$pWANcRZ z!ETRXKIU9G=@9lEB?<{ivj7!8FE9WN;qoo2Lr0#c@DmcF=JzU<73PmM3 zbe!-gs`c26Uc(AKz7%U!a0yZ5gsprdo1i51MjJPeHtV6d@Jy=*+_3dJ^>}p#8N#kPK_4t?hltq>u=?m+t z?em(Y%u3Bp_pyV?c_w-4c}p+?Y$aHr>TuPGs@SUj;Er!b@3GVLDS@T8OTts1JFS-p zKZ=&5zp;DRor*`Gy8MTeWdpVJv2(4-*slRM@XXG+i^F&Ku>7i08vKenZHoS4s(!!h zJE}*MHu7PR_IfdNzu*P}3^87K?f&A1;>NMsgKcR6**;aB74NC7tR(NB?{dHT-9QhXa*KoG!kGU1}$l2D>ypo)fSBuG$ zkTW4?+|I1m?6ZH8tD4^fB{cUpoEoZOo%4hl!EtNtQ#?j*jJR)x-Mn0TrxrX2uT_rh ziOh=Jxsktqbd9x{^s{c5z92Pk$LGoQl53o+=7QXXCp-Z>io998w|DCCCGfr20oiRN zX|`KH$W4)wN~)J$kYB~>4EU;NcS^qH&yzeUzXokpMegg_lX$6ve^4}%bY~Sg)%uJ- zZpb$p4x^GS5d{XJP=STbfpHV`58UBH& zKFg&BgS6bV+#-|^KBGeIBee2B zrM-`uTB^_(eS+{-KK1h3l`-Yjpv8X4z*uBwQ3a~pL0Ae2xvNGyC3A|#MARToe$W~8 z+4{DsyenENye9df1M}gNUM9_Leh6G=`9exL-cdSKQ_CGyEdZ3W5uoR!Lb^D)9!bd=7h@R=M%=|JqX9XP;Z6# zFD15Bw7qTP(ZlG?o@#x@=wG;XxM(>n@4P$9WwY#lW$h=`zMi_zq30HbV-zHheqpE0 zR6kXtxdzl&Ml2D#zDIvflJkb*e zIAI?GMjp?JBK76WW`{l{pFAY|%5?nYUxRnT&y6~Kz19AD;C0(z*7?dM{%HhVtqWEc z%+M$z6u@uQu)kg_%2PO_U|n1JE0V1>iVbekOLEOG$U6X^Umc519WC)L$t%`#Di0$ zY1|5H*440_`onhmXeayq`8EIg?x2r9KWe()q}QayqCMEC?c4meb4}#i`HHPaxO&3SPtSVKj@ND?Y+-@R`CDnf-d`T>vTn8RR<=@3 zNXk=Gloyh#S@3R89WHrXBHr;f(&ZO@I_Uo7;O5Bs@ecGx@7%7{_>Q`Adg&sCeZTYp ztVy{^vAUfOpTDzF*4`h%X0odWn`#uZ4s4igIV^UrVVg?c*{>K)hHq^^RxU2CM;WN> z;oK@^sg`J}BguyvilN{DQ*V+N4rD{X_~KAFj5qyk3(gP#cvSIDXe!zk3B!^InwV{j zCXGPmumQl(m`28618`K37tR+?goD{H>cAkpHyrG$XA89@o8$cOh%gGyG0e^h8y0{y z@CF+jfedLdjsO8i#eispKw=P#1_%GG3**eU%@8o?ZwNI24*pM2Xj=!6If;S;9nsX% zz(S!=&=CVoZ;TfP>*b{m(uQhlL7=)2EnN*L6sBVU)71t2^ME<-DBeCWl!etl&NwSL z*pEsj!yu5*&``}#9ZeF&7oufgU;u$?L$tLuI0%g(I+2Q@X%K^ye=Atvg0K`knTjV7 zLEDNLFH$fS4(5dVpED51|H=}B{>c+3V-OmK4AIhrZlCEl(AM_T0=zuK- zizjYd4*pHCwT0ObgQyrH7H4At2XjO;@px~TsgAA%R9|05PuEIcOUu&SOwUTs^00xK zshI`T;)sF%Z>|Li8%)3vslU12|K;lbk-Oav1Tx371&)Fb!FgLzNCeQ|r-tGG9E;W; z_5R^{|2Y=zKXM_QU?AJI{a>~IZQ?Z0_VnM@U`9wuDcQ1RO(?0Mk|NnE zLbfQ9B|8a?C1mX#&+qB^y??yD=kqz|zV7S3zTay-pL4D`*jWkj%kl#NAY_d&NA9dU zH!m0aX`w4&2LSwLI5RT`Ycn$tnL_fx;jsWf@5^=!MkTFE84j&tMO;jK=bxnEF9KjC zCU29dTb}4m0DW0h%(x*cn%_l2a!(e*x&Bf&KO#GNH1}YIugUf3Q!&nG^u8+$6g~?J zVa?5LeA=j*%9`42XLN`}>=9E*oXqnF^pQ~puwI3DdqjP6bp)p*Vwf8wI@$8tm!|;$ z=D8U3aN1*|O^!z-fD<5hYa9@39QhSl>7e2YfD(aWu-KFUM*It@G8k zo>9Wo&lH~ZqaklQV4egvR9qO^uDZd=4T#!xu=+eECVIHYjU0~yYXgc-1AQ)l z-_V-7c0XV4DgO5%YcUMHP2>GJcO04wBV*Vkz41`#Gn#n+*Av>cUpsq0UjACuh_ouP>mkRXBic8yPQ< ziROyUDWhW37qk`>Qn&b$f`tI)75h57=ewV^;OoM_b8yB8qq>3swK9jur8*<&u*+&vj1qGhi%^@OH|#m-!uAxrP_+?(@y zZ`Bn(Zj&ZnakL^VdXHCJFSwmoIz5gXj7I3(j3@w2M@yUpH#AWSIEzgE6WtL?i|P~! z{n#_c>k0i$Ag$}0*Q=~FlP{K@7g6#FTxztXYj);3iYFT%N?|5Yx-Rj$7mm zC6*_MB-r2FXnr$ZE&*$Z9<|}iJAf=m7CWwsHJaeQdt1viJ@>)MwxXPmybq#bw@+CU za)TToj#rDsbpkV#+cKrhS_;(jyWeNvd~vIOkZD>a-(ci^i?sJ?T>)QrPftxp{sj-&-QLNY1FkD~CfR6W@uYz*1aN z!c(RmI5|_Djk*~R1e_i^i#$B*5_Zqh`KiNL5#L9thuuZ;&M%9Ol(Zv*k?{^4Cq43O zJhm>aV}wetL|NuuLF7AO%HPVwDoVZ8!Y-gpdnhhkGim|1Y`spGuFcv6@odNiLC)Ja zno%G4FntnzvM0~AaR|SCGCZ&UIqP`4V!KfLd37#zBlRae{>47U;l)S$Li%d@yyhr# zQgbtXtUz+Makg6aGK>IQ4dkmlQhBm6saUQ-V<-re?fgg!+6c1w&Z{epUTd%546_SCba=(FSB_zPQN=VAO~IZ zxvGCNHtMcLR>Sd_BQcGseW{@>JgK&+tIS(2hAs@3WtUG(>z*?+YBPi$SG5x`k+k0ki@7&{GqNx%Z|i8&DqUa{@IM#U32;?=oRG^!b*pH>pn60o@2CQ zp%hwRYY?7XHB&I6^QNf2=*_gNubl54YW9+@^t}@aEn;awY0{2_!s~^^+aWC}6SChc zyPkbm&d+?AIZ*tW@Nuve-VpY1!&W0xuG#$!oMrN3eib!(u5~QCFthOWQo?Vo0;ZBLt)-c)wzG@krlJ9u4B~Qt%Lt9mB_V?_GyVAisBpOb-w`Mcl`kXg<*a{zA zp@5S~mtG5#ICNO+fyTF!WsbCSv{khp=D6F2Z*|;4e9?^;$NK%BQ-XY%{&*xFGn-iv zQSqSSBK_)5i-j~Xn)m^}xohL~z4h>GV^q#5e1>+`c!pCd4O22PkoQ7*a=N`GC)mJE z*DWDbFY1<9TB*@QB*@eOve$m1kZ3C}zIZt^%HEtf#Xh1v1>+-G(DFT@HaiultQokfV%BC~F3|ZnJEM)_^uS!3?_cXl%QH?nDQG3W|``en5 zz$K~B>V(G*6_20xR?yuRhQYNKFQt@X9HoObG~JPv-gMl2S6GW*OKIws!zc>ryy(vu zSd2qPcHO;erh3U$C#5L4xrJErecI*1Vd)ePCYgD^cXKm{nSvQ2bJeZ((eY}3lkWFd=7oyo7GfvlJP60X(C&ozFUPf& zwY_WO(nageoo;>3>|eZdB!49&`+|Fm%U1Ej@|w>oeLb~w?Sjx&}b>tXH)4to3d#pAueVK}PpRXeS0Iz!WE0>=rhL^yt!pU1Bh)1VMGuYLZ zIah-c+7H{AW1XxI7uNmjx~ZRje$sHi&8TL*os}ymstoR{P_A758MHDd9nAmTX23lp zp8jaFrf=)p?sbuG7s|GuVCx9OKRxR_JKng7u!Q-p=4>bb`fzom%c|9?Tgg%>Ha=TH zK~6}vdeOT*X{4~UP`u+^xXUlb4E5pE(AMb2i4N3e@4UcTOh;`AqiBi3dRX)b)~M8| zP}RG*`RxdAYMCdE;VgFUi z&@50iN0JXM7)`+fCf+13EXbOG_QfKxXm7^3W~>1KaH-&&P&AaS4GcpfXrOm&H0T5} z8w~&kMszY76M&_Gys*AFA{@+mSqlc?yy0M1U0bLv*$nH4LxfPUjv;nVn2-RBzBky& z5M)4yu?YxR8X80=;E7Zi9S;7R7si%%)DSS}ZxdPo9Q>c4P__;rGZF<0I;x?mj)6j< zpriU4-e@m0#>-0$qy^Q|gg|v5nmX!GC`?-)rlSM;=K{0cQM`R%NOQ}7oUwOsupf;^ zhCv{~!ND5A+8QK^FGN#cUmpV1f@o=}vn|xA3?dCpS0_@HelwV3sTc~5Ov90gpdCiE z7b%bi2eU){PYwj~zqCZ^KXqbP3_?efA(|S{ot%Cf+S>mArUb&j)>Il2``>u~PhzSQ zgN%hBu~bqZ1;g%~kJ64SGR%yEMbk(WClU$&yNnKgBpQk8MECm;Y^|qvt2%x{ShT;Agi>bvQ`ToIr z|1lO*%Rgcv>|h`}z5QRk{;gsU(2n@;=(0Ee4nLO2o_Gp-v?B%|jk8~iT@E%*7VLFn zW8+olk$r4Q+1lL1iQebs$<4V-6wuDa^WJ8EKPjE`j~qYo##DjQV;r1*&|8!^APw~9?k(a6Vz_{`1J?VwO%hlm80mweJ_2Ll%+w5Jal|B#ZToHj zkX!A1wWV(yKRGcrJmE7L$o^5EyA?1;0vjpK4{lZ7;N}HH?K{|g9^>OZJmdzhM?p0K zMW=v17r<|D)m^7wAm^muyU^8WhW>`hzU({5Mni?Yg1dIjs(9V0f{sQT{n8mG4Mm49 zbG~l%ht2_K(@oNfYx5#D&tizdC8*fR7G5(g;>x7*Rzu{4&DevTBf5`It4m&=M_(&P zg6$d@FHi{BFL>ue9`qCWpjMUz{dO z@9>n#el1gZMS$0|kzX961dH0^726AL=a){4^e8+sFE>V1@t?G01xkRvR~uHtV6d@Jy=*+_LjJ^<;I%HkfZ+ zJ{WS&*3q1L--qRs;FC3Rwv9{p?cw*6_FMFK^@Q9yZ8!?f0Ei>znMIVlCNa;%nYvD_=OIcyvaxrpYxGcGRWZCqbo>reG^tc8h zWbb>x%$fc-l1kK>Pg=_9^WFC8k{QaNGP~oK)fB= zk~}W=y`t;c`=z{$ml*@ap9mj5x5DesKUlZZ%#d$#e*hBLJ2$e|kFK?B#{H}rW-Lg}+w*yHz2X|@s=6q5@hMLLk0Ngx@77A0z{8^GG<=3FCsOHJ6w{_pD*!j4k8!wLb`#+}y`?CB4 zQGwW*jB;lA{ql?St3NI0Q^jcF`vqpNjn(zm!LN-{xhDhDbu!1&ol`GQ%#aWnhw%cUor3tn<%~!N%j(>i+!K$>%8wb|oXB!X zUe^D7^t}0+-xUX|ptm{#4k$H7g6z!~%8Pa`7Cm2B9iPsA(lAKMOv=nd3E@*p)jmSY z4wO0gsHr6ijWH$&&GLy?n^(q^SE-Brl7W%7oq46G5~Q${Eu>J5eoE#Py&O@6IQcl%pM`Lo~JAQ5D{F{9M=h7QdD!DVxX< zG|G9wpE0lyi;C#Fd)Hj;lB;fVQBqS2vE;|e7g$M5vbQtaKehXm%Y{SI$sQ~+tFYwf zBdhX>5m$SU?yw~Wp|9`Dv9jjbX~cB?G?BI9R`c*!mA`5CyDM`-#q#qpezqJMP@wb32zU+0*_sQsBVDnwlp9 z1k~Y}eFzwNJcCK<%a~0Mc}6~YNcgqs_^ZDL?}eQkMSi{0{$}7!+hE#-vL*g$1VgP0 zRujb1$Rp&y?^LnB-pI>RIHO=)UG^)Stu=}bYS4>w&Cba>0H0qSyOcOu;9ZcNWp51s zkT$?rvE4`ua6jQ*ND(zN(xGR}RjlKca_;?=KGcDxu~0=Et)Zw@0K zo+3@-R$69V4NGW0?52-)vfp1=^RMlue*F1S)BQH1iv4y*zKp2)d2hK&#nR8<o8NY>iF~_Iy7d@WOBnj;S?k&H#!ZAREO0e@E9uw!tHWK^t=8Sj zR?0DPS&EACLUL6L-tCFQ1y2gZJDS5?ele!04<-jUN7j#bpf`HwcCAKt)RZua7Afop zMGs*O$_4u!*bGtM^Q3;}>g74L+mq3vv8SQ0@K zvyIWD6UZDk02mt6$rx+^jt26=`QnLiF#BZ<7=-tRgI)FPpmt<)oF5($O2IjX+B;!G z1F#0(U}GbYAsxmMAmC^i5S7-)K9yf9cVFLjVMR9g!I)rDy3YCxed9RrxIF6f^D=D4GH`@m2ZR{uET z?BHNO8jTEtKte)7G(&VWNfcj*mVto*1gZ_u*4E%4G^h+B4MW!;Qk8!zSm3Bw3Z6{E zlZc>gMT{3Ihz199LjBJf2;_fdiPV4c#K{#)rmpIK~Oj6!<%hNIw#dMD-()LE1W+P|yK8 z3>Ht^wjBJMVrK`lAyR1=A{J+30S9wLH1T+En5mAg1yo=Eh@P&MzLu7yxtX4op5xA}2IPRCO?t!+X9zvoGZ%D;b1(Y*s+gO-7(fhnSIU^r{GM99afXqQXz`L$cAW!v1IOaB9=s#hui literal 0 HcmV?d00001 diff --git a/assets/icons/BLE/BLE_HID/Voldwn_6x6.png b/assets/icons/BLE/BLE_HID/Voldwn_6x6.png new file mode 100644 index 0000000000000000000000000000000000000000..d7a82a2df8262667a9a03419f437ff9b350e645f GIT binary patch literal 3593 zcmaJ^c{r49-@a{yvSeS9G2*E#GsaRTV;jpTTVorQ7-KM)rJ2EukdjieWy_jSQbU^} z*%BdJ6bWS~p|OOledBqbp7;CX>${HQzOU^(&);(W?&G+xtM;~*LV|LF000PCq0G>n ze#iF1&%=3t6jKZV06`=HiL|#uB0&@?*_#l62LMK2wnH!`X+_F#a0M^oY}z~bI4$4; z09I!4H;KCDiQWLPmqf*k8=|5Goh2mqWTBkuFLn!}vZF_G50v|uT#G&#<8=DScg2Ci zXJH}i+1d4v>y?vPlN;^K4v~mGVycM~d47OCI?4dvs~B&Gs&B4};Fd%U@q$DrTIziG z8USF9hsg-1KQh|jdPoMi0ZO;#ezC^kUy&8|sxAO15f}oCP441KKm$#hj!hCklML|4 z;i;D(kPH9;%urJ>a9;?R`C(A&8=ml<3}F9g$lLOtBZCc<<_EVbuXFPPqP89EKKJqQ9v(^~*Q3B1|Dsbs zpEKY)xay|eFOYju@LkAi4D-l_@xGkf_Du!~dj)sxnpN?XETh`i)-^EH_u{8K_%$8$rfHyEz-)Q@>XNi`OUb4og+GrPpeB_o5x%&w+Gua zGGCw*&6Ju`M#QGh!{!xJHwBV{g#gxNyIR}lJD;@#)P{fO;*Jr<_Z8L)vU%Ft8oEsX$7MIQ2ABn^u1(h>o@!WV3vE~&?A$byI)DLYK602DOA=< zb7Oay8Sma-YanX6V=Q8?;BA>y6IsVvcrWj>M?7-5doqSaOJ8Xn5ty zCZ|rO^0EN0NfW;~RtX-x$1|=M+|DnZ9>)vDqI7OV6o96pB~E}Fny3ZbMW%j}lh*g#IQF?Ape)N=vQe3r|k)eBcf=esNDx?%JDNS|?pc#4RE<&%aZybRQz( zd0t`X@vnh&AnaNkE}~OQ*!%h??CI-Q%ssAR@MYYg(9%8YWUSOvd}K;$K@y1&3l_v}hlLc~_<8J_UR2^b5O z>UX7mN;xWL{t^~}fJP*kF%bt@hlqr*iq+8$Rd!Lrxtyl^? z#W^KBW%9nG6V1t}n|Xhi;{zv=2WOna?pioKwI3}K_#pM5yGX(5WszPhod`Dc_8`)STsW&kEJjS$#>dZ5(?tjz9^VE~o8S5avb@?F3 zIcorq;L$MBc--Sx>|GpQe7G;9ue#53 zmO3jnJKe_)q+}ast7k94iSU&`feO8f6BSVv{ed0d4Bz9XnNtEwZ}vf?{k}$y{IdF_jp2!SXxk;v;(p5S|RCHNK4AN z-1myEXYZHtGhb#76n`Rq_}q$U2z#(@qnRn+?DiVLHu*8Pf*Cp6I+|UWSy;E2FbO#m zbjJ0}deuI=r&+2wJy2p(fBmVUs+Myea6<%st$m8e@Qoq&t&m$+s_#~V2NBiE;XUE$ z;X5~S){m~WY{vhr8D=g>&D-*MaJ}Lh=c>9Oci}0IKaV1BI`5sGx_q&GFLyw88%mn) z77%h(q$ZJTr5EH^aoPhu>KUDqZ~3z&Ps*=BTUD+1_3Vke+`&I68cx2uYCYBZoIiTV zG9bEKkszBcy&5KQ@DS|2=C>224)nA174;t0nCrSvRor}h(e)Qc`~99%gM3(i0q6kS zOlEmR`Tg<>j4MCQ=hMXK;`;?=ua4FC)+4Tt(zquBGPJYCG8|LsxRUXKycg0FQ|&D| z!3M6nt_h(>qHc<%Juw=O1ew}HWbDQZNj3`N3zssZ?98k4V)ITsE-OD~aAP9dIc53C z=c8fBHQ&p27J+ZH1?KVN0a0?-xJE%X!LI)J%kbF1HM}YsiT|cjw&BWpnnlADtX9@UW)li2xC; z7rPGyr;KMtkoz)cGlHK{P974jGZ}yN*WlgIbEEcOZ@0f5c-=Obe!gspe;UP9>w?z= zvNZCExrp0U?624JvlY%LSXP()3TJDL;sP6W<6UxcvkxHVSH~_UjTU+p=49I%AwHxJ zFjuTM(*4~|xK;TeJ93Pq>EEr(+*g_xzf8uv%~euGRmzSRBT5jK;gro`)WcKc zY5YpdtcyVj{fEu;(N6aJ^J{*!-L#KCKWe(&Vpg%=%*dCKR6p-6SE*R~8MHhr9W40W zdcZ9tp7C&_x^MH_&NY#5=S#O9<7){YQd{LX}Iu7p?JsJaOYplY1)Iy!OfBN;~kid-nm_?F&#A}%%Vjq`$5q| zc%yQoVr4rMF@JZXxV=A&UCyo;Y^+jDKd@oEWxv?DhHET*XSZTF8M?IrS-G^h9-*(Y zhx1n{OE<^R9mwAFU@R36n0S#r@gOTA)(4NqW4)MXoACw!z@tQP#LzJ|)^Hq|sEOUi zXflWt4jTXrj2ILw&L2+)dE$KtBm|iKvIYzycp<8kl2^>g5ebn_2v0i!(!j zed%-x90Car4%Q6T)+AGXAX@tR`Vc4#0)uIA5E?WliH>DxkZ8)k70mE79F;(!6UZdc zwj$P(97soiIiCI}1R~{MSrYA^G;tCJVPGi`EluclNWXzLHvd1ANcI{NyD^|bY% zhhY}Kxn^WsAQ4ZZ|K@uAm#h0n?sg>*DICjYcq$aNAlv8qzs~vh5~p~!hyPYBXYy~|<4K%ir*f)VECG~N3t`XAZG70Mn#!Kq>|l0^MC=h$Nt(>}1N6~R2Jk+G1UpniOLYXdBx;x!Bs$qz z@59#!0P{RdMmYVU(I(deGQbT`dNdA*HI4j?th85g0YFK>Fj#DA7gr)0Xx4CSmH?Xf z0uLRYcnJb201&_oH3b9rgn-%aR)%~)UvcuFG|-p7ub3Z*;{q}cS{~pwegSwmT|ldG z*VO}gEMu?+Z(S)@gzGa+OYVqjJ|HL_lPF^B0Yqe&sk6{&A!gBRzAM-@lw10I=Tr4NaE3yg!a)3cPsQByqD9lHTQ zcCG8>ww_Vq)a3Zcr1w++`+H;lw*NdCY^b;}v|V+Ln->tZ?PT}6PfYakP@1?N2G;r) zp91=w0pFoDH?0AIypw`&L)K!MdYi`kb8p!<8_4ey+_h^?+4EL4bS&2Jr`8C0I5vER z^K^S4WF9!1X`E3~R}i^%7E1~$MaNII@|wa(t5ZtbO;P8!;tzF=YCk%yCV6!MbEU!_ zY}3Sij!rUDY)Kszn?A3(ppdpDkQ^)ourAxx**@F(v^AhE{2Lc{tT3iK2rv#`Qokm< zD+v(w(bi3-FpW^NV8@;W2wWX+n( zQd(4}O6bR(HeOF0Xa;Fs-Mm_52}`-~_yo^;?m*+`cNJu>zRsg{(X~a~BGU5xyJXAu zBO;#V7j+%~5=aNauEygcx?sZI*FIuTUyC;PxPp;YX_CTCV04@lba3*RBSDgKb-7qJ z{{imU2=Q6|GnYi`11=^eT4Jm*$h*q3N@Ze|{4N5KmtggOfs^mrl_`gatu-(_;g1qA z7A%!-iu)CFmCyVoEbg9+Iw0I~ecV=1Q8`i5YL}HiY5=8P=ul|bElS9?R+&j8wtODv ze;mOAr6-jqiX_@y-)MO?UM>M|j2X2S$UlHCOc6V#gEyMsy?s;DG$ZfciT2{$_x$%_ z;5ScN5%YrVAr8^S;@W|k%I#TF$ksyjf}XdT1RuhxFJzitDex(Bzj^xG^ltwzJEy0n zBfkgl7P>4H*@W^uDB~}4PNryYxeO%3`VQZ_^o(Xl=m$-?44)e!H^@$y!z+hFC6nHW zrNUF4Q^QlI?m0TqoQ!&y_jWnncM`dO#yRYch0_!Jv0{PuQulj`<(*y>>y~z)gV720 zohRH2YTUOjuH%FrUyicKyNoJu#Ff96iBpt%t%+a2nD$bgd1lo7Z`gRAdb~Dk9mKaG z7X&$H?SQ1+^JaM`dFM=?ZRZkx{b+bz|6}&C4#f_kj&tff>PG61di_egOTtTz^oR7< z^n1=x=cMLl`q_b$9OE3doMku>z8WY{satuXGOBVQu=A_oJKPL&T44Fjvheh$F3V-& z_kv~Vuk2oSm%4ZT_9eV#1s&-g)q1FR=ObD*%HuyMTRPOwa+dFmm;`m(&(c@bdRgPH8$Q+X3kk*7o*y0XdqxfNVfh81 z18}oh6%iHpDlRahf0!?%i_ygo2+Um>Z|G}4Tp6QrPX%OZWshe%rqOYw6NCBBr6;F5 zT62R9Tyfl3jonBBYh6et?!A zEVuJkRZSKeXHF8|$R$U=Sshneqb&_c21HqR6_lY%?S-YRA$L_7r}my=RG_L+C*Nxg zd2fGRQ`&V=DzrNBp?$@}Cw&zR*M(tlt@#TnrC0~)U=5fXy3&h5nC}j2^=*Bewq-wx zK|3w_F$Wjp(UIM^ZzEMNx@e~sr?j+^O240cj+4ZudO5NE(tA!hpFb>}>dvCD?w0;| zXi+ga>SF8O6S~YK_V<52R{myg1~pSSLt?GE);>5^?Pt>S_VTBsM6nC`ziR`l5nKFnEPUyKY`!BaTUJbr#AIdmizRW*^Vybq- zYXe#81;jkWt!nm{YXv#-XXGtw%72ElVPm+!CY=PA+`OEFh=sNBi^*d}UPZY%wnm8e z8H3DK>&*;*w-avFKFH2oBWe0K>vH$imZi^A32yUMl<(kG&jID~<0Xhvgk?BoYXtS+ z6nO@}+B)ZAP)h%9Gjp_y{qFp_UtJIF!;cRdZa10L?ANn$se?ML`J;_wfTI*-m*t|DwE@OB)gT z%6m9pl`?d54Bdh3O%KLW@qmdJ*%J@4B4T~;Xgt=7dA0>_002CS1V;=VV`B}+k%=1E zUl-#D&8T)))5!t zkJI-88ySKO7;ugN5l_d07{mY)4bDJ-|JH?b#=n*!V9?(Xx<3N^pQJE0_8=sgiU;Xv z=&Ivj+M1vv`Wi4@sJ^DQ8b}igI|6|ofxxuXp)fd97p|ob`lo?8(WqYDaI~4lKe0G7 z1lX5Or@$eQ;NW15U@Z+Y)dvF8*Vl(YH6fas>KueRjY*q!ozBfy+Y|FZ=m@Pfn4Om+33P^1o0%LE29N1AFQ&CK=nkWfu? z3z&tD_HV8k85c;zljy&>UjOBq{gM022}BAfvKgLA2*P_=P{~Bl-#dmA{+x@+ANBs> zdi^;U(?4<{oMa%s>iWOx{CkOGo?pX%UCWvL>w7$jV|FUX)$L7+A2@Hs4tr}y^PfL| za)wUz@4`8qf|Z$xBctEbgVT7GKri_xq1;?NN}4enable_adv) { // Restart advertising - gap_advertise_start(GapCommandAdvFast); + gap_advertise_start(GapStateAdvFast); furi_hal_power_insomnia_exit(); } BleEvent event = {.type = BleEventTypeDisconnected}; @@ -446,7 +446,11 @@ void gap_thread_stop() { static int32_t gap_app(void *context) { GapCommand command; while(1) { - furi_check(osMessageQueueGet(gap->command_queue, &command, NULL, osWaitForever) == osOK); + osStatus status = osMessageQueueGet(gap->command_queue, &command, NULL, osWaitForever); + if(status != osOK) { + FURI_LOG_E(TAG, "Message queue get error: %d", status); + continue; + } osMutexAcquire(gap->state_mutex, osWaitForever); if(command == GapCommandKillThread) { break; diff --git a/firmware/targets/f6/ble-glue/hid_service.h b/firmware/targets/f6/ble-glue/hid_service.h index ab4a2bb9..ed1394be 100644 --- a/firmware/targets/f6/ble-glue/hid_service.h +++ b/firmware/targets/f6/ble-glue/hid_service.h @@ -3,8 +3,8 @@ #include #include -#define HID_SVC_REPORT_MAP_MAX_LEN (80) -#define HID_SVC_REPORT_MAX_LEN (8) +#define HID_SVC_REPORT_MAP_MAX_LEN (120) +#define HID_SVC_REPORT_MAX_LEN (9) #define HID_SVC_BOOT_KEYBOARD_INPUT_REPORT_MAX_LEN (8) #define HID_SVC_REPORT_REF_LEN (2) #define HID_SVC_INFO_LEN (4) diff --git a/firmware/targets/f6/furi-hal/furi-hal-bt-hid.c b/firmware/targets/f6/furi-hal/furi-hal-bt-hid.c index 5d5e89ed..890c447c 100644 --- a/firmware/targets/f6/furi-hal/furi-hal-bt-hid.c +++ b/firmware/targets/f6/furi-hal/furi-hal-bt-hid.c @@ -13,16 +13,23 @@ #define FURI_HAL_BT_HID_KB_KEYS_MAX (6) typedef struct { + // uint8_t report_id; uint8_t mods; uint8_t reserved; uint8_t key[FURI_HAL_BT_HID_KB_KEYS_MAX]; } FuriHalBtHidKbReport; -// TODO rework with HID defines +typedef struct { + uint8_t report_id; + uint8_t key; +} FuriHalBtHidMediaReport; + +// TODO make composite HID device static uint8_t furi_hal_bt_hid_report_map_data[] = { 0x05, 0x01, // Usage Page (Generic Desktop) 0x09, 0x06, // Usage (Keyboard) 0xA1, 0x01, // Collection (Application) + // 0x85, 0x01, // Report ID (1) 0x05, 0x07, // Usage Page (Key Codes) 0x19, 0xe0, // Usage Minimum (224) 0x29, 0xe7, // Usage Maximum (231) @@ -62,10 +69,31 @@ static uint8_t furi_hal_bt_hid_report_map_data[] = { 0x95, 0x02, // Report Count (2) 0xB1, 0x02, // Feature (Data, Variable, Absolute) - 0xC0 // End Collection (Application) + 0xC0, // End Collection (Application) + + // 0x05, 0x0C, // Usage Page (Consumer) + // 0x09, 0x01, // Usage (Consumer Control) + // 0xA1, 0x01, // Collection (Application) + // 0x85, 0x02, // Report ID (2) + // 0x05, 0x0C, // Usage Page (Consumer) + // 0x15, 0x00, // Logical Minimum (0) + // 0x25, 0x01, // Logical Maximum (1) + // 0x75, 0x01, // Report Size (1) + // 0x95, 0x07, // Report Count (7) + // 0x09, 0xB5, // Usage (Scan Next Track) + // 0x09, 0xB6, // Usage (Scan Previous Track) + // 0x09, 0xB7, // Usage (Stop) + // 0x09, 0xB8, // Usage (Eject) + // 0x09, 0xCD, // Usage (Play/Pause) + // 0x09, 0xE2, // Usage (Mute) + // 0x09, 0xE9, // Usage (Volume Increment) + // 0x09, 0xEA, // Usage (Volume Decrement) + // 0x81, 0x02, // Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position) + // 0xC0, // End Collection }; FuriHalBtHidKbReport* kb_report = NULL; +FuriHalBtHidMediaReport* media_report = NULL; void furi_hal_bt_hid_start() { // Start device info @@ -82,6 +110,7 @@ void furi_hal_bt_hid_start() { } // Configure HID Keyboard kb_report = furi_alloc(sizeof(FuriHalBtHidKbReport)); + media_report = furi_alloc(sizeof(FuriHalBtHidMediaReport)); // Configure Report Map characteristic hid_svc_update_report_map(furi_hal_bt_hid_report_map_data, sizeof(furi_hal_bt_hid_report_map_data)); // Configure HID Information characteristic @@ -107,11 +136,14 @@ void furi_hal_bt_hid_stop() { hid_svc_stop(); } free(kb_report); + free(media_report); + media_report = NULL; kb_report = NULL; } bool furi_hal_bt_hid_kb_press(uint16_t button) { furi_assert(kb_report); + // kb_report->report_id = 0x01; for (uint8_t i = 0; i < FURI_HAL_BT_HID_KB_KEYS_MAX; i++) { if (kb_report->key[i] == 0) { kb_report->key[i] = button & 0xFF; @@ -124,6 +156,7 @@ bool furi_hal_bt_hid_kb_press(uint16_t button) { bool furi_hal_bt_hid_kb_release(uint16_t button) { furi_assert(kb_report); + // kb_report->report_id = 0x01; for (uint8_t i = 0; i < FURI_HAL_BT_HID_KB_KEYS_MAX; i++) { if (kb_report->key[i] == (button & 0xFF)) { kb_report->key[i] = 0; @@ -136,6 +169,28 @@ bool furi_hal_bt_hid_kb_release(uint16_t button) { bool furi_hal_bt_hid_kb_release_all() { furi_assert(kb_report); + // kb_report->report_id = 0x01; memset(kb_report, 0, sizeof(FuriHalBtHidKbReport)); return hid_svc_update_input_report((uint8_t*)kb_report, sizeof(FuriHalBtHidKbReport)); } + +bool furi_hal_bt_hid_media_press(uint8_t button) { + furi_assert(media_report); + media_report->report_id = 0x02; + media_report->key |= (0x01 << button); + return hid_svc_update_input_report((uint8_t*)media_report, sizeof(FuriHalBtHidMediaReport)); +} + +bool furi_hal_bt_hid_media_release(uint8_t button) { + furi_assert(media_report); + media_report->report_id = 0x02; + media_report->key &= ~(0x01 << button); + return hid_svc_update_input_report((uint8_t*)media_report, sizeof(FuriHalBtHidMediaReport)); +} + +bool furi_hal_bt_hid_media_release_all() { + furi_assert(media_report); + media_report->report_id = 0x02; + media_report->key = 0x00; + return hid_svc_update_input_report((uint8_t*)media_report, sizeof(FuriHalBtHidMediaReport)); +} diff --git a/firmware/targets/f6/furi-hal/furi-hal-bt.c b/firmware/targets/f6/furi-hal/furi-hal-bt.c index 714d894f..bbd29754 100644 --- a/firmware/targets/f6/furi-hal/furi-hal-bt.c +++ b/firmware/targets/f6/furi-hal/furi-hal-bt.c @@ -126,9 +126,9 @@ bool furi_hal_bt_start_app(FuriHalBtProfile profile, BleEventCallback event_cb, } else if(profile == FuriHalBtProfileHidKeyboard) { // Change MAC address for HID profile config->mac_address[2]++; - // Change name Flipper -> Clicker - const char* clicker_str = "Clicker"; - memcpy(&config->adv_name[1], clicker_str, strlen(clicker_str) - 1); + // Change name Flipper -> Keynote + const char* clicker_str = "Keynote"; + memcpy(&config->adv_name[1], clicker_str, strlen(clicker_str)); } ret = gap_init(config, event_cb, context); if(!ret) { diff --git a/firmware/targets/f7/ble-glue/gap.c b/firmware/targets/f7/ble-glue/gap.c index 7f574f0b..e2991fca 100644 --- a/firmware/targets/f7/ble-glue/gap.c +++ b/firmware/targets/f7/ble-glue/gap.c @@ -75,7 +75,7 @@ SVCCTL_UserEvtFlowStatus_t SVCCTL_App_Notification( void *pckt ) } if(gap->enable_adv) { // Restart advertising - gap_advertise_start(GapCommandAdvFast); + gap_advertise_start(GapStateAdvFast); furi_hal_power_insomnia_exit(); } BleEvent event = {.type = BleEventTypeDisconnected}; @@ -446,7 +446,11 @@ void gap_thread_stop() { static int32_t gap_app(void *context) { GapCommand command; while(1) { - furi_check(osMessageQueueGet(gap->command_queue, &command, NULL, osWaitForever) == osOK); + osStatus status = osMessageQueueGet(gap->command_queue, &command, NULL, osWaitForever); + if(status != osOK) { + FURI_LOG_E(TAG, "Message queue get error: %d", status); + continue; + } osMutexAcquire(gap->state_mutex, osWaitForever); if(command == GapCommandKillThread) { break; diff --git a/firmware/targets/f7/ble-glue/hid_service.h b/firmware/targets/f7/ble-glue/hid_service.h index ab4a2bb9..ed1394be 100644 --- a/firmware/targets/f7/ble-glue/hid_service.h +++ b/firmware/targets/f7/ble-glue/hid_service.h @@ -3,8 +3,8 @@ #include #include -#define HID_SVC_REPORT_MAP_MAX_LEN (80) -#define HID_SVC_REPORT_MAX_LEN (8) +#define HID_SVC_REPORT_MAP_MAX_LEN (120) +#define HID_SVC_REPORT_MAX_LEN (9) #define HID_SVC_BOOT_KEYBOARD_INPUT_REPORT_MAX_LEN (8) #define HID_SVC_REPORT_REF_LEN (2) #define HID_SVC_INFO_LEN (4) diff --git a/firmware/targets/f7/furi-hal/furi-hal-bt-hid.c b/firmware/targets/f7/furi-hal/furi-hal-bt-hid.c index 5d5e89ed..890c447c 100644 --- a/firmware/targets/f7/furi-hal/furi-hal-bt-hid.c +++ b/firmware/targets/f7/furi-hal/furi-hal-bt-hid.c @@ -13,16 +13,23 @@ #define FURI_HAL_BT_HID_KB_KEYS_MAX (6) typedef struct { + // uint8_t report_id; uint8_t mods; uint8_t reserved; uint8_t key[FURI_HAL_BT_HID_KB_KEYS_MAX]; } FuriHalBtHidKbReport; -// TODO rework with HID defines +typedef struct { + uint8_t report_id; + uint8_t key; +} FuriHalBtHidMediaReport; + +// TODO make composite HID device static uint8_t furi_hal_bt_hid_report_map_data[] = { 0x05, 0x01, // Usage Page (Generic Desktop) 0x09, 0x06, // Usage (Keyboard) 0xA1, 0x01, // Collection (Application) + // 0x85, 0x01, // Report ID (1) 0x05, 0x07, // Usage Page (Key Codes) 0x19, 0xe0, // Usage Minimum (224) 0x29, 0xe7, // Usage Maximum (231) @@ -62,10 +69,31 @@ static uint8_t furi_hal_bt_hid_report_map_data[] = { 0x95, 0x02, // Report Count (2) 0xB1, 0x02, // Feature (Data, Variable, Absolute) - 0xC0 // End Collection (Application) + 0xC0, // End Collection (Application) + + // 0x05, 0x0C, // Usage Page (Consumer) + // 0x09, 0x01, // Usage (Consumer Control) + // 0xA1, 0x01, // Collection (Application) + // 0x85, 0x02, // Report ID (2) + // 0x05, 0x0C, // Usage Page (Consumer) + // 0x15, 0x00, // Logical Minimum (0) + // 0x25, 0x01, // Logical Maximum (1) + // 0x75, 0x01, // Report Size (1) + // 0x95, 0x07, // Report Count (7) + // 0x09, 0xB5, // Usage (Scan Next Track) + // 0x09, 0xB6, // Usage (Scan Previous Track) + // 0x09, 0xB7, // Usage (Stop) + // 0x09, 0xB8, // Usage (Eject) + // 0x09, 0xCD, // Usage (Play/Pause) + // 0x09, 0xE2, // Usage (Mute) + // 0x09, 0xE9, // Usage (Volume Increment) + // 0x09, 0xEA, // Usage (Volume Decrement) + // 0x81, 0x02, // Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position) + // 0xC0, // End Collection }; FuriHalBtHidKbReport* kb_report = NULL; +FuriHalBtHidMediaReport* media_report = NULL; void furi_hal_bt_hid_start() { // Start device info @@ -82,6 +110,7 @@ void furi_hal_bt_hid_start() { } // Configure HID Keyboard kb_report = furi_alloc(sizeof(FuriHalBtHidKbReport)); + media_report = furi_alloc(sizeof(FuriHalBtHidMediaReport)); // Configure Report Map characteristic hid_svc_update_report_map(furi_hal_bt_hid_report_map_data, sizeof(furi_hal_bt_hid_report_map_data)); // Configure HID Information characteristic @@ -107,11 +136,14 @@ void furi_hal_bt_hid_stop() { hid_svc_stop(); } free(kb_report); + free(media_report); + media_report = NULL; kb_report = NULL; } bool furi_hal_bt_hid_kb_press(uint16_t button) { furi_assert(kb_report); + // kb_report->report_id = 0x01; for (uint8_t i = 0; i < FURI_HAL_BT_HID_KB_KEYS_MAX; i++) { if (kb_report->key[i] == 0) { kb_report->key[i] = button & 0xFF; @@ -124,6 +156,7 @@ bool furi_hal_bt_hid_kb_press(uint16_t button) { bool furi_hal_bt_hid_kb_release(uint16_t button) { furi_assert(kb_report); + // kb_report->report_id = 0x01; for (uint8_t i = 0; i < FURI_HAL_BT_HID_KB_KEYS_MAX; i++) { if (kb_report->key[i] == (button & 0xFF)) { kb_report->key[i] = 0; @@ -136,6 +169,28 @@ bool furi_hal_bt_hid_kb_release(uint16_t button) { bool furi_hal_bt_hid_kb_release_all() { furi_assert(kb_report); + // kb_report->report_id = 0x01; memset(kb_report, 0, sizeof(FuriHalBtHidKbReport)); return hid_svc_update_input_report((uint8_t*)kb_report, sizeof(FuriHalBtHidKbReport)); } + +bool furi_hal_bt_hid_media_press(uint8_t button) { + furi_assert(media_report); + media_report->report_id = 0x02; + media_report->key |= (0x01 << button); + return hid_svc_update_input_report((uint8_t*)media_report, sizeof(FuriHalBtHidMediaReport)); +} + +bool furi_hal_bt_hid_media_release(uint8_t button) { + furi_assert(media_report); + media_report->report_id = 0x02; + media_report->key &= ~(0x01 << button); + return hid_svc_update_input_report((uint8_t*)media_report, sizeof(FuriHalBtHidMediaReport)); +} + +bool furi_hal_bt_hid_media_release_all() { + furi_assert(media_report); + media_report->report_id = 0x02; + media_report->key = 0x00; + return hid_svc_update_input_report((uint8_t*)media_report, sizeof(FuriHalBtHidMediaReport)); +} diff --git a/firmware/targets/f7/furi-hal/furi-hal-bt.c b/firmware/targets/f7/furi-hal/furi-hal-bt.c index 714d894f..bbd29754 100644 --- a/firmware/targets/f7/furi-hal/furi-hal-bt.c +++ b/firmware/targets/f7/furi-hal/furi-hal-bt.c @@ -126,9 +126,9 @@ bool furi_hal_bt_start_app(FuriHalBtProfile profile, BleEventCallback event_cb, } else if(profile == FuriHalBtProfileHidKeyboard) { // Change MAC address for HID profile config->mac_address[2]++; - // Change name Flipper -> Clicker - const char* clicker_str = "Clicker"; - memcpy(&config->adv_name[1], clicker_str, strlen(clicker_str) - 1); + // Change name Flipper -> Keynote + const char* clicker_str = "Keynote"; + memcpy(&config->adv_name[1], clicker_str, strlen(clicker_str)); } ret = gap_init(config, event_cb, context); if(!ret) { diff --git a/firmware/targets/furi-hal-include/furi-hal-bt-hid.h b/firmware/targets/furi-hal-include/furi-hal-bt-hid.h index 03b2c7f7..8dd42803 100644 --- a/firmware/targets/furi-hal-include/furi-hal-bt-hid.h +++ b/firmware/targets/furi-hal-include/furi-hal-bt-hid.h @@ -3,6 +3,17 @@ #include #include +enum FuriHalBtHidMediKeys{ + FuriHalBtHidMediaScanNext, + FuriHalBtHidMediaScanPrevious, + FuriHalBtHidMediaStop, + FuriHalBtHidMediaEject, + FuriHalBtHidMediaPlayPause, + FuriHalBtHidMediaMute, + FuriHalBtHidMediaVolumeUp, + FuriHalBtHidMediaVolumeDown, +}; + /** Start Hid Keyboard Profile */ void furi_hal_bt_hid_start(); @@ -11,7 +22,7 @@ void furi_hal_bt_hid_start(); */ void furi_hal_bt_hid_stop(); -/** Press key button +/** Press keyboard button * * @param button button code from HID specification * @@ -19,7 +30,7 @@ void furi_hal_bt_hid_stop(); */ bool furi_hal_bt_hid_kb_press(uint16_t button); -/** Release key button +/** Release keyboard button * * @param button button code from HID specification * @@ -27,8 +38,26 @@ bool furi_hal_bt_hid_kb_press(uint16_t button); */ bool furi_hal_bt_hid_kb_release(uint16_t button); -/** Release all key buttons +/** Release all keyboard buttons * * @return true on success */ bool furi_hal_bt_hid_kb_release_all(); + +/** Release all media buttons + * + * @return true on success + */ +bool furi_hal_bt_hid_media_press(uint8_t button); + +/** Release all media buttons + * + * @return true on success + */ +bool furi_hal_bt_hid_media_release(uint8_t button); + +/** Release all media buttons + * + * @return true on success + */ +bool furi_hal_bt_hid_media_release_all(); From 757ea073a8308815fcb3e7b18cbb96865d70c186 Mon Sep 17 00:00:00 2001 From: gornekich Date: Wed, 15 Dec 2021 20:58:42 +0300 Subject: [PATCH 07/13] FurHal: synchronise subghz hal between targets. (#904) * furi-hal-subghz: target fixes * FuriHal: remove unused include from subghz Co-authored-by: Aleksandr Kutuzov --- .../targets/f6/furi-hal/furi-hal-subghz.c | 29 +++++++++++++++++-- .../targets/f7/furi-hal/furi-hal-subghz.c | 3 -- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/firmware/targets/f6/furi-hal/furi-hal-subghz.c b/firmware/targets/f6/furi-hal/furi-hal-subghz.c index 3e810880..bb762d2f 100644 --- a/firmware/targets/f6/furi-hal/furi-hal-subghz.c +++ b/firmware/targets/f6/furi-hal/furi-hal-subghz.c @@ -808,6 +808,8 @@ typedef struct { bool flip_flop; FuriHalSubGhzAsyncTxCallback callback; void* callback_context; + uint64_t duty_high; + uint64_t duty_low; } FuriHalSubGhzAsyncTx; static FuriHalSubGhzAsyncTx furi_hal_subghz_async_tx = {0}; @@ -817,21 +819,30 @@ static void furi_hal_subghz_async_tx_refill(uint32_t* buffer, size_t samples) { bool is_odd = samples % 2; LevelDuration ld = furi_hal_subghz_async_tx.callback(furi_hal_subghz_async_tx.callback_context); - if(level_duration_is_wait(ld)) return; - if(level_duration_is_reset(ld)) { + + if(level_duration_is_wait(ld)) { + return; + } else if(level_duration_is_reset(ld)) { // One more even sample required to end at low level if(is_odd) { *buffer = API_HAL_SUBGHZ_ASYNC_TX_GUARD_TIME; buffer++; samples--; + furi_hal_subghz_async_tx.duty_low += API_HAL_SUBGHZ_ASYNC_TX_GUARD_TIME; } break; } else { // Inject guard time if level is incorrect - if(is_odd == level_duration_get_level(ld)) { + bool level = level_duration_get_level(ld); + if(is_odd == level) { *buffer = API_HAL_SUBGHZ_ASYNC_TX_GUARD_TIME; buffer++; samples--; + if (!level) { + furi_hal_subghz_async_tx.duty_high += API_HAL_SUBGHZ_ASYNC_TX_GUARD_TIME; + } else { + furi_hal_subghz_async_tx.duty_low += API_HAL_SUBGHZ_ASYNC_TX_GUARD_TIME; + } } uint32_t duration = level_duration_get_duration(ld); @@ -839,6 +850,12 @@ static void furi_hal_subghz_async_tx_refill(uint32_t* buffer, size_t samples) { *buffer = duration; buffer++; samples--; + + if (level) { + furi_hal_subghz_async_tx.duty_high += duration; + } else { + furi_hal_subghz_async_tx.duty_low += duration; + } } } @@ -888,6 +905,9 @@ bool furi_hal_subghz_start_async_tx(FuriHalSubGhzAsyncTxCallback callback, void* furi_hal_subghz_state = SubGhzStateAsyncTx; + furi_hal_subghz_async_tx.duty_low = 0; + furi_hal_subghz_async_tx.duty_high = 0; + furi_hal_subghz_async_tx.buffer = furi_alloc(API_HAL_SUBGHZ_ASYNC_TX_BUFFER_FULL * sizeof(uint32_t)); furi_hal_subghz_async_tx_refill( @@ -994,5 +1014,8 @@ void furi_hal_subghz_stop_async_tx() { free(furi_hal_subghz_async_tx.buffer); + float duty_cycle = 100.0f * (float)furi_hal_subghz_async_tx.duty_high / ((float)furi_hal_subghz_async_tx.duty_low + (float)furi_hal_subghz_async_tx.duty_high); + FURI_LOG_D(TAG, "Async TX Radio stats: on %0.0fus, off %0.0fus, DutyCycle: %0.0f%%", (float)furi_hal_subghz_async_tx.duty_high, (float)furi_hal_subghz_async_tx.duty_low, duty_cycle); + furi_hal_subghz_state = SubGhzStateIdle; } diff --git a/firmware/targets/f7/furi-hal/furi-hal-subghz.c b/firmware/targets/f7/furi-hal/furi-hal-subghz.c index 1b794182..bb762d2f 100644 --- a/firmware/targets/f7/furi-hal/furi-hal-subghz.c +++ b/firmware/targets/f7/furi-hal/furi-hal-subghz.c @@ -10,9 +10,6 @@ #include #include -#define __STDC_FORMAT_MACROS -#include - #define TAG "FuriHalSubGhz" static volatile SubGhzState furi_hal_subghz_state = SubGhzStateInit; From de006aa06aad160a1207cd4b6d414d28981da152 Mon Sep 17 00:00:00 2001 From: ghettorce <799240+ghettorce@users.noreply.github.com> Date: Wed, 15 Dec 2021 21:27:25 +0300 Subject: [PATCH 08/13] NFC: fixes & improvements (#897) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * nfc: (mf_ul) fix overflow while reading * nfc: (mf_ul) fix FAST_READ command emulation * nfc: (mf_ul) implement non-strict PWD_AUTH command emulation for NTAG21x * nfc: (mf_ul) improve emulation stability by removing frequent furi_hal_console_put() calls that cause delays or something * nfc: (mf_ul) remove calls to blocking functions from emulation worker Co-authored-by: あく --- applications/nfc/nfc_worker.c | 8 ++- lib/nfc_protocols/mifare_ultralight.c | 71 +++++++++++++++++++++++++-- lib/nfc_protocols/mifare_ultralight.h | 9 ++++ 3 files changed, 78 insertions(+), 10 deletions(-) diff --git a/applications/nfc/nfc_worker.c b/applications/nfc/nfc_worker.c index 3f7f87e4..27eab370 100644 --- a/applications/nfc/nfc_worker.c +++ b/applications/nfc/nfc_worker.c @@ -613,6 +613,9 @@ void nfc_worker_emulate_mifare_ul(NfcWorker* nfc_worker) { // Setup emulation parameters from mifare ultralight data structure mf_ul_prepare_emulation(&mf_ul_emulate, &data->mf_ul_data); while(nfc_worker->state == NfcWorkerStateEmulateMifareUl) { + // WARNING + // DO NOT call any blocking functions (e.g. FURI_LOG_*) in this loop, + // as any delay will negatively affect the stability of the emulation. if(furi_hal_nfc_listen( data->nfc_data.uid, data->nfc_data.uid_len, @@ -620,7 +623,6 @@ void nfc_worker_emulate_mifare_ul(NfcWorker* nfc_worker) { data->nfc_data.sak, true, 200)) { - FURI_LOG_D(TAG, "Anticollision passed"); if(furi_hal_nfc_get_first_frame(&rx_buff, &rx_len)) { // Data exchange loop while(nfc_worker->state == NfcWorkerStateEmulateMifareUl) { @@ -632,17 +634,14 @@ void nfc_worker_emulate_mifare_ul(NfcWorker* nfc_worker) { if(err == ERR_NONE) { continue; } else { - FURI_LOG_E(TAG, "Communication error: %d", err); break; } } else { - FURI_LOG_W(TAG, "Not valid command: %02X", rx_buff[0]); furi_hal_nfc_deactivate(); break; } } } else { - FURI_LOG_W(TAG, "Error in 1st data exchange"); furi_hal_nfc_deactivate(); } } @@ -653,7 +652,6 @@ void nfc_worker_emulate_mifare_ul(NfcWorker* nfc_worker) { nfc_worker->callback(nfc_worker->context); } } - FURI_LOG_W(TAG, "Can't find reader"); osThreadYield(); } } diff --git a/lib/nfc_protocols/mifare_ultralight.c b/lib/nfc_protocols/mifare_ultralight.c index 962b81b0..b3678864 100644 --- a/lib/nfc_protocols/mifare_ultralight.c +++ b/lib/nfc_protocols/mifare_ultralight.c @@ -53,9 +53,14 @@ uint16_t mf_ul_prepare_read(uint8_t* dest, uint8_t start_page) { } void mf_ul_parse_read_response(uint8_t* buff, uint16_t page_addr, MifareUlDevice* mf_ul_read) { - mf_ul_read->pages_readed += 4; + uint8_t pages_read = 4; + uint8_t page_read_count = mf_ul_read->pages_readed + pages_read; + if(page_read_count > mf_ul_read->pages_to_read) { + pages_read -= page_read_count - mf_ul_read->pages_to_read; + } + mf_ul_read->pages_readed += pages_read; mf_ul_read->data.data_size = mf_ul_read->pages_readed * 4; - memcpy(&mf_ul_read->data.data[page_addr * 4], buff, 16); + memcpy(&mf_ul_read->data.data[page_addr * 4], buff, pages_read * 4); } uint16_t mf_ul_prepare_fast_read(uint8_t* dest, uint8_t start_page, uint8_t end_page) { @@ -140,6 +145,7 @@ uint16_t mf_ul_prepare_write(uint8_t* dest, uint16_t page_addr, uint32_t data) { void mf_ul_prepare_emulation(MifareUlDevice* mf_ul_emulate, MifareUlData* data) { mf_ul_emulate->data = *data; + mf_ul_emulate->auth_data = NULL; mf_ul_emulate->data_changed = false; if(data->version.storage_size == 0) { mf_ul_emulate->type = MfUltralightTypeUnknown; @@ -150,6 +156,37 @@ void mf_ul_prepare_emulation(MifareUlDevice* mf_ul_emulate, MifareUlData* data) } else if(data->version.storage_size == 0x0E) { mf_ul_emulate->type = MfUltralightTypeUL21; mf_ul_emulate->support_fast_read = true; + } else if(data->version.storage_size == 0x0F) { + mf_ul_emulate->type = MfUltralightTypeNTAG213; + mf_ul_emulate->support_fast_read = true; + } else if(data->version.storage_size == 0x11) { + mf_ul_emulate->type = MfUltralightTypeNTAG215; + mf_ul_emulate->support_fast_read = true; + } else if(data->version.storage_size == 0x13) { + mf_ul_emulate->type = MfUltralightTypeNTAG216; + mf_ul_emulate->support_fast_read = true; + } + + if(mf_ul_emulate->type >= MfUltralightTypeNTAG213) { + uint16_t pwd_page = (data->data_size / 4) - 2; + mf_ul_emulate->auth_data = (MifareUlAuthData*)&data->data[pwd_page * 4]; + } +} + +void mf_ul_protect_auth_data_on_read_command( + uint8_t* tx_buff, + uint8_t start_page, + uint8_t end_page, + MifareUlDevice* mf_ul_emulate) { + if(mf_ul_emulate->type >= MfUltralightTypeNTAG213) { + uint8_t pwd_page = (mf_ul_emulate->data.data_size / 4) - 2; + uint8_t pack_page = pwd_page + 1; + if((start_page <= pwd_page) && (end_page >= pwd_page)) { + memset(&tx_buff[(pwd_page - start_page) * 4], 0, 4); + } + if((start_page <= pack_page) && (end_page >= pack_page)) { + memset(&tx_buff[(pack_page - start_page) * 4], 0, 2); + } } } @@ -175,16 +212,24 @@ uint16_t mf_ul_prepare_emulation_response(uint8_t* buff_rx, uint16_t len_rx, uin } else { memcpy(buff_tx, &mf_ul_emulate->data.data[start_page * 4], tx_len); } + mf_ul_protect_auth_data_on_read_command( + buff_tx, start_page, (start_page + 4), mf_ul_emulate); } } else if(cmd == MF_UL_FAST_READ_CMD) { if(mf_ul_emulate->support_fast_read) { uint8_t start_page = buff_rx[1]; uint8_t end_page = buff_rx[2]; if((start_page < page_num) && - (end_page < page_num) && (start_page < end_page)) { - tx_len = (end_page - start_page) * 4; + (end_page < page_num) && (start_page < (end_page + 1))) { + tx_len = ((end_page + 1) - start_page) * 4; memcpy(buff_tx, &mf_ul_emulate->data.data[start_page * 4], tx_len); - } + mf_ul_protect_auth_data_on_read_command( + buff_tx, start_page, end_page, mf_ul_emulate); + } else { + // TODO make 4-bit NAK + buff_tx[0] = 0x0; + tx_len = 1; + } } } else if(cmd == MF_UL_WRITE) { uint8_t write_page = buff_rx[1]; @@ -213,6 +258,22 @@ uint16_t mf_ul_prepare_emulation_response(uint8_t* buff_rx, uint16_t len_rx, uin buff_tx[0] = 0x0A; tx_len = 1; } + } else if(cmd == MF_UL_AUTH) { + if(mf_ul_emulate->type >= MfUltralightTypeNTAG213) { + if(memcmp(&buff_rx[1], mf_ul_emulate->auth_data->pwd, 4) == 0) { + buff_tx[0] = mf_ul_emulate->auth_data->pack.raw[0]; + buff_tx[1] = mf_ul_emulate->auth_data->pack.raw[1]; + tx_len = 2; + } else if(!mf_ul_emulate->auth_data->pack.value) { + buff_tx[0] = 0x80; + buff_tx[1] = 0x80; + tx_len = 2; + } else { + // TODO make 4-bit NAK + buff_tx[0] = 0x0; + tx_len = 1; + } + } } else if(cmd == MF_UL_READ_SIG) { // Check 2nd byte = 0x00 - RFU if(buff_rx[1] == 0x00) { diff --git a/lib/nfc_protocols/mifare_ultralight.h b/lib/nfc_protocols/mifare_ultralight.h index 4548ca73..386850c8 100644 --- a/lib/nfc_protocols/mifare_ultralight.h +++ b/lib/nfc_protocols/mifare_ultralight.h @@ -60,6 +60,14 @@ typedef struct { uint8_t data[MF_UL_MAX_DUMP_SIZE]; } MifareUlData; +typedef struct { + uint8_t pwd[4]; + union { + uint8_t raw[2]; + uint16_t value; + } pack; +} MifareUlAuthData; + typedef struct { MfUltralightType type; uint8_t pages_to_read; @@ -67,6 +75,7 @@ typedef struct { bool support_fast_read; bool data_changed; MifareUlData data; + MifareUlAuthData* auth_data; } MifareUlDevice; bool mf_ul_check_card_type(uint8_t ATQA0, uint8_t ATQA1, uint8_t SAK); From 36089c74727e7c74bf6cd94d10070d1e030f198b Mon Sep 17 00:00:00 2001 From: gornekich Date: Wed, 15 Dec 2021 22:07:37 +0300 Subject: [PATCH 09/13] Change NFC log messaged level (#906) * nfc: change nfc worker log messaged to debug level * FuriHal: switch logging level to trace in nfc Co-authored-by: Aleksandr Kutuzov --- applications/nfc/nfc_worker.c | 116 ++++++++++---------- firmware/targets/f6/furi-hal/furi-hal-nfc.c | 4 +- firmware/targets/f7/furi-hal/furi-hal-nfc.c | 4 +- 3 files changed, 64 insertions(+), 60 deletions(-) diff --git a/applications/nfc/nfc_worker.c b/applications/nfc/nfc_worker.c index 27eab370..5f810cf6 100644 --- a/applications/nfc/nfc_worker.c +++ b/applications/nfc/nfc_worker.c @@ -144,7 +144,7 @@ void nfc_worker_emulate(NfcWorker* nfc_worker) { NfcDeviceCommonData* data = &nfc_worker->dev_data->nfc_data; while(nfc_worker->state == NfcWorkerStateEmulate) { if(furi_hal_nfc_listen(data->uid, data->uid_len, data->atqa, data->sak, false, 100)) { - FURI_LOG_I(TAG, "Reader detected"); + FURI_LOG_D(TAG, "Reader detected"); } osDelay(10); } @@ -174,17 +174,17 @@ void nfc_worker_read_emv_app(NfcWorker* nfc_worker) { result->nfc_data.uid, dev_list[0].dev.nfca.nfcId1, result->nfc_data.uid_len); result->nfc_data.protocol = NfcDeviceProtocolEMV; - FURI_LOG_I(TAG, "Send select PPSE command"); + FURI_LOG_D(TAG, "Send select PPSE command"); tx_len = emv_prepare_select_ppse(tx_buff); err = furi_hal_nfc_data_exchange(tx_buff, tx_len, &rx_buff, &rx_len, false); if(err != ERR_NONE) { - FURI_LOG_E(TAG, "Error during selection PPSE request: %d", err); + FURI_LOG_D(TAG, "Error during selection PPSE request: %d", err); furi_hal_nfc_deactivate(); continue; } - FURI_LOG_I(TAG, "Select PPSE response received. Start parsing response"); + FURI_LOG_D(TAG, "Select PPSE response received. Start parsing response"); if(emv_decode_ppse_response(rx_buff, *rx_len, &emv_app)) { - FURI_LOG_I(TAG, "Select PPSE responce parced"); + FURI_LOG_D(TAG, "Select PPSE responce parced"); // Notify caller and exit result->emv_data.aid_len = emv_app.aid_len; memcpy(result->emv_data.aid, emv_app.aid, emv_app.aid_len); @@ -193,7 +193,7 @@ void nfc_worker_read_emv_app(NfcWorker* nfc_worker) { } break; } else { - FURI_LOG_E(TAG, "Can't find pay application"); + FURI_LOG_D(TAG, "Can't find pay application"); furi_hal_nfc_deactivate(); continue; } @@ -204,7 +204,7 @@ void nfc_worker_read_emv_app(NfcWorker* nfc_worker) { } } else { // Can't find EMV card - FURI_LOG_W(TAG, "Can't find any cards"); + FURI_LOG_D(TAG, "Can't find any cards"); furi_hal_nfc_deactivate(); } osDelay(20); @@ -235,53 +235,53 @@ void nfc_worker_read_emv(NfcWorker* nfc_worker) { result->nfc_data.uid, dev_list[0].dev.nfca.nfcId1, result->nfc_data.uid_len); result->nfc_data.protocol = NfcDeviceProtocolEMV; - FURI_LOG_I(TAG, "Send select PPSE command"); + FURI_LOG_D(TAG, "Send select PPSE command"); tx_len = emv_prepare_select_ppse(tx_buff); err = furi_hal_nfc_data_exchange(tx_buff, tx_len, &rx_buff, &rx_len, false); if(err != ERR_NONE) { - FURI_LOG_E(TAG, "Error during selection PPSE request: %d", err); + FURI_LOG_D(TAG, "Error during selection PPSE request: %d", err); furi_hal_nfc_deactivate(); continue; } - FURI_LOG_I(TAG, "Select PPSE response received. Start parsing response"); + FURI_LOG_D(TAG, "Select PPSE response received. Start parsing response"); if(emv_decode_ppse_response(rx_buff, *rx_len, &emv_app)) { - FURI_LOG_I(TAG, "Select PPSE responce parced"); + FURI_LOG_D(TAG, "Select PPSE responce parced"); result->emv_data.aid_len = emv_app.aid_len; memcpy(result->emv_data.aid, emv_app.aid, emv_app.aid_len); } else { - FURI_LOG_E(TAG, "Can't find pay application"); + FURI_LOG_D(TAG, "Can't find pay application"); furi_hal_nfc_deactivate(); continue; } - FURI_LOG_I(TAG, "Starting application ..."); + FURI_LOG_D(TAG, "Starting application ..."); tx_len = emv_prepare_select_app(tx_buff, &emv_app); err = furi_hal_nfc_data_exchange(tx_buff, tx_len, &rx_buff, &rx_len, false); if(err != ERR_NONE) { - FURI_LOG_E(TAG, "Error during application selection request: %d", err); + FURI_LOG_D(TAG, "Error during application selection request: %d", err); furi_hal_nfc_deactivate(); continue; } - FURI_LOG_I(TAG, "Select application response received. Start parsing response"); + FURI_LOG_D(TAG, "Select application response received. Start parsing response"); if(emv_decode_select_app_response(rx_buff, *rx_len, &emv_app)) { - FURI_LOG_I(TAG, "Card name: %s", emv_app.name); + FURI_LOG_D(TAG, "Card name: %s", emv_app.name); memcpy(result->emv_data.name, emv_app.name, sizeof(emv_app.name)); } else if(emv_app.pdol.size > 0) { - FURI_LOG_W(TAG, "Can't find card name, but PDOL is present."); + FURI_LOG_D(TAG, "Can't find card name, but PDOL is present."); } else { - FURI_LOG_E(TAG, "Can't find card name or PDOL"); + FURI_LOG_D(TAG, "Can't find card name or PDOL"); furi_hal_nfc_deactivate(); continue; } - FURI_LOG_I(TAG, "Starting Get Processing Options command ..."); + FURI_LOG_D(TAG, "Starting Get Processing Options command ..."); tx_len = emv_prepare_get_proc_opt(tx_buff, &emv_app); err = furi_hal_nfc_data_exchange(tx_buff, tx_len, &rx_buff, &rx_len, false); if(err != ERR_NONE) { - FURI_LOG_E(TAG, "Error during Get Processing Options command: %d", err); + FURI_LOG_D(TAG, "Error during Get Processing Options command: %d", err); furi_hal_nfc_deactivate(); continue; } if(emv_decode_get_proc_opt(rx_buff, *rx_len, &emv_app)) { - FURI_LOG_I(TAG, "Card number parsed"); + FURI_LOG_D(TAG, "Card number parsed"); result->emv_data.number_len = emv_app.card_number_len; memcpy(result->emv_data.number, emv_app.card_number, emv_app.card_number_len); // Notify caller and exit @@ -304,7 +304,7 @@ void nfc_worker_read_emv(NfcWorker* nfc_worker) { err = furi_hal_nfc_data_exchange( tx_buff, tx_len, &rx_buff, &rx_len, false); if(err != ERR_NONE) { - FURI_LOG_E( + FURI_LOG_D( TAG, "Error reading application sfi %d, record %d", sfi, @@ -317,7 +317,7 @@ void nfc_worker_read_emv(NfcWorker* nfc_worker) { } } if(pan_found) { - FURI_LOG_I(TAG, "Card PAN found"); + FURI_LOG_D(TAG, "Card PAN found"); result->emv_data.number_len = emv_app.card_number_len; memcpy( result->emv_data.number, @@ -339,7 +339,7 @@ void nfc_worker_read_emv(NfcWorker* nfc_worker) { } break; } else { - FURI_LOG_E(TAG, "Can't read card number"); + FURI_LOG_D(TAG, "Can't read card number"); } furi_hal_nfc_deactivate(); } @@ -350,7 +350,7 @@ void nfc_worker_read_emv(NfcWorker* nfc_worker) { } } else { // Can't find EMV card - FURI_LOG_W(TAG, "Can't find any cards"); + FURI_LOG_D(TAG, "Can't find any cards"); furi_hal_nfc_deactivate(); } osDelay(20); @@ -412,63 +412,63 @@ void nfc_worker_emulate_apdu(NfcWorker* nfc_worker) { while(nfc_worker->state == NfcWorkerStateEmulateApdu) { if(furi_hal_nfc_listen(params.uid, params.uid_len, params.atqa, params.sak, false, 300)) { - FURI_LOG_I(TAG, "POS terminal detected"); + FURI_LOG_D(TAG, "POS terminal detected"); // Read data from POS terminal err = furi_hal_nfc_data_exchange(NULL, 0, &rx_buff, &rx_len, false); if(err == ERR_NONE) { - FURI_LOG_I(TAG, "Received Select PPSE"); + FURI_LOG_D(TAG, "Received Select PPSE"); } else { - FURI_LOG_E(TAG, "Error in 1st data exchange: select PPSE"); + FURI_LOG_D(TAG, "Error in 1st data exchange: select PPSE"); furi_hal_nfc_deactivate(); continue; } - FURI_LOG_I(TAG, "Transive SELECT PPSE ANS"); + FURI_LOG_D(TAG, "Transive SELECT PPSE ANS"); tx_len = emv_select_ppse_ans(tx_buff); err = furi_hal_nfc_data_exchange(tx_buff, tx_len, &rx_buff, &rx_len, false); if(err == ERR_NONE) { - FURI_LOG_I(TAG, "Received Select APP"); + FURI_LOG_D(TAG, "Received Select APP"); } else { - FURI_LOG_E(TAG, "Error in 2nd data exchange: select APP"); + FURI_LOG_D(TAG, "Error in 2nd data exchange: select APP"); furi_hal_nfc_deactivate(); continue; } - FURI_LOG_I(TAG, "Transive SELECT APP ANS"); + FURI_LOG_D(TAG, "Transive SELECT APP ANS"); tx_len = emv_select_app_ans(tx_buff); err = furi_hal_nfc_data_exchange(tx_buff, tx_len, &rx_buff, &rx_len, false); if(err == ERR_NONE) { - FURI_LOG_I(TAG, "Received PDOL"); + FURI_LOG_D(TAG, "Received PDOL"); } else { - FURI_LOG_E(TAG, "Error in 3rd data exchange: receive PDOL"); + FURI_LOG_D(TAG, "Error in 3rd data exchange: receive PDOL"); furi_hal_nfc_deactivate(); continue; } - FURI_LOG_I(TAG, "Transive PDOL ANS"); + FURI_LOG_D(TAG, "Transive PDOL ANS"); tx_len = emv_get_proc_opt_ans(tx_buff); err = furi_hal_nfc_data_exchange(tx_buff, tx_len, &rx_buff, &rx_len, false); if(err == ERR_NONE) { - FURI_LOG_I(TAG, "Transive PDOL ANS"); + FURI_LOG_D(TAG, "Transive PDOL ANS"); } else { - FURI_LOG_E(TAG, "Error in 4rd data exchange: Transive PDOL ANS"); + FURI_LOG_D(TAG, "Error in 4rd data exchange: Transive PDOL ANS"); furi_hal_nfc_deactivate(); continue; } if(*rx_len != sizeof(debug_rx) || memcmp(rx_buff, debug_rx, sizeof(debug_rx))) { - FURI_LOG_E(TAG, "Failed long message test"); + FURI_LOG_D(TAG, "Failed long message test"); } else { - FURI_LOG_I(TAG, "Correct debug message received"); + FURI_LOG_D(TAG, "Correct debug message received"); tx_len = sizeof(debug_tx); err = furi_hal_nfc_data_exchange( (uint8_t*)debug_tx, tx_len, &rx_buff, &rx_len, false); if(err == ERR_NONE) { - FURI_LOG_I(TAG, "Transive Debug message"); + FURI_LOG_D(TAG, "Transive Debug message"); } } furi_hal_nfc_deactivate(); } else { - FURI_LOG_W(TAG, "Can't find reader"); + FURI_LOG_D(TAG, "Can't find reader"); } osDelay(20); } @@ -495,26 +495,26 @@ void nfc_worker_read_mifare_ul(NfcWorker* nfc_worker) { dev_list[0].dev.nfca.sensRes.platformInfo, dev_list[0].dev.nfca.selRes.sak)) { // Get Mifare Ultralight version - FURI_LOG_I(TAG, "Found Mifare Ultralight tag. Reading tag version"); + FURI_LOG_D(TAG, "Found Mifare Ultralight tag. Reading tag version"); tx_len = mf_ul_prepare_get_version(tx_buff); err = furi_hal_nfc_data_exchange(tx_buff, tx_len, &rx_buff, &rx_len, false); if(err == ERR_NONE) { mf_ul_parse_get_version_response(rx_buff, &mf_ul_read); - FURI_LOG_I( + FURI_LOG_D( TAG, "Mifare Ultralight Type: %d, Pages: %d", mf_ul_read.type, mf_ul_read.pages_to_read); - FURI_LOG_I(TAG, "Reading signature ..."); + FURI_LOG_D(TAG, "Reading signature ..."); tx_len = mf_ul_prepare_read_signature(tx_buff); if(furi_hal_nfc_data_exchange(tx_buff, tx_len, &rx_buff, &rx_len, false)) { - FURI_LOG_W(TAG, "Failed reading signature"); + FURI_LOG_D(TAG, "Failed reading signature"); memset(mf_ul_read.data.signature, 0, sizeof(mf_ul_read.data.signature)); } else { mf_ul_parse_read_signature_response(rx_buff, &mf_ul_read); } } else if(err == ERR_TIMEOUT) { - FURI_LOG_W( + FURI_LOG_D( TAG, "Card doesn't respond to GET VERSION command. Setting default read parameters"); err = ERR_NONE; @@ -522,27 +522,27 @@ void nfc_worker_read_mifare_ul(NfcWorker* nfc_worker) { // Reinit device furi_hal_nfc_deactivate(); if(!furi_hal_nfc_detect(&dev_list, &dev_cnt, 300, false)) { - FURI_LOG_E(TAG, "Lost connection. Restarting search"); + FURI_LOG_D(TAG, "Lost connection. Restarting search"); continue; } } else { - FURI_LOG_E( + FURI_LOG_D( TAG, "Error getting Mifare Ultralight version. Error code: %d", err); continue; } if(mf_ul_read.support_fast_read) { - FURI_LOG_I(TAG, "Reading pages ..."); + FURI_LOG_D(TAG, "Reading pages ..."); tx_len = mf_ul_prepare_fast_read(tx_buff, 0x00, mf_ul_read.pages_to_read - 1); if(furi_hal_nfc_data_exchange(tx_buff, tx_len, &rx_buff, &rx_len, false)) { - FURI_LOG_E(TAG, "Failed reading pages"); + FURI_LOG_D(TAG, "Failed reading pages"); continue; } else { mf_ul_parse_fast_read_response( rx_buff, 0x00, mf_ul_read.pages_to_read - 1, &mf_ul_read); } - FURI_LOG_I(TAG, "Reading 3 counters ..."); + FURI_LOG_D(TAG, "Reading 3 counters ..."); for(uint8_t i = 0; i < 3; i++) { tx_len = mf_ul_prepare_read_cnt(tx_buff, i); if(furi_hal_nfc_data_exchange(tx_buff, tx_len, &rx_buff, &rx_len, false)) { @@ -553,11 +553,11 @@ void nfc_worker_read_mifare_ul(NfcWorker* nfc_worker) { } } - FURI_LOG_I(TAG, "Checking tearing flags ..."); + FURI_LOG_D(TAG, "Checking tearing flags ..."); for(uint8_t i = 0; i < 3; i++) { tx_len = mf_ul_prepare_check_tearing(tx_buff, i); if(furi_hal_nfc_data_exchange(tx_buff, tx_len, &rx_buff, &rx_len, false)) { - FURI_LOG_E(TAG, "Error checking tearing flag %d", i); + FURI_LOG_D(TAG, "Error checking tearing flag %d", i); mf_ul_read.data.tearing[i] = MF_UL_TEARING_FLAG_DEFAULT; } else { mf_ul_parse_check_tearing_response(rx_buff, i, &mf_ul_read); @@ -566,10 +566,10 @@ void nfc_worker_read_mifare_ul(NfcWorker* nfc_worker) { } else { // READ card with READ command (4 pages at a time) for(uint8_t page = 0; page < mf_ul_read.pages_to_read; page += 4) { - FURI_LOG_I(TAG, "Reading pages %d - %d ...", page, page + 3); + FURI_LOG_D(TAG, "Reading pages %d - %d ...", page, page + 3); tx_len = mf_ul_prepare_read(tx_buff, page); if(furi_hal_nfc_data_exchange(tx_buff, tx_len, &rx_buff, &rx_len, false)) { - FURI_LOG_E(TAG, "Read pages %d - %d failed", page, page + 3); + FURI_LOG_D(TAG, "Read pages %d - %d failed", page, page + 3); continue; } else { mf_ul_parse_read_response(rx_buff, page, &mf_ul_read); @@ -596,7 +596,7 @@ void nfc_worker_read_mifare_ul(NfcWorker* nfc_worker) { FURI_LOG_W(TAG, "Tag does not support Mifare Ultralight"); } } else { - FURI_LOG_W(TAG, "Can't find any tags"); + FURI_LOG_D(TAG, "Can't find any tags"); } osDelay(100); } @@ -634,14 +634,17 @@ void nfc_worker_emulate_mifare_ul(NfcWorker* nfc_worker) { if(err == ERR_NONE) { continue; } else { + FURI_LOG_D(TAG, "Communication error: %d", err); break; } } else { + FURI_LOG_D(TAG, "Not valid command: %02X", rx_buff[0]); furi_hal_nfc_deactivate(); break; } } } else { + FURI_LOG_D(TAG, "Error in 1st data exchange"); furi_hal_nfc_deactivate(); } } @@ -652,6 +655,7 @@ void nfc_worker_emulate_mifare_ul(NfcWorker* nfc_worker) { nfc_worker->callback(nfc_worker->context); } } + FURI_LOG_D(TAG, "Can't find reader"); osThreadYield(); } } diff --git a/firmware/targets/f6/furi-hal/furi-hal-nfc.c b/firmware/targets/f6/furi-hal/furi-hal-nfc.c index 4bca12a9..dbe5579c 100644 --- a/firmware/targets/f6/furi-hal/furi-hal-nfc.c +++ b/firmware/targets/f6/furi-hal/furi-hal-nfc.c @@ -65,7 +65,7 @@ bool furi_hal_nfc_detect(rfalNfcDevice **dev_list, uint8_t* dev_cnt, uint32_t ti while(state != RFAL_NFC_STATE_ACTIVATED) { rfalNfcWorker(); state = rfalNfcGetState(); - FURI_LOG_D(TAG, "Current state %d", state); + FURI_LOG_T(TAG, "Current state %d", state); if(state == RFAL_NFC_STATE_POLL_ACTIVATION) { start = DWT->CYCCNT; continue; @@ -75,7 +75,7 @@ bool furi_hal_nfc_detect(rfalNfcDevice **dev_list, uint8_t* dev_cnt, uint32_t ti } if(DWT->CYCCNT - start > timeout * clocks_in_ms) { rfalNfcDeactivate(true); - FURI_LOG_D(TAG, "Timeout"); + FURI_LOG_T(TAG, "Timeout"); return false; } osThreadYield(); diff --git a/firmware/targets/f7/furi-hal/furi-hal-nfc.c b/firmware/targets/f7/furi-hal/furi-hal-nfc.c index 4bca12a9..dbe5579c 100644 --- a/firmware/targets/f7/furi-hal/furi-hal-nfc.c +++ b/firmware/targets/f7/furi-hal/furi-hal-nfc.c @@ -65,7 +65,7 @@ bool furi_hal_nfc_detect(rfalNfcDevice **dev_list, uint8_t* dev_cnt, uint32_t ti while(state != RFAL_NFC_STATE_ACTIVATED) { rfalNfcWorker(); state = rfalNfcGetState(); - FURI_LOG_D(TAG, "Current state %d", state); + FURI_LOG_T(TAG, "Current state %d", state); if(state == RFAL_NFC_STATE_POLL_ACTIVATION) { start = DWT->CYCCNT; continue; @@ -75,7 +75,7 @@ bool furi_hal_nfc_detect(rfalNfcDevice **dev_list, uint8_t* dev_cnt, uint32_t ti } if(DWT->CYCCNT - start > timeout * clocks_in_ms) { rfalNfcDeactivate(true); - FURI_LOG_D(TAG, "Timeout"); + FURI_LOG_T(TAG, "Timeout"); return false; } osThreadYield(); From acb2c986635df6c33bbd048f731f41743519566e Mon Sep 17 00:00:00 2001 From: Anna Prosvetova Date: Thu, 16 Dec 2021 15:28:42 +0300 Subject: [PATCH 10/13] CI: pass the target in a fast flash link (#907) --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e7c8546f..d440147f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -147,5 +147,5 @@ jobs: comment-id: ${{ steps.fc.outputs.comment-id }} issue-number: ${{ github.event.pull_request.number }} body: | - [Click here](https://update.flipperzero.one/?url=https://update.flipperzero.one/builds/firmware/${{steps.names.outputs.artifacts-path}}/flipper-z-${{steps.names.outputs.default-target}}-full-${{steps.names.outputs.suffix}}.dfu&channel=${{steps.names.outputs.artifacts-path}}&version=${{steps.names.outputs.short-hash}}) to flash the `${{steps.names.outputs.short-hash}}` version of this branch via WebUSB. + [Click here](https://update.flipperzero.one/?url=https://update.flipperzero.one/builds/firmware/${{steps.names.outputs.artifacts-path}}/flipper-z-${{steps.names.outputs.default-target}}-full-${{steps.names.outputs.suffix}}.dfu&channel=${{steps.names.outputs.artifacts-path}}&version=${{steps.names.outputs.short-hash}}&target=${{steps.names.outputs.default-target}}) to flash the `${{steps.names.outputs.short-hash}}` version of this branch via WebUSB. edit-mode: replace From 4013da5b595af6c77ee8e9bf0644609aa07ec157 Mon Sep 17 00:00:00 2001 From: Anna Prosvetova Date: Thu, 16 Dec 2021 18:41:55 +0300 Subject: [PATCH 11/13] Rpc: implement SystemGetDateTime, SystemSetDateTime, update GuiStartVirtualDisplay (#908) * Rpc: update protobuf sources * Rpc: implement SystemGetDateTime, SystemSetDateTime * Rpc: add first frame parameter to GuiStartVirtualDisplay --- applications/rpc/rpc_gui.c | 10 +++++ applications/rpc/rpc_system.c | 56 +++++++++++++++++++++++ assets/compiled/flipper.pb.h | 18 ++++++-- assets/compiled/gui.pb.h | 19 ++++---- assets/compiled/system.pb.c | 12 +++++ assets/compiled/system.pb.h | 83 +++++++++++++++++++++++++++++++++++ assets/protobuf | 2 +- 7 files changed, 188 insertions(+), 12 deletions(-) diff --git a/applications/rpc/rpc_gui.c b/applications/rpc/rpc_gui.c index 6e9cfb08..4b8b42d1 100644 --- a/applications/rpc/rpc_gui.c +++ b/applications/rpc/rpc_gui.c @@ -159,6 +159,16 @@ void rpc_system_gui_start_virtual_display_process(const PB_Main* request, void* // Glad they both are 1024 for now size_t buffer_size = canvas_get_buffer_size(rpc_gui->gui->canvas); rpc_gui->virtual_display_buffer = furi_alloc(buffer_size); + + if(request->content.gui_start_virtual_display_request.has_first_frame) { + size_t buffer_size = canvas_get_buffer_size(rpc_gui->gui->canvas); + memcpy( + rpc_gui->virtual_display_buffer, + request->content.gui_start_virtual_display_request.first_frame.data->bytes, + buffer_size); + rpc_gui->virtual_display_not_empty = true; + } + rpc_gui->virtual_display_view_port = view_port_alloc(); view_port_draw_callback_set( rpc_gui->virtual_display_view_port, diff --git a/applications/rpc/rpc_system.c b/applications/rpc/rpc_system.c index 01cb3145..56b626f4 100644 --- a/applications/rpc/rpc_system.c +++ b/applications/rpc/rpc_system.c @@ -98,6 +98,56 @@ void rpc_system_system_device_info_process(const PB_Main* request, void* context free(response); } +void rpc_system_system_get_datetime_process(const PB_Main* request, void* context) { + furi_assert(request); + furi_assert(request->which_content == PB_Main_system_get_datetime_request_tag); + furi_assert(context); + Rpc* rpc = context; + + FuriHalRtcDateTime datetime; + furi_hal_rtc_get_datetime(&datetime); + + PB_Main* response = furi_alloc(sizeof(PB_Main)); + response->command_id = request->command_id; + response->which_content = PB_Main_system_get_datetime_response_tag; + response->command_status = PB_CommandStatus_OK; + response->content.system_get_datetime_response.has_datetime = true; + response->content.system_get_datetime_response.datetime.hour = datetime.hour; + response->content.system_get_datetime_response.datetime.minute = datetime.minute; + response->content.system_get_datetime_response.datetime.second = datetime.second; + response->content.system_get_datetime_response.datetime.day = datetime.day; + response->content.system_get_datetime_response.datetime.month = datetime.month; + response->content.system_get_datetime_response.datetime.year = datetime.year; + response->content.system_get_datetime_response.datetime.weekday = datetime.weekday; + + rpc_send_and_release(rpc, response); +} + +void rpc_system_system_set_datetime_process(const PB_Main* request, void* context) { + furi_assert(request); + furi_assert(request->which_content == PB_Main_system_set_datetime_request_tag); + furi_assert(context); + Rpc* rpc = context; + + if(!request->content.system_set_datetime_request.has_datetime) { + rpc_send_and_release_empty( + rpc, request->command_id, PB_CommandStatus_ERROR_INVALID_PARAMETERS); + return; + } + + FuriHalRtcDateTime datetime; + datetime.hour = request->content.system_set_datetime_request.datetime.hour; + datetime.minute = request->content.system_set_datetime_request.datetime.minute; + datetime.second = request->content.system_set_datetime_request.datetime.second; + datetime.day = request->content.system_set_datetime_request.datetime.day; + datetime.month = request->content.system_set_datetime_request.datetime.month; + datetime.year = request->content.system_set_datetime_request.datetime.year; + datetime.weekday = request->content.system_set_datetime_request.datetime.weekday; + furi_hal_rtc_set_datetime(&datetime); + + rpc_send_and_release_empty(rpc, request->command_id, PB_CommandStatus_OK); +} + void rpc_system_system_factory_reset_process(const PB_Main* request, void* context) { furi_assert(request); furi_assert(request->which_content == PB_Main_system_factory_reset_request_tag); @@ -126,5 +176,11 @@ void* rpc_system_system_alloc(Rpc* rpc) { rpc_handler.message_handler = rpc_system_system_factory_reset_process; rpc_add_handler(rpc, PB_Main_system_factory_reset_request_tag, &rpc_handler); + rpc_handler.message_handler = rpc_system_system_get_datetime_process; + rpc_add_handler(rpc, PB_Main_system_get_datetime_request_tag, &rpc_handler); + + rpc_handler.message_handler = rpc_system_system_set_datetime_process; + rpc_add_handler(rpc, PB_Main_system_set_datetime_request_tag, &rpc_handler); + return NULL; } diff --git a/assets/compiled/flipper.pb.h b/assets/compiled/flipper.pb.h index 5ce575fd..551b34de 100644 --- a/assets/compiled/flipper.pb.h +++ b/assets/compiled/flipper.pb.h @@ -92,6 +92,9 @@ typedef struct _PB_Main { PB_System_DeviceInfoRequest system_device_info_request; PB_System_DeviceInfoResponse system_device_info_response; PB_System_FactoryResetRequest system_factory_reset_request; + PB_System_GetDateTimeRequest system_get_datetime_request; + PB_System_GetDateTimeResponse system_get_datetime_response; + PB_System_SetDateTimeRequest system_set_datetime_request; } content; } PB_Main; @@ -149,6 +152,9 @@ extern "C" { #define PB_Main_system_device_info_request_tag 32 #define PB_Main_system_device_info_response_tag 33 #define PB_Main_system_factory_reset_request_tag 34 +#define PB_Main_system_get_datetime_request_tag 35 +#define PB_Main_system_get_datetime_response_tag 36 +#define PB_Main_system_set_datetime_request_tag 37 /* Struct field encoding specification for nanopb */ #define PB_Empty_FIELDLIST(X, a) \ @@ -195,7 +201,10 @@ X(a, STATIC, ONEOF, MSG_W_CB, (content,storage_rename_request,content.stora X(a, STATIC, ONEOF, MSG_W_CB, (content,system_reboot_request,content.system_reboot_request), 31) \ X(a, STATIC, ONEOF, MSG_W_CB, (content,system_device_info_request,content.system_device_info_request), 32) \ X(a, STATIC, ONEOF, MSG_W_CB, (content,system_device_info_response,content.system_device_info_response), 33) \ -X(a, STATIC, ONEOF, MSG_W_CB, (content,system_factory_reset_request,content.system_factory_reset_request), 34) +X(a, STATIC, ONEOF, MSG_W_CB, (content,system_factory_reset_request,content.system_factory_reset_request), 34) \ +X(a, STATIC, ONEOF, MSG_W_CB, (content,system_get_datetime_request,content.system_get_datetime_request), 35) \ +X(a, STATIC, ONEOF, MSG_W_CB, (content,system_get_datetime_response,content.system_get_datetime_response), 36) \ +X(a, STATIC, ONEOF, MSG_W_CB, (content,system_set_datetime_request,content.system_set_datetime_request), 37) #define PB_Main_CALLBACK NULL #define PB_Main_DEFAULT NULL #define PB_Main_content_empty_MSGTYPE PB_Empty @@ -229,6 +238,9 @@ X(a, STATIC, ONEOF, MSG_W_CB, (content,system_factory_reset_request,content #define PB_Main_content_system_device_info_request_MSGTYPE PB_System_DeviceInfoRequest #define PB_Main_content_system_device_info_response_MSGTYPE PB_System_DeviceInfoResponse #define PB_Main_content_system_factory_reset_request_MSGTYPE PB_System_FactoryResetRequest +#define PB_Main_content_system_get_datetime_request_MSGTYPE PB_System_GetDateTimeRequest +#define PB_Main_content_system_get_datetime_response_MSGTYPE PB_System_GetDateTimeResponse +#define PB_Main_content_system_set_datetime_request_MSGTYPE PB_System_SetDateTimeRequest extern const pb_msgdesc_t PB_Empty_msg; extern const pb_msgdesc_t PB_StopSession_msg; @@ -242,9 +254,9 @@ extern const pb_msgdesc_t PB_Main_msg; /* Maximum encoded size of messages (where known) */ #define PB_Empty_size 0 #define PB_StopSession_size 0 -#if defined(PB_System_PingRequest_size) && defined(PB_System_PingResponse_size) && defined(PB_Storage_ListRequest_size) && defined(PB_Storage_ListResponse_size) && defined(PB_Storage_ReadRequest_size) && defined(PB_Storage_ReadResponse_size) && defined(PB_Storage_WriteRequest_size) && defined(PB_Storage_DeleteRequest_size) && defined(PB_Storage_MkdirRequest_size) && defined(PB_Storage_Md5sumRequest_size) && defined(PB_App_StartRequest_size) && defined(PB_Gui_ScreenFrame_size) && defined(PB_Storage_StatRequest_size) && defined(PB_Storage_StatResponse_size) && defined(PB_Storage_InfoRequest_size) && defined(PB_Storage_RenameRequest_size) && defined(PB_System_DeviceInfoResponse_size) +#if defined(PB_System_PingRequest_size) && defined(PB_System_PingResponse_size) && defined(PB_Storage_ListRequest_size) && defined(PB_Storage_ListResponse_size) && defined(PB_Storage_ReadRequest_size) && defined(PB_Storage_ReadResponse_size) && defined(PB_Storage_WriteRequest_size) && defined(PB_Storage_DeleteRequest_size) && defined(PB_Storage_MkdirRequest_size) && defined(PB_Storage_Md5sumRequest_size) && defined(PB_App_StartRequest_size) && defined(PB_Gui_ScreenFrame_size) && defined(PB_Storage_StatRequest_size) && defined(PB_Storage_StatResponse_size) && defined(PB_Gui_StartVirtualDisplayRequest_size) && defined(PB_Storage_InfoRequest_size) && defined(PB_Storage_RenameRequest_size) && defined(PB_System_DeviceInfoResponse_size) #define PB_Main_size (10 + sizeof(union PB_Main_content_size_union)) -union PB_Main_content_size_union {char f5[(6 + PB_System_PingRequest_size)]; char f6[(6 + PB_System_PingResponse_size)]; char f7[(6 + PB_Storage_ListRequest_size)]; char f8[(6 + PB_Storage_ListResponse_size)]; char f9[(6 + PB_Storage_ReadRequest_size)]; char f10[(6 + PB_Storage_ReadResponse_size)]; char f11[(6 + PB_Storage_WriteRequest_size)]; char f12[(6 + PB_Storage_DeleteRequest_size)]; char f13[(6 + PB_Storage_MkdirRequest_size)]; char f14[(6 + PB_Storage_Md5sumRequest_size)]; char f16[(7 + PB_App_StartRequest_size)]; char f22[(7 + PB_Gui_ScreenFrame_size)]; char f24[(7 + PB_Storage_StatRequest_size)]; char f25[(7 + PB_Storage_StatResponse_size)]; char f28[(7 + PB_Storage_InfoRequest_size)]; char f30[(7 + PB_Storage_RenameRequest_size)]; char f33[(7 + PB_System_DeviceInfoResponse_size)]; char f0[36];}; +union PB_Main_content_size_union {char f5[(6 + PB_System_PingRequest_size)]; char f6[(6 + PB_System_PingResponse_size)]; char f7[(6 + PB_Storage_ListRequest_size)]; char f8[(6 + PB_Storage_ListResponse_size)]; char f9[(6 + PB_Storage_ReadRequest_size)]; char f10[(6 + PB_Storage_ReadResponse_size)]; char f11[(6 + PB_Storage_WriteRequest_size)]; char f12[(6 + PB_Storage_DeleteRequest_size)]; char f13[(6 + PB_Storage_MkdirRequest_size)]; char f14[(6 + PB_Storage_Md5sumRequest_size)]; char f16[(7 + PB_App_StartRequest_size)]; char f22[(7 + PB_Gui_ScreenFrame_size)]; char f24[(7 + PB_Storage_StatRequest_size)]; char f25[(7 + PB_Storage_StatResponse_size)]; char f26[(7 + PB_Gui_StartVirtualDisplayRequest_size)]; char f28[(7 + PB_Storage_InfoRequest_size)]; char f30[(7 + PB_Storage_RenameRequest_size)]; char f33[(7 + PB_System_DeviceInfoResponse_size)]; char f0[36];}; #endif #ifdef __cplusplus diff --git a/assets/compiled/gui.pb.h b/assets/compiled/gui.pb.h index 84cf1d57..7ab8a97d 100644 --- a/assets/compiled/gui.pb.h +++ b/assets/compiled/gui.pb.h @@ -36,10 +36,6 @@ typedef struct _PB_Gui_StartScreenStreamRequest { char dummy_field; } PB_Gui_StartScreenStreamRequest; -typedef struct _PB_Gui_StartVirtualDisplayRequest { - char dummy_field; -} PB_Gui_StartVirtualDisplayRequest; - typedef struct _PB_Gui_StopScreenStreamRequest { char dummy_field; } PB_Gui_StopScreenStreamRequest; @@ -53,6 +49,11 @@ typedef struct _PB_Gui_SendInputEventRequest { PB_Gui_InputType type; } PB_Gui_SendInputEventRequest; +typedef struct _PB_Gui_StartVirtualDisplayRequest { + bool has_first_frame; + PB_Gui_ScreenFrame first_frame; /* optional */ +} PB_Gui_StartVirtualDisplayRequest; + /* Helper constants for enums */ #define _PB_Gui_InputKey_MIN PB_Gui_InputKey_UP @@ -73,19 +74,20 @@ extern "C" { #define PB_Gui_StartScreenStreamRequest_init_default {0} #define PB_Gui_StopScreenStreamRequest_init_default {0} #define PB_Gui_SendInputEventRequest_init_default {_PB_Gui_InputKey_MIN, _PB_Gui_InputType_MIN} -#define PB_Gui_StartVirtualDisplayRequest_init_default {0} +#define PB_Gui_StartVirtualDisplayRequest_init_default {false, PB_Gui_ScreenFrame_init_default} #define PB_Gui_StopVirtualDisplayRequest_init_default {0} #define PB_Gui_ScreenFrame_init_zero {NULL} #define PB_Gui_StartScreenStreamRequest_init_zero {0} #define PB_Gui_StopScreenStreamRequest_init_zero {0} #define PB_Gui_SendInputEventRequest_init_zero {_PB_Gui_InputKey_MIN, _PB_Gui_InputType_MIN} -#define PB_Gui_StartVirtualDisplayRequest_init_zero {0} +#define PB_Gui_StartVirtualDisplayRequest_init_zero {false, PB_Gui_ScreenFrame_init_zero} #define PB_Gui_StopVirtualDisplayRequest_init_zero {0} /* Field tags (for use in manual encoding/decoding) */ #define PB_Gui_ScreenFrame_data_tag 1 #define PB_Gui_SendInputEventRequest_key_tag 1 #define PB_Gui_SendInputEventRequest_type_tag 2 +#define PB_Gui_StartVirtualDisplayRequest_first_frame_tag 1 /* Struct field encoding specification for nanopb */ #define PB_Gui_ScreenFrame_FIELDLIST(X, a) \ @@ -110,9 +112,10 @@ X(a, STATIC, SINGULAR, UENUM, type, 2) #define PB_Gui_SendInputEventRequest_DEFAULT NULL #define PB_Gui_StartVirtualDisplayRequest_FIELDLIST(X, a) \ - +X(a, STATIC, OPTIONAL, MESSAGE, first_frame, 1) #define PB_Gui_StartVirtualDisplayRequest_CALLBACK NULL #define PB_Gui_StartVirtualDisplayRequest_DEFAULT NULL +#define PB_Gui_StartVirtualDisplayRequest_first_frame_MSGTYPE PB_Gui_ScreenFrame #define PB_Gui_StopVirtualDisplayRequest_FIELDLIST(X, a) \ @@ -136,9 +139,9 @@ extern const pb_msgdesc_t PB_Gui_StopVirtualDisplayRequest_msg; /* Maximum encoded size of messages (where known) */ /* PB_Gui_ScreenFrame_size depends on runtime parameters */ +/* PB_Gui_StartVirtualDisplayRequest_size depends on runtime parameters */ #define PB_Gui_SendInputEventRequest_size 4 #define PB_Gui_StartScreenStreamRequest_size 0 -#define PB_Gui_StartVirtualDisplayRequest_size 0 #define PB_Gui_StopScreenStreamRequest_size 0 #define PB_Gui_StopVirtualDisplayRequest_size 0 diff --git a/assets/compiled/system.pb.c b/assets/compiled/system.pb.c index dd1bc623..89abf7cf 100644 --- a/assets/compiled/system.pb.c +++ b/assets/compiled/system.pb.c @@ -24,5 +24,17 @@ PB_BIND(PB_System_DeviceInfoResponse, PB_System_DeviceInfoResponse, AUTO) PB_BIND(PB_System_FactoryResetRequest, PB_System_FactoryResetRequest, AUTO) +PB_BIND(PB_System_GetDateTimeRequest, PB_System_GetDateTimeRequest, AUTO) + + +PB_BIND(PB_System_GetDateTimeResponse, PB_System_GetDateTimeResponse, AUTO) + + +PB_BIND(PB_System_SetDateTimeRequest, PB_System_SetDateTimeRequest, AUTO) + + +PB_BIND(PB_System_DateTime, PB_System_DateTime, AUTO) + + diff --git a/assets/compiled/system.pb.h b/assets/compiled/system.pb.h index dbb23ff7..be1e6628 100644 --- a/assets/compiled/system.pb.h +++ b/assets/compiled/system.pb.h @@ -29,6 +29,10 @@ typedef struct _PB_System_FactoryResetRequest { char dummy_field; } PB_System_FactoryResetRequest; +typedef struct _PB_System_GetDateTimeRequest { + char dummy_field; +} PB_System_GetDateTimeRequest; + typedef struct _PB_System_PingRequest { pb_bytes_array_t *data; } PB_System_PingRequest; @@ -37,10 +41,32 @@ typedef struct _PB_System_PingResponse { pb_bytes_array_t *data; } PB_System_PingResponse; +typedef struct _PB_System_DateTime { + /* Time */ + uint8_t hour; /* *< Hour in 24H format: 0-23 */ + uint8_t minute; /* *< Minute: 0-59 */ + uint8_t second; /* *< Second: 0-59 */ + /* Date */ + uint8_t day; /* *< Current day: 1-31 */ + uint8_t month; /* *< Current month: 1-12 */ + uint16_t year; /* *< Current year: 2000-2099 */ + uint8_t weekday; /* *< Current weekday: 1-7 */ +} PB_System_DateTime; + typedef struct _PB_System_RebootRequest { PB_System_RebootRequest_RebootMode mode; } PB_System_RebootRequest; +typedef struct _PB_System_GetDateTimeResponse { + bool has_datetime; + PB_System_DateTime datetime; +} PB_System_GetDateTimeResponse; + +typedef struct _PB_System_SetDateTimeRequest { + bool has_datetime; + PB_System_DateTime datetime; +} PB_System_SetDateTimeRequest; + /* Helper constants for enums */ #define _PB_System_RebootRequest_RebootMode_MIN PB_System_RebootRequest_RebootMode_OS @@ -59,19 +85,36 @@ extern "C" { #define PB_System_DeviceInfoRequest_init_default {0} #define PB_System_DeviceInfoResponse_init_default {NULL, NULL} #define PB_System_FactoryResetRequest_init_default {0} +#define PB_System_GetDateTimeRequest_init_default {0} +#define PB_System_GetDateTimeResponse_init_default {false, PB_System_DateTime_init_default} +#define PB_System_SetDateTimeRequest_init_default {false, PB_System_DateTime_init_default} +#define PB_System_DateTime_init_default {0, 0, 0, 0, 0, 0, 0} #define PB_System_PingRequest_init_zero {NULL} #define PB_System_PingResponse_init_zero {NULL} #define PB_System_RebootRequest_init_zero {_PB_System_RebootRequest_RebootMode_MIN} #define PB_System_DeviceInfoRequest_init_zero {0} #define PB_System_DeviceInfoResponse_init_zero {NULL, NULL} #define PB_System_FactoryResetRequest_init_zero {0} +#define PB_System_GetDateTimeRequest_init_zero {0} +#define PB_System_GetDateTimeResponse_init_zero {false, PB_System_DateTime_init_zero} +#define PB_System_SetDateTimeRequest_init_zero {false, PB_System_DateTime_init_zero} +#define PB_System_DateTime_init_zero {0, 0, 0, 0, 0, 0, 0} /* Field tags (for use in manual encoding/decoding) */ #define PB_System_DeviceInfoResponse_key_tag 1 #define PB_System_DeviceInfoResponse_value_tag 2 #define PB_System_PingRequest_data_tag 1 #define PB_System_PingResponse_data_tag 1 +#define PB_System_DateTime_hour_tag 1 +#define PB_System_DateTime_minute_tag 2 +#define PB_System_DateTime_second_tag 3 +#define PB_System_DateTime_day_tag 4 +#define PB_System_DateTime_month_tag 5 +#define PB_System_DateTime_year_tag 6 +#define PB_System_DateTime_weekday_tag 7 #define PB_System_RebootRequest_mode_tag 1 +#define PB_System_GetDateTimeResponse_datetime_tag 1 +#define PB_System_SetDateTimeRequest_datetime_tag 1 /* Struct field encoding specification for nanopb */ #define PB_System_PingRequest_FIELDLIST(X, a) \ @@ -105,12 +148,44 @@ X(a, POINTER, SINGULAR, STRING, value, 2) #define PB_System_FactoryResetRequest_CALLBACK NULL #define PB_System_FactoryResetRequest_DEFAULT NULL +#define PB_System_GetDateTimeRequest_FIELDLIST(X, a) \ + +#define PB_System_GetDateTimeRequest_CALLBACK NULL +#define PB_System_GetDateTimeRequest_DEFAULT NULL + +#define PB_System_GetDateTimeResponse_FIELDLIST(X, a) \ +X(a, STATIC, OPTIONAL, MESSAGE, datetime, 1) +#define PB_System_GetDateTimeResponse_CALLBACK NULL +#define PB_System_GetDateTimeResponse_DEFAULT NULL +#define PB_System_GetDateTimeResponse_datetime_MSGTYPE PB_System_DateTime + +#define PB_System_SetDateTimeRequest_FIELDLIST(X, a) \ +X(a, STATIC, OPTIONAL, MESSAGE, datetime, 1) +#define PB_System_SetDateTimeRequest_CALLBACK NULL +#define PB_System_SetDateTimeRequest_DEFAULT NULL +#define PB_System_SetDateTimeRequest_datetime_MSGTYPE PB_System_DateTime + +#define PB_System_DateTime_FIELDLIST(X, a) \ +X(a, STATIC, SINGULAR, UINT32, hour, 1) \ +X(a, STATIC, SINGULAR, UINT32, minute, 2) \ +X(a, STATIC, SINGULAR, UINT32, second, 3) \ +X(a, STATIC, SINGULAR, UINT32, day, 4) \ +X(a, STATIC, SINGULAR, UINT32, month, 5) \ +X(a, STATIC, SINGULAR, UINT32, year, 6) \ +X(a, STATIC, SINGULAR, UINT32, weekday, 7) +#define PB_System_DateTime_CALLBACK NULL +#define PB_System_DateTime_DEFAULT NULL + extern const pb_msgdesc_t PB_System_PingRequest_msg; extern const pb_msgdesc_t PB_System_PingResponse_msg; extern const pb_msgdesc_t PB_System_RebootRequest_msg; extern const pb_msgdesc_t PB_System_DeviceInfoRequest_msg; extern const pb_msgdesc_t PB_System_DeviceInfoResponse_msg; extern const pb_msgdesc_t PB_System_FactoryResetRequest_msg; +extern const pb_msgdesc_t PB_System_GetDateTimeRequest_msg; +extern const pb_msgdesc_t PB_System_GetDateTimeResponse_msg; +extern const pb_msgdesc_t PB_System_SetDateTimeRequest_msg; +extern const pb_msgdesc_t PB_System_DateTime_msg; /* Defines for backwards compatibility with code written before nanopb-0.4.0 */ #define PB_System_PingRequest_fields &PB_System_PingRequest_msg @@ -119,14 +194,22 @@ extern const pb_msgdesc_t PB_System_FactoryResetRequest_msg; #define PB_System_DeviceInfoRequest_fields &PB_System_DeviceInfoRequest_msg #define PB_System_DeviceInfoResponse_fields &PB_System_DeviceInfoResponse_msg #define PB_System_FactoryResetRequest_fields &PB_System_FactoryResetRequest_msg +#define PB_System_GetDateTimeRequest_fields &PB_System_GetDateTimeRequest_msg +#define PB_System_GetDateTimeResponse_fields &PB_System_GetDateTimeResponse_msg +#define PB_System_SetDateTimeRequest_fields &PB_System_SetDateTimeRequest_msg +#define PB_System_DateTime_fields &PB_System_DateTime_msg /* Maximum encoded size of messages (where known) */ /* PB_System_PingRequest_size depends on runtime parameters */ /* PB_System_PingResponse_size depends on runtime parameters */ /* PB_System_DeviceInfoResponse_size depends on runtime parameters */ +#define PB_System_DateTime_size 22 #define PB_System_DeviceInfoRequest_size 0 #define PB_System_FactoryResetRequest_size 0 +#define PB_System_GetDateTimeRequest_size 0 +#define PB_System_GetDateTimeResponse_size 24 #define PB_System_RebootRequest_size 2 +#define PB_System_SetDateTimeRequest_size 24 #ifdef __cplusplus } /* extern "C" */ diff --git a/assets/protobuf b/assets/protobuf index f6fdc10e..f5365c36 160000 --- a/assets/protobuf +++ b/assets/protobuf @@ -1 +1 @@ -Subproject commit f6fdc10e6d111b289188e88ac1d432698bb739cf +Subproject commit f5365c36aa458eb344280560440d6e27232a5667 From e109e2e3e86236e377651fcf03d7ba4b625b863f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=81=8F?= Date: Fri, 17 Dec 2021 04:28:51 +0300 Subject: [PATCH 12/13] Debug: remove lxml dependency, pickle SVD tree for faster processing. (#909) * Debug: remove lxml dependency, pickle SVD tree for faster processing. * Debug: remove unused import in svd.py --- .gitignore | 3 +- debug/PyCortexMDebug/README.md | 2 +- debug/PyCortexMDebug/cmdebug/svd.py | 61 +-- debug/PyCortexMDebug/cmdebug/svd_gdb.py | 2 + debug/PyCortexMDebug/cmdebug/x2d.py | 586 ++++++++++++++++++++++++ docker/Dockerfile | 5 +- 6 files changed, 624 insertions(+), 35 deletions(-) create mode 100644 debug/PyCortexMDebug/cmdebug/x2d.py diff --git a/.gitignore b/.gitignore index 3b032201..319cf90c 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ venv/ __pycache__/ *.py[cod] *$py.class +*.pickle .obj/ bindings/ @@ -34,4 +35,4 @@ build CMakeLists.txt # bundle output -dist \ No newline at end of file +dist diff --git a/debug/PyCortexMDebug/README.md b/debug/PyCortexMDebug/README.md index 5bf2eacd..32c76e76 100644 --- a/debug/PyCortexMDebug/README.md +++ b/debug/PyCortexMDebug/README.md @@ -16,7 +16,7 @@ My implementation so far has only tested STM32 chips but should hold for others. expect plenty of errors in the file. Like GPIOA having a register named GPIOB_OSPEEDR and lots of 16-bit registers that are listed as 32! -The implementation consists of two components -- An lxml-based parser module (pysvd) and a GDB file (gdb_svd). +The implementation consists of two components -- An xml parser module (pysvd) and a GDB file (gdb_svd). I haven't yet worked out a perfect workflow for this, though it's quite easy to use when you already tend to have a GDB initialization file for starting up OpenOCD and the like. However your workflow works, just make sure to, in GDB: diff --git a/debug/PyCortexMDebug/cmdebug/svd.py b/debug/PyCortexMDebug/cmdebug/svd.py index a25e69bf..10c9e0af 100755 --- a/debug/PyCortexMDebug/cmdebug/svd.py +++ b/debug/PyCortexMDebug/cmdebug/svd.py @@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License along with PyCortexMDebug. If not, see . """ -import lxml.objectify as objectify import sys from collections import OrderedDict import os @@ -24,6 +23,7 @@ import pickle import traceback import re import warnings +import x2d class SmartDict: @@ -126,26 +126,31 @@ class SVDFile: def __init__(self, fname): """ - Args: fname: Filename for the SVD file """ - f = objectify.parse(os.path.expanduser(fname)) - root = f.getroot() - periph = root.peripherals.getchildren() self.peripherals = SmartDict() self.base_address = 0 + xml_file_name = os.path.expanduser(fname) + pickle_file_name = xml_file_name + ".pickle" + root = None + if os.path.exists(pickle_file_name): + print("Loading pickled SVD") + root = pickle.load(open(pickle_file_name, "rb")) + else: + print("Loading XML SVD and pickling it") + root = x2d.parse(open(xml_file_name, "rb")) + pickle.dump(root, open(pickle_file_name, "wb"), pickle.HIGHEST_PROTOCOL) + print("Processing SVD tree") # XML elements - for p in periph: + for p in root["device"]["peripherals"]["peripheral"]: try: - if p.tag == "peripheral": - self.peripherals[str(p.name)] = SVDPeripheral(p, self) - else: - # This is some other tag - pass + self.peripherals[p["name"]] = SVDPeripheral(p, self) except SVDNonFatalError as e: - print(e) + # print(e) + pass + print("SVD Ready") def add_register(parent, node): @@ -265,11 +270,11 @@ class SVDPeripheral: self.parent_base_address = parent.base_address # Look for a base address, as it is required - if not hasattr(svd_elem, "baseAddress"): + if "baseAddress" not in svd_elem: raise SVDNonFatalError("Periph without base address") self.base_address = int(str(svd_elem.baseAddress), 0) - if "derivedFrom" in svd_elem.attrib: - derived_from = svd_elem.attrib["derivedFrom"] + if "@derivedFrom" in svd_elem: + derived_from = svd_elem["@derivedFrom"] try: self.name = str(svd_elem.name) except AttributeError: @@ -295,16 +300,14 @@ class SVDPeripheral: self.clusters = SmartDict() if hasattr(svd_elem, "registers"): - registers = [ - r - for r in svd_elem.registers.getchildren() - if r.tag in ["cluster", "register"] - ] - for r in registers: - if r.tag == "cluster": - add_cluster(self, r) - elif r.tag == "register": - add_register(self, r) + if "register" in svd_elem.registers: + for r in svd_elem.registers.register: + if isinstance(r, x2d.ObjectDict): + add_register(self, r) + if "cluster" in svd_elem.registers: + for c in svd_elem.registers.cluster: + if isinstance(c, x2d.ObjectDict): + add_cluster(self, c) def refactor_parent(self, parent): self.parent_base_address = parent.base_address @@ -338,11 +341,11 @@ class SVDPeripheralRegister: else: self.size = 0x20 self.fields = SmartDict() - if hasattr(svd_elem, "fields"): + if "fields" in svd_elem: # Filter fields to only consider those of tag "field" - fields = [f for f in svd_elem.fields.getchildren() if f.tag == "field"] - for f in fields: - self.fields[str(f.name)] = SVDPeripheralRegisterField(f, self) + for f in svd_elem.fields.field: + if isinstance(f, x2d.ObjectDict): + self.fields[str(f.name)] = SVDPeripheralRegisterField(f, self) def refactor_parent(self, parent): self.parent_base_address = parent.base_address diff --git a/debug/PyCortexMDebug/cmdebug/svd_gdb.py b/debug/PyCortexMDebug/cmdebug/svd_gdb.py index 2629a3ce..c7de1110 100755 --- a/debug/PyCortexMDebug/cmdebug/svd_gdb.py +++ b/debug/PyCortexMDebug/cmdebug/svd_gdb.py @@ -23,6 +23,7 @@ import sys import struct import pkg_resources import fnmatch +import traceback from .svd import SVDFile @@ -99,6 +100,7 @@ class LoadSVD(gdb.Command): try: SVD(SVDFile(f)) except Exception as e: + traceback.print_exc() raise gdb.GdbError("Could not load SVD file {} : {}...\n".format(f, e)) diff --git a/debug/PyCortexMDebug/cmdebug/x2d.py b/debug/PyCortexMDebug/cmdebug/x2d.py new file mode 100644 index 00000000..fc3f185d --- /dev/null +++ b/debug/PyCortexMDebug/cmdebug/x2d.py @@ -0,0 +1,586 @@ +#!/usr/bin/env python +"Makes working with XML feel like you are working with JSON" + +try: + from defusedexpat import pyexpat as expat +except ImportError: + from xml.parsers import expat + +from xml.sax.saxutils import XMLGenerator +from xml.sax.xmlreader import AttributesImpl + +try: # pragma no cover + from cStringIO import StringIO +except ImportError: # pragma no cover + try: + from StringIO import StringIO + except ImportError: + from io import StringIO + +from inspect import isgenerator + + +class ObjectDict(dict): + def __getattr__(self, name): + if name in self: + return self[name] + else: + raise AttributeError("No such attribute: " + name) + + +try: # pragma no cover + _basestring = basestring +except NameError: # pragma no cover + _basestring = str +try: # pragma no cover + _unicode = unicode +except NameError: # pragma no cover + _unicode = str + +__author__ = "Martin Blech" +__version__ = "0.12.0" +__license__ = "MIT" + + +class ParsingInterrupted(Exception): + pass + + +class _DictSAXHandler(object): + def __init__( + self, + item_depth=0, + item_callback=lambda *args: True, + xml_attribs=True, + attr_prefix="@", + cdata_key="#text", + force_cdata=False, + cdata_separator="", + postprocessor=None, + dict_constructor=ObjectDict, + strip_whitespace=True, + namespace_separator=":", + namespaces=None, + force_list=None, + comment_key="#comment", + ): + self.path = [] + self.stack = [] + self.data = [] + self.item = None + self.item_depth = item_depth + self.xml_attribs = xml_attribs + self.item_callback = item_callback + self.attr_prefix = attr_prefix + self.cdata_key = cdata_key + self.force_cdata = force_cdata + self.cdata_separator = cdata_separator + self.postprocessor = postprocessor + self.dict_constructor = dict_constructor + self.strip_whitespace = strip_whitespace + self.namespace_separator = namespace_separator + self.namespaces = namespaces + self.namespace_declarations = ObjectDict() + self.force_list = force_list + self.comment_key = comment_key + + def _build_name(self, full_name): + if self.namespaces is None: + return full_name + i = full_name.rfind(self.namespace_separator) + if i == -1: + return full_name + namespace, name = full_name[:i], full_name[i + 1 :] + try: + short_namespace = self.namespaces[namespace] + except KeyError: + short_namespace = namespace + if not short_namespace: + return name + else: + return self.namespace_separator.join((short_namespace, name)) + + def _attrs_to_dict(self, attrs): + if isinstance(attrs, dict): + return attrs + return self.dict_constructor(zip(attrs[0::2], attrs[1::2])) + + def startNamespaceDecl(self, prefix, uri): + self.namespace_declarations[prefix or ""] = uri + + def startElement(self, full_name, attrs): + name = self._build_name(full_name) + attrs = self._attrs_to_dict(attrs) + if attrs and self.namespace_declarations: + attrs["xmlns"] = self.namespace_declarations + self.namespace_declarations = ObjectDict() + self.path.append((name, attrs or None)) + if len(self.path) > self.item_depth: + self.stack.append((self.item, self.data)) + if self.xml_attribs: + attr_entries = [] + for key, value in attrs.items(): + key = self.attr_prefix + self._build_name(key) + if self.postprocessor: + entry = self.postprocessor(self.path, key, value) + else: + entry = (key, value) + if entry: + attr_entries.append(entry) + attrs = self.dict_constructor(attr_entries) + else: + attrs = None + self.item = attrs or None + self.data = [] + + def endElement(self, full_name): + name = self._build_name(full_name) + if len(self.path) == self.item_depth: + item = self.item + if item is None: + item = None if not self.data else self.cdata_separator.join(self.data) + + should_continue = self.item_callback(self.path, item) + if not should_continue: + raise ParsingInterrupted() + if len(self.stack): + data = None if not self.data else self.cdata_separator.join(self.data) + item = self.item + self.item, self.data = self.stack.pop() + if self.strip_whitespace and data: + data = data.strip() or None + if data and self.force_cdata and item is None: + item = self.dict_constructor() + if item is not None: + if data: + self.push_data(item, self.cdata_key, data) + self.item = self.push_data(self.item, name, item) + else: + self.item = self.push_data(self.item, name, data) + else: + self.item = None + self.data = [] + self.path.pop() + + def characters(self, data): + if not self.data: + self.data = [data] + else: + self.data.append(data) + + def comments(self, data): + if self.strip_whitespace: + data = data.strip() + self.item = self.push_data(self.item, self.comment_key, data) + + def push_data(self, item, key, data): + if self.postprocessor is not None: + result = self.postprocessor(self.path, key, data) + if result is None: + return item + key, data = result + if item is None: + item = self.dict_constructor() + try: + value = item[key] + if isinstance(value, list): + value.append(data) + else: + item[key] = [value, data] + except KeyError: + if self._should_force_list(key, data): + item[key] = [data] + else: + item[key] = data + return item + + def _should_force_list(self, key, value): + if not self.force_list: + return False + if isinstance(self.force_list, bool): + return self.force_list + try: + return key in self.force_list + except TypeError: + return self.force_list(self.path[:-1], key, value) + + +def parse( + xml_input, + encoding=None, + expat=expat, + process_namespaces=False, + namespace_separator=":", + disable_entities=True, + process_comments=False, + **kwargs +): + """Parse the given XML input and convert it into a dictionary. + + `xml_input` can either be a `string`, a file-like object, or a generator of strings. + + If `xml_attribs` is `True`, element attributes are put in the dictionary + among regular child elements, using `@` as a prefix to avoid collisions. If + set to `False`, they are just ignored. + + Simple example:: + + >>> import xmltodict + >>> doc = xmltodict.parse(\"\"\" + ... + ... 1 + ... 2 + ... + ... \"\"\") + >>> doc['a']['@prop'] + u'x' + >>> doc['a']['b'] + [u'1', u'2'] + + If `item_depth` is `0`, the function returns a dictionary for the root + element (default behavior). Otherwise, it calls `item_callback` every time + an item at the specified depth is found and returns `None` in the end + (streaming mode). + + The callback function receives two parameters: the `path` from the document + root to the item (name-attribs pairs), and the `item` (dict). If the + callback's return value is false-ish, parsing will be stopped with the + :class:`ParsingInterrupted` exception. + + Streaming example:: + + >>> def handle(path, item): + ... print('path:%s item:%s' % (path, item)) + ... return True + ... + >>> xmltodict.parse(\"\"\" + ... + ... 1 + ... 2 + ... \"\"\", item_depth=2, item_callback=handle) + path:[(u'a', {u'prop': u'x'}), (u'b', None)] item:1 + path:[(u'a', {u'prop': u'x'}), (u'b', None)] item:2 + + The optional argument `postprocessor` is a function that takes `path`, + `key` and `value` as positional arguments and returns a new `(key, value)` + pair where both `key` and `value` may have changed. Usage example:: + + >>> def postprocessor(path, key, value): + ... try: + ... return key + ':int', int(value) + ... except (ValueError, TypeError): + ... return key, value + >>> xmltodict.parse('12x', + ... postprocessor=postprocessor) + ObjectDict([(u'a', ObjectDict([(u'b:int', [1, 2]), (u'b', u'x')]))]) + + You can pass an alternate version of `expat` (such as `defusedexpat`) by + using the `expat` parameter. E.g: + + >>> import defusedexpat + >>> xmltodict.parse('hello', expat=defusedexpat.pyexpat) + ObjectDict([(u'a', u'hello')]) + + You can use the force_list argument to force lists to be created even + when there is only a single child of a given level of hierarchy. The + force_list argument is a tuple of keys. If the key for a given level + of hierarchy is in the force_list argument, that level of hierarchy + will have a list as a child (even if there is only one sub-element). + The index_keys operation takes precedence over this. This is applied + after any user-supplied postprocessor has already run. + + For example, given this input: + + + host1 + Linux + + + em0 + 10.0.0.1 + + + + + + If called with force_list=('interface',), it will produce + this dictionary: + {'servers': + {'server': + {'name': 'host1', + 'os': 'Linux'}, + 'interfaces': + {'interface': + [ {'name': 'em0', 'ip_address': '10.0.0.1' } ] } } } + + `force_list` can also be a callable that receives `path`, `key` and + `value`. This is helpful in cases where the logic that decides whether + a list should be forced is more complex. + + + If `process_comment` is `True` then comment will be added with comment_key + (default=`'#comment'`) to then tag which contains comment + + For example, given this input: + + + + + + 1 + + 2 + + + + If called with process_comment=True, it will produce + this dictionary: + 'a': { + 'b': { + '#comment': 'b comment', + 'c': { + + '#comment': 'c comment', + '#text': '1', + }, + 'd': '2', + }, + } + """ + handler = _DictSAXHandler(namespace_separator=namespace_separator, **kwargs) + if isinstance(xml_input, _unicode): + if not encoding: + encoding = "utf-8" + xml_input = xml_input.encode(encoding) + if not process_namespaces: + namespace_separator = None + parser = expat.ParserCreate(encoding, namespace_separator) + try: + parser.ordered_attributes = True + except AttributeError: + # Jython's expat does not support ordered_attributes + pass + parser.StartNamespaceDeclHandler = handler.startNamespaceDecl + parser.StartElementHandler = handler.startElement + parser.EndElementHandler = handler.endElement + parser.CharacterDataHandler = handler.characters + if process_comments: + parser.CommentHandler = handler.comments + parser.buffer_text = True + if disable_entities: + try: + # Attempt to disable DTD in Jython's expat parser (Xerces-J). + feature = "http://apache.org/xml/features/disallow-doctype-decl" + parser._reader.setFeature(feature, True) + except AttributeError: + # For CPython / expat parser. + # Anything not handled ends up here and entities aren't expanded. + parser.DefaultHandler = lambda x: None + # Expects an integer return; zero means failure -> expat.ExpatError. + parser.ExternalEntityRefHandler = lambda *x: 1 + if hasattr(xml_input, "read"): + parser.ParseFile(xml_input) + elif isgenerator(xml_input): + for chunk in xml_input: + parser.Parse(chunk, False) + parser.Parse(b"", True) + else: + parser.Parse(xml_input, True) + return handler.item + + +def _process_namespace(name, namespaces, ns_sep=":", attr_prefix="@"): + if not namespaces: + return name + try: + ns, name = name.rsplit(ns_sep, 1) + except ValueError: + pass + else: + ns_res = namespaces.get(ns.strip(attr_prefix)) + name = ( + "{}{}{}{}".format( + attr_prefix if ns.startswith(attr_prefix) else "", ns_res, ns_sep, name + ) + if ns_res + else name + ) + return name + + +def _emit( + key, + value, + content_handler, + attr_prefix="@", + cdata_key="#text", + depth=0, + preprocessor=None, + pretty=False, + newl="\n", + indent="\t", + namespace_separator=":", + namespaces=None, + full_document=True, + expand_iter=None, +): + key = _process_namespace(key, namespaces, namespace_separator, attr_prefix) + if preprocessor is not None: + result = preprocessor(key, value) + if result is None: + return + key, value = result + if ( + not hasattr(value, "__iter__") + or isinstance(value, _basestring) + or isinstance(value, dict) + ): + value = [value] + for index, v in enumerate(value): + if full_document and depth == 0 and index > 0: + raise ValueError("document with multiple roots") + if v is None: + v = ObjectDict() + elif isinstance(v, bool): + if v: + v = _unicode("true") + else: + v = _unicode("false") + elif not isinstance(v, dict): + if ( + expand_iter + and hasattr(v, "__iter__") + and not isinstance(v, _basestring) + ): + v = ObjectDict(((expand_iter, v),)) + else: + v = _unicode(v) + if isinstance(v, _basestring): + v = ObjectDict(((cdata_key, v),)) + cdata = None + attrs = ObjectDict() + children = [] + for ik, iv in v.items(): + if ik == cdata_key: + cdata = iv + continue + if ik.startswith(attr_prefix): + ik = _process_namespace( + ik, namespaces, namespace_separator, attr_prefix + ) + if ik == "@xmlns" and isinstance(iv, dict): + for k, v in iv.items(): + attr = "xmlns{}".format(":{}".format(k) if k else "") + attrs[attr] = _unicode(v) + continue + if not isinstance(iv, _unicode): + iv = _unicode(iv) + attrs[ik[len(attr_prefix) :]] = iv + continue + children.append((ik, iv)) + if pretty: + content_handler.ignorableWhitespace(depth * indent) + content_handler.startElement(key, AttributesImpl(attrs)) + if pretty and children: + content_handler.ignorableWhitespace(newl) + for child_key, child_value in children: + _emit( + child_key, + child_value, + content_handler, + attr_prefix, + cdata_key, + depth + 1, + preprocessor, + pretty, + newl, + indent, + namespaces=namespaces, + namespace_separator=namespace_separator, + expand_iter=expand_iter, + ) + if cdata is not None: + content_handler.characters(cdata) + if pretty and children: + content_handler.ignorableWhitespace(depth * indent) + content_handler.endElement(key) + if pretty and depth: + content_handler.ignorableWhitespace(newl) + + +def unparse( + input_dict, + output=None, + encoding="utf-8", + full_document=True, + short_empty_elements=False, + **kwargs +): + """Emit an XML document for the given `input_dict` (reverse of `parse`). + + The resulting XML document is returned as a string, but if `output` (a + file-like object) is specified, it is written there instead. + + Dictionary keys prefixed with `attr_prefix` (default=`'@'`) are interpreted + as XML node attributes, whereas keys equal to `cdata_key` + (default=`'#text'`) are treated as character data. + + The `pretty` parameter (default=`False`) enables pretty-printing. In this + mode, lines are terminated with `'\n'` and indented with `'\t'`, but this + can be customized with the `newl` and `indent` parameters. + + """ + if full_document and len(input_dict) != 1: + raise ValueError("Document must have exactly one root.") + must_return = False + if output is None: + output = StringIO() + must_return = True + if short_empty_elements: + content_handler = XMLGenerator(output, encoding, True) + else: + content_handler = XMLGenerator(output, encoding) + if full_document: + content_handler.startDocument() + for key, value in input_dict.items(): + _emit(key, value, content_handler, full_document=full_document, **kwargs) + if full_document: + content_handler.endDocument() + if must_return: + value = output.getvalue() + try: # pragma no cover + value = value.decode(encoding) + except AttributeError: # pragma no cover + pass + return value + + +if __name__ == "__main__": # pragma: no cover + import sys + import marshal + + try: + stdin = sys.stdin.buffer + stdout = sys.stdout.buffer + except AttributeError: + stdin = sys.stdin + stdout = sys.stdout + + (item_depth,) = sys.argv[1:] + item_depth = int(item_depth) + + def handle_item(path, item): + marshal.dump((path, item), stdout) + return True + + try: + root = parse( + stdin, + item_depth=item_depth, + item_callback=handle_item, + dict_constructor=dict, + ) + if item_depth == 0: + handle_item([], root) + except KeyboardInterrupt: + pass diff --git a/docker/Dockerfile b/docker/Dockerfile index 4d9b5fa8..ef89d7ce 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -25,9 +25,6 @@ RUN wget --progress=dot:giga "https://developer.arm.com/-/media/Files/downloads/ for file in * ; do ln -s "${PWD}/${file}" "/usr/bin/${file}" ; done && \ cd / && arm-none-eabi-gcc -v && arm-none-eabi-gdb -v -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 --depth 1 --branch v0.4.1 https://github.com/atomicobject/heatshrink.git && \ cd heatshrink && make && mv ./heatshrink /usr/local/bin/heatshrink @@ -35,4 +32,4 @@ COPY entrypoint.sh syntax_check.sh / RUN chmod +x /syntax_check.sh -ENTRYPOINT ["/entrypoint.sh"] \ No newline at end of file +ENTRYPOINT ["/entrypoint.sh"] From 93871f942552597846b582ab277ba0e28856a52d Mon Sep 17 00:00:00 2001 From: gornekich Date: Fri, 17 Dec 2021 16:24:37 +0300 Subject: [PATCH 13/13] BT hid navigation fix (#911) * bt: fix bt hid navigation * Cli: change datetime format to more ISO-ish, add datetime validation. Co-authored-by: Aleksandr Kutuzov --- applications/bt/bt_hid_app/bt_hid.c | 9 +-- applications/bt/bt_hid_app/bt_hid.h | 2 - applications/bt/bt_service/bt.c | 1 + applications/cli/cli_commands.c | 71 +++++++++++-------- firmware/targets/f6/furi-hal/furi-hal-bt.c | 1 + firmware/targets/f6/furi-hal/furi-hal-rtc.c | 22 ++++++ firmware/targets/f7/furi-hal/furi-hal-bt.c | 1 + firmware/targets/f7/furi-hal/furi-hal-rtc.c | 22 ++++++ .../targets/furi-hal-include/furi-hal-rtc.h | 2 + 9 files changed, 92 insertions(+), 39 deletions(-) diff --git a/applications/bt/bt_hid_app/bt_hid.c b/applications/bt/bt_hid_app/bt_hid.c index 6a93ce85..020a26b8 100755 --- a/applications/bt/bt_hid_app/bt_hid.c +++ b/applications/bt/bt_hid_app/bt_hid.c @@ -28,7 +28,7 @@ void bt_hid_dialog_callback(DialogExResult result, void* context) { // TODO switch to Submenu after Media is done view_dispatcher_stop(app->view_dispatcher); } else if(result == DialogExResultRight) { - view_dispatcher_switch_to_view(app->view_dispatcher, app->view_id); + view_dispatcher_switch_to_view(app->view_dispatcher, BtHidViewKeynote); } } @@ -56,9 +56,6 @@ void bt_hid_connection_status_changed_callback(BtStatus status, void* context) { BtHid* bt_hid_app_alloc() { BtHid* app = furi_alloc(sizeof(BtHid)); - // Load Bluetooth settings - bt_settings_load(&app->bt_settings); - // Gui app->gui = furi_record_open("gui"); @@ -156,10 +153,6 @@ int32_t bt_hid_app(void* p) { view_dispatcher_run(app->view_dispatcher); bt_set_status_changed_callback(app->bt, NULL, NULL); - // Stop advertising if bt was off - if(app->bt_settings.enabled) { - furi_hal_bt_stop_advertising(); - } // Change back profile to Serial bt_set_profile(app->bt, BtProfileSerial); diff --git a/applications/bt/bt_hid_app/bt_hid.h b/applications/bt/bt_hid_app/bt_hid.h index 4156b44b..875cac58 100644 --- a/applications/bt/bt_hid_app/bt_hid.h +++ b/applications/bt/bt_hid_app/bt_hid.h @@ -6,7 +6,6 @@ #include #include #include -#include #include #include @@ -14,7 +13,6 @@ #include "views/bt_hid_media.h" typedef struct { - BtSettings bt_settings; Bt* bt; Gui* gui; NotificationApp* notifications; diff --git a/applications/bt/bt_service/bt.c b/applications/bt/bt_service/bt.c index 4dfcdfb7..fdd43ec4 100755 --- a/applications/bt/bt_service/bt.c +++ b/applications/bt/bt_service/bt.c @@ -235,6 +235,7 @@ static void bt_statusbar_update(Bt* bt) { } static void bt_change_profile(Bt* bt, BtMessage* message) { + bt_settings_load(&bt->bt_settings); if(bt->profile == BtProfileSerial && bt->rpc_session) { FURI_LOG_I(TAG, "Close RPC connection"); osEventFlagsSet(bt->rpc_event, BT_RPC_EVENT_DISCONNECTED); diff --git a/applications/cli/cli_commands.c b/applications/cli/cli_commands.c index 7f194220..c7827d2f 100644 --- a/applications/cli/cli_commands.c +++ b/applications/cli/cli_commands.c @@ -6,6 +6,9 @@ #include #include +// Close to ISO, `date +'%Y-%m-%d %H:%M:%S %u'` +#define CLI_DATE_FORMAT "%.4d-%.2d-%.2d %.2d:%.2d:%.2d %d" + void cli_command_device_info_callback(const char* key, const char* value, bool last, void* context) { printf("%-24s: %s\r\n", key, value); } @@ -63,51 +66,61 @@ void cli_command_date(Cli* cli, string_t args, void* context) { uint16_t hours, minutes, seconds, month, day, year, weekday; int ret = sscanf( string_get_cstr(args), - "%hu:%hu:%hu %hu-%hu-%hu %hu", + "%hu-%hu-%hu %hu:%hu:%hu %hu", + &year, + &month, + &day, &hours, &minutes, &seconds, - &month, - &day, - &year, &weekday); - if(ret == 7) { - datetime.hour = hours; - datetime.minute = minutes; - datetime.second = seconds; - datetime.weekday = weekday; - datetime.month = month; - datetime.day = day; - datetime.year = year; - furi_hal_rtc_set_datetime(&datetime); - // Verification - furi_hal_rtc_get_datetime(&datetime); + + // Some variables are going to discard upper byte + // There will be some funky behaviour which is not breaking anything + datetime.hour = hours; + datetime.minute = minutes; + datetime.second = seconds; + datetime.weekday = weekday; + datetime.month = month; + datetime.day = day; + datetime.year = year; + + if(ret != 7) { printf( - "New time is: %.2d:%.2d:%.2d %.2d-%.2d-%.2d %d", - datetime.hour, - datetime.minute, - datetime.second, - datetime.month, - datetime.day, - datetime.year, - datetime.weekday); - } else { - printf( - "Invalid time format, use `hh:mm:ss MM-DD-YYYY WD`. sscanf %d %s", + "Invalid datetime format, use `%s`. sscanf %d %s", + "%Y-%m-%d %H:%M:%S %u", ret, string_get_cstr(args)); return; } - } else { + + if(!furi_hal_rtc_validate_datetime(&datetime)) { + printf("Invalid datetime data"); + return; + } + + furi_hal_rtc_set_datetime(&datetime); + // Verification furi_hal_rtc_get_datetime(&datetime); printf( - "%.2d:%.2d:%.2d %.2d-%.2d-%.2d %d", + "New datetime is: " CLI_DATE_FORMAT, + datetime.year, + datetime.month, + datetime.day, datetime.hour, datetime.minute, datetime.second, + datetime.weekday); + } else { + furi_hal_rtc_get_datetime(&datetime); + printf( + CLI_DATE_FORMAT, + datetime.year, datetime.month, datetime.day, - datetime.year, + datetime.hour, + datetime.minute, + datetime.second, datetime.weekday); } } diff --git a/firmware/targets/f6/furi-hal/furi-hal-bt.c b/firmware/targets/f6/furi-hal/furi-hal-bt.c index bbd29754..5a457279 100644 --- a/firmware/targets/f6/furi-hal/furi-hal-bt.c +++ b/firmware/targets/f6/furi-hal/furi-hal-bt.c @@ -160,6 +160,7 @@ bool furi_hal_bt_change_app(FuriHalBtProfile profile, BleEventCallback event_cb, gap_thread_stop(); FURI_LOG_I(TAG, "Reset SHCI"); SHCI_C2_Reinit(); + osDelay(100); ble_glue_thread_stop(); FURI_LOG_I(TAG, "Start BT initialization"); furi_hal_bt_init(); diff --git a/firmware/targets/f6/furi-hal/furi-hal-rtc.c b/firmware/targets/f6/furi-hal/furi-hal-rtc.c index 13bb17cb..20e77e13 100644 --- a/firmware/targets/f6/furi-hal/furi-hal-rtc.c +++ b/firmware/targets/f6/furi-hal/furi-hal-rtc.c @@ -120,3 +120,25 @@ void furi_hal_rtc_get_datetime(FuriHalRtcDateTime* datetime) { datetime->day = __LL_RTC_CONVERT_BCD2BIN((date >> 16) & 0xFF); datetime->weekday = __LL_RTC_CONVERT_BCD2BIN((date >> 24) & 0xFF); } + +bool furi_hal_rtc_validate_datetime(FuriHalRtcDateTime* datetime) { + bool invalid = false; + + invalid |= (datetime->second > 59); + invalid |= (datetime->minute > 59); + invalid |= (datetime->hour > 23); + + invalid |= (datetime->year < 2000); + invalid |= (datetime->year > 2099); + + invalid |= (datetime->month == 0); + invalid |= (datetime->month > 12); + + invalid |= (datetime->day == 0); + invalid |= (datetime->day > 31); + + invalid |= (datetime->weekday == 0); + invalid |= (datetime->weekday > 7); + + return !invalid; +} diff --git a/firmware/targets/f7/furi-hal/furi-hal-bt.c b/firmware/targets/f7/furi-hal/furi-hal-bt.c index bbd29754..5a457279 100644 --- a/firmware/targets/f7/furi-hal/furi-hal-bt.c +++ b/firmware/targets/f7/furi-hal/furi-hal-bt.c @@ -160,6 +160,7 @@ bool furi_hal_bt_change_app(FuriHalBtProfile profile, BleEventCallback event_cb, gap_thread_stop(); FURI_LOG_I(TAG, "Reset SHCI"); SHCI_C2_Reinit(); + osDelay(100); ble_glue_thread_stop(); FURI_LOG_I(TAG, "Start BT initialization"); furi_hal_bt_init(); diff --git a/firmware/targets/f7/furi-hal/furi-hal-rtc.c b/firmware/targets/f7/furi-hal/furi-hal-rtc.c index 13bb17cb..20e77e13 100644 --- a/firmware/targets/f7/furi-hal/furi-hal-rtc.c +++ b/firmware/targets/f7/furi-hal/furi-hal-rtc.c @@ -120,3 +120,25 @@ void furi_hal_rtc_get_datetime(FuriHalRtcDateTime* datetime) { datetime->day = __LL_RTC_CONVERT_BCD2BIN((date >> 16) & 0xFF); datetime->weekday = __LL_RTC_CONVERT_BCD2BIN((date >> 24) & 0xFF); } + +bool furi_hal_rtc_validate_datetime(FuriHalRtcDateTime* datetime) { + bool invalid = false; + + invalid |= (datetime->second > 59); + invalid |= (datetime->minute > 59); + invalid |= (datetime->hour > 23); + + invalid |= (datetime->year < 2000); + invalid |= (datetime->year > 2099); + + invalid |= (datetime->month == 0); + invalid |= (datetime->month > 12); + + invalid |= (datetime->day == 0); + invalid |= (datetime->day > 31); + + invalid |= (datetime->weekday == 0); + invalid |= (datetime->weekday > 7); + + return !invalid; +} diff --git a/firmware/targets/furi-hal-include/furi-hal-rtc.h b/firmware/targets/furi-hal-include/furi-hal-rtc.h index 7c36aa09..cc2f56f5 100644 --- a/firmware/targets/furi-hal-include/furi-hal-rtc.h +++ b/firmware/targets/furi-hal-include/furi-hal-rtc.h @@ -47,6 +47,8 @@ void furi_hal_rtc_set_datetime(FuriHalRtcDateTime* datetime); void furi_hal_rtc_get_datetime(FuriHalRtcDateTime* datetime); +bool furi_hal_rtc_validate_datetime(FuriHalRtcDateTime* datetime); + #ifdef __cplusplus } #endif