File tree Expand file tree Collapse file tree 3 files changed +11
-10
lines changed
Expand file tree Collapse file tree 3 files changed +11
-10
lines changed Original file line number Diff line number Diff line change 1717* SubGHz: KeeLoq ** display decrypted hop** in ` Hop ` instead of showing encrypted as is (encrypted non byte reversed hop is still displayed in ` Key ` field)
1818* SubGHz: ** BFT KeeLoq** try decoding with ** zero seed** too
1919* SubGHz: KeeLoq ** display BFT programming mode TX** (when arrow button is held)
20+ * SubGHz: KeeLoq ** add counter mode 7 (sends 7 signals increasing counter with 0x3333 steps)** - may bypass counter on some receivers!
2021* SubGHz: Add signals button editor and real ** remote simulation** (full signal transmit with just one click) (PR #956 | by @Dmitry422 )
2122* JS: feat: add IR capabilities to the JS engine (PR #957 | by @LuisMayo )
2223* NFC: Handle PPS request in ISO14443-4 layer (by @WillyJL )
2829* Desktop: Disable winter holidays anims
2930* OFW PR 4333: NFC: Fix sending 32+ byte ISO 15693-3 commands (by @WillyJL )
3031* NFC: Fix LED not blinking at SLIX unlock (closes issue #945 )
32+ * SubGHz: Added some RAM
3133* SubGHz: Fix documentation link for HT12A protocol (by @carlogrisetti )
3234* SubGHz: Improve docs on low level code (PR #949 | by @Dmitry422 )
3335* SubGHz: Fix Alutech AT4N false positives
Original file line number Diff line number Diff line change @@ -127,6 +127,12 @@ CounterMode: 1
127127** Mode 6:**
128128- Counter freeze - do not increment
129129
130+ ** Mode 7:**
131+ - Incremental mode: ` +0x3333 ` 5 times to current counter and return original value back adding +1 - 2 times - 7 signals in pack total
132+ - Might work with Doorhan, seen in some "universal remotes"
133+ - One click of Send button on flipper may bypass receiver counter, wait for full transmission
134+
135+
130136---
131137
132138### 5. V2 Phoenix (Phox)
Original file line number Diff line number Diff line change @@ -202,10 +202,6 @@ static bool subghz_protocol_keeloq_gen_data(
202202 uint64_t man = 0 ;
203203 uint64_t code_found_reverse ;
204204 int res = 0 ;
205- // No mf name set? -> set to ""
206- if (instance -> manufacture_name == 0x0 ) {
207- instance -> manufacture_name = "" ;
208- }
209205
210206 // programming mode on / off conditions
211207 if (strcmp (instance -> manufacture_name , "BFT" ) == 0 ) {
@@ -543,10 +539,8 @@ static size_t subghz_protocol_encoder_keeloq_encode_to_timings(
543539 size_t index ) {
544540 furi_assert (instance );
545541 // Generate new key
546- if (subghz_protocol_keeloq_gen_data (instance , btn , counter_up , false)) {
547- // OK
548- } else {
549- return false;
542+ if (!subghz_protocol_keeloq_gen_data (instance , btn , counter_up , false)) {
543+ return 0 ;
550544 }
551545
552546 uint32_t gap_duration = subghz_protocol_keeloq_const .te_short * 40 ;
@@ -1411,8 +1405,7 @@ static uint8_t subghz_protocol_keeloq_get_btn_code(uint8_t last_btn_code) {
14111405
14121406 // Set custom button
14131407 // Basic set | 0x1 | 0x2 | 0x4 | 0x8 | 0xA or Special Learning Code |
1414- if ((custom_btn_id == SUBGHZ_CUSTOM_BTN_OK ) && (original_btn_code != 0 ) &&
1415- (keeloq_counter_mode != 7 )) {
1408+ if ((custom_btn_id == SUBGHZ_CUSTOM_BTN_OK ) && (original_btn_code != 0 )) {
14161409 // Restore original button code
14171410 btn = original_btn_code ;
14181411 } else if (custom_btn_id == SUBGHZ_CUSTOM_BTN_UP ) {
You can’t perform that action at this time.
0 commit comments