autotest
/
xiuos
forked from xuos/xiuos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat add control_framework, support fins protocol OK

This commit is contained in:
Liu_Weichao 2022-11-24 17:20:40 +08:00
parent ba31c9e0f8
commit 8583ea25b6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
APP_Framework/Framework/control/plc_protocol/fins/fins.c
View File

@ -117,9 +117,9 @@ static uint16_t FinsCommandGenerate(uint8_t *p_command, uint16_t plc_ip_4, uint1
static int FinsTransformRecvBuffToData(FinsReadItem *p_read_item, uint8_t *recv_buff)
{
FinsDataInfo *p_fins_data_info = &(p_read_item->data_info);
uint8_t error_code = recv_buff[3];
uint8_t error_code = recv_buff[15];
if (error_code) {
printf("Data abnormal, abnormal error code is %08x!", error_code);
printf("Data abnormal, abnormal error code is 0x%x!\n", error_code);
return -1;
}
recv_buff += 30;
@ -134,14 +134,14 @@ static int FinsTransformRecvBuffToData(FinsReadItem *p_read_item, uint8_t *recv_
if (FINS_DATA_TYPE_BIT == p_read_item->data_type) {
memcpy(p_fins_data_info->base_data_info.p_data, recv_buff, data_length);
printf("%02x", p_fins_data_info->base_data_info.p_data[0]);
printf("0x%x", p_fins_data_info->base_data_info.p_data[0]);
} else {
uint8_t *p_data = p_fins_data_info->base_data_info.p_data;
for (uint16_t i = 0; i < data_length; i ++) {
p_data[2 * i] = recv_buff[2 * (data_length - i - 1)];
p_data[2 * i + 1] = recv_buff[2 * (data_length - i - 1) + 1];
printf("%03x%03x", p_data[2 * i], p_data[2 * i + 1]);
printf("0x%x 0x%x", p_data[2 * i], p_data[2 * i + 1]);
}
}

2
APP_Framework/Framework/control/shared/control_def.c
View File

@ -186,7 +186,7 @@ void ControlPrintfList(char name[5], uint8_t *number_list, uint16_t length)
{
printf("\n******************%5s****************\n", name);
for (int32_t i = 0;i < length;i ++) {
printf("%03x ", number_list[i]);
printf("0x%x ", number_list[i]);
}
printf("\n**************************************\n");
}