DataTarget为接收的node

User project/3.BasicFunction/Source/giant_can.c

@@ -170,7 +170,7 @@ void giant_CANRxData_Process(void)
         stGiantStandardDataFrameID_rx.DataBehaviors = (UBYTE)((CAN_ReceiveFrame_tmp->id & 0x001C0)>>6);
         stGiantStandardDataFrameID_rx.DataAddress = (UBYTE)(CAN_ReceiveFrame_tmp->id & 0x0003F);
         
-        if(stGiantStandardDataFrameID_rx.NodeGroup == NODE_SERVICETOOL)
+        if((stGiantStandardDataFrameID_rx.NodeGroup == NODE_SERVICETOOL)|| (stGiantStandardDataFrameID_rx.NodeGroup == NODE_USERINTERFACE))//上位机更新或者蓝牙通过仪表更新
         {
             if((stGiantStandardDataFrameID_rx.DataAddress == 0x1) && (CAN_ReceiveFrame_tmp->rx_dlen == 6))
             {
@@ -182,6 +182,7 @@ void giant_CANRxData_Process(void)
                     {
                         UBYTE reply_data[6];
                         memcpy(reply_data, CAN_ReceiveFrame_tmp->rx_data, CAN_ReceiveFrame_tmp->rx_dlen);
+                        reply_data[0] = (0x40 | stGiantStandardDataFrameID_rx.NodeGroup);
                         reply_data[5] = 0x10;
                         giant_SendExtendData(0x01, DB_ACTIVEDATA, reply_data, CAN_ReceiveFrame_tmp->rx_dlen);