修改运行时间为每差分1分钟或者跨天时主动上报,防止上报过快或过慢

This commit is contained in:
2026-09-10 11:03:10 +08:00
parent d50f1302de
commit d2565a4c8a
4 changed files with 40 additions and 5 deletions
+1 -1
View File
@@ -200,7 +200,7 @@ void app_runrec_rotate_if_needed(void)
}
}
/* 每拍灌 DP17读请求 / 10min 全量能拿到当前秒数;差分上报不带本 DP */
/* 每拍灌 DP170x05 读立刻拿到当前秒;差分满 1 分钟才 0x07;10min 全量仍带 */
app_runrec_pack(gDevData.run_record);
if (need_vm) {
app_nvm_save_runrec(); /* 满 10 分钟或跨天 / 首次对时才写 flash */
+36 -4
View File
@@ -647,9 +647,15 @@ static void jbUnpackDps(const uint8_t *bitmap, const uint8_t *values,
/* ════════════════════════════════════════════════════════════════
* jbBuildDiffMask — 比较上次与当前值,为变化的可上报 DP 置 mask 位
* 返回: 1 = 有 DP 发生变化, 0 = 全部未变化
* DP17 运行记录不参与差分:秒数常变,避免 2s 一包 124B;仍走读请求与定时全量
* DP17 运行记录:今天累计秒数相对上次上报满 JB_RUNREC_DIFF_SEC 才进差分;
* 其它日期格变化(跨天旋转)立刻进差分。0x05 读 / 10min 全量仍带完整 124B。
* ════════════════════════════════════════════════════════════════ */
static uint32_t jbRunrecTodaySec(const uint8_t *rec)
{
return ((uint32_t)rec[0] << 24) | ((uint32_t)rec[1] << 16)
| ((uint32_t)rec[2] << 8) | (uint32_t)rec[3];
}
static uint8_t jbBuildDiffMask(const jb_data_point_t *last,
const jb_data_point_t *cur,
uint8_t *mask)
@@ -754,7 +760,21 @@ static uint8_t jbBuildDiffMask(const jb_data_point_t *last,
mask[DP_ID_TIME_CONFIG7 / 8] |= (1 << (DP_ID_TIME_CONFIG7 % 8));
hasChange = 1;
}
/* DP17 运行记录:不进差分(秒累加会刷 0x07);0x05 读 / 10min 全量仍带 */
/* DP17 运行记录:今天秒数差分满 1 分钟,或后 30 天格变了(跨天) */
{
uint32_t last_today = jbRunrecTodaySec(last->run_record);
uint32_t cur_today = jbRunrecTodaySec(cur->run_record);
uint32_t delta = (cur_today > last_today)
? (cur_today - last_today)
: (last_today - cur_today);
if ((delta >= JB_RUNREC_DIFF_SEC)
|| memcmp(&last->run_record[4], &cur->run_record[4], 120))
{
mask[DP_ID_RUN_RECORD / 8] |= (1 << (DP_ID_RUN_RECORD % 8));
hasChange = 1;
}
}
/* DP19 设备故障使能 */
if (last->fault_en != cur->fault_en)
{
@@ -937,7 +957,19 @@ static void jbReportPolicy(jb_data_point_t *data)
(now - jbProtocol.lastChangeTime > REPORT_DEBOUNCE))
{
jbSendReport(data, diffMask);
memcpy(&jbProtocol.lastData, data, sizeof(jb_data_point_t));
/* 未带 DP17 时保留上次记录基准,避免加热开关等上报把 1 分钟差分冲掉 */
if (!(diffMask[DP_ID_RUN_RECORD / 8] & (1u << (DP_ID_RUN_RECORD % 8))))
{
uint8_t keep[124];
memcpy(keep, jbProtocol.lastData.run_record, 124);
memcpy(&jbProtocol.lastData, data, sizeof(jb_data_point_t));
memcpy(jbProtocol.lastData.run_record, keep, 124);
}
else
{
memcpy(&jbProtocol.lastData, data, sizeof(jb_data_point_t));
}
jbProtocol.lastChangeTime = now;
jbProtocol.lastReportTime = now;
return;
+1
View File
@@ -33,6 +33,7 @@
#define SEND_MAX_NUM 3 /* 最大重传次数 */
#define REPORT_DEBOUNCE 2000 /* 变化上报防抖时间(ms) */
#define REPORT_PERIOD 600000 /* 定时全量上报周期(ms) */
#define JB_RUNREC_DIFF_SEC 60 /* DP17 差分:今天秒数相对上次上报满 1 分钟才带 */
/* Device identity: 取自 Excel 设备信息表的 ProdtCode / productCode。
* JB_CATEGORY_CODE: 必须 4 字符 ASCII,供 BLE 广播 prodcode 使用