From bbe5c9cae1a6df29e47fd4e4e6a2123680d717eb Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Fri, 9 Sep 2022 14:33:18 +0300 Subject: [PATCH] fix universal tv, lfrfid gui --- CHANGELOG.md | 18 ++----- .../lfrfid/scenes/lfrfid_scene_read_success.c | 11 ++-- assets/resources/Manifest | 6 +-- .../resources/infrared/assets/projectors.ir | 22 +++++++- assets/resources/infrared/assets/tv.ir | 50 +++++++++---------- 5 files changed, 56 insertions(+), 51 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f9bfcdb02..d10ff40afd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,19 +1,7 @@ ### New changes -* Fix picopass plugin (revert OFW PR 1701) -* Updated universal remote assets (by @Amec0e) -### Changes from previous release -* Add SubGhz Bruteforce plugin (by @Ganapati & @xMasterX) (PR #57) - saving functionality and many fixes by @xMasterX -* Fix GUI and add new icon in LF-RFID App (icon by @Svaarich) -* GUI Changes to LFRFID Fuzzer -* New Battery info (from @theeogflip) (PR #60) -* NRFSniff: Adds unique count display (by @Graf3x) (PR #56) -* Updated universal remote assets (by @Amec0e) -* OFW: RFID app port to plain C -* OFW: SubGhz: fix decoder keeloq -* OFW PR: Picopass: detect and show SE / SIO - OFW PR 1701 (by pcunning) -* OFW PR: Fix MFClassic 4k reading - OFW PR 1712 (by Astrrra) -* OFW: SubGhz: handle missing key in cryptostore. Lib: lower default display contrast. -* OFW: Furi: wait for timer wind down in destructor +* Fix universal tv remote +* Fit extra element on lfrfid screen +* Updated universal remote assets (by @Amec0e & projectors by @Alejandro12120) **Note: To avoid issues prefer installing using web updater or by self update package, all needed assets will be installed** diff --git a/applications/lfrfid/scenes/lfrfid_scene_read_success.c b/applications/lfrfid/scenes/lfrfid_scene_read_success.c index 6593715208..c250fe4eaf 100644 --- a/applications/lfrfid/scenes/lfrfid_scene_read_success.c +++ b/applications/lfrfid/scenes/lfrfid_scene_read_success.c @@ -24,14 +24,13 @@ void lfrfid_scene_read_success_on_enter(void* context) { uint8_t* data = (uint8_t*)malloc(size); protocol_dict_get_data(app->dict, app->protocol_id, data, size); for(uint8_t i = 0; i < size; i++) { - if(i != 0) { - string_cat_printf(tmp_string, ":"); - } - - if(i >= 8) { - string_cat_printf(tmp_string, "..."); + if(i >= 9) { + string_cat_printf(tmp_string, ".."); break; } else { + if(i != 0) { + string_cat_printf(tmp_string, ":"); + } string_cat_printf(tmp_string, "%02X", data[i]); } } diff --git a/assets/resources/Manifest b/assets/resources/Manifest index 0fa51d9c28..743305aa99 100644 --- a/assets/resources/Manifest +++ b/assets/resources/Manifest @@ -1,5 +1,5 @@ V:0 -T:1662677298 +T:1662721925 D:badusb D:dolphin D:infrared @@ -245,8 +245,8 @@ D:infrared/assets F:5e55f221320c8f0bbeafd5df59673e75:139785:infrared/assets/ac.ir F:1720722745039a27440e62ea08db7f3a:60611:infrared/assets/audio.ir F:faa49194e6ba4e5bc1ae5b2f90909d29:87512:infrared/assets/fans.ir -F:9fea10aa40ce414753b45449acd8a2d0:6910:infrared/assets/projectors.ir -F:a377e1f74292ce3ccde7aebe5b41e81b:140936:infrared/assets/tv.ir +F:4193827d68bbdbbda9347d423752b70f:7164:infrared/assets/projectors.ir +F:88f9487786acceab7f207a4d2baabd14:140985:infrared/assets/tv.ir F:a157a80f5a668700403d870c23b9567d:470:music_player/Marble_Machine.fmf D:nfc/assets F:81dc04c7b181f94b644079a71476dff4:4742:nfc/assets/aid.nfc diff --git a/assets/resources/infrared/assets/projectors.ir b/assets/resources/infrared/assets/projectors.ir index 533700cdd2..1e4f6f01ea 100644 --- a/assets/resources/infrared/assets/projectors.ir +++ b/assets/resources/infrared/assets/projectors.ir @@ -1,6 +1,6 @@ Filetype: IR library file Version: 1 -# Last Updated 7th Sep, 2022 +# Last Updated 8th Sep, 2022 # # ON name: POWER @@ -332,10 +332,28 @@ type: parsed protocol: NEC address: 32 00 00 00 command: 14 00 00 00 -# +# OFF name: POWER type: parsed protocol: NECext address: 83 F4 00 00 command: 4E B1 00 00 # +name: POWER +type: parsed +protocol: NEC +address: 03 00 00 00 +command: 1D 00 00 00 +# +name: VOL+ +type: parsed +protocol: NEC +address: 03 00 00 00 +command: 11 00 00 00 +# +name: VOL- +type: parsed +protocol: NEC +address: 03 00 00 00 +command: 15 00 00 00 +# diff --git a/assets/resources/infrared/assets/tv.ir b/assets/resources/infrared/assets/tv.ir index b1685a0319..ba13292fbd 100755 --- a/assets/resources/infrared/assets/tv.ir +++ b/assets/resources/infrared/assets/tv.ir @@ -1,6 +1,6 @@ Filetype: IR library file Version: 1 -# Last Updated 7th Sep, 2022 +# Last Updated 9th Sept, 2022 # # ON name: POWER @@ -17,7 +17,7 @@ command: E9 16 00 00 # ON name: POWER type: parsed -protocol: RCA +protocol: RC5 address: 0F 00 00 00 command: 3A 00 00 00 # ON @@ -2777,37 +2777,37 @@ data: 182 7824 176 2328 181 2323 176 2328 181 2324 175 1312 183 1323 182 2322 17 # name: POWER type: parsed -protocol: RCA +protocol: RC5 address: 0F 00 00 00 command: 2A 00 00 00 # name: CH- type: parsed -protocol: RCA +protocol: RC5 address: 0F 00 00 00 command: 2C 00 00 00 # name: CH+ type: parsed -protocol: RCA +protocol: RC5 address: 0F 00 00 00 command: 2D 00 00 00 # name: VOL- type: parsed -protocol: RCA +protocol: RC5 address: 0F 00 00 00 command: 2E 00 00 00 # name: VOL+ type: parsed -protocol: RCA +protocol: RC5 address: 0F 00 00 00 command: 2F 00 00 00 # name: MUTE type: parsed -protocol: RCA +protocol: RC5 address: 0F 00 00 00 command: 3F 00 00 00 # @@ -3170,97 +3170,97 @@ type: raw frequency: 38000 duty_cycle: 0.330000 data: 4006 3981 523 1973 520 1977 516 1981 522 1974 519 1011 497 1006 491 1979 524 1005 493 1978 515 1982 521 1009 488 1015 493 1010 498 1006 491 1012 496 1007 490 1980 523 1973 520 1010 498 1973 520 983 515 1016 492 1978 514 1983 520 8468 4007 3982 522 1973 520 1977 516 1981 522 1975 518 986 522 1008 490 1982 521 982 516 1982 521 1976 517 986 522 982 516 988 520 984 524 979 519 985 523 1975 518 1979 514 989 519 1978 515 988 520 984 524 1973 520 1977 516 -# +# OFF name: POWER type: parsed protocol: NEC address: 01 00 00 00 command: 59 00 00 00 -# +# OFF name: POWER type: parsed protocol: NEC address: 08 00 00 00 command: D5 00 00 00 -# +# OFF name: POWER type: parsed protocol: RC5 address: 01 00 00 00 command: 2A 00 00 00 -# +# OFF name: POWER type: parsed protocol: NECext address: 00 7F 00 00 command: 0C F3 00 00 -# +# OFF name: POWER type: parsed protocol: NECext address: 86 05 00 00 command: 13 EC 00 00 -# +# OFF name: POWER type: parsed protocol: NECext address: 02 7D 00 00 command: 11 EE 00 00 -# +# OFF name: POWER type: parsed protocol: NECext address: 84 E0 00 00 command: 22 DD 00 00 -# +# OFF name: POWER type: parsed protocol: NEC address: 20 00 00 00 command: 4E 00 00 00 -# +# OFF name: POWER type: parsed protocol: NEC address: 04 00 00 00 command: 0E 00 00 00 -# +# OFF name: POWER type: parsed protocol: NEC address: 04 00 00 00 command: 1B 00 00 00 -# +# OFF name: POWER type: parsed protocol: NEC address: 01 00 00 00 command: 5E 00 00 00 -# +# OFF name: POWER type: parsed protocol: NECext address: EA C7 00 00 command: 62 9D 00 00 -# +# OFF name: POWER type: parsed -protocol: RCA +protocol: RC5 address: 0F 00 00 00 command: 3B 00 00 00 -# +# OFF name: POWER type: parsed protocol: Samsung32 address: 07 00 00 00 command: 03 00 00 00 -# +# OFF name: POWER type: parsed protocol: SIRC address: 01 00 00 00 command: 36 00 00 00 -# +# OFF name: POWER type: parsed protocol: Samsung32