Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix wifi configuration on serial #736

Merged
merged 4 commits into from
May 15, 2024
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Configure wifi using serial commands for device os < 6.x
keeramis committed May 15, 2024
commit 907a20b39c8fc14fab784c839e3d13fbbf829360
18 changes: 12 additions & 6 deletions src/cmd/serial.js
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@ const usbUtils = require('./usb-util');
const { platformForId } = require('../lib/platform');
const { FirmwareModuleDisplayNames } = require('../lib/require-optional')('particle-usb');
const WifiControlRequest = require('../lib/wifi-control-request');
const semver = require('semver');

const IDENTIFY_COMMAND_TIMEOUT = 20000;

@@ -524,19 +525,24 @@ module.exports = class SerialCommand extends CLICommandBase {
}

async configureWifi({ port, file }){
const device = await this.whatSerialPortDidYouMean(port, true);
if (!device?.specs?.features?.includes('wifi')) {
const deviceFromSerialPort = await this.whatSerialPortDidYouMean(port, true);
const deviceId = deviceFromSerialPort.deviceId;
const device = await usbUtils.getOneUsbDevice({ idOrName: deviceId });
if (!deviceFromSerialPort?.specs?.features?.includes('wifi')) {
throw new VError('The device does not support Wi-Fi');
}
if (device?.specs?.generation <= 2 ) {

// if device's firmware version is less than 6.0.0, use the old way
const fwVer = device.firmwareVersion;
if (semver.lt(fwVer, '6.0.0')) {
// configure serial
if (file){
return this._configWifiFromFile(device, file);
return this._configWifiFromFile(deviceFromSerialPort, file);
} else {
return this.promptWifiScan(device);
return this.promptWifiScan(deviceFromSerialPort);
}
} else {
const wifiControlRequest = new WifiControlRequest(device.deviceId, {
const wifiControlRequest = new WifiControlRequest(deviceFromSerialPort.deviceId, {
file,
ui: this.ui,
newSpin: this.newSpin,