From 17747b92ba07598edd67c849eb04fbaec7403565 Mon Sep 17 00:00:00 2001 From: 95384 <664090429@qq.com> Date: Fri, 10 Jan 2025 18:22:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E6=B5=8B=E8=AF=95OK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/Src/encrypt.c | 2 +- App/Src/frt_protocol.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/App/Src/encrypt.c b/App/Src/encrypt.c index 849c995..7188962 100644 --- a/App/Src/encrypt.c +++ b/App/Src/encrypt.c @@ -27,5 +27,5 @@ uint8_t JudgeEncrypt() // uint32_t key[] = {0x509770ff, 0x29c6b369, 0x4da2c125, IDÖмä32λ}; // uint32_t key[] = {(K_128 >> 1) ^ (*(uint32_t*)(0x1FFF7590 + 4)), (K_96 >> 2) ^ key[0], (K_64 >>1) ^ (*(uint32_t*)(0x1FFF7590)), (*(uint32_t*)(0x1FFF7590 + 4)) ^ key[0]}; tea_decrypt(encryptCode, key); - return ((*(uint32_t*)(0x1FFF7590)) == encryptCode[0] && (*(uint32_t*)(0x1FFF7590 + 4)) == encryptCode[1]); + return ((*(uint32_t*)(0x1FFF7590 + 4)) == encryptCode[0] && (*(uint32_t*)(0x1FFF7590 + 8)) == encryptCode[1]); } diff --git a/App/Src/frt_protocol.c b/App/Src/frt_protocol.c index 3d6bd8f..f406543 100644 --- a/App/Src/frt_protocol.c +++ b/App/Src/frt_protocol.c @@ -890,7 +890,7 @@ static u_int16_t FRT_ReadReg_MaxWave_4(void *pMsg) */ static u_int16_t FRT_ReadReg_ID_1(void *pMsg) { - u_int16_t value = ((*(uint32_t*)(0x1FFF7590)) >> 16) & 0x0000FFFF; + u_int16_t value = ((*(uint32_t*)(0x1FFF7590 + 4)) >> 16) & 0x0000FFFF; return FRT_swap_endian_16(value); } @@ -901,7 +901,7 @@ static u_int16_t FRT_ReadReg_ID_1(void *pMsg) */ static u_int16_t FRT_ReadReg_ID_2(void *pMsg) { - u_int16_t value = (*(uint32_t*)(0x1FFF7590)) & 0x0000FFFF; + u_int16_t value = (*(uint32_t*)(0x1FFF7590 + 4)) & 0x0000FFFF; return FRT_swap_endian_16(value); } @@ -912,7 +912,7 @@ static u_int16_t FRT_ReadReg_ID_2(void *pMsg) */ static u_int16_t FRT_ReadReg_ID_3(void *pMsg) { - u_int16_t value = ((*(uint32_t*)(0x1FFF7590 + 4)) >> 16) & 0x0000FFFF; + u_int16_t value = ((*(uint32_t*)(0x1FFF7590 + 8)) >> 16) & 0x0000FFFF; return FRT_swap_endian_16(value); } @@ -923,7 +923,7 @@ static u_int16_t FRT_ReadReg_ID_3(void *pMsg) */ static u_int16_t FRT_ReadReg_ID_4(void *pMsg) { - u_int16_t value = (*(uint32_t*)(0x1FFF7590 + 4)) & 0x0000FFFF; + u_int16_t value = (*(uint32_t*)(0x1FFF7590 + 8)) & 0x0000FFFF; return FRT_swap_endian_16(value); }