fafea4f2fa
Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev
2022-12-19 23:54:32 +01: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
5ae12ea073
Update ReadMe.md
2022-12-19 16:11:46 -05:00
3565a3c2ff
Merge pull request #6 from ClaraCrazy/Dev
...
Dev
2022-12-19 22:00:22 +01:00
e5d04eefda
Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev
2022-12-19 21:59:16 +01:00
6d265d164b
NFC - Part 2
2022-12-19 21:58:32 +01:00
ccd5a0ffc6
Update .gitignore
2022-12-19 15:57:13 -05:00
cea79f6610
Update mrtd.h
2022-12-19 15:55:36 -05: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
353f622357
Update readme.md
2022-12-19 21:36:42 +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
f19c9113b1
Weather App update
2022-12-19 20:30:30 +01:00
32401b5103
Merge pull request #5 from ClaraCrazy/Dev
...
Dev
2022-12-19 20:29:18 +01:00
dd0fcf12b2
Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev
2022-12-19 20:27:56 +01:00
b55a0508a4
Merge PR's
2022-12-19 20:27:02 +01:00
1e17516304
Update ReadMe.md
2022-12-19 14:26:26 -05:00
5bc2fb685c
Merge branch 'ofwdev' into 420
2022-12-19 14:26:06 -05:00
40fb9dec37
Merge pull request #4 from ClaraCrazy/Dev
...
Dev
2022-12-19 20:25:01 +01:00
921b47ac50
Merge branch 'fz-dev' into dev
2022-12-19 22:24:52 +03:00
5817871062
Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev
2022-12-19 20:24:18 +01:00
7450c8f38f
Update ReadMe.md
2022-12-19 14:23:51 -05:00
6162a16662
Merge branch 'ofwdev' into 420
2022-12-19 14:23:34 -05:00
14431a0eb4
Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev
2022-12-19 20:23:25 +01: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
ab6bf63016
Merge pull request #3 from ClaraCrazy/Dev
...
Dev
2022-12-19 20:22:44 +01:00
fcd26a074f
Update ReadMe.md
2022-12-19 14:21:40 -05: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
8234d29759
Update ReadMe.md
2022-12-19 14:10:47 -05:00
a844d83f0e
Update application.fam
2022-12-19 14:10:44 -05:00
128cca0613
Clock locale
2022-12-19 20:09:57 +01:00
11e3680b30
Merge pull request #2 from ClaraCrazy/Dev
...
Dev
2022-12-19 20:08:32 +01: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
84ba2690a5
GitHub: update unit_tests workflow steps to always re-flash device ( #2150 )
...
Co-authored-by: Konstantin Volkov <k.volkov@flipperdevices.com >
Co-authored-by: あく <alleteam@gmail.com >
2022-12-20 03:14:44 +09:00
50de358584
Merge branch 'ofwdev' into 420
2022-12-19 13:02:19 -05:00
8a426465c8
Merge branch 'UNLEASHED' into 420
2022-12-19 13:01:35 -05:00
de2334f314
Update Readme and changelog
2022-12-19 20:50:16 +03:00
1112056e85
Update readme.md
2022-12-19 18:31:19 +01:00
VerstreuteSeele