diff --git a/.gitignore b/.gitignore index 5fe00fe..c5df647 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ out node_modules .vscode-test/ *.vsix +package.json.bak diff --git a/i18n/eng/package.i18n.json b/i18n/eng/package.i18n.json index 66db502..ea9c997 100644 --- a/i18n/eng/package.i18n.json +++ b/i18n/eng/package.i18n.json @@ -1,25 +1,26 @@ -{ - "commands.category": "Arduino-CLI", - "commands.title.chooseBoard": "Choose board", - "commands.title.chooseDeploymentMethod": "Choose deployment method", - "commands.title.compile": "Compile", - "commands.title.deploy": "Deploy", - "commands.title.flash": "Flash", - "commands.title.chooseMonitorBoardConnection": "Choose monitor board connection", - "commands.title.redetectBoardConnections": "Redetect board connections", - "configuration.title.board": "Board", - "configuration.title.arduinoCli": "Arduino-CLI", - "configuration.description.alwaysDetectBoardConnections": "By default, board connections are redetected every time the list is shown, causing a perceptible delay before it appears. If you disable this, detection will occur once at startup and the list will appear instantly. This is fine until you change USB ports. If that happens, press `F1` and run `Arduino-CLI: Redetect Board Connections`.", - "configuration.description.board": "The type of Arduino you are using", - "configuration.description.verboseCompile": "Apply the `--verbose` option when compiling", - "configuration.description.verboseDeploy": "Apply the `--verbose` option when deploying", - "configuration.description.monitorBoardConnection": "Monitor board connection", - "configuration.description.deploymentMethod": "The hardware programmer or the USB serial port that will deploy compiled code to your Arduino", - "configuration.description.showButtons": "Show Compile and Deploy buttons on the toolbar", - "configuration.description.arduinoCliPath": "Absolute path to the Arduino-CLI executable", - "configuration.description.libraryCatalogueRefreshIntervalMonths": "The number of months between refreshes of your library catalogue.", - "configuration.description.warnAboutDetectionLag": "On startup, if `always detect board connections` is enabled, warn about the delay it causes.", - "warning.detectionLag.message": "Your system is configured to scan hardware every time, causing a perceptible delay before the board connection list appears. If you disable this in settings, detection will occur once at startup and the list will appear instantly, but you will need to manually refresh if you you connect with a different USB port.", - "warning.detectionLag.stopTellingMe": "I know, stop telling me", - "warning.detectionLag.close": "Close" +{ + "commands.category": "Arduino-CLI", + "commands.title.chooseBoard": "Choose board", + "commands.title.chooseDeploymentMethod": "Choose deployment method", + "commands.title.compile": "Compile", + "commands.title.deploy": "Deploy", + "commands.title.flash": "Flash", + "commands.title.chooseMonitorBoardConnection": "Choose monitor board connection", + "commands.title.redetectBoardConnections": "Redetect board connections", + "configuration.title.board": "Board", + "configuration.title.arduinoCli": "Arduino-CLI", + "configuration.description.alwaysDetectBoardConnections": "By default, board connections are redetected every time the list is shown, causing a perceptible delay before it appears. If you disable this, detection will occur once at startup and the list will appear instantly. This is fine until you change USB ports. If that happens, press `F1` and run `Arduino-CLI: Redetect Board Connections`.", + "configuration.description.board": "The type of Arduino you are using", + "configuration.description.verboseCompile": "Apply the `--verbose` option when compiling", + "configuration.description.verboseDeploy": "Apply the `--verbose` option when deploying", + "configuration.description.monitorBoardConnection": "Monitor board connection", + "configuration.description.deploymentMethod": "The hardware programmer or the USB serial port that will deploy compiled code to your Arduino", + "configuration.description.showButtons": "Show Compile and Deploy buttons on the toolbar", + "configuration.description.arduinoCliPath": "Absolute path to the Arduino-CLI executable", + "configuration.description.serialmonitorCliPath": "Absolute path to the Serial-Monitor executable", + "configuration.description.libraryCatalogueRefreshIntervalMonths": "The number of months between refreshes of your library catalogue.", + "configuration.description.warnAboutDetectionLag": "On startup, if `always detect board connections` is enabled, warn about the delay it causes.", + "warning.detectionLag.message": "Your system is configured to scan hardware every time, causing a perceptible delay before the board connection list appears. If you disable this in settings, detection will occur once at startup and the list will appear instantly, but you will need to manually refresh if you you connect with a different USB port.", + "warning.detectionLag.stopTellingMe": "I know, stop telling me", + "warning.detectionLag.close": "Close" } \ No newline at end of file diff --git a/package.json b/package.json index 3e2d35b..fe775ca 100644 --- a/package.json +++ b/package.json @@ -1,175 +1,180 @@ -{ - "name": "vscode-arduino-cli", - "displayName": "Arduino CLI integration", - "description": "Fixes the Serial problem. Does not require the Arduino IDE.", - "version": "0.0.2", - "icon": "chip-dark.png", - "author": { - "name": "Peter Wone", - "email": "peter.wone@outlook.com" - }, - "publisher": "pdconsec", - "repository": { - "type": "git", - "url": "https://github.com/PeterWone/vscode-arduino-cli" - }, - "engines": { - "vscode": "^1.49.3" - }, - "categories": [ - "Programming Languages" - ], - "activationEvents": [ - "workspaceContains:*.ino" - ], - "main": "./out/extension.js", - "contributes": { - "commands": [ - { - "category": "%commands.category%", - "command": "extension.compile", - "title": "%commands.title.compile%" - }, - { - "category": "%commands.category%", - "command": "extension.deploy", - "title": "%commands.title.deploy%" - }, - { - "category": "%commands.category%", - "command": "extension.flash", - "title": "%commands.title.flash%" - }, - { - "category": "%commands.category%", - "command": "extension.chooseDeploymentMethod", - "title": "%commands.title.chooseDeploymentMethod%" - }, - { - "category": "%commands.category%", - "command": "extension.chooseBoard", - "title": "%commands.title.chooseBoard%" - }, - { - "category": "%commands.category%", - "command": "extension.chooseLibraries", - "title": "%commands.title.chooseLibraries%" - }, - { - "category": "%commands.category%", - "command": "extension.chooseMonitorBoardConnection", - "title": "%commands.title.chooseMonitorBoardConnection%" - }, - { - "category": "%commands.category%", - "command": "extension.redetectBoardConnections", - "title": "%commands.title.redetectBoardConnections%" - } - ], - "menus": { - "editor/title": [ - { - "command": "extension.compile", - "group": "navigation", - "when": "showCompileAndDeployButtonsOnToolbar && resourceExtname == .ino" - }, - { - "command": "extension.deploy", - "group": "navigation", - "when": "showCompileAndDeployButtonsOnToolbar && resourceExtname == .ino" - }, - { - "command": "extension.flash", - "group": "navigation", - "when": "showFlashButtonOnToolbar && resourceExtname == .ino" - } - ] - }, - "configuration": [ - { - "title": "%configuration.title.arduinoCli%", - "properties": { - "arduinoCli.refreshIntervalLibraryCatalogueMonths": { - "type": "number", - "description": "%configuration.description.libraryCatalogueRefreshIntervalMonths%", - "default": 3 - }, - "arduinoCli.path": { - "type": "string", - "scope": "machine", - "description": "%configuration.description.arduinoCliPath%" - }, - "arduinoCli.selectedBoard": { - "type": "object", - "description": "%configuration.description.board%" - }, - "arduinoCli.selectedMonitorBoardConnection": { - "type": "object", - "description": "%configuration.description.monitorBoardConnection%" - }, - "arduinoCli.selectedDeploymentMethod": { - "type": "object", - "description": "%configuration.description.deploymentMethod%" - }, - "arduinoCli.showCompileAndDeployButtonsOnToolbar": { - "type": "boolean", - "description": "%configuration.description.showButtons%", - "default": true - }, - "arduinoCli.verboseCompile": { - "type": "boolean", - "markdownDescription": "%configuration.description.verboseCompile%", - "default": false - }, - "arduinoCli.verboseDeploy": { - "type": "boolean", - "markdownDescription": "%configuration.description.verboseDeploy%", - "default": false - }, - "arduinoCli.detection.alwaysDetectBoardConnections": { - "type": "boolean", - "markdownDescription": "%configuration.description.alwaysDetectBoardConnections%", - "default": true - }, - "arduinoCli.detection.warnAboutDetectionLag": { - "type": "boolean", - "markdownDescription": "%configuration.description.warnAboutDetectionLag%", - "default": true, - "when": false - } - } - } - ] - }, - "scripts": { - "vscode:prepublish": "npm run compile", - "compile": "tsc -p ./", - "watch": "tsc -watch -p ./", - "test": "npm run compile && node ./node_modules/vscode/bin/test" - }, - "devDependencies": { - "@types/glob": "^7.1.1", - "@types/mocha": "^5.2.7", - "@types/node": "^12.7.12", - "@types/vscode": "^1.49.0", - "glob": "^7.1.4", - "mocha": "^6.1.4", - "del": "^5.1.0", - "event-stream": "^4.0.1", - "gulp": "^4.0.2", - "gulp-filter": "^6.0.0", - "gulp-sourcemaps": "^2.6.5", - "gulp-typescript": "^5.0.1", - "run-sequence": "^2.2.1", - "tslint": "^5.20.0", - "typescript": "^3.6.4", - "vsce": "^1.67.1", - "vscode-nls-dev": "^3.3.1", - "vscode-test": "^1.4.0" - }, - "dependencies": { - "tree-kill": "^1.2.2", - "vscode-nls": "^4.1.1", - "vscode-nls-i18n": "^0.2.0" - } -} +{ + "name": "vscode-arduino-cli", + "displayName": "Arduino CLI integration", + "description": "Fixes the Serial problem. Does not require the Arduino IDE.", + "version": "0.0.5", + "icon": "chip-dark.png", + "author": { + "name": "Peter Wone", + "email": "peter.wone@outlook.com" + }, + "publisher": "pdconsec", + "repository": { + "type": "git", + "url": "https://github.com/PeterWone/vscode-arduino-cli" + }, + "engines": { + "vscode": "^1.49.3" + }, + "categories": [ + "Programming Languages" + ], + "activationEvents": [ + "workspaceContains:*.ino" + ], + "main": "./out/extension.js", + "contributes": { + "commands": [ + { + "category": "%commands.category%", + "command": "extension.compile", + "title": "%commands.title.compile%" + }, + { + "category": "%commands.category%", + "command": "extension.deploy", + "title": "%commands.title.deploy%" + }, + { + "category": "%commands.category%", + "command": "extension.flash", + "title": "%commands.title.flash%" + }, + { + "category": "%commands.category%", + "command": "extension.chooseDeploymentMethod", + "title": "%commands.title.chooseDeploymentMethod%" + }, + { + "category": "%commands.category%", + "command": "extension.chooseBoard", + "title": "%commands.title.chooseBoard%" + }, + { + "category": "%commands.category%", + "command": "extension.chooseLibraries", + "title": "%commands.title.chooseLibraries%" + }, + { + "category": "%commands.category%", + "command": "extension.chooseMonitorBoardConnection", + "title": "%commands.title.chooseMonitorBoardConnection%" + }, + { + "category": "%commands.category%", + "command": "extension.redetectBoardConnections", + "title": "%commands.title.redetectBoardConnections%" + } + ], + "menus": { + "editor/title": [ + { + "command": "extension.compile", + "group": "navigation", + "when": "showCompileAndDeployButtonsOnToolbar && resourceExtname == .ino" + }, + { + "command": "extension.deploy", + "group": "navigation", + "when": "showCompileAndDeployButtonsOnToolbar && resourceExtname == .ino" + }, + { + "command": "extension.flash", + "group": "navigation", + "when": "showFlashButtonOnToolbar && resourceExtname == .ino" + } + ] + }, + "configuration": [ + { + "title": "%configuration.title.arduinoCli%", + "properties": { + "arduinoCli.refreshIntervalLibraryCatalogueMonths": { + "type": "number", + "description": "%configuration.description.libraryCatalogueRefreshIntervalMonths%", + "default": 3 + }, + "arduinoCli.path": { + "type": "string", + "scope": "machine", + "description": "%configuration.description.arduinoCliPath%" + }, + "serialmonitorCli.path": { + "type": "string", + "scope": "machine", + "description": "%configuration.description.serialmonitorCliPath%" + }, + "arduinoCli.selectedBoard": { + "type": "object", + "description": "%configuration.description.board%" + }, + "arduinoCli.selectedMonitorBoardConnection": { + "type": "object", + "description": "%configuration.description.monitorBoardConnection%" + }, + "arduinoCli.selectedDeploymentMethod": { + "type": "object", + "description": "%configuration.description.deploymentMethod%" + }, + "arduinoCli.showCompileAndDeployButtonsOnToolbar": { + "type": "boolean", + "description": "%configuration.description.showButtons%", + "default": true + }, + "arduinoCli.verboseCompile": { + "type": "boolean", + "markdownDescription": "%configuration.description.verboseCompile%", + "default": false + }, + "arduinoCli.verboseDeploy": { + "type": "boolean", + "markdownDescription": "%configuration.description.verboseDeploy%", + "default": false + }, + "arduinoCli.detection.alwaysDetectBoardConnections": { + "type": "boolean", + "markdownDescription": "%configuration.description.alwaysDetectBoardConnections%", + "default": true + }, + "arduinoCli.detection.warnAboutDetectionLag": { + "type": "boolean", + "markdownDescription": "%configuration.description.warnAboutDetectionLag%", + "default": true, + "when": false + } + } + } + ] + }, + "scripts": { + "vscode:prepublish": "npm run compile", + "compile": "tsc -p ./", + "watch": "tsc -watch -p ./", + "test": "npm run compile && node ./node_modules/vscode/bin/test" + }, + "devDependencies": { + "@types/glob": "^7.1.1", + "@types/mocha": "^5.2.7", + "@types/node": "^12.7.12", + "@types/vscode": "^1.49.0", + "glob": "^7.1.4", + "mocha": "^6.1.4", + "del": "^5.1.0", + "event-stream": "^4.0.1", + "gulp": "^4.0.2", + "gulp-filter": "^6.0.0", + "gulp-sourcemaps": "^2.6.5", + "gulp-typescript": "^5.0.1", + "run-sequence": "^2.2.1", + "tslint": "^5.20.0", + "typescript": "^3.6.4", + "vsce": "^1.67.1", + "vscode-nls-dev": "^3.3.1", + "vscode-test": "^1.4.0" + }, + "dependencies": { + "tree-kill": "^1.2.2", + "vscode-nls": "^4.1.1", + "vscode-nls-i18n": "^0.2.0" + } +} diff --git a/package.nls.en.json b/package.nls.en.json index 7c9d113..98d0766 100644 --- a/package.nls.en.json +++ b/package.nls.en.json @@ -17,6 +17,7 @@ "configuration.description.deploymentMethod": "The hardware programmer or the USB serial port that will deploy compiled code to your Arduino", "configuration.description.showButtons": "Show Compile and Deploy buttons on the toolbar", "configuration.description.arduinoCliPath": "Absolute path to the Arduino-CLI executable", + "configuration.description.serialmonitorCliPath": "Absolute path to the Serial-Monitor executable", "configuration.description.libraryCatalogueRefreshIntervalMonths": "The number of months between refreshes of your library catalogue.", "configuration.description.warnAboutDetectionLag": "On startup, if `always detect board connections` is enabled, warn about the delay it causes.", "warning.detectionLag.message": "Your system is configured to scan hardware every time, causing a perceptible delay before the board connection list appears. If you disable this in settings, detection will occur once at startup and the list will appear instantly, but you will need to manually refresh if you you connect with a different USB port.", diff --git a/package.nls.fr.json b/package.nls.fr.json index e9b3770..be34d88 100644 --- a/package.nls.fr.json +++ b/package.nls.fr.json @@ -17,6 +17,7 @@ "configuration.description.deploymentMethod": "Le programmeur matériel ou le port de série USB qui déploiera le code compilé à votre Arduino", "configuration.description.showButtons": "Affichez les boutons Compiler et Déployer dans la barre d’outils", "configuration.description.arduinoCliPath": "Chemin absolu vers l’exécutable Arduino-CLI", + "configuration.description.serialmonitorCliPath": "Absolute path to the Serial-Monitor executable", "configuration.description.libraryCatalogueRefreshIntervalMonths": "Le nombre de mois entre les actualisations de votre catalogue des libs.", "configuration.description.warnAboutDetectionLag": "Au démarrage, si l’activation de `toujours détecter les connexions de carte`, avertissez-vous du retard qu’il provoque.", "warning.detectionLag.message": "Votre système est configuré pour analyser le matériel à chaque fois, ce qui entraîne un retard perceptible avant l’affichage de la liste de connexion du conseil. Si vous désactivez cela dans les paramètres, la détection se produira une fois au démarrage et la liste apparaîtra instantanément, mais vous devrez actualiser manuellement si vous vous connectez à un autre port USB.", diff --git a/package.nls.json b/package.nls.json index 2e092b9..182860d 100644 --- a/package.nls.json +++ b/package.nls.json @@ -1,25 +1,26 @@ -{ - "commands.category": "Arduino-CLI", - "commands.title.compile": "Compile", - "commands.title.deploy": "Deploy", - "commands.title.flash": "Flash", - "commands.title.chooseDeploymentMethod": "Choose deployment method", - "commands.title.chooseMonitorBoardConnection": "Choose monitor board connection", - "commands.title.redetectBoardConnections": "Redetect board connections", - "commands.title.chooseBoard": "Choose board", - "commands.title.chooseLibraries": "Choose libraries", - "configuration.title.arduinoCli": "Arduino-CLI", - "configuration.description.board": "The type of Arduino you are using", - "configuration.description.verboseCompile": "Apply the `--verbose` option when compiling", - "configuration.description.verboseDeploy": "Apply the `--verbose` option when deploying", - "configuration.description.monitorBoardConnection": "Monitor board connection", - "configuration.description.alwaysDetectBoardConnections": "By default, board connections are redetected every time the list is shown, causing a perceptible delay before it appears. If you disable this, detection will occur once at startup and the list will appear instantly. This is fine until you change USB ports. If that happens, press `F1` and run `Arduino-CLI: Redetect Board Connections`.", - "configuration.description.deploymentMethod": "The hardware programmer or the USB serial port that will deploy compiled code to your Arduino", - "configuration.description.showButtons": "Show Compile and Deploy buttons on the toolbar", - "configuration.description.arduinoCliPath": "Absolute path to the Arduino-CLI executable", - "configuration.description.libraryCatalogueRefreshIntervalMonths": "The number of months between refreshes of your library catalogue", - "configuration.description.warnAboutDetectionLag": "On startup, if `always detect board connections` is enabled, warn about the delay it causes.", - "warning.detectionLag.message": "Your system is configured to scan hardware every time, causing a perceptible delay before the board connection list appears. If you disable this in settings, detection will occur once at startup and the list will appear instantly, but you will need to manually refresh if you you connect with a different USB port.", - "warning.detectionLag.stopTellingMe": "I know, stop telling me", - "warning.detectionLag.close": "Close" +{ + "commands.category": "Arduino-CLI", + "commands.title.compile": "Compile", + "commands.title.deploy": "Deploy", + "commands.title.flash": "Flash", + "commands.title.chooseDeploymentMethod": "Choose deployment method", + "commands.title.chooseMonitorBoardConnection": "Choose monitor board connection", + "commands.title.redetectBoardConnections": "Redetect board connections", + "commands.title.chooseBoard": "Choose board", + "commands.title.chooseLibraries": "Choose libraries", + "configuration.title.arduinoCli": "Arduino-CLI", + "configuration.description.board": "The type of Arduino you are using", + "configuration.description.verboseCompile": "Apply the `--verbose` option when compiling", + "configuration.description.verboseDeploy": "Apply the `--verbose` option when deploying", + "configuration.description.monitorBoardConnection": "Monitor board connection", + "configuration.description.alwaysDetectBoardConnections": "By default, board connections are redetected every time the list is shown, causing a perceptible delay before it appears. If you disable this, detection will occur once at startup and the list will appear instantly. This is fine until you change USB ports. If that happens, press `F1` and run `Arduino-CLI: Redetect Board Connections`.", + "configuration.description.deploymentMethod": "The hardware programmer or the USB serial port that will deploy compiled code to your Arduino", + "configuration.description.showButtons": "Show Compile and Deploy buttons on the toolbar", + "configuration.description.arduinoCliPath": "Absolute path to the Arduino-CLI executable", + "configuration.description.serialmonitorCliPath": "Absolute path to the Serial-Monitor executable", + "configuration.description.libraryCatalogueRefreshIntervalMonths": "The number of months between refreshes of your library catalogue", + "configuration.description.warnAboutDetectionLag": "On startup, if `always detect board connections` is enabled, warn about the delay it causes.", + "warning.detectionLag.message": "Your system is configured to scan hardware every time, causing a perceptible delay before the board connection list appears. If you disable this in settings, detection will occur once at startup and the list will appear instantly, but you will need to manually refresh if you you connect with a different USB port.", + "warning.detectionLag.stopTellingMe": "I know, stop telling me", + "warning.detectionLag.close": "Close" } \ No newline at end of file diff --git a/vscode-arduino-cli.code-workspace b/vscode-arduino-cli.code-workspace new file mode 100644 index 0000000..81a074b --- /dev/null +++ b/vscode-arduino-cli.code-workspace @@ -0,0 +1,13 @@ +{ + "folders": [ + { + "path": "." + } + ], + "settings": { + "typescript.tsc.autoDetect": "off", + "files.associations": { + "*.yaml": "home-assistant" + } + } +} \ No newline at end of file