Skip to content
This repository was archived by the owner on Oct 1, 2024. It is now read-only.

add arduino.defaultBaudRate option #620

Merged
merged 5 commits into from
Jul 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand Down
4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,10 @@
"arduino.skipHeaderProvider": {
"type": "boolean",
"default": false
},
"defaultBaudRate": {
"type": "number",
"default": 115200
}
}
},
Expand Down
18 changes: 18 additions & 0 deletions src/arduino/arduinoSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export interface IArduinoSettings {
defaultLibPath: string;
sketchbookPath: string;
preferencePath: string;
defaultBaudRate: number;
preferences: Map<string, string>;
reloadPreferences(): void;
}
Expand All @@ -33,6 +34,8 @@ export class ArduinoSettings implements IArduinoSettings {

private _sketchbookPath: string;

private _defaultBaudRate: number;

private _preferences: Map<string, string>;

public constructor() {
Expand All @@ -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 === "") {
Expand Down Expand Up @@ -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")) {
Expand Down Expand Up @@ -209,4 +217,14 @@ export class ArduinoSettings implements IArduinoSettings {
this._arduinoPath = configValue;
}
}

private async tryGetDefaultBaudRate(): Promise<void> {
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;
}
}
}
6 changes: 6 additions & 0 deletions src/arduino/vscodeSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -24,6 +25,7 @@ export interface IVscodeSettings {
disableTestingOpen: boolean;
ignoreBoards: string[];
skipHeaderProvider: boolean;
defaultBaudRate: number;
updateAdditionalUrls(urls: string | string[]): void;
}

Expand Down Expand Up @@ -71,6 +73,10 @@ export class VscodeSettings implements IVscodeSettings {
this.setConfigValue(configKeys.IGNORE_BOARDS, value, true);
}

public get defaultBaudRate(): number {
return this.getConfigValue<number>(configKeys.DEFAULT_BAUD_RATE);
}

public get skipHeaderProvider(): boolean {
return this.getConfigValue<boolean>(configKeys.SKIP_HEADER_PROVIDER);
}
Expand Down
6 changes: 4 additions & 2 deletions src/serialmonitor/serialMonitor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand All @@ -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);
Expand Down