@jiabaida/tools 1.0.7 → 1.0.10

package/src/core/BleCmdAnalysis/readAndSetParam.js

@@ -1,5 +1,5 @@
-import { decimalToHex, decimalToTwoByteHexArray } from '../BleDataProcess.js';
-import { enterFactory, existFactory, getDDA5FAAsync, getDDA5OldAsync, readExistFactory, setDDA5FAAsync, setDDA5OldAsync } from './BleCmdDD.js';
+import { decimalToHex, decimalToTwoByteHexArray, sleep, decimalToHex0x } from '../BleDataProcess.js';
+import { enterFactory, existFactory, getDD5AE1Async, getDD5AFBAsync, getDDA5FAAsync, getDDA5OldAsync, readExistFactory, resolveBaseDD, setDDA5FAAsync, setDDA5OldAsync } from './BleCmdDD.js';
 
 // #region 发指令读取参数 
 /**
@@ -20,7 +20,7 @@ export const readParamCmd = (chipType, deviceId, paramInfo, needFactoryMode = tr
     /**  地址转换为16进制 */
     const hexAddress = decimalToTwoByteHexArray(address);
     // 长度转换为16进制
-    const hexLength = decimalToHex(length);
+    const hexLength = decimalToHex0x(length);
     const handleRead = async (readFunction, index) => {
       try {
         const hex = await readFunction();
@@ -68,7 +68,7 @@ export const readParamCmd = (chipType, deviceId, paramInfo, needFactoryMode = tr
 */
 export const getSysParamCmd = async (chipType, deviceId, paramInfo, needFactoryMode = true) => {
   try {
-    console.log('paramInfo: ', paramInfo);
+    console.warn('paramInfo:参数信息', paramInfo);
     const paramObj = {
       address: paramInfo.paramNo,
       length: paramInfo.paramLength / 2,
@@ -89,10 +89,12 @@ export const getSysParamCmd = async (chipType, deviceId, paramInfo, needFactoryM
   }
 }
 
-// #region 系统写参数处理 
+// #region 系统写参数处理 判断wifi或蓝牙
 /**
  * @param {*} chipType 芯片类型
  * @param {*} deviceId 设备deviceId
+ * @param {*} macAddr 设备macAddr
+ * @param {*} blueConnect 是否通过蓝牙连接 默认true
  * @param {Array|Object} paramInfoArray 包含多个参数信息的数组或单个参数信息对象
  * @param {*} paramInfoArray[].newValue 新设置的参数输入值十进制值
  * @param {*} paramInfoArray[].paramValue 新设置的参数值十进制值 部分参数输入的值需单独处理
@@ -113,12 +115,15 @@ export const setSysParamCmd = async (chipType, deviceId, paramInfoArray) => {
     const paramObjs = [];
 
     for (const paramInfo of paramsToProcess) {
-      let value = Math.round(Number(paramInfo?.paramValue || paramInfo.newValue) / Number(paramInfo?.divisor || 1));
+      // 根据系数处理参数值
+      let value = Number(paramInfo?.paramValue || paramInfo.newValue) / Number(paramInfo?.divisor || 1);
       console.log('value: ', value);
       if (paramInfo.isTemp) {
         value = 2731 + (Number(paramInfo.newValue) * 10)
       }
-      const valuesHexs = decimalToTwoByteHexArray(value);
+      value = Math.round(value);
+      let valuesHexs = [];
+      valuesHexs = decimalToTwoByteHexArray(value);
       console.log('valuesHexs: ', valuesHexs);
 
       // 将处理后的参数对象添加到数组中
@@ -127,11 +132,14 @@ export const setSysParamCmd = async (chipType, deviceId, paramInfoArray) => {
         length: paramInfo.paramLength / 2,
         values: valuesHexs,
         oldAddress: paramInfo.oldParamNo,
+        newValue: value,
       });
     }
 
     // 一次性将所有参数对象数组传递给setParamCmd函数
+    console.log("chipType: 芯片", chipType);
     await setParamCmd(chipType, deviceId, paramObjs);
+   
   } catch (error) {
     console.error('error: 写系统参数报错 setSysParamCmd', error);
     throw error
@@ -143,6 +151,7 @@ export const setSysParamCmd = async (chipType, deviceId, paramInfoArray) => {
  * 发指令设置参数
  * @param {*} chipType 芯片类型
  * @param {*} deviceId 设备deviceId
+ * @param {*} macAddr 设备macAddr
  * @param {Array} paramInfoArray 参数信息数组 或单个对象
  * @param {*} paramInfoArray[].address 新协议开始写入地址（十进制）如 31
  * @param {*} paramInfoArray[].length 新协议写参数内容长度（写几个）（十进制）如 1
@@ -150,7 +159,7 @@ export const setSysParamCmd = async (chipType, deviceId, paramInfoArray) => {
  * @param {*} paramInfoArray[].oldAddress 旧协议写入地址 默认一个（十六进制字符串）如 '0x1f'
  * @returns {Promise<Array>} 包含所有参数设置结果的数组
  */
-export const setParamCmd = (chipType, deviceId, paramInfoArray) => {
+export const setParamCmd = async (chipType, deviceId, paramInfoArray) => {
   console.log("chipType: 芯片", chipType);
 
   // 确保paramInfoArray是数组
@@ -212,6 +221,84 @@ export const setParamCmd = (chipType, deviceId, paramInfoArray) => {
   });
 }
 
+/** 控制开关 
+ * @param {*} deviceId 
+ * @param {*} typeCmd 0x00 - 放电MOS 0x01 - 充电MOS
+ * @param {*} currentSwitch 当前修改开关状态 true - 打开 false - 关闭
+ * @param {*} anotherSwitch 另一个开关状态
+ * @returns 指令结果 Ooj.status: 00 - 成功 81/84 不支持 82/83 失败
+*/
+export const controlSwitch = async (deviceId, typeCmd, currentSwitch, anotherSwitch) => {
+  //充放电开关
+  const hex = await getDD5AFBAsync(
+    deviceId,
+    typeCmd,
+    currentSwitch ? "0x00" : "0x01",
+  );
+  const mosRes = resolveBaseDD(hex);
+  console.log("hex: ", hex);
+  let dataRes = mosRes
+  //FB指令控制mos失败或无响应，发送E1指令
+  if (!mosRes || mosRes?.status != '00') {
+    const cmd = getE1Cmd(typeCmd, currentSwitch, anotherSwitch);
+    const e1hex = await getDD5AE1Async(
+      deviceId,
+      cmd
+    );
+    dataRes = resolveBaseDD(e1hex);
+  }
+  return dataRes
+}
+/** 计算E1指令
+ * @param {*} typeCmd 0x00 - 放电MOS 0x01 - 充电MOS
+ * @param {*} currentSwitch 当前修改开关状态 true - 打开 false - 关闭
+ * @param {*} anotherSwitch 另一个开关状态 true - 打开 false - 关闭
+ * @returns 0x00 - 充电MOS打开 放电MOS打开
+ * 0x01 - 充电MOS关闭 放电MOS打开
+ * 0x02 - 充电MOS打开 放电MOS关闭
+ * 0x03 - 充电MOS关闭 放电MOS关闭
+*/
+export const getE1Cmd = (typeCmd, currentSwitch, anotherSwitch) => {
+  let cmd = '0x00'
+  // 根据E1指令码定义计算：
+  // 0x00 - 充电MOS打开 放电MOS打开
+  // 0x01 - 充电MOS关闭 放电MOS打开
+  // 0x02 - 充电MOS打开 放电MOS关闭
+  // 0x03 - 充电MOS关闭 放电MOS关闭
+  if (typeCmd === '0x00') {
+    // 当前是放电操作
+    if (currentSwitch && anotherSwitch) {
+      // 放电MOS打开，充电MOS打开
+      cmd = '0x00'
+    } else if (currentSwitch && !anotherSwitch) {
+      // 放电MOS打开，充电MOS关闭
+      cmd = '0x01'
+    } else if (!currentSwitch && anotherSwitch) {
+      // 放电MOS关闭，充电MOS打开
+      cmd = '0x02'
+    } else {
+      // 放电MOS关闭，充电MOS关闭
+      cmd = '0x03'
+    }
+  } else if (typeCmd === '0x01') {
+    // 当前是充电操作
+    if (currentSwitch && anotherSwitch) {
+      // 充电MOS打开，放电MOS打开
+      cmd = '0x00'
+    } else if (!currentSwitch && anotherSwitch) {
+      // 充电MOS关闭，放电MOS打开
+      cmd = '0x01'
+    } else if (currentSwitch && !anotherSwitch) {
+      // 充电MOS打开，放电MOS关闭
+      cmd = '0x02'
+    } else {
+      // 充电MOS关闭，放电MOS关闭
+      cmd = '0x03'
+    }
+  }
+  return cmd
+}
+
 // #region 写入标称容量
 /**写入标称容量 同步写入满充及循环
  * @param {*} chipType 芯片类型
@@ -230,17 +317,17 @@ export const setCapacityParamCmd = (chipType, deviceId, paramInfo) => {
     const { values } = paramInfo;
     // 循环 循环是标称的80%
     const circular = {
-      address: 1,
-      oldAddress: "0x11",
+      paramNo: 1,
+      oldParamNo: "0x11",
       values: values * 0.8,
-      length: 1,
+      paramLength: 2,
     };
     // 满充 满充等于标称  旧协议没有满充
     const full = {
-      address: 112,
-      oldAddress: "0x10",
+      paramNo: 112,
+      oldParamNo: "0x10",
       values: values,
-      length: 1,
+      paramLength: 2,
     };
 
     const handleSet = async (setFunction, index) => {
@@ -272,12 +359,42 @@ export const setCapacityParamCmd = (chipType, deviceId, paramInfo) => {
         return await handleSet(() => setDDA5OldAsync(deviceId, oldParamNo, hexValues), 4);
       }
     };
+
+    // 写入容量参数的高低位（标称容量、满充容量）
+    const handleCapacityParam = async (paramObj, lowParamNo, highParamNo) => {
+      const value = Math.round(Number(paramObj.values) / paramInfo.divisor);
+      console.log(`容量参数value (paramNo ${lowParamNo}):`, value);
+
+      // 拆分成高低16位
+      const lowValue = value & 0xFFFF; // 低16位
+      const highValue = (value >> 16) & 0xFFFF; // 高16位
+
+      // 写入低16位
+      const lowBytes = decimalToTwoByteHexArray(lowValue);
+      const lowAddress = decimalToTwoByteHexArray(lowParamNo);
+      const hexLength = decimalToHex(1);
+      const lowHex = await handleSet(async () => await setDDA5FAAsync(deviceId, lowAddress, hexLength, lowBytes), 7);
+
+      // 写入高16位
+      const highBytes = decimalToTwoByteHexArray(highValue);
+      const highAddress = decimalToTwoByteHexArray(highParamNo);
+      const highHex = await handleSet(async () => await setDDA5FAAsync(deviceId, highAddress, hexLength, highBytes), 7);
+
+      return lowHex && highHex;
+    };
     try {
       await enterFactory(deviceId);
-      const paramInfoHex = await handleParam(paramInfo);
+      let paramInfoHex;
+      if (chipType) {
+        // 新协议：标称容量需要写入两个参数（paramNo 0和155）
+        paramInfoHex = await handleCapacityParam(paramInfo, 0, 155);
+      } else {
+        // 旧协议：直接写入
+        paramInfoHex = await handleParam(paramInfo);
+      }
       const circularHex = await handleParam(circular);
       if (chipType) {
-        const fullHex = await handleParam(full);
+        const fullHex = await handleCapacityParam(full, 112, 156);
       }
       await existFactory(deviceId);
       if (paramInfoHex) {

package/src/core/BleDataProcess.js

@@ -312,22 +312,26 @@
     return new Promise((r) => setTimeout(() => r(true), n));
   }
   /**
- * 十进制数转换为两个字节的十六进制数组
- * @param {number} decimal 十进制数，范围 0 - 65535
- * @returns {Array} 包含两个字节十六进制字符串的数组
- */
+   * 将一个十进制数转换为两个字节的十六进制数组。
+   * @param {number} decimal - 要转换的十进制数。
+   * @returns {Array<string>} 包含两个十六进制字符串的数组，每个字符串表示一个字节。
+   */
   export const decimalToTwoByteHexArray = (decimal) => {
-    // 添加类型和整数检查
-    if (typeof decimal !== 'number' || !Number.isInteger(decimal)) {
-      throw new Error('输入必须为整数');
+    // 范围检查（支持有符号和无符号）
+    if (decimal < -32768 || decimal > 65535) {
+      throw new Error('输入超出范围（-32768 到 65535）');
     }
-    if (decimal < 0 || decimal > 65535) {
-      throw new Error('输入的十进制数超出 16 位无符号整数范围（0 - 65535）');
+
+    // 负数转为无符号 16 位表示
+    if (decimal < 0) {
+      decimal = decimal & 0xFFFF;
     }
-    let f = `00${(decimal >> 8).toString(16)}`.slice(-2);
-    let e = `00${(decimal & 0xff).toString(16)}`.slice(-2);
+
+    let f = `00${(decimal >> 8).toString(16).toUpperCase()}`.slice(-2);
+    let e = `00${(decimal & 0xff).toString(16).toUpperCase()}`.slice(-2);
     return [`0x${f}`, `0x${e}`];
   }
+  
 
   /**
    * 将十六进制字符串转换为两个十六进制的数组