From f0c4f0d9f9efcb300546aaef06d7a79416b8c3c2 Mon Sep 17 00:00:00 2001 From: xin Date: Wed, 15 May 2024 17:38:10 +0800 Subject: [PATCH] =?UTF-8?q?+5=20=E6=94=B9=E6=88=90+2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Communication_Protocol.h | 2 +- src/IRIS_Method.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Communication_Protocol.h b/src/Communication_Protocol.h index 6803fa2..9965c8e 100644 --- a/src/Communication_Protocol.h +++ b/src/Communication_Protocol.h @@ -12,7 +12,7 @@ // todo : define your protocol here /*-------------------------------------------------------------------------------------------------------------*/ - + diff --git a/src/IRIS_Method.c b/src/IRIS_Method.c index 929ac6c..b623ea4 100644 --- a/src/IRIS_Method.c +++ b/src/IRIS_Method.c @@ -57,7 +57,7 @@ int32_t IRIS_STM32_Protocol_Unpack(uint8_t *PackData, uint16_t LenthofIn, uint8_ { return ERROR_NOT_ENOUGH_DATA; } - uint16_t CRC = IRIS_calcCRC(PackData+3, LenthofOut+5); + uint16_t CRC = IRIS_calcCRC(PackData+3, LenthofOut+2); if(CRC != (PackData[LenthofOut+6] + (PackData[LenthofOut+5] << 8))) { return ERROR_CRC; @@ -81,7 +81,7 @@ int32_t IRIS_Protocol_Unpack(uint8_t *PackData, uint16_t LenthofIn, uint8_t Comm } if(PackData[0] != 0x55 || PackData[1] != 0xAA) { - return ERROR_HEADER + return ERROR_HEADER; } if(PackData[2] != Command) { @@ -92,7 +92,7 @@ int32_t IRIS_Protocol_Unpack(uint8_t *PackData, uint16_t LenthofIn, uint8_t Comm { return ERROR_NOT_ENOUGH_DATA; } - uint16_t CRC = IRIS_calcCRC(PackData+3, LenthofOut+5); + uint16_t CRC = IRIS_calcCRC(PackData+3, LenthofOut+2); if(CRC != (PackData[LenthofOut+6] + (PackData[LenthofOut+5] << 8))) { return ERROR_CRC; @@ -111,7 +111,7 @@ int32_t IRIS_Cut_Befor_Header(uint8_t *PackData, uint16_t LenthofIn ) { if( PackData == NULL ) { - return ERROR_INPUT + return ERROR_INPUT; } uint16_t i = 0; for(i = 0; i < LenthofIn; i++) @@ -154,7 +154,7 @@ int32_t IRIS_Check_Data_Valid(uint8_t *PackData, uint16_t LenthofIn) { return ERROR_NOT_ENOUGH_DATA; } - uint16_t CRC = IRIS_calcCRC(PackData+3, LenthofOut+5); + uint16_t CRC = IRIS_calcCRC(PackData+3, LenthofOut+2); if(CRC != (PackData[LenthofOut+6] + (PackData[LenthofOut+5] << 8))) { return ERROR_CRC;