@jiabaida/tools 1.0.7 → 1.0.10

package/src/core/BleCmdAnalysis/BleCmdDDA4.js

@@ -20,7 +20,8 @@ export const getDDA420Async = async (deviceId) => {
           return { verified: c1 == _c1 && c2 == _c2 };
         },
       },
-      'DDA420'
+      'DDA420',
+      1500
     );
 }
   
@@ -85,10 +86,11 @@ export const getDDA420Async = async (deviceId) => {
     );
 
     // 6. 充电器温度（2字节）
-    const chargeTemperature = hexToDecimal(
+    const tempChargeTemperature = hexToDecimal(
       decimalToHex(data[n++]) +
       decimalToHex(data[n++])
-    ) / 10;
+    );
+    const chargeTemperature = tempChargeTemperature > 32768 ? (tempChargeTemperature - 65536) / 10 : tempChargeTemperature / 10;
 
     // 7. 已充电量（4字节）
     const chargeCapacity = hexToDecimal(
@@ -231,7 +233,7 @@ export const getDDA420Async = async (deviceId) => {
     const checks = generateCrcCheckSum(_command);
     const command = ['0xdd', '0xa4', ..._command, ...checks, '0x77'];
 
-    return this.getData(
+    return getData(
       deviceId,
       {
         command,
@@ -243,7 +245,8 @@ export const getDDA420Async = async (deviceId) => {
           return { verified: c1 == _c1 && c2 == _c2 };
         },
       },
-      'DDA421'
+      'DDA421',
+      1500
     );
   }
   /** 解析充电电池信息21指令
@@ -271,7 +274,8 @@ export const getDDA420Async = async (deviceId) => {
     const batterySOC = data[18]; // %
     // 电池温度 2BYTE [19,20]
     const batteryTempHex = decimalToHex(data[19]) + decimalToHex(data[20]);
-    const batteryTemperature = hexToDecimal(batteryTempHex) / 10; // 0.1摄氏度
+    const tempBatteryTemperature = hexToDecimal(batteryTempHex);
+    const batteryTemperature = tempBatteryTemperature > 32768 ? (tempBatteryTemperature - 65536) / 10 : tempBatteryTemperature / 10; // 0.1摄氏度
     // const batteryTemperature = [data[19] ?? 0, [data[20] ?? 0]] // 摄氏度，保留一位小数
     // 加热状态 1BYTE [21]
     const heatingStatus = data[21]; // 0未加热 1加热中
@@ -332,7 +336,8 @@ export const getDDA420Async = async (deviceId) => {
           return { verified: true };
         },
       },
-      'DDA425'
+      'DDA425',
+      1500
     );
   }
   export const resolveDDA425 = (data) => {
@@ -377,7 +382,8 @@ export const getDDA420Async = async (deviceId) => {
           return { verified: c1 == _c1 && c2 == _c2 };
         },
       },
-      'DDA422'
+      'DDA422',
+      3000
     );
   }
   /** 解析充电器参数22指令响应
@@ -406,46 +412,66 @@ export const getDDA420Async = async (deviceId) => {
    * 设置充电器参数23指令
    */
   export const getDDA423Async = async (deviceId, startReg, endReg, values, valuesLength) => {
-    // 转为2字节十六进制字符串
-    const startRegHex = decimalToHex(startReg, 4);
-    // 起始地址
-    const startRegArr = [
-      parseInt(startRegHex.slice(0, 2), 16),
-      parseInt(startRegHex.slice(2, 4), 16)
-    ];
-    // 结束地址
-    const endRegHex = decimalToHex(endReg, 4);
-    const endRegArr = [
-      parseInt(endRegHex.slice(0, 2), 16),
-      parseInt(endRegHex.slice(2, 4), 16)
-    ];
-    // 数据内容
-    const valueRegHex = decimalToHex(values, valuesLength * 2);
-    let valueArr = [];
-    for (let i = 0; i < valuesLength; i++) {
-      const hex = valueRegHex.slice(i * 2, i * 2 + 2);
-      valueArr.push(parseInt(hex.slice(0, 2), 16));
-    }
-
-    const lengthHex = decimalToHex(4+valuesLength, 2);
+    try {
+      // 起始/结束地址 2 字节大端
+      const startRegHex = decimalToHex(startReg, 4);
+      const startRegArr = [
+        parseInt(startRegHex.slice(0, 2), 16),
+        parseInt(startRegHex.slice(2, 4), 16)
+      ];
+      const endRegHex = decimalToHex(endReg, 4);
+      const endRegArr = [
+        parseInt(endRegHex.slice(0, 2), 16),
+        parseInt(endRegHex.slice(2, 4), 16)
+      ];
+
+      let valueArr = [];
+      // 批量模式：传入数组
+      if (Array.isArray(values)) {
+        valueArr = values.map(v => (Number(v) || 0) & 0xFF);
+        const expectLen = endReg - startReg + 1;
+        if (valueArr.length !== expectLen) {
+          if (valueArr.length > expectLen) {
+            valueArr = valueArr.slice(0, expectLen);
+          } else {
+            while (valueArr.length < expectLen) valueArr.push(0);
+          }
+        }
+        valuesLength = valueArr.length;
+      } else {
+        // 单值模式：保持兼容旧逻辑
+        const len = valuesLength || (endReg - startReg + 1);
+        const valueRegHex = decimalToHex(values, len * 2);
+        for (let i = 0; i < len; i++) {
+          const hex = valueRegHex.slice(i * 2, i * 2 + 2);
+          valueArr.push(parseInt(hex, 16));
+        }
+        valuesLength = len;
+      }
 
-    const _command = ['0x23', lengthHex, ...startRegArr, ...endRegArr, ...valueArr];
-    const checks = generateCrcCheckSum(_command);
-    const command = ['0xDD', '0xA4', ..._command, ...checks, '0x77'];
-    return getData(
-      deviceId,
-      {
-        command,
-        commandVerifyHandler: (hexArr) => ({ verified: hexArr[0] == 0xdd && hexArr[1] == 0x23, pkgLen: hexArr[3] + 7 }),
-        pkgVerifyHandler: (pkg) => {
-          const len = pkg.length;
-          const [c1, c2] = generateCrcCheckSum(pkg.slice(2, len - 3));
-          const [_c1, _c2] = [pkg[len - 3], pkg[len - 2]];
-          return { verified: c1 == _c1 && c2 == _c2 };
+      const lengthHex = 4 + valuesLength;
+      const _command = ['0x23', lengthHex, ...startRegArr, ...endRegArr, ...valueArr];
+      const checks = generateCrcCheckSum(_command);
+      const command = ['0xDD', '0xA4', ..._command, ...checks, '0x77'];
+      return getData(
+        deviceId,
+        {
+          command,
+          commandVerifyHandler: (hexArr) => ({ verified: hexArr[0] == 0xdd && hexArr[1] == 0x23, pkgLen: hexArr[3] + 7 }),
+          pkgVerifyHandler: (pkg) => {
+            const len = pkg.length;
+            const [c1, c2] = generateCrcCheckSum(pkg.slice(2, len - 3));
+            const [_c1, _c2] = [pkg[len - 3], pkg[len - 2]];
+            return { verified: c1 == _c1 && c2 == _c2 };
+          },
         },
-      },
-      'DDA423'
-    );
+        'DDA423',
+        3000
+      );
+    } catch (e) {
+      console.warn('getDDA423Async build frame error', e);
+      return Promise.reject(e);
+    }
   }
   export const resolveDDA423 = (data) => {
     if (!data) return null;
@@ -475,14 +501,14 @@ export const getDDA420Async = async (deviceId) => {
 
     // 转 4 字节 (大端) 十六进制 -> 数组
     const to4Bytes = (val) => {
-      const hex = commonfun.decimalToHex(val, 8); // 8位十六进制字符串
+      const hex = decimalToHex(val, 8); // 8位十六进制字符串
       return [0, 2, 4, 6].map(i => parseInt(hex.slice(i, i + 2), 16));
     };
     const voltageArr = to4Bytes(outputVoltage);
     const currentArr = to4Bytes(outputCurrent);
 
     // 长度 = 1(模式) +4(电压)+4(电流) = 9
-    const lengthHex = commonfun.decimalToHex(9, 2); // '09'
+    const lengthHex = decimalToHex(9, 2); // '09'
     const _command = ['0x26', `0x${lengthHex}`, testMode & 0xFF, ...voltageArr, ...currentArr].map(o => typeof o === 'number' ? `0x${('00' + o.toString(16)).slice(-2)}` : o);
     // 去掉 0x 前缀转成数值数组生成 CRC
     const _commandNums = _command.map(h => parseInt(h, 16));
@@ -615,49 +641,31 @@ export const getDDA420Async = async (deviceId) => {
    * @param {*} deviceId
    * @returns
    */
-  export const getDDA429Async = async (deviceId, id) => {
-    // id、是四个bites
+  export const getDDA429Async = async (deviceId, id = 1, seq = 0) => {
+    // ID 与 SEQ 均为 4 字节大端
     const idHex = decimalToHex(id, 8);
-    // 拆分为4字节
+    const seqHex = decimalToHex(seq, 8);
     const idArr = [
       parseInt(idHex.slice(0, 2), 16),
       parseInt(idHex.slice(2, 4), 16),
       parseInt(idHex.slice(4, 6), 16),
-      parseInt(idHex.slice(4, 6), 16),
       parseInt(idHex.slice(6, 8), 16)
     ];
-    const _command = ['0x29', '0x04', ...idArr];
+    const seqArr = [
+      parseInt(seqHex.slice(0, 2), 16),
+      parseInt(seqHex.slice(2, 4), 16),
+      parseInt(seqHex.slice(4, 6), 16),
+      parseInt(seqHex.slice(6, 8), 16)
+    ];
+    // 长度 = 8 (ID+SEQ)
+    const _command = ['0x29', '0x08', ...idArr, ...seqArr];
     const checks = generateCrcCheckSum(_command);
-    const command = ['0xdd', '0xa4', ..._command, ...checks, '0x77'];
-
-
+    const command = ['0xDD', '0xA4', ..._command, ...checks, '0x77'];
     return getData(
       deviceId,
       {
         command,
-        commandVerifyHandler: (hexArr) => {
-          // 基本头部验证
-          if (hexArr[0] != 0xdd || hexArr[1] != 0x29) return { verified: false, pkgLen: null };
-          
-          // 验证数据包长度是否合理
-          if (hexArr.length < 8) return { verified: false, pkgLen: null };
-          
-          // 根据resolveDDA429的解析结构，ID在响应偏移32位置
-          // 实际协议中可能有所不同，需要根据协议规范调整
-          if (hexArr.length >= 36) {
-            // 从resolveDDA429可知，ID位于n=32处的4个字节
-            const respIdHex = decimalToHex(hexArr[32]) + 
-                             decimalToHex(hexArr[33]) + 
-                             decimalToHex(hexArr[34]) + 
-                             decimalToHex(hexArr[35]);
-            const respId = hexToDecimal(respIdHex);
-            
-            // 如果ID不匹配，则拒绝该数据包
-            if (respId !== id) return { verified: false, pkgLen: null };
-          }
-          
-          return { verified: true, pkgLen: hexArr[3] + 7 };
-        },
+        commandVerifyHandler: (hexArr) => ({ verified: hexArr[0] == 0xdd && hexArr[1] == 0x29, pkgLen: hexArr[3] + 7 }),
         pkgVerifyHandler: (pkg) => {
           const len = pkg.length;
           const [c1, c2] = generateCrcCheckSum(pkg.slice(2, len - 3));
@@ -665,161 +673,80 @@ export const getDDA420Async = async (deviceId) => {
           return { verified: c1 == _c1 && c2 == _c2 };
         },
       },
-      'DDA429'
+      'DDA429',
+      3000
     );
   }
   export const resolveDDA429 = (data) => {
     if (!data) return null;
+    const status = data[2];
+    const content = data.slice(4, data.length - 3);
     const dataStr = hexArr2string(data);
-    let n = 4; // 起始偏移
-
-    // 1. 工作状态
-    const workStatus = data[n++];
-
-    // 2. 充电状态
-    const chargeStatus = data[n++];
-
-    // 3. 充电电压（4字节）
-    const chargeVoltage = hexToDecimal(
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++])
-    );
-
-    // 4. 充电电流（4字节）
-    const chargeElectricity = hexToDecimal(
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++])
-    );
-
-    // 5. 充电功率（2字节）
-    const chargePower = hexToDecimal(
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++])
-    );
-
-    // 6. 充电器温度（2字节）
-    const chargeTemperature = hexToDecimal(
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++])
-    ) / 10;
-
-    // 7. 已充电量（4字节）
-    const chargeCapacity = hexToDecimal(
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++])
-    );
-
-    // 8. 充电时长（2字节）
-    const chargeTime = hexToDecimal(
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++])
-    );
-
-    // 9. 充电剩余时间（2字节）
-    const chargeRemainTime = hexToDecimal(
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++])
-    );
-
-    // 10. 充电完成时长（2字节）
-    const chargeCompleteTime = hexToDecimal(
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++])
-    );
-
-    // 输出电压占空比
-    const outputVoltagePercent = data[n++];
-
-    // 输出电流占空比
-    const outputElectricityPercent = data[n++];
-
-    // id（4字节）
-    const id1 = hexToDecimal(
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++])
-    );
-
-    // 检测输出电流（4字节）
-    const outputElectricity = hexToDecimal(
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++])
-    );
-
-    // 检测电池电压（4字节）
-    const id = hexToDecimal(
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++])
-    );
-
-    //  开关状态（2字节）
-    const switchStatus = hexToDecimal(
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++])
-    );
-    const swtichStatusArr = switchStatus.toString(2).padStart(16, '0').split('').reverse();
-    const chargeSwitch = swtichStatusArr[0] == '1';
-    const preChargeSwitch = swtichStatusArr[1] == '1';
-    const fanSwitch = swtichStatusArr[2] == '1';
-
-    // 保护状态（4字节）
-    const protectStatus = hexToDecimal(
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++])
-    );
-    const protectStatusArr = protectStatus.toString(2).padStart(32, '0').split('').reverse();
-    let protectStatusIndexs = [];
-    for (let i = 0; i < protectStatusArr.length; i++) {
-      if (protectStatusArr[i] == '1') protectStatusIndexs.push(i);
+    if (content.length < 8) return { dataStr, status, error: 'content too short' };
+
+    const id = hexToDecimal(decimalToHex(content[0]) + decimalToHex(content[1]) + decimalToHex(content[2]) + decimalToHex(content[3]));
+    const seq = hexToDecimal(decimalToHex(content[4]) + decimalToHex(content[5]) + decimalToHex(content[6]) + decimalToHex(content[7]));
+    const body = content.slice(8);
+
+    // ID=1 解析：末尾 57 字节固定含义，其余视作工作信息原始区
+    if (id === 1) {
+      const peerTailLen = 57;
+      let workInfo = [];
+      let peerSection = [];
+      if (body.length >= peerTailLen) {
+        workInfo = body.slice(0, body.length - peerTailLen);
+        peerSection = body.slice(body.length - peerTailLen);
+      } else {
+        peerSection = body.slice();
+      }
+      const workinfoField = {
+        state: workInfo[0] || 0,
+        ipwm: hexToDecimal(decimalToHex(workInfo[24]) + decimalToHex(workInfo[25]) + decimalToHex(workInfo[26]) + decimalToHex(workInfo[27])),
+        vpwm: hexToDecimal(decimalToHex(workInfo[28]) + decimalToHex(workInfo[29]) + decimalToHex(workInfo[30]) + decimalToHex(workInfo[31])),
+        vout: hexToDecimal(decimalToHex(workInfo[32]) + decimalToHex(workInfo[33]) + decimalToHex(workInfo[34]) + decimalToHex(workInfo[35])),
+        iout: hexToDecimal(decimalToHex(workInfo[36]) + decimalToHex(workInfo[37]) + decimalToHex(workInfo[38]) + decimalToHex(workInfo[39])),
+        vbat: hexToDecimal(decimalToHex(workInfo[40]) + decimalToHex(workInfo[41]) + decimalToHex(workInfo[42]) + decimalToHex(workInfo[43])),
+        port: String(workInfo[54]) || 0
+      };
+      const fieldNames = ['peer_curr', 'peer_num', 'ble_state', 'ble_init', 'ble_release', 'release_cnt', 'scan_start', 'scan_end', 'scan_res', 'scan_resp', 'conn_start', 'conn_resp', 'conn_end', 'conn_idx', 'conn_res', 'cmp_resp', 'handshake_resp', 'qr_chg', 'blacklist', 'ext_resp', 'ext_num'];
+      const peerMap = {};
+      peerSection.slice(0, 21).forEach((b, i) => { peerMap[fieldNames[i] || (`extra_${i}`)] = b; });
+
+      const extraBytes = peerSection.slice(21);
+      let i = 0;
+      let j = 0;
+      const fieldNamesExtra = ['run_ts', 'scan_ts', 'scan_end_ts', 'get_ts', 'get_end_ts', 'conn_ts', 'conn_end_ts', 'cmp_ts', 'cmp_end_ts'];
+      while (i < extraBytes.length) {
+        peerMap[fieldNamesExtra[j] || (`extra_${j}`)] = hexToDecimal(
+          decimalToHex(extraBytes[i] || 0) +
+          decimalToHex(extraBytes[i + 1] || 0) +
+          decimalToHex(extraBytes[i + 2] || 0) +
+          decimalToHex(extraBytes[i + 3] || 0)
+        );
+        i += 4;
+        j += 1;
+      }
+      return { dataStr, status, id, seq, type: 'ID1', ...workinfoField, ...peerMap };
     }
 
-    // 告警状态（4字节）
-    const alarmStatus = hexToDecimal(
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++]) +
-      decimalToHex(data[n++])
-    );
-    const alarmStatusArr = alarmStatus.toString(2).padStart(32, '0').split('').reverse();
-    let alarmStatusIndexs = [];
-    for (let i = 0; i < alarmStatusArr.length; i++) {
-      if (alarmStatusArr[i] == '1') alarmStatusIndexs.push(i);
+    // ID=2/3 解析：按 16 字节一组 peer_info
+    if (id === 2 || id === 3) {
+      const peerInfos = [];
+      for (let i = 0; i + 16 <= body.length; i += 16) {
+        const seg = body.slice(i, i + 16);
+        const macBytes = seg.slice(0, 6).map(b => decimalToHex(b));
+        const mac = macBytes.map(m => m.toUpperCase()).join(':');
+        const state = seg[6] === 255 ? -1 : seg[6];
+        const cmp = seg[7] === 255 ? -1 : seg[7];
+        const voltage = hexToDecimal(decimalToHex(seg[8]) + decimalToHex(seg[9]));
+        const b_voltage = hexToDecimal(decimalToHex(seg[10]) + decimalToHex(seg[11]));
+        const current = hexToDecimal(decimalToHex(seg[12]) + decimalToHex(seg[13]));
+        const b_current = hexToDecimal(decimalToHex(seg[14]) + decimalToHex(seg[15]));
+        peerInfos.push({ mac, state, cmp, voltage, b_voltage, current, b_current });
+      }
+      return { dataStr, status, id, seq, type: `ID${id}`, peerInfos: peerInfos.map((item, i) => ({ id: i, ...item })) };
     }
 
-    return {
-      dataStr,
-      workStatus,
-      chargeStatus,
-      chargeVoltage,
-      chargeElectricity,
-      chargePower,
-      chargeTemperature,
-      chargeCapacity,
-      chargeTime,
-      chargeRemainTime,
-      chargeCompleteTime,
-      outputVoltagePercent,
-      outputElectricityPercent,
-      id,
-      outputElectricity,
-      id1,
-      chargeSwitch,
-      preChargeSwitch,
-      fanSwitch,
-      protectStatusIndexs,
-      alarmStatusIndexs,
-    };
+    // 未知 ID
+    return { dataStr, status, id, seq, raw: body };
   }

package/src/core/BleCmdAnalysis/BleCmdFFAA.js

@@ -168,6 +168,7 @@ export const getFFAA80Async = async (deviceId, ATStr) => {
     },
     'FFAA_80(AT)'
   );
+  console.log('getFFAA80Async', hex)
   if(!hex) return null;
   return resolveFFAA80(hex);
 }