|
@@ -166,9 +166,9 @@ int rec_write(const rec_data_t *data)
|
|
|
|
|
|
|
|
// 计算需要跳过的旧记录数量
|
|
// 计算需要跳过的旧记录数量
|
|
|
uint16_t skip_count = 0;
|
|
uint16_t skip_count = 0;
|
|
|
- if (total_valid > RECORD_MAX_COUNT)
|
|
|
|
|
|
|
+ if (total_valid >= RECORD_MAX_COUNT)
|
|
|
{
|
|
{
|
|
|
- skip_count = total_valid - RECORD_MAX_COUNT;
|
|
|
|
|
|
|
+ skip_count = total_valid - RECORD_MAX_COUNT - 1;
|
|
|
valid_count = RECORD_MAX_COUNT;
|
|
valid_count = RECORD_MAX_COUNT;
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
@@ -208,7 +208,7 @@ int rec_write(const rec_data_t *data)
|
|
|
// 擦除扇区
|
|
// 擦除扇区
|
|
|
if (flash_erase_with_retry(RECORD_FLASH_SECTOR) != 0)
|
|
if (flash_erase_with_retry(RECORD_FLASH_SECTOR) != 0)
|
|
|
{
|
|
{
|
|
|
- return -3;
|
|
|
|
|
|
|
+ return -2;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 清空整理后的剩余空间
|
|
// 清空整理后的剩余空间
|
|
@@ -225,8 +225,8 @@ int rec_write(const rec_data_t *data)
|
|
|
|
|
|
|
|
// 更新状态
|
|
// 更新状态
|
|
|
rec_state.write_addr = write_offset;
|
|
rec_state.write_addr = write_offset;
|
|
|
- rec_state.count = valid_count;
|
|
|
|
|
- rec_state.total_count = valid_count;
|
|
|
|
|
|
|
+ rec_state.count = valid_index;
|
|
|
|
|
+ rec_state.total_count = valid_index;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 使用带重试的写入
|
|
// 使用带重试的写入
|