node-red-zelecproto 0.1.2 → 0.1.3

package/645.js

@@ -755,6 +755,9 @@ function decode645(_msg) {
                 unit: 'V',
                 description: `${di === '02800008' ? '时钟电池电压' : '停电抄表电池电压'}: ${v.toFixed(2)}V`
             };
+        } else if (di === '0280000A' && arrPush.length >= 8) {
+            // 0280000A: 内部电池工作时间，4字节，单位分
+            value = bytesToIntBE(arrPush.slice(-4).reverse());
         } else if (di === '0400040A' && arrPush.length >= 7) {
             // 无功脉冲常数：DI(4) + N3(3字节BCD，小端)
             const dataBytes = arrPush.slice(4, 7); // LE：低字节在前
@@ -768,13 +771,7 @@ function decode645(_msg) {
         } else if (di === '03300D01' && arrPush.length >= 16) {
             value = parseCoverOpenLast645(arrPush);
         } else {
-            // 未匹配的DI，返回去偏移(−0x33)后的原始数据，便于排查/厂商私有解析
-            value = {
-                rawMinus33: bytesToHex(arrPush).replace(/\s+/g, ''),           // 含DI(4B) + 数据
-                di,
-                data: bytesToHex(arrPush.slice(4)).replace(/\s+/g, ''),        // 纯数据部分（不含DI）
-                note: '未识别DI，已返回去0x33的原始数据'
-            };
+            value = parseGeneric645Data(di, arrPush);
         }
     } catch (e) {
         return Object.assign(result, { ok: false, reason: 'decode_exception', exec_addr, di, ctrl, len, raw: put, err: String(e) });
@@ -888,6 +885,44 @@ function bcdDigitsStrLE(bytes) {
     return s;
 }
 
+function parseGeneric645Data(di, arrPush) {
+    const dataBytes = Array.from(arrPush.slice(4));
+    const dataHex = bytesToHex(dataBytes).replace(/\s+/g, '');
+    const result = {
+        rawMinus33: bytesToHex(arrPush).replace(/\s+/g, ''),
+        di,
+        data: dataHex,
+        length: dataBytes.length,
+        note: '未识别DI，已按通用格式解析候选值'
+    };
+
+    if (dataBytes.length === 0) return result;
+
+    result.uintLE = bytesToUInt(dataBytes, true);
+    result.uintBE = bytesToUInt(dataBytes, false);
+
+    try {
+        result.bcdLE = bcdLEToInt(dataBytes);
+        result.bcdText = bcdDigitsStrLE(dataBytes);
+    } catch (_) {
+        result.bcdLE = null;
+    }
+
+    if (dataBytes.every(b => b >= 0x20 && b <= 0x7E)) {
+        result.ascii = Buffer.from(dataBytes).toString('ascii');
+    }
+
+    return result;
+}
+
+function bytesToUInt(bytes, littleEndian) {
+    if (!bytes || bytes.length === 0) return null;
+    const arr = littleEndian ? bytes.slice().reverse() : bytes;
+    const hex = Buffer.from(arr).toString('hex') || '0';
+    const value = BigInt(`0x${hex}`);
+    return value <= BigInt(Number.MAX_SAFE_INTEGER) ? Number(value) : value.toString();
+}
+
 
 // === 开盖明细专用工具 ===
 

package/698.js

@@ -140,6 +140,7 @@ const OAD_CATEGORIES = {
     BATTERY_VOLTAGE: {
         "CLOCK_BATTERY_VOLTAGE": { oad: "20110200", desc: "时钟电池电压", type: "double-long-unsigned", unit: "V", scale: -2 },
         "POWER_DOWN_READING_BATTERY_VOLTAGE": { oad: "20120200", desc: "停电抄表电池电压", type: "double-long-unsigned", unit: "V", scale: -2 },
+        "CLOCK_BATTERY_WORK_TIME": { oad: "20130200", desc: "时钟电池工作时间", type: "double-long-unsigned", unit: "min", scale: 0 },
     },
     FREEZE_DATA: {
         "DAILY_FREEZE": { oad: "50040200", desc: "日冻结", requestType: "record" },
@@ -1781,6 +1782,48 @@ function parseBatteryVoltage(dataBuffer, oad) {
     return result;
 }
 
+/**
+ * 解析时钟电池工作时间（分钟）
+ * @param {Buffer} dataBuffer - 数据缓冲区
+ * @param {string} oad - OAD标识
+ * @returns {Object} 解析结果
+ */
+function parseClockBatteryWorkTime(dataBuffer, oad) {
+    const oadInfo = getOADInfo(oad);
+    const result = createStandardResult(oadInfo ? oadInfo.desc : "时钟电池工作时间", oad, dataBuffer);
+
+    try {
+        const { result: genericResult } = enhancedParseData(dataBuffer, oad.slice(0, 4), oad.slice(4, 6));
+
+        if (genericResult.dataType !== '双长无符号整数' || typeof genericResult.parsedValue !== 'number') {
+            throw new Error(`时钟电池工作时间数据格式不正确: ${genericResult.dataType}`);
+        }
+
+        const rawMinutes = genericResult.parsedValue;
+        result.value = rawMinutes;
+
+        setSuccessResult(result, [{
+            type: oadInfo ? oadInfo.desc : "时钟电池工作时间",
+            rawValue: rawMinutes,
+            minutes: rawMinutes,
+            workMinutes: rawMinutes,
+            clock_battery_work_min: rawMinutes,
+            unit: "min",
+            description: `${oadInfo ? oadInfo.desc : "时钟电池工作时间"} ${rawMinutes}分钟`
+        }], {
+            unit: "min",
+            scale: 0,
+            count: 1,
+            generic: genericResult
+        });
+
+    } catch (e) {
+        setErrorResult(result, e.message);
+    }
+
+    return result;
+}
+
 function parseEnergyData(dataBuffer, oad) {
     const result = createStandardResult("电能数据", oad, dataBuffer);
     try {
@@ -2277,6 +2320,7 @@ function oadParserRouter(payload, oad) {
     if (oad === '40070205') return parseLCDDecimalDigits(payload); //抄读当前组合有功电能数据块
     if (oad === '20110200') return parseBatteryVoltage(payload, oad); // 时钟电池电压
     if (oad === '20120200') return parseBatteryVoltage(payload, oad); // 停电抄表电池电压
+    if (oad === '20130200') return parseClockBatteryWorkTime(payload, oad); // 时钟电池工作时间
     // 通用兜底
     const oadInfo = getOADInfo(oad) || { desc: "通用数据" };
     const genericStdResult = createStandardResult(oadInfo.desc, oad, payload);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-zelecproto",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "node-red zelecproto node",
   "main": "index.js",
   "scripts": {