yocvito
6de0470b4d
Merge remote-tracking branch 'upstream/dev' into badusb-ble
2023-02-12 00:33:42 +01:00
yocvito
796930b12c
remove useless func
2023-02-12 00:28:03 +01:00
Willy-JL
0e50bf9707
Sort order wording (again)
2023-02-11 22:58:35 +00:00
VerstreuteSeele
f385a9b531
wording
2023-02-11 23:31:55 +01:00
VerstreuteSeele
409a79ddee
Fix chat & subghz settings
2023-02-11 23:27:21 +01:00
jbohack
73a9425f73
added the common pager frequency to the frequency list
2023-02-11 15:20:34 -05:00
jbohack
462836346e
added pager modulation for restaurant pagers
...
credit to jimi for the modulation :)
2023-02-11 15:16:09 -05:00
Willy-JL
9ed14fe773
Remove unused imports and old code
2023-02-11 20:07:53 +00:00
jbohack
2455cc0c75
added pager modulation back
...
modulation made by jimi
2023-02-11 14:56:50 -05:00
MX
a4c28ed5bf
Show internal memory only in DEBUG mode + other fixes
...
Remove unused imports and remove my old code that used to hide layouts and tmp history folders, this was removed in dev but somehow was added back here
2023-02-11 21:59:22 +03:00
MX
b8deb931c2
Merge branch 'dev' into filebrowser
2023-02-11 21:47:21 +03:00
Willy-JL
99b126f0ef
Fix archive tab switch code
2023-02-11 17:34:43 +00:00
MX
9d2297410e
fbt format
2023-02-11 18:28:58 +03:00
VerstreuteSeele
371f3b3869
De-xtreme-ify the code
2023-02-11 16:13:49 +01:00
VerstreuteSeele
6b99999566
Update browser
2023-02-11 15:49:00 +01:00
Clara K
11f3464e1b
Update archive_browser_view.h
2023-02-11 15:41:18 +01:00
Clara K
e5bef61364
Update archive_browser_view.c
2023-02-11 15:40:46 +01:00
Clara K
c0afbf659a
Update archive_browser.h
2023-02-11 15:40:11 +01:00
Clara K
a6dc16a98c
Add Internal Tab
2023-02-11 15:39:30 +01:00
jbohack
6800a12ab4
Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into dev
2023-02-11 01:02:53 -05:00
jbohack
a708164dac
added pager to subghz frequency analyzer in subghz settings
...
subghz frequency changes are hardcoded in the firmware for app loading times so this is needed
2023-02-11 01:02:37 -05:00
Willy-JL
537edb151c
Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into badusb-ble
2023-02-11 05:54:09 +00:00
Willy-JL
786ea60af9
Nightstand clock tweaks
2023-02-11 05:53:56 +00:00
Willy-JL
c627c1caf0
Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into badusb-ble
2023-02-11 05:20:57 +00:00
Willy-JL
efb11dfcbd
Properly integrate xtreme apis and headers
2023-02-11 05:19:37 +00:00
Willy-JL
9cf68935e8
Remove testing code
2023-02-11 05:03:01 +00:00
Willy-JL
ae9e15604e
Bring back status bar as xfw setting
2023-02-11 04:30:26 +00:00
Willy-JL
48cd89b904
Setting name capitalization fix
2023-02-11 04:26:44 +00:00
Willy-JL
f075fa1f84
Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into xfw-dev
2023-02-11 04:26:03 +00:00
Willy-JL
a90c6f44d7
Expose xtreme_settings api import for other apps
2023-02-11 04:25:57 +00:00
VerstreuteSeele
ff90b9db8d
Naming
...
fucking bs, i swear
2023-02-11 04:41:31 +01:00
VerstreuteSeele
2db0cae428
clara wants her nightstand
2023-02-11 04:35:13 +01:00
Willy-JL
0127b87b0d
Keep SFW and NSFW asset packs first
2023-02-11 00:43:03 +00:00
Willy-JL
1ccfc608c7
Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into badusb-ble
2023-02-10 21:59:48 +00:00
VerstreuteSeele
1ab7b893ee
subghz != subghz | same name, entirely different place = no good
2023-02-10 22:53:37 +01:00
Willy-JL
e644b97cf0
Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into badusb-ble
2023-02-10 20:58:15 +00:00
Willy-JL
6555082e2a
Revert "Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into dev"
...
This reverts commit 708dd167c8 .
2023-02-10 20:50:30 +00:00
MX
db012807f5
Merge branch 'fz-dev' into dev
2023-02-10 22:53:51 +03:00
yocvito
fa003f7816
merge
2023-02-10 20:05:47 +01:00
yocvito
f5219db3fc
Adds LED state report characteristic into bt GATT hid service (for now writing by host isn't working)
2023-02-10 20:04:45 +01:00
VerstreuteSeele
708dd167c8
Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into dev
2023-02-10 17:36:22 +01:00
VerstreuteSeele
5b1fe0caa0
Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into dev
2023-02-10 17:30:12 +01:00
VerstreuteSeele
e7d01998c1
Update subghz
2023-02-10 17:29:45 +01:00
VerstreuteSeele
792d58c4cb
Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev
2023-02-10 17:15:39 +01:00
MX
97087fadb9
Merge pull request #316 from notmarek/dev
...
Fix CTRL-SHIFT in mousejacker
2023-02-10 16:51:51 +03:00
Pierce
3eacb0c715
Fixed typo in nfc_magic_scene_wrong_card.c ( #2382 )
2023-02-10 21:52:53 +09:00
Willy-JL
f263249016
Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into badusb-ble
2023-02-10 10:09:42 +00:00
Willy-JL
9b80cec2fa
Add internal flash browser tab
2023-02-10 10:09:28 +00:00
Willy-JL
3234273c9a
Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into badusb-ble
2023-02-10 09:54:53 +00:00
Willy-JL
a1d1e2a5a2
Format
2023-02-10 08:56:07 +00:00