Commit 81e1cf57 authored by 张金硕's avatar 张金硕

🐞 fix:优化蓝牙关闭时的逻辑,修改零件号

parent 90c88a1f
...@@ -71,7 +71,6 @@ void BlueToothService(void) ...@@ -71,7 +71,6 @@ void BlueToothService(void)
} }
else else
{ {
SetBluetoothCloseCount++;
if(GetBlueToothVaild == 1) if(GetBlueToothVaild == 1)
{ {
// if(SetBluetoothCloseCount < 30) // if(SetBluetoothCloseCount < 30)
...@@ -86,7 +85,9 @@ void BlueToothService(void) ...@@ -86,7 +85,9 @@ void BlueToothService(void)
// SetBluetoothCloseCount++; // SetBluetoothCloseCount++;
SetBluetoothTurnXX(0); SetBluetoothTurnXX(0);
GetBlueToothVaild = 0; GetBlueToothVaild = 0;
SetBluetoothCloseCount = 0;
} }
SetBluetoothCloseCount++;
if(SetBluetoothCloseCount >= 5) if(SetBluetoothCloseCount >= 5)
{ {
SetBluetoothTurnXX(0); SetBluetoothTurnXX(0);
......
...@@ -78,7 +78,7 @@ uint8_t MCU_HWversion[6] = {'H', 'V', (uint8_t)((HWV >> 8u) & 0x0Fu) + 0x30u, '. ...@@ -78,7 +78,7 @@ uint8_t MCU_HWversion[6] = {'H', 'V', (uint8_t)((HWV >> 8u) & 0x0Fu) + 0x30u, '.
uint8_t MCU_FBLversion[6] = {'B', 'V', (uint8_t)((BTV >> 8u) & 0x0Fu) + 0x30u, '.', (uint8_t)((BTV >> 4u) & 0x0Fu) + 0x30u, (uint8_t)(BTV & 0x0Fu) + 0x30u}; uint8_t MCU_FBLversion[6] = {'B', 'V', (uint8_t)((BTV >> 8u) & 0x0Fu) + 0x30u, '.', (uint8_t)((BTV >> 4u) & 0x0Fu) + 0x30u, (uint8_t)(BTV & 0x0Fu) + 0x30u};
//零件号信息 F187 //零件号信息 F187
uint8_t MCU_PartNumber[12] = {'H', 'J', 'Y', 'B', '-', '7', '5', '0', '0', 'T', 'F', 'T'}; uint8_t MCU_PartNumber[20] = {'3', '7', '1', '0', '0', '0', '-', '7', '5', '0', '0', '-', '0', '2', 'T', 'Y', '0', '0', '0', '0'};
/* internal program info */ /* internal program info */
const uint8_t DID_1024[13] = const uint8_t DID_1024[13] =
...@@ -671,11 +671,11 @@ void UDS_Service_22_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A ...@@ -671,11 +671,11 @@ void UDS_Service_22_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A
break; break;
case 0xF187: // 读零件号 case 0xF187: // 读零件号
for (i = 0; i < 12; i++) for (i = 0; i < 20; i++)
{ {
UDS_ISO14229_Transfer[i + 2] = MCU_PartNumber[i]; UDS_ISO14229_Transfer[i + 2] = MCU_PartNumber[i];
} }
UDS_Service_Response(si, POSITIVE_RSP, DIAG_ID_Tx, 2 + 12, UDS_ISO14229_Transfer); UDS_Service_Response(si, POSITIVE_RSP, DIAG_ID_Tx, 2 + 20, UDS_ISO14229_Transfer);
break; break;
case 0x5000U: // 读UUID case 0x5000U: // 读UUID
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment