- 将日志环形缓冲区从静态数组改为动态堆分配
- 实现启动时大容量缓冲区和运行时小容量缓冲区的切换机制
- 添加日志环满时优先保留错误和警告信息的清理策略
- 优化内存使用,在日志为空时避免不必要的内存分配
- 移除调试日志中的冗余字段显示
feat(api): 更新CAN接口为批量发送模式
- 将 `/can/send` 接口替换为 `/can/send_batch`,支持1到N帧的批量发送
- 更新API文档中的接口描述和使用示例
- 修改请求参数格式为 `{"ch":0,"frames":[{...}]}` 返回格式为 `{"status":"ok","results":[...]}`
- 单帧发送也需要通过send_batch接口实现
feat(monitor): 新增GD32 ADC调试反馈处理功能
- 添加gd32_adc_feedback组件用于解析0xC4类型的SPI反馈
- 实现ADC数据解析包括温度、电压等参数的计算和转换
- 在can_feedback_task中集成ADC反馈分发逻辑
- 添加线程安全的数据获取和年龄检查接口
refactor(config): 优化任务栈大小配置并调整OTA块大小
- 重新评估各任务栈使用情况,优化HTTP、WiFi、SPI等工作任务的栈大小
- 将HTTP服务器栈从8KB调整至7KB,WiFi OTA任务栈从4KB调整至3KB
- OTA块大小从2KB调整回4KB以提升传输吞吐性能
- 重新整理配置文件结构,移动WiFi模式配置位置
187 lines
11 KiB
HTML
187 lines
11 KiB
HTML
<!DOCTYPE html>
|
||
<html lang="zh-CN">
|
||
<head>
|
||
<meta charset="UTF-8">
|
||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||
<title>ESP32 CAN 接收监控</title>
|
||
<link rel="stylesheet" href="css/base.css?v=20260716s">
|
||
<link rel="stylesheet" href="css/layout.css?v=20260716s">
|
||
<link rel="stylesheet" href="css/components.css?v=20260716s">
|
||
<link rel="stylesheet" href="css/can.css?v=20260719s">
|
||
<link rel="stylesheet" href="css/responsive.css?v=20260716s">
|
||
</head>
|
||
<body class="can-page">
|
||
<div class="container can-container">
|
||
|
||
<header class="header-bar can-header">
|
||
<div class="header-brand">
|
||
<span class="dot-mark"></span>
|
||
<strong>ESP32 CAN 接收监控</strong>
|
||
</div>
|
||
<div class="header-status">
|
||
<span class="pill offline" id="monConnPill"><span class="indicator"></span><span id="monConnTxt">未连接</span></span>
|
||
<span class="pill" id="fbModePill">模式: --</span>
|
||
<span class="pill" id="fbPollStatus">轮询: 待连接</span>
|
||
</div>
|
||
<div class="header-sub can-header-actions">
|
||
<a class="pill can-link-pill" href="can.html">CAN 发送控制台</a>
|
||
<a class="pill can-link-pill" href="index.html">返回 OTA 控制台</a>
|
||
</div>
|
||
</header>
|
||
|
||
<!-- ═══ 工作台 ═══ -->
|
||
<section class="card can-toolbar-card">
|
||
<div class="card-head"><span class="ico">🧰</span> 连接设置</div>
|
||
<div class="card-body">
|
||
<div class="can-toolbar-grid" style="grid-template-columns: minmax(260px, 1.2fr) 1fr;">
|
||
<div class="can-toolbar-block">
|
||
<label class="form-label" for="monIp">ESP32 IP</label>
|
||
<div class="input-group">
|
||
<input class="input" type="text" id="monIp" value="192.168.31.127" placeholder="输入 IP 地址">
|
||
<button class="btn btn-outline" id="monTestBtn" type="button">测试</button>
|
||
</div>
|
||
</div>
|
||
<div class="can-toolbar-block">
|
||
<label class="form-label">接收模式</label>
|
||
<div class="input-group">
|
||
<button class="btn btn-primary btn-sm" id="btnModeAllPass" type="button">全收模式</button>
|
||
<button class="btn btn-outline btn-sm" id="btnModeFilter" type="button">过滤模式</button>
|
||
<button class="btn btn-outline btn-sm" id="btnModeBridge" type="button" title="CAN0 收到的每一帧按原帧格式自动转发到 CAN1 与 CAN2">CAN0→1/2 桥接</button>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
<div class="can-toolbar-foot">
|
||
<div class="conn-indicator err" id="monConnIndicator">
|
||
<span class="light"></span>
|
||
<span id="monConnIndicatorTxt">等待连接测试</span>
|
||
</div>
|
||
<div class="helper-note" id="monHelper">
|
||
页面每 1 秒通过 <code>/can/feedback</code> 拉取三路 CAN 通道快照。无 RX 的通道显示 <b>空(无 RX)</b>。<br><b>桥接模式</b>:CAN0 收到的每一帧(11/29 位、FD、BRS)自动由 CAN1 与 CAN2 转发出去。
|
||
</div>
|
||
</div>
|
||
</div>
|
||
</section>
|
||
|
||
<!-- ═══ 三路反馈 ═══ -->
|
||
<section class="card can-feedback-card">
|
||
<div class="card-head"><span class="ico">📊</span> 三路 CAN 通道反馈(1Hz)</div>
|
||
<div class="card-body">
|
||
<div class="feedback-grid">
|
||
<div class="feedback-channel collapsed" id="fbCh0">
|
||
<div class="feedback-ch-head" role="button" tabindex="0" title="点击展开/折叠详情">
|
||
<span class="ch-dot ch0"></span> CAN0
|
||
<span class="feedback-expand-caret">▾</span>
|
||
</div>
|
||
<div class="feedback-primary">
|
||
<div class="feedback-row"><span class="fb-label">状态</span><span class="fb-val" id="fb0State">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">接收数</span><span class="fb-val" id="fb0Rx">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">发送数</span><span class="fb-val" id="fb0Tx">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">丢帧</span><span class="fb-val" id="fb0Drop">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">错误</span><span class="fb-val" id="fb0Err">--</span></div>
|
||
</div>
|
||
<div class="feedback-detail">
|
||
<div class="feedback-row"><span class="fb-label">TEC</span><span class="fb-val" id="fb0Tec">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">REC</span><span class="fb-val" id="fb0Rec">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">总线状态</span><span class="fb-val" id="fb0Bus">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">最新ID</span><span class="fb-val mono" id="fb0LastId">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">DLC</span><span class="fb-val" id="fb0Dlc">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">FD/BRS/ESI</span><span class="fb-val" id="fb0Flags">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">Seq</span><span class="fb-val" id="fb0Seq">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">Δrx/s</span><span class="fb-val" id="fb0Delta">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">最新HEX</span><span class="fb-val mono fb-data-cell" id="fb0LastData">--</span></div>
|
||
</div>
|
||
</div>
|
||
|
||
<div class="feedback-channel collapsed" id="fbCh1">
|
||
<div class="feedback-ch-head" role="button" tabindex="0" title="点击展开/折叠详情">
|
||
<span class="ch-dot ch1"></span> CAN1
|
||
<span class="feedback-expand-caret">▾</span>
|
||
</div>
|
||
<div class="feedback-primary">
|
||
<div class="feedback-row"><span class="fb-label">状态</span><span class="fb-val" id="fb1State">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">接收数</span><span class="fb-val" id="fb1Rx">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">发送数</span><span class="fb-val" id="fb1Tx">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">丢帧</span><span class="fb-val" id="fb1Drop">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">错误</span><span class="fb-val" id="fb1Err">--</span></div>
|
||
</div>
|
||
<div class="feedback-detail">
|
||
<div class="feedback-row"><span class="fb-label">TEC</span><span class="fb-val" id="fb1Tec">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">REC</span><span class="fb-val" id="fb1Rec">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">总线状态</span><span class="fb-val" id="fb1Bus">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">最新ID</span><span class="fb-val mono" id="fb1LastId">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">DLC</span><span class="fb-val" id="fb1Dlc">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">FD/BRS/ESI</span><span class="fb-val" id="fb1Flags">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">Seq</span><span class="fb-val" id="fb1Seq">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">Δrx/s</span><span class="fb-val" id="fb1Delta">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">最新HEX</span><span class="fb-val mono fb-data-cell" id="fb1LastData">--</span></div>
|
||
</div>
|
||
</div>
|
||
|
||
<div class="feedback-channel collapsed" id="fbCh2">
|
||
<div class="feedback-ch-head" role="button" tabindex="0" title="点击展开/折叠详情">
|
||
<span class="ch-dot ch2"></span> CAN2
|
||
<span class="feedback-expand-caret">▾</span>
|
||
</div>
|
||
<div class="feedback-primary">
|
||
<div class="feedback-row"><span class="fb-label">状态</span><span class="fb-val" id="fb2State">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">接收数</span><span class="fb-val" id="fb2Rx">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">发送数</span><span class="fb-val" id="fb2Tx">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">丢帧</span><span class="fb-val" id="fb2Drop">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">错误</span><span class="fb-val" id="fb2Err">--</span></div>
|
||
</div>
|
||
<div class="feedback-detail">
|
||
<div class="feedback-row"><span class="fb-label">TEC</span><span class="fb-val" id="fb2Tec">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">REC</span><span class="fb-val" id="fb2Rec">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">总线状态</span><span class="fb-val" id="fb2Bus">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">最新ID</span><span class="fb-val mono" id="fb2LastId">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">DLC</span><span class="fb-val" id="fb2Dlc">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">FD/BRS/ESI</span><span class="fb-val" id="fb2Flags">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">Seq</span><span class="fb-val" id="fb2Seq">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">Δrx/s</span><span class="fb-val" id="fb2Delta">--</span></div>
|
||
<div class="feedback-row"><span class="fb-label">最新HEX</span><span class="fb-val mono fb-data-cell" id="fb2LastData">--</span></div>
|
||
</div>
|
||
</div>
|
||
|
||
</div>
|
||
</div>
|
||
</section>
|
||
|
||
<!-- ═══ 每 ID 快照表 ═══ -->
|
||
<section class="card" id="idSnapshotSection" style="margin-top:18px;">
|
||
<div class="card-head"><span class="ico">🔬</span> 每 ID 快照表(1Hz 刷新)
|
||
<div class="feedback-controls">
|
||
<select class="input" id="idsnapChannel" style="width:100px;">
|
||
<option value="0">CAN0</option>
|
||
<option value="1">CAN1</option>
|
||
<option value="2">CAN2</option>
|
||
</select>
|
||
<span class="pill" id="idsnapStatus">--</span>
|
||
</div>
|
||
</div>
|
||
<div class="card-body">
|
||
<div class="idsnap-table-wrap">
|
||
<table class="idsnap-table" id="idsnapTable">
|
||
<thead>
|
||
<tr>
|
||
<th>#</th><th>CAN ID</th><th>DLC</th>
|
||
<th>FD</th><th>BRS</th><th>ESI</th><th>数据 (HEX)</th>
|
||
</tr>
|
||
</thead>
|
||
<tbody id="idsnapBody">
|
||
<tr><td colspan="7" class="status-empty">等待数据...</td></tr>
|
||
</tbody>
|
||
</table>
|
||
</div>
|
||
</div>
|
||
</section>
|
||
|
||
</div>
|
||
|
||
<div class="toast" id="toast">
|
||
<span class="toast-ico" id="toastIco">✓</span>
|
||
<span id="toastMsg">操作成功</span>
|
||
</div>
|
||
|
||
<script type="module" src="js/can_monitor.js?v=20260719s"></script>
|
||
</body>
|
||
</html> |