Merge branch 'dev' into developer-docs-editing

Author: portasynthinca3

.github/actions/submit_sdk/action.yml

@@ -49,7 +49,7 @@ runs:
     - name: Submit SDK
       shell: bash
       run: |
-        curl -sX 'GET' \
+        curl --fail -sX 'GET' \
           '${{ inputs.catalog-url }}/api/v0/0/sdk?length=500' \
           -H 'Accept: application/json' > sdk_versions.json
         if jq -r -e ".[] | select((.api == \"${{ inputs.firmware-api }}\") and .target == \"${{ inputs.firmware-target }}\")" sdk_versions.json > found_sdk.json ; then
@@ -61,15 +61,15 @@ runs:
           if ! echo "${{ inputs.firmware-version }}" | grep -q -- "-rc" ; then
             SDK_ID=$(jq -r ._id found_sdk.json)
             echo "Marking SDK $SDK_ID as released"
-            curl -X 'POST' \
+            curl --fail-with-body -X 'POST' \
               "${{ inputs.catalog-url }}/api/v0/0/sdk/${SDK_ID}/release" \
               -H 'Accept: application/json' \
               -H 'Authorization: Bearer ${{ inputs.catalog-api-token }}' \
               -d ''
           fi
         else
           echo "API version ${{ inputs.firmware-api }} doesn't exist in catalog, adding"
-          curl -X 'POST' \
+          curl --fail-with-body -X 'POST' \
             '${{ inputs.catalog-url }}/api/v0/0/sdk' \
             -H 'Accept: application/json' \
             -H 'Authorization: Bearer ${{ inputs.catalog-api-token }}' \

applications/debug/unit_tests/application.fam

