some updates

lib/subghz/protocols/honda.h

@@ -7,27 +7,56 @@
 #include <lib/subghz/blocks/generic.h>
 #include <lib/subghz/blocks/math.h>
 
+/* ── Protocol name ─────────────────────────────────────────────────────── */
 #define SUBGHZ_PROTOCOL_HONDA_NAME "Honda"
 
-#define HONDA_TE_SHORT        63u
-#define HONDA_TE_LONG        126u
-#define HONDA_TE_DELTA        35u
-#define HONDA_GUARD_TIME_US  700u
+#define HONDA_TE_SHORT        250u
+#define HONDA_TE_LONG         480u
+#define HONDA_TE_DELTA         62u
 
-#define HONDA_MIN_PREAMBLE_COUNT  20u
-#define HONDA_PREAMBLE_CYCLES     312u
+/* ── FSK adaptive decoder parameters ──────────────────────────────────── */
 
-#define HONDA_FRAME_BITS     64u
-#define HONDA_FRAME_BITS_B   68u
-#define HONDA_MIN_BITS       HONDA_FRAME_BITS
+#define HONDA_FSK_DUR_MIN_US       35u
+#define HONDA_FSK_DUR_MAX_US     2000u
 
-#define HONDA_BTN_LOCK       0x01u
-#define HONDA_BTN_UNLOCK     0x02u
-#define HONDA_BTN_TRUNK      0x04u
-#define HONDA_BTN_PANIC      0x08u
-#define HONDA_BTN_RSTART     0x05u
-#define HONDA_BTN_LOCK2PRESS 0x09u
+//#define HONDA_FSK_GAP_US         3000u
+#define HONDA_FSK_GAP_US     400u
 
+#define HONDA_FSK_COLLECT_N        32u
+#define HONDA_FSK_TOL_PCT          40u
+
+#define HONDA_RAW_EDGE_BUF        512u
+#define HONDA_MAN_BIT_BUF         256u
+
+#define HONDA_FSK_MIN_PREAMBLE_BITS  16u
+
+#define HONDA_FRAME_BITS_M1    88u
+#define HONDA_FRAME_BITS_M2    66u
+#define HONDA_MIN_BITS         HONDA_FRAME_BITS_M2
+
+/* ── Mode 2 OOK parameters ────────────────────── */
+#define HONDA_TE_M2           400u
+#define HONDA_TE_M2_DELTA     100u
+#define HONDA_MIN_PREAMBLE_PULSES_M1  280u
+#define HONDA_MIN_PREAMBLE_PULSES_M2   18u
+#define HONDA_PREAMBLE_CYCLES_M1      312u
+#define HONDA_PREAMBLE_CYCLES_M2       23u
+#define HONDA_GAP_M1_MIN_US   500u
+#define HONDA_GAP_M1_MAX_US  1100u
+#define HONDA_GAP_M2_MIN_US  3000u
+#define HONDA_GAP_M2_MAX_US  5500u
+#define HONDA_GUARD_TIME_US  1000u
+
+/* ── Button codes ──────────────────────────────────────────────────────── */
+#define HONDA_BTN_LOCK        0x01u
+#define HONDA_BTN_UNLOCK      0x02u
+#define HONDA_BTN_TRUNK       0x04u
+#define HONDA_BTN_PANIC       0x08u
+#define HONDA_BTN_RSTART      0x05u
+#define HONDA_BTN_LOCK2PRESS  0x09u
+#define HONDA_CUSTOM_BTN_MAX  5u
+
+/* ── Lookup tables ─────────────────────────────────────────── */
 #define HONDA_TABLE_A \
     {0x02,0x06,0x00,0x04,0x0B,0x0F,0x09,0x0D,0x06,0x02,0x04,0x00,0x0F,0x0B,0x0D,0x09}, \
     {0x08,0x0C,0x0A,0x0E,0x01,0x05,0x03,0x07,0x0C,0x08,0x0E,0x0A,0x05,0x01,0x07,0x03}, \
@@ -118,6 +147,7 @@
     {0x08,0x09,0x0C,0x0D,0x02,0x0A,0x06,0x07,0x0D,0x0C,0x09,0x08,0x07,0x06,0x03,0x02}, \
     {0x06,0x07,0x02,0x03,0x0C,0x0D,0x08,0x09,0x03,0x02,0x07,0x06,0x09,0x08,0x0D,0x0C}
 
+/* ── CC1101 FSK preset ──────────────────────────────────────────────────── */
 #define HONDA_CC1101_PRESET_DATA \
     0x02, 0x0D, \
     0x0B, 0x06, \
@@ -140,16 +170,15 @@
     0x00, 0x00, \
     0xC0, 0x00
 
