Mirrors/unleashed-firmware
2
0
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware synced 2024-09-20 06:31:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'OFW/dev' into dev

Browse source
This commit is contained in:
MX 2024-07-28 19:09:49 +03:00
commit 09597ca898
No known key found for this signature in database
GPG key ID: 7CCC66B7DBDD1C83
2 changed files with 29 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.editorconfig
View file

@ -8,6 +8,3 @@ charset = utf-8
[*.{cpp,h,c,py,sh}] [*.{cpp,h,c,py,sh}]
indent_style = space indent_style = space
indent_size = 4 indent_size = 4
[{Makefile,*.mk}]
indent_size = tab

56
.vscode/example/tasks.json vendored
View file

@ -75,48 +75,42 @@
"type": "shell", "type": "shell",
"command": "./fbt updater_all" "command": "./fbt updater_all"
}, },
{
"label": "[Debug] Flash (USB, w/o resources)",
"group": "build",
"type": "shell",
"command": "./fbt FORCE=1 flash_usb"
},
{ {
"label": "[Release] Flash (USB, w/o resources)", "label": "[Release] Flash (USB, w/o resources)",
"group": "build", "group": "build",
"type": "shell", "type": "shell",
"command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash_usb" "command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash_usb"
}, },
{
"label": "[Debug] Flash (USB, w/o resources)",
"group": "build",
"type": "shell",
"command": "./fbt FORCE=1 flash_usb"
},
{ {
"label": "[Debug:unit_tests] Flash (USB)", "label": "[Debug:unit_tests] Flash (USB)",
"group": "build", "group": "build",
"type": "shell", "type": "shell",
"command": "./fbt FIRMWARE_APP_SET=unit_tests FORCE=1 flash_usb_full" "command": "./fbt FIRMWARE_APP_SET=unit_tests FORCE=1 flash_usb_full"
}, },
{
"label": "[Debug] Flash (USB, with resources)",
"group": "build",
"type": "shell",
"command": "./fbt FORCE=1 flash_usb_full"
},
{ {
"label": "[Release] Flash (USB, with resources)", "label": "[Release] Flash (USB, with resources)",
"group": "build", "group": "build",
"type": "shell", "type": "shell",
"command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash_usb_full" "command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash_usb_full"
}, },
{
"label": "[Debug] Flash (USB, with resources)",
"group": "build",
"type": "shell",
"command": "./fbt FORCE=1 flash_usb_full"
},
{ {
"label": "[Debug] Create PVS-Studio report", "label": "[Debug] Create PVS-Studio report",
"group": "build", "group": "build",
"type": "shell", "type": "shell",
"command": "./fbt firmware_pvs" "command": "./fbt firmware_pvs"
}, },
{
"label": "[Debug] Build FAPs",
"group": "build",
"type": "shell",
"command": "./fbt fap_dist"
},
{ {
"label": "[Release] Build FAPs", "label": "[Release] Build FAPs",
"group": "build", "group": "build",
@ -124,10 +118,10 @@
"command": "./fbt COMPACT=1 DEBUG=0 fap_dist" "command": "./fbt COMPACT=1 DEBUG=0 fap_dist"
}, },
{ {
"label": "[Debug] Build App", "label": "[Debug] Build FAPs",
"group": "build", "group": "build",
"type": "shell", "type": "shell",
"command": "./fbt build APPSRC=${relativeFileDirname}" "command": "./fbt fap_dist"
}, },
{ {
"label": "[Release] Build App", "label": "[Release] Build App",
@ -136,10 +130,10 @@
"command": "./fbt COMPACT=1 DEBUG=0 build APPSRC=${relativeFileDirname}" "command": "./fbt COMPACT=1 DEBUG=0 build APPSRC=${relativeFileDirname}"
}, },
{ {
"label": "[Debug] Launch App on Flipper", "label": "[Debug] Build App",
"group": "build", "group": "build",
"type": "shell", "type": "shell",
"command": "./fbt launch APPSRC=${relativeFileDirname}" "command": "./fbt build APPSRC=${relativeFileDirname}"
}, },
{ {
"label": "[Release] Launch App on Flipper", "label": "[Release] Launch App on Flipper",
@ -147,6 +141,12 @@
"type": "shell", "type": "shell",
"command": "./fbt COMPACT=1 DEBUG=0 launch APPSRC=${relativeFileDirname}" "command": "./fbt COMPACT=1 DEBUG=0 launch APPSRC=${relativeFileDirname}"
}, },
{
"label": "[Debug] Launch App on Flipper",
"group": "build",
"type": "shell",
"command": "./fbt launch APPSRC=${relativeFileDirname}"
},
{ {
"label": "[Debug] Launch App on Flipper with Serial Console", "label": "[Debug] Launch App on Flipper with Serial Console",
"dependsOrder": "sequence", "dependsOrder": "sequence",
@ -156,18 +156,18 @@
"Serial Console" "Serial Console"
] ]
}, },
{
"label": "[Debug] Build and upload all FAPs to Flipper over USB",
"group": "build",
"type": "shell",
"command": "./fbt fap_deploy"
},
{ {
"label": "[Release] Build and upload all FAPs to Flipper over USB", "label": "[Release] Build and upload all FAPs to Flipper over USB",
"group": "build", "group": "build",
"type": "shell", "type": "shell",
"command": "./fbt COMPACT=1 DEBUG=0 fap_deploy" "command": "./fbt COMPACT=1 DEBUG=0 fap_deploy"
}, },
{
"label": "[Debug] Build and upload all FAPs to Flipper over USB",
"group": "build",
"type": "shell",
"command": "./fbt fap_deploy"
},
{ {
// Press Ctrl+] to quit // Press Ctrl+] to quit
"label": "Serial Console", "label": "Serial Console",