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

DarkFlippers · Jul 28, 2024 · 09597ca · 09597ca
2 parents 121b5e0 + 0223c23
commit 09597ca
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 26 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -8,6 +8,3 @@ charset = utf-8
 [*.{cpp,h,c,py,sh}]
 indent_style = space
 indent_size = 4
-
-[{Makefile,*.mk}]
-indent_size = tab
diff --git a/.vscode/example/tasks.json b/.vscode/example/tasks.json
@@ -75,29 +75,23 @@
             "type": "shell",
             "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)",
             "group": "build",
             "type": "shell",
             "command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash_usb"
         },
         {
-            "label": "[Debug:unit_tests] Flash (USB)",
+            "label": "[Debug] Flash (USB, w/o resources)",
             "group": "build",
             "type": "shell",
-            "command": "./fbt FIRMWARE_APP_SET=unit_tests FORCE=1 flash_usb_full"
+            "command": "./fbt FORCE=1 flash_usb"
         },
         {
-            "label": "[Debug] Flash (USB, with resources)",
+            "label": "[Debug:unit_tests] Flash (USB)",
             "group": "build",
             "type": "shell",
-            "command": "./fbt FORCE=1 flash_usb_full"
+            "command": "./fbt FIRMWARE_APP_SET=unit_tests FORCE=1 flash_usb_full"
         },
         {
             "label": "[Release] Flash (USB, with resources)",
@@ -106,16 +100,16 @@
             "command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash_usb_full"
         },
         {
-            "label": "[Debug] Create PVS-Studio report",
+            "label": "[Debug] Flash (USB, with resources)",
             "group": "build",
             "type": "shell",
-            "command": "./fbt firmware_pvs"
+            "command": "./fbt FORCE=1 flash_usb_full"
         },
         {
-            "label": "[Debug] Build FAPs",
+            "label": "[Debug] Create PVS-Studio report",
             "group": "build",
             "type": "shell",
-            "command": "./fbt fap_dist"
+            "command": "./fbt firmware_pvs"
         },
         {
             "label": "[Release] Build FAPs",
@@ -124,10 +118,10 @@
             "command": "./fbt COMPACT=1 DEBUG=0 fap_dist"
         },
         {
-            "label": "[Debug] Build App",
+            "label": "[Debug] Build FAPs",
             "group": "build",
             "type": "shell",
-            "command": "./fbt build APPSRC=${relativeFileDirname}"
+            "command": "./fbt fap_dist"
         },
         {
             "label": "[Release] Build App",
@@ -136,17 +130,23 @@
             "command": "./fbt COMPACT=1 DEBUG=0 build APPSRC=${relativeFileDirname}"
         },
         {
-            "label": "[Debug] Launch App on Flipper",
+            "label": "[Debug] Build App",
             "group": "build",
             "type": "shell",
-            "command": "./fbt launch APPSRC=${relativeFileDirname}"
+            "command": "./fbt build APPSRC=${relativeFileDirname}"
         },
         {
             "label": "[Release] Launch App on Flipper",
             "group": "build",
             "type": "shell",
             "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",
             "dependsOrder": "sequence",
@@ -157,16 +157,16 @@
             ]
         },
         {
-            "label": "[Debug] Build and upload all FAPs to Flipper over USB",
+            "label": "[Release] Build and upload all FAPs to Flipper over USB",
             "group": "build",
             "type": "shell",
-            "command": "./fbt fap_deploy"
+            "command": "./fbt COMPACT=1 DEBUG=0 fap_deploy"
         },
         {
-            "label": "[Release] Build and upload all FAPs to Flipper over USB",
+            "label": "[Debug] Build and upload all FAPs to Flipper over USB",
             "group": "build",
             "type": "shell",
-            "command": "./fbt COMPACT=1 DEBUG=0 fap_deploy"
+            "command": "./fbt fap_deploy"
         },
         {
             // Press Ctrl+] to quit
@@ -192,4 +192,4 @@
             }
         }
     ]
-}
+}