SXDT-Embedded
/
BLE_TYQ_BJQ_CH32V303
mirror of https://gitee.com/SXDT-Embedded/ble_-tyq_-bjq_-ch32-v303.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

暂存

This commit is contained in:
小马_666 2025-06-04 14:09:18 +08:00
parent b33706bdd9
commit b598b06938
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bsp/src/bsp_ml307.c
View File

@ -310,11 +310,6 @@ uint8_t dec_to_bcd(uint8_t dec)
return ((dec / 10) << 4) | (dec % 10); return ((dec / 10) << 4) | (dec % 10);
} }
// 将BCD格式转换为十进制（可选）
uint8_t bcd_to_dec(uint8_t bcd)
{
return ((bcd >> 4) * 10) + (bcd & 0x0F);
}
int test(int argc, char **argv) int test(int argc, char **argv)
{ {
@ -332,8 +327,6 @@ MSH_CMD_EXPORT(test, "test");
int _Update_Valve_Data (struct Ml307_Ops *ops) int _Update_Valve_Data (struct Ml307_Ops *ops)
{ {
uint8_t valtage = 0;
ops->body->valve_num = Flash_Get_Valve_Num(); ops->body->valve_num = Flash_Get_Valve_Num();
if (ops->body->valve_num == 0) // 确保至少有一个阀门数据体 if (ops->body->valve_num == 0) // 确保至少有一个阀门数据体
{ {
@ -345,8 +338,7 @@ int _Update_Valve_Data (struct Ml307_Ops *ops)
LOG_D ("valve_num: %d", ops->body->valve_num); LOG_D ("valve_num: %d", ops->body->valve_num);
rt_memcpy (&ops->body->valve_data[0], &valve[0], sizeof (struct valve_t)); rt_memcpy (&ops->body->valve_data[0], &valve[0], sizeof (struct valve_t));
// rt_memset(&valve[0].valve_connct_status, 0, (sizeof(struct valve_t) - 7)); // 清空阀门包数据，等待下次更新,如果没更新说明断开了 // rt_memset(&valve[0].valve_connct_status, 0, (sizeof(struct valve_t) - 7)); // 清空阀门包数据，等待下次更新,如果没更新说明断开了
valtage = ops->body->valve_data[0].valve_voltage; //将十六进制转为十进制 ops->body->valve_data[0].valve_voltage = dec_to_bcd(ops->body->valve_data[0].valve_voltage);
ops->body->valve_data[0].valve_voltage = (valtage >> 4) * 16 + (valtage & 0x0F);
} }
return RT_EOK; return RT_EOK;
} }