@@ -131,6 +131,7 @@ App(
     apptype=FlipperAppType.PLUGIN,
     entry_point="get_api",
     requires=["unit_tests"],
+    fap_libs=["infrared"],
 )
 
 App(

applications/debug/unit_tests/tests/infrared/infrared_test.c

@@ -2,6 +2,7 @@
 #include <flipper_format.h>
 #include <infrared.h>
 #include <common/infrared_common_i.h>
+#include <lib/infrared/signal/infrared_brute_force.h>
 #include "../test.h" // IWYU pragma: keep
 
 #define IR_TEST_FILES_DIR   EXT_PATH("unit_tests/infrared/")
@@ -13,6 +14,7 @@ typedef struct {
     InfraredEncoderHandler* encoder_handler;
     FuriString* file_path;
     FlipperFormat* ff;
+    InfraredBruteForce* brutedb;
 } InfraredTest;
 
 static InfraredTest* test;
@@ -24,12 +26,14 @@ static void infrared_test_alloc(void) {
     test->encoder_handler = infrared_alloc_encoder();
     test->ff = flipper_format_buffered_file_alloc(storage);
     test->file_path = furi_string_alloc();
+    test->brutedb = infrared_brute_force_alloc();
 }
 
 static void infrared_test_free(void) {
     furi_check(test);
     infrared_free_decoder(test->decoder_handler);
     infrared_free_encoder(test->encoder_handler);
+    infrared_brute_force_free(test->brutedb);
     flipper_format_free(test->ff);
     furi_string_free(test->file_path);
     furi_record_close(RECORD_STORAGE);
@@ -523,6 +527,74 @@ MU_TEST(infrared_test_encoder_decoder_all) {
     infrared_test_run_encoder_decoder(InfraredProtocolPioneer, 1);
 }
 
+MU_TEST(infrared_test_ac_database) {
+    infrared_brute_force_set_db_filename(test->brutedb, EXT_PATH("infrared/assets/ac.ir"));
+    uint32_t i = 0;
+    infrared_brute_force_add_record(test->brutedb, i++, "Off");
+    infrared_brute_force_add_record(test->brutedb, i++, "Dh");
+    infrared_brute_force_add_record(test->brutedb, i++, "Cool_hi");
+    infrared_brute_force_add_record(test->brutedb, i++, "Heat_hi");
+    infrared_brute_force_add_record(test->brutedb, i++, "Cool_lo");
+    infrared_brute_force_add_record(test->brutedb, i++, "Heat_lo");
+
+    mu_assert(
+        infrared_brute_force_calculate_messages(test->brutedb) == InfraredErrorCodeNone,
+        "universal ac database is invalid");
+
+    infrared_brute_force_reset(test->brutedb);
+}
+
+MU_TEST(infrared_test_audio_database) {
+    infrared_brute_force_set_db_filename(test->brutedb, EXT_PATH("infrared/assets/audio.ir"));
+    uint32_t i = 0;
+    infrared_brute_force_add_record(test->brutedb, i++, "Power");
+    infrared_brute_force_add_record(test->brutedb, i++, "Mute");
+    infrared_brute_force_add_record(test->brutedb, i++, "Play");
+    infrared_brute_force_add_record(test->brutedb, i++, "Pause");
+    infrared_brute_force_add_record(test->brutedb, i++, "Prev");
+    infrared_brute_force_add_record(test->brutedb, i++, "Next");
+    infrared_brute_force_add_record(test->brutedb, i++, "Vol_dn");
+    infrared_brute_force_add_record(test->brutedb, i++, "Vol_up");
+
+    mu_assert(
+        infrared_brute_force_calculate_messages(test->brutedb) == InfraredErrorCodeNone,
+        "universal audio database is invalid");
+
+    infrared_brute_force_reset(test->brutedb);
+}
+
+MU_TEST(infrared_test_projector_database) {
+    infrared_brute_force_set_db_filename(test->brutedb, EXT_PATH("infrared/assets/projector.ir"));
+    uint32_t i = 0;
+    infrared_brute_force_add_record(test->brutedb, i++, "Power");
+    infrared_brute_force_add_record(test->brutedb, i++, "Mute");
+    infrared_brute_force_add_record(test->brutedb, i++, "Vol_up");
+    infrared_brute_force_add_record(test->brutedb, i++, "Vol_dn");
+
+    mu_assert(
+        infrared_brute_force_calculate_messages(test->brutedb) == InfraredErrorCodeNone,
+        "universal projector database is invalid");
+
+    infrared_brute_force_reset(test->brutedb);
+}
+
+MU_TEST(infrared_test_tv_database) {
+    infrared_brute_force_set_db_filename(test->brutedb, EXT_PATH("infrared/assets/tv.ir"));
+    uint32_t i = 0;
+    infrared_brute_force_add_record(test->brutedb, i++, "Power");
+    infrared_brute_force_add_record(test->brutedb, i++, "Mute");
+    infrared_brute_force_add_record(test->brutedb, i++, "Vol_up");
+    infrared_brute_force_add_record(test->brutedb, i++, "Ch_next");
+    infrared_brute_force_add_record(test->brutedb, i++, "Vol_dn");
+    infrared_brute_force_add_record(test->brutedb, i++, "Ch_prev");
+
+    mu_assert(
+        infrared_brute_force_calculate_messages(test->brutedb) == InfraredErrorCodeNone,
+        "universal tv database is invalid");
+
+    infrared_brute_force_reset(test->brutedb);
+}
+
 MU_TEST_SUITE(infrared_test) {
     MU_SUITE_CONFIGURE(&infrared_test_alloc, &infrared_test_free);
 
@@ -543,6 +615,10 @@ MU_TEST_SUITE(infrared_test) {
     MU_RUN_TEST(infrared_test_decoder_pioneer);
     MU_RUN_TEST(infrared_test_decoder_mixed);
     MU_RUN_TEST(infrared_test_encoder_decoder_all);
+    MU_RUN_TEST(infrared_test_ac_database);
+    MU_RUN_TEST(infrared_test_audio_database);
+    MU_RUN_TEST(infrared_test_projector_database);
+    MU_RUN_TEST(infrared_test_tv_database);
 }
 
 int run_minunit_test_infrared(void) {

applications/main/infrared/application.fam

@@ -9,7 +9,7 @@ App(
     order=40,
     sources=["*.c", "!infrared_cli.c"],
     resources="resources",
-    fap_libs=["assets"],
+    fap_libs=["assets", "infrared"],
     fap_icon="icon.png",
     fap_category="Infrared",
 )
@@ -20,9 +20,6 @@ App(
     apptype=FlipperAppType.PLUGIN,
     entry_point="cli_ir_ep",
     requires=["cli"],
-    sources=[
-        "infrared_cli.c",
-        "infrared_brute_force.c",
-        "infrared_signal.c",
-    ],
+    sources=["infrared_cli.c"],
+    fap_libs=["infrared"],
 )

applications/main/infrared/infrared_app.h

@@ -3,9 +3,7 @@
  * @brief Infrared application - start here.
  *
  * @see infrared_app_i.h for the main application data structure and functions.
- * @see infrared_signal.h for the infrared signal library - loading, storing and transmitting signals.
- * @see infrared_remote.hl for the infrared remote library - loading, storing and manipulating remotes.
- * @see infrared_brute_force.h for the infrared brute force - loading and transmitting multiple signals.
+ * @see infrared_remote.h for the infrared remote library - loading, storing and manipulating remotes
  */
 #pragma once
 

applications/main/infrared/infrared_app_i.h

@@ -31,7 +31,7 @@
 
 #include "infrared_app.h"
 #include "infrared_remote.h"
-#include "infrared_brute_force.h"
+#include <lib/infrared/signal/infrared_brute_force.h>
 #include "infrared_custom_event.h"
 
 #include "scenes/infrared_scene.h"

applications/main/infrared/infrared_cli.c

@@ -8,8 +8,8 @@
 #include <toolbox/pipe.h>
 #include <m-dict.h>
 
-#include "infrared_signal.h"
-#include "infrared_brute_force.h"
+#include <lib/infrared/signal/infrared_signal.h>
+#include <lib/infrared/signal/infrared_brute_force.h>
 
 #define INFRARED_CLI_BUF_SIZE            (10U)
 #define INFRARED_CLI_FILE_NAME_SIZE      (256U)

applications/main/infrared/infrared_remote.h

@@ -11,7 +11,7 @@
  */
 #pragma once
 
-#include "infrared_signal.h"
+#include <lib/infrared/signal/infrared_signal.h>
 
 /**
  * @brief InfraredRemote opaque type declaration.

applications/main/nfc/helpers/protocol_support/felica/felica.c

@@ -102,19 +102,21 @@ static void nfc_scene_read_success_on_enter_felica(NfcApp* instance) {
             temp_str, "\e#%s\n", nfc_device_get_name(device, NfcDeviceNameTypeFull));
         nfc_render_felica_info(data, NfcProtocolFormatTypeShort, temp_str);
     } else {
-        bool all_unlocked = data->blocks_read == data->blocks_total;
-        furi_string_cat_printf(
-            temp_str,
-            "\e#%s\n",
-            all_unlocked ? "All Blocks Are Unlocked" : "Some Blocks Are Locked");
-        nfc_render_felica_idm(data, NfcProtocolFormatTypeShort, temp_str);
-        uint8_t* ck_data = instance->felica_auth->card_key.data;
-        furi_string_cat_printf(temp_str, "Key:");
-        for(uint8_t i = 0; i < 7; i++) {
-            furi_string_cat_printf(temp_str, " %02X", ck_data[i]);
-            if(i == 6) furi_string_cat_printf(temp_str, "...");
+        if(data->workflow_type == FelicaLite) {
+            bool all_unlocked = data->blocks_read == data->blocks_total;
+            furi_string_cat_printf(
+                temp_str,
+                "\e#%s\n",
+                all_unlocked ? "All Blocks Are Unlocked" : "Some Blocks Are Locked");
+            nfc_render_felica_idm(data, NfcProtocolFormatTypeShort, temp_str);
+            uint8_t* ck_data = instance->felica_auth->card_key.data;
+            furi_string_cat_printf(temp_str, "Key:");
+            for(uint8_t i = 0; i < 7; i++) {
+                furi_string_cat_printf(temp_str, " %02X", ck_data[i]);
+                if(i == 6) furi_string_cat_printf(temp_str, "...");
+            }
+            nfc_render_felica_blocks_count(data, temp_str, false);
         }
-        nfc_render_felica_blocks_count(data, temp_str, false);
     }
     felica_auth_reset(instance->felica_auth);
 

applications/main/nfc/helpers/protocol_support/felica/felica_render.c

@@ -6,14 +6,10 @@ void nfc_render_felica_blocks_count(
     bool render_auth_notification) {
     if(data->workflow_type == FelicaLite) {
         furi_string_cat_printf(str, "Blocks: %u\n", data->blocks_total);
-
         furi_string_cat_printf(str, "\nBlocks Read: %u/%u", data->blocks_read, data->blocks_total);
         if(render_auth_notification && data->blocks_read != data->blocks_total) {
             furi_string_cat_printf(str, "\nAuth-protected blocks!");
         }
-    } else if(data->workflow_type == FelicaStandard) {
-        furi_string_cat_printf(
-            str, "Public blocks Read: %lu", simple_array_get_count(data->public_blocks));
     }
 }
 
@@ -54,11 +50,7 @@ void nfc_render_felica_info(
     }
 
     furi_string_cat_printf(str, "\n");
-    furi_string_cat_printf(
-        str,
-        "Services found: %lu \nAreas found: %lu\n",
-        simple_array_get_count(data->services),
-        simple_array_get_count(data->areas));
+    furi_string_cat_printf(str, "Systems found: %lu \n", simple_array_get_count(data->systems));
 
     nfc_render_felica_blocks_count(data, str, true);
 }
@@ -136,9 +128,9 @@ void nfc_more_info_render_felica_lite_dump(const FelicaData* data, FuriString* s
     nfc_render_felica_block(&data->data.fs.crc_check, str, "CRC_CHCK", 15, 17);
 }
 
-void nfc_more_info_render_felica_dir(const FelicaData* data, FuriString* str) {
-    const size_t area_count = simple_array_get_count(data->areas);
-    const size_t service_count = simple_array_get_count(data->services);
+void nfc_more_info_render_felica_dir(const FelicaSystem* system, FuriString* str) {
+    const size_t area_count = simple_array_get_count(system->areas);
+    const size_t service_count = simple_array_get_count(system->services);
 
     furi_string_cat_printf(str, "\e#Directory Tree:\n");
 
@@ -150,11 +142,12 @@ void nfc_more_info_render_felica_dir(const FelicaData* data, FuriString* str) {
         furi_string_cat_printf(
             str, "::: ... are readable services\n||| ... are locked services\n");
     }
-    felica_write_directory_tree(data, str);
+    felica_write_directory_tree(system, str);
 }
 
 void nfc_more_info_render_felica_blocks(
     const FelicaData* data,
+    const FelicaSystem* system,
     FuriString* str,
     const uint16_t service_code_key) {
     furi_string_cat_printf(str, "\n");
@@ -190,9 +183,9 @@ void nfc_more_info_render_felica_blocks(
         nfc_render_felica_block(&data->data.fs.crc_check, str, "CRC_CHCK", 15, 17);
 
     } else if(data->workflow_type == FelicaStandard) {
-        uint32_t public_blocks_count = simple_array_get_count(data->public_blocks);
+        uint32_t public_blocks_count = simple_array_get_count(system->public_blocks);
         for(size_t i = 0; i < public_blocks_count; i++) {
-            FelicaPublicBlock* public_block = simple_array_get(data->public_blocks, i);
+            FelicaPublicBlock* public_block = simple_array_get(system->public_blocks, i);
             if(public_block->service_code != service_code_key) {
                 continue; // Skip blocks not matching the requested service code
             }