feat: 完成通信帧组包功能

This commit is contained in:
bmy
2024-02-23 18:56:53 +08:00
parent 1e982b4954
commit 3a68f98635
7 changed files with 112 additions and 2 deletions

View File

@@ -10,6 +10,7 @@ by_tf_parse_frame_t frame_now;
void by_tiny_frame_parse_init(void)
{
/** 初始化环形缓冲区 **/
lwrb_init(&lwrb_struct, buffer_rb, 40);
}
@@ -19,10 +20,17 @@ uint8_t by_tiny_frame_parse_listening(by_tf_parse_frame_t *frame_s, const uint8_
static uint8_t cnt_s = 0;
static uint8_t cnt_rest_s = 0;
#if (BY_TF_DEBUG)
printf("%0.2X\r\n", buff);
#endif
do {
#if defined(BY_TF_DEVICE_SLAVE)
if ((0 == cnt_s) && ((slave_id << 1) == buff)) {
#else
if ((0 == cnt_s) && (((slave_id << 1) + 1) == buff)) {
#endif
memset(frame_s, 0, sizeof(*frame_s));
cnt_s = 1;
cnt_rest_s = 9;
@@ -45,6 +53,8 @@ uint8_t by_tiny_frame_parse_listening(by_tf_parse_frame_t *frame_s, const uint8_
frame_s->data |= ((uint32_t)frame_s->frame[5] << 16);
frame_s->data |= ((uint32_t)frame_s->frame[6] << 8);
frame_s->data |= (uint32_t)frame_s->frame[7];
frame_s->crc_val |= ((uint16_t)frame_s->frame[8] << 8);
frame_s->crc_val |= (uint16_t)frame_s->frame[9];
return 0;
}
} while (0);
@@ -65,11 +75,15 @@ void by_tiny_frame_parse_run(void)
break;
}
if (!by_tiny_frame_parse_listening(&frame_now, 127, buffer_out)) {
// TODO 待结合 read&wirte 部分修改监听的从机地址
if (!by_tiny_frame_parse_listening(&frame_now, 0x0D, buffer_out)) {
if (!by_tiny_frame_parse_crc(&frame_now)) {
#if (BY_TF_DEBUG)
printf("frame parsed!\r\n");
#endif
// 解析帧
}
// 解析帧
}
// if (!mp_cmd_parse_modbus_handle(data)) {
// mp_cmd_mb_parse(&mp_cmd_mb_now, &mp_cmd_parsed_now);
@@ -83,11 +97,13 @@ uint8_t by_tiny_frame_parse_crc(by_tf_parse_frame_t *frame_s)
calc_crc_val = crc16_check(frame_s->frame, (sizeof(frame_s->frame) - 2));
#if (BY_TF_DEBUG)
printf("get: %0.2X", frame_s->crc_val);
printf("\r\n");
printf("cal: %0.2X", calc_crc_val);
printf("\r\n");
#endif
if ((frame_s->crc_val == calc_crc_val) || (frame_s->crc_val == 0xFFFF)) {
return 0;