修改双电池bug

user_inc/soft_bms.h

@@ -341,7 +341,7 @@ struct BMS_DATA
     uint16_t bms_cycle; //循环次数
     uint16_t bms_volt;  //电压 mv
     int16_t bms_ac;     //电流 10ma
-    uint16_t bms_temp;  //温度 0.1℃
+    int16_t bms_temp;  //温度 0.1℃
     uint8_t bms_vs;     //充电百分比 1%
     uint16_t bms_ss;    //状态
     uint16_t serial_num; //VK3厂商编号

user_src/soft_device.c

@@ -338,10 +338,10 @@ void update_device_type_data(void)
 
             if(bms_data.bms_group == 2)
             {
-                memcpy(&Dev.Bms.buf[Dev.Bms.index],&bms_data.bms_ids,1 + bms_data.bms_num * 2);
-                Dev.Bms.index += (1 + bms_data.bms_num * 2);
+                memcpy(&Dev.Bms.buf[Dev.Bms.index],&bms_data2.bms_num,1 + bms_data.bms_num * 2);
+                Dev.Bms.index += (1 + bms_data2.bms_num * 2);
 
-                memcpy(&Dev.Bms.buf[Dev.Bms.index],&bms_data.bms_ids,43);
+                memcpy(&Dev.Bms.buf[Dev.Bms.index],&bms_data2.bms_ids,43);
                 Dev.Bms.index += 43;
 
                 memcpy(&Dev.Bms.buf[Dev.Bms.index],&fplate.bms_plug_tempture,2);

user_src/soft_version.c

@@ -266,7 +266,7 @@ void can_recv_mimo_dev_version(uint32_t cellCanID, uint8_t data[], uint8_t len)
         else if(data[0] == 0xFB && data[1] == 0x03 && data[2] == 0)
         {   
             //设置距离最大值反馈
-            if(data[3] == 0xB1 && data[4] == 0xc1 && data[5] == 0)
+            if(data[3] == 0xB2 && data[4] == 0xE1)
             {
                 pmu_set_ack(_MSGID_SET,MSGID_SET_LACKLOSS_CAL,mimo_lackloss.cal_distance,mimo_lackloss.strength);
             }
@@ -1001,36 +1001,7 @@ void get_eftdev_version_and_sn(void)
 
 }
 
-/**
-  * @file    get_device_version_and_sn
-  * @brief   版本号
-  * @param   none
-  * @details 
-  * @author  Zhang Sir 
- **/
-void get_device_version_and_sn(void)
-{
-    static uint32_t circu_time = 0;
-
-    if(Check_Timer_Ready(&circu_time,_1_HZ_))
-    {
-        //获取雷达版本和SN号
-        get_radar_version_and_sn();
 
-        //获取流量计版本和SN号
-        get_flowmeter_version_and_sn();
-
-        get_spread_version_and_sn();
-        get_spary_version_and_sn();
-        get_nozzle_version_and_sn();
-        get_weight_version_and_sn();
-        // //获取EFT设备版本信息
-        // if(drone_type == Drone_Z70)
-        //     get_eftZ70_version_and_sn();
-        // else if(drone_type == Drone_Z20)
-        //     get_eftdev_version_and_sn();
-    }
-}
 
 /**
   * @file    get_spread_version_and_sn
@@ -1476,3 +1447,33 @@ void regist_dev_info(dev_version_content *dev,uint8_t num,bool verify_flag,char
     }
 };
 
+/**
+  * @file    get_device_version_and_sn
+  * @brief   版本号
+  * @param   none
+  * @details 
+  * @author  Zhang Sir 
+ **/
+void get_device_version_and_sn(void)
+{
+    static uint32_t circu_time = 0;
+
+    if(Check_Timer_Ready(&circu_time,_1_HZ_))
+    {
+        //获取雷达版本和SN号
+        get_radar_version_and_sn();
+
+        //获取流量计版本和SN号
+        get_flowmeter_version_and_sn();
+
+        get_spread_version_and_sn();
+        get_spary_version_and_sn();
+        get_nozzle_version_and_sn();
+        get_weight_version_and_sn();
+        // //获取EFT设备版本信息
+        // if(drone_type == Drone_Z70)
+        //     get_eftZ70_version_and_sn();
+        // else if(drone_type == Drone_Z20)
+        //     get_eftdev_version_and_sn();
+    }
+}

user_src/usart_data_handle.c

@@ -565,10 +565,7 @@ void thread_usart_task_entry(void *param)
                     uint8_t can_buf[8] = {0};
                     if(Dev.Lackloss_Link.connect_status == COMP_NORMAL)
                     {
-                        mimo_lackloss.cal_distance = mimo_lackloss.distance + 5;
-                        put_date_to_can(can_buf,0xFA,0x03,0x00,0xB1,0XC1,0x00,0X00,0X00);
-                        can_buf[6] = mimo_lackloss.cal_distance & 0xff;
-                        can_buf[5] = (mimo_lackloss.cal_distance >> 8) & 0xff;
+                        put_date_to_can(can_buf,0xFA,0x03,0x00,0xB2,0XE1,0x00,0X00,0X00);
                         can_buf[7] = (can_buf[1]+can_buf[2]+can_buf[3]+can_buf[4]+can_buf[5]+can_buf[6]) & 0xff;
                         Can_Send_Msg_Func(CANID2, can_buf, 8, 0xFA, CAN_ID_STD);
                     }