-#define HONDA_CUSTOM_BTN_MAX 5
-
+/* ── External declarations ──────────────────────────────────────────────── */
 extern const SubGhzProtocolDecoder subghz_protocol_honda_decoder;
 extern const SubGhzProtocolEncoder subghz_protocol_honda_encoder;
-extern const SubGhzProtocol subghz_protocol_honda;
+extern const SubGhzProtocol        subghz_protocol_honda;
 
-void* subghz_protocol_decoder_honda_alloc(SubGhzEnvironment* environment);
-void  subghz_protocol_decoder_honda_free(void* context);
-void  subghz_protocol_decoder_honda_reset(void* context);
-void  subghz_protocol_decoder_honda_feed(void* context, bool level, uint32_t duration);
+void*  subghz_protocol_decoder_honda_alloc(SubGhzEnvironment* environment);
+void   subghz_protocol_decoder_honda_free(void* context);
+void   subghz_protocol_decoder_honda_reset(void* context);
+void   subghz_protocol_decoder_honda_feed(void* context, bool level, uint32_t duration);
 uint8_t subghz_protocol_decoder_honda_get_hash_data(void* context);
 SubGhzProtocolStatus subghz_protocol_decoder_honda_serialize(
     void* context, FlipperFormat* flipper_format, SubGhzRadioPreset* preset);
@@ -157,9 +186,9 @@ SubGhzProtocolStatus subghz_protocol_decoder_honda_deserialize(
     void* context, FlipperFormat* flipper_format);
 void subghz_protocol_decoder_honda_get_string(void* context, FuriString* output);
 
-void* subghz_protocol_encoder_honda_alloc(SubGhzEnvironment* environment);
-void  subghz_protocol_encoder_honda_free(void* context);
-void  subghz_protocol_encoder_honda_stop(void* context);
+void*  subghz_protocol_encoder_honda_alloc(SubGhzEnvironment* environment);
+void   subghz_protocol_encoder_honda_free(void* context);
+void   subghz_protocol_encoder_honda_stop(void* context);
 LevelDuration subghz_protocol_encoder_honda_yield(void* context);
 SubGhzProtocolStatus subghz_protocol_encoder_honda_deserialize(
     void* context, FlipperFormat* flipper_format);

lib/subghz/protocols/protocol_items.c

