removed some compile errors and added vscode running

Milk-Cool · Oct 27, 2023 · d338f37 · d338f37
1 parent f6470df
commit d338f37
Show file tree

Hide file tree

Showing 6 changed files with 105 additions and 40 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,23 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "App launch",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceRoot}/out_${input:app_name}/${input:app_name}",
+            "cwd": "${workspaceFolder}"
+        }
+    ],
+    "inputs": [
+        {
+            "id": "app_name",
+            "description": "App name:",
+            "default": "example",
+            "type": "promptString"
+        }
+    ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -92,7 +92,8 @@
         "stop_token": "c",
         "streambuf": "c",
         "cinttypes": "c",
-        "inttypes.h": "c"
+        "inttypes.h": "c",
+        "notification.h": "c"
     },
     "[python]": {
         "editor.defaultFormatter": "ms-python.autopep8"

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,34 @@
+{
+    "tasks": [
+        {
+            "type": "cppbuild",
+            "label": "Build an application",
+            "command": "bash",
+            "args": [
+                "-i",
+                "-c",
+                "npm start ${input:app_folder}",
+            ],
+            "options": {
+                "cwd": "${fileDirname}"
+            },
+            "problemMatcher": [
+                "$gcc"
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "detail": "Task to build a Flippulator app."
+        }
+    ],
+    "inputs": [
+        {
+            "id": "app_folder",
+            "description": "App folder:",
+            "default": "test_app",
+            "type": "promptString"
+        }
+    ],
+    "version": "2.0.0"
+}
diff --git a/flipper/gui/view_port.c b/flipper/gui/view_port.c
@@ -6,42 +6,42 @@
 #include <furi.h>
 #include <flippulator_defines.h>
 
-static const InputKey view_port_input_mapping[ViewPortOrientationMAX][InputKeyMAX] = {
-    {InputKeyUp,
-     InputKeyDown,
-     InputKeyRight,
-     InputKeyLeft,
-     InputKeyOk,
-     InputKeyBack}, //ViewPortOrientationHorizontal
-    {InputKeyDown,
-     InputKeyUp,
-     InputKeyLeft,
-     InputKeyRight,
-     InputKeyOk,
-     InputKeyBack}, //ViewPortOrientationHorizontalFlip
-    {InputKeyRight,
-     InputKeyLeft,
-     InputKeyDown,
-     InputKeyUp,
-     InputKeyOk,
-     InputKeyBack}, //ViewPortOrientationVertical
-    {InputKeyLeft,
-     InputKeyRight,
-     InputKeyUp,
-     InputKeyDown,
-     InputKeyOk,
-     InputKeyBack}, //ViewPortOrientationVerticalFlip
-};
+// static const InputKey view_port_input_mapping[ViewPortOrientationMAX][InputKeyMAX] = {
+//     {InputKeyUp,
+//      InputKeyDown,
+//      InputKeyRight,
+//      InputKeyLeft,
+//      InputKeyOk,
+//      InputKeyBack}, //ViewPortOrientationHorizontal
+//     {InputKeyDown,
+//      InputKeyUp,
+//      InputKeyLeft,
+//      InputKeyRight,
+//      InputKeyOk,
+//      InputKeyBack}, //ViewPortOrientationHorizontalFlip
+//     {InputKeyRight,
+//      InputKeyLeft,
+//      InputKeyDown,
+//      InputKeyUp,
+//      InputKeyOk,
+//      InputKeyBack}, //ViewPortOrientationVertical
+//     {InputKeyLeft,
+//      InputKeyRight,
+//      InputKeyUp,
+//      InputKeyDown,
+//      InputKeyOk,
+//      InputKeyBack}, //ViewPortOrientationVerticalFlip
+// };
 
-static const InputKey view_port_left_hand_input_mapping[InputKeyMAX] =
-    {InputKeyDown, InputKeyUp, InputKeyLeft, InputKeyRight, InputKeyOk, InputKeyBack};
+// static const InputKey view_port_left_hand_input_mapping[InputKeyMAX] =
+//     {InputKeyDown, InputKeyUp, InputKeyLeft, InputKeyRight, InputKeyOk, InputKeyBack};
 
-static const CanvasOrientation view_port_orientation_mapping[ViewPortOrientationMAX] = {
-    [ViewPortOrientationHorizontal] = CanvasOrientationHorizontal,
-    [ViewPortOrientationHorizontalFlip] = CanvasOrientationHorizontalFlip,
-    [ViewPortOrientationVertical] = CanvasOrientationVertical,
-    [ViewPortOrientationVerticalFlip] = CanvasOrientationVerticalFlip,
-};
+// static const CanvasOrientation view_port_orientation_mapping[ViewPortOrientationMAX] = {
+//     [ViewPortOrientationHorizontal] = CanvasOrientationHorizontal,
+//     [ViewPortOrientationHorizontalFlip] = CanvasOrientationHorizontalFlip,
+//     [ViewPortOrientationVertical] = CanvasOrientationVertical,
+//     [ViewPortOrientationVerticalFlip] = CanvasOrientationVerticalFlip,
+// };
 
 ViewPort* view_port_alloc() {
     ViewPort* view_port = malloc(sizeof(ViewPort));

diff --git a/index.js b/index.js
@@ -8,6 +8,8 @@ const fs = require("fs");
 const { join } = require("path");
 const { tmpdir } = require("os");
 
+const file = process.argv[process.argv.length - 1];
+
 const rl = readline.createInterface({
     "input": process.stdin,
     "output": process.stdout
@@ -18,10 +20,15 @@ const question = text => new Promise(resolve => rl.question(text, resolve));
 const APP_COPY = "flippulator_app_copy";
 
 (async () => {
-    const folder = await question("Enter the application folder name: ");
-    if(!fs.existsSync(folder)) {
-        console.log("Folder does not exist!");
-        process.exit(1);
+    let folder;
+    if(fs.existsSync(file))
+        folder = file;
+    else {
+        const folder = await question("Enter the application folder name: ");
+        if(!fs.existsSync(folder)) {
+            console.log("Folder does not exist!");
+            process.exit(1);
+        }
     }
     if(!fs.existsSync(join(folder, "application.fam"))) {
         console.log("Manifest does not exist!");

diff --git a/lib/heatshrink b/lib/heatshrink