Skip to content

Commit 77c9d60

Browse files
committed
remove built-in serialport bar
1 parent 81f12d9 commit 77c9d60

2 files changed

Lines changed: 4 additions & 123 deletions

File tree

src/EIDEProject.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2864,7 +2864,8 @@ class EIDEProject extends AbstractProject {
28642864
"zixuanwang.linkerscript",
28652865
"redhat.vscode-yaml",
28662866
"IBM.output-colorizer",
2867-
"cschlosser.doxdocgen"
2867+
"cschlosser.doxdocgen",
2868+
"ms-vscode.vscode-serial-monitor"
28682869
];
28692870

28702871
const prjInfo = this.GetConfiguration().config;

src/extension.ts

Lines changed: 2 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,10 @@ export async function activate(context: vscode.ExtensionContext) {
111111
subscriptions.push(vscode.commands.registerCommand('eide.c51ToSdcc', () => c51ToSDCC()));
112112
subscriptions.push(vscode.commands.registerCommand('eide.ReloadJlinkDevs', () => reloadJlinkDevices()));
113113
subscriptions.push(vscode.commands.registerCommand('eide.ReloadStm8Devs', () => reloadStm8Devices()));
114-
subscriptions.push(vscode.commands.registerCommand('eide.selectBaudrate', () => onSelectSerialBaudrate()));
115114
subscriptions.push(vscode.commands.registerCommand('eide.create.clang-format.file', () => newClangFormatFile()));
116115

117116
// internal command
118-
subscriptions.push(vscode.commands.registerCommand('_cl.eide.selectCurSerialName', () => onSelectCurSerialName()));
117+
// TODO
119118

120119
// operations
121120
const operationExplorer = new OperationExplorer(context);
@@ -321,11 +320,6 @@ function postLaunchHook(extensionCtx: vscode.ExtensionContext) {
321320
// internal vsc-commands funcs
322321
//////////////////////////////////////////////////
323322

324-
let serial_curPort: string | undefined;
325-
let serial_nameBar: vscode.StatusBarItem | undefined;
326-
let serial_baudBar: vscode.StatusBarItem | undefined;
327-
let serial_openBar_args: string[] = [<any>null];
328-
329323
function ShowUUID() {
330324
vscode.window.showInputBox({
331325
value: platform.GetUUID()
@@ -344,18 +338,6 @@ function reloadStm8Devices() {
344338
}
345339
}
346340

347-
function updateSerialportBarState() {
348-
if (SettingManager.GetInstance().isShowSerialportStatusbar()) {
349-
StatusBarManager.getInstance().show('serialport');
350-
StatusBarManager.getInstance().show('serialport-name');
351-
StatusBarManager.getInstance().show('serialport-baud');
352-
} else {
353-
StatusBarManager.getInstance().hide('serialport');
354-
StatusBarManager.getInstance().hide('serialport-name');
355-
StatusBarManager.getInstance().hide('serialport-baud');
356-
}
357-
}
358-
359341
async function newClangFormatFile() {
360342

361343
let root = WorkspaceManager.getInstance().getWorkspaceRoot();
@@ -375,56 +357,6 @@ async function newClangFormatFile() {
375357
}
376358
}
377359

378-
async function onSelectSerialBaudrate() {
379-
380-
const baudList: string[] = [
381-
'600', '1200', '2400',
382-
'4800', '9600', '14400',
383-
'19200', '28800', '38400',
384-
'57600', '115200', '230400',
385-
'460800', '576000', '921600'
386-
];
387-
388-
const baudrate = await vscode.window.showQuickPick(baudList, {
389-
placeHolder: 'select a baudrate for serialport'
390-
});
391-
392-
if (baudrate) {
393-
SettingManager.GetInstance().setSerialBaudrate(
394-
parseInt(baudrate),
395-
WorkspaceManager.getInstance().hasWorkspaces() == false
396-
);
397-
}
398-
}
399-
400-
async function onSelectCurSerialName() {
401-
try {
402-
const portList: string[] = ResManager.GetInstance().enumSerialPort();
403-
404-
if (portList.length === 0) {
405-
GlobalEvent.emit('msg', newMessage('Info', 'Not found any serial port !'));
406-
return;
407-
}
408-
409-
const portName = await vscode.window.showQuickPick(portList, {
410-
canPickMany: false,
411-
placeHolder: 'select a serial port to open'
412-
});
413-
414-
if (portName && portName != serial_curPort) {
415-
serial_curPort = portName;
416-
if (serial_nameBar) {
417-
serial_nameBar.text = `${view_str$operation$serialport_name}: ${serial_curPort}`;
418-
serial_nameBar.tooltip = serial_curPort;
419-
serial_openBar_args[0] = serial_curPort;
420-
updateSerialportBarState();
421-
}
422-
}
423-
} catch (error) {
424-
GlobalEvent.emit('error', error);
425-
}
426-
}
427-
428360
//////////////////////////////////////////////////
429361
// eide binaries installer
430362
//////////////////////////////////////////////////
@@ -1086,49 +1018,8 @@ async function InitComponents(context: vscode.ExtensionContext): Promise<boolean
10861018
// init status bar
10871019
{
10881020
const statusBarManager = StatusBarManager.getInstance();
1089-
const serialDefCfg = settingManager.getPortSerialMonitorOptions();
10901021

1091-
// init default port name
1092-
serial_curPort = serialDefCfg.defaultPort;
1093-
1094-
// get current active port
1095-
try {
1096-
const ports = ResManager.GetInstance().enumSerialPort();
1097-
if (ports.length > 0) {
1098-
if (ports.length == 1 || !ports.includes(serialDefCfg.defaultPort)) {
1099-
serial_curPort = ports[0];
1100-
}
1101-
}
1102-
} catch (error) {
1103-
// nothing todo
1104-
}
1105-
1106-
// serial btn
1107-
const serial_openBar = statusBarManager.create('serialport');
1108-
serial_openBar.text = '$(plug) ' + view_str$operation$serialport;
1109-
serial_openBar.tooltip = view_str$operation$serialport;
1110-
serial_openBar_args[0] = serial_curPort;
1111-
serial_openBar.command = {
1112-
title: 'open serialport',
1113-
command: '_cl.eide.Operation.OpenSerialPortMonitor',
1114-
arguments: serial_openBar_args,
1115-
};
1116-
1117-
// serial name btn
1118-
serial_nameBar = statusBarManager.create('serialport-name');
1119-
serial_nameBar.text = `${view_str$operation$serialport_name}: ${serial_curPort || 'none'}`;
1120-
serial_nameBar.tooltip = 'serial name';
1121-
serial_nameBar.command = '_cl.eide.selectCurSerialName';
1122-
1123-
// serial baudrate btn
1124-
serial_baudBar = statusBarManager.create('serialport-baud');
1125-
const baudrate = settingManager.getSerialBaudrate();
1126-
serial_baudBar.text = `${view_str$operation$baudrate}: ${baudrate}`;
1127-
serial_baudBar.tooltip = serial_baudBar.text;
1128-
serial_baudBar.command = 'eide.selectBaudrate';
1129-
1130-
// show now
1131-
updateSerialportBarState();
1022+
// TODO
11321023
}
11331024

11341025
// register msys bash profile for windows
@@ -1144,17 +1035,6 @@ async function InitComponents(context: vscode.ExtensionContext): Promise<boolean
11441035
// update onchanged
11451036
settingManager.on('onChanged', (e) => {
11461037

1147-
/* serialport */
1148-
if (e.affectsConfiguration('EIDE.SerialPortMonitor.ShowStatusBar')) {
1149-
updateSerialportBarState();
1150-
}
1151-
else if (e.affectsConfiguration('EIDE.SerialPortMonitor.BaudRate') && serial_baudBar) {
1152-
const baudrate = settingManager.getSerialBaudrate();
1153-
serial_baudBar.text = `${view_str$operation$baudrate}: ${baudrate}`;
1154-
serial_baudBar.tooltip = serial_baudBar.text;
1155-
updateSerialportBarState();
1156-
}
1157-
11581038
/* set some toolpath to env when path is changed */
11591039
if (e.affectsConfiguration('EIDE.ARM.GCC.InstallDirectory') ||
11601040
e.affectsConfiguration('EIDE.JLink.InstallDirectory') ||

0 commit comments

Comments
 (0)