Merge remote-tracking branch 'ofw/dev' into mntm-dev

lib/ibutton/ibutton_worker_modes.c

@@ -1,9 +1,10 @@
 #include "ibutton_worker_i.h"
 
 #include <core/check.h>
+#include <core/record.h>
 
 #include <furi_hal_rfid.h>
-#include <furi_hal_power.h>
+#include <power/power_service/power.h>
 
 #include "ibutton_protocols.h"
 
@@ -75,7 +76,9 @@ void ibutton_worker_mode_idle_stop(iButtonWorker* worker) {
 
 void ibutton_worker_mode_read_start(iButtonWorker* worker) {
     UNUSED(worker);
-    if(!furi_hal_power_is_otg_enabled()) furi_hal_power_enable_otg();
+    Power* power = furi_record_open(RECORD_POWER);
+    power_enable_otg(power, true);
+    furi_record_close(RECORD_POWER);
 }
 
 void ibutton_worker_mode_read_tick(iButtonWorker* worker) {
@@ -90,7 +93,9 @@ void ibutton_worker_mode_read_tick(iButtonWorker* worker) {
 
 void ibutton_worker_mode_read_stop(iButtonWorker* worker) {
     UNUSED(worker);
-    if(furi_hal_power_is_otg_enabled()) furi_hal_power_disable_otg();
+    Power* power = furi_record_open(RECORD_POWER);
+    power_enable_otg(power, false);
+    furi_record_close(RECORD_POWER);
 }
 
 /*********************** EMULATE ***********************/
@@ -120,7 +125,9 @@ void ibutton_worker_mode_emulate_stop(iButtonWorker* worker) {
 
 void ibutton_worker_mode_write_common_start(iButtonWorker* worker) { //-V524
     UNUSED(worker);
-    if(!furi_hal_power_is_otg_enabled()) furi_hal_power_enable_otg();
+    Power* power = furi_record_open(RECORD_POWER);
+    power_enable_otg(power, true);
+    furi_record_close(RECORD_POWER);
 }
 
 void ibutton_worker_mode_write_id_tick(iButtonWorker* worker) {
@@ -149,5 +156,7 @@ void ibutton_worker_mode_write_copy_tick(iButtonWorker* worker) {
 
 void ibutton_worker_mode_write_common_stop(iButtonWorker* worker) { //-V524
     UNUSED(worker);
-    if(furi_hal_power_is_otg_enabled()) furi_hal_power_disable_otg();
+    Power* power = furi_record_open(RECORD_POWER);
+    power_enable_otg(power, false);
+    furi_record_close(RECORD_POWER);
 }

lib/lfrfid/protocols/protocol_securakey.c

@@ -61,17 +61,22 @@ uint8_t* protocol_securakey_get_data(ProtocolSecurakey* protocol) {
 static bool protocol_securakey_can_be_decoded(ProtocolSecurakey* protocol) {
     // check 19 bits preamble + format flag
     if(bit_lib_get_bits_32(protocol->RKKT_encoded_data, 0, 19) == 0b0111111111000000000) {
-        protocol->bit_format = 0;
-        return true;
+        if(bit_lib_test_parity(protocol->RKKT_encoded_data, 2, 54, BitLibParityAlways0, 9)) {
+            protocol->bit_format = 0;
+            return true;
+        }
     } else if(bit_lib_get_bits_32(protocol->RKKT_encoded_data, 0, 19) == 0b0111111111001011010) {
-        protocol->bit_format = 26;
-        return true;
+        if(bit_lib_test_parity(protocol->RKKT_encoded_data, 2, 90, BitLibParityAlways0, 9)) {
+            protocol->bit_format = 26;
+            return true;
+        }
     } else if(bit_lib_get_bits_32(protocol->RKKT_encoded_data, 0, 19) == 0b0111111111001100000) {
-        protocol->bit_format = 32;
-        return true;
-    } else {
-        return false;
+        if(bit_lib_test_parity(protocol->RKKT_encoded_data, 2, 90, BitLibParityAlways0, 9)) {
+            protocol->bit_format = 32;
+            return true;
+        }
     }
+    return false;
 }
 
 static void protocol_securakey_decode(ProtocolSecurakey* protocol) {

lib/nfc/protocols/felica/felica_poller.c

@@ -118,7 +118,8 @@ NfcCommand felica_poller_state_handler_auth_internal(FelicaPoller* instance) {
         blocks[1] = FELICA_BLOCK_INDEX_WCNT;
         blocks[2] = FELICA_BLOCK_INDEX_MAC_A;
         FelicaPollerReadCommandResponse* rx_resp;
-        error = felica_poller_read_blocks(instance, sizeof(blocks), blocks, &rx_resp);
+        error = felica_poller_read_blocks(
+            instance, sizeof(blocks), blocks, FELICA_SERVICE_RO_ACCESS, &rx_resp);
         if(error != FelicaErrorNone || rx_resp->SF1 != 0 || rx_resp->SF2 != 0) break;
 
         if(felica_check_mac(
@@ -174,7 +175,7 @@ NfcCommand felica_poller_state_handler_auth_external(FelicaPoller* instance) {
         if(error != FelicaErrorNone || tx_resp->SF1 != 0 || tx_resp->SF2 != 0) break;
 
         FelicaPollerReadCommandResponse* rx_resp;
-        error = felica_poller_read_blocks(instance, 1, blocks, &rx_resp);
+        error = felica_poller_read_blocks(instance, 1, blocks, FELICA_SERVICE_RO_ACCESS, &rx_resp);
         if(error != FelicaErrorNone || rx_resp->SF1 != 0 || rx_resp->SF2 != 0) break;
 
         instance->data->data.fs.state.SF1 = 0;
@@ -203,7 +204,8 @@ NfcCommand felica_poller_state_handler_read_blocks(FelicaPoller* instance) {
     }
 
     FelicaPollerReadCommandResponse* response;
-    FelicaError error = felica_poller_read_blocks(instance, block_count, block_list, &response);
+    FelicaError error = felica_poller_read_blocks(
+        instance, block_count, block_list, FELICA_SERVICE_RO_ACCESS, &response);
     if(error == FelicaErrorNone) {
         block_count = (response->SF1 == 0) ? response->block_count : block_count;
         uint8_t* data_ptr =

lib/nfc/protocols/felica/felica_poller.h

@@ -56,6 +56,23 @@ typedef struct {
  */
 FelicaError felica_poller_activate(FelicaPoller* instance, FelicaData* data);
 
+/**
+ * @brief Performs felica read operation for blocks provided as parameters
+ * 
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[in] block_count Amount of blocks involved in reading procedure
+ * @param[in] block_numbers Array with block indexes according to felica docs
+ * @param[in] service_code Service code for the read operation
+ * @param[out] response_ptr Pointer to the response structure
+ * @return FelicaErrorNone on success, an error code on failure.
+*/
+FelicaError felica_poller_read_blocks(
+    FelicaPoller* instance,
+    const uint8_t block_count,
+    const uint8_t* const block_numbers,
+    uint16_t service_code,
+    FelicaPollerReadCommandResponse** const response_ptr);
+
 #ifdef __cplusplus
 }
 #endif

lib/nfc/protocols/felica/felica_poller_i.c

@@ -134,6 +134,7 @@ FelicaError felica_poller_read_blocks(
     FelicaPoller* instance,
     const uint8_t block_count,
     const uint8_t* const block_numbers,
+    uint16_t service_code,
     FelicaPollerReadCommandResponse** const response_ptr) {
     furi_assert(instance);
     furi_assert(block_count <= 4);
@@ -143,7 +144,7 @@ FelicaError felica_poller_read_blocks(
     felica_poller_prepare_tx_buffer(
         instance,
         FELICA_CMD_READ_WITHOUT_ENCRYPTION,
-        FELICA_SERVICE_RO_ACCESS,
+        service_code,
         block_count,
         block_numbers,
         0,

lib/nfc/protocols/felica/felica_poller_i.h

@@ -70,21 +70,6 @@ FelicaError felica_poller_polling(
     const FelicaPollerPollingCommand* cmd,
     FelicaPollerPollingResponse* resp);
 
-/**
- * @brief Performs felica read operation for blocks provided as parameters
- * 
- * @param[in, out] instance pointer to the instance to be used in the transaction.
- * @param[in] block_count Amount of blocks involved in reading procedure
- * @param[in] block_numbers Array with block indexes according to felica docs
- * @param[out] response_ptr Pointer to the response structure
- * @return FelicaErrorNone on success, an error code on failure.
-*/
-FelicaError felica_poller_read_blocks(
-    FelicaPoller* instance,
-    const uint8_t block_count,
-    const uint8_t* const block_numbers,
-    FelicaPollerReadCommandResponse** const response_ptr);
-
 /**
  * @brief Performs felica write operation with data provided as parameters
  * 

lib/subghz/protocols/secplus_v1.c

@@ -230,7 +230,7 @@ static bool subghz_protocol_secplus_v1_encode(SubGhzProtocolEncoderSecPlus_v1* i
         rolling = 0xE6000000;
     }
     if(fixed > 0xCFD41B90) {
-        FURI_LOG_E("TAG", "Encode wrong fixed data");
+        FURI_LOG_E(TAG, "Encode wrong fixed data");
         return false;
     }
 

lib/toolbox/pipe.c

@@ -23,6 +23,7 @@ struct PipeSide {
     PipeSideDataArrivedCallback on_data_arrived;
     PipeSideSpaceFreedCallback on_space_freed;
     PipeSideBrokenCallback on_pipe_broken;
+    FuriWait stdout_timeout;
 };
 
 PipeSideBundle pipe_alloc(size_t capacity, size_t trigger_level) {
@@ -52,12 +53,14 @@ PipeSideBundle pipe_alloc_ex(PipeSideReceiveSettings alice, PipeSideReceiveSetti
         .shared = shared,
         .sending = alice_to_bob,
         .receiving = bob_to_alice,
+        .stdout_timeout = FuriWaitForever,
     };
     *bobs_side = (PipeSide){
         .role = PipeRoleBob,
         .shared = shared,
         .sending = bob_to_alice,
         .receiving = alice_to_bob,
+        .stdout_timeout = FuriWaitForever,
     };
 
     return (PipeSideBundle){.alices_side = alices_side, .bobs_side = bobs_side};
@@ -100,7 +103,8 @@ static void _pipe_stdout_cb(const char* data, size_t size, void* context) {
     furi_assert(context);
     PipeSide* pipe = context;
     while(size) {
-        size_t sent = pipe_send(pipe, data, size, FuriWaitForever);
+        size_t sent = pipe_send(pipe, data, size, pipe->stdout_timeout);
+        if(!sent) break;
         data += sent;
         size -= sent;
     }
@@ -118,6 +122,11 @@ void pipe_install_as_stdio(PipeSide* pipe) {
     furi_thread_set_stdin_callback(_pipe_stdin_cb, pipe);
 }
 
+void pipe_set_stdout_timeout(PipeSide* pipe, FuriWait timeout) {
+    furi_check(pipe);
+    pipe->stdout_timeout = timeout;
+}
+
 size_t pipe_receive(PipeSide* pipe, void* data, size_t length, FuriWait timeout) {
     furi_check(pipe);
     return furi_stream_buffer_receive(pipe->receiving, data, length, timeout);

lib/toolbox/pipe.h

@@ -147,6 +147,16 @@ void pipe_free(PipeSide* pipe);
  */
 void pipe_install_as_stdio(PipeSide* pipe);
 
+/**
+ * @brief Sets the timeout for `stdout` write operations
+ * 
+ * @note This value is set to `FuriWaitForever` when the pipe is created
+ * 
+ * @param [in] pipe Pipe side to set the timeout of
+ * @param [in] timeout Timeout value in ticks
+ */
+void pipe_set_stdout_timeout(PipeSide* pipe, FuriWait timeout);
+
 /**
  * @brief Receives data from the pipe.
  *