diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 4e35b0b..403b427 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -12,7 +12,10 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
- node-version: 16
+ node-version: 22
cache: 'npm'
+ - run: rm -rf node_modules
+ - run: rm package-lock.json
+ - run: npm install
- run: npm ci
- run: npm run build
diff --git a/index.html b/index.html
index 84d2111..a8f30c4 100644
--- a/index.html
+++ b/index.html
@@ -325,6 +325,22 @@ Select USB Host Folder
IP Address: |
|
+
+ | Build Date: |
+ |
+
+
+ | MCU Name: |
+ |
+
+
+ | Board ID: |
+ |
+
+
+ | UID: |
+ |
+
More network devices
@@ -333,6 +349,45 @@ More network devicesClose
+
+
+
+
+
+ | Current Device Info |
+
+
+
+
+ | Board: |
+ |
+
+
+ | Version: |
+ |
+
+
+ | Build Date: |
+ |
+
+
+ | MCU Name: |
+ |
+
+
+ | Board ID: |
+ |
+
+
+ | UID: |
+ |
+
+
+
+
+
+
+
diff --git a/js/common/ble-file-transfer.js b/js/common/ble-file-transfer.js
new file mode 100644
index 0000000..fd7abf9
--- /dev/null
+++ b/js/common/ble-file-transfer.js
@@ -0,0 +1,43 @@
+import {FileTransferClient as BLEFileTransferClient} from '@adafruit/ble-file-transfer-js';
+
+// Wrapper for BLEFileTransferClient to add additional functionality
+class FileTransferClient extends BLEFileTransferClient {
+ constructor(bleDevice, bufferSize) {
+ super(bleDevice, bufferSize);
+ }
+
+ async versionInfo() {
+ // Possibly open /boot_out.txt and read the version info
+ let versionInfo = {};
+ console.log("Reading version info");
+ let bootout = await this.readFile('/boot_out.txt', false);
+ console.log(bootout);
+ if (!bootout) {
+ console.error("Unable to read boot_out.txt");
+ return null;
+ }
+ bootout += "\n";
+
+ // Add these items as they are found
+ const searchItems = {
+ version: /Adafruit CircuitPython (.*?) on/,
+ build_date: /on ([0-9]{4}-[0-9]{2}-[0-9]{2});/,
+ board_name: /; (.*?) with/,
+ mcu_name: /with (.*?)\r?\n/,
+ board_id: /Board ID:(.*?)\r?\n/,
+ uid: /UID:([0-9A-F]{12,16})\r?\n/,
+ }
+
+ for (const [key, regex] of Object.entries(searchItems)) {
+ const match = bootout.match(regex);
+
+ if (match) {
+ versionInfo[key] = match[1];
+ }
+ }
+
+ return versionInfo;
+ }
+}
+
+export {FileTransferClient};
\ No newline at end of file
diff --git a/js/common/dialogs.js b/js/common/dialogs.js
index 74d110f..73b87e1 100644
--- a/js/common/dialogs.js
+++ b/js/common/dialogs.js
@@ -329,6 +329,10 @@ class DiscoveryModal extends GenericModal {
let ip = this._currentModal.querySelector("#ip");
ip.href = `http://${deviceInfo.ip + port}/code/`;
ip.textContent = deviceInfo.ip;
+ this._currentModal.querySelector("#builddate").textContent = deviceInfo.build_date;
+ this._currentModal.querySelector("#mcuname").textContent = deviceInfo.mcu_name;
+ this._currentModal.querySelector("#boardid").textContent = deviceInfo.board_id;
+ this._currentModal.querySelector("#uid").textContent = deviceInfo.uid;
}
async _refreshDevices() {
@@ -378,11 +382,43 @@ class DiscoveryModal extends GenericModal {
}
}
+class DeviceInfoModal extends GenericModal {
+ async _getDeviceInfo() {
+ const deviceInfo = await this._showBusy(this._fileHelper.versionInfo());
+ this._currentModal.querySelector("#version").textContent = deviceInfo.version;
+ const boardLink = this._currentModal.querySelector("#board");
+ boardLink.href = `https://circuitpython.org/board/${deviceInfo.board_id}/`;
+ boardLink.textContent = deviceInfo.board_name;
+ this._currentModal.querySelector("#builddate").textContent = deviceInfo.build_date;
+ this._currentModal.querySelector("#mcuname").textContent = deviceInfo.mcu_name;
+ this._currentModal.querySelector("#boardid").textContent = deviceInfo.board_id;
+ this._currentModal.querySelector("#uid").textContent = deviceInfo.uid;
+ }
+
+ async open(workflow, documentState) {
+ this._workflow = workflow;
+ this._fileHelper = workflow.fileHelper;
+ this._showBusy = workflow.showBusy.bind(workflow);
+ this._docState = documentState;
+
+ let p = super.open();
+ const okButton = this._currentModal.querySelector("button.ok-button");
+ this._addDialogElement('okButton', okButton, 'click', this._closeModal);
+
+ const refreshIcon = this._currentModal.querySelector("i.refresh");
+ this._addDialogElement('refreshIcon', refreshIcon, 'click', this._refreshDevices);
+
+ await this._getDeviceInfo();
+ return p;
+ }
+}
+
export {
GenericModal,
MessageModal,
ButtonValueDialog,
UnsavedDialog,
DiscoveryModal,
- ProgressDialog
+ ProgressDialog,
+ DeviceInfoModal
};
\ No newline at end of file
diff --git a/js/common/file_dialog.js b/js/common/file_dialog.js
index 8bd7a38..c051903 100644
--- a/js/common/file_dialog.js
+++ b/js/common/file_dialog.js
@@ -42,7 +42,7 @@ const extensionMap = {
"mp4": {style: FA_STYLE_REGULAR, icon: "file-video", type: "bin"},
"mpy": {style: FA_STYLE_REGULAR, icon: "file", type: "bin"},
"pdf": {style: FA_STYLE_REGULAR, icon: "file-pdf", type: "bin"},
- "py": {style: FA_STYLE_REGULAR, icon: "file-lines", type: "text"},
+ "py": {style: FA_STYLE_REGULAR, icon: "file-code", type: "text"},
"toml": {style: FA_STYLE_REGULAR, icon: "file-lines", type: "text"},
"txt": {style: FA_STYLE_REGULAR, icon: "file-lines", type: "text"},
"wav": {style: FA_STYLE_REGULAR, icon: "file-audio", type: "bin"},
@@ -57,6 +57,9 @@ const FILESIZE_UNITS = ["bytes", "KB", "MB", "GB", "TB"];
const COMPACT_UNITS = ["", "K", "M", "G", "T"];
function getFileExtension(filename) {
+ if (filename === null) {
+ return null;
+ }
let extension = filename.split('.').pop();
if (extension !== null) {
return String(extension).toLowerCase();
@@ -189,7 +192,7 @@ class FileDialog extends GenericModal {
this._currentPath = path;
}
const currentPathLabel = this._getElement('currentPathLabel');
- currentPathLabel.innerHTML = this._currentPath;
+ currentPathLabel.innerHTML = `