Commit Graph

922 Commits

Author SHA1 Message Date
VerstreuteSeele 294547f2a2 Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into dev 2022-12-25 07:39:05 +01:00
RogueMaster 309e78f1d6 remove dupe app 2022-12-25 01:32:44 -05:00
RogueMaster 7b02f26e82 Merge branch 'UNLEASHED' into 420 2022-12-25 01:31:22 -05:00
VerstreuteSeele e1021749b3 fixed stuff lol 2022-12-25 04:23:44 +01:00
VerstreuteSeele 5a60585f6f Updated Barcode, Subghz receiver & weather station app 2022-12-25 04:07:07 +01:00
MX 749a2f5977 Merge pull request #233 from eugene-kirzhanov/dev
Add 2048 game
2022-12-25 01:53:02 +03:00
MX 1481036abe Merge pull request #234 from gid9798/barcode_ean13
add EAN-13 support
2022-12-25 01:33:40 +03:00
VerstreuteSeele 64fdea5877 Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev 2022-12-24 19:16:14 +01:00
RogueMaster 5d9926be0a nrf24 fix 2022-12-24 06:59:56 -05:00
RogueMaster 05f8cf2492 4 minor updates 2022-12-24 01:52:18 -05:00
RogueMaster 9ee1322f8d FMT 2022-12-24 01:35:47 -05:00
RogueMaster 85e39b53a1 upd wifi marauder 2022-12-24 01:34:48 -05:00
MX 02369c8394 Merge branch 'fz-dev' into dev 2022-12-24 02:25:58 +03:00
VerstreuteSeele 5470ea940b Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev 2022-12-23 17:59:12 +01:00
RogueMaster 704306ae1a Merge branch 'ofwdev' into 420 2022-12-23 10:44:27 -05:00
あく b0970953b9 [FL-3067] WeatherStation: fix incorrect history index increment (#2186) 2022-12-23 22:46:35 +09:00
gid9798 4d9ecbacae Barcode generator: add EAN-13 support 2022-12-23 12:25:20 +03:00
VerstreuteSeele 005733b8af Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev 2022-12-23 00:59:47 +01:00
Eugene Kirzhanov a8541d5191 Games: Add 2048 game 2022-12-22 21:36:50 +03:00
RogueMaster 07184c2b6a NEW 2048 2022-12-22 12:16:13 -05:00
RogueMaster 95b34cd01c NRF24Scan UPD 2022-12-22 12:04:33 -05:00
VerstreuteSeele 434a26bd86 Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev 2022-12-21 23:20:39 +01:00
RogueMaster 1f0bc58450 fmt 2022-12-21 16:40:16 -05:00
RogueMaster 3d78b455c8 Update NRF24 Scanner v2.1 2022-12-21 16:39:28 -05:00
RogueMaster 4cb434fcf0 TOTP update 2022-12-21 16:37:07 -05:00
VerstreuteSeele 4d0a986dfd New Files for everyone 2022-12-21 22:03:12 +01:00
VerstreuteSeele 768548867d Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev 2022-12-21 19:09:36 +01:00
RogueMaster e5367086d8 Merge branch 'UNLEASHED' into 420 2022-12-21 10:53:00 -05:00
MX 488211b4d7 Update Unitemp
https://github.com/quen0n/unitemp-flipperzero/tree/dev
2022-12-21 14:23:26 +03:00
VerstreuteSeele 6136e386bd Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev 2022-12-20 20:39:35 +01:00
VerstreuteSeele 60cb4a971e Updating OFW 2022-12-20 20:35:25 +01:00
RogueMaster 7480d80321 Update nrf24scan.c 2022-12-20 14:34:15 -05:00
RogueMaster b32ae83436 Merge branch 'ofwdev' into 420 2022-12-20 10:14:17 -05:00
RogueMaster c1d9423c04 Merge branch 'UNLEASHED' into 420 2022-12-20 10:04:43 -05:00
Kowalski Dragon a9c2b4d6a0 Desktop: dummy mode improvements. Fixes: correct scrolling text, correct AM/PM in Clock. (#2160)
* Show passport instead of app if SD/app is missing 
* Desktop: cleanup dummy mode code and add more apps
* Gui: fix incorrect trimming in scrollable text

Signed-off-by: Kowalski Dragon (kowalski7cc) <kowalski7cc@users.noreply.github.com>
Co-authored-by: あく <alleteam@gmail.com>
2022-12-20 22:57:58 +09:00
MX 7e049d185f Merge branch 'fz-dev' into dev 2022-12-20 16:19:43 +03:00
gornekich 4cee550cc6 [FL-2809] Rework BLE key storage (#2154)
* bt: disconnect first on profile change
* bt keys: rework bt keys
* saved struct: add payload size getter to API
* bt: rework bt with new key storage API
* bt: add keys storage operation to bt API
* hid: save bt keys on sd card
* bt: add unit tests for key storage
* bt: working profile switch
* bt: cleanup
* bt hid: change keys storage path

Co-authored-by: あく <alleteam@gmail.com>
2022-12-20 21:32:24 +09:00
VerstreuteSeele 270aa4059c Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev 2022-12-20 07:03:02 +01:00
RogueMaster 971ef7915d NRF24 Scanner v2.0 2022-12-20 00:55:14 -05:00
VerstreuteSeele c02ce79f8c Application Galore 2022-12-20 06:28:52 +01:00
VerstreuteSeele 8c2a40a46b No, thanks 2022-12-20 05:47:51 +01:00
VerstreuteSeele ef94710988 Part 2 2022-12-20 05:19:41 +01:00
VerstreuteSeele 85b386afc5 Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev 2022-12-20 05:19:15 +01:00
RogueMaster 635dae23f1 Update application.fam 2022-12-19 23:05:22 -05:00
RogueMaster 341a3937c6 Updates from xMasterX (mostly)
Thanks to @xMasterX
2022-12-19 23:00:43 -05:00
VerstreuteSeele 586264f140 Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev 2022-12-20 04:35:07 +01:00
VerstreuteSeele 234b509411 Part 1 2022-12-20 04:34:21 +01:00
RogueMaster 013b51c025 Update ocarina.c 2022-12-19 22:06:00 -05:00
RogueMaster 015ae63205 fix ? 2022-12-19 22:03:42 -05:00
RogueMaster 3f5188fc6b fmt fixes 2022-12-19 21:44:21 -05:00