Merge branch 'ofw-dev' into dev

lib/ReadMe.md

@@ -27,6 +27,7 @@
 - `nfc`                 - NFC library, used by NFC application
 - `one_wire`            - OneWire library, used by iButton application
 - `print`               - Tiny printf implementation
+- `digital_signal`      - Digital Signal library used by NFC for software implemented protocols
 - `pulse_reader`        - Pulse Reader library used by NFC for software implemented protocols
 - `qrcode`              - QR-Code library
 - `stm32wb_cmsis`       - STM32WB series CMSIS headers, extends CMSIS Core

lib/SConscript

@@ -15,7 +15,6 @@ env.Append(
         Dir("u8g2"),
         Dir("update_util"),
         Dir("print"),
-        Dir("pulse_reader"),
     ],
 )
 
@@ -95,6 +94,7 @@ libs = env.BuildModules(
         "mbedtls",
         "subghz",
         "nfc",
+        "digital_signal",
         "pulse_reader",
         "appframe",
         "misc",

lib/digital_signal/SConscript

@@ -0,0 +1,20 @@
+Import("env")
+
+env.Append(
+    CPPPATH=[
+        "#/lib/digital_signal",
+    ],
+    SDK_HEADERS=[
+        File("digital_signal.h"),
+    ],
+)
+
+libenv = env.Clone(FW_LIB_NAME="digital_signal")
+libenv.ApplyLibFlags()
+libenv.Append(CCFLAGS=["-O3", "-funroll-loops", "-Ofast"])
+
+sources = libenv.GlobRecursive("*.c*")
+
+lib = libenv.StaticLibrary("${FW_LIB_NAME}", sources)
+libenv.Install("${LIB_DIST_DIR}", lib)
+Return("lib")

lib/digital_signal/digital_signal.c

@@ -212,8 +212,7 @@ void digital_signal_prepare_arr(DigitalSignal* signal) {
     internals->reload_reg_entries = 0;
 
     for(size_t pos = 0; pos < signal->edge_cnt; pos++) {
-        uint32_t edge_scaled = (internals->factor * signal->edge_timings[pos]) / (1024 * 1024);
-        uint32_t pulse_duration = edge_scaled + internals->reload_reg_remainder;
+        uint32_t pulse_duration = signal->edge_timings[pos] + internals->reload_reg_remainder;
         if(pulse_duration < 10 || pulse_duration > 10000000) {
             /*FURI_LOG_D(
                 TAG,

lib/misc.scons

@@ -4,7 +4,6 @@ Import("env")
 
 env.Append(
     CPPPATH=[
-        "#/lib/digital_signal",
         "#/lib/fnv1a_hash",
         "#/lib/heatshrink",
         "#/lib/micro-ecc",
@@ -26,7 +25,6 @@ libenv.ApplyLibFlags()
 sources = []
 
 libs_recurse = [
-    "digital_signal",
     "micro-ecc",
     "u8g2",
     "update_util",