Commit Graph

7802 Commits

Author SHA1 Message Date
nullableVoidPtr
c41ce0b782 Merge branch 'nfcf' of github.com:erakem/flipperzero-firmware into erakem-nfcf 2022-12-10 12:32:17 +11:00
nullableVoidPtr
5c26ddbc02 Bump API version 2022-12-10 12:22:41 +11:00
nullableVoidPtr
eaf72348a6 Merge branch 'dev' into nfcf 2022-12-10 12:21:54 +11:00
nullableVoidPtr
6c7cd0960c NFC: Add Felica info scenes and properly clear felica_data 2022-12-10 12:15:09 +11:00
MX
9df393c301 Update changelog and docs 2022-12-10 03:20:38 +03:00
RogueMaster
fcdf3e94c5 Update version.py 2022-12-09 16:05:02 -05:00
RogueMaster
39e7003f51 Merge branch 'flipperdevices:dev' into 420 2022-12-09 15:19:57 -05:00
SHxKenzuto
bfc563e895 Merge remote-tracking branch 'upstream/dev' into shutdown_idle 2022-12-09 20:48:39 +01:00
SHxKenzuto
400558acfd Shutdown on Idle: auto-shutdown timer arm/inhibit hooked to loader events 2022-12-09 20:29:39 +01:00
MX
df693e7e57 Update Readme 2022-12-09 22:13:11 +03:00
MX
74fb904fb0 Merge branch 'fz-dev' into dev 2022-12-09 22:04:43 +03:00
Nikolay Minaylov
b85f533a20 VCP session close fix (#2108)
* VCP thread check before flag set
* VCP running flag check
* Cli vcp: more clear CLI_VCP_DEBUG logs
* Cli: move tag to debug log macro

Co-authored-by: SG <who.just.the.doctor@gmail.com>
2022-12-10 03:03:19 +09:00
MX
6f9f0dbe6e Infrared: Update assets
by @Amec0e
2022-12-09 20:42:09 +03:00
MX
6701cbacf9 SubGHz: Improve signals visibility in history 2022-12-09 20:01:05 +03:00
MX
aae82b2694 Misc fixes & updates 2022-12-09 20:00:39 +03:00
SHxKenzuto
76c2ccdccd Merge branch 'dev-upstream' into shutdown_idle 2022-12-09 17:18:28 +01:00
RogueMaster
acc421aff9 RELEASE 2022-12-09 00:31:41 -05:00
RogueMaster
42f8f8254b remove old 2022-12-09 00:31:28 -05:00
RogueMaster
6d950c1b50 Update ReadMe.md 2022-12-09 00:28:50 -05:00
RogueMaster
3d97fa6737 Merge branch 'UNLEASHED' into 420 2022-12-09 00:28:19 -05:00
RogueMaster
18f64f0002 Merge branch 'ofwdev' into 420 2022-12-09 00:24:04 -05:00
MX
556b604f7b WS: GUI fixes and improvements 2022-12-09 00:04:55 +03:00
MX
8794aad5d0 Merge branch 'fz-dev' into dev 2022-12-08 21:41:45 +03:00
Georgii Surkov
df808be8d7 [FL-3003] Fix logical error in storage script (#2105)
* Fix logical error in storage script
* Fix formatting
2022-12-08 18:31:22 +09:00
MX
99ef76e638 Some small fixes - added 'base_path' 2022-12-08 10:10:38 +03:00
Aleksandr Kutuzov
a590f7e46b Merge remote-tracking branch 'origin/dev' into DigitalSequence_PulseReader 2022-12-08 16:04:31 +09:00
Shane Synan
5c3a5cd8f7 FuriHal, Power, UnitTests: battery charging voltage limit API (#2063) 2022-12-08 15:57:49 +09:00
RogueMaster
ed0203edf7 RELEASE 2022-12-08 01:24:50 -05:00
MX
349ef2ecb8 Fix merge issues 2022-12-08 09:04:22 +03:00
MX
1fc67f76a2 Merge branch 'fz-dev' into dev 2022-12-08 08:58:39 +03:00
RogueMaster
11e4df56ef remove old 2022-12-08 00:56:42 -05:00
RogueMaster
63bcba1bcf Update ReadMe.md 2022-12-08 00:55:14 -05:00
RogueMaster
c1fae1dce0 Merge branch 'ofwdev' into 420 2022-12-08 00:54:42 -05:00
Skorpionm
6a470a464e [FL-3002] SubGhz: add RPC error (#2097)
* [FL-3002] SubGhz: add RPC error
* RPC_APP: rpc_system_app_error_reset, automatic error reset when a new event is executed
* SubGhz: fix text error
* SubGhz: fix text error 2
* SubGhz: add error description
* Format sources

Co-authored-by: あく <alleteam@gmail.com>
2022-12-08 14:49:54 +09:00
RogueMaster
0a9e316bde Update version.py 2022-12-08 00:35:09 -05:00
RogueMaster
51c98adb88 RELEASE 2022-12-07 23:34:04 -05:00
RogueMaster
ae7054a338 Update ReadMe.md 2022-12-07 23:33:36 -05:00
RogueMaster
1e3eb7a429 fmt changes 2022-12-07 23:32:34 -05:00
RogueMaster
81de0d77f0 new ani 2022-12-07 23:30:55 -05:00
RogueMaster
d78484f158 remove old 2022-12-07 23:29:11 -05:00
RogueMaster
38f8883b81 Update README.md 2022-12-07 23:23:39 -05:00
RogueMaster
feb57d0779 IR TV Universal: Toshiba TV (2084) 2022-12-07 23:21:25 -05:00
RogueMaster
bddaf3cfe1 RELEASE 2022-12-07 19:23:20 -05:00
RogueMaster
29c4070d0b Update bad_usb_scene_file_select.c 2022-12-07 19:21:25 -05:00
RogueMaster
bc1f73801e Update bad_usb_scene_file_select.c 2022-12-07 19:20:18 -05:00
RogueMaster
9261e3cdcf Merge branch 'ofwdev' into 420 2022-12-07 19:16:33 -05:00
Mekare
2871759877 use FuriHalNfcADevData instead of using each of its fields in function calls 2022-12-07 22:24:44 +01:00
Mekare
72d9ad83dc mf_classic_get_classic_type: ATQA1 is used 2022-12-07 21:31:55 +01:00
Mekare
c7d60e5f11 mf_classic_check_card_type: ATQA1 is used 2022-12-07 21:19:35 +01:00
gornekich
c535b8f4ce [FL-3017], [FL-3018] Change NFC emulation screens (#2102)
* nfc: fix emulate uid view
* archive: hide dot files in apps
* nfc: fix other emulation scenes view
2022-12-08 01:47:55 +09:00