Merge remote-tracking branch 'kiisu/kiisudev' into kiisu-mntm

applications/services/cli/cli_main_shell.c

@@ -6,25 +6,11 @@
 
 void cli_main_motd(void* context) {
     UNUSED(context);
-    printf(ANSI_FLIPPER_BRAND_ORANGE
-           "\r\n"
-           "              _.-------.._                    -,\r\n"
-           "          .-\"```\"--..,,_/ /`-,               -,  \\ \r\n"
-           "       .:\"          /:/  /'\\  \\     ,_...,  `. |  |\r\n"
-           "      /       ,----/:/  /`\\ _\\~`_-\"`     _;\r\n"
-           "     '      / /`\"\"\"'\\ \\ \\.~`_-'      ,-\"'/ \r\n"
-           "    |      | |  0    | | .-'      ,/`  /\r\n"
-           "   |    ,..\\ \\     ,.-\"`       ,/`    /\r\n"
-           "  ;    :    `/`\"\"\\`           ,/--==,/-----,\r\n"
-           "  |    `-...|        -.___-Z:_______J...---;\r\n"
-           "  :         `                           _-'\r\n"
-           " _L_  _     ___  ___  ___  ___  ____--\"`___  _     ___\r\n"
-           "| __|| |   |_ _|| _ \\| _ \\| __|| _ \\   / __|| |   |_ _|\r\n"
-           "| _| | |__  | | |  _/|  _/| _| |   /  | (__ | |__  | |\r\n"
-           "|_|  |____||___||_|  |_|  |___||_|_\\   \\___||____||___|\r\n"
-           "\r\n" ANSI_FG_BR_WHITE "Welcome to Flipper Zero Command Line Interface!\r\n"
+    printf("CONNECT 1500000/NONE\r\n"
+           "\r\n" ANSI_FG_BR_WHITE "Welcome to Kiisu Command Line Interface (compatible with Flipper Zero)!\r\n"
            "Read the manual: https://docs.flipper.net/development/cli\r\n"
            "Run `help` or `?` to list available commands\r\n"
+           "Run `!` for info about the device, `power reboot` also useful\r\n"
            "\r\n" ANSI_RESET);
 
     const Version* firmware_version = furi_hal_version_get_firmware_version();

applications/services/desktop/animations/animation_manager.c

@@ -363,13 +363,14 @@ static bool animation_manager_is_valid_idle_animation(
 
     bool result = true;
 
-    if(!strcmp(info->name, BAD_BATTERY_ANIMATION_NAME)) {
+    /*if(!strcmp(info->name, BAD_BATTERY_ANIMATION_NAME)) {
         Power* power = furi_record_open(RECORD_POWER);
         bool battery_is_well = power_is_battery_healthy(power);
         furi_record_close(RECORD_POWER);
 
         result = !battery_is_well;
-    }
+    }*/
+    
     if(!strcmp(info->name, NO_SD_ANIMATION_NAME)) {
         Storage* storage = furi_record_open(RECORD_STORAGE);
         FS_Error sd_status = storage_sd_status(storage);

applications/services/desktop/desktop.c

@@ -576,7 +576,7 @@ int32_t desktop_srv(void* p) {
     if(furi_hal_rtc_get_fault_data()) {
         scene_manager_next_scene(desktop->scene_manager, DesktopSceneFault);
     }
-
+/*
     uint8_t keys_total, keys_valid;
     if(!furi_hal_crypto_enclave_verify(&keys_total, &keys_valid)) {
         FURI_LOG_E(
@@ -586,7 +586,7 @@ int32_t desktop_srv(void* p) {
             keys_valid);
 
         scene_manager_next_scene(desktop->scene_manager, DesktopSceneSecureEnclave);
-    }
+    }*/
 
     // Special case: autostart application is already running
     if(desktop->app_running && animation_manager_is_animation_loaded(desktop->animation_manager)) {

applications/settings/about/about.c

@@ -23,11 +23,13 @@ static DialogMessageButton about_screen_product(DialogsApp* dialogs, DialogMessa
         furi_hal_version_get_model_name(),
         furi_hal_version_get_model_code());
 
-    FuriString* screen_text = furi_string_alloc_printf(
-        "FCC ID: %s\n"
-        "IC: %s",
-        furi_hal_version_get_fcc_id(),
-        furi_hal_version_get_ic_id());
+    // FuriString* screen_text = furi_string_alloc_printf(
+    //     "FCC ID: %s\n"
+    //     "IC: %s",
+    //     furi_hal_version_get_fcc_id(),
+    //     furi_hal_version_get_ic_id());
+
+    FuriString* screen_text = furi_string_alloc_printf("From Tallinn with love <3");
 
     dialog_message_set_header(
         message, furi_string_get_cstr(screen_header), 0, 0, AlignLeft, AlignTop);
@@ -41,92 +43,92 @@ static DialogMessageButton about_screen_product(DialogsApp* dialogs, DialogMessa
     return result;
 }
 
-static DialogMessageButton about_screen_address(DialogsApp* dialogs, DialogMessage* message) {
-    DialogMessageButton result;
+// static DialogMessageButton about_screen_address(DialogsApp* dialogs, DialogMessage* message) {
+//     DialogMessageButton result;
 
-    const char* screen_text = "Flipper Devices Inc.\n"
-                              "Suite B #551, 2803\n"
-                              "Philadelphia Pike, Claymont\n"
-                              "DE, USA 19703\n";
+//     const char* screen_text = "Flipper Devices Inc.\n"
+//                               "Suite B #551, 2803\n"
+//                               "Philadelphia Pike, Claymont\n"
+//                               "DE, USA 19703\n";
 
-    dialog_message_set_text(message, screen_text, 0, 0, AlignLeft, AlignTop);
-    result = dialog_message_show(dialogs, message);
+//     dialog_message_set_text(message, screen_text, 0, 0, AlignLeft, AlignTop);
+//     result = dialog_message_show(dialogs, message);
 
-    return result;
-}
+//     return result;
+// }
 
-static DialogMessageButton about_screen_compliance(DialogsApp* dialogs, DialogMessage* message) {
-    DialogMessageButton result;
+// static DialogMessageButton about_screen_compliance(DialogsApp* dialogs, DialogMessage* message) {
+//     DialogMessageButton result;
 
-    const char* screen_text = "For all compliance\n"
-                              "certificates, please visit:\n"
-                              "www.flipp.dev/compliance";
+//     const char* screen_text = "For all compliance\n"
+//                               "certificates, please visit:\n"
+//                               "www.flipp.dev/compliance";
 
-    dialog_message_set_text(message, screen_text, 0, 0, AlignLeft, AlignTop);
-    result = dialog_message_show(dialogs, message);
+//     dialog_message_set_text(message, screen_text, 0, 0, AlignLeft, AlignTop);
+//     result = dialog_message_show(dialogs, message);
 
-    return result;
-}
+//     return result;
+// }
 
-static DialogMessageButton about_screen_icon1(DialogsApp* dialogs, DialogMessage* message) {
-    DialogMessageButton result;
+// static DialogMessageButton about_screen_icon1(DialogsApp* dialogs, DialogMessage* message) {
+//     DialogMessageButton result;
 
-    dialog_message_set_icon(message, &I_Certification1_103x56, 13, 0);
-    result = dialog_message_show(dialogs, message);
+//     dialog_message_set_icon(message, &I_Certification1_103x56, 13, 0);
+//     result = dialog_message_show(dialogs, message);
 
-    return result;
-}
+//     return result;
+// }
 
-static DialogMessageButton about_screen_icon2(DialogsApp* dialogs, DialogMessage* message) {
-    DialogMessageButton result;
+// static DialogMessageButton about_screen_icon2(DialogsApp* dialogs, DialogMessage* message) {
+//     DialogMessageButton result;
 
-    dialog_message_set_icon(message, &I_Certification2_46x33, 15, 10);
-    dialog_message_set_text(
-        message, furi_hal_version_get_mic_id(), 63, 27, AlignLeft, AlignCenter);
-    result = dialog_message_show(dialogs, message);
+//     dialog_message_set_icon(message, &I_Certification2_46x33, 15, 10);
+//     dialog_message_set_text(
+//         message, furi_hal_version_get_mic_id(), 63, 27, AlignLeft, AlignCenter);
+//     result = dialog_message_show(dialogs, message);
 
-    return result;
-}
+//     return result;
+// }
 
-static DialogMessageButton about_screen_cert_china_0(DialogsApp* dialogs, DialogMessage* message) {
-    DialogMessageButton result;
+// static DialogMessageButton about_screen_cert_china_0(DialogsApp* dialogs, DialogMessage* message) {
+//     DialogMessageButton result;
 
-    dialog_message_set_icon(message, &I_CertificationChina0_121x41, 3, 3);
-    result = dialog_message_show(dialogs, message);
+//     dialog_message_set_icon(message, &I_CertificationChina0_121x41, 3, 3);
+//     result = dialog_message_show(dialogs, message);
 
-    return result;
-}
+//     return result;
+// }
 
-static DialogMessageButton about_screen_cert_china_1(DialogsApp* dialogs, DialogMessage* message) {
-    DialogMessageButton result;
+// static DialogMessageButton about_screen_cert_china_1(DialogsApp* dialogs, DialogMessage* message) {
+//     DialogMessageButton result;
 
-    dialog_message_set_icon(message, &I_CertificationChina1_124x47, 3, 3);
-    dialog_message_set_text(
-        message, furi_hal_version_get_srrc_id(), 55, 11, AlignLeft, AlignBottom);
-    result = dialog_message_show(dialogs, message);
+//     dialog_message_set_icon(message, &I_CertificationChina1_124x47, 3, 3);
+//     dialog_message_set_text(
+//         message, furi_hal_version_get_srrc_id(), 55, 11, AlignLeft, AlignBottom);
+//     result = dialog_message_show(dialogs, message);
 
-    return result;
-}
+//     return result;
+// }
 
-static DialogMessageButton about_screen_cert_taiwan(DialogsApp* dialogs, DialogMessage* message) {
-    DialogMessageButton result;
+// static DialogMessageButton about_screen_cert_taiwan(DialogsApp* dialogs, DialogMessage* message) {
+//     DialogMessageButton result;
 
-    dialog_message_set_icon(message, &I_CertificationTaiwan_33x32, 3, 10);
-    dialog_message_set_text(
-        message, furi_hal_version_get_ncc_id(), 39, 30, AlignLeft, AlignBottom);
-    result = dialog_message_show(dialogs, message);
+//     dialog_message_set_icon(message, &I_CertificationTaiwan_33x32, 3, 10);
+//     dialog_message_set_text(
+//         message, furi_hal_version_get_ncc_id(), 39, 30, AlignLeft, AlignBottom);
+//     result = dialog_message_show(dialogs, message);
 
-    return result;
-}
+//     return result;
+// }
 
-static DialogMessageButton about_screen_cert_mexico(DialogsApp* dialogs, DialogMessage* message) {
-    DialogMessageButton result;
+// static DialogMessageButton about_screen_cert_mexico(DialogsApp* dialogs, DialogMessage* message) {
+//     DialogMessageButton result;
 
-    dialog_message_set_icon(message, &I_CertificationMexico_98x41, 17, 4);
-    result = dialog_message_show(dialogs, message);
+//     dialog_message_set_icon(message, &I_CertificationMexico_98x41, 17, 4);
+//     result = dialog_message_show(dialogs, message);
 
-    return result;
-}
+//     return result;
+// }
 
 static DialogMessageButton about_screen_hw_version(DialogsApp* dialogs, DialogMessage* message) {
     DialogMessageButton result;
@@ -206,14 +208,6 @@ const AboutDialogScreen about_screens[] = {
     about_screen_product,
     about_screen_hw_version,
     about_screen_fw_version,
-    about_screen_compliance,
-    about_screen_address,
-    about_screen_icon1,
-    about_screen_icon2,
-    about_screen_cert_china_0,
-    about_screen_cert_china_1,
-    about_screen_cert_taiwan,
-    about_screen_cert_mexico,
 };
 
 int32_t about_settings_app(void* p) {

assets/dolphin/external/L1_3d_printing_128x64/meta.txt

@@ -1,14 +0,0 @@
-Filetype: Flipper Animation
-Version: 1
-
-Width: 128
-Height: 64
-Passive frames: 46
-Active frames: 0
-Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45
-Active cycles: 0
-Frame rate: 2
-Duration: 360
-Active cooldown: 0
-
-Bubble slots: 0

assets/dolphin/external/L1_Akira_128x64/meta.txt

@@ -1,14 +0,0 @@
-Filetype: Flipper Animation
-Version: 1
-
-Width: 128
-Height: 64
-Passive frames: 15
-Active frames: 21
-Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35
-Active cycles: 1
-Frame rate: 2
-Duration: 360
-Active cooldown: 7
-
-Bubble slots: 0

assets/dolphin/external/L1_Boxing_128x64/meta.txt

@@ -1,32 +0,0 @@
-Filetype: Flipper Animation
-Version: 1
-
-Width: 128
-Height: 64
-Passive frames: 9
-Active frames: 7
-Frames order: 0 1 2 1 3 1 2 3 1 4 5 6 5 6 5 4
-Active cycles: 1
-Frame rate: 2
-Duration: 360
-Active cooldown: 7
-
-Bubble slots: 2
-
-Slot: 0
-X: 78
-Y: 16
-Text: F*&K!!!
-AlignH: Left
-AlignV: Bottom
-StartFrame: 2
-EndFrame: 4
-
-Slot: 1
-X: 78
-Y: 16
-Text: What ya\nlookin at?!
-AlignH: Left
-AlignV: Center
-StartFrame: 10
-EndFrame: 15