Willy-JL
28a0a414b0
Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev
2024-06-02 02:34:01 +01:00
hedger
c93d164785
fbt, vscode: tweaks for cdb generation for clangd ( #3680 )
...
* fbt, vscode: tweaks for cdb generation for clangd
* .clangd: updated config
* vscode: disabled auto header insertion for clangd
* .clangd: updated config, ignoring format warnings
* Add sublime text project
* vscode: enabled clang-tidy for clangd
* clangd: strict include checks for sources only
Co-authored-by: あく <alleteam@gmail.com >
2024-06-01 13:20:51 +01:00
Willy-JL
94efe04132
Refactor asset packs to build properly with fbt
2023-11-12 05:39:24 +00:00
ClaraCrazy
3162a68580
Fix Gitignore
2023-07-24 14:46:17 +02:00
ClaraCrazy
3264c37e5b
Migrate asset packs folder
2023-07-24 13:54:32 +02:00
Willy-JL
c35406689b
Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev
2023-05-31 16:45:55 +01:00
hedger
8d2ea14f06
[FL-3330] fbt: added hooks for build & dist environments; added FW_ORIGIN_* macro for apps & SDK ( #2705 )
...
* fbt: added hooks for build & dist environments
* Moved env hooks to an optional file
* Fixed var name
* Added fw origin to device info
* Bumped device info version
* fbt: added FIRMWARE_ORIGIN option. Different implementation for FW_ORIGIN_* C macro.
* api: bumped versions
* fbt: added fbt_options_local.py
* gitignore: cleanup
Co-authored-by: あく <alleteam@gmail.com >
2023-05-30 01:40:56 +09:00
Willy-JL
c6fe511c1f
Remove NSFW pack
2023-05-25 08:16:52 +01:00
Willy-JL
8fa7d16c5f
Merge branch 'ul-dev' into xfw-dev
2023-05-06 01:43:09 +01:00
Sergey Gavrilov
a7d1ec03e8
[FL-3270] Loader refactoring, part 1 ( #2593 )
...
* Loader: menu part
* Settings: remove unused loader api
* Desktop: get loader from record_open
* CLI: remove unneeded loader api
* gitignore: ignore .old files
* Loader: now really a service
* Loader: working service prototype
* Loader: cli, system start hooks
* CI/CD: make happy
* Loader: autorun
* Loader: lock and unlock
* Loader: rearrange code
* Gui, module menu: fix memleak
* Updater test: add timeout
* added update timeouts and max run duration
* Github: revert updater test workflow changes
* Loader: less missleading message in info cli command
Co-authored-by: doomwastaken <k.volkov@flipperdevices.com >
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com >
2023-05-04 12:48:13 +09:00
Willy-JL
a5cddc076e
Merge branch 'ul-dev' into xfw-dev
2023-04-23 17:48:05 +01:00
MX
93035f07aa
Merge branch 'fz-dev' into dev
2023-04-10 18:41:51 +03:00
hedger
b9ccb274a7
ufbt: project & debugging updates ( #2572 )
...
* ufbt: removed warning in "channel=dev" update mode
* ufbt: removed API version warning; added get_blackmagic & get_apiversion targets
* ufbt: updater project template to include blackmagic & jlink targets
* ufbt: project template: fixes & updates
* ufbt: project template: added config update shortcut
* sdk: using fixed names for file components
2023-04-11 00:46:22 +10:00
Willy-JL
90e99fe794
Merge branch 'ul-dev' into xfw-dev
2023-04-07 23:40:28 +01:00
MX
bb8e1d8ee2
Merge branch 'fz-dev' into dev
2023-04-04 13:07:38 +03:00
Eric Betts
f98ac4c48a
Add more detail to saved info screen ( #2548 )
...
* Add more detail to saved info screen
* PR feedback
* Format sources and add pvs temp files to gitignore
Co-authored-by: あく <alleteam@gmail.com >
2023-04-04 11:21:43 +08:00
Willy-JL
39ddf75f91
Merge branch 'ul-dev' into xfw-dev
2023-03-14 01:07:01 +00:00
MX
68fed0e03d
Merge branch 'fz-dev' into dev
2023-03-09 21:17:57 +03:00
Michal Suchánek
780da7d4d5
Upside down / left handed orientation support ( #2462 )
...
* Add backup files to .gitignore
* Added lefty support in Settings > System > hand Orient: Fixes : #1015
* Left handed mode
* Fix lefthanded mode on vertical interfaces
* Input: new composite sequence identifier
* Gui: move input mapping from Canvas to ViewPort, properly handle input mapping on View switch in ViewDispatcher
* Rpc: proper input sequencing and tagging in RpcGui
* Rpc: remove magic from RpcGui
Co-authored-by: MrDaGree <5050898+MrDaGree@users.noreply.github.com >
Co-authored-by: Willy-JL <willy.leslie@icloud.com >
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com >
Co-authored-by: Sergey Gavrilov <who.just.the.doctor@gmail.com >
2023-03-10 02:13:18 +09:00
Willy-JL
fa8ed7f6e4
Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware
2023-02-28 20:34:44 +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
VerstreuteSeele
708dd167c8
Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into dev
2023-02-10 17:36:22 +01:00
Willy-JL
955e16b0ef
Move NSFW mode to an asset pack
2023-02-10 03:14:40 +00:00
Willy-JL
17db80794c
Better asset pack git ignore
2023-02-09 18:46:40 +00:00
VerstreuteSeele
9b81f93fd2
Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev
2023-02-07 19:12:13 +01:00
MX
f116e8165f
Merge branch 'fz-dev' into dev
2023-02-06 22:46:17 +03:00
Max Andreev
9f279ac872
[FL-2744] SPI Mem Manager C port ( #1860 )
...
Co-authored-by: あく <alleteam@gmail.com >
2023-02-06 23:03:29 +09:00
VerstreuteSeele
d1a357076c
Update .gitignore
2023-01-25 15:36:20 +01:00
MX
5d4dcc925d
Merge branch 'fz-dev' into dev
2023-01-03 18:42:03 +03:00
VerstreuteSeele
e0628d87fb
prepare for fancy stuff
2023-01-02 22:35:22 +01:00
Georgii Surkov
72dc8e95d0
Add .kateconfig and .kateproject to .gitignore ( #2237 )
2023-01-02 18:01:59 +09:00
VerstreuteSeele
06fd48dee9
Update .gitignore
2022-12-28 12:16:30 +01:00
jbohack
0b3771f401
ignore visual studio folders
2022-12-25 16:52:49 -05:00
VerstreuteSeele
9de00b6d60
Clock hotfix\nTesting new release style
2022-12-25 09:57:53 +01:00
VerstreuteSeele
e1021749b3
fixed stuff lol
2022-12-25 04:23:44 +01:00
VerstreuteSeele
b42d3d7a0f
No more RM animations
2022-12-23 02:12:14 +01: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
c045f19b04
Update .gitignore
2022-12-22 14:48:08 -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
4d6bcd2bdc
Update .gitignore
2022-12-21 16:36:25 -05:00
VerstreuteSeele
d5e1d1c8aa
Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev
2022-12-21 08:04:48 +01:00
RogueMaster
15ca7f6979
Update .gitignore
2022-12-20 23:49:40 -05:00
RogueMaster
750a9c04a3
Update .gitignore
2022-12-20 23:48:53 -05:00
VerstreuteSeele
e5d04eefda
Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev
2022-12-19 21:59:16 +01:00
RogueMaster
ccd5a0ffc6
Update .gitignore
2022-12-19 15:57:13 -05:00
ClaraCrazy
21e94c514a
Merge branch 'RogueMaster:420' into main
2022-12-18 22:34:36 +01:00
RogueMaster
60811d3d52
Update .gitignore
2022-12-18 16:30:06 -05:00
ClaraCrazy
aebbf7c1cb
Update .gitignore
2022-12-18 21:17:59 +01:00
MX
684fdc632f
Merge branch 'fz-dev' into dev
2022-11-10 06:57:08 +03:00
RogueMaster
b791127c54
Merge branch 'ofwdev' into 420
2022-11-07 16:54:25 -05:00