Skip to content

Commit a9ac48a

Browse files
committed
fix: 更换识别硬件的OTP地址
1 parent 29892b4 commit a9ac48a

File tree

2 files changed

+22
-14
lines changed

2 files changed

+22
-14
lines changed

projects/HSLink-Pro/src/setting.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
#include "BL_Setting_Common.h"
88

99
HSLink_Setting_t HSLink_Setting = {
10-
.boost = false,
11-
.swd_port_mode = PORT_MODE_SPI,
12-
.jtag_port_mode = PORT_MODE_SPI,
13-
.power = {
14-
.voltage = 3.3,
15-
.power_on = false,
16-
.port_on = false,
17-
},
18-
.reset = RESET_NRST,
19-
.led = false,
20-
.led_brightness = 0,
10+
.boost = false,
11+
.swd_port_mode = PORT_MODE_SPI,
12+
.jtag_port_mode = PORT_MODE_SPI,
13+
.power = {
14+
.voltage = 3.3,
15+
.power_on = false,
16+
.port_on = false,
17+
},
18+
.reset = RESET_NRST,
19+
.led = false,
20+
.led_brightness = 0,
2121
};
2222

2323
Setting_Version_t HSLink_Hardware_Version;
@@ -33,7 +33,7 @@ BL_Setting_t bl_setting;
3333
#define SETTING_E2P_MANEGE_SIZE (SETTING_E2P_ERASE_SIZE * SETTING_E2P_SECTOR_CNT) // 128K
3434
#define SETTING_E2P_MANAGE_OFFSET (BOARD_FLASH_SIZE - APP_OFFSET - SETTING_E2P_MANEGE_SIZE * 2) // 1M - 0x20000 - 256K = 640K
3535

36-
static const uint32_t HARDWARE_VER_ADDR = 69;
36+
static const uint32_t HARDWARE_VER_ADDR = 70;
3737

3838
static const char *e2p_name = "HSP";
3939
static uint32_t setting_eeprom_id;
@@ -76,6 +76,7 @@ static Setting_Version_t get_hardware_version(void)
7676
void Setting_Init(void)
7777
{
7878
HSLink_Hardware_Version = get_hardware_version();
79+
printf("Hardware version: %d.%d.%d\n", HSLink_Hardware_Version.major, HSLink_Hardware_Version.minor, HSLink_Hardware_Version.patch);
7980

8081
e2p.nor_config.xpi_base = BOARD_APP_XPI_NOR_XPI_BASE;
8182
e2p.nor_config.base_addr = BOARD_FLASH_BASE_ADDRESS;
@@ -96,8 +97,7 @@ void Setting_Init(void)
9697
setting_eeprom_id = e2p_generate_id(e2p_name);
9798
HSLink_Setting_t temp;
9899
e2p_read(setting_eeprom_id, sizeof(HSLink_Setting_t), (uint8_t *) &temp);
99-
if (temp.magic != SETTING_MAGIC)
100-
{
100+
if (temp.magic != SETTING_MAGIC) {
101101
// 第一次烧录,使用默认设置
102102
printf("First boot, use default setting\n");
103103
Setting_Save();

projects/HSLink-Pro/src/setting.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,14 @@ void Setting_Init(void);
6161

6262
void Setting_Save(void);
6363

64+
/**
65+
* @brief 比较硬件版本号是否相同,如果输入的是UINT8_MAX,则不比较这一位以及后面的版本号
66+
* @return 如果硬件版本号相同,返回true,否则返回false
67+
*/
68+
uint8_t Setting_IsHardwareVersion(uint8_t major, uint8_t minor, uint8_t patch);
69+
70+
uint8_t Setting_GetSRSTLevel(void);
71+
6472
#ifdef __cplusplus
6573
}
6674
#endif

0 commit comments

Comments
 (0)