Revert "some updates"

This reverts commit a55189e2a4.

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,7 +76,7 @@ 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,
 };
 

lib/subghz/protocols/psa.c

@@ -125,6 +125,10 @@ struct SubGhzProtocolDecoderPSA {
 
     uint32_t last_key1_low;
     uint32_t last_key1_high;
+
+    uint32_t te_sum;
+    uint16_t te_count;
+    uint32_t te_detected;
 };
 
 struct SubGhzProtocolEncoderPSA {
@@ -670,6 +674,9 @@ void subghz_protocol_decoder_psa_feed(void* context, bool level, uint32_t durati
         instance->pattern_counter = 0;
         instance->decode_count_bit = 0;
         instance->mode_serialize = 0;
+        instance->te_sum = duration;
+        instance->te_count = 1;
+        instance->te_detected = 0;
         instance->prev_duration = duration;
         manchester_advance(instance->manchester_state, ManchesterEventReset,
                          &instance->manchester_state, NULL);
@@ -935,39 +942,35 @@ void subghz_protocol_decoder_psa_feed(void* context, bool level, uint32_t durati
             return;
         }
 
-        if(duration < PSA_TE_SHORT_125) {
-            tolerance = PSA_TE_SHORT_125 - duration;
-            if(tolerance < PSA_TOLERANCE_50) {
-                uint32_t prev_diff = psa_abs_diff(prev_dur, PSA_TE_SHORT_125);
-                if(prev_diff <= PSA_TOLERANCE_49) {
-                    instance->pattern_counter++;
-                } else {
-                    instance->pattern_counter = 0;
-                }
-                instance->prev_duration = duration;
-                return;
+        // Adaptive AM preamble: accept 76-174us, average to detect actual TE
+        if(duration >= 76 && duration <= 174) {
+            if(prev_dur >= 76 && prev_dur <= 174) {
+                instance->pattern_counter++;
+                instance->te_sum += duration;
+                instance->te_count++;
+            } else {
+                instance->pattern_counter = 0;
+                instance->te_sum = duration;
+                instance->te_count = 1;
             }
+            instance->prev_duration = duration;
+            return;
         } else {
-            tolerance = duration - PSA_TE_SHORT_125;
-            if(tolerance < PSA_TOLERANCE_50) {
-                uint32_t prev_diff = psa_abs_diff(prev_dur, PSA_TE_SHORT_125);
-                if(prev_diff <= PSA_TOLERANCE_49) {
-                    instance->pattern_counter++;
-                } else {
-                    instance->pattern_counter = 0;
-                }
-                instance->prev_duration = duration;
-                return;
-            } else if(duration >= PSA_TE_LONG_250 && duration < 0x12c) {
-                if(instance->pattern_counter > PSA_PATTERN_THRESHOLD_2) {
-                    new_state = PSADecoderState4;
-                    instance->decode_data_low = 0;
-                    instance->decode_data_high = 0;
-                    instance->decode_count_bit = 0;
-                    manchester_advance(instance->manchester_state, ManchesterEventReset,
-                                     &instance->manchester_state, NULL);
-                    instance->state = new_state;
-                }
+            // Check if this is the preamble-to-data transition (2x detected TE)
+            uint32_t te_avg = (instance->te_count > 0) ?
+                (instance->te_sum / instance->te_count) : PSA_TE_SHORT_125;
+            uint32_t te_long_expected = te_avg * 2;
+            uint32_t long_diff = psa_abs_diff(duration, te_long_expected);
+
+            if(long_diff <= te_avg && instance->pattern_counter > PSA_PATTERN_THRESHOLD_2) {
+                instance->te_detected = te_avg;
+                new_state = PSADecoderState4;
+                instance->decode_data_low = 0;
+                instance->decode_data_high = 0;
+                instance->decode_count_bit = 0;
+                manchester_advance(instance->manchester_state, ManchesterEventReset,
+                                 &instance->manchester_state, NULL);
+                instance->state = new_state;
                 instance->pattern_counter = 0;
                 instance->prev_duration = duration;
                 return;
@@ -975,67 +978,25 @@ void subghz_protocol_decoder_psa_feed(void* context, bool level, uint32_t durati
         }
 
         new_state = PSADecoderState0;
+        instance->pattern_counter = 0;
         break;
 
-    case PSADecoderState4:
+    case PSADecoderState4: {
         if(instance->decode_count_bit >= PSA_MAX_BITS) {
             new_state = PSADecoderState0;
             break;
         }
 
-        if(!level) {
-            uint8_t manchester_input;
-            bool decoded_bit = false;
-
-            if(duration < PSA_TE_SHORT_125) {
-                tolerance = PSA_TE_SHORT_125 - duration;
-                if(tolerance > PSA_TOLERANCE_49) {
-                    return;
-                }
-                manchester_input = ((level ^ 1) & 0x7f) << 1;
-            } else {
-                tolerance = duration - PSA_TE_SHORT_125;
-                if(tolerance < PSA_TOLERANCE_50) {
-                    manchester_input = ((level ^ 1) & 0x7f) << 1;
-                } else if(duration >= PSA_TE_LONG_250 && duration < 0x12c) {
-                    if(level == 0) {
-                        manchester_input = 6;
-                    } else {
-                        manchester_input = 4;
-                    }
-                } else {
-                    return;
-                }
-            }
-
-            if(manchester_advance(instance->manchester_state,
-                                 (ManchesterEvent)manchester_input,
-                                 &instance->manchester_state,
-                                 &decoded_bit)) {
-                uint32_t carry = (instance->decode_data_low >> 31) & 1;
-                instance->decode_data_low = (instance->decode_data_low << 1) | (decoded_bit ? 1 : 0);
-                instance->decode_data_high = (instance->decode_data_high << 1) | carry;
-                instance->decode_count_bit++;
-
-                if(instance->decode_count_bit == PSA_KEY1_BITS) {
-                    instance->key1_low = instance->decode_data_low;
-                    instance->key1_high = instance->decode_data_high;
-                    instance->decode_data_low = 0;
-                    instance->decode_data_high = 0;
-                }
-            }
-        } else if(level) {
-            uint32_t end_diff;
-            if(duration < PSA_TE_END_500) {
-                end_diff = PSA_TE_END_500 - duration;
-            } else {
-                end_diff = duration - PSA_TE_END_500;
-            }
-            if(end_diff <= 99) {
-                if(instance->decode_count_bit != PSA_KEY2_BITS) {
-                    return;
-                }
+        uint32_t te_s = instance->te_detected ? instance->te_detected : PSA_TE_SHORT_125;
+        uint32_t te_l = te_s * 2;
+        uint32_t te_tol = te_s / 2;
+        uint32_t midpoint = (te_s + te_l) / 2;
 
+        // End marker check: HIGH pulse beyond long range at 80 bits
+        if(level && instance->decode_count_bit == PSA_KEY2_BITS && duration > midpoint) {
+            uint32_t end_expected = te_s * 4;
+            uint32_t end_diff = psa_abs_diff(duration, end_expected);
+            if(end_diff <= te_s * 2) {
                 instance->validation_field = (uint16_t)(instance->decode_data_low & 0xFFFF);
                 instance->key2_low = instance->decode_data_low;
                 instance->key2_high = instance->decode_data_high;
@@ -1052,7 +1013,6 @@ void subghz_protocol_decoder_psa_feed(void* context, bool level, uint32_t durati
                     instance->mode_serialize = 0x36;
                 }
 
-                // Only fire callback if decrypted or validation nibble matches
                 if(instance->decrypted != 0x50 &&
                    (instance->validation_field & 0xf) != 0xa) {
                     instance->decode_data_low = 0;
@@ -1076,12 +1036,56 @@ void subghz_protocol_decoder_psa_feed(void* context, bool level, uint32_t durati
                 new_state = PSADecoderState0;
                 instance->state = new_state;
                 return;
-            } else {
+            }
+        }
+
+        // Manchester decode: process BOTH high and low pulses (unlike original AM path)
+        if(duration > te_l + te_tol) {
+            if(duration > 10000) {
+                new_state = PSADecoderState0;
+                break;
+            }
+            return;
+        }
+
+        uint8_t manchester_input;
+        bool decoded_bit = false;
+
+        if(duration <= midpoint) {
+            if(psa_abs_diff(duration, te_s) > te_tol) {
                 return;
             }
+            manchester_input = level ? ManchesterEventShortLow : ManchesterEventShortHigh;
+        } else {
+            if(psa_abs_diff(duration, te_l) > te_tol) {
+                return;
+            }
+            manchester_input = level ? ManchesterEventLongLow : ManchesterEventLongHigh;
+        }
+
+        if(instance->decode_count_bit < PSA_KEY2_BITS) {
+            if(manchester_advance(instance->manchester_state,
+                                 (ManchesterEvent)manchester_input,
+                                 &instance->manchester_state,
+                                 &decoded_bit)) {
+                uint32_t carry = (instance->decode_data_low >> 31) & 1;
+                // PSA AM uses inverted Manchester convention
+                decoded_bit = !decoded_bit;
+                instance->decode_data_low = (instance->decode_data_low << 1) | (decoded_bit ? 1 : 0);
+                instance->decode_data_high = (instance->decode_data_high << 1) | carry;
+                instance->decode_count_bit++;
+
+                if(instance->decode_count_bit == PSA_KEY1_BITS) {
+                    instance->key1_low = instance->decode_data_low;
+                    instance->key1_high = instance->decode_data_high;
+                    instance->decode_data_low = 0;
+                    instance->decode_data_high = 0;
+                }
+            }
         }
         break;
     }
+    }
 
     instance->state = new_state;
     instance->prev_duration = duration;