wandering1/STM32F4-Base
1
0
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 2 Releases Wiki Activity

fix(console): gate adcTask logs on console-writer readiness

Browse Source 
B1 on-board closed loop surfaced a byte-level console interleave: before
the console writer (defaultTask) registers, con_append() routes to
dbg_console_write_raw() -> con_tx_bounded(), which is register-level
polling with no mutual exclusion. adcTask logged every 1 ms, so its
first-frame line collided with defaultTask's [NAND_FTL] init line and
the required marker spanned two interleaved lines -> false FAIL.

- console_log: add dbg_console_writer_ready() (returns s_con_writer_up)
- adc_task: gate first-frame and 10 s stats logs on writer readiness;
  defer the first-frame report until the writer is up
- docs: close B1/P1-1 in the registry; flip stale "remaining @test"
  notes; correct the console doc's obsolete "drop-only, no interleave"
  claim (that held for HAL gState, not register-level raw send)

Bench (run_boot_test.py): VERDICT PASS, readback OK. adcTask
frames/seq +10000 per 10 s = 1000 Hz, idle=0, frst_err=0; stack
496/2048 (75%). @build 0/0.
This commit is contained in:
Wanderingss
2026-10-10 14:53:36 +08:00
parent 7c4b724057
commit da66c500ea
12 changed files with 103 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/task/adc_task.c
+25 -12
View File
@@ -20,12 +20,17 @@
* v1.1 2026-10-05 王建锋 P3-11：注明"预留桩（未启用）"，避免误认为已实现
* v2.0 2026-10-10 王建锋 B1：实现真实消费者（1ms 节拍 + 原子快照 + 帧统计 +
* 看门狗心跳），由 Src/freertos.c 创建为 adcTask
* v2.1 2026-10-10 王建锋 日志门控：首帧/周期统计仅在 dbg_console_writer_ready()
* 为真后落日志。写者未注册时控制台走无锁直发，与
* defaultTask 的存储初始化日志字节级交错（台架实测）；
* 就绪前挂起上报，就绪后补报最近一帧。
*/
#include "adc_task.h"
#include "cmsis_os.h"
#include "tpafe5160.h"
#include "task_watchdog.h"
#include "console_log.h"
#define DBG_TAG "[ADC_TASK]"
#include "dbg_log.h"
@@ -82,31 +87,39 @@ void adc_task_func(void *arg) {
r = tpafe5160_snapshot(s_frame, (uint8_t)TPAFE5160_CH_NUM);
if (r == 1) {
s_frames_consumed++;
if (first_logged == 0u) {
first_logged = 1u;
/* 只报 TPAFE 三路（UA=buf[6] UN=buf[5] IA=buf[2]），验证取数契约 */
DBG_INFO("first frame: UA=%d UN=%d IA=%d",
s_frame[6], s_frame[5], s_frame[2]);
}
} else if (r == 0) {
s_frames_idle++;
} else {
/* r == -1：参数错。调用点 count 为常量，不可达；不计入 idle 以区分异常 */
}
/* 2b) 首帧码值上报：**写者就绪后**才落日志。写者未注册时 con_append 走
* 无锁直发路径，与 defaultTask 的存储初始化日志会字节级交错
* （2026-10-10 台架实测）；此时挂起上报，就绪后补报最近一帧。
* 只报 TPAFE 三路（UA=buf[6] UN=buf[5] IA=buf[2]），验证取数契约 */
if ((first_logged == 0u) && (s_frames_consumed != 0u) &&
(dbg_console_writer_ready() != 0u)) {
first_logged = 1u;
DBG_INFO("first frame: UA=%d UN=%d IA=%d",
s_frame[6], s_frame[5], s_frame[2]);
}
/* 3) 看门狗心跳（本任务已纳入 required_mask） */
task_wd_beat(TASK_WD_ADC);
/* 4) 周期心跳日志：帧统计 + 驱动侧 FRSTDATA 错误计数 */
/* 4) 周期心跳日志：帧统计 + 驱动侧 FRSTDATA 错误计数。
* 写者就绪前抑制（同 2b 的交错理由）；到点无论是否落日志都推进下个上报点 */
{
uint32_t now = osKernelGetTickCount();
if ((int32_t)(now - report_at) >= 0) {
DBG_INFO("frames=%lu idle=%lu seq=%lu frst_err=%u",
(unsigned long)s_frames_consumed,
(unsigned long)s_frames_idle,
(unsigned long)tpafe5160_frame_seq(),
(unsigned)tpafe5160_frstdata_err());
if (dbg_console_writer_ready() != 0u) {
DBG_INFO("frames=%lu idle=%lu seq=%lu frst_err=%u",
(unsigned long)s_frames_consumed,
(unsigned long)s_frames_idle,
(unsigned long)tpafe5160_frame_seq(),
(unsigned)tpafe5160_frstdata_err());
}
report_at = now + ADC_TASK_REPORT_MS;
}
}