@@ -44,7 +44,7 @@ const SubGhzProtocol* const subghz_protocol_registry_items[] = {
     //&subghz_protocol_honeywell,     
     //&subghz_protocol_legrand,
     &subghz_protocol_dickert_mahs,  
-    //&subghz_protocol_gangqi,
+    &subghz_protocol_gangqi,
     &subghz_protocol_marantec24,    
     //&subghz_protocol_hollarm,
     &subghz_protocol_hay21,         
@@ -76,8 +76,9 @@ const SubGhzProtocol* const subghz_protocol_registry_items[] = {
     &subghz_protocol_star_line,
     &subghz_protocol_scher_khan,
     &subghz_protocol_sheriff_cfm,
-    &subghz_protocol_honda,
+    // until fix &subghz_protocol_honda,
     &subghz_protocol_chrysler,
+    &subghz_protocol_psa2,
 };
 
 const SubGhzProtocolRegistry subghz_protocol_registry = {

lib/subghz/protocols/protocol_items.h

@@ -80,3 +80,4 @@
 #include "sheriff_cfm.h"
 #include "honda.h"
 #include "chrysler.h"
+#include "psa2.h"

lib/subghz/protocols/psa2.h

@@ -0,0 +1,160 @@
+#pragma once
+
+#include <lib/subghz/protocols/base.h>
+#include <lib/subghz/blocks/const.h>
+#include <lib/subghz/blocks/decoder.h>
+#include <lib/subghz/blocks/encoder.h>
+#include <lib/subghz/blocks/generic.h>
+#include <lib/subghz/blocks/math.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* =========================================================
+ * PROTOCOL NAME
+ * ========================================================= */
+
+#define SUBGHZ_PROTOCOL_PSA2_NAME "PSA OLD"
+
+/* =========================================================
+ * FORWARD DECLARATIONS — opaque handles
+ * ========================================================= */
+
+typedef struct SubGhzProtocolDecoderPSA SubGhzProtocolDecoderPSA;
+typedef struct SubGhzProtocolEncoderPSA SubGhzProtocolEncoderPSA;
+
+/* =========================================================
+ * PROTOCOL DESCRIPTORS — exported singletons
+ * ========================================================= */
+
+extern const SubGhzProtocolDecoder subghz_protocol_psa_decoder;
+extern const SubGhzProtocolEncoder subghz_protocol_psa_encoder;
+extern const SubGhzProtocol        subghz_protocol_psa2;
+
+/* =========================================================
+ * DECODER API
+ * ========================================================= */
+
+/**
+ * Allocate a PSA decoder instance.
+ *
+ * @param environment   SubGHz environment (may be NULL / unused)
+ * @return              Opaque pointer to SubGhzProtocolDecoderPSA
+ */
+void* subghz_protocol_decoder_psa2_alloc(SubGhzEnvironment* environment);
+
+/**
+ * Free a PSA decoder instance.
+ *
+ * @param context   Pointer returned by subghz_protocol_decoder_psa_alloc()
+ */
+void subghz_protocol_decoder_psa2_free(void* context);
+
+/**
+ * Reset the decoder state machine to its initial state.
+ *
+ * @param context   Pointer returned by subghz_protocol_decoder_psa_alloc()
+ */
+void subghz_protocol_decoder_psa2_reset(void* context);
+
+/**
+ * Feed one pulse/gap sample into the decoder state machine.
+ *
+ * @param context   Pointer returned by subghz_protocol_decoder_psa_alloc()
+ * @param level     true = RF high (pulse), false = RF low (gap)
+ * @param duration  Duration of this level in microseconds
+ */
+void subghz_protocol_decoder_psa2_feed(void* context, bool level, uint32_t duration);
+
+/**
+ * Return a one-byte hash of the most recently decoded packet.
+ *
+ * @param context   Pointer returned by subghz_protocol_decoder_psa_alloc()
+ * @return          Hash byte
+ */
+uint8_t subghz_protocol_decoder_psa2_get_hash_data(void* context);
+
+/**
+ * Serialize the most recently decoded packet into a FlipperFormat stream.
+ *
+ * @param context   Pointer returned by subghz_protocol_decoder_psa_alloc()
+ * @param ff        Open FlipperFormat file handle
+ * @param preset    Radio preset in use
+ * @return          SubGhzProtocolStatusOk on success
+ */
+SubGhzProtocolStatus subghz_protocol_decoder_psa2_serialize(
+    void*             context,
+    FlipperFormat*    ff,
+    SubGhzRadioPreset* preset);
+
+/**
+ * Deserialize a previously saved packet from a FlipperFormat stream
+ * into the decoder instance.
+ *
+ * @param context   Pointer returned by subghz_protocol_decoder_psa_alloc()
+ * @param ff        Open FlipperFormat file handle (positioned at start)
+ * @return          SubGhzProtocolStatusOk on success
+ */
+SubGhzProtocolStatus subghz_protocol_decoder_psa2_deserialize(
+    void*          context,
+    FlipperFormat* ff);
+
+/**
+ * Build a human-readable description of the most recently decoded packet.
+ *
+ * @param context   Pointer returned by subghz_protocol_decoder_psa_alloc()
+ * @param output    FuriString to write the description into (cleared first)
+ */
+void subghz_protocol_decoder_psa2_get_string(void* context, FuriString* output);
+
+/* =========================================================
+ * ENCODER API
+ * ========================================================= */
+
+/**
+ * Allocate a PSA encoder instance.
+ *
+ * @param environment   SubGHz environment (may be NULL / unused)
+ * @return              Opaque pointer to SubGhzProtocolEncoderPSA
+ */
+void* subghz_protocol_encoder_psa2_alloc(SubGhzEnvironment* environment);
+
+/**
+ * Free a PSA encoder instance.
+ *
+ * @param context   Pointer returned by subghz_protocol_encoder_psa_alloc()
+ */
+void subghz_protocol_encoder_psa2_free(void* context);
+
+/**
+ * Load transmit data from a FlipperFormat stream into the encoder.
+ * Rebuilds the upload buffer ready for transmission.
+ *
+ * @param context   Pointer returned by subghz_protocol_encoder_psa_alloc()
+ * @param ff        Open FlipperFormat file handle (will be rewound internally)
+ * @return          SubGhzProtocolStatusOk on success
+ */
+SubGhzProtocolStatus subghz_protocol_encoder_psa2_deserialize(
+    void*          context,
+    FlipperFormat* ff);
+
+/**
+ * Stop an in-progress transmission immediately.
+ *
+ * @param context   Pointer returned by subghz_protocol_encoder_psa_alloc()
+ */
+void subghz_protocol_encoder_psa2_stop(void* context);
+
+/**
+ * Yield the next LevelDuration sample from the upload buffer.
+ * Called repeatedly by the SubGHz radio driver during transmission.
+ *
+ * @param context   Pointer returned by subghz_protocol_encoder_psa_alloc()
+ * @return          Next LevelDuration, or level_duration_reset() when done
+ */
+LevelDuration subghz_protocol_encoder_psa2_yield(void* context);
+
+#ifdef __cplusplus
+}
+#endif