From d338f37ed751668a6949ccb9935e5c2a5de55471 Mon Sep 17 00:00:00 2001 From: Milk-Cool Date: Fri, 27 Oct 2023 11:07:14 +0300 Subject: [PATCH] removed some compile errors and added vscode running --- .vscode/launch.json | 23 ++++++++++++++ .vscode/settings.json | 3 +- .vscode/tasks.json | 34 +++++++++++++++++++++ flipper/gui/view_port.c | 68 ++++++++++++++++++++--------------------- index.js | 15 ++++++--- lib/heatshrink | 2 +- 6 files changed, 105 insertions(+), 40 deletions(-) create mode 100644 .vscode/launch.json create mode 100644 .vscode/tasks.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..fa2c5d3 --- /dev/null +++ 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" + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 620481f..162f3c7 100644 --- 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 new file mode 100644 index 0000000..6db1610 --- /dev/null +++ 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" +} \ No newline at end of file diff --git a/flipper/gui/view_port.c b/flipper/gui/view_port.c index ddd7200..9f9eee1 100644 --- a/flipper/gui/view_port.c +++ b/flipper/gui/view_port.c @@ -6,42 +6,42 @@ #include #include -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 index d1f19ca..081019f 100644 --- 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 index 95263f4..1f98c0d 160000 --- a/lib/heatshrink +++ b/lib/heatshrink @@ -1 +1 @@ -Subproject commit 95263f49a9393c00f2325b13f1e5072503eb4774 +Subproject commit 1f98c0d01c920e675e48208b45671d18c46cfb94