Skip to content

Commit

Permalink
remove unused code and update api dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
gcampbell-msft committed Jan 25, 2023
1 parent 94deda9 commit bb0bcd4
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 217 deletions.
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ This extension provides several commands in the Command Palette (<kbd>F1</kbd> o
| `arduino.enableUSBDetection` | Enable/disable USB detection from the VSCode Arduino extension. The default value is `true`. When your device is plugged in to your computer, it will pop up a message "`Detected board ****, Would you like to switch to this board type`". After clicking the `Yes` button, it will automatically detect which serial port (COM) is connected a USB device. If your device does not support this feature, please provide us with the PID/VID of your device; the code format is defined in `misc/usbmapping.json`.To learn more about how to list the vid/pid, use the following tools: https://github.com/EmergingTechnologyAdvisors/node-serialport `npm install -g serialport` `serialport-list -f jsonline`|
| `arduino.disableTestingOpen` | Enable/disable automatic sending of a test message to the serial port for checking the open status. The default value is `false` (a test message will be sent). |
| `arduino.skipHeaderProvider` | Enable/disable the extension providing completion items for headers. This functionality is included in newer versions of the C++ extension. The default value is `false`.|
| `arduino.defaultBaudRate` | Default baud rate for the serial port monitor. The default value is 115200. Supported values are 300, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 74880, 115200, 230400 and 250000 |
| `arduino.defaultTimestampFormat` | Format of timestamp printed before each line of Serial Monitor output. You can find list of all available placeholders [here](https://github.com/samsonjs/strftime#supported-specifiers). |
| `arduino.disableIntelliSenseAutoGen` | When `true` vscode-arduino will not auto-generate an IntelliSense configuration (i.e. `.vscode/c_cpp_properties.json`) by analyzing Arduino's compiler output. |
| `arduino.analyzeOnOpen` | When true, automatically run analysis when the project is opened. Only works when `arduino.analyzeOnSettingChange` is true. |
Expand All @@ -102,7 +101,6 @@ The following Visual Studio Code settings are available for the Arduino extensio
"https://raw.githubusercontent.com/VSChina/azureiotdevkit_tools/master/package_azureboard_index.json",
"http://arduino.esp8266.com/stable/package_esp8266com_index.json"
],
"arduino.defaultBaudRate": 115200
}
```
*Note:* You only need to set `arduino.path` in Visual Studio Code settings, other options are not required.
Expand Down
16 changes: 7 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 1 addition & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,7 @@
"onCommand:arduino.selectProgrammer",
"onCommand:arduino.selectSerialPort",
"onCommand:arduino.selectSketch",
"onCommand:arduino.changeBaudRate",
"onCommand:arduino.changeTimestampFormat",
"onCommand:arduino.openSerialMonitor",
"onCommand:arduino.sendMessageToSerialPort",
"onCommand:arduino.closeSerialMonitor",
"onCommand:arduino.changeBoardType",
"onCommand:arduino.showBoardConfig",
Expand Down Expand Up @@ -124,14 +121,6 @@
"command": "arduino.selectSerialPort",
"title": "Arduino: Select Serial Port"
},
{
"command": "arduino.changeBaudRate",
"title": "Arduino: Change Baud Rate"
},
{
"command": "arduino.changeTimestampFormat",
"title": "Arduino: Change Timestamp Format"
},
{
"command": "arduino.openSerialMonitor",
"title": "Arduino: Open Serial Monitor"
Expand Down Expand Up @@ -527,20 +516,11 @@
"type": "boolean",
"default": false
},
"arduino.defaultBaudRate": {
"type": "number",
"default": 115200
},
"arduino.disableIntelliSenseAutoGen": {
"type": "boolean",
"default": false,
"description": "When disabled vscode-arduino will not auto-generate an IntelliSense configuration (i.e. c_cpp_properties.json) by analyzing the compiler output."
},
"arduino.defaultTimestampFormat": {
"type": "string",
"default": "",
"markdownDescription": "Format of timestamp printed before each line of Serial Monitor output. You can find list of all available placeholders [here](https://github.com/samsonjs/strftime#supported-specifiers)."
},
"arduino.analyzeOnOpen": {
"type": "boolean",
"default": true,
Expand Down Expand Up @@ -604,7 +584,6 @@
"ms-vscode.vscode-serial-monitor"
],
"devDependencies": {
"@microsoft/vscode-serial-monitor-api": "0.1.3",
"@babel/core": "^7.15.5",
"@babel/preset-env": "^7.15.6",
"@types/compare-versions": "^3.0.0",
Expand Down Expand Up @@ -648,6 +627,7 @@
"webpack": "^4.44.1"
},
"dependencies": {
"@microsoft/vscode-serial-monitor-api": "^0.1.4",
"@vscode/extension-telemetry": "~0.6.2",
"body-parser": "^1.16.1",
"cocopa": "0.0.13",
Expand Down
35 changes: 0 additions & 35 deletions src/arduino/arduinoSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@ export interface IArduinoSettings {
defaultLibPath: string;
sketchbookPath: string;
preferencePath: string;
defaultBaudRate: number;
preferences: Map<string, string>;
useArduinoCli: boolean;
defaultTimestampFormat: string;
analyzeOnSettingChange: boolean;
reloadPreferences(): void;
}
Expand All @@ -36,14 +34,10 @@ export class ArduinoSettings implements IArduinoSettings {

private _sketchbookPath: string;

private _defaultBaudRate: number;

private _preferences: Map<string, string>;

private _useArduinoCli: boolean;

private _defaultTimestampFormat: string;

public constructor() {
}

Expand All @@ -52,8 +46,6 @@ export class ArduinoSettings implements IArduinoSettings {
this._commandPath = VscodeSettings.getInstance().commandPath;
this._useArduinoCli = VscodeSettings.getInstance().useArduinoCli;
await this.tryResolveArduinoPath();
await this.tryGetDefaultBaudRate();
await this.tryGetDefaultTimestampFormat();
if (platform === "win32") {
await this.updateWindowsPath();
if (this._commandPath === "") {
Expand Down Expand Up @@ -162,14 +154,6 @@ export class ArduinoSettings implements IArduinoSettings {
return this._useArduinoCli;
}

public get defaultBaudRate() {
return this._defaultBaudRate;
}

public get defaultTimestampFormat() {
return this._defaultTimestampFormat;
}

public get analyzeOnSettingChange(): boolean {
return VscodeSettings.getInstance().analyzeOnSettingChange;
}
Expand Down Expand Up @@ -237,23 +221,4 @@ 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;
}
}

private async tryGetDefaultTimestampFormat(): Promise<void> {
const configValue = VscodeSettings.getInstance().defaultTimestampFormat;
if (!configValue) {
this._defaultTimestampFormat = "";
} else {
this._defaultTimestampFormat = configValue;
}
}
}
12 changes: 0 additions & 12 deletions src/arduino/vscodeSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ const configKeys = {
DISABLE_TESTING_OPEN: "arduino.disableTestingOpen",
IGNORE_BOARDS: "arduino.ignoreBoards",
SKIP_HEADER_PROVIDER: "arduino.skipHeaderProvider",
DEFAULT_BAUD_RATE: "arduino.defaultBaudRate",
USE_ARDUINO_CLI: "arduino.useArduinoCli",
DISABLE_INTELLISENSE_AUTO_GEN: "arduino.disableIntelliSenseAutoGen",
DEFAULT_TIMESTAMP_FORMAT: "arduino.defaultTimestampFormat",
ANALYZE_ON_OPEN: "arduino.analyzeOnOpen",
ANALYZE_ON_SETTING_CHANGE: "arduino.analyzeOnSettingChange",
};
Expand All @@ -35,10 +33,8 @@ export interface IVscodeSettings {
disableTestingOpen: boolean;
ignoreBoards: string[];
skipHeaderProvider: boolean;
defaultBaudRate: number;
useArduinoCli: boolean;
disableIntelliSenseAutoGen: boolean;
defaultTimestampFormat: string;
analyzeOnOpen: boolean;
analyzeOnSettingChange: boolean;
updateAdditionalUrls(urls: string[]): void;
Expand Down Expand Up @@ -108,10 +104,6 @@ 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 useArduinoCli(): boolean {
return this.getConfigValue<boolean>(configKeys.USE_ARDUINO_CLI);
}
Expand All @@ -124,10 +116,6 @@ export class VscodeSettings implements IVscodeSettings {
return this.getConfigValue<boolean>(configKeys.DISABLE_INTELLISENSE_AUTO_GEN);
}

public get defaultTimestampFormat(): string {
return this.getConfigValue<string>(configKeys.DEFAULT_TIMESTAMP_FORMAT);
}

public get analyzeOnOpen(): boolean {
return this.getConfigValue<boolean>(configKeys.ANALYZE_ON_OPEN);
}
Expand Down
2 changes: 0 additions & 2 deletions src/common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ export const messages = {
export const statusBarPriority = {
PORT: 20,
OPEN_PORT: 30,
BAUD_RATE: 40,
TIMESTAMP_FORMAT: 50,
BOARD: 60,
ENDING: 70,
SKETCH: 80,
Expand Down
3 changes: 0 additions & 3 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,6 @@ export async function activate(context: vscode.ExtensionContext) {
context.subscriptions.push(serialMonitor);
registerNonArduinoCommand("arduino.selectSerialPort", () => serialMonitor.selectSerialPort());
registerNonArduinoCommand("arduino.openSerialMonitor", () => serialMonitor.openSerialMonitor());
//registerNonArduinoCommand("arduino.changeBaudRate", () => serialMonitor.changeBaudRate());
//registerNonArduinoCommand("arduino.changeTimestampFormat", () => serialMonitor.changeTimestampFormat());
//registerNonArduinoCommand("arduino.sendMessageToSerialPort", () => serialMonitor.sendMessageToSerialPort());
registerNonArduinoCommand("arduino.closeSerialMonitor", (port) => serialMonitor.closeSerialMonitor(port));

const completionProvider = new completionProviderModule.CompletionProvider();
Expand Down

0 comments on commit bb0bcd4

Please sign in to comment.