586264f140
Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev
2022-12-20 04:35:07 +01:00
234b509411
Part 1
2022-12-20 04:34:21 +01:00
013b51c025
Update ocarina.c
2022-12-19 22:06:00 -05:00
015ae63205
fix ?
2022-12-19 22:03:42 -05:00
3f5188fc6b
fmt fixes
2022-12-19 21:44:21 -05:00
8815f58e40
fix some sound crash issues in faps
2022-12-19 21:41:57 -05:00
369ed2d844
Fix Music Beeper path
2022-12-19 21:21:32 -05:00
929aea6a91
Fix some sound issues
2022-12-19 20:21:20 -05:00
37a0e5463f
Update music_beeper_worker.c
2022-12-19 20:04:52 -05:00
700d0a060e
Fix GPIO ordering
2022-12-19 18:55:23 -05:00
da52c979a1
add gpio reader icon
2022-12-19 18:53:36 -05:00
a2a510ee39
fix ordering for clock
2022-12-19 18:52:16 -05:00
1cf3626434
Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev
2022-12-20 00:20:35 +01:00
fb8623935c
subbrute upd
2022-12-19 18:04:16 -05:00
b64c0e09cb
Revert "Testing marauder +5 volt"
...
This reverts commit 9e2c3eb96d
2022-12-19 17:45:33 -05:00
45dd74cd96
Merge branch 'UNLEASHED' into 420
2022-12-19 17:44:58 -05:00
ad42d1e74f
Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev
2022-12-19 23:40:39 +01:00
469d91eb69
Update application.fam
2022-12-19 17:38:45 -05:00
7302ee2554
Merge branch 'flipperdevices:dev' into 420
2022-12-19 17:36:45 -05:00
2bdc34274f
Clock v1 ( #1750 )
2022-12-20 06:43:32 +09:00
792ec90d86
Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev
2022-12-19 21:52:58 +01:00
84c2161a6a
Merge branch 'flipperdevices:dev' into 420
2022-12-19 15:50:52 -05:00
4ed4ea7f4d
NFC
2022-12-19 21:46:36 +01:00
842ba616ee
Merge branch 'fz-dev' into dev
2022-12-19 23:34:35 +03:00
9e2c3eb96d
Testing marauder +5 volt
2022-12-19 23:33:11 +03:00
fa87216a1e
[FL-2970] Untangle NFC_APP_FOLDER from nfc_device ( #2124 )
...
* Untangle NFC_APP_FOLDER from nfc_device
* Make the folder an internal part of the nfc device struct
* Move the NFC folder definition to the nfc allocator
* Move the NFC folder definition to the allocator in the nfc magic FAP
* Replace furi_string_printf with furi_string_set for folder allocation and handle the cases when folder has no slashes
* Build and allocation fixes
Co-authored-by: あく <alleteam@gmail.com >
2022-12-20 04:57:48 +09:00
dd0fcf12b2
Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev
2022-12-19 20:27:56 +01:00
5bc2fb685c
Merge branch 'ofwdev' into 420
2022-12-19 14:26:06 -05:00
921b47ac50
Merge branch 'fz-dev' into dev
2022-12-19 22:24:52 +03:00
a81a5ca57c
[FL-3052] WS: add choice fahrenheit/celsius ( #2149 )
...
* WS: add choice fahrenheit/celsius
* WS: fix syntax
Co-authored-by: あく <alleteam@gmail.com >
2022-12-20 04:22:57 +09:00
5c073408cf
Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev
2022-12-19 20:19:55 +01:00
51bccd298a
Update application.fam
2022-12-19 14:18:54 -05:00
a844d83f0e
Update application.fam
2022-12-19 14:10:44 -05:00
5fb5ab9f2d
Merge branch 'UNLEASHED' into 420
2022-12-19 14:06:17 -05:00
42a0dc2d5f
Let Clock use locale settings
2022-12-19 20:05:36 +01:00
007bde1a8a
Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev
2022-12-19 20:05:12 +01:00
577334a394
Fix sound issues in multiple apps
2022-12-19 21:55:06 +03:00
8a426465c8
Merge branch 'UNLEASHED' into 420
2022-12-19 13:01:35 -05:00
d5624cd842
Merge branch 'dev' into unitemp
2022-12-19 20:24:14 +03:00
ca72a4f225
Drop AM2320 and DHT Monitor plugins
2022-12-19 20:21:40 +03:00
453666192c
DHT monitor remove
2022-12-19 20:16:33 +03:00
cbc9720738
New plugin: Unitemp
2022-12-19 20:16:02 +03:00
cefff35661
Move submenu_set_selected_item
2022-12-19 20:07:07 +03:00
07b9e691d9
First Locale integration
2022-12-19 17:57:39 +01:00
383752072d
Merge (Dev Commits)[ https://github.com/flipperdevices/flipperzero-firmware/commits/dev ]
2022-12-19 17:45:02 +01:00
6dbe0de18d
Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev
2022-12-19 16:56:40 +01:00
352bc73662
Orgasmatron Icon
2022-12-19 16:56:25 +01:00
8a09ac2569
Update SubGhz Bruteforcer
2022-12-19 18:45:27 +03:00
94e7bb7fe3
Add mouse jiggler to USB Keyboard&Mouse App
2022-12-19 17:56:13 +03:00
da32d252db
Clock - use system locale settings
2022-12-19 17:54:59 +03:00
VerstreuteSeele