From 50e037d802bdf1aa7ff5afd18c2c695e685e29cd Mon Sep 17 00:00:00 2001 From: Yu Xifeng <2860280851@qq.com> Date: Tue, 4 Feb 2025 13:34:24 +0000 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=95=8C=E9=9D=A2=E4=B8=AD?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=8E=A5=E5=8F=97=E5=88=B0=E7=9A=84CAN?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=92=8C=E5=8F=91=E9=80=81=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main_app/GUI-Guider/generated/events_init.c | 178 +++++++++++++++--- .../generated/setup_scr_screen_home.c | 8 +- main_app/Socket_can.c | 124 +++++++++++- main_app/Socket_can.h | 33 +++- main_app/lvgl_task.c | 22 +-- main_app/main.c | 8 +- 6 files changed, 321 insertions(+), 52 deletions(-) diff --git a/main_app/GUI-Guider/generated/events_init.c b/main_app/GUI-Guider/generated/events_init.c index 26ab1cb..9d8b594 100755 --- a/main_app/GUI-Guider/generated/events_init.c +++ b/main_app/GUI-Guider/generated/events_init.c @@ -20,6 +20,7 @@ #include "../custom/custom.h" #include "../custom/lv_conf_ext.h" #include "../../Socket_can.h" +extern pthread_mutex_t mutex_disp_Refresh; // 全局变量,用于存储上一次点击的 textarea static lv_obj_t *last_clicked_textarea = NULL; @@ -30,11 +31,12 @@ void screen_home_init(lv_ui *ui) lv_obj_set_style_text_font(ui->screen_home_table_1, lv_ft_MHEIGB[24].font, LV_PART_ITEMS|LV_STATE_DEFAULT); #endif lv_table_set_col_width(ui->screen_home_table_1,0,70); - // lv_table_set_col_width(ui->screen_home_table_1,1,200); - // lv_table_set_col_width(ui->screen_home_table_1,2,200); + lv_table_set_col_width(ui->screen_home_table_1,1,80); + lv_table_set_col_width(ui->screen_home_table_1,2,200); lv_table_set_col_width(ui->screen_home_table_1,3,80); - lv_table_set_col_width(ui->screen_home_table_1,4,70); + lv_table_set_col_width(ui->screen_home_table_1,4,80); lv_table_set_col_width(ui->screen_home_table_1,5,400); + lv_table_set_row_cnt(ui->screen_home_table_1,30); } @@ -138,7 +140,7 @@ static void screen_home_btnm_1_event_handler (lv_event_t *e) btnm_state_map[2] = 0; lv_btnmatrix_set_ctrl_map(obj, btnm_state_map); - sockfd_can0 = socket_can_init("can1"); + sockfd_can0 = socket_can_init("can0"); start_can_receive_task(sockfd_can0); break; @@ -207,11 +209,48 @@ static void screen_home_table_1_event_handler(lv_event_t *e) default: break; } - int *data = (int *)lv_event_get_param(e); - for (int i = 0; i < 8; i++) { - printf("%02X ", data[i]); + can_data_t *data = (can_data_t *)lv_event_get_param(e); + // for (int i = 0; i < 8; i++) { + // printf("%02X ", data->frame.data[i]); + // } + // printf("\r\n"); + + // // 打印接收到的 CAN 数据 + // printf("Received CAN frame: ID=0x%X, Data=", data->frame.can_id); + // for (int i = 0; i < data->frame.can_dlc; i++) { + // printf("%02X ", data->frame.data[i]); + // } + static int Serial_num; + static char databuf[24]; + sprintf(&databuf[0],"%02X %02X %02X %02X %02X %02X %02X %02X",data->frame.data[0],data->frame.data[1],data->frame.data[2],data->frame.data[3],\ + data->frame.data[4],data->frame.data[5],data->frame.data[6],data->frame.data[7]); + + Serial_num = data->Serial_num; + lv_table_set_cell_value_fmt(guider_ui.screen_home_table_1,Serial_num,0,"%d",Serial_num); + if(data->Tran_dir == 0) + { + lv_table_set_cell_value(guider_ui.screen_home_table_1,Serial_num,1,"接收"); + }else{ + lv_table_set_cell_value(guider_ui.screen_home_table_1,Serial_num,1,"发送"); } - printf("\r\n"); + + lv_table_set_cell_value_fmt(guider_ui.screen_home_table_1,Serial_num,3,"0x%X",data->frame.can_id&0x7ff); + lv_table_set_cell_value_fmt(guider_ui.screen_home_table_1,Serial_num,4,"0x%X",data->frame.can_dlc); + lv_table_set_cell_value(guider_ui.screen_home_table_1,Serial_num,5,databuf); + + // 将秒数转换为本地时间 + struct tm *tm_info = localtime(&data->tv.tv_sec); + + // 提取时分秒和微秒 + int hour = tm_info->tm_hour; // 小时 + int min = tm_info->tm_min; // 分钟 + int sec = tm_info->tm_sec; // 秒 + int usec = data->tv.tv_usec; // 微秒 + + // 格式化输出为 16:55:45:234 + // printf("当前时间:%02d:%02d:%02d:%03d\n", hour, min, sec, usec / 1000); + lv_table_set_cell_value_fmt(guider_ui.screen_home_table_1,Serial_num,2,"%02d:%02d:%02d:%03d",hour, min, sec, usec / 1000); + } @@ -237,21 +276,30 @@ static void screen_home_btn_3_event_handler (lv_event_t *e) case LV_EVENT_CLICKED: { // printf("LV_EVENT_CLICKED\r\n"); - // uint8_t data[8] = {1,2,3,4,5,6,7,8}; - // if(sockfd_can0 != -1) - // { - // socket_can_send(sockfd_can0,0x12,data); - // lv_event_send(guider_ui.screen_home_table_1, 0x30, data); - // } - // 动态分配数组 - int *data = (int *)malloc(8 * sizeof(int)); - data[0] = 10; - data[1] = 20; - data[2] = 30; - - // 手动发送事件,并传递动态数组指针 - lv_event_send(guider_ui.screen_home_table_1, 0x30, data); - lv_event_send(guider_ui.screen_home_table_1, 0x30, data); + uint8_t data[24] = {1,2,3,4,5,6,7,8}; + + if(sockfd_can0 != -1) + { + uint32_t value; + struct can_frame frame; + can0_dev.datalist[can0_dev.index_write].Tran_dir = 1; + frame.can_dlc = 8; + frame.can_id = 0x123456; + extract_hex_data(lv_textarea_get_text(guider_ui.screen_home_ta_2),&frame.data[0],8); + if (sscanf(lv_textarea_get_text(guider_ui.screen_home_ta_1), "%8x", &value) == 1) + { + // printf("value:%d,%s\r\n",value,lv_textarea_get_text(guider_ui.screen_home_ta_1)); + frame.can_id = value&0x7ff; + } + // extract_hex_data(lv_textarea_get_text(guider_ui.screen_home_ta_1),&frame.data[0],8); + memcpy(&can0_dev.datalist[can0_dev.index_write].frame,&frame,sizeof(struct can_frame)); + socket_can_send(sockfd_can0,frame.can_id,frame.data); + gettimeofday(&can0_dev.datalist[can0_dev.index_write].tv, NULL); + can0_dev.index_write+=1; + // lv_event_send(guider_ui.screen_home_table_1, 0x30, data); + } + + printf("data:%s\r\n",lv_textarea_get_text(guider_ui.screen_home_ta_2)); break; } default: @@ -286,6 +334,90 @@ void events_init_screen_home (lv_ui *ui) lv_obj_add_event_cb(ui->screen_home_table_1, screen_home_table_1_event_handler, 0x30, ui); } +void polling_can_data(void *arg) +{ + while (1) + { + if(can0_dev.index_read != can0_dev.index_write) + { + can0_dev.datalist[can0_dev.index_read].Serial_num = can0_dev.index_read + 1; + int res; + /* 互斥锁上锁 */ + res = pthread_mutex_lock(&mutex_disp_Refresh); + if (res) + { /*获取失败*/ + printf("Thread lock failed\n"); + + /* 互斥锁解锁 */ + pthread_mutex_unlock(&mutex_disp_Refresh); + + pthread_exit(NULL); + } + lv_event_send(guider_ui.screen_home_table_1, 0x30, &can0_dev.datalist[can0_dev.index_read]); + + can0_dev.index_read = can0_dev.index_write; + /* 互斥锁解锁 */ + pthread_mutex_unlock(&mutex_disp_Refresh); + + // printf("当前时间戳(秒 + 微秒):%02ld.%02ld\n", can0_dev.datalist->tv.tv_sec, can0_dev.datalist->tv.tv_usec); + // 将秒数转换为本地时间 + struct tm *tm_info = localtime(&can0_dev.datalist[can0_dev.index_read].tv.tv_sec); + + // 提取时分秒和微秒 + int hour = tm_info->tm_hour; // 小时 + int min = tm_info->tm_min; // 分钟 + int sec = tm_info->tm_sec; // 秒 + int usec = can0_dev.datalist[can0_dev.index_read].tv.tv_usec; // 微秒 + + // 格式化输出为 16:55:45:234 + printf("当前时间:%02d:%02d:%02d:%03d\n", hour, min, sec, usec / 1000); + + } + + usleep(500); + } + +} + +/** + * 从字符串中提取十六进制数据(支持任意长度) + * @param text 输入字符串(格式如 "00 01 02 ...") + * @param output 输出缓冲区(存储提取的字节) + * @param max_bytes 最大提取字节数 + * @return 实际提取的字节数(-1 表示失败) + */ +int extract_hex_data(const char *text, uint8_t *output, int max_bytes) { + if (text == NULL || output == NULL || max_bytes <= 0) { + printf("错误:参数无效。\n"); + return -1; + } + + const char *ptr = text; + int extracted_count = 0; + + // 循环提取字节,直到达到 max_bytes 或字符串结束 + while (extracted_count < max_bytes) { + // 跳过空格和其他非十六进制字符 + while (*ptr != '\0' && ( (*ptr < '0' || *ptr > '9') && + (*ptr < 'A' || *ptr > 'F') && + (*ptr < 'a' || *ptr > 'f') )) { + ptr++; + } + + if (*ptr == '\0') break; // 字符串结束 + + // 尝试解析 2 字符的十六进制值 + uint8_t value; + if (sscanf(ptr, "%2hhx", &value) == 1) { + output[extracted_count++] = value; + ptr += 2; // 移动到下一个可能的字节 + } else { + break; // 解析失败 + } + } + + return extracted_count; +} void events_init(lv_ui *ui) { diff --git a/main_app/GUI-Guider/generated/setup_scr_screen_home.c b/main_app/GUI-Guider/generated/setup_scr_screen_home.c index f31d7e1..040d42a 100755 --- a/main_app/GUI-Guider/generated/setup_scr_screen_home.c +++ b/main_app/GUI-Guider/generated/setup_scr_screen_home.c @@ -114,7 +114,7 @@ void setup_scr_screen_home(lv_ui *ui) //Write codes screen_home_ta_2 ui->screen_home_ta_2 = lv_textarea_create(ui->screen_home_tabview_2_tab_1); - lv_textarea_set_text(ui->screen_home_ta_2, "00 01 02 03 04 05 06"); + lv_textarea_set_text(ui->screen_home_ta_2, "00 01 02 03 04 05 06 07"); lv_textarea_set_placeholder_text(ui->screen_home_ta_2, ""); lv_textarea_set_password_bullet(ui->screen_home_ta_2, "*"); lv_textarea_set_password_mode(ui->screen_home_ta_2, false); @@ -179,7 +179,7 @@ void setup_scr_screen_home(lv_ui *ui) //Write codes screen_home_ta_1 ui->screen_home_ta_1 = lv_textarea_create(ui->screen_home_tabview_2_tab_1); - lv_textarea_set_text(ui->screen_home_ta_1, "00000000"); + lv_textarea_set_text(ui->screen_home_ta_1, "0000000"); lv_textarea_set_placeholder_text(ui->screen_home_ta_1, ""); lv_textarea_set_password_bullet(ui->screen_home_ta_1, "*"); lv_textarea_set_password_mode(ui->screen_home_ta_1, false); @@ -679,10 +679,10 @@ void setup_scr_screen_home(lv_ui *ui) lv_table_set_cell_value(ui->screen_home_table_1,0,0,"序号"); lv_table_set_cell_value(ui->screen_home_table_1,1,0,"0"); lv_table_set_cell_value(ui->screen_home_table_1,2,0,"1"); - lv_table_set_cell_value(ui->screen_home_table_1,0,1,"传输方向"); + lv_table_set_cell_value(ui->screen_home_table_1,0,1,"方向"); lv_table_set_cell_value(ui->screen_home_table_1,1,1,"发送"); lv_table_set_cell_value(ui->screen_home_table_1,2,1,"接收"); - lv_table_set_cell_value(ui->screen_home_table_1,0,2,"时间标识"); + lv_table_set_cell_value(ui->screen_home_table_1,0,2,"时间"); lv_table_set_cell_value(ui->screen_home_table_1,1,2,"0"); lv_table_set_cell_value(ui->screen_home_table_1,2,2,"0"); lv_table_set_cell_value(ui->screen_home_table_1,0,3,"帧ID"); diff --git a/main_app/Socket_can.c b/main_app/Socket_can.c index a5ace53..b462e46 100644 --- a/main_app/Socket_can.c +++ b/main_app/Socket_can.c @@ -9,6 +9,10 @@ #include #include #include +#include "Socket_can.h" +#include +#include + int sockfd_can0; // 全局变量,用于线程间通信 @@ -16,6 +20,10 @@ static int can_sockfd = -1; static pthread_t can_thread; static volatile int can_thread_running = 1; // 线程运行标志 + +Socket_can_t can0_dev; +Socket_can_t can1_dev; + int socket_can_init(char* can_dev) { int sockfd_can; @@ -39,6 +47,35 @@ int socket_can_init(char* can_dev) return -2; } + // 根据 can_dev 判断是 can0 还是 can1 + if (strcmp(can_dev, "can0") == 0) { + printf("初始化 can0 成功。\n"); + can0_dev.sockfd = sockfd_can; + can0_dev.data_buff = malloc(1024 * 128 * sizeof(char)); + if (can0_dev.data_buff == NULL) { + fprintf(stderr, "内存分配失败!\n"); + exit(EXIT_FAILURE); + } + can0_dev.datalist = malloc(1024 * 128 *sizeof(can_data_t)); + can0_dev.index_read = can0_dev.index_write = 0; + can0_dev.index_max = 1024 * 128 * sizeof(char); + } else if (strcmp(can_dev, "can1") == 0) { + printf("初始化 can1 成功。\n"); + can1_dev.sockfd = sockfd_can; + can1_dev.data_buff = malloc(1024 * 128 * sizeof(char)); + if (can1_dev.data_buff == NULL) { + fprintf(stderr, "内存分配失败!\n"); + exit(EXIT_FAILURE); + } + can1_dev.datalist = malloc(1024 * 128 *sizeof(can_data_t)); + can1_dev.index_read = can1_dev.index_write = 0; + can1_dev.index_max = 1024 * 128 * sizeof(char); + } else { + fprintf(stderr, "错误:不支持的 CAN 接口名称:%s\n", can_dev); + return -1; + } + + return sockfd_can; } @@ -93,6 +130,13 @@ int socket_can_close(int sockfd) { // 关闭套接字 close(sockfd); + if(sockfd == can0_dev.sockfd) + { + free(can0_dev.data_buff); + }else if(sockfd == can1_dev.sockfd) + { + free(can1_dev.data_buff); + } return -1; } @@ -137,13 +181,25 @@ void *can_receive_task(void *arg) { fprintf(stderr, "Incomplete CAN frame read\n"); continue; } - - // 打印接收到的 CAN 数据 - printf("Received CAN frame: ID=0x%X, Data=", frame.can_id); - for (int i = 0; i < frame.can_dlc; i++) { - printf("%02X ", frame.data[i]); + if(sockfd == can0_dev.sockfd) + { + // assert(socket_can_fill_data(&can0_dev, frame.data, frame.can_dlc) == 0); + memcpy(&can0_dev.datalist[can0_dev.index_write].frame,&frame,sizeof(struct can_frame)); + gettimeofday(&can0_dev.datalist[can0_dev.index_write].tv, NULL); + can0_dev.index_write+=1; + }else{ + assert(socket_can_fill_data(&can1_dev, frame.data, frame.can_dlc) == 0); } - printf("\n"); + // 打印接收到的 CAN 数据 + // printf("Received CAN frame: ID=0x%X, Data=", frame.can_id); + // for (int i = 0; i < frame.can_dlc; i++) { + // printf("%02X ", frame.data[i]); + // } + // printf("\n:%d\r\n",can1_dev.index_write); + // struct timeval tv; + // gettimeofday(&tv, NULL); + // printf("当前时间戳(秒 + 微秒):%ld.%06ld\n", tv.tv_sec, tv.tv_usec); + } } @@ -164,7 +220,7 @@ int start_can_receive_task(int sockfd) { return -1; } - printf("CAN receive task started.\n"); + printf("CAN receive task started.\n"); return 0; } @@ -181,6 +237,60 @@ void stop_can_receive_task() { } +/** + * 向环形缓冲区 data_buff 中填充数据 + * @param can 指向 Socket_can_t 结构体的指针 + * @param data 要写入的数据 + * @param size 数据大小(字节数) + * @return 成功返回 0,失败返回 -1 + */ +int socket_can_fill_data(Socket_can_t *can, const void *data, uint32_t size) { + if (can == NULL || data == NULL || can->data_buff == NULL) { + fprintf(stderr, "错误:参数不能为空。\n"); + return -1; + } + + if (size == 0) { + return 0; // 空数据直接返回 + } + + // 计算可用空间(保留一个位置避免歧义) + uint32_t available_space; + if (can->index_write >= can->index_read) { + available_space = can->index_max - can->index_write + can->index_read; + } else { + available_space = can->index_read - can->index_write; + } + + // 可用空间需要减 1 以区分满和空状态 + available_space--; + + if (size > available_space) { + fprintf(stderr, "错误:缓冲区空间不足(需要 %u,剩余 %u)。\n", size, available_space); + return -1; + } + + // 计算从 index_write 到缓冲区末尾的剩余空间 + uint32_t space_to_end = can->index_max - can->index_write; + + // 分两种情况写入数据 + if (space_to_end >= size) { + // 情况 1:剩余空间足够,直接写入 + memcpy((char *)can->data_buff + can->index_write, data, size); + } else { + // 情况 2:分两次写入(尾部 + 头部) + memcpy((char *)can->data_buff + can->index_write, data, space_to_end); + memcpy((char *)can->data_buff, (char *)data + space_to_end, size - space_to_end); + } + + // 更新 index_write(环形逻辑) + can->index_write = (can->index_write + size) % can->index_max; + + return 0; +} + + + int test() { int sockfd; struct sockaddr_can addr; diff --git a/main_app/Socket_can.h b/main_app/Socket_can.h index 0146802..47f4490 100644 --- a/main_app/Socket_can.h +++ b/main_app/Socket_can.h @@ -1,13 +1,44 @@ #ifndef SOCKET_CAN_H #define SOCKET_CAN_H +#include "stdio.h" +#include +#include +#include +#include +#include +#include + +typedef struct can_data_ +{ + int Serial_num; + int Tran_dir;//传输方向 + struct can_frame frame; + struct timeval tv; +}can_data_t; + +typedef struct Socket_can_ +{ + int sockfd; + char* data_buff; + can_data_t* datalist; + uint32_t index_read; + uint32_t index_write; + uint32_t index_max; +}Socket_can_t; + + extern int socket_can_init(char* can_dev); extern int socket_can_send(int sockfd,uint32_t can_id,uint8_t data[8]); extern int socket_can_close(int sockfd); extern int socket_can_receive(int sockfd, uint8_t *data); extern int start_can_receive_task(int sockfd); extern void stop_can_receive_task(); - +extern int socket_can_fill_data(Socket_can_t *can, const void *data, uint32_t size); +extern int extract_hex_data(const char *text, uint8_t *output, int max_bytes); extern int sockfd_can0; +extern Socket_can_t can0_dev; +extern Socket_can_t can1_dev; + #endif \ No newline at end of file diff --git a/main_app/lvgl_task.c b/main_app/lvgl_task.c index 696b557..94ffbdc 100755 --- a/main_app/lvgl_task.c +++ b/main_app/lvgl_task.c @@ -158,7 +158,7 @@ void *Lv_main_task(void *arg) lv_indev_set_group(indev_keyboard, Key_Matrix_Group); //将组绑定到输入设备 #endif - // pthread_mutex_init(&mutex_disp_Refresh, NULL); + pthread_mutex_init(&mutex_disp_Refresh, NULL); /*Create a Demo*/ //lv_demo_widgets(); // lv_demo_benchmark(); @@ -176,20 +176,20 @@ void *Lv_main_task(void *arg) while(1) { /* 互斥锁上锁 */ - // res = pthread_mutex_lock(&mutex_disp_Refresh); - // if (res) - // { /*获取失败*/ - // printf("Thread %d lock failed\n",num); + int res = pthread_mutex_lock(&mutex_disp_Refresh); + if (res) + { /*获取失败*/ + printf("Thread %d lock failed\n",num); - // /* 互斥锁解锁 */ - // pthread_mutex_unlock(&mutex_disp_Refresh); + /* 互斥锁解锁 */ + pthread_mutex_unlock(&mutex_disp_Refresh); - // pthread_exit(NULL); - // } + pthread_exit(NULL); + } lv_timer_handler(); - usleep(5000); /* 互斥锁解锁 */ - // pthread_mutex_unlock(&mutex_disp_Refresh); + pthread_mutex_unlock(&mutex_disp_Refresh); + usleep(5000); } diff --git a/main_app/main.c b/main_app/main.c index d6c9477..e7a9553 100755 --- a/main_app/main.c +++ b/main_app/main.c @@ -94,7 +94,7 @@ void Get_FB_Info(void) } extern int mouse_test(); -extern int Bluetooth_Printer(const char* com); +extern void polling_can_data(void *arg); @@ -116,10 +116,6 @@ int main(int argc, char *argv[]) exit(res); } - while (1) - { - sleep(1); - } - + polling_can_data(NULL); // return 0; }