Commit Graph

1907 Commits

Author SHA1 Message Date
Willy-JL
4c86f7b2fb Fix external subrem 2023-05-31 17:22:47 +01:00
Willy-JL
c35406689b Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-05-31 16:45:55 +01:00
Tiernan Messmer
b18bf3eddb nfcv code review fixes 2023-05-31 17:14:06 +03:00
MX
6374474b25 fmt 2023-05-31 10:39:11 +03:00
MX
c0d80a4f83 Merge branch 'dev' into keeloq_move_mf_to_keystore 2023-05-31 10:38:28 +03:00
gid9798
a260465721 Prog_mode to custom_btn 2023-05-30 22:18:54 +03:00
gid9798
da4a8eb5c1 Merge branch 'UFW_dev' into lfrfid_t5577 2023-05-30 11:20:01 +03:00
gid9798
a4c1ad22ef Removing duplicate code in t5577 passwd clear 2023-05-29 22:15:07 +03:00
MX
0ab530e750 Merge branch 'ofw-dev' into dev 2023-05-29 20:33:12 +03:00
hedger
8d2ea14f06 [FL-3330] fbt: added hooks for build & dist environments; added FW_ORIGIN_* macro for apps & SDK (#2705)
* fbt: added hooks for build & dist environments
* Moved env hooks to an optional file
* Fixed var name
* Added fw origin to device info
* Bumped device info version
* fbt: added FIRMWARE_ORIGIN option. Different implementation for FW_ORIGIN_* C macro.
* api: bumped versions
* fbt: added fbt_options_local.py
* gitignore: cleanup

Co-authored-by: あく <alleteam@gmail.com>
2023-05-30 01:40:56 +09:00
あく
3de856f8d5 [FL-3295] FuriHal: add bus abstraction (#2614)
* FuriHal: add bus abstraction and port some subsystem to it
* Make PVS happy, cleanup code
* Update API symbols for f18
* F18: backport bus changes from f7
* Revert to STOP2 sleep mode
* Fix downgrading the firmware via updater
* Port iButton TIM1 to furi_hal_bus
* Port Infrared TIM1 and TIM2 to furi_hal_bus
* Just enable the timer bus
* Port furi_hal_pwm to bus API
* Fix include statement
* Port furi_hal_rfid to bus API
* Port furi_hal_subghz and others to bus API
* Remove unneeded include
* Improve furi_hal_infrared defines
* Reset LPTIM1 via furi_hal_bus API
* Crash when trying to enable an already enabled peripheral
* Better defines
* Improved checks
* Lots of macro wrappers
* Copy spi changes for f18
* Fix crashes in LFRFID system
* Fix crashes in NFC system
* Improve comments
* Create FuriHalBus.md
* Update FuriHalBus.md
* Fix crash when launching updater
* Documentation: couple small fixes in FuriHalBus
* FuriHal: fix copypaste in furi_hal_rfid_tim_reset
* FuriHal: reset radio core related peripherals on restart
* FuriHalBus: is enabled routine and bug fix for uart
* RFID HAL: accomodate furi hal bus

Co-authored-by: Georgii Surkov <georgii.surkov@outlook.com>
Co-authored-by: Georgii Surkov <37121527+gsurkov@users.noreply.github.com>
Co-authored-by: SG <who.just.the.doctor@gmail.com>
2023-05-30 01:05:57 +09:00
ClaraCrazy
b17f5be06c Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-05-29 16:25:18 +02:00
ClaraCrazy
31f624d662 Revert "Feature: Custom user set charging cap (#265)"
This reverts commit 557cc73a1d, reversing
changes made to 32fad4af8d.
2023-05-29 15:42:02 +02:00
micolous
363f555ed7 Implement support for reading Opal card (Sydney, Australia) (#2683)
* Implement support for reading Opal card (Sydney, Australia)
* stub_parser_verify_read: used UNUSED macro
* furi_hal_rtc: expose calendaring as functions
* opal: use bit-packed struct to parse, rather than manually shifting about
* Update f18 api symbols

Co-authored-by: あく <alleteam@gmail.com>
2023-05-29 20:55:55 +09:00
Sebastian Mauer
44426c7612 [LRFID] Add support for Nexkey/Nexwatch (#2680)
* [LRFID] Add support for Nexkey/Nexwatch
* Update protocol_nexwatch.c: Remove unnecessary check

Co-authored-by: SG <who.just.the.doctor@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2023-05-29 17:19:42 +09:00
Willy-JL
75b939ac76 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-05-29 08:07:55 +01:00
Willy-JL
3a21b12818 Move charge cap setting, more values, fix build 2023-05-28 21:04:25 +01:00
Willy-JL
9fe6dbe0cd Fix submodules 2023-05-28 20:37:50 +01:00
John
8becdc66e7 Feature: Custom user set charging cap 2023-05-28 21:12:00 +02:00
MX
7b426b936e Comment debug logs in digital signal
and comment some debug logs in nfc v
2023-05-28 19:24:21 +03:00
Willy-JL
7051917d36 Unload asset pack icons for external apps 2023-05-28 17:04:33 +01:00
Willy-JL
ce1e98eb4a Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-05-28 04:29:08 +01:00
MX
1e1b85a575 SecPlus 2.0 - Add new custom button
Fix issue with add manually
2023-05-28 04:18:32 +03:00
MX
c8d396f94b OFW PR 2680: RFID Add support for Nexkey/Nexwatch
by mauimauer
2023-05-28 02:49:29 +03:00
Willy-JL
fc56e39075 Preload extmainapps 2023-05-28 00:27:58 +01:00
Willy-JL
d325a1a43e Free file handle after elf load 2023-05-28 00:25:42 +01:00
Willy-JL
7e5b9f68c5 Add lock on boot setting 2023-05-27 02:54:41 +01:00
Willy-JL
decce5aa8d Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-05-26 19:33:56 +01:00
MX
3c452e6ddb Merge branch 'ofw-dev' into dev 2023-05-26 16:51:11 +03:00
Yukai Li
5f52382098 nfc: Mifare Ultralight C detection (#2668)
* nfc: Add Mifare Ultralight C detection
* nfc: Add display name for MFUL C and hide menu items
    MFUL C unlock and emulation currently not supported, so hide from menu
    if current card is MFUL C
* nfc: Also check response when probing 3DES auth
* nfc: Hide emulate option in saved menu for MFUL if not supported
* nfc: Remove unlock options from saved menu if Ultralight C


Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2023-05-26 22:19:10 +09:00
MX
612d58b4b2 Merge branch 'ofw-dev' into dev 2023-05-26 16:04:03 +03:00
hedger
4f054ed535 api: added toolbox/api_lock.h (#2702)
Co-authored-by: あく <alleteam@gmail.com>
2023-05-26 21:57:24 +09:00
Yukai Li
5a7cd203cd nfc: Fix MFUL tearing flags read (#2669)
Co-authored-by: gornekich <n.gorbadey@gmail.com>
2023-05-26 21:50:59 +09:00
MX
36102b8ee0 Merge branch 'ofw-dev' into dev 2023-05-26 12:03:49 +03:00
Georgii Surkov
ed1ebf9b93 [FL-3322] Infrared: respect carrier frequency and duty cycle settings (#2677)
* Make infrared_worker respect carrier frequency and duty cycle
* Update comments

Co-authored-by: あく <alleteam@gmail.com>
2023-05-25 23:38:56 +09:00
Willy-JL
805f14b996 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-05-22 14:27:27 +01:00
MX
aab4d2bd34 API CleanUp part 3 2023-05-22 03:45:17 +03:00
gid9798
8597169e14 Merge branch 'DarkFlippers:dev' into keeloq_move_mf_to_keystore 2023-05-21 23:44:22 +03:00
Willy-JL
20f55c956e Icons go brrr 2023-05-21 20:42:09 +01:00
Willy-JL
25ab52c681 Fix assets memory leak 2023-05-21 19:40:58 +01:00
Willy-JL
aa7cb42642 Only load xtreme on normal boot 2023-05-21 19:39:25 +01:00
Willy-JL
5dec3ed290 Remove xtreme assets struct 2023-05-20 21:42:33 +01:00
Willy-JL
79f36c2297 Swap assets system-wide 2023-05-20 21:20:14 +01:00
gid9798
2414346ec3 keeloq to kestore 2023-05-20 16:15:01 +03:00
Willy-JL
9ddff2a259 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-05-20 01:20:34 +01:00
gid9798
2af8f00d0d fix 2023-05-20 01:25:05 +03:00
gid9798
2309656120 clean up 2023-05-20 01:19:13 +03:00
gid9798
09527c3ab6 keeloq 2023-05-20 01:15:36 +03:00
MX
e7965c6d95 De-libify name changer 2023-05-19 06:33:15 +03:00
MX
a7ee5fea93 Name changer as service + extra checks 2023-05-19 04:33:14 +03:00