Commit Graph

907 Commits

Author SHA1 Message Date
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
VerstreuteSeele
005733b8af Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev 2022-12-23 00:59:47 +01: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
RogueMaster
8815f58e40 fix some sound crash issues in faps 2022-12-19 21:41:57 -05:00
RogueMaster
369ed2d844 Fix Music Beeper path 2022-12-19 21:21:32 -05:00
RogueMaster
929aea6a91 Fix some sound issues 2022-12-19 20:21:20 -05:00
RogueMaster
37a0e5463f Update music_beeper_worker.c 2022-12-19 20:04:52 -05:00
RogueMaster
700d0a060e Fix GPIO ordering 2022-12-19 18:55:23 -05:00
RogueMaster
da52c979a1 add gpio reader icon 2022-12-19 18:53:36 -05:00
RogueMaster
a2a510ee39 fix ordering for clock 2022-12-19 18:52:16 -05:00
VerstreuteSeele
1cf3626434 Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev 2022-12-20 00:20:35 +01:00
RogueMaster
fb8623935c subbrute upd 2022-12-19 18:04:16 -05:00
RogueMaster
b64c0e09cb Revert "Testing marauder +5 volt"
This reverts commit 9e2c3eb96d.
2022-12-19 17:45:33 -05:00
RogueMaster
45dd74cd96 Merge branch 'UNLEASHED' into 420 2022-12-19 17:44:58 -05:00
VerstreuteSeele
ad42d1e74f Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev 2022-12-19 23:40:39 +01:00
RogueMaster
469d91eb69 Update application.fam 2022-12-19 17:38:45 -05:00
RogueMaster
7302ee2554 Merge branch 'flipperdevices:dev' into 420 2022-12-19 17:36:45 -05:00
Kowalski Dragon
2bdc34274f Clock v1 (#1750) 2022-12-20 06:43:32 +09:00