From 138768dd65f4abf03cff9ff4b189809ca46d00d0 Mon Sep 17 00:00:00 2001 From: zhangsan Date: Thu, 7 Oct 2021 17:35:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9eeprom=20block=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- si4/ps5ws.si4project/soft_ps5ws.siwork | Bin 14205 -> 14205 bytes source/app/common.c | 2 +- source/app/main.c | 3 ++- source/bsp/bsp_config.h | 8 ++++---- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/si4/ps5ws.si4project/soft_ps5ws.siwork b/si4/ps5ws.si4project/soft_ps5ws.siwork index 3ab92bdf8393e859024ba2dfd57f1f746d85349c..81299fbd652002b45a3b4507243af69f6f889997 100644 GIT binary patch delta 198 zcmeyH_cw3D2N8jQSxZ?QW-eu6WME+U4+NV78ILe-J|dRK#8EJPDNBIRI+o2=k`2r< z6M(z}Ub$>QbqpN*5IkYVQkDn&Q&~1&lX<}J^8u)00T6>!z(4>{#Q`8@1_~HLF-*Y) zkZxCqiEDuhKsW&Clo$I8*fuliHnPYl%wEdkF+T-tXCEsA0|uR|ubE-fSh=z$|kE z$XnpFmlddvfrB4{ZzvyNe!#zhdGj@y2mC%SfGU0fF-QdrWB^rY0F4I;8bUD(RMJE3 z0P_V$h>2@~3P6|xD3k diff --git a/source/app/common.c b/source/app/common.c index cd16338..303929f 100644 --- a/source/app/common.c +++ b/source/app/common.c @@ -30,7 +30,7 @@ void L3_chip_encrypt_main(void) Lc_buf_copy_uc((U8*)eep_enc.enc_val,(U8*)&G.mcu_enc_id,MCU_ID_LEN); //4. 写入EEPROM - if(L1_eep_write_block(D_EEP_ENC_IN_SECTOR, D_EEP_ENC_IN_BLOCK, D_EEP_ENC_BLOCK_SIZE, (U8*)&eep_enc,sizeof(eep_enc),TRUE) == 0) + if(L1_eep_write_block(D_EEP_ENC_IN_SECTOR, D_EEP_ENC_IN_BLOCK, D_EEP_SECTOR_BLOCK_SIZE, (U8*)&eep_enc,sizeof(eep_enc),TRUE) == 0) { //L0_uart0_sendstr("e2p write success"); return; diff --git a/source/app/main.c b/source/app/main.c index 490bb4b..9fb2a2c 100644 --- a/source/app/main.c +++ b/source/app/main.c @@ -107,7 +107,8 @@ void main(void) { s_nos_tick.t1s_heatbeart = 0; //L0_uart0_uc('.'); - P10 ^= 1; + P54 ^= 1; + P17 ^= 1; } } } diff --git a/source/bsp/bsp_config.h b/source/bsp/bsp_config.h index 7da041c..32438f5 100644 --- a/source/bsp/bsp_config.h +++ b/source/bsp/bsp_config.h @@ -58,19 +58,19 @@ //EEP存储地址定义 #define D_EEP_SECTOR_SIZE 0x200 //每个扇区0x200==512bytes - #define D_EEP_SECTOR_BLOCK_SIZE 0x40 //扇区中每个数据块0x40==64bytes，可选值[32,64,128]等 + #define D_EEP_SECTOR_BLOCK_SIZE 0x80 //扇区中每个数据块0x40==64bytes，可选值[32,64,128]等 #define D_EEP_SECTOR_BLOCK_NUM (D_EEP_SECTOR_SIZE / D_EEP_PARAM_BLOCK_SIZE) //每个扇区数据块的数量 #define D_EEP_BLOCK_FILTER0 0xAA //扇区中每个数据块的Filter字段值 #define D_EEP_BLOCK_FILTER1 0x55 //EEP User Defined 参数区存储配置 #define D_EEP_PARAM_IN_SECTOR 1 //eeprom参数区扇区地址，从0开始 #define D_EEP_PARAM_IN_BLOCK 0 //eeprom参数区数据块地址，从0开始 - #define D_EEP_PARAM_BLOCK_SIZE (D_EEP_SECTOR_BLOCK_SIZE) //参数区每个块大小，必须：D_EEP_PARAM_BLOCK_SIZE<=D_EEP_SECTOR_BLOCK_SIZE!!!，因为eeprom.h中是按照D_EEP_SECTOR_BLOCK_SIZE分配的buf - #define D_EEP_PARAM_BLOCK_NUM (D_EEP_SECTOR_SIZE / D_EEP_PARAM_BLOCK_SIZE) //每个扇区数据块的数量 + //#define D_EEP_PARAM_BLOCK_SIZE (D_EEP_SECTOR_BLOCK_SIZE) //参数区每个块大小，必须：D_EEP_PARAM_BLOCK_SIZE<=D_EEP_SECTOR_BLOCK_SIZE!!!，因为eeprom.h中是按照D_EEP_SECTOR_BLOCK_SIZE分配的buf + //#define D_EEP_PARAM_BLOCK_NUM (D_EEP_SECTOR_SIZE / D_EEP_PARAM_BLOCK_SIZE) //每个扇区数据块的数量 //EEP 加密区存储配置 #define D_EEP_ENC_IN_SECTOR 0 //eeprom加密区扇区地址，从0开始 #define D_EEP_ENC_IN_BLOCK 0 //eeprom加密区数据块地址，从0开始 - #define D_EEP_ENC_BLOCK_SIZE 0x20 //ENC_BLOCK_SIZE必须与加密程序中的ENC_BLOCK_SIZE匹配，此处不建议修改，如需修改，请同时修改加密程序 + //#define D_EEP_ENC_BLOCK_SIZE 0x20 //ENC_BLOCK_SIZE必须与加密程序中的ENC_BLOCK_SIZE匹配，此处不建议修改，如需修改，请同时修改加密程序 #elif(TYPE_UASER_BOARD == TYPE_BOARD_SMMM_MB_VH032_0E) xx