Merge branch 'dev' into doom/2991-e2e-runner

.github/CODEOWNERS

@@ -52,7 +52,6 @@
 /scripts/toolchain/ @skotopes @DrZlo13 @hedger @drunkbatya
 
 # Lib
-/lib/ST25RFAL002/ @skotopes @DrZlo13 @hedger @gornekich
 /lib/stm32wb_copro/ @skotopes @DrZlo13 @hedger @gornekich
 /lib/digital_signal/ @skotopes @DrZlo13 @hedger @gornekich
 /lib/infrared/ @skotopes @DrZlo13 @hedger @gsurkov

.github/workflows/build.yml

@@ -11,6 +11,7 @@ on:
 env:
   DEFAULT_TARGET: f7
   FBT_TOOLCHAIN_PATH: /runner/_work
+  FBT_GIT_SUBMODULE_SHALLOW: 1
 
 jobs:
   main:

.github/workflows/build_compact.yml

@@ -5,6 +5,7 @@ on:
 
 env:
   FBT_TOOLCHAIN_PATH: /runner/_work
+  FBT_GIT_SUBMODULE_SHALLOW: 1
 
 jobs:
   compact:

.github/workflows/pvs_studio.yml

@@ -10,6 +10,7 @@ env:
   TARGETS: f7
   DEFAULT_TARGET: f7
   FBT_TOOLCHAIN_PATH: /runner/_work
+  FBT_GIT_SUBMODULE_SHALLOW: 1
 
 jobs:
   analyse_c_cpp:

.github/workflows/unit_tests.yml

@@ -13,6 +13,7 @@ env:
   TARGETS: f7
   DEFAULT_TARGET: f7
   FBT_TOOLCHAIN_PATH: /opt
+  FBT_GIT_SUBMODULE_SHALLOW: 1
 
 jobs:
   run_units_on_bench:
@@ -37,7 +38,7 @@ jobs:
         if: success()
         timeout-minutes: 10
         run: |
-          ./fbt flash SWD_TRANSPORT_SERIAL=2A0906016415303030303032 FIRMWARE_APP_SET=unit_tests FORCE=1
+          ./fbt flash SWD_TRANSPORT_SERIAL=2A0906016415303030303032 LIB_DEBUG=1 FIRMWARE_APP_SET=unit_tests FORCE=1
 
       - name: 'Wait for flipper and format ext'
         id: format_ext
@@ -71,4 +72,4 @@ jobs:
       - name: 'Check GDB output'
         if: failure()
         run: |
-          ./fbt gdb_trace_all SWD_TRANSPORT_SERIAL=2A0906016415303030303032 FIRMWARE_APP_SET=unit_tests FORCE=1
+          ./fbt gdb_trace_all SWD_TRANSPORT_SERIAL=2A0906016415303030303032 LIB_DEBUG=1 FIRMWARE_APP_SET=unit_tests FORCE=1

.github/workflows/updater_test.yml

@@ -13,6 +13,7 @@ env:
   TARGETS: f7
   DEFAULT_TARGET: f7
   FBT_TOOLCHAIN_PATH: /opt
+  FBT_GIT_SUBMODULE_SHALLOW: 1
 
 jobs:
   test_updater_on_bench:

.pvsoptions

@@ -1 +1 @@
---ignore-ccache -C gccarm --rules-config .pvsconfig -e lib/cmsis_core -e lib/fatfs -e lib/fnv1a-hash -e lib/FreeRTOS-Kernel -e lib/heatshrink -e lib/libusb_stm32 -e lib/littlefs -e lib/mbedtls -e lib/micro-ecc -e lib/microtar -e lib/mlib -e lib/qrcode -e lib/ST25RFAL002 -e lib/stm32wb_cmsis -e lib/stm32wb_copro -e lib/stm32wb_hal -e lib/u8g2 -e lib/nanopb -e */arm-none-eabi/*
+--ignore-ccache -C gccarm --rules-config .pvsconfig -e lib/cmsis_core -e lib/fatfs -e lib/fnv1a-hash -e lib/FreeRTOS-Kernel -e lib/heatshrink -e lib/libusb_stm32 -e lib/littlefs -e lib/mbedtls -e lib/micro-ecc -e lib/microtar -e lib/mlib -e lib/qrcode -e lib/stm32wb_cmsis -e lib/stm32wb_copro -e lib/stm32wb_hal -e lib/u8g2 -e lib/nanopb -e */arm-none-eabi/*

applications/debug/ccid_test/ccid_test_app.c

@@ -39,15 +39,25 @@ void icc_power_on_callback(uint8_t* atrBuffer, uint32_t* atrlen, void* context)
     iso7816_answer_to_reset(atrBuffer, atrlen);
 }
 
-void xfr_datablock_callback(uint8_t* dataBlock, uint32_t* dataBlockLen, void* context) {
+//dataBlock points to the buffer
+//dataBlockLen tells reader how nany bytes should be read
+void xfr_datablock_callback(
+    const uint8_t* dataBlock,
+    uint32_t dataBlockLen,
+    uint8_t* responseDataBlock,
+    uint32_t* responseDataBlockLen,
+    void* context) {
     UNUSED(context);
 
+    struct ISO7816_Command_APDU commandAPDU;
+    iso7816_read_command_apdu(&commandAPDU, dataBlock, dataBlockLen);
+
     struct ISO7816_Response_APDU responseAPDU;
     //class not supported
     responseAPDU.SW1 = 0x6E;
     responseAPDU.SW2 = 0x00;
 
-    iso7816_write_response_apdu(&responseAPDU, dataBlock, dataBlockLen);
+    iso7816_write_response_apdu(&responseAPDU, responseDataBlock, responseDataBlockLen);
 }
 
 static const CcidCallbacks ccid_cb = {
@@ -66,7 +76,7 @@ static void ccid_test_app_render_callback(Canvas* canvas, void* ctx) {
     canvas_draw_str(canvas, 0, 63, "Hold [back] to exit");
 }
 
-static void ccid_test_app__input_callback(InputEvent* input_event, void* ctx) {
+static void ccid_test_app_input_callback(InputEvent* input_event, void* ctx) {
     FuriMessageQueue* event_queue = ctx;
 
     CcidTestAppEvent event;
@@ -94,7 +104,7 @@ CcidTestApp* ccid_test_app_alloc() {
     //message queue
     app->event_queue = furi_message_queue_alloc(8, sizeof(CcidTestAppEvent));
     furi_check(app->event_queue);
-    view_port_input_callback_set(app->view_port, ccid_test_app__input_callback, app->event_queue);
+    view_port_input_callback_set(app->view_port, ccid_test_app_input_callback, app->event_queue);
 
     return app;
 }

applications/debug/ccid_test/iso7816_t0_apdu.c

@@ -4,26 +4,27 @@
 #include <furi.h>
 #include "iso7816_t0_apdu.h"
 
-void iso7816_answer_to_reset(uint8_t* atrBuffer, uint32_t* atrlen) {
+void iso7816_answer_to_reset(uint8_t* dataBuffer, uint32_t* atrlen) {
     //minimum valid ATR: https://smartcard-atr.apdu.fr/parse?ATR=3B+00
     uint8_t AtrBuffer[2] = {
         0x3B, //TS (direct convention)
         0x00 // T0 (Y(1): b0000, K: 0 (historical bytes))
     };
     *atrlen = 2;
 
-    memcpy(atrBuffer, AtrBuffer, sizeof(uint8_t) * (*atrlen));
+    memcpy(dataBuffer, AtrBuffer, sizeof(uint8_t) * (*atrlen));
 }
 
 void iso7816_read_command_apdu(
     struct ISO7816_Command_APDU* command,
     const uint8_t* dataBuffer,
     uint32_t dataLen) {
-    furi_assert(dataLen <= 4);
+    UNUSED(dataLen);
     command->CLA = dataBuffer[0];
     command->INS = dataBuffer[1];
     command->P1 = dataBuffer[2];
     command->P2 = dataBuffer[3];
+    command->Lc = dataBuffer[4];
 }
 
 void iso7816_write_response_apdu(

applications/debug/ccid_test/iso7816_t0_apdu.h

@@ -6,18 +6,18 @@
 struct ISO7816_Command_APDU {
     //header
     uint8_t CLA;
-    uint32_t INS;
+    uint8_t INS;
     uint8_t P1;
     uint8_t P2;
 
     //body
-    uint8_t Nc;
-    uint8_t Ne;
+    uint8_t Lc;
+    uint8_t Le;
 } __attribute__((packed));
 
 struct ISO7816_Response_APDU {
     uint8_t SW1;
-    uint32_t SW2;
+    uint8_t SW2;
 } __attribute__((packed));
 
 void iso7816_answer_to_reset(uint8_t* atrBuffer, uint32_t* atrlen);