diff --git a/README.md b/README.md index 1784efc5..73e48856 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,8 @@ The following Visual Studio Code settings are available for the Arduino extensio "arduino.additionalUrls": [ "https://raw.githubusercontent.com/VSChina/azureiotdevkit_tools/master/package_azureboard_index.json", "http://arduino.esp8266.com/stable/package_esp8266com_index.json" - ] + ], + "arduino.defaultBaudRate": 115200, } ``` - `arduino.path` - Path to Arduino, you can use a custom version of Arduino by modifying this setting to include the full path. Example: `C:\\Program Files\\Arduino` for Windows, `/Applications` for Mac, `/home/$user/Downloads/arduino-1.8.1` for Linux. (Requires a restart after change). The default value is automatically detected from your Arduino IDE installation path. @@ -80,6 +81,7 @@ serialport-list -f jsonline ``` - `arduino.disableTestingOpen` - Disable/enable auto sending a test message to serial port for checking open status. The default value is `false` (a test message will be sent). - `arduino.skipHeaderProvider` - Enable/disable the extension providing completion items for headers. The functionality is included in newer versions of the C++ extension. The default value is `false`. +- `arduino.defaultBaudRate` - Default baud rate for serial port monitor. The default value is 115200. Supported values are 300, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 74880, 115200, 230400 and 250000. The following settings are per sketch settings of the Arduino extension. You can find them in `.vscode/arduino.json` under the workspace. diff --git a/package.json b/package.json index 9fb9e126..dc1587e1 100644 --- a/package.json +++ b/package.json @@ -458,6 +458,10 @@ "arduino.skipHeaderProvider": { "type": "boolean", "default": false + }, + "defaultBaudRate": { + "type": "number", + "default": 115200 } } }, diff --git a/src/arduino/arduinoSettings.ts b/src/arduino/arduinoSettings.ts index c22c952c..58419519 100644 --- a/src/arduino/arduinoSettings.ts +++ b/src/arduino/arduinoSettings.ts @@ -20,6 +20,7 @@ export interface IArduinoSettings { defaultLibPath: string; sketchbookPath: string; preferencePath: string; + defaultBaudRate: number; preferences: Map; reloadPreferences(): void; } @@ -33,6 +34,8 @@ export class ArduinoSettings implements IArduinoSettings { private _sketchbookPath: string; + private _defaultBaudRate: number; + private _preferences: Map; public constructor() { @@ -42,6 +45,7 @@ export class ArduinoSettings implements IArduinoSettings { const platform = os.platform(); this._commandPath = VscodeSettings.getInstance().commandPath; await this.tryResolveArduinoPath(); + await this.tryGetDefaultBaudRate(); if (platform === "win32") { await this.updateWindowsPath(); if (this._commandPath === "") { @@ -146,6 +150,10 @@ export class ArduinoSettings implements IArduinoSettings { return this._preferences; } + public get defaultBaudRate() { + return this._defaultBaudRate; + } + public reloadPreferences() { this._preferences = util.parseConfigFile(this.preferencePath); if (this.preferences.get("sketchbook.path")) { @@ -209,4 +217,14 @@ export class ArduinoSettings implements IArduinoSettings { this._arduinoPath = configValue; } } + + private async tryGetDefaultBaudRate(): Promise { + const supportBaudRates = [300, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 74880, 115200, 230400, 250000]; + const configValue = VscodeSettings.getInstance().defaultBaudRate; + if (!configValue || supportBaudRates.indexOf(configValue) === -1) { + this._defaultBaudRate = 0; + } else { + this._defaultBaudRate = configValue; + } + } } diff --git a/src/arduino/vscodeSettings.ts b/src/arduino/vscodeSettings.ts index d65e45db..a2fce5ab 100644 --- a/src/arduino/vscodeSettings.ts +++ b/src/arduino/vscodeSettings.ts @@ -13,6 +13,7 @@ const configKeys = { DISABLE_TESTING_OPEN: "arduino.disableTestingOpen", IGNORE_BOARDS: "arduino.ignoreBoards", SKIP_HEADER_PROVIDER: "arduino.skipHeaderProvider", + DEFAULT_BAUD_RATE: "arduino.defaultBaudRate", }; export interface IVscodeSettings { @@ -24,6 +25,7 @@ export interface IVscodeSettings { disableTestingOpen: boolean; ignoreBoards: string[]; skipHeaderProvider: boolean; + defaultBaudRate: number; updateAdditionalUrls(urls: string | string[]): void; } @@ -71,6 +73,10 @@ export class VscodeSettings implements IVscodeSettings { this.setConfigValue(configKeys.IGNORE_BOARDS, value, true); } + public get defaultBaudRate(): number { + return this.getConfigValue(configKeys.DEFAULT_BAUD_RATE); + } + public get skipHeaderProvider(): boolean { return this.getConfigValue(configKeys.SKIP_HEADER_PROVIDER); } diff --git a/src/serialmonitor/serialMonitor.ts b/src/serialmonitor/serialMonitor.ts index 492a3b56..c47a30c3 100644 --- a/src/serialmonitor/serialMonitor.ts +++ b/src/serialmonitor/serialMonitor.ts @@ -2,6 +2,7 @@ // Licensed under the MIT license. import * as vscode from "vscode"; +import ArduinoContext from "../arduinoContext"; import * as constants from "../common/constants"; import { DeviceContext } from "../deviceContext"; import * as Logger from "../logger/logger"; @@ -66,8 +67,9 @@ export class SerialMonitor implements vscode.Disposable { } public initialize() { + const defaultBaudRate = ArduinoContext.arduinoApp.settings.defaultBaudRate || SerialMonitor.DEFAULT_BAUD_RATE; this._outputChannel = vscode.window.createOutputChannel(SerialMonitor.SERIAL_MONITOR); - this._currentBaudRate = SerialMonitor.DEFAULT_BAUD_RATE; + this._currentBaudRate = defaultBaudRate; this._portsStatusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, constants.statusBarPriority.PORT); this._portsStatusBar.command = "arduino.selectSerialPort"; this._portsStatusBar.tooltip = "Select Serial Port"; @@ -82,7 +84,7 @@ export class SerialMonitor implements vscode.Disposable { this._baudRateStatusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, constants.statusBarPriority.BAUD_RATE); this._baudRateStatusBar.command = "arduino.changeBaudRate"; this._baudRateStatusBar.tooltip = "Baud Rate"; - this._baudRateStatusBar.text = SerialMonitor.DEFAULT_BAUD_RATE.toString(); + this._baudRateStatusBar.text = defaultBaudRate.toString(); this.updatePortListStatus(null); this._endingStatusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, constants.statusBarPriority.ENDING);