-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add experimental new-install command
- Loading branch information
Showing
9 changed files
with
887 additions
and
1 deletion.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| import { Command, Opt } from "./lib/command.js"; | ||
|
|
||
| import { loadPackage } from "../distribution/package.js"; | ||
| import { stderr, stdout } from "process"; | ||
|
|
||
|
|
||
| const cmd = new Command("Test new install command", { | ||
| action: async (options: Record<string, string | boolean>) => { | ||
| const pkgPath = options["package"] as string; | ||
| const port = options["port"] as string; | ||
|
|
||
| if (!port) { | ||
| stderr.write("Port not specified\n"); | ||
| throw 1; | ||
| } | ||
|
|
||
| stdout.write("Loading package...\n"); | ||
|
|
||
| const pkg = await loadPackage(pkgPath); | ||
|
|
||
| stdout.write("Version: " + pkg.getManifest().getVersion() + "\n"); | ||
| stdout.write("Board: " + pkg.getManifest().getBoard() + "\n"); | ||
| stdout.write("Platform: " + pkg.getManifest().getPlatform() + "\n"); | ||
| stdout.write("\n"); | ||
|
|
||
| await pkg.flash(port); | ||
| }, | ||
| args: [], | ||
| options: { | ||
| "package": new Opt("Uri to the package file", { required: true }) | ||
| }, | ||
| chainable: false | ||
| }); | ||
|
|
||
| export default cmd; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| import { Package } from "../package.js"; | ||
| import { ESPLoader } from "esptool-js"; | ||
| import { SerialPort } from "serialport"; | ||
| import { NodeTransport } from "./nodeTransport.js"; | ||
| import { logger } from "../../util/logger.js"; | ||
| import cliProgress from "cli-progress"; | ||
| import { stdout } from "process"; | ||
|
|
||
|
|
||
| class UploadReporter { | ||
| private bar: cliProgress.SingleBar; | ||
| private fileIndex: number; | ||
|
|
||
| constructor(private files: { size: number, name: string }[]) { | ||
| this.fileIndex = 0; | ||
| this.bar = this.createBar(this.fileIndex); | ||
| } | ||
|
|
||
| private createBar(fileIndex: number) { | ||
| const fileName = this.files[fileIndex].name; | ||
|
|
||
| return new cliProgress.SingleBar({ | ||
| format: `${fileIndex + 1}/${this.files.length} | {bar} {percentage}% | ${fileName} | {value} / {total}`, | ||
| hideCursor: true | ||
| }, cliProgress.Presets.rect); | ||
| } | ||
|
|
||
| public update(fileIndex: number, written: number) { | ||
| if (fileIndex !== this.fileIndex) { | ||
| this.bar.update(this.bar.getTotal()); | ||
| this.bar.stop(); | ||
| this.fileIndex = fileIndex; | ||
| this.bar = this.createBar(this.fileIndex); | ||
| this.bar.start(this.files[this.fileIndex].size, 0); | ||
| } | ||
|
|
||
| this.bar.update(written); | ||
| } | ||
|
|
||
| public start () { | ||
| this.bar.start(this.files[this.fileIndex].size, 0); | ||
| } | ||
|
|
||
| public stop() { | ||
| this.bar.update(this.bar.getTotal()); | ||
| this.bar.stop(); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| export async function flash(Package: Package, path: string): Promise<void> { | ||
| const config = Package.getManifest().getConfig(); | ||
|
|
||
| const flashBaud = parseInt(config["flashBaud"] ?? 921600); | ||
|
|
||
| const partitions = config["partitions"]; | ||
| if (!partitions) { | ||
| throw new Error("No partitions defined"); | ||
| } | ||
|
|
||
| const list = await SerialPort.list(); | ||
| const info = list.find((port) => port.path === path); | ||
| if (!info) { | ||
| throw new Error("Port not found"); | ||
| } | ||
|
|
||
| stdout.write("Connecting to " + info.path + "...\n"); | ||
|
|
||
| const port = new SerialPort({ | ||
| path: info.path, | ||
| baudRate: 115200, | ||
| autoOpen: false | ||
| }); | ||
|
|
||
| const loaderOptions: any = { | ||
| debugLogging: false, | ||
| transport: new NodeTransport(port), | ||
| baudrate: flashBaud, | ||
| romBaudrate: 115200, | ||
| terminal: { | ||
| clean: () => { }, | ||
| writeLine: (data: any) => { logger.debug(data); }, | ||
| write: (data: any) => { logger.debug(data); } | ||
| } | ||
| }; | ||
| const esploader = new ESPLoader(loaderOptions); | ||
|
|
||
| const fileArray: { data: string, address: number, fileName: string }[] = []; | ||
| for (const partition of partitions) { | ||
| const file = partition["file"]; | ||
| if (file === undefined) { | ||
| throw new Error("No file defined for partition"); | ||
| } | ||
| const address = parseInt(partition["address"]); | ||
| if (address === undefined) { | ||
| throw new Error("No address defined for partition"); | ||
| } | ||
| const dataBuffer = Package.getData()[file]; | ||
| if (dataBuffer === undefined) { | ||
| throw new Error("File not found in package"); | ||
| } | ||
|
|
||
| fileArray.push({ data: esploader.ui8ToBstr(dataBuffer), address: address, fileName: file }); | ||
| } | ||
|
|
||
| const reporter = new UploadReporter(fileArray.map((file) => { | ||
| return { | ||
| size: file.data.length, | ||
| name: file.fileName | ||
| }; | ||
| })); | ||
|
|
||
| try { | ||
| await esploader.main_fn(); | ||
|
|
||
| stdout.write("Detected chip type: " + esploader.chip.CHIP_NAME + "\n"); | ||
| stdout.write("Flash size: " + await esploader.get_flash_size() + "K\n"); | ||
|
|
||
| stdout.write("\n"); | ||
|
|
||
| if (esploader.chip.CHIP_NAME !== config["chip"]) { | ||
| throw new Error("Chip type mismatch (expected " + config["chip"] + ", got " + esploader.chip.CHIP_NAME + ")"); | ||
| } | ||
|
|
||
| stdout.write("Writing flash...\n"); | ||
|
|
||
| reporter.start(); | ||
| await esploader.write_flash({ | ||
| fileArray: fileArray, | ||
| flashSize: "4MB", | ||
| flashMode: "keep", | ||
| flashFreq: "keep", | ||
| eraseAll: false, | ||
| compress: true, | ||
| reportProgress: (fileIndex: number, written: number) => { | ||
| reporter.update(fileIndex, written); | ||
| } | ||
| }); | ||
| } | ||
| finally { | ||
| reporter.stop(); | ||
| await esploader.hard_reset(); | ||
| await esploader.transport.disconnect(); | ||
| } | ||
| } |
Oops, something went wrong.