小龙虾
5db3f66b8e
- 将SPI OTA帧格式升级为SPI Link v2，采用新的帧格式： | SOF0 0xA5 | SOF1 0x5A | VER 0x02 | FLAGS | SESSION 4B LE | TX_SEQ | ACK_SEQ | CREDIT | TYPE | LEN 2B LE | RSV 2B | PAYLOAD | CRC32 4B LE | - 新增V2_OVERHEAD=20字节开销，APP最大payload为236字节，BOOT为108字节 - 修改帧类型定义：ENTER_BOOT从0xB5合并至0xB0，新增CAN业务类型0xC0~C3 - 更新CAN协议文档，支持SPI Link v2-only模式，调整最大业务payload计算 - 扩展0xC1帧功能，支持双向通信和1Hz主动推送ID快照 - 添加0xC3完整ID快照帧类型，包含seq/rx_count等完整字段 - 更新协议文档中的错误码定义和反馈payload格式 refactor(main): 重构主程序入口并添加CAN反馈任务 - 在main.cpp中添加CAN反馈任务，更新启动流程注释 - 创建createCriticalTask辅助函数，统一关键任务创建逻辑 - 调整SPI初始化顺序，确保CAN反馈任务依赖正确 - 优化错误处理机制，关键任务失败时立即重启 - 将GD32版本探测移至ota_relay任务处理 - 更新版本号至0.3.48，调整编译时间和Git哈希 config: 更新SPI和BLE配置参数 - 添加SPI主机相关配置参数，包括CS GPIO、READY GPIO等引脚定义 - 配置SPI缓冲区大小：APP为256字节，BOOT为128字节 - 更新BLE滑动窗口参数，ACK窗口设为32，数据队列深度为72 - 调整SPI工作队列大小至5120字节，增加任务堆栈监控说明
283 lines
12 KiB
JavaScript
283 lines
12 KiB
JavaScript
/**
|
||
* console-mode.js - 共享模式/目标切换胶水代码（从 index.html 内联脚本抽取）
|
||
*
|
||
* 职责：
|
||
* - 覆盖 app.js 中的 switchStageFlow，支持 BLE 阶段流程
|
||
* - 提供 setConsoleMode / selectFlashTarget 等供 HTML onclick 调用
|
||
* - 维护共享固件文件状态 (sharedFirmwareFiles) 并在 WiFi/BLE 间同步
|
||
* - 页面刷新后恢复上次升级目标与固件选择
|
||
*
|
||
* 依赖：app.js (通过 window.* 或 bare 引用) 提供 switchStageFlow、
|
||
* handleFileSelect、clearFile、pickFileViaFSAPI、addLog、showToast、setActivePhase 等。
|
||
*/
|
||
import {
|
||
restorePersistedFirmwareSelection,
|
||
persistFlashTarget,
|
||
loadPersistedFlashTarget
|
||
} from './file-handle.js';
|
||
|
||
window.connectionMode = window.connectionMode || 'wifi';
|
||
/* 刷新后优先用上次目标，避免默认回到 ESP32 丢掉 GD32 选择上下文 */
|
||
window.flashTarget = loadPersistedFlashTarget() || window.flashTarget || 'esp32';
|
||
window.sharedFirmwareFiles = window.sharedFirmwareFiles || {
|
||
esp32: { file: null, handle: null },
|
||
gd32: { file: null, handle: null }
|
||
};
|
||
(function () {
|
||
var originalSwitchStageFlow = window.switchStageFlow;
|
||
window.switchStageFlow = function (target) {
|
||
if (target === 'ble') {
|
||
window.currentOtaTarget = 'ble';
|
||
var esp32El = document.getElementById('esp32Stages');
|
||
var gd32El = document.getElementById('gd32Stages');
|
||
var bleEl = document.getElementById('bleStages');
|
||
if (esp32El) esp32El.style.display = 'none';
|
||
if (gd32El) gd32El.style.display = 'none';
|
||
if (bleEl) bleEl.style.display = '';
|
||
return;
|
||
}
|
||
if (typeof originalSwitchStageFlow === 'function') {
|
||
originalSwitchStageFlow(target);
|
||
}
|
||
var bleEl = document.getElementById('bleStages');
|
||
if (bleEl) bleEl.style.display = 'none';
|
||
};
|
||
|
||
window.setConsoleMode = function (mode) {
|
||
// ★ 刷写进行中禁止切换连接模式：setConsoleMode → syncBleFileFromSelectedTarget →
|
||
// notifyFileChange → updateFileInfo → finalizeFileInfo → setProgress(0) 会覆盖
|
||
// 进行中的 WiFi/BLE 上传进度（与 selectFlashTarget 同样的守卫策略）。
|
||
var bleBusy = window.bleOta && window.bleOta.isUploading && window.bleOta.isUploading();
|
||
if (window.isUploading || bleBusy) {
|
||
var active = bleBusy ? 'BLE' : ((window.activeUploadChip || 'OTA').toUpperCase());
|
||
if (typeof addLog === 'function') addLog('W', 'OTA', active + ' 刷写进行中，无法切换连接模式');
|
||
if (typeof showToast === 'function') showToast('当前有 ' + active + ' 任务在运行，请等待结束后再切换', 'error');
|
||
return;
|
||
}
|
||
var isBle = mode === 'ble';
|
||
window.connectionMode = isBle ? 'ble' : 'wifi';
|
||
var wifiCards = document.getElementById('wifiModeCards');
|
||
var bleCards = document.getElementById('bleModeCards');
|
||
var wifiBtn = document.getElementById('modeWifiBtn');
|
||
var bleBtn = document.getElementById('modeBleBtn');
|
||
if (wifiCards) wifiCards.style.display = isBle ? 'none' : '';
|
||
if (bleCards) bleCards.style.display = isBle ? '' : 'none';
|
||
var headBtns = document.getElementById('bleHeadActions');
|
||
if (headBtns) headBtns.style.display = isBle ? '' : 'none';
|
||
if (wifiBtn) wifiBtn.className = isBle ? 'btn btn-outline' : 'btn btn-primary';
|
||
if (bleBtn) bleBtn.className = isBle ? 'btn btn-primary' : 'btn btn-outline';
|
||
applySharedModeUi();
|
||
syncBleFileFromSelectedTarget();
|
||
if (isBle) {
|
||
window.switchStageFlow('ble');
|
||
if (typeof setActivePhase === 'function') {
|
||
setActivePhase(window.flashTarget === 'gd32' ? 'gd32Ota' : 'esp32Ota');
|
||
}
|
||
if (window.bleOta && typeof window.bleOta.refreshButtons === 'function') {
|
||
window.bleOta.refreshButtons();
|
||
}
|
||
} else {
|
||
window.switchStageFlow(window.flashTarget || (window.activePhase === 'esp32Ota' ? 'esp32' : 'gd32'));
|
||
}
|
||
};
|
||
|
||
window.selectFlashTarget = function (target) {
|
||
// OTA 上传进行中禁止切换目标：避免前端状态与后端 relay/upload 不同步导致卡死
|
||
// ★ 兼容 BLE 模式：BLE 上传用 bleOta.state.uploading，window.isUploading 仅 WiFi 通道使用。
|
||
var bleBusy = window.bleOta && window.bleOta.isUploading && window.bleOta.isUploading();
|
||
if (window.isUploading || bleBusy) {
|
||
var active = bleBusy ? 'BLE' : ((window.activeUploadChip || 'OTA').toUpperCase());
|
||
if (typeof addLog === 'function') addLog('W', 'OTA', active + ' 刷写进行中，无法切换目标');
|
||
if (typeof showToast === 'function') showToast('当前有 ' + active + ' 任务在运行，请等待结束后再切换', 'error');
|
||
return;
|
||
}
|
||
window.flashTarget = target === 'gd32' ? 'gd32' : 'esp32';
|
||
persistFlashTarget(window.flashTarget);
|
||
applySharedModeUi();
|
||
syncBleFileFromSelectedTarget();
|
||
if (window.connectionMode === 'ble') {
|
||
window.switchStageFlow('ble');
|
||
if (typeof setActivePhase === 'function') {
|
||
setActivePhase(target === 'gd32' ? 'gd32Ota' : 'esp32Ota');
|
||
}
|
||
} else {
|
||
window.switchStageFlow(window.flashTarget);
|
||
}
|
||
if (window.bleOta && typeof window.bleOta.refreshTargetUi === 'function') {
|
||
window.bleOta.refreshTargetUi();
|
||
}
|
||
};
|
||
|
||
window.handleSharedFileSelect = function (event, chip) {
|
||
var file = event && event.target && event.target.files && event.target.files[0] ? event.target.files[0] : null;
|
||
if (file) {
|
||
/* 传统 input 无持久 handle，刷新后无法自动恢复该次选择 */
|
||
window.sharedFirmwareFiles[chip] = { file: file, handle: null };
|
||
}
|
||
if (typeof window.handleFileSelect === 'function') {
|
||
window.handleFileSelect(event, chip);
|
||
}
|
||
window.flashTarget = chip === 'gd32' ? 'gd32' : 'esp32';
|
||
persistFlashTarget(window.flashTarget);
|
||
applySharedModeUi();
|
||
setTimeout(syncBleFileFromSelectedTarget, 0);
|
||
};
|
||
|
||
window.pickSharedFirmware = function (chip) {
|
||
window.flashTarget = chip === 'gd32' ? 'gd32' : 'esp32';
|
||
persistFlashTarget(window.flashTarget);
|
||
applySharedModeUi();
|
||
if (window.showOpenFilePicker && typeof window.pickFileViaFSAPI === 'function') {
|
||
var nativePicker = window.showOpenFilePicker;
|
||
var capturedHandle = null;
|
||
window.showOpenFilePicker = function () {
|
||
return nativePicker.apply(this, arguments).then(function (handles) {
|
||
capturedHandle = handles && handles.length ? handles[0] : null;
|
||
return handles;
|
||
});
|
||
};
|
||
Promise.resolve(window.pickFileViaFSAPI(chip)).then(function () {
|
||
window.showOpenFilePicker = nativePicker;
|
||
if (!capturedHandle || typeof capturedHandle.getFile !== 'function') {
|
||
syncBleFileFromSelectedTarget();
|
||
return;
|
||
}
|
||
capturedHandle.getFile().then(function (file) {
|
||
window.sharedFirmwareFiles[chip] = { file: file, handle: capturedHandle };
|
||
syncBleFileFromSelectedTarget();
|
||
}).catch(function () {
|
||
syncBleFileFromSelectedTarget();
|
||
});
|
||
}).catch(function (err) {
|
||
window.showOpenFilePicker = nativePicker;
|
||
if (err && err.name !== 'AbortError' && typeof window.addLog === 'function') {
|
||
window.addLog('W', '文件', 'FSAPI 选择失败: ' + err.message);
|
||
}
|
||
});
|
||
} else {
|
||
var input = document.getElementById(chip === 'gd32' ? 'fileInputGd32' : 'fileInputEsp32');
|
||
if (input) input.click();
|
||
}
|
||
};
|
||
|
||
window.clearSharedFirmware = function (chip) {
|
||
window.sharedFirmwareFiles[chip] = { file: null, handle: null };
|
||
if (typeof window.clearFile === 'function') {
|
||
window.clearFile(chip);
|
||
}
|
||
if (window.connectionMode === 'ble' && window.flashTarget === chip && window.bleOta && typeof window.bleOta.clearFile === 'function') {
|
||
window.bleOta.clearFile();
|
||
}
|
||
};
|
||
|
||
window.setBleFirmwareInputFile = function (file) {
|
||
var input = document.getElementById('firmwareFile');
|
||
if (!input || !file || typeof window.DataTransfer !== 'function') {
|
||
return;
|
||
}
|
||
try {
|
||
var dt = new DataTransfer();
|
||
dt.items.add(file);
|
||
input.files = dt.files;
|
||
} catch (err) {
|
||
// Some browsers restrict assignment to file inputs; BLE state is still synced via notifyFileChange.
|
||
}
|
||
};
|
||
|
||
window.syncBleFileFromSelectedTarget = function () {
|
||
if (window.connectionMode !== 'ble' || !window.bleOta || typeof window.bleOta.notifyFileChange !== 'function') {
|
||
return;
|
||
}
|
||
var isGd32 = window.flashTarget === 'gd32';
|
||
var chip = isGd32 ? 'gd32' : 'esp32';
|
||
var suffix = isGd32 ? 'Gd32' : 'Esp32';
|
||
var stored = window.sharedFirmwareFiles[chip];
|
||
if (stored && stored.handle && typeof stored.handle.getFile === 'function') {
|
||
stored.handle.getFile().then(function (file) {
|
||
stored.file = file;
|
||
setBleFirmwareInputFile(file);
|
||
window.bleOta.notifyFileChange(file, stored.handle);
|
||
}).catch(function () {
|
||
if (stored.file) {
|
||
setBleFirmwareInputFile(stored.file);
|
||
window.bleOta.notifyFileChange(stored.file, stored.handle);
|
||
}
|
||
});
|
||
return;
|
||
}
|
||
if (stored && stored.file) {
|
||
setBleFirmwareInputFile(stored.file);
|
||
window.bleOta.notifyFileChange(stored.file, stored.handle || null);
|
||
return;
|
||
}
|
||
var input = document.getElementById('fileInput' + suffix);
|
||
var info = document.getElementById('fileInfo' + suffix);
|
||
var hasInfo = info && info.classList.contains('show');
|
||
var file = input && input.files && input.files[0] ? input.files[0] : null;
|
||
if (file) {
|
||
window.sharedFirmwareFiles[chip] = { file: file, handle: null };
|
||
setBleFirmwareInputFile(file);
|
||
window.bleOta.notifyFileChange(file, null);
|
||
return;
|
||
}
|
||
if (!hasInfo) {
|
||
return;
|
||
}
|
||
var nameEl = document.getElementById('fileName' + suffix);
|
||
var typeEl = document.getElementById('fileType' + suffix);
|
||
var sizeEl = document.getElementById('fileSize' + suffix);
|
||
var bleInfo = document.getElementById('fileInfo');
|
||
var bleName = document.getElementById('fileName');
|
||
var bleType = document.getElementById('fileType');
|
||
var bleSize = document.getElementById('fileSize');
|
||
if (bleInfo) bleInfo.classList.add('show');
|
||
if (bleName && nameEl) bleName.textContent = nameEl.textContent;
|
||
if (bleType && typeEl) bleType.textContent = typeEl.textContent;
|
||
if (bleSize && sizeEl) bleSize.textContent = sizeEl.textContent;
|
||
var packetCount = document.getElementById('packetCount');
|
||
var sentCount = document.getElementById('sentCount');
|
||
if (packetCount) packetCount.textContent = '-';
|
||
if (sentCount) sentCount.textContent = '0';
|
||
};
|
||
|
||
window.applySharedModeUi = function () {
|
||
var isBle = window.connectionMode === 'ble';
|
||
var isGd32 = window.flashTarget === 'gd32';
|
||
var targetEsp32 = document.getElementById('targetEsp32Tab');
|
||
var targetGd32 = document.getElementById('targetGd32Tab');
|
||
if (targetEsp32) targetEsp32.className = isGd32 ? 'btn btn-outline' : 'btn btn-primary';
|
||
if (targetGd32) targetGd32.className = isGd32 ? 'btn btn-primary' : 'btn btn-outline';
|
||
var ids = {
|
||
wifiEsp32UploadPane: !isGd32,
|
||
wifiGd32UploadPane: isGd32,
|
||
bleUploadPane: false,
|
||
wifiEsp32ActionPane: !isBle && !isGd32,
|
||
wifiGd32ActionPane: !isBle && isGd32,
|
||
bleActionPane: isBle
|
||
};
|
||
Object.keys(ids).forEach(function (id) {
|
||
var el = document.getElementById(id);
|
||
if (el) el.style.display = ids[id] ? '' : 'none';
|
||
});
|
||
var hint = document.getElementById('readyHint');
|
||
if (hint) {
|
||
if (isBle) {
|
||
hint.innerHTML = 'BLE 模式：连接设备 → 选择固件 → 一键刷写。';
|
||
} else if (isGd32) {
|
||
hint.innerHTML = 'WiFi 模式：上传 GD32 固件后自动执行 SPI OTA。';
|
||
} else {
|
||
hint.innerHTML = 'WiFi 模式：上传 ESP32 固件后自动执行 OTA 并重启。';
|
||
}
|
||
}
|
||
};
|
||
|
||
applySharedModeUi();
|
||
/* 刷新后恢复上次固件与目标（FSAPI handle + localStorage 目标） */
|
||
restorePersistedFirmwareSelection().then(function () {
|
||
if (typeof window.switchStageFlow === 'function' && window.connectionMode !== 'ble') {
|
||
window.switchStageFlow(window.flashTarget || 'esp32');
|
||
}
|
||
}).catch(function () {});
|
||
})();
|
||
/* HTML onclick 用的 API 已在 IIFE 内挂到 window.*，无需再二次赋值 */
|