From 7bb41c56b77e113df482bbf12abfdfefa734fb33 Mon Sep 17 00:00:00 2001 From: Kidenygood <2979564623@qq.com> Date: Mon, 3 Apr 2023 17:05:43 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E8=A3=81=E5=88=A4=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=87=8D=E6=9E=84=E5=89=8D=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/extensions.json | 3 ++ .vscode/tasks.json | 24 +++++++-------- application/referee/referee.c | 57 +++++++++++++++++------------------ application/robot.c | 2 +- modules/referee/rm_referee.c | 1 - 5 files changed, 44 insertions(+), 43 deletions(-) create mode 100644 .vscode/extensions.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..7e257db --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,3 @@ +{ + "recommendations": [] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 7ef9fdf..18c4c65 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -3,10 +3,10 @@ "version": "2.0.0", "tasks": [ { - "label": "build task", // 任务标签 - "type": "shell", // 任务类型,因为要调用mingw32-make,是在终端(CMD)里运行的,所以是shell任务 - "command": "mingw32-make -j24",// 任务命令,线程数可以根据自己的电脑修改,建议为核数的4~8倍 - "problemMatcher": [], + "label": "build task", + "type": "shell", + "command": "mingw32-make -j24", + "problemMatcher": [], "group": { "kind": "build", "isDefault": true @@ -14,21 +14,21 @@ }, { "label": "download dap", - "type": "shell", // 如果希望在下载前编译,可以把command换成下面的命令 - "command":"mingw32-make download_dap", // "mingw32-make -j24 && mingw32-make download_dap", - "group": { // 如果没有修改代码,编译任务不会消耗时间,因此推荐使用上面的替换. + "type": "shell", + "command": "mingw32-make download_dap", + "group": { "kind": "build", - "isDefault": false, - }, + "isDefault": false + } }, { "label": "download jlink", "type": "shell", - "command":"mingw32-make download_jlink", // "mingw32-make -j24 && mingw32-make download_dap" + "command": "mingw32-make download_jlink", "group": { "kind": "build", - "isDefault": false, + "isDefault": false } - }, + } ] } \ No newline at end of file diff --git a/application/referee/referee.c b/application/referee/referee.c index 57ab4c6..04a86fe 100644 --- a/application/referee/referee.c +++ b/application/referee/referee.c @@ -15,7 +15,7 @@ #include "referee_communication.h" static Referee_Interactive_info_t Interactive_data; // 非裁判系统数据 -static referee_info_t *referee_data; // 裁判系统相关数据 +static referee_info_t *referee_data; // 裁判系统相关数据 static robot_interactive_data_t *SendData; static void determine_ID(referee_info_t *_referee_info); @@ -23,25 +23,26 @@ static void My_UI_init(referee_info_t *_referee_info); static void My_UI_Refresh(referee_info_t *_referee_info, Referee_Interactive_info_t *_Interactive_data); static void Mode_Change_Check(Referee_Interactive_info_t *_Interactive_data); // 模式切换检测 -//syhtod 正式上车后需删除 +// syhtod 正式上车后需删除 static void robot_mode_change(Referee_Interactive_info_t *_Interactive_data); // 测试用函数，实现模式自动变化 -static void UI_test_init(referee_info_t *_referee_info);//UI测试函数 +static void UI_test_init(referee_info_t *_referee_info); // UI测试函数 void Referee_Interactive_init() { referee_data = RefereeInit(&huart6); // 裁判系统初始化 - while (referee_data->GameRobotState.robot_id == 0) - ; + // while (referee_data->GameRobotState.robot_id == 0); + referee_data->GameRobotState.robot_id = 101; // syhtodo RobotInit中关闭了中断进行初始化，无法读取到裁判系统的ID，暂时在此处写死 determine_ID(referee_data); - My_UI_init(referee_data); - //UI_test_init(referee_data); + // My_UI_init(referee_data); + UI_test_init(referee_data); // syhtodo此处先使用测试函数 - for (int i=0;idata[i]=i+1; - } - referee_data->referee_id.Receiver_Robot_ID = RobotID_BEngineer; // 机器人车间通信时接收者的ID暂时发给蓝色2 - Communicate_SendData(&referee_data->referee_id,SendData); + // syhtodo此处先关闭机器人车间通信 + // for (int i=0;idata[i]=i+1; + // } + // referee_data->referee_id.Receiver_Robot_ID = RobotID_BEngineer; // 机器人车间通信时接收者的ID暂时发给蓝色2 + // Communicate_SendData(&referee_data->referee_id,SendData); } void Referee_Interactive_task() @@ -305,7 +306,6 @@ static void My_UI_Refresh(referee_info_t *_referee_info, Referee_Interactive_inf } } - /** * @brief 模式切换检测,模式发生切换时，对flag置位 * @param Referee_Interactive_info_t *_Interactive_data @@ -357,29 +357,28 @@ static void determine_ID(referee_info_t *_referee_info) _referee_info->referee_id.Robot_Color = _referee_info->GameRobotState.robot_id > 7 ? Robot_Blue : Robot_Red; _referee_info->referee_id.Robot_ID = _referee_info->GameRobotState.robot_id; _referee_info->referee_id.Cilent_ID = 0x0100 + _referee_info->referee_id.Robot_ID; // 计算客户端ID - _referee_info->referee_id.Receiver_Robot_ID = 0; + _referee_info->referee_id.Receiver_Robot_ID = 0; } /* 测试用函数 */ static void UI_test_init(referee_info_t *_referee_info) { Graph_Data_t graph[5]; - Graph_Data_t num[2]; - String_Data_t sdata[1]; + Graph_Data_t num[2]; + String_Data_t sdata[1]; UI_Delete(&_referee_info->referee_id, UI_Data_Del_ALL, 0); - Line_Draw(&graph[0],"s0",UI_Graph_ADD,0,UI_Color_White,3,710,540,1210,540); - Rectangle_Draw(&graph[1],"s1",UI_Graph_ADD,0,UI_Color_Yellow,4,600,200,800,500); - Circle_Draw(&graph[2],"s2",UI_Graph_ADD,0,UI_Color_Green,5,960,540,100); - Elliptical_Draw(&graph[3],"s3",UI_Graph_ADD,0,UI_Color_Orange,3,960,540,100,20); - Arc_Draw(&graph[4],"s4",UI_Graph_ADD,0,UI_Color_Purplish_red,30,160,3,1200,550,50,100); + Line_Draw(&graph[0], "s0", UI_Graph_ADD, 0, UI_Color_White, 3, 710, 540, 1210, 540); + Rectangle_Draw(&graph[1], "s1", UI_Graph_ADD, 0, UI_Color_Yellow, 4, 600, 200, 800, 500); + Circle_Draw(&graph[2], "s2", UI_Graph_ADD, 0, UI_Color_Green, 5, 960, 540, 100); + Elliptical_Draw(&graph[3], "s3", UI_Graph_ADD, 0, UI_Color_Orange, 3, 960, 540, 100, 20); + Arc_Draw(&graph[4], "s4", UI_Graph_ADD, 0, UI_Color_Purplish_red, 30, 160, 3, 1200, 550, 50, 100); - Float_Draw(&num[0],"s5",UI_Graph_ADD,0,UI_Color_Pink,50,3,5,1050,660,1245545); - Integer_Draw(&num[1],"s6",UI_Graph_ADD,0,UI_Color_Cyan,50,5,1050,460,12345); - UI_ReFresh(&_referee_info->referee_id,7,graph[0],graph[1],graph[2],graph[3],graph[4],num[0],num[1]); + Float_Draw(&num[0], "s5", UI_Graph_ADD, 0, UI_Color_Pink, 50, 3, 5, 1050, 660, 1245545); + Integer_Draw(&num[1], "s6", UI_Graph_ADD, 0, UI_Color_Cyan, 50, 5, 1050, 460, 12345); + UI_ReFresh(&_referee_info->referee_id, 7, graph[0], graph[1], graph[2], graph[3], graph[4], num[0], num[1]); - - Char_Draw(&sdata[0],"s7",UI_Graph_ADD,0,UI_Color_Green,20,2,620,710); - Char_Write(&sdata[0],"number:%d",123); - Char_ReFresh(&_referee_info->referee_id,sdata[0]); + Char_Draw(&sdata[0], "s7", UI_Graph_ADD, 0, UI_Color_Green, 20, 2, 620, 710); + Char_Write(&sdata[0], "number:%d", 123); + Char_ReFresh(&_referee_info->referee_id, sdata[0]); } diff --git a/application/robot.c b/application/robot.c index 5e79041..f9a6c63 100644 --- a/application/robot.c +++ b/application/robot.c @@ -52,6 +52,6 @@ void RobotTask() #if defined(ONE_BOARD) || defined(CHASSIS_BOARD) ChassisTask(); - Referee_Interactive_task(); + // Referee_Interactive_task(); #endif } diff --git a/modules/referee/rm_referee.c b/modules/referee/rm_referee.c index e40297e..8650fa0 100644 --- a/modules/referee/rm_referee.c +++ b/modules/referee/rm_referee.c @@ -43,7 +43,6 @@ void RefereeSend(uint8_t *send, uint16_t tx_len) { USARTSend(referee_usart_instance, send, tx_len); /* syhtodo DMA请求过快会导致数据发送丢失，考虑数据尽可能打成一个整包以及队列发送，并且发送函数添加缓冲区 */ - HAL_Delay(5); } /*裁判系统串口接收回调函数,解析数据 */ From ef5cdda82cda7863fea43982a76903fbc5cca7b0 Mon Sep 17 00:00:00 2001 From: Kidenygood <2979564623@qq.com> Date: Mon, 3 Apr 2023 18:40:49 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=BD=E5=85=A5?= =?UTF-8?q?=E7=BC=93=E5=86=B2=E5=8C=BA=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/referee/rm_referee.c | 19 ++++++++++++++++--- modules/referee/rm_referee.h | 15 +++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/modules/referee/rm_referee.c b/modules/referee/rm_referee.c index 8650fa0..818abed 100644 --- a/modules/referee/rm_referee.c +++ b/modules/referee/rm_referee.c @@ -16,8 +16,8 @@ #define RE_RX_BUFFER_SIZE 200 -static USARTInstance *referee_usart_instance; // 暂时改为非静态变量 - +static USARTInstance *referee_usart_instance; +static referee_tx_buffer_t referee_tx_buffer={{0},0}; static referee_info_t referee_info; static void JudgeReadData(uint8_t *ReadFromUsart); static void RefereeRxCallback(); @@ -35,16 +35,29 @@ referee_info_t *RefereeInit(UART_HandleTypeDef *referee_usart_handle) return &referee_info; } +/** + * @brief 载入缓存区函数 + * @param send 待载入的数据 + */ +void RefereeLoadToBuffer(uint8_t *send, uint16_t tx_len) +{ + memcpy((uint8_t *)(&referee_tx_buffer.buffer)+referee_tx_buffer.pos,send,tx_len); + referee_tx_buffer.pos+=tx_len; +} + + /** * @brief 发送函数 * @param send 待发送数据 */ void RefereeSend(uint8_t *send, uint16_t tx_len) { - USARTSend(referee_usart_instance, send, tx_len); + USARTSend(referee_usart_instance, send, tx_len);//syhtodo此函数需要重写 /* syhtodo DMA请求过快会导致数据发送丢失，考虑数据尽可能打成一个整包以及队列发送，并且发送函数添加缓冲区 */ } + + /*裁判系统串口接收回调函数,解析数据 */ static void RefereeRxCallback() { diff --git a/modules/referee/rm_referee.h b/modules/referee/rm_referee.h index 16fb381..08d9a01 100644 --- a/modules/referee/rm_referee.h +++ b/modules/referee/rm_referee.h @@ -7,6 +7,14 @@ extern uint8_t UI_Seq; #pragma pack(1) +#define RE_TX_BUFFER_SIZE 1024 +//发送缓冲区结构体定义 +typedef struct +{ + uint8_t buffer[RE_TX_BUFFER_SIZE]; + uint8_t pos; +} referee_tx_buffer_t; + typedef struct { uint8_t Robot_Color; //机器人颜色 @@ -50,6 +58,13 @@ typedef struct */ referee_info_t *RefereeInit(UART_HandleTypeDef *referee_usart_handle); + +/** + * @brief 载入缓存区函数 + * @param send 待载入的数据 + */ +void RefereeLoadToBuffer(uint8_t *send, uint16_t tx_len); + /** * @brief 发送函数 * @todo From b37ceaa2e90e3739074c48e44151facbf3f37de6 Mon Sep 17 00:00:00 2001 From: Kidenygood <2979564623@qq.com> Date: Mon, 3 Apr 2023 21:01:17 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=8F=91=E9=80=81=E7=BC=93=E5=86=B2?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HAL_N_Middlewares/Src/main.c | 3 +-- application/referee/referee.c | 2 ++ application/robot.c | 3 ++- modules/referee/referee_UI.c | 10 +++++----- modules/referee/referee_communication.c | 2 +- modules/referee/rm_referee.c | 7 ++++--- modules/referee/rm_referee.h | 4 ++-- 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/HAL_N_Middlewares/Src/main.c b/HAL_N_Middlewares/Src/main.c index df310d0..a06f22e 100644 --- a/HAL_N_Middlewares/Src/main.c +++ b/HAL_N_Middlewares/Src/main.c @@ -83,8 +83,7 @@ int main(void) /* MCU Configuration--------------------------------------------------------*/ /* Reset of all peripherals, Initializes the Flash interface and the Systick. */ - HAL_Init(); - + HAL_Init(); /* USER CODE BEGIN Init */ /* USER CODE END Init */ diff --git a/application/referee/referee.c b/application/referee/referee.c index 04a86fe..facaa56 100644 --- a/application/referee/referee.c +++ b/application/referee/referee.c @@ -381,4 +381,6 @@ static void UI_test_init(referee_info_t *_referee_info) Char_Draw(&sdata[0], "s7", UI_Graph_ADD, 0, UI_Color_Green, 20, 2, 620, 710); Char_Write(&sdata[0], "number:%d", 123); Char_ReFresh(&_referee_info->referee_id, sdata[0]); + + RefereeSend(); } diff --git a/application/robot.c b/application/robot.c index 6463b39..7806bea 100644 --- a/application/robot.c +++ b/application/robot.c @@ -35,11 +35,12 @@ void RobotInit() #endif #if defined(ONE_BOARD) || defined(CHASSIS_BOARD) - // Referee_Interactive_init(); + ChassisInit(); #endif // 初始化完成,开启中断 __enable_irq(); + Referee_Interactive_init(); } void RobotTask() diff --git a/modules/referee/referee_UI.c b/modules/referee/referee_UI.c index 2dc3e36..e40a95a 100644 --- a/modules/referee/referee_UI.c +++ b/modules/referee/referee_UI.c @@ -42,7 +42,7 @@ void UI_Delete(referee_id_t *_id, uint8_t Del_Operate, uint8_t Del_Layer) UI_delete_data.frametail = Get_CRC16_Check_Sum((uint8_t *)&UI_delete_data, LEN_HEADER + LEN_CMDID + temp_datalength, 0xFFFF); /* 填入0xFFFF,关于crc校验 */ - RefereeSend((uint8_t *)&UI_delete_data, LEN_HEADER + LEN_CMDID + temp_datalength + LEN_TAIL); // 发送 + RefereeLoadToBuffer((uint8_t *)&UI_delete_data, LEN_HEADER + LEN_CMDID + temp_datalength + LEN_TAIL); // 发送 UI_Seq++; // 包序号+1 } @@ -388,17 +388,17 @@ void UI_ReFresh(referee_id_t *_id, int cnt, ...) // 先发送帧头、命令码、交互数据帧头三部分，并计算CRC16校验值 UI_GraphReFresh_data.frametail = Get_CRC16_Check_Sum((uint8_t *)&UI_GraphReFresh_data, LEN_HEADER + LEN_CMDID + Interactive_Data_LEN_Head, 0xFFFF); - RefereeSend((uint8_t *)&UI_GraphReFresh_data, LEN_HEADER + LEN_CMDID + Interactive_Data_LEN_Head); + RefereeLoadToBuffer((uint8_t *)&UI_GraphReFresh_data, LEN_HEADER + LEN_CMDID + Interactive_Data_LEN_Head); for (i = 0; i < cnt; i++) // 发送交互数据的数据帧，并计算CRC16校验值 { graphData = va_arg(ap, Graph_Data_t); // 访问参数列表中的每个项,第二个参数是你要返回的参数的类型,在取值时需要将其强制转化为指定类型的变量 // 发送并计算CRC16 - RefereeSend((uint8_t *)&graphData, UI_Operate_LEN_PerDraw); + RefereeLoadToBuffer((uint8_t *)&graphData, UI_Operate_LEN_PerDraw); UI_GraphReFresh_data.frametail = Get_CRC16_Check_Sum((uint8_t *)&graphData, UI_Operate_LEN_PerDraw, UI_GraphReFresh_data.frametail); } - RefereeSend((uint8_t *)&UI_GraphReFresh_data.frametail, LEN_TAIL); // 发送CRC16校验值 + RefereeLoadToBuffer((uint8_t *)&UI_GraphReFresh_data.frametail, LEN_TAIL); // 发送CRC16校验值 va_end(ap); // 结束可变参数的获取 UI_Seq++; // 包序号+1 @@ -427,7 +427,7 @@ void Char_ReFresh(referee_id_t *_id, String_Data_t string_Data) UI_CharReFresh_data.frametail = Get_CRC16_Check_Sum((uint8_t *)&UI_CharReFresh_data, LEN_HEADER + LEN_CMDID + temp_datalength, 0xFFFF); - RefereeSend((uint8_t *)&UI_CharReFresh_data, LEN_HEADER + LEN_CMDID + temp_datalength + LEN_TAIL); // 发送 + RefereeLoadToBuffer((uint8_t *)&UI_CharReFresh_data, LEN_HEADER + LEN_CMDID + temp_datalength + LEN_TAIL); // 发送 UI_Seq++; // 包序号+1 } diff --git a/modules/referee/referee_communication.c b/modules/referee/referee_communication.c index d714605..fb93438 100644 --- a/modules/referee/referee_communication.c +++ b/modules/referee/referee_communication.c @@ -40,6 +40,6 @@ void Communicate_SendData(referee_id_t *_id,robot_interactive_data_t *_data) SendData.frametail = Get_CRC16_Check_Sum((uint8_t *)&SendData,LEN_HEADER+LEN_CMDID+temp_datalength,0xFFFF); - RefereeSend((uint8_t *)&SendData,LEN_HEADER+LEN_CMDID+temp_datalength+LEN_TAIL); //发送 + RefereeLoadToBuffer((uint8_t *)&SendData,LEN_HEADER+LEN_CMDID+temp_datalength+LEN_TAIL); //发送 UI_Seq++; // 包序号+1 } diff --git a/modules/referee/rm_referee.c b/modules/referee/rm_referee.c index 7e9471b..a91206e 100644 --- a/modules/referee/rm_referee.c +++ b/modules/referee/rm_referee.c @@ -48,11 +48,12 @@ void RefereeLoadToBuffer(uint8_t *send, uint16_t tx_len) /** * @brief 发送函数 - * @param send 待发送数据 + * @param */ -void RefereeSend(uint8_t *send, uint16_t tx_len) +void RefereeSend() { - USARTSend(referee_usart_instance, send, tx_len,USART_TRANSFER_IT);//syhtodo此函数需要重写 + USARTSend(referee_usart_instance, (uint8_t *)(&referee_tx_buffer.buffer), referee_tx_buffer.pos,USART_TRANSFER_DMA); + referee_tx_buffer.pos=0; /* syhtodo DMA请求过快会导致数据发送丢失，考虑数据尽可能打成一个整包以及队列发送，并且发送函数添加缓冲区 */ } diff --git a/modules/referee/rm_referee.h b/modules/referee/rm_referee.h index 08d9a01..8c1e50c 100644 --- a/modules/referee/rm_referee.h +++ b/modules/referee/rm_referee.h @@ -68,8 +68,8 @@ void RefereeLoadToBuffer(uint8_t *send, uint16_t tx_len); /** * @brief 发送函数 * @todo - * @param send 待发送数据 + * @param */ -void RefereeSend(uint8_t *send, uint16_t tx_len); +void RefereeSend(void); #endif // !REFEREE_H From 79ace733d37acbd7882f5c3563119efa4bb9d87f Mon Sep 17 00:00:00 2001 From: Kidenygood <2979564623@qq.com> Date: Mon, 3 Apr 2023 22:16:41 +0800 Subject: [PATCH 04/11] =?UTF-8?q?my=5Fui=5Finit=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/referee/referee.c | 19 ++++++------------- modules/referee/rm_referee.h | 4 ++-- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/application/referee/referee.c b/application/referee/referee.c index facaa56..7bfd35d 100644 --- a/application/referee/referee.c +++ b/application/referee/referee.c @@ -31,18 +31,13 @@ void Referee_Interactive_init() { referee_data = RefereeInit(&huart6); // 裁判系统初始化 // while (referee_data->GameRobotState.robot_id == 0); - referee_data->GameRobotState.robot_id = 101; // syhtodo RobotInit中关闭了中断进行初始化，无法读取到裁判系统的ID，暂时在此处写死 + referee_data->GameRobotState.robot_id = 103; // syhtodo RobotInit中关闭了中断进行初始化，无法读取到裁判系统的ID，暂时在此处写死 determine_ID(referee_data); - // My_UI_init(referee_data); - UI_test_init(referee_data); // syhtodo此处先使用测试函数 - - // syhtodo此处先关闭机器人车间通信 - // for (int i=0;idata[i]=i+1; - // } - // referee_data->referee_id.Receiver_Robot_ID = RobotID_BEngineer; // 机器人车间通信时接收者的ID暂时发给蓝色2 - // Communicate_SendData(&referee_data->referee_id,SendData); + My_UI_init(referee_data); + // UI_test_init(referee_data); // 测试函数 + RefereeSend(); + //如果此处还要加入车间通信初始化，注意将referee和车间通信的数据合并后再使用 + //refereesend函数永远是最后一步 } void Referee_Interactive_task() @@ -381,6 +376,4 @@ static void UI_test_init(referee_info_t *_referee_info) Char_Draw(&sdata[0], "s7", UI_Graph_ADD, 0, UI_Color_Green, 20, 2, 620, 710); Char_Write(&sdata[0], "number:%d", 123); Char_ReFresh(&_referee_info->referee_id, sdata[0]); - - RefereeSend(); } diff --git a/modules/referee/rm_referee.h b/modules/referee/rm_referee.h index 8c1e50c..733433f 100644 --- a/modules/referee/rm_referee.h +++ b/modules/referee/rm_referee.h @@ -7,12 +7,12 @@ extern uint8_t UI_Seq; #pragma pack(1) -#define RE_TX_BUFFER_SIZE 1024 +#define RE_TX_BUFFER_SIZE 512 //发送缓冲区结构体定义 typedef struct { uint8_t buffer[RE_TX_BUFFER_SIZE]; - uint8_t pos; + uint16_t pos; } referee_tx_buffer_t; typedef struct From 11655fbe46e2a1a7f0abb2cf3870c1366ee87f7e Mon Sep 17 00:00:00 2001 From: Kidenygood <2979564623@qq.com> Date: Mon, 17 Apr 2023 16:06:13 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=89=8D=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/referee/referee.c | 2 ++ application/robot.c | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/application/referee/referee.c b/application/referee/referee.c index 7bfd35d..5d91086 100644 --- a/application/referee/referee.c +++ b/application/referee/referee.c @@ -38,6 +38,8 @@ void Referee_Interactive_init() RefereeSend(); //如果此处还要加入车间通信初始化，注意将referee和车间通信的数据合并后再使用 //refereesend函数永远是最后一步 + + //串口接收需要设置喂狗 } void Referee_Interactive_task() diff --git a/application/robot.c b/application/robot.c index 7806bea..8e759a7 100644 --- a/application/robot.c +++ b/application/robot.c @@ -30,13 +30,13 @@ void RobotInit() #if defined(ONE_BOARD) || defined(GIMBAL_BOARD) RobotCMDInit(); - GimbalInit(); - ShootInit(); + // GimbalInit(); + // ShootInit(); #endif #if defined(ONE_BOARD) || defined(CHASSIS_BOARD) - ChassisInit(); + // ChassisInit(); #endif // 初始化完成,开启中断 __enable_irq(); @@ -47,12 +47,12 @@ void RobotTask() { #if defined(ONE_BOARD) || defined(GIMBAL_BOARD) RobotCMDTask(); - GimbalTask(); - ShootTask(); + // GimbalTask(); + // ShootTask(); #endif #if defined(ONE_BOARD) || defined(CHASSIS_BOARD) - ChassisTask(); + // ChassisTask(); // Referee_Interactive_task(); #endif } From 5c9c7962c882e851fc7e77c97829fb6f19fda5bf Mon Sep 17 00:00:00 2001 From: Kidenygood <2979564623@qq.com> Date: Mon, 17 Apr 2023 16:22:11 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=90=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/robot.c | 4 ++-- modules/referee/rm_referee.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/application/robot.c b/application/robot.c index e91cd81..68de21f 100644 --- a/application/robot.c +++ b/application/robot.c @@ -39,11 +39,11 @@ void RobotInit() #endif #if defined(ONE_BOARD) || defined(CHASSIS_BOARD) - ChassisInit(); + // ChassisInit(); #endif #ifdef BALANCE_BAORD - BalanceInit(); + // BalanceInit(); #endif // BALANCE_BA // 初始化完成,开启中断 diff --git a/modules/referee/rm_referee.c b/modules/referee/rm_referee.c index a91206e..e494d4e 100644 --- a/modules/referee/rm_referee.c +++ b/modules/referee/rm_referee.c @@ -54,7 +54,6 @@ void RefereeSend() { USARTSend(referee_usart_instance, (uint8_t *)(&referee_tx_buffer.buffer), referee_tx_buffer.pos,USART_TRANSFER_DMA); referee_tx_buffer.pos=0; - /* syhtodo DMA请求过快会导致数据发送丢失，考虑数据尽可能打成一个整包以及队列发送，并且发送函数添加缓冲区 */ } From f6c686598d0234148443f98e4ccd6560b3d4048f Mon Sep 17 00:00:00 2001 From: NeoZng Date: Wed, 19 Apr 2023 18:52:40 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E4=BA=86=E8=A3=81=E5=88=A4=E7=B3=BB=E7=BB=9F=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 4 +- Src/freertos.c | 104 ++-- application/balance_chassis/balance.c | 2 +- application/chassis/chassis.c | 10 +- application/referee/referee.h | 50 -- application/referee/referee.md | 3 - application/robot.c | 8 +- modules/referee/crc_ref.h | 2 +- modules/referee/referee.md | 4 +- modules/referee/referee_UI.c | 589 +++++++++--------- modules/referee/referee_UI.h | 69 +- modules/referee/referee_communication.c | 45 -- modules/referee/referee_communication.h | 10 - .../{referee_def.h => referee_protocol.h} | 49 +- .../referee/referee_task.c | 140 ++--- modules/referee/referee_task.h | 19 + modules/referee/rm_referee.c | 116 ++-- modules/referee/rm_referee.h | 95 ++- 18 files changed, 615 insertions(+), 704 deletions(-) delete mode 100644 application/referee/referee.h delete mode 100644 application/referee/referee.md delete mode 100644 modules/referee/referee_communication.c delete mode 100644 modules/referee/referee_communication.h rename modules/referee/{referee_def.h => referee_protocol.h} (86%) rename application/referee/referee.c => modules/referee/referee_task.c (76%) create mode 100644 modules/referee/referee_task.h diff --git a/Makefile b/Makefile index 664d149..c551cca 100644 --- a/Makefile +++ b/Makefile @@ -145,7 +145,7 @@ modules/oled/oled.c \ modules/referee/crc_ref.c \ modules/referee/rm_referee.c \ modules/referee/referee_UI.c \ -modules/referee/referee_communication.c \ +modules/referee/referee_task.c \ modules/remote/remote_control.c \ modules/super_cap/super_cap.c \ modules/can_comm/can_comm.c \ @@ -155,7 +155,6 @@ modules/vofa/vofa.c \ application/gimbal/gimbal.c \ application/chassis/chassis.c \ application/shoot/shoot.c \ -application/referee/referee.c \ application/cmd/robot_cmd.c \ application/balance_chassis/balance.c \ application/robot.c @@ -237,7 +236,6 @@ C_INCLUDES = \ -Iapplication/gimbal \ -Iapplication/cmd \ -Iapplication/balance_chassis \ --Iapplication/referee \ -Iapplication \ -Ibsp/dwt \ -Ibsp/can \ diff --git a/Src/freertos.c b/Src/freertos.c index d4c2165..2a2b1a2 100644 --- a/Src/freertos.c +++ b/Src/freertos.c @@ -1,20 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : freertos.c - * Description : Code for freertos applications - ****************************************************************************** - * @attention - * - * Copyright (c) 2023 STMicroelectronics. - * All rights reserved. - * - * This software is licensed under terms that can be found in the LICENSE file - * in the root directory of this software component. - * If no LICENSE file comes with this software, it is provided AS-IS. - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : freertos.c + * Description : Code for freertos applications + ****************************************************************************** + * @attention + * + * Copyright (c) 2023 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -28,6 +28,7 @@ #include "ins_task.h" #include "motor_task.h" #include "led_task.h" +#include "referee_task.h" #include "daemon.h" #include "robot.h" /* USER CODE END Includes */ @@ -55,28 +56,32 @@ osThreadId defaultTaskHandle; /* Private function prototypes -----------------------------------------------*/ /* USER CODE BEGIN FunctionPrototypes */ -void StartINSTASK(void const * argument); +void StartINSTASK(void const *argument); -void StartMOTORTASK(void const * argument); +void StartMOTORTASK(void const *argument); -void StartDAEMONTASK(void const* argument); +void StartDAEMONTASK(void const *argument); -void StartROBOTTASK(void const* argument); +void StartROBOTTASK(void const *argument); + +void StartROBOTTASK(void const *argument); + +void StartUITASK(void const *argument); /* USER CODE END FunctionPrototypes */ -void StartDefaultTask(void const * argument); +void StartDefaultTask(void const *argument); extern void MX_USB_DEVICE_Init(void); void MX_FREERTOS_Init(void); /* (MISRA C 2004 rule 8.1) */ /* GetIdleTaskMemory prototype (linked to static allocation support) */ -void vApplicationGetIdleTaskMemory( StaticTask_t **ppxIdleTaskTCBBuffer, StackType_t **ppxIdleTaskStackBuffer, uint32_t *pulIdleTaskStackSize ); +void vApplicationGetIdleTaskMemory(StaticTask_t **ppxIdleTaskTCBBuffer, StackType_t **ppxIdleTaskStackBuffer, uint32_t *pulIdleTaskStackSize); /* USER CODE BEGIN GET_IDLE_TASK_MEMORY */ static StaticTask_t xIdleTaskTCBBuffer; static StackType_t xIdleStack[configMINIMAL_STACK_SIZE]; -void vApplicationGetIdleTaskMemory( StaticTask_t **ppxIdleTaskTCBBuffer, StackType_t **ppxIdleTaskStackBuffer, uint32_t *pulIdleTaskStackSize ) +void vApplicationGetIdleTaskMemory(StaticTask_t **ppxIdleTaskTCBBuffer, StackType_t **ppxIdleTaskStackBuffer, uint32_t *pulIdleTaskStackSize) { *ppxIdleTaskTCBBuffer = &xIdleTaskTCBBuffer; *ppxIdleTaskStackBuffer = &xIdleStack[0]; @@ -86,11 +91,12 @@ void vApplicationGetIdleTaskMemory( StaticTask_t **ppxIdleTaskTCBBuffer, StackTy /* USER CODE END GET_IDLE_TASK_MEMORY */ /** - * @brief FreeRTOS initialization - * @param None - * @retval None - */ -void MX_FREERTOS_Init(void) { + * @brief FreeRTOS initialization + * @param None + * @retval None + */ +void MX_FREERTOS_Init(void) +{ /* USER CODE BEGIN Init */ /* USER CODE END Init */ @@ -129,24 +135,27 @@ void MX_FREERTOS_Init(void) { osThreadDef(robottask, StartROBOTTASK, osPriorityNormal, 0, 1024); defaultTaskHandle = osThreadCreate(osThread(robottask), NULL); - /* USER CODE END RTOS_THREADS */ + osThreadDef(uitask, StartUITASK, osPriorityNormal, 0, 512); + defaultTaskHandle = osThreadCreate(osThread(uitask), NULL); + + /* USER CODE END RTOS_THREADS */ } /* USER CODE BEGIN Header_StartDefaultTask */ /** - * @brief Function implementing the defaultTask thread. - * @param argument: Not used - * @retval None - */ + * @brief Function implementing the defaultTask thread. + * @param argument: Not used + * @retval None + */ /* USER CODE END Header_StartDefaultTask */ -void StartDefaultTask(void const * argument) +void StartDefaultTask(void const *argument) { /* init code for USB_DEVICE */ MX_USB_DEVICE_Init(); /* USER CODE BEGIN StartDefaultTask */ /* Infinite loop */ - for(;;) + for (;;) { osDelay(1); } @@ -155,43 +164,52 @@ void StartDefaultTask(void const * argument) /* Private application code --------------------------------------------------*/ /* USER CODE BEGIN Application */ -void StartINSTASK(void const * argument) +void StartINSTASK(void const *argument) { while (1) { - //1kHz - INS_Task(); + // 1kHz + // INS_Task(); osDelay(1); } } -void StartMOTORTASK(void const * argument) +void StartMOTORTASK(void const *argument) { while (1) { - //500Hz + // 500Hz MotorControlTask(); osDelay(2); } } -void StartDAEMONTASK(void const * argument) +void StartDAEMONTASK(void const *argument) { while (1) { - //100Hz + // 100Hz DaemonTask(); osDelay(10); } } -void StartROBOTTASK(void const * argument) +void StartROBOTTASK(void const *argument) { while (1) { // 200Hz RobotTask(); - osDelay(10);//syh此处暂时将时间改?10ms，原因在于未使用缓冲区发送，发?时延时5ms + osDelay(10); // syh此处暂时将时间改�?10ms，原因在于未使用缓冲区发送，发�?�时延时5ms + } +} + +void StartUITASK(void const *argument) +{ + Referee_Interactive_init(); + while (1) + { + Referee_Interactive_task(); } } /* USER CODE END Application */ diff --git a/application/balance_chassis/balance.c b/application/balance_chassis/balance.c index f935571..7f9ec0e 100644 --- a/application/balance_chassis/balance.c +++ b/application/balance_chassis/balance.c @@ -7,11 +7,11 @@ #include "HT04.h" #include "LK9025.h" #include "bmi088.h" -#include "referee.h" #include "super_cap.h" #include "controller.h" #include "can_comm.h" #include "user_lib.h" +#include "rm_referee.h" // standard #include "stdint.h" #include "arm_math.h" // 需要用到较多三角函数 diff --git a/application/chassis/chassis.c b/application/chassis/chassis.c index 6b3cc54..3306643 100644 --- a/application/chassis/chassis.c +++ b/application/chassis/chassis.c @@ -16,12 +16,7 @@ #include "dji_motor.h" #include "super_cap.h" #include "message_center.h" - -// referee需要移动到module层 -///////////////////////// - #include "rm_referee.h" -///////////////////////// #include "general_def.h" #include "bsp_dwt.h" @@ -47,6 +42,9 @@ static Subscriber_t *chassis_sub; // 用于订阅底盘的控 static Chassis_Ctrl_Cmd_s chassis_cmd_recv; // 底盘接收到的控制命令 static Chassis_Upload_Data_s chassis_feedback_data; // 底盘回传的反馈数据 +static referee_info_t* referee_data; // 用于获取裁判系统的数据 +static Referee_Interactive_info_t ui_data; // UI数据 + static SuperCapInstance *cap; // 超级电容 static DJIMotorInstance *motor_lf, *motor_rf, *motor_lb, *motor_rb; // left right forward back @@ -105,7 +103,7 @@ void ChassisInit() chassis_motor_config.controller_setting_init_config.motor_reverse_flag = MOTOR_DIRECTION_REVERSE; motor_rb = DJIMotorInit(&chassis_motor_config); - // referee_data = RefereeInit(&huart6); // 裁判系统初始化 + referee_data = RefereeInit(&huart6,&ui_data); // 裁判系统初始化 // while (referee_data->GameRobotState.robot_id ==0); // Referee_Interactive_init(referee_data); diff --git a/application/referee/referee.h b/application/referee/referee.h deleted file mode 100644 index d531d5a..0000000 --- a/application/referee/referee.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef REFEREE_H -#define REFEREE_H - -#include "rm_referee.h" -#include "robot_def.h" -#pragma pack(1) - -//模式是否切换标志位，0为未切换，1为切换，static定义默认为0 -typedef struct -{ - uint32_t chassis_flag : 1; - uint32_t gimbal_flag : 1; - uint32_t shoot_flag : 1; - uint32_t lid_flag : 1; - uint32_t friction_flag : 1; - uint32_t Power_flag : 1; -} Referee_Interactive_Flag_t; - - -// 此结构体包含UI绘制与机器人车间通信的需要的其他非裁判系统数据 -typedef struct -{ - Referee_Interactive_Flag_t Referee_Interactive_Flag; - //为UI绘制以及交互数据所用 - Robot_Status_e Robot_Status;// 机器人状态 - App_Status_e App_Status;// 应用状态 - chassis_mode_e chassis_mode;//底盘模式 - gimbal_mode_e gimbal_mode;//云台模式 - shoot_mode_e shoot_mode;//发射模式设置 - friction_mode_e friction_mode;//摩擦轮关闭 - lid_mode_e lid_mode;//弹舱盖打开 - loader_mode_e loader_mode;//单发...连发 - Chassis_Power_Data_s Chassis_Power_Data;// 功率控制 - - chassis_mode_e chassis_last_mode;//底盘模式 - gimbal_mode_e gimbal_last_mode;//云台模式 - shoot_mode_e shoot_last_mode;//发射模式设置 - friction_mode_e friction_last_mode;//摩擦轮关闭 - lid_mode_e lid_last_mode;//弹舱盖打开 - -} Referee_Interactive_info_t; - -#pragma pack() - -void Referee_Interactive_init(void); -void Referee_Interactive_task(void); -#endif // REFEREE_H - - - diff --git a/application/referee/referee.md b/application/referee/referee.md deleted file mode 100644 index 7e97160..0000000 --- a/application/referee/referee.md +++ /dev/null @@ -1,3 +0,0 @@ -# referee - -需要将此模块移动到module层，并新建一个rtos任务，以一定频率运行，用于ui刷新和多机通信 diff --git a/application/robot.c b/application/robot.c index 68de21f..a3185db 100644 --- a/application/robot.c +++ b/application/robot.c @@ -22,14 +22,13 @@ #include "balance.h" #endif // BALANCE_BOARD - void RobotInit() -{ +{ // 关闭中断,防止在初始化过程中发生中断 // 请不要在初始化过程中使用中断和延时函数！ // 若必须,则只允许使用DWT_Delay() __disable_irq(); - + BSPInit(); #if defined(ONE_BOARD) || defined(GIMBAL_BOARD) @@ -39,7 +38,7 @@ void RobotInit() #endif #if defined(ONE_BOARD) || defined(CHASSIS_BOARD) - // ChassisInit(); + ChassisInit(); #endif #ifdef BALANCE_BAORD @@ -48,7 +47,6 @@ void RobotInit() // 初始化完成,开启中断 __enable_irq(); - Referee_Interactive_init(); } void RobotTask() diff --git a/modules/referee/crc_ref.h b/modules/referee/crc_ref.h index 2b210fe..7ad1297 100644 --- a/modules/referee/crc_ref.h +++ b/modules/referee/crc_ref.h @@ -1,7 +1,7 @@ #ifndef __CRC_H_ #define __CRC_H_ -//裁判系统官方CRC校验,LUT和module/algorithms中的不同,后续需要统一实现crc,提供8/16/32的支持 +// 裁判系统官方CRC校验,LUT和module/algorithms中的不同,后续需要统一实现crc,提供8/16/32的支持 #include diff --git a/modules/referee/referee.md b/modules/referee/referee.md index d818026..2b09cc3 100644 --- a/modules/referee/referee.md +++ b/modules/referee/referee.md @@ -1,3 +1 @@ -# referee - -当前模块组织较为混乱，后续统一为多机通信+裁判系统信息接收+UI绘制。UI绘制和多机通信的发送部分在referee任务中以一定的频率运行，信息的接收通过中断完成。 \ No newline at end of file +# referee \ No newline at end of file diff --git a/modules/referee/referee_UI.c b/modules/referee/referee_UI.c index e40a95a..651a891 100644 --- a/modules/referee/referee_UI.c +++ b/modules/referee/referee_UI.c @@ -10,424 +10,415 @@ */ #include "referee_UI.h" #include "string.h" -#include "crc.h" +#include "crc_ref.h" #include "stdio.h" #include "rm_referee.h" // 包序号 /********************************************删除操作************************************* **参数：_id 对应的id结构体 - Del_Operate 对应头文件删除操作 - Del_Layer 要删除的层 取值0-9 + Del_Operate 对应头文件删除操作 + Del_Layer 要删除的层 取值0-9 *****************************************************************************************/ -void UI_Delete(referee_id_t *_id, uint8_t Del_Operate, uint8_t Del_Layer) +void UIDelete(referee_id_t *_id, uint8_t Del_Operate, uint8_t Del_Layer) { - UI_delete_t UI_delete_data; - uint8_t temp_datalength = Interactive_Data_LEN_Head + UI_Operate_LEN_Del; // 计算交互数据长度 + UI_delete_t UI_delete_data; + uint8_t temp_datalength = Interactive_Data_LEN_Head + UI_Operate_LEN_Del; // 计算交互数据长度 - UI_delete_data.FrameHeader.SOF = REFEREE_SOF; - UI_delete_data.FrameHeader.DataLength = temp_datalength; - UI_delete_data.FrameHeader.Seq = UI_Seq; - UI_delete_data.FrameHeader.CRC8 = Get_CRC8_Check_Sum((uint8_t *)&UI_delete_data, LEN_CRC8, 0xFF); + UI_delete_data.FrameHeader.SOF = REFEREE_SOF; + UI_delete_data.FrameHeader.DataLength = temp_datalength; + UI_delete_data.FrameHeader.Seq = UI_Seq; + UI_delete_data.FrameHeader.CRC8 = Get_CRC8_Check_Sum((uint8_t *)&UI_delete_data, LEN_CRC8, 0xFF); - UI_delete_data.CmdID = ID_student_interactive; + UI_delete_data.CmdID = ID_student_interactive; - UI_delete_data.datahead.data_cmd_id = UI_Data_ID_Del; - UI_delete_data.datahead.receiver_ID = _id->Cilent_ID; - UI_delete_data.datahead.sender_ID = _id->Robot_ID; + UI_delete_data.datahead.data_cmd_id = UI_Data_ID_Del; + UI_delete_data.datahead.receiver_ID = _id->Cilent_ID; + UI_delete_data.datahead.sender_ID = _id->Robot_ID; - UI_delete_data.Delete_Operate = Del_Operate; // 删除操作 - UI_delete_data.Layer = Del_Layer; + UI_delete_data.Delete_Operate = Del_Operate; // 删除操作 + UI_delete_data.Layer = Del_Layer; - UI_delete_data.frametail = Get_CRC16_Check_Sum((uint8_t *)&UI_delete_data, LEN_HEADER + LEN_CMDID + temp_datalength, 0xFFFF); - /* 填入0xFFFF,关于crc校验 */ + UI_delete_data.frametail = Get_CRC16_Check_Sum((uint8_t *)&UI_delete_data, LEN_HEADER + LEN_CMDID + temp_datalength, 0xFFFF); + /* 填入0xFFFF,关于crc校验 */ - RefereeLoadToBuffer((uint8_t *)&UI_delete_data, LEN_HEADER + LEN_CMDID + temp_datalength + LEN_TAIL); // 发送 + RefereeSend((uint8_t *)&UI_delete_data, LEN_HEADER + LEN_CMDID + temp_datalength + LEN_TAIL); // 发送 - UI_Seq++; // 包序号+1 + UI_Seq++; // 包序号+1 } /************************************************绘制直线************************************************* **参数：*graph Graph_Data类型变量指针，用于存放图形数据 - graphname[3] 图片名称，用于标识更改 - Graph_Operate 图片操作，见头文件 - Graph_Layer 图层0-9 - Graph_Color 图形颜色 - Graph_Width 图形线宽 - Start_x、Start_y 起点xy坐标 - End_x、End_y 终点xy坐标 + graphname[3] 图片名称，用于标识更改 + Graph_Operate 图片操作，见头文件 + Graph_Layer 图层0-9 + Graph_Color 图形颜色 + Graph_Width 图形线宽 + Start_x、Start_y 起点xy坐标 + End_x、End_y 终点xy坐标 **********************************************************************************************************/ void Line_Draw(Graph_Data_t *graph, char graphname[3], uint32_t Graph_Operate, uint32_t Graph_Layer, uint32_t Graph_Color, - uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, uint32_t End_x, uint32_t End_y) + uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, uint32_t End_x, uint32_t End_y) { - int i; - for (i = 0; i < 3 && graphname[i] != '\0'; i++) // 填充至‘0’为止 - { - graph->graphic_name[2 - i] = graphname[i]; // 按内存地址增大方向填充，所以会有i与2-i - } + int i; + for (i = 0; i < 3 && graphname[i] != '\0'; i++) // 填充至‘0’为止 + { + graph->graphic_name[2 - i] = graphname[i]; // 按内存地址增大方向填充，所以会有i与2-i + } - graph->operate_tpye = Graph_Operate; - graph->graphic_tpye = UI_Graph_Line; - graph->layer = Graph_Layer; - graph->color = Graph_Color; + graph->operate_tpye = Graph_Operate; + graph->graphic_tpye = UI_Graph_Line; + graph->layer = Graph_Layer; + graph->color = Graph_Color; - graph->start_angle = 0; - graph->end_angle = 0; - graph->width = Graph_Width; - graph->start_x = Start_x; - graph->start_y = Start_y; - graph->radius = 0; - graph->end_x = End_x; - graph->end_y = End_y; + graph->start_angle = 0; + graph->end_angle = 0; + graph->width = Graph_Width; + graph->start_x = Start_x; + graph->start_y = Start_y; + graph->radius = 0; + graph->end_x = End_x; + graph->end_y = End_y; } /************************************************绘制矩形************************************************* **参数：*graph Graph_Data类型变量指针，用于存放图形数据 - graphname[3] 图片名称，用于标识更改 - Graph_Operate 图片操作，见头文件 - Graph_Layer 图层0-9 - Graph_Color 图形颜色 - Graph_Width 图形线宽 - Start_x、Start_y 起点xy坐标 - End_x、End_y 对角顶点xy坐标 + graphname[3] 图片名称，用于标识更改 + Graph_Operate 图片操作，见头文件 + Graph_Layer 图层0-9 + Graph_Color 图形颜色 + Graph_Width 图形线宽 + Start_x、Start_y 起点xy坐标 + End_x、End_y 对角顶点xy坐标 **********************************************************************************************************/ void Rectangle_Draw(Graph_Data_t *graph, char graphname[3], uint32_t Graph_Operate, uint32_t Graph_Layer, uint32_t Graph_Color, - uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, uint32_t End_x, uint32_t End_y) + uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, uint32_t End_x, uint32_t End_y) { - int i; - for (i = 0; i < 3 && graphname[i] != '\0'; i++) - { - graph->graphic_name[2 - i] = graphname[i]; - } + int i; + for (i = 0; i < 3 && graphname[i] != '\0'; i++) + { + graph->graphic_name[2 - i] = graphname[i]; + } - graph->graphic_tpye = UI_Graph_Rectangle; - graph->operate_tpye = Graph_Operate; - graph->layer = Graph_Layer; - graph->color = Graph_Color; + graph->graphic_tpye = UI_Graph_Rectangle; + graph->operate_tpye = Graph_Operate; + graph->layer = Graph_Layer; + graph->color = Graph_Color; - graph->start_angle = 0; - graph->end_angle = 0; - graph->width = Graph_Width; - graph->start_x = Start_x; - graph->start_y = Start_y; - graph->radius = 0; - graph->end_x = End_x; - graph->end_y = End_y; + graph->start_angle = 0; + graph->end_angle = 0; + graph->width = Graph_Width; + graph->start_x = Start_x; + graph->start_y = Start_y; + graph->radius = 0; + graph->end_x = End_x; + graph->end_y = End_y; } /************************************************绘制整圆************************************************* **参数：*graph Graph_Data类型变量指针，用于存放图形数据 - graphname[3] 图片名称，用于标识更改 - Graph_Operate 图片操作，见头文件 - Graph_Layer 图层0-9 - Graph_Color 图形颜色 - Graph_Width 图形线宽 - Start_x、Start_y 圆心xy坐标 - Graph_Radius 圆形半径 + graphname[3] 图片名称，用于标识更改 + Graph_Operate 图片操作，见头文件 + Graph_Layer 图层0-9 + Graph_Color 图形颜色 + Graph_Width 图形线宽 + Start_x、Start_y 圆心xy坐标 + Graph_Radius 圆形半径 **********************************************************************************************************/ void Circle_Draw(Graph_Data_t *graph, char graphname[3], uint32_t Graph_Operate, uint32_t Graph_Layer, uint32_t Graph_Color, - uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, uint32_t Graph_Radius) + uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, uint32_t Graph_Radius) { - int i; - for (i = 0; i < 3 && graphname[i] != '\0'; i++) - { - graph->graphic_name[2 - i] = graphname[i]; - } + int i; + for (i = 0; i < 3 && graphname[i] != '\0'; i++) + { + graph->graphic_name[2 - i] = graphname[i]; + } - graph->graphic_tpye = UI_Graph_Circle; - graph->operate_tpye = Graph_Operate; - graph->layer = Graph_Layer; - graph->color = Graph_Color; + graph->graphic_tpye = UI_Graph_Circle; + graph->operate_tpye = Graph_Operate; + graph->layer = Graph_Layer; + graph->color = Graph_Color; - graph->start_angle = 0; - graph->end_angle = 0; - graph->width = Graph_Width; - graph->start_x = Start_x; - graph->start_y = Start_y; - graph->radius = Graph_Radius; - graph->end_x = 0; - graph->end_y = 0; + graph->start_angle = 0; + graph->end_angle = 0; + graph->width = Graph_Width; + graph->start_x = Start_x; + graph->start_y = Start_y; + graph->radius = Graph_Radius; + graph->end_x = 0; + graph->end_y = 0; } /************************************************绘制椭圆************************************************* **参数：*graph Graph_Data类型变量指针，用于存放图形数据 - graphname[3] 图片名称，用于标识更改 - Graph_Operate 图片操作，见头文件 - Graph_Layer 图层0-9 - Graph_Color 图形颜色 - Graph_Width 图形线宽 - Start_x、Start_y 圆心xy坐标 - End_x、End_y xy半轴长度 + graphname[3] 图片名称，用于标识更改 + Graph_Operate 图片操作，见头文件 + Graph_Layer 图层0-9 + Graph_Color 图形颜色 + Graph_Width 图形线宽 + Start_x、Start_y 圆心xy坐标 + End_x、End_y xy半轴长度 **********************************************************************************************************/ void Elliptical_Draw(Graph_Data_t *graph, char graphname[3], uint32_t Graph_Operate, uint32_t Graph_Layer, uint32_t Graph_Color, - uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, uint32_t end_x, uint32_t end_y) + uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, uint32_t end_x, uint32_t end_y) { - int i; - for (i = 0; i < 3 && graphname[i] != '\0'; i++) - { - graph->graphic_name[2 - i] = graphname[i]; - } + int i; + for (i = 0; i < 3 && graphname[i] != '\0'; i++) + { + graph->graphic_name[2 - i] = graphname[i]; + } - graph->graphic_tpye = UI_Graph_Ellipse; - graph->operate_tpye = Graph_Operate; - graph->layer = Graph_Layer; - graph->color = Graph_Color; - graph->width = Graph_Width; + graph->graphic_tpye = UI_Graph_Ellipse; + graph->operate_tpye = Graph_Operate; + graph->layer = Graph_Layer; + graph->color = Graph_Color; + graph->width = Graph_Width; - graph->start_angle = 0; - graph->end_angle = 0; - graph->width = Graph_Width; - graph->start_x = Start_x; - graph->start_y = Start_y; - graph->radius = 0; - graph->end_x = end_x; - graph->end_y = end_y; + graph->start_angle = 0; + graph->end_angle = 0; + graph->width = Graph_Width; + graph->start_x = Start_x; + graph->start_y = Start_y; + graph->radius = 0; + graph->end_x = end_x; + graph->end_y = end_y; } /************************************************绘制圆弧************************************************* **参数：*graph Graph_Data类型变量指针，用于存放图形数据 - graphname[3] 图片名称，用于标识更改 - Graph_Operate 图片操作，见头文件 - Graph_Layer 图层0-9 - Graph_Color 图形颜色 - Graph_StartAngle,Graph_EndAngle 起始终止角度 - Graph_Width 图形线宽 - Start_y,Start_y 圆心xy坐标 - x_Length,y_Length xy半轴长度 + graphname[3] 图片名称，用于标识更改 + Graph_Operate 图片操作，见头文件 + Graph_Layer 图层0-9 + Graph_Color 图形颜色 + Graph_StartAngle,Graph_EndAngle 起始终止角度 + Graph_Width 图形线宽 + Start_y,Start_y 圆心xy坐标 + x_Length,y_Length xy半轴长度 **********************************************************************************************************/ void Arc_Draw(Graph_Data_t *graph, char graphname[3], uint32_t Graph_Operate, uint32_t Graph_Layer, uint32_t Graph_Color, - uint32_t Graph_StartAngle, uint32_t Graph_EndAngle, uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, - uint32_t end_x, uint32_t end_y) + uint32_t Graph_StartAngle, uint32_t Graph_EndAngle, uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, + uint32_t end_x, uint32_t end_y) { - int i; - for (i = 0; i < 3 && graphname[i] != '\0'; i++) - { - graph->graphic_name[2 - i] = graphname[i]; - } + int i; + for (i = 0; i < 3 && graphname[i] != '\0'; i++) + { + graph->graphic_name[2 - i] = graphname[i]; + } - graph->graphic_tpye = UI_Graph_Arc; - graph->operate_tpye = Graph_Operate; - graph->layer = Graph_Layer; - graph->color = Graph_Color; + graph->graphic_tpye = UI_Graph_Arc; + graph->operate_tpye = Graph_Operate; + graph->layer = Graph_Layer; + graph->color = Graph_Color; - graph->start_angle = Graph_StartAngle; - graph->end_angle = Graph_EndAngle; - graph->width = Graph_Width; - graph->start_x = Start_x; - graph->start_y = Start_y; - graph->radius = 0; - graph->end_x = end_x; - graph->end_y = end_y; + graph->start_angle = Graph_StartAngle; + graph->end_angle = Graph_EndAngle; + graph->width = Graph_Width; + graph->start_x = Start_x; + graph->start_y = Start_y; + graph->radius = 0; + graph->end_x = end_x; + graph->end_y = end_y; } /************************************************绘制浮点型数据************************************************* **参数：*graph Graph_Data类型变量指针，用于存放图形数据 - graphname[3] 图片名称，用于标识更改 - Graph_Operate 图片操作，见头文件 - Graph_Layer 图层0-9 - Graph_Color 图形颜色 - Graph_Size 字号 - Graph_Digit 小数位数 - Graph_Width 图形线宽 - Start_x、Start_y 开始坐标 - radius=a&0x3FF; a为浮点数乘以1000后的32位整型数 - end_x=(a>>10)&0x7FF; - end_y=(a>>21)&0x7FF; + graphname[3] 图片名称，用于标识更改 + Graph_Operate 图片操作，见头文件 + Graph_Layer 图层0-9 + Graph_Color 图形颜色 + Graph_Size 字号 + Graph_Digit 小数位数 + Graph_Width 图形线宽 + Start_x、Start_y 开始坐标 + radius=a&0x3FF; a为浮点数乘以1000后的32位整型数 + end_x=(a>>10)&0x7FF; + end_y=(a>>21)&0x7FF; **********************************************************************************************************/ void Float_Draw(Graph_Data_t *graph, char graphname[3], uint32_t Graph_Operate, uint32_t Graph_Layer, uint32_t Graph_Color, - uint32_t Graph_Size, uint32_t Graph_Digit, uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, int32_t Graph_Float) + uint32_t Graph_Size, uint32_t Graph_Digit, uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, int32_t Graph_Float) { - int i; - for (i = 0; i < 3 && graphname[i] != '\0'; i++) - { - graph->graphic_name[2 - i] = graphname[i]; - } - graph->graphic_tpye = UI_Graph_Float; - graph->operate_tpye = Graph_Operate; - graph->layer = Graph_Layer; - graph->color = Graph_Color; + int i; + for (i = 0; i < 3 && graphname[i] != '\0'; i++) + { + graph->graphic_name[2 - i] = graphname[i]; + } + graph->graphic_tpye = UI_Graph_Float; + graph->operate_tpye = Graph_Operate; + graph->layer = Graph_Layer; + graph->color = Graph_Color; - graph->width = Graph_Width; - graph->start_x = Start_x; - graph->start_y = Start_y; - graph->start_angle = Graph_Size; - graph->end_angle = Graph_Digit; + graph->width = Graph_Width; + graph->start_x = Start_x; + graph->start_y = Start_y; + graph->start_angle = Graph_Size; + graph->end_angle = Graph_Digit; - graph->radius = Graph_Float & 0x3FF; - graph->end_x = (Graph_Float >> 10) & 0x7FF; - graph->end_y = (Graph_Float >> 21) & 0x7FF; + graph->radius = Graph_Float & 0x3FF; + graph->end_x = (Graph_Float >> 10) & 0x7FF; + graph->end_y = (Graph_Float >> 21) & 0x7FF; } /************************************************绘制整型数据************************************************* **参数：*graph Graph_Data类型变量指针，用于存放图形数据 - graphname[3] 图片名称，用于标识更改 - Graph_Operate 图片操作，见头文件 - Graph_Layer 图层0-9 - Graph_Color 图形颜色 - Graph_Size 字号 - Graph_Width 图形线宽 - Start_x、Start_y 开始坐标 - radius=a&0x3FF; a为32位整型数 - end_x=(a>>10)&0x7FF; - end_y=(a>>21)&0x7FF; + graphname[3] 图片名称，用于标识更改 + Graph_Operate 图片操作，见头文件 + Graph_Layer 图层0-9 + Graph_Color 图形颜色 + Graph_Size 字号 + Graph_Width 图形线宽 + Start_x、Start_y 开始坐标 + radius=a&0x3FF; a为32位整型数 + end_x=(a>>10)&0x7FF; + end_y=(a>>21)&0x7FF; **********************************************************************************************************/ void Integer_Draw(Graph_Data_t *graph, char graphname[3], uint32_t Graph_Operate, uint32_t Graph_Layer, uint32_t Graph_Color, - uint32_t Graph_Size, uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, int32_t Graph_Integer) + uint32_t Graph_Size, uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, int32_t Graph_Integer) { - int i; - for (i = 0; i < 3 && graphname[i] != '\0'; i++) - { - graph->graphic_name[2 - i] = graphname[i]; - } - graph->graphic_tpye = UI_Graph_Int; - graph->operate_tpye = Graph_Operate; - graph->layer = Graph_Layer; - graph->color = Graph_Color; + int i; + for (i = 0; i < 3 && graphname[i] != '\0'; i++) + { + graph->graphic_name[2 - i] = graphname[i]; + } + graph->graphic_tpye = UI_Graph_Int; + graph->operate_tpye = Graph_Operate; + graph->layer = Graph_Layer; + graph->color = Graph_Color; - graph->start_angle = Graph_Size; - graph->end_angle = 0; - graph->width = Graph_Width; - graph->start_x = Start_x; - graph->start_y = Start_y; - graph->radius = Graph_Integer & 0x3FF; - graph->end_x = (Graph_Integer >> 10) & 0x7FF; - graph->end_y = (Graph_Integer >> 21) & 0x7FF; + graph->start_angle = Graph_Size; + graph->end_angle = 0; + graph->width = Graph_Width; + graph->start_x = Start_x; + graph->start_y = Start_y; + graph->radius = Graph_Integer & 0x3FF; + graph->end_x = (Graph_Integer >> 10) & 0x7FF; + graph->end_y = (Graph_Integer >> 21) & 0x7FF; } /************************************************绘制字符型数据************************************************* **参数：*graph Graph_Data类型变量指针，用于存放图形数据 - graphname[3] 图片名称，用于标识更改 - Graph_Operate 图片操作，见头文件 - Graph_Layer 图层0-9 - Graph_Color 图形颜色 - Graph_Size 字号 - Graph_Width 图形线宽 - Start_x、Start_y 开始坐标 + graphname[3] 图片名称，用于标识更改 + Graph_Operate 图片操作，见头文件 + Graph_Layer 图层0-9 + Graph_Color 图形颜色 + Graph_Size 字号 + Graph_Width 图形线宽 + Start_x、Start_y 开始坐标 + +**参数：*graph Graph_Data类型变量指针，用于存放图形数据 + fmt需要显示的字符串 + 此函数的实现和具体使用类似于printf函数 **********************************************************************************************************/ void Char_Draw(String_Data_t *graph, char graphname[3], uint32_t Graph_Operate, uint32_t Graph_Layer, uint32_t Graph_Color, - uint32_t Graph_Size, uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y) + uint32_t Graph_Size, uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, char *fmt, ...) { - int i; - for (i = 0; i < 3 && graphname[i] != '\0'; i++) - { - graph->Graph_Control.graphic_name[2 - i] = graphname[i]; - } + int i; + for (i = 0; i < 3 && graphname[i] != '\0'; i++) + { + graph->Graph_Control.graphic_name[2 - i] = graphname[i]; + } - graph->Graph_Control.graphic_tpye = UI_Graph_Char; - graph->Graph_Control.operate_tpye = Graph_Operate; - graph->Graph_Control.layer = Graph_Layer; - graph->Graph_Control.color = Graph_Color; + graph->Graph_Control.graphic_tpye = UI_Graph_Char; + graph->Graph_Control.operate_tpye = Graph_Operate; + graph->Graph_Control.layer = Graph_Layer; + graph->Graph_Control.color = Graph_Color; - graph->Graph_Control.width = Graph_Width; - graph->Graph_Control.start_x = Start_x; - graph->Graph_Control.start_y = Start_y; - graph->Graph_Control.start_angle = Graph_Size; - graph->Graph_Control.radius = 0; - graph->Graph_Control.end_x = 0; - graph->Graph_Control.end_y = 0; -} + graph->Graph_Control.width = Graph_Width; + graph->Graph_Control.start_x = Start_x; + graph->Graph_Control.start_y = Start_y; + graph->Graph_Control.start_angle = Graph_Size; + graph->Graph_Control.radius = 0; + graph->Graph_Control.end_x = 0; + graph->Graph_Control.end_y = 0; -/************************************************绘制字符型数据************************************************* -**参数：*graph Graph_Data类型变量指针，用于存放图形数据 - fmt需要显示的字符串 - 此函数的实现和具体使用类似于printf函数 -**********************************************************************************************************/ -void Char_Write(String_Data_t *graph, char *fmt, ...) -{ - uint16_t i = 0; - va_list ap; - va_start(ap, fmt); - vsprintf((char *)graph->show_Data, fmt, ap); // 使用参数列表进行格式化并输出到字符串 - va_end(ap); - i = strlen((const char *)graph->show_Data); - graph->Graph_Control.end_angle = i; + va_list ap; + va_start(ap, fmt); + vsprintf((char *)graph->show_Data, fmt, ap); // 使用参数列表进行格式化并输出到字符串 + va_end(ap); + graph->Graph_Control.end_angle = strlen((const char *)graph->show_Data); } /* UI推送函数（使更改生效） 参数： cnt 图形个数 - ... 图形变量参数 + ... 图形变量参数 Tips：：该函数只能推送1，2，5，7个图形，其他数目协议未涉及 */ void UI_ReFresh(referee_id_t *_id, int cnt, ...) { - int i; - UI_GraphReFresh_t UI_GraphReFresh_data; - Graph_Data_t graphData; + UI_GraphReFresh_t UI_GraphReFresh_data; + Graph_Data_t graphData; - va_list ap; // 创建一个 va_list 类型变量 - va_start(ap, cnt); // 初始化 va_list 变量为一个参数列表 + uint8_t temp_datalength = LEN_HEADER + LEN_CMDID + Interactive_Data_LEN_Head + UI_Operate_LEN_PerDraw * cnt + LEN_TAIL; // 计算交互数据长度 - UI_GraphReFresh_data.FrameHeader.SOF = REFEREE_SOF; - UI_GraphReFresh_data.FrameHeader.DataLength = Interactive_Data_LEN_Head + cnt * UI_Operate_LEN_PerDraw; - UI_GraphReFresh_data.FrameHeader.Seq = UI_Seq; - UI_GraphReFresh_data.FrameHeader.CRC8 = Get_CRC8_Check_Sum((uint8_t *)&UI_GraphReFresh_data, LEN_CRC8, 0xFF); + uint8_t buffer[temp_datalength]; // 交互数据缓存 - UI_GraphReFresh_data.CmdID = ID_student_interactive; + va_list ap; // 创建一个 va_list 类型变量 + va_start(ap, cnt); // 初始化 va_list 变量为一个参数列表 - switch (cnt) - { - case 1: - UI_GraphReFresh_data.datahead.data_cmd_id = UI_Data_ID_Draw1; - break; - case 2: - UI_GraphReFresh_data.datahead.data_cmd_id = UI_Data_ID_Draw2; - break; - case 5: - UI_GraphReFresh_data.datahead.data_cmd_id = UI_Data_ID_Draw5; - break; - case 7: - UI_GraphReFresh_data.datahead.data_cmd_id = UI_Data_ID_Draw7; - break; - } + UI_GraphReFresh_data.FrameHeader.SOF = REFEREE_SOF; + UI_GraphReFresh_data.FrameHeader.DataLength = Interactive_Data_LEN_Head + cnt * UI_Operate_LEN_PerDraw; + UI_GraphReFresh_data.FrameHeader.Seq = UI_Seq; + UI_GraphReFresh_data.FrameHeader.CRC8 = Get_CRC8_Check_Sum((uint8_t *)&UI_GraphReFresh_data, LEN_CRC8, 0xFF); - UI_GraphReFresh_data.datahead.receiver_ID = _id->Cilent_ID; - UI_GraphReFresh_data.datahead.sender_ID = _id->Robot_ID; + UI_GraphReFresh_data.CmdID = ID_student_interactive; - // 先发送帧头、命令码、交互数据帧头三部分，并计算CRC16校验值 - UI_GraphReFresh_data.frametail = Get_CRC16_Check_Sum((uint8_t *)&UI_GraphReFresh_data, LEN_HEADER + LEN_CMDID + Interactive_Data_LEN_Head, 0xFFFF); - RefereeLoadToBuffer((uint8_t *)&UI_GraphReFresh_data, LEN_HEADER + LEN_CMDID + Interactive_Data_LEN_Head); + switch (cnt) + { + case 1: + UI_GraphReFresh_data.datahead.data_cmd_id = UI_Data_ID_Draw1; + break; + case 2: + UI_GraphReFresh_data.datahead.data_cmd_id = UI_Data_ID_Draw2; + break; + case 5: + UI_GraphReFresh_data.datahead.data_cmd_id = UI_Data_ID_Draw5; + break; + case 7: + UI_GraphReFresh_data.datahead.data_cmd_id = UI_Data_ID_Draw7; + break; + } - for (i = 0; i < cnt; i++) // 发送交互数据的数据帧，并计算CRC16校验值 - { - graphData = va_arg(ap, Graph_Data_t); // 访问参数列表中的每个项,第二个参数是你要返回的参数的类型,在取值时需要将其强制转化为指定类型的变量 - // 发送并计算CRC16 - RefereeLoadToBuffer((uint8_t *)&graphData, UI_Operate_LEN_PerDraw); - UI_GraphReFresh_data.frametail = Get_CRC16_Check_Sum((uint8_t *)&graphData, UI_Operate_LEN_PerDraw, UI_GraphReFresh_data.frametail); - } + UI_GraphReFresh_data.datahead.receiver_ID = _id->Cilent_ID; + UI_GraphReFresh_data.datahead.sender_ID = _id->Robot_ID; + memcpy(buffer, (uint8_t *)&UI_GraphReFresh_data, LEN_HEADER + LEN_CMDID + Interactive_Data_LEN_Head); // 将帧头、命令码、交互数据帧头三部分复制到缓存中 - RefereeLoadToBuffer((uint8_t *)&UI_GraphReFresh_data.frametail, LEN_TAIL); // 发送CRC16校验值 + for (uint8_t i = 0; i < cnt; i++) // 发送交互数据的数据帧，并计算CRC16校验值 + { + graphData = va_arg(ap, Graph_Data_t); // 访问参数列表中的每个项,第二个参数是你要返回的参数的类型,在取值时需要将其强制转化为指定类型的变量 + memcpy(buffer + (LEN_HEADER + LEN_CMDID + Interactive_Data_LEN_Head + UI_Operate_LEN_PerDraw * i), (uint8_t *)&graphData, UI_Operate_LEN_PerDraw); + } + Append_CRC16_Check_Sum(buffer,temp_datalength); + RefereeSend(buffer, temp_datalength); // 发送CRC16校验值 - va_end(ap); // 结束可变参数的获取 - UI_Seq++; // 包序号+1 + va_end(ap); // 结束可变参数的获取 } /************************************************UI推送字符（使更改生效）*********************************/ void Char_ReFresh(referee_id_t *_id, String_Data_t string_Data) { - UI_CharReFresh_t UI_CharReFresh_data; + UI_CharReFresh_t UI_CharReFresh_data; - uint8_t temp_datalength = Interactive_Data_LEN_Head + UI_Operate_LEN_DrawChar; // 计算交互数据长度 + uint8_t temp_datalength = Interactive_Data_LEN_Head + UI_Operate_LEN_DrawChar; // 计算交互数据长度 - UI_CharReFresh_data.FrameHeader.SOF = REFEREE_SOF; - UI_CharReFresh_data.FrameHeader.DataLength = temp_datalength; - UI_CharReFresh_data.FrameHeader.Seq = UI_Seq; - UI_CharReFresh_data.FrameHeader.CRC8 = Get_CRC8_Check_Sum((uint8_t *)&UI_CharReFresh_data, LEN_CRC8, 0xFF); + UI_CharReFresh_data.FrameHeader.SOF = REFEREE_SOF; + UI_CharReFresh_data.FrameHeader.DataLength = temp_datalength; + UI_CharReFresh_data.FrameHeader.Seq = UI_Seq; + UI_CharReFresh_data.FrameHeader.CRC8 = Get_CRC8_Check_Sum((uint8_t *)&UI_CharReFresh_data, LEN_CRC8, 0xFF); - UI_CharReFresh_data.CmdID = ID_student_interactive; + UI_CharReFresh_data.CmdID = ID_student_interactive; - UI_CharReFresh_data.datahead.data_cmd_id = UI_Data_ID_DrawChar; + UI_CharReFresh_data.datahead.data_cmd_id = UI_Data_ID_DrawChar; - UI_CharReFresh_data.datahead.receiver_ID = _id->Cilent_ID; - UI_CharReFresh_data.datahead.sender_ID = _id->Robot_ID; + UI_CharReFresh_data.datahead.receiver_ID = _id->Cilent_ID; + UI_CharReFresh_data.datahead.sender_ID = _id->Robot_ID; - UI_CharReFresh_data.String_Data = string_Data; + UI_CharReFresh_data.String_Data = string_Data; - UI_CharReFresh_data.frametail = Get_CRC16_Check_Sum((uint8_t *)&UI_CharReFresh_data, LEN_HEADER + LEN_CMDID + temp_datalength, 0xFFFF); + UI_CharReFresh_data.frametail = Get_CRC16_Check_Sum((uint8_t *)&UI_CharReFresh_data, LEN_HEADER + LEN_CMDID + temp_datalength, 0xFFFF); - RefereeLoadToBuffer((uint8_t *)&UI_CharReFresh_data, LEN_HEADER + LEN_CMDID + temp_datalength + LEN_TAIL); // 发送 + RefereeSend((uint8_t *)&UI_CharReFresh_data, LEN_HEADER + LEN_CMDID + temp_datalength + LEN_TAIL); // 发送 - UI_Seq++; // 包序号+1 + UI_Seq++; // 包序号+1 } diff --git a/modules/referee/referee_UI.h b/modules/referee/referee_UI.h index 474b966..cc7125c 100644 --- a/modules/referee/referee_UI.h +++ b/modules/referee/referee_UI.h @@ -3,75 +3,70 @@ #include "stdarg.h" #include "stdint.h" -#include "referee_def.h" +#include "referee_protocol.h" #include "rm_referee.h" -#pragma pack(1) //按1字节对齐 +#pragma pack(1) // 按1字节对齐 /* 此处的定义只与UI绘制有关 */ typedef struct { - xFrameHeader FrameHeader; - uint16_t CmdID; + xFrameHeader FrameHeader; + uint16_t CmdID; ext_student_interactive_header_data_t datahead; - uint8_t Delete_Operate; //删除操作 - uint8_t Layer; + uint8_t Delete_Operate; // 删除操作 + uint8_t Layer; uint16_t frametail; } UI_delete_t; typedef struct { - xFrameHeader FrameHeader; - uint16_t CmdID; + xFrameHeader FrameHeader; + uint16_t CmdID; ext_student_interactive_header_data_t datahead; uint16_t frametail; } UI_GraphReFresh_t; typedef struct { - xFrameHeader FrameHeader; - uint16_t CmdID; + xFrameHeader FrameHeader; + uint16_t CmdID; ext_student_interactive_header_data_t datahead; String_Data_t String_Data; - uint16_t frametail; -} UI_CharReFresh_t; //打印字符串数据 + uint16_t frametail; +} UI_CharReFresh_t; // 打印字符串数据 #pragma pack() +void UIDelete(referee_id_t *_id, uint8_t Del_Operate, uint8_t Del_Layer); +void Line_Draw(Graph_Data_t *graph, char graphname[3], uint32_t Graph_Operate, uint32_t Graph_Layer, uint32_t Graph_Color, + uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, uint32_t End_x, uint32_t End_y); +void Rectangle_Draw(Graph_Data_t *graph, char graphname[3], uint32_t Graph_Operate, uint32_t Graph_Layer, uint32_t Graph_Color, + uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, uint32_t End_x, uint32_t End_y); -void UI_Delete(referee_id_t *_id,uint8_t Del_Operate,uint8_t Del_Layer); +void Circle_Draw(Graph_Data_t *graph, char graphname[3], uint32_t Graph_Operate, uint32_t Graph_Layer, uint32_t Graph_Color, + uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, uint32_t Graph_Radius); -void Line_Draw(Graph_Data_t *graph,char graphname[3],uint32_t Graph_Operate,uint32_t Graph_Layer,uint32_t Graph_Color, - uint32_t Graph_Width,uint32_t Start_x,uint32_t Start_y,uint32_t End_x,uint32_t End_y); +void Elliptical_Draw(Graph_Data_t *graph, char graphname[3], uint32_t Graph_Operate, uint32_t Graph_Layer, uint32_t Graph_Color, + uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, uint32_t end_x, uint32_t end_y); -void Rectangle_Draw(Graph_Data_t *graph,char graphname[3],uint32_t Graph_Operate,uint32_t Graph_Layer,uint32_t Graph_Color, - uint32_t Graph_Width,uint32_t Start_x,uint32_t Start_y,uint32_t End_x,uint32_t End_y); +void Arc_Draw(Graph_Data_t *graph, char graphname[3], uint32_t Graph_Operate, uint32_t Graph_Layer, uint32_t Graph_Color, + uint32_t Graph_StartAngle, uint32_t Graph_EndAngle, uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, + uint32_t end_x, uint32_t end_y); -void Circle_Draw(Graph_Data_t *graph,char graphname[3],uint32_t Graph_Operate,uint32_t Graph_Layer,uint32_t Graph_Color, - uint32_t Graph_Width,uint32_t Start_x,uint32_t Start_y,uint32_t Graph_Radius); +void Float_Draw(Graph_Data_t *graph, char graphname[3], uint32_t Graph_Operate, uint32_t Graph_Layer, uint32_t Graph_Color, + uint32_t Graph_Size, uint32_t Graph_Digit, uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, int32_t Graph_Float); -void Elliptical_Draw(Graph_Data_t *graph,char graphname[3],uint32_t Graph_Operate,uint32_t Graph_Layer,uint32_t Graph_Color, - uint32_t Graph_Width,uint32_t Start_x,uint32_t Start_y,uint32_t end_x,uint32_t end_y); +void Integer_Draw(Graph_Data_t *graph, char graphname[3], uint32_t Graph_Operate, uint32_t Graph_Layer, uint32_t Graph_Color, + uint32_t Graph_Size, uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, int32_t Graph_Integer); -void Arc_Draw(Graph_Data_t *graph,char graphname[3],uint32_t Graph_Operate,uint32_t Graph_Layer,uint32_t Graph_Color, - uint32_t Graph_StartAngle,uint32_t Graph_EndAngle,uint32_t Graph_Width,uint32_t Start_x,uint32_t Start_y, - uint32_t end_x,uint32_t end_y); +void Char_Draw(String_Data_t *graph, char graphname[3], uint32_t Graph_Operate, uint32_t Graph_Layer, uint32_t Graph_Color, + uint32_t Graph_Size, uint32_t Graph_Width, uint32_t Start_x, uint32_t Start_y, char *fmt, ...); -void Float_Draw(Graph_Data_t *graph,char graphname[3],uint32_t Graph_Operate,uint32_t Graph_Layer,uint32_t Graph_Color, - uint32_t Graph_Size,uint32_t Graph_Digit,uint32_t Graph_Width,uint32_t Start_x,uint32_t Start_y,int32_t Graph_Float); - -void Integer_Draw(Graph_Data_t *graph,char graphname[3],uint32_t Graph_Operate,uint32_t Graph_Layer,uint32_t Graph_Color, - uint32_t Graph_Size,uint32_t Graph_Width,uint32_t Start_x,uint32_t Start_y,int32_t Graph_Integer); +void UI_ReFresh(referee_id_t *_id, int cnt, ...); -void Char_Draw(String_Data_t *graph,char graphname[3],uint32_t Graph_Operate,uint32_t Graph_Layer,uint32_t Graph_Color, - uint32_t Graph_Size,uint32_t Graph_Width,uint32_t Start_x,uint32_t Start_y); +void Char_ReFresh(referee_id_t *_id, String_Data_t string_Data); -void Char_Write(String_Data_t *graph,char* fmt, ...); - -void UI_ReFresh(referee_id_t *_id,int cnt,...); - -void Char_ReFresh(referee_id_t *_id,String_Data_t string_Data); - #endif diff --git a/modules/referee/referee_communication.c b/modules/referee/referee_communication.c deleted file mode 100644 index f7dd872..0000000 --- a/modules/referee/referee_communication.c +++ /dev/null @@ -1,45 +0,0 @@ -/** - * @file referee_communication.h - * @author kidneygood (you@domain.com) - * @version 0.1 - * @date 2022-12-02 - * - * @copyright Copyright (c) HNU YueLu EC 2022 all rights reserved - * - */ - -#include "referee_communication.h" -#include "crc_ref.h" -#include "stdio.h" -#include "rm_referee.h" - -/** - * @brief 发送机器人间的交互数据 - * @param referee_id_t *_id sender为本机器人，receiver为接收方机器人，发送前设置Receiver_Robot_ID再调用该函数 - * robot_interactive_data_t *data 数据段 - * @retval none - * @attention - */ -void Communicate_SendData(referee_id_t *_id,robot_interactive_data_t *_data) -{ - Communicate_SendData_t SendData; - uint8_t temp_datalength = Interactive_Data_LEN_Head + Communicate_Data_LEN; // 计算交互数据长度 6+n,n为交互数据长度 - - SendData.FrameHeader.SOF = REFEREE_SOF; - SendData.FrameHeader.DataLength = temp_datalength; - SendData.FrameHeader.Seq = UI_Seq; - SendData.FrameHeader.CRC8 = Get_CRC8_Check_Sum((uint8_t *)&SendData, LEN_CRC8, 0xFF); - - SendData.CmdID = ID_student_interactive; - - SendData.datahead.data_cmd_id = Communicate_Data_ID; - SendData.datahead.sender_ID = _id->Robot_ID; - SendData.datahead.receiver_ID = _id->Receiver_Robot_ID; - - SendData.Data = *_data; - - SendData.frametail = Get_CRC16_Check_Sum((uint8_t *)&SendData,LEN_HEADER+LEN_CMDID+temp_datalength,0xFFFF); - - RefereeLoadToBuffer((uint8_t *)&SendData,LEN_HEADER+LEN_CMDID+temp_datalength+LEN_TAIL); //发送 - UI_Seq++; // 包序号+1 -} diff --git a/modules/referee/referee_communication.h b/modules/referee/referee_communication.h deleted file mode 100644 index cba2324..0000000 --- a/modules/referee/referee_communication.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef REFEREE_COMMUNICATION_H -#define REFEREE_COMMUNICATION_H - -#include "stdint.h" -#include "referee_def.h" -#include "rm_referee.h" - -void Communicate_SendData(referee_id_t *_id,robot_interactive_data_t *_data); - -#endif \ No newline at end of file diff --git a/modules/referee/referee_def.h b/modules/referee/referee_protocol.h similarity index 86% rename from modules/referee/referee_def.h rename to modules/referee/referee_protocol.h index 4c2312f..22416b3 100644 --- a/modules/referee/referee_def.h +++ b/modules/referee/referee_protocol.h @@ -1,5 +1,5 @@ /** - * @file referee_def.h + * @file referee_protocol.h * @author kidneygood (you@domain.com) * @version 0.1 * @date 2022-12-02 @@ -8,22 +8,20 @@ * */ -#ifndef REFEREE_DEF_H -#define REFEREE_DEF_H +#ifndef referee_protocol_H +#define referee_protocol_H #include "stdint.h" -/****************************宏定义部分****************************/ /****************************宏定义部分****************************/ #define REFEREE_SOF 0xA5 // 起始字节,协议固定为0xA5 #define Robot_Red 0 #define Robot_Blue 1 -#define Communicate_Data_LEN 5 //自定义交互数据长度，该长度决定了我方发送和他方接收，自定义交互数据协议更改时只需要更改此宏定义即可 +#define Communicate_Data_LEN 5 // 自定义交互数据长度，该长度决定了我方发送和他方接收，自定义交互数据协议更改时只需要更改此宏定义即可 -#pragma pack(1) +#pragma pack(1) -/****************************通信协议格式****************************/ /****************************通信协议格式****************************/ /* 通信协议格式偏移，枚举类型,代替#define声明 */ @@ -90,19 +88,19 @@ typedef enum /* 命令码数据段长,根据官方协议来定义长度，还有自定义数据长度 */ typedef enum { - LEN_game_state = 3, // 0x0001 - LEN_game_result = 1, // 0x0002 - LEN_game_robot_HP = 2, // 0x0003 - LEN_event_data = 4, // 0x0101 - LEN_supply_projectile_action = 4, // 0x0102 - LEN_game_robot_state = 27, // 0x0201 - LEN_power_heat_data = 14, // 0x0202 - LEN_game_robot_pos = 16, // 0x0203 - LEN_buff_musk = 1, // 0x0204 - LEN_aerial_robot_energy = 1, // 0x0205 - LEN_robot_hurt = 1, // 0x0206 - LEN_shoot_data = 7, // 0x0207 - LEN_receive_data = 6+Communicate_Data_LEN, //0x0301 + LEN_game_state = 3, // 0x0001 + LEN_game_result = 1, // 0x0002 + LEN_game_robot_HP = 2, // 0x0003 + LEN_event_data = 4, // 0x0101 + LEN_supply_projectile_action = 4, // 0x0102 + LEN_game_robot_state = 27, // 0x0201 + LEN_power_heat_data = 14, // 0x0202 + LEN_game_robot_pos = 16, // 0x0203 + LEN_buff_musk = 1, // 0x0204 + LEN_aerial_robot_energy = 1, // 0x0205 + LEN_robot_hurt = 1, // 0x0206 + LEN_shoot_data = 7, // 0x0207 + LEN_receive_data = 6 + Communicate_Data_LEN, // 0x0301 } JudgeDataLength_e; @@ -235,7 +233,7 @@ typedef struct /* 交互数据头结构 */ typedef struct { - uint16_t data_cmd_id; //由于存在多个内容 ID，但整个cmd_id 上行频率最大为 10Hz，请合理安排带宽。注意交互部分的上行频率 + uint16_t data_cmd_id; // 由于存在多个内容 ID，但整个cmd_id 上行频率最大为 10Hz，请合理安排带宽。注意交互部分的上行频率 uint16_t sender_ID; uint16_t receiver_ID; } ext_student_interactive_header_data_t; @@ -244,7 +242,7 @@ typedef struct typedef enum { // 红方机器人ID - RobotID_RHero = 1, + RobotID_RHero = 1, RobotID_REngineer = 2, RobotID_RStandard1 = 3, RobotID_RStandard2 = 4, @@ -290,14 +288,13 @@ typedef enum } Interactive_Data_Length_e; -/****************************自定义交互数据****************************/ /****************************自定义交互数据****************************/ /* 学生机器人间通信 cmd_id 0x0301，内容 ID:0x0200~0x02FF 自定义交互数据 机器人间通信：0x0301。 发送频率：上限 10Hz */ -//自定义交互数据协议，可更改，更改后需要修改最上方宏定义数据长度的值 +// 自定义交互数据协议，可更改，更改后需要修改最上方宏定义数据长度的值 typedef struct { uint8_t data[Communicate_Data_LEN]; // 数据段,n需要小于113 @@ -319,8 +316,6 @@ typedef struct robot_interactive_data_t Data; // 数据段 } Communicate_ReceiveData_t; - -/****************************UI交互数据****************************/ /****************************UI交互数据****************************/ /* 图形数据 */ @@ -339,7 +334,7 @@ typedef struct uint32_t radius : 10; uint32_t end_x : 11; uint32_t end_y : 11; -} Graph_Data_t; +} Graph_Data_t; typedef struct { diff --git a/application/referee/referee.c b/modules/referee/referee_task.c similarity index 76% rename from application/referee/referee.c rename to modules/referee/referee_task.c index 5d91086..fe1b616 100644 --- a/application/referee/referee.c +++ b/modules/referee/referee_task.c @@ -8,17 +8,15 @@ * @copyright Copyright (c) 2022 * */ -#include "referee.h" +#include "referee_task.h" #include "robot_def.h" #include "rm_referee.h" #include "referee_UI.h" -#include "referee_communication.h" -static Referee_Interactive_info_t Interactive_data; // 非裁判系统数据 -static referee_info_t *referee_data; // 裁判系统相关数据 -static robot_interactive_data_t *SendData; +static Referee_Interactive_info_t *Interactive_data; // UI绘制需要的机器人状态数据 +static referee_info_t *referee_recv_info; // 接收到的裁判系统数据 -static void determine_ID(referee_info_t *_referee_info); +static void DeterminRobotID(referee_info_t *_referee_info); static void My_UI_init(referee_info_t *_referee_info); static void My_UI_Refresh(referee_info_t *_referee_info, Referee_Interactive_info_t *_Interactive_data); static void Mode_Change_Check(Referee_Interactive_info_t *_Interactive_data); // 模式切换检测 @@ -29,23 +27,16 @@ static void UI_test_init(referee_info_t *_referee_info); // void Referee_Interactive_init() { - referee_data = RefereeInit(&huart6); // 裁判系统初始化 - // while (referee_data->GameRobotState.robot_id == 0); - referee_data->GameRobotState.robot_id = 103; // syhtodo RobotInit中关闭了中断进行初始化，无法读取到裁判系统的ID，暂时在此处写死 - determine_ID(referee_data); - My_UI_init(referee_data); - // UI_test_init(referee_data); // 测试函数 - RefereeSend(); - //如果此处还要加入车间通信初始化，注意将referee和车间通信的数据合并后再使用 - //refereesend函数永远是最后一步 - - //串口接收需要设置喂狗 + RefereeGetUIData(&referee_recv_info, &Interactive_data); + while (referee_recv_info->GameRobotState.robot_id == 0); + DeterminRobotID(referee_recv_info); + My_UI_init(referee_recv_info); } void Referee_Interactive_task() { - robot_mode_change(&Interactive_data); // 测试用函数，实现模式自动变化 - My_UI_Refresh(referee_data, &Interactive_data); + robot_mode_change(Interactive_data); // 测试用函数，实现模式自动变化 + My_UI_Refresh(referee_recv_info, Interactive_data); } static Graph_Data_t UI_shoot_line[10]; // 射击准线 @@ -55,9 +46,9 @@ static uint32_t shoot_line_location[10] = {540, 960, 490, 515, 565}; static void My_UI_init(referee_info_t *_referee_info) { - UI_Delete(&_referee_info->referee_id, UI_Data_Del_ALL, 0); + UIDelete(&_referee_info->referee_id, UI_Data_Del_ALL, 0); - // 绘制发射基准线 + // // 绘制发射基准线 Line_Draw(&UI_shoot_line[0], "sl0", UI_Graph_ADD, 7, UI_Color_White, 3, 710, shoot_line_location[0], 1210, shoot_line_location[0]); Line_Draw(&UI_shoot_line[1], "sl1", UI_Graph_ADD, 7, UI_Color_White, 3, shoot_line_location[1], 340, shoot_line_location[1], 740); Line_Draw(&UI_shoot_line[2], "sl2", UI_Graph_ADD, 7, UI_Color_Yellow, 2, 810, shoot_line_location[2], 1110, shoot_line_location[2]); @@ -66,57 +57,37 @@ static void My_UI_init(referee_info_t *_referee_info) UI_ReFresh(&_referee_info->referee_id, 5, UI_shoot_line[0], UI_shoot_line[1], UI_shoot_line[2], UI_shoot_line[3], UI_shoot_line[4]); - // 绘制车辆状态标志，静态 - Char_Draw(&UI_State_sta[0], "ss0", UI_Graph_ADD, 8, UI_Color_Main, 15, 2, 150, 750); - Char_Write(&UI_State_sta[0], "chassis:"); + // 绘制车辆状态标志指示 + Char_Draw(&UI_State_sta[0], "ss0", UI_Graph_ADD, 8, UI_Color_Main, 15, 2, 150, 750, "chassis:"); Char_ReFresh(&_referee_info->referee_id, UI_State_sta[0]); - - Char_Draw(&UI_State_sta[1], "ss1", UI_Graph_ADD, 8, UI_Color_Yellow, 15, 2, 150, 700); - Char_Write(&UI_State_sta[1], "gimbal:"); + Char_Draw(&UI_State_sta[1], "ss1", UI_Graph_ADD, 8, UI_Color_Yellow, 15, 2, 150, 700, "gimbal:"); Char_ReFresh(&_referee_info->referee_id, UI_State_sta[1]); - - Char_Draw(&UI_State_sta[2], "ss2", UI_Graph_ADD, 8, UI_Color_Orange, 15, 2, 150, 650); - Char_Write(&UI_State_sta[2], "shoot:"); + Char_Draw(&UI_State_sta[2], "ss2", UI_Graph_ADD, 8, UI_Color_Orange, 15, 2, 150, 650, "shoot:"); Char_ReFresh(&_referee_info->referee_id, UI_State_sta[2]); - - Char_Draw(&UI_State_sta[3], "ss3", UI_Graph_ADD, 8, UI_Color_Pink, 15, 2, 150, 600); - Char_Write(&UI_State_sta[3], "frict:"); + Char_Draw(&UI_State_sta[3], "ss3", UI_Graph_ADD, 8, UI_Color_Pink, 15, 2, 150, 600, "frict:"); Char_ReFresh(&_referee_info->referee_id, UI_State_sta[3]); - - Char_Draw(&UI_State_sta[4], "ss4", UI_Graph_ADD, 8, UI_Color_Pink, 15, 2, 150, 550); - Char_Write(&UI_State_sta[4], "lid:"); + Char_Draw(&UI_State_sta[4], "ss4", UI_Graph_ADD, 8, UI_Color_Pink, 15, 2, 150, 550, "lid:"); Char_ReFresh(&_referee_info->referee_id, UI_State_sta[4]); // 底盘功率显示，静态 - Char_Draw(&UI_State_sta[5], "ss5", UI_Graph_ADD, 8, UI_Color_Green, 18, 2, 720, 210); - Char_Write(&UI_State_sta[5], "Power:"); + Char_Draw(&UI_State_sta[5], "ss5", UI_Graph_ADD, 8, UI_Color_Green, 18, 2, 720, 210, "Power:"); Char_ReFresh(&_referee_info->referee_id, UI_State_sta[5]); // 绘制车辆状态标志，动态 // 由于初始化时xxx_last_mode默认为0，所以此处对应UI也应该设为0时对应的UI，防止模式不变的情况下无法置位flag，导致UI无法刷新 - Char_Draw(&UI_State_dyn[0], "sd0", UI_Graph_ADD, 8, UI_Color_Main, 15, 2, 270, 750); - Char_Write(&UI_State_dyn[0], "zeroforce"); + Char_Draw(&UI_State_dyn[0], "sd0", UI_Graph_ADD, 8, UI_Color_Main, 15, 2, 270, 750, "zeroforce"); Char_ReFresh(&_referee_info->referee_id, UI_State_dyn[0]); - - Char_Draw(&UI_State_dyn[1], "sd1", UI_Graph_ADD, 8, UI_Color_Yellow, 15, 2, 270, 700); - Char_Write(&UI_State_dyn[1], "zeroforce"); + Char_Draw(&UI_State_dyn[1], "sd1", UI_Graph_ADD, 8, UI_Color_Yellow, 15, 2, 270, 700, "zeroforce"); Char_ReFresh(&_referee_info->referee_id, UI_State_dyn[1]); - - Char_Draw(&UI_State_dyn[2], "sd2", UI_Graph_ADD, 8, UI_Color_Orange, 15, 2, 270, 650); - Char_Write(&UI_State_dyn[2], "off"); + Char_Draw(&UI_State_dyn[2], "sd2", UI_Graph_ADD, 8, UI_Color_Orange, 15, 2, 270, 650, "off"); Char_ReFresh(&_referee_info->referee_id, UI_State_dyn[2]); - - Char_Draw(&UI_State_dyn[3], "sd3", UI_Graph_ADD, 8, UI_Color_Pink, 15, 2, 270, 600); - Char_Write(&UI_State_dyn[3], "off"); + Char_Draw(&UI_State_dyn[3], "sd3", UI_Graph_ADD, 8, UI_Color_Pink, 15, 2, 270, 600, "off"); Char_ReFresh(&_referee_info->referee_id, UI_State_dyn[3]); - - Char_Draw(&UI_State_dyn[4], "sd4", UI_Graph_ADD, 8, UI_Color_Pink, 15, 2, 270, 550); - Char_Write(&UI_State_dyn[4], "open "); + Char_Draw(&UI_State_dyn[4], "sd4", UI_Graph_ADD, 8, UI_Color_Pink, 15, 2, 270, 550, "open "); Char_ReFresh(&_referee_info->referee_id, UI_State_dyn[4]); - // 底盘功率显示，动态 - Char_Draw(&UI_State_dyn[5], "sd5", UI_Graph_ADD, 8, UI_Color_Green, 18, 2, 840, 210); - Char_Write(&UI_State_dyn[5], "0000"); + // 底盘功率显示,动态 + Char_Draw(&UI_State_dyn[5], "sd5", UI_Graph_ADD, 8, UI_Color_Green, 18, 2, 840, 210, "0000"); Char_ReFresh(&_referee_info->referee_id, UI_State_dyn[5]); } @@ -143,7 +114,6 @@ static void robot_mode_change(Referee_Interactive_info_t *_Interactive_data) // } case 1: { - ; _Interactive_data->chassis_mode = CHASSIS_ROTATE; _Interactive_data->gimbal_mode = GIMBAL_FREE_MODE; _Interactive_data->shoot_mode = SHOOT_OFF; @@ -183,30 +153,19 @@ static void My_UI_Refresh(referee_info_t *_referee_info, Referee_Interactive_inf switch (_Interactive_data->chassis_mode) { case CHASSIS_ZERO_FORCE: - { - Char_Draw(&UI_State_dyn[0], "sd0", UI_Graph_Change, 8, UI_Color_Main, 15, 2, 270, 750); - Char_Write(&UI_State_dyn[0], "zeroforce"); + Char_Draw(&UI_State_dyn[0], "sd0", UI_Graph_Change, 8, UI_Color_Main, 15, 2, 270, 750, "zeroforce"); break; - } case CHASSIS_ROTATE: - { - Char_Draw(&UI_State_dyn[0], "sd0", UI_Graph_Change, 8, UI_Color_Main, 15, 2, 270, 750); - Char_Write(&UI_State_dyn[0], "rotate "); // 此处注意字数对齐问题，字数相同才能覆盖掉 + Char_Draw(&UI_State_dyn[0], "sd0", UI_Graph_Change, 8, UI_Color_Main, 15, 2, 270, 750, "rotate "); + // 此处注意字数对齐问题，字数相同才能覆盖掉 break; - } case CHASSIS_NO_FOLLOW: - { - Char_Draw(&UI_State_dyn[0], "sd0", UI_Graph_Change, 8, UI_Color_Main, 15, 2, 270, 750); - Char_Write(&UI_State_dyn[0], "nofollow "); + Char_Draw(&UI_State_dyn[0], "sd0", UI_Graph_Change, 8, UI_Color_Main, 15, 2, 270, 750, "nofollow "); break; - } case CHASSIS_FOLLOW_GIMBAL_YAW: - { - Char_Draw(&UI_State_dyn[0], "sd0", UI_Graph_Change, 8, UI_Color_Main, 15, 2, 270, 750); - Char_Write(&UI_State_dyn[0], "follow "); + Char_Draw(&UI_State_dyn[0], "sd0", UI_Graph_Change, 8, UI_Color_Main, 15, 2, 270, 750, "follow "); break; } - } Char_ReFresh(&_referee_info->referee_id, UI_State_dyn[0]); _Interactive_data->Referee_Interactive_Flag.chassis_flag = 0; } @@ -217,20 +176,17 @@ static void My_UI_Refresh(referee_info_t *_referee_info, Referee_Interactive_inf { case GIMBAL_ZERO_FORCE: { - Char_Draw(&UI_State_dyn[1], "sd1", UI_Graph_Change, 8, UI_Color_Yellow, 15, 2, 270, 700); - Char_Write(&UI_State_dyn[1], "zeroforce"); + Char_Draw(&UI_State_dyn[1], "sd1", UI_Graph_Change, 8, UI_Color_Yellow, 15, 2, 270, 700, "zeroforce"); break; } case GIMBAL_FREE_MODE: { - Char_Draw(&UI_State_dyn[1], "sd1", UI_Graph_Change, 8, UI_Color_Yellow, 15, 2, 270, 700); - Char_Write(&UI_State_dyn[1], "free "); + Char_Draw(&UI_State_dyn[1], "sd1", UI_Graph_Change, 8, UI_Color_Yellow, 15, 2, 270, 700, "free "); break; } case GIMBAL_GYRO_MODE: { - Char_Draw(&UI_State_dyn[1], "sd1", UI_Graph_Change, 8, UI_Color_Yellow, 15, 2, 270, 700); - Char_Write(&UI_State_dyn[1], "gyro "); + Char_Draw(&UI_State_dyn[1], "sd1", UI_Graph_Change, 8, UI_Color_Yellow, 15, 2, 270, 700, "gyro "); break; } } @@ -244,14 +200,12 @@ static void My_UI_Refresh(referee_info_t *_referee_info, Referee_Interactive_inf { case SHOOT_OFF: { - Char_Draw(&UI_State_dyn[2], "sd2", UI_Graph_Change, 8, UI_Color_Orange, 15, 2, 270, 650); - Char_Write(&UI_State_dyn[2], "off"); + Char_Draw(&UI_State_dyn[2], "sd2", UI_Graph_Change, 8, UI_Color_Orange, 15, 2, 270, 650, "off"); break; } case SHOOT_ON: { - Char_Draw(&UI_State_dyn[2], "sd2", UI_Graph_Change, 8, UI_Color_Orange, 15, 2, 270, 650); - Char_Write(&UI_State_dyn[2], "on "); + Char_Draw(&UI_State_dyn[2], "sd2", UI_Graph_Change, 8, UI_Color_Orange, 15, 2, 270, 650, "on "); break; } } @@ -259,42 +213,37 @@ static void My_UI_Refresh(referee_info_t *_referee_info, Referee_Interactive_inf _Interactive_data->Referee_Interactive_Flag.shoot_flag = 0; } - // friction if (_Interactive_data->Referee_Interactive_Flag.friction_flag == 1) { switch (_Interactive_data->friction_mode) { case FRICTION_OFF: { - Char_Draw(&UI_State_dyn[3], "sd3", UI_Graph_Change, 8, UI_Color_Pink, 15, 2, 270, 600); - Char_Write(&UI_State_dyn[3], "off"); + Char_Draw(&UI_State_dyn[3], "sd3", UI_Graph_Change, 8, UI_Color_Pink, 15, 2, 270, 600, "off"); break; } case FRICTION_ON: { - Char_Draw(&UI_State_dyn[3], "sd3", UI_Graph_Change, 8, UI_Color_Pink, 15, 2, 270, 600); - Char_Write(&UI_State_dyn[3], "on "); + Char_Draw(&UI_State_dyn[3], "sd3", UI_Graph_Change, 8, UI_Color_Pink, 15, 2, 270, 600, "on "); break; } } Char_ReFresh(&_referee_info->referee_id, UI_State_dyn[3]); _Interactive_data->Referee_Interactive_Flag.friction_flag = 0; } - // lid + if (_Interactive_data->Referee_Interactive_Flag.lid_flag == 1) { switch (_Interactive_data->lid_mode) { case LID_CLOSE: { - Char_Draw(&UI_State_dyn[4], "sd4", UI_Graph_Change, 8, UI_Color_Pink, 15, 2, 270, 550); - Char_Write(&UI_State_dyn[4], "close"); + Char_Draw(&UI_State_dyn[4], "sd4", UI_Graph_Change, 8, UI_Color_Pink, 15, 2, 270, 550, "close"); break; } case LID_OPEN: { - Char_Draw(&UI_State_dyn[4], "sd4", UI_Graph_Change, 8, UI_Color_Pink, 15, 2, 270, 550); - Char_Write(&UI_State_dyn[4], "open "); + Char_Draw(&UI_State_dyn[4], "sd4", UI_Graph_Change, 8, UI_Color_Pink, 15, 2, 270, 550, "open "); break; } } @@ -348,7 +297,7 @@ static void Mode_Change_Check(Referee_Interactive_info_t *_Interactive_data) * @retval none * @attention */ -static void determine_ID(referee_info_t *_referee_info) +static void DeterminRobotID(referee_info_t *_referee_info) { // id小于7是红色,大于7是蓝色,0为红色，1为蓝色 #define Robot_Red 0 #define Robot_Blue 1 _referee_info->referee_id.Robot_Color = _referee_info->GameRobotState.robot_id > 7 ? Robot_Blue : Robot_Red; @@ -363,7 +312,7 @@ static void UI_test_init(referee_info_t *_referee_info) Graph_Data_t graph[5]; Graph_Data_t num[2]; String_Data_t sdata[1]; - UI_Delete(&_referee_info->referee_id, UI_Data_Del_ALL, 0); + UIDelete(&_referee_info->referee_id, UI_Data_Del_ALL, 0); Line_Draw(&graph[0], "s0", UI_Graph_ADD, 0, UI_Color_White, 3, 710, 540, 1210, 540); Rectangle_Draw(&graph[1], "s1", UI_Graph_ADD, 0, UI_Color_Yellow, 4, 600, 200, 800, 500); @@ -375,7 +324,6 @@ static void UI_test_init(referee_info_t *_referee_info) Integer_Draw(&num[1], "s6", UI_Graph_ADD, 0, UI_Color_Cyan, 50, 5, 1050, 460, 12345); UI_ReFresh(&_referee_info->referee_id, 7, graph[0], graph[1], graph[2], graph[3], graph[4], num[0], num[1]); - Char_Draw(&sdata[0], "s7", UI_Graph_ADD, 0, UI_Color_Green, 20, 2, 620, 710); - Char_Write(&sdata[0], "number:%d", 123); + Char_Draw(&sdata[0], "s7", UI_Graph_ADD, 0, UI_Color_Green, 20, 2, 620, 710, "number:%d", 123); Char_ReFresh(&_referee_info->referee_id, sdata[0]); } diff --git a/modules/referee/referee_task.h b/modules/referee/referee_task.h new file mode 100644 index 0000000..4a2555b --- /dev/null +++ b/modules/referee/referee_task.h @@ -0,0 +1,19 @@ +#ifndef REFEREE_H +#define REFEREE_H + +#include "rm_referee.h" +#include "robot_def.h" + +/** + * @brief 初始化裁判系统交互任务(UI和多机通信) + * + */ +void Referee_Interactive_init(); + +/** + * @brief 裁判系统交互任务(UI和多机通信) + * + */ +void Referee_Interactive_task(); + +#endif // REFEREE_H diff --git a/modules/referee/rm_referee.c b/modules/referee/rm_referee.c index e494d4e..8300dc2 100644 --- a/modules/referee/rm_referee.c +++ b/modules/referee/rm_referee.c @@ -13,50 +13,71 @@ #include "string.h" #include "crc_ref.h" #include "bsp_usart.h" +#include "task.h" #define RE_RX_BUFFER_SIZE 200 -static USARTInstance *referee_usart_instance; -static referee_tx_buffer_t referee_tx_buffer={{0},0}; -static referee_info_t referee_info; -static void JudgeReadData(uint8_t *ReadFromUsart); +static USARTInstance *referee_usart_instance; // 裁判系统串口实例 +static referee_info_t referee_info; // 裁判系统数据 +static Referee_Interactive_info_t *UI_tmp; // UI绘制需要的机器人状态数据 + static void RefereeRxCallback(); +static void JudgeReadData(uint8_t *buff); uint8_t UI_Seq = 0; // 包序号，供整个referee文件使用 /* 裁判系统通信初始化 */ -referee_info_t *RefereeInit(UART_HandleTypeDef *referee_usart_handle) +referee_info_t *RefereeInit(UART_HandleTypeDef *referee_usart_handle, Referee_Interactive_info_t *UI_data) { USART_Init_Config_s conf; conf.module_callback = RefereeRxCallback; conf.usart_handle = referee_usart_handle; conf.recv_buff_size = RE_RX_BUFFER_SIZE; referee_usart_instance = USARTRegister(&conf); + UI_tmp = UI_data; return &referee_info; } -/** - * @brief 载入缓存区函数 - * @param send 待载入的数据 - */ -void RefereeLoadToBuffer(uint8_t *send, uint16_t tx_len) +void RefereeGetUIData(referee_info_t **recv_info_pp, Referee_Interactive_info_t **UI_data_pp) { - memcpy((uint8_t *)(&referee_tx_buffer.buffer)+referee_tx_buffer.pos,send,tx_len); - referee_tx_buffer.pos+=tx_len; + *recv_info_pp = &referee_info; + *UI_data_pp = UI_tmp; } - -/** - * @brief 发送函数 - * @param - */ -void RefereeSend() +void CommBetweenRobotSend(referee_id_t *_id, robot_interactive_data_t *_data) { - USARTSend(referee_usart_instance, (uint8_t *)(&referee_tx_buffer.buffer), referee_tx_buffer.pos,USART_TRANSFER_DMA); - referee_tx_buffer.pos=0; + Communicate_SendData_t SendData; + uint8_t temp_datalength = Interactive_Data_LEN_Head + Communicate_Data_LEN; // 计算交互数据长度 6+n,n为交互数据长度 + + SendData.FrameHeader.SOF = REFEREE_SOF; + SendData.FrameHeader.DataLength = temp_datalength; + SendData.FrameHeader.Seq = UI_Seq; + SendData.FrameHeader.CRC8 = Get_CRC8_Check_Sum((uint8_t *)&SendData, LEN_CRC8, 0xFF); + + SendData.CmdID = ID_student_interactive; + + SendData.datahead.data_cmd_id = Communicate_Data_ID; + SendData.datahead.sender_ID = _id->Robot_ID; + SendData.datahead.receiver_ID = _id->Receiver_Robot_ID; + + SendData.Data = *_data; + + SendData.frametail = Get_CRC16_Check_Sum((uint8_t *)&SendData, LEN_HEADER + LEN_CMDID + temp_datalength, 0xFFFF); + + RefereeSend((uint8_t *)&SendData, LEN_HEADER + LEN_CMDID + temp_datalength + LEN_TAIL); // 发送 + UI_Seq++; // 包序号+1 } - +/** + * @brief 裁判系统数据发送函数,由于使用 + * @param + */ +void RefereeSend(uint8_t *send, uint16_t tx_len) +{ + static TickType_t xLastWakeTime; + USARTSend(referee_usart_instance, send, tx_len, USART_TRANSFER_DMA); + vTaskDelayUntil(&xLastWakeTime, 120); +} /*裁判系统串口接收回调函数,解析数据 */ static void RefereeRxCallback() @@ -66,83 +87,82 @@ static void RefereeRxCallback() /** * @brief 读取裁判数据,中断中读取保证速度 - * @param ReadFromUsart: 读取到的裁判系统原始数据 + * @param buff: 读取到的裁判系统原始数据 * @retval 是否对正误判断做处理 * @attention 在此判断帧头和CRC校验,无误再写入数据，不重复判断帧头 */ -static void JudgeReadData(uint8_t *ReadFromUsart) +static void JudgeReadData(uint8_t *buff) { - uint16_t judge_length; // 统计一帧数据长度 - if (ReadFromUsart == NULL) // 空数据包，则不作任何处理 + uint16_t judge_length; // 统计一帧数据长度 + if (buff == NULL) // 空数据包，则不作任何处理 return; // 写入帧头数据(5-byte),用于判断是否开始存储裁判数据 - memcpy(&referee_info.FrameHeader, ReadFromUsart, LEN_HEADER); + memcpy(&referee_info.FrameHeader, buff, LEN_HEADER); // 判断帧头数据(0)是否为0xA5 - if (ReadFromUsart[SOF] == REFEREE_SOF) + if (buff[SOF] == REFEREE_SOF) { // 帧头CRC8校验 - if (Verify_CRC8_Check_Sum(ReadFromUsart, LEN_HEADER) == TRUE) + if (Verify_CRC8_Check_Sum(buff, LEN_HEADER) == TRUE) { // 统计一帧数据长度(byte),用于CR16校验 - judge_length = ReadFromUsart[DATA_LENGTH] + LEN_HEADER + LEN_CMDID + LEN_TAIL; + judge_length = buff[DATA_LENGTH] + LEN_HEADER + LEN_CMDID + LEN_TAIL; // 帧尾CRC16校验 - if (Verify_CRC16_Check_Sum(ReadFromUsart, judge_length) == TRUE) + if (Verify_CRC16_Check_Sum(buff, judge_length) == TRUE) { // 2个8位拼成16位int - referee_info.CmdID = (ReadFromUsart[6] << 8 | ReadFromUsart[5]); + referee_info.CmdID = (buff[6] << 8 | buff[5]); // 解析数据命令码,将数据拷贝到相应结构体中(注意拷贝数据的长度) // 第8个字节开始才是数据 data=7 switch (referee_info.CmdID) { case ID_game_state: // 0x0001 - memcpy(&referee_info.GameState, (ReadFromUsart + DATA_Offset), LEN_game_state); + memcpy(&referee_info.GameState, (buff + DATA_Offset), LEN_game_state); break; case ID_game_result: // 0x0002 - memcpy(&referee_info.GameResult, (ReadFromUsart + DATA_Offset), LEN_game_result); + memcpy(&referee_info.GameResult, (buff + DATA_Offset), LEN_game_result); break; case ID_game_robot_survivors: // 0x0003 - memcpy(&referee_info.GameRobotHP, (ReadFromUsart + DATA_Offset), LEN_game_robot_HP); + memcpy(&referee_info.GameRobotHP, (buff + DATA_Offset), LEN_game_robot_HP); break; case ID_event_data: // 0x0101 - memcpy(&referee_info.EventData, (ReadFromUsart + DATA_Offset), LEN_event_data); + memcpy(&referee_info.EventData, (buff + DATA_Offset), LEN_event_data); break; case ID_supply_projectile_action: // 0x0102 - memcpy(&referee_info.SupplyProjectileAction, (ReadFromUsart + DATA_Offset), LEN_supply_projectile_action); + memcpy(&referee_info.SupplyProjectileAction, (buff + DATA_Offset), LEN_supply_projectile_action); break; case ID_game_robot_state: // 0x0201 - memcpy(&referee_info.GameRobotState, (ReadFromUsart + DATA_Offset), LEN_game_robot_state); + memcpy(&referee_info.GameRobotState, (buff + DATA_Offset), LEN_game_robot_state); break; case ID_power_heat_data: // 0x0202 - memcpy(&referee_info.PowerHeatData, (ReadFromUsart + DATA_Offset), LEN_power_heat_data); + memcpy(&referee_info.PowerHeatData, (buff + DATA_Offset), LEN_power_heat_data); break; case ID_game_robot_pos: // 0x0203 - memcpy(&referee_info.GameRobotPos, (ReadFromUsart + DATA_Offset), LEN_game_robot_pos); + memcpy(&referee_info.GameRobotPos, (buff + DATA_Offset), LEN_game_robot_pos); break; case ID_buff_musk: // 0x0204 - memcpy(&referee_info.BuffMusk, (ReadFromUsart + DATA_Offset), LEN_buff_musk); + memcpy(&referee_info.BuffMusk, (buff + DATA_Offset), LEN_buff_musk); break; case ID_aerial_robot_energy: // 0x0205 - memcpy(&referee_info.AerialRobotEnergy, (ReadFromUsart + DATA_Offset), LEN_aerial_robot_energy); + memcpy(&referee_info.AerialRobotEnergy, (buff + DATA_Offset), LEN_aerial_robot_energy); break; case ID_robot_hurt: // 0x0206 - memcpy(&referee_info.RobotHurt, (ReadFromUsart + DATA_Offset), LEN_robot_hurt); + memcpy(&referee_info.RobotHurt, (buff + DATA_Offset), LEN_robot_hurt); break; case ID_shoot_data: // 0x0207 - memcpy(&referee_info.ShootData, (ReadFromUsart + DATA_Offset), LEN_shoot_data); + memcpy(&referee_info.ShootData, (buff + DATA_Offset), LEN_shoot_data); break; case ID_student_interactive: // 0x0301 syhtodo接收代码未测试 - memcpy(&referee_info.ReceiveData, (ReadFromUsart + DATA_Offset), LEN_receive_data); + memcpy(&referee_info.ReceiveData, (buff + DATA_Offset), LEN_receive_data); break; } } } // 首地址加帧长度,指向CRC16下一字节,用来判断是否为0xA5,从而判断一个数据包是否有多帧数据 - if (*(ReadFromUsart + sizeof(xFrameHeader) + LEN_CMDID + referee_info.FrameHeader.DataLength + LEN_TAIL) == 0xA5) - { - // 如果一个数据包出现了多帧数据,则再次调用解析函数,直到所有数据包解析完毕 - JudgeReadData(ReadFromUsart + sizeof(xFrameHeader) + LEN_CMDID + referee_info.FrameHeader.DataLength + LEN_TAIL); + if (*(buff + sizeof(xFrameHeader) + LEN_CMDID + referee_info.FrameHeader.DataLength + LEN_TAIL) == 0xA5) + { // 如果一个数据包出现了多帧数据,则再次调用解析函数,直到所有数据包解析完毕 + JudgeReadData(buff + sizeof(xFrameHeader) + LEN_CMDID + referee_info.FrameHeader.DataLength + LEN_TAIL); } } } diff --git a/modules/referee/rm_referee.h b/modules/referee/rm_referee.h index 733433f..477a3e3 100644 --- a/modules/referee/rm_referee.h +++ b/modules/referee/rm_referee.h @@ -2,30 +2,25 @@ #define RM_REFEREE_H #include "usart.h" -#include "referee_def.h" +#include "referee_protocol.h" +#include "robot_def.h" #include "bsp_usart.h" -extern uint8_t UI_Seq; +#include "FreeRTOS.h" + +extern uint8_t UI_Seq; #pragma pack(1) -#define RE_TX_BUFFER_SIZE 512 -//发送缓冲区结构体定义 typedef struct { - uint8_t buffer[RE_TX_BUFFER_SIZE]; - uint16_t pos; -} referee_tx_buffer_t; - -typedef struct -{ - uint8_t Robot_Color; //机器人颜色 - uint16_t Robot_ID; //本机器人ID - uint16_t Cilent_ID; //本机器人对应的客户端ID - uint16_t Receiver_Robot_ID; //机器人车间通信时接收者的ID，必须和本机器人同颜色 + uint8_t Robot_Color; // 机器人颜色 + uint16_t Robot_ID; // 本机器人ID + uint16_t Cilent_ID; // 本机器人对应的客户端ID + uint16_t Receiver_Robot_ID; // 机器人车间通信时接收者的ID，必须和本机器人同颜色 } referee_id_t; // 此结构体包含裁判系统接收数据以及UI绘制与机器人车间通信的相关信息 typedef struct -{ +{ referee_id_t referee_id; xFrameHeader FrameHeader; // 接收到的帧头信息 @@ -43,33 +38,79 @@ typedef struct ext_robot_hurt_t RobotHurt; // 0x0206 ext_shoot_data_t ShootData; // 0x0207 - //自定义交互数据的接收 + // 自定义交互数据的接收 Communicate_ReceiveData_t ReceiveData; } referee_info_t; +// 模式是否切换标志位，0为未切换，1为切换，static定义默认为0 +typedef struct +{ + uint32_t chassis_flag : 1; + uint32_t gimbal_flag : 1; + uint32_t shoot_flag : 1; + uint32_t lid_flag : 1; + uint32_t friction_flag : 1; + uint32_t Power_flag : 1; +} Referee_Interactive_Flag_t; + +// 此结构体包含UI绘制与机器人车间通信的需要的其他非裁判系统数据 +typedef struct +{ + Referee_Interactive_Flag_t Referee_Interactive_Flag; + // 为UI绘制以及交互数据所用 + Robot_Status_e Robot_Status; // 机器人状态 + App_Status_e App_Status; // 应用状态 + chassis_mode_e chassis_mode; // 底盘模式 + gimbal_mode_e gimbal_mode; // 云台模式 + shoot_mode_e shoot_mode; // 发射模式设置 + friction_mode_e friction_mode; // 摩擦轮关闭 + lid_mode_e lid_mode; // 弹舱盖打开 + loader_mode_e loader_mode; // 单发...连发 + Chassis_Power_Data_s Chassis_Power_Data; // 功率控制 + + //上一次的模式，用于flag判断 + chassis_mode_e chassis_last_mode; // 底盘模式 + gimbal_mode_e gimbal_last_mode; // 云台模式 + shoot_mode_e shoot_last_mode; // 发射模式设置 + friction_mode_e friction_last_mode; // 摩擦轮关闭 + lid_mode_e lid_last_mode; // 弹舱盖打开 + +} Referee_Interactive_info_t; + #pragma pack() /** - * @brief 初始化裁判系统,返回接收数据指针 - * - * @param referee_usart_handle - * @return referee_info_t* + * @brief 裁判系统通信初始化, 该函数会初始化裁判系统串口,开启中断,同时将UI绘制的数据指针传入 + * + * @param referee_usart_handle 串口handle,C板一般用串口6 + * @param UI_data UI绘制数据指针,即保存着UI绘制的各种状态数据 + * @return referee_info_t* 返回裁判系统反馈的数据,包括热量/血量/状态等 */ -referee_info_t *RefereeInit(UART_HandleTypeDef *referee_usart_handle); - +referee_info_t *RefereeInit(UART_HandleTypeDef *referee_usart_handle, Referee_Interactive_info_t *UI_data); /** - * @brief 载入缓存区函数 - * @param send 待载入的数据 + * @brief 由UI绘制的任务初始化调用,用于获取裁判系统反馈的数据指针和UI绘制的数据指针,以便UI绘制任务使用 + * + * @param recv_info_pp 指向裁判系统反馈的数据指针 + * @param UI_data_pp */ -void RefereeLoadToBuffer(uint8_t *send, uint16_t tx_len); +void RefereeGetUIData(referee_info_t **recv_info_pp, Referee_Interactive_info_t **UI_data_pp); + +/** + * @brief 发送机器人间的交互数据 + * @param referee_id_t *_id sender为本机器人，receiver为接收方机器人，发送前设置Receiver_Robot_ID再调用该函数 + * robot_interactive_data_t *data 数据段 + * @retval none + * @attention + */ +void CommBetweenRobotSend(referee_id_t *_id, robot_interactive_data_t *_data); /** * @brief 发送函数 * @todo - * @param + * @param */ -void RefereeSend(void); +void RefereeSend(uint8_t *send, uint16_t tx_len); #endif // !REFEREE_H From bcb1d72a97c315b811ac5acc3462aee0c91d5eff Mon Sep 17 00:00:00 2001 From: NeoZng Date: Wed, 19 Apr 2023 19:28:17 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E9=A1=BA=E5=BA=8F=E5=92=8C=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HAL_N_Middlewares/Src/main.c | 242 --------------------------------- Src/freertos.c | 2 +- application/chassis/chassis.c | 4 +- modules/referee/referee.md | 30 +++- modules/referee/referee_UI.c | 2 +- modules/referee/referee_task.c | 109 ++++++--------- modules/referee/referee_task.h | 8 +- modules/referee/rm_referee.c | 32 +---- modules/referee/rm_referee.h | 36 ++--- 9 files changed, 93 insertions(+), 372 deletions(-) delete mode 100644 HAL_N_Middlewares/Src/main.c diff --git a/HAL_N_Middlewares/Src/main.c b/HAL_N_Middlewares/Src/main.c deleted file mode 100644 index a06f22e..0000000 --- a/HAL_N_Middlewares/Src/main.c +++ /dev/null @@ -1,242 +0,0 @@ -/* USER CODE BEGIN Header */ -/** - ****************************************************************************** - * @file : main.c - * @brief : Main program body - ****************************************************************************** - * @attention - * - * Copyright (c) 2023 STMicroelectronics. - * All rights reserved. - * - * This software is licensed under terms that can be found in the LICENSE file - * in the root directory of this software component. - * If no LICENSE file comes with this software, it is provided AS-IS. - * - ****************************************************************************** - */ -/* USER CODE END Header */ -/* Includes ------------------------------------------------------------------*/ -#include "main.h" -#include "cmsis_os.h" -#include "adc.h" -#include "can.h" -#include "crc.h" -#include "dac.h" -#include "dma.h" -#include "i2c.h" -#include "rng.h" -#include "rtc.h" -#include "spi.h" -#include "tim.h" -#include "usart.h" -#include "usb_device.h" -#include "gpio.h" - -/* Private includes ----------------------------------------------------------*/ -/* USER CODE BEGIN Includes */ -#include "robot.h" -/* USER CODE END Includes */ - -/* Private typedef -----------------------------------------------------------*/ -/* USER CODE BEGIN PTD */ - -/* USER CODE END PTD */ - -/* Private define ------------------------------------------------------------*/ -/* USER CODE BEGIN PD */ -/* USER CODE END PD */ - -/* Private macro -------------------------------------------------------------*/ -/* USER CODE BEGIN PM */ - -/* USER CODE END PM */ - -/* Private variables ---------------------------------------------------------*/ - -/* USER CODE BEGIN PV */ - -/* USER CODE END PV */ - -/* Private function prototypes -----------------------------------------------*/ -void SystemClock_Config(void); -void MX_FREERTOS_Init(void); -/* USER CODE BEGIN PFP */ - -/* USER CODE END PFP */ - -/* Private user code ---------------------------------------------------------*/ -/* USER CODE BEGIN 0 */ - -/* USER CODE END 0 */ - -/** - * @brief The application entry point. - * @retval int - */ -int main(void) -{ - /* USER CODE BEGIN 1 */ - - /* USER CODE END 1 */ - - /* MCU Configuration--------------------------------------------------------*/ - - /* Reset of all peripherals, Initializes the Flash interface and the Systick. */ - HAL_Init(); - /* USER CODE BEGIN Init */ - - /* USER CODE END Init */ - - /* Configure the system clock */ - SystemClock_Config(); - - /* USER CODE BEGIN SysInit */ - - /* USER CODE END SysInit */ - - /* Initialize all configured peripherals */ - MX_GPIO_Init(); - MX_DMA_Init(); - MX_ADC1_Init(); - MX_CAN1_Init(); - MX_CAN2_Init(); - MX_SPI1_Init(); - MX_TIM4_Init(); - MX_TIM5_Init(); - MX_USART3_UART_Init(); - MX_RNG_Init(); - MX_RTC_Init(); - MX_TIM1_Init(); - MX_TIM10_Init(); - MX_USART1_UART_Init(); - MX_USART6_UART_Init(); - MX_TIM8_Init(); - MX_I2C2_Init(); - MX_I2C3_Init(); - MX_SPI2_Init(); - MX_CRC_Init(); - MX_DAC_Init(); - /* USER CODE BEGIN 2 */ - RobotInit(); - /* USER CODE END 2 */ - - /* Call init function for freertos objects (in freertos.c) */ - MX_FREERTOS_Init(); - - /* Start scheduler */ - osKernelStart(); - - /* We should never get here as control is now taken by the scheduler */ - /* Infinite loop */ - /* USER CODE BEGIN WHILE */ - while (1) - { - /* USER CODE END WHILE */ - - /* USER CODE BEGIN 3 */ - } - /* USER CODE END 3 */ -} - -/** - * @brief System Clock Configuration - * @retval None - */ -void SystemClock_Config(void) -{ - RCC_OscInitTypeDef RCC_OscInitStruct = {0}; - RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - - /** Configure the main internal regulator output voltage - */ - __HAL_RCC_PWR_CLK_ENABLE(); - __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); - - /** Initializes the RCC Oscillators according to the specified parameters - * in the RCC_OscInitTypeDef structure. - */ - RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE; - RCC_OscInitStruct.HSEState = RCC_HSE_ON; - RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; - RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE; - RCC_OscInitStruct.PLL.PLLM = 6; - RCC_OscInitStruct.PLL.PLLN = 168; - RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 7; - if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) - { - Error_Handler(); - } - - /** Initializes the CPU, AHB and APB buses clocks - */ - RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2; - RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK; - RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; - RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4; - RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2; - - if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5) != HAL_OK) - { - Error_Handler(); - } -} - -/* USER CODE BEGIN 4 */ - -/* USER CODE END 4 */ - -/** - * @brief Period elapsed callback in non blocking mode - * @note This function is called when TIM14 interrupt took place, inside - * HAL_TIM_IRQHandler(). It makes a direct call to HAL_IncTick() to increment - * a global variable "uwTick" used as application time base. - * @param htim : TIM handle - * @retval None - */ -void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) -{ - /* USER CODE BEGIN Callback 0 */ - - /* USER CODE END Callback 0 */ - if (htim->Instance == TIM14) - { - HAL_IncTick(); - } - /* USER CODE BEGIN Callback 1 */ - - /* USER CODE END Callback 1 */ -} - -/** - * @brief This function is executed in case of error occurrence. - * @retval None - */ -void Error_Handler(void) -{ - /* USER CODE BEGIN Error_Handler_Debug */ - /* User can add his own implementation to report the HAL error return state */ - __disable_irq(); - while (1) - { - } - /* USER CODE END Error_Handler_Debug */ -} - -#ifdef USE_FULL_ASSERT -/** - * @brief Reports the name of the source file and the source line number - * where the assert_param error has occurred. - * @param file: pointer to the source file name - * @param line: assert_param error line source number - * @retval None - */ -void assert_failed(uint8_t *file, uint32_t line) -{ - /* USER CODE BEGIN 6 */ - /* User can add his own implementation to report the file name and line number, - ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */ - /* USER CODE END 6 */ -} -#endif /* USE_FULL_ASSERT */ diff --git a/Src/freertos.c b/Src/freertos.c index 2a2b1a2..4f339e6 100644 --- a/Src/freertos.c +++ b/Src/freertos.c @@ -206,7 +206,7 @@ void StartROBOTTASK(void const *argument) void StartUITASK(void const *argument) { - Referee_Interactive_init(); + My_UI_init(); while (1) { Referee_Interactive_task(); diff --git a/application/chassis/chassis.c b/application/chassis/chassis.c index 3306643..1e0a1a2 100644 --- a/application/chassis/chassis.c +++ b/application/chassis/chassis.c @@ -16,7 +16,7 @@ #include "dji_motor.h" #include "super_cap.h" #include "message_center.h" -#include "rm_referee.h" +#include "referee_task.h" #include "general_def.h" #include "bsp_dwt.h" @@ -103,7 +103,7 @@ void ChassisInit() chassis_motor_config.controller_setting_init_config.motor_reverse_flag = MOTOR_DIRECTION_REVERSE; motor_rb = DJIMotorInit(&chassis_motor_config); - referee_data = RefereeInit(&huart6,&ui_data); // 裁判系统初始化 + referee_data = Referee_Interactive_init(&huart6,&ui_data); // 裁判系统初始化 // while (referee_data->GameRobotState.robot_id ==0); // Referee_Interactive_init(referee_data); diff --git a/modules/referee/referee.md b/modules/referee/referee.md index 2b09cc3..abf58c0 100644 --- a/modules/referee/referee.md +++ b/modules/referee/referee.md @@ -1 +1,29 @@ -# referee \ No newline at end of file +# referee + + +若需要进行多机交互，可增加此函数： +```c +void CommBetweenRobotSend(referee_id_t *_id, robot_interactive_data_t *_data) +{ + Communicate_SendData_t SendData; + uint8_t temp_datalength = Interactive_Data_LEN_Head + Communicate_Data_LEN; // 计算交互数据长度 6+n,n为交互数据长度 + + SendData.FrameHeader.SOF = REFEREE_SOF; + SendData.FrameHeader.DataLength = temp_datalength; + SendData.FrameHeader.Seq = UI_Seq; + SendData.FrameHeader.CRC8 = Get_CRC8_Check_Sum((uint8_t *)&SendData, LEN_CRC8, 0xFF); + + SendData.CmdID = ID_student_interactive; + + SendData.datahead.data_cmd_id = Communicate_Data_ID; + SendData.datahead.sender_ID = _id->Robot_ID; + SendData.datahead.receiver_ID = _id->Receiver_Robot_ID; + + SendData.Data = *_data; + + SendData.frametail = Get_CRC16_Check_Sum((uint8_t *)&SendData, LEN_HEADER + LEN_CMDID + temp_datalength, 0xFFFF); + + RefereeSend((uint8_t *)&SendData, LEN_HEADER + LEN_CMDID + temp_datalength + LEN_TAIL); // 发送 + UI_Seq++; // 包序号+1 +} +``` \ No newline at end of file diff --git a/modules/referee/referee_UI.c b/modules/referee/referee_UI.c index 651a891..d58a152 100644 --- a/modules/referee/referee_UI.c +++ b/modules/referee/referee_UI.c @@ -389,7 +389,7 @@ void UI_ReFresh(referee_id_t *_id, int cnt, ...) graphData = va_arg(ap, Graph_Data_t); // 访问参数列表中的每个项,第二个参数是你要返回的参数的类型,在取值时需要将其强制转化为指定类型的变量 memcpy(buffer + (LEN_HEADER + LEN_CMDID + Interactive_Data_LEN_Head + UI_Operate_LEN_PerDraw * i), (uint8_t *)&graphData, UI_Operate_LEN_PerDraw); } - Append_CRC16_Check_Sum(buffer,temp_datalength); + Append_CRC16_Check_Sum(buffer, temp_datalength); RefereeSend(buffer, temp_datalength); // 发送CRC16校验值 va_end(ap); // 结束可变参数的获取 diff --git a/modules/referee/referee_task.c b/modules/referee/referee_task.c index fe1b616..123700e 100644 --- a/modules/referee/referee_task.c +++ b/modules/referee/referee_task.c @@ -16,21 +16,32 @@ static Referee_Interactive_info_t *Interactive_data; // UI绘制需要的机器人状态数据 static referee_info_t *referee_recv_info; // 接收到的裁判系统数据 -static void DeterminRobotID(referee_info_t *_referee_info); -static void My_UI_init(referee_info_t *_referee_info); -static void My_UI_Refresh(referee_info_t *_referee_info, Referee_Interactive_info_t *_Interactive_data); +/** + * @brief 判断各种ID，选择客户端ID + * @param referee_info_t *referee_recv_info + * @retval none + * @attention + */ +static void DeterminRobotID() +{ + // id小于7是红色,大于7是蓝色,0为红色，1为蓝色 #define Robot_Red 0 #define Robot_Blue 1 + referee_recv_info->referee_id.Robot_Color = referee_recv_info->GameRobotState.robot_id > 7 ? Robot_Blue : Robot_Red; + referee_recv_info->referee_id.Robot_ID = referee_recv_info->GameRobotState.robot_id; + referee_recv_info->referee_id.Cilent_ID = 0x0100 + referee_recv_info->referee_id.Robot_ID; // 计算客户端ID + referee_recv_info->referee_id.Receiver_Robot_ID = 0; +} + +static void My_UI_Refresh(referee_info_t *referee_recv_info, Referee_Interactive_info_t *_Interactive_data); static void Mode_Change_Check(Referee_Interactive_info_t *_Interactive_data); // 模式切换检测 // syhtod 正式上车后需删除 static void robot_mode_change(Referee_Interactive_info_t *_Interactive_data); // 测试用函数，实现模式自动变化 -static void UI_test_init(referee_info_t *_referee_info); // UI测试函数 -void Referee_Interactive_init() +referee_info_t *Referee_Interactive_init(UART_HandleTypeDef *referee_usart_handle, Referee_Interactive_info_t *UI_data) { - RefereeGetUIData(&referee_recv_info, &Interactive_data); - while (referee_recv_info->GameRobotState.robot_id == 0); - DeterminRobotID(referee_recv_info); - My_UI_init(referee_recv_info); + referee_recv_info = RefereeInit(referee_usart_handle); // 初始化裁判系统的串口,并返回裁判系统反馈数据指针 + Interactive_data = UI_data; // 获取UI绘制需要的机器人状态数据 + return referee_recv_info; } void Referee_Interactive_task() @@ -44,9 +55,10 @@ static String_Data_t UI_State_sta[6]; // 机器人状态,静态只需画一次 static String_Data_t UI_State_dyn[6]; // 机器人状态,动态先add才能change static uint32_t shoot_line_location[10] = {540, 960, 490, 515, 565}; -static void My_UI_init(referee_info_t *_referee_info) +void My_UI_init() { - UIDelete(&_referee_info->referee_id, UI_Data_Del_ALL, 0); + DeterminRobotID(); + UIDelete(&referee_recv_info->referee_id, UI_Data_Del_ALL, 0); // 清空UI // // 绘制发射基准线 Line_Draw(&UI_shoot_line[0], "sl0", UI_Graph_ADD, 7, UI_Color_White, 3, 710, shoot_line_location[0], 1210, shoot_line_location[0]); @@ -55,40 +67,40 @@ static void My_UI_init(referee_info_t *_referee_info) Line_Draw(&UI_shoot_line[3], "sl3", UI_Graph_ADD, 7, UI_Color_Yellow, 2, 810, shoot_line_location[3], 1110, shoot_line_location[3]); Line_Draw(&UI_shoot_line[4], "sl4", UI_Graph_ADD, 7, UI_Color_Yellow, 2, 810, shoot_line_location[4], 1110, shoot_line_location[4]); - UI_ReFresh(&_referee_info->referee_id, 5, UI_shoot_line[0], UI_shoot_line[1], UI_shoot_line[2], UI_shoot_line[3], UI_shoot_line[4]); + UI_ReFresh(&referee_recv_info->referee_id, 5, UI_shoot_line[0], UI_shoot_line[1], UI_shoot_line[2], UI_shoot_line[3], UI_shoot_line[4]); // 绘制车辆状态标志指示 Char_Draw(&UI_State_sta[0], "ss0", UI_Graph_ADD, 8, UI_Color_Main, 15, 2, 150, 750, "chassis:"); - Char_ReFresh(&_referee_info->referee_id, UI_State_sta[0]); + Char_ReFresh(&referee_recv_info->referee_id, UI_State_sta[0]); Char_Draw(&UI_State_sta[1], "ss1", UI_Graph_ADD, 8, UI_Color_Yellow, 15, 2, 150, 700, "gimbal:"); - Char_ReFresh(&_referee_info->referee_id, UI_State_sta[1]); + Char_ReFresh(&referee_recv_info->referee_id, UI_State_sta[1]); Char_Draw(&UI_State_sta[2], "ss2", UI_Graph_ADD, 8, UI_Color_Orange, 15, 2, 150, 650, "shoot:"); - Char_ReFresh(&_referee_info->referee_id, UI_State_sta[2]); + Char_ReFresh(&referee_recv_info->referee_id, UI_State_sta[2]); Char_Draw(&UI_State_sta[3], "ss3", UI_Graph_ADD, 8, UI_Color_Pink, 15, 2, 150, 600, "frict:"); - Char_ReFresh(&_referee_info->referee_id, UI_State_sta[3]); + Char_ReFresh(&referee_recv_info->referee_id, UI_State_sta[3]); Char_Draw(&UI_State_sta[4], "ss4", UI_Graph_ADD, 8, UI_Color_Pink, 15, 2, 150, 550, "lid:"); - Char_ReFresh(&_referee_info->referee_id, UI_State_sta[4]); + Char_ReFresh(&referee_recv_info->referee_id, UI_State_sta[4]); // 底盘功率显示，静态 Char_Draw(&UI_State_sta[5], "ss5", UI_Graph_ADD, 8, UI_Color_Green, 18, 2, 720, 210, "Power:"); - Char_ReFresh(&_referee_info->referee_id, UI_State_sta[5]); + Char_ReFresh(&referee_recv_info->referee_id, UI_State_sta[5]); // 绘制车辆状态标志，动态 // 由于初始化时xxx_last_mode默认为0，所以此处对应UI也应该设为0时对应的UI，防止模式不变的情况下无法置位flag，导致UI无法刷新 Char_Draw(&UI_State_dyn[0], "sd0", UI_Graph_ADD, 8, UI_Color_Main, 15, 2, 270, 750, "zeroforce"); - Char_ReFresh(&_referee_info->referee_id, UI_State_dyn[0]); + Char_ReFresh(&referee_recv_info->referee_id, UI_State_dyn[0]); Char_Draw(&UI_State_dyn[1], "sd1", UI_Graph_ADD, 8, UI_Color_Yellow, 15, 2, 270, 700, "zeroforce"); - Char_ReFresh(&_referee_info->referee_id, UI_State_dyn[1]); + Char_ReFresh(&referee_recv_info->referee_id, UI_State_dyn[1]); Char_Draw(&UI_State_dyn[2], "sd2", UI_Graph_ADD, 8, UI_Color_Orange, 15, 2, 270, 650, "off"); - Char_ReFresh(&_referee_info->referee_id, UI_State_dyn[2]); + Char_ReFresh(&referee_recv_info->referee_id, UI_State_dyn[2]); Char_Draw(&UI_State_dyn[3], "sd3", UI_Graph_ADD, 8, UI_Color_Pink, 15, 2, 270, 600, "off"); - Char_ReFresh(&_referee_info->referee_id, UI_State_dyn[3]); + Char_ReFresh(&referee_recv_info->referee_id, UI_State_dyn[3]); Char_Draw(&UI_State_dyn[4], "sd4", UI_Graph_ADD, 8, UI_Color_Pink, 15, 2, 270, 550, "open "); - Char_ReFresh(&_referee_info->referee_id, UI_State_dyn[4]); + Char_ReFresh(&referee_recv_info->referee_id, UI_State_dyn[4]); // 底盘功率显示,动态 Char_Draw(&UI_State_dyn[5], "sd5", UI_Graph_ADD, 8, UI_Color_Green, 18, 2, 840, 210, "0000"); - Char_ReFresh(&_referee_info->referee_id, UI_State_dyn[5]); + Char_ReFresh(&referee_recv_info->referee_id, UI_State_dyn[5]); } static uint8_t count = 0; @@ -144,7 +156,7 @@ static void robot_mode_change(Referee_Interactive_info_t *_Interactive_data) // } } -static void My_UI_Refresh(referee_info_t *_referee_info, Referee_Interactive_info_t *_Interactive_data) +static void My_UI_Refresh(referee_info_t *referee_recv_info, Referee_Interactive_info_t *_Interactive_data) { Mode_Change_Check(_Interactive_data); // chassis @@ -166,7 +178,7 @@ static void My_UI_Refresh(referee_info_t *_referee_info, Referee_Interactive_inf Char_Draw(&UI_State_dyn[0], "sd0", UI_Graph_Change, 8, UI_Color_Main, 15, 2, 270, 750, "follow "); break; } - Char_ReFresh(&_referee_info->referee_id, UI_State_dyn[0]); + Char_ReFresh(&referee_recv_info->referee_id, UI_State_dyn[0]); _Interactive_data->Referee_Interactive_Flag.chassis_flag = 0; } // gimbal @@ -190,7 +202,7 @@ static void My_UI_Refresh(referee_info_t *_referee_info, Referee_Interactive_inf break; } } - Char_ReFresh(&_referee_info->referee_id, UI_State_dyn[1]); + Char_ReFresh(&referee_recv_info->referee_id, UI_State_dyn[1]); _Interactive_data->Referee_Interactive_Flag.gimbal_flag = 0; } // shoot @@ -209,7 +221,7 @@ static void My_UI_Refresh(referee_info_t *_referee_info, Referee_Interactive_inf break; } } - Char_ReFresh(&_referee_info->referee_id, UI_State_dyn[2]); + Char_ReFresh(&referee_recv_info->referee_id, UI_State_dyn[2]); _Interactive_data->Referee_Interactive_Flag.shoot_flag = 0; } @@ -228,7 +240,7 @@ static void My_UI_Refresh(referee_info_t *_referee_info, Referee_Interactive_inf break; } } - Char_ReFresh(&_referee_info->referee_id, UI_State_dyn[3]); + Char_ReFresh(&referee_recv_info->referee_id, UI_State_dyn[3]); _Interactive_data->Referee_Interactive_Flag.friction_flag = 0; } @@ -247,7 +259,7 @@ static void My_UI_Refresh(referee_info_t *_referee_info, Referee_Interactive_inf break; } } - Char_ReFresh(&_referee_info->referee_id, UI_State_dyn[4]); + Char_ReFresh(&referee_recv_info->referee_id, UI_State_dyn[4]); _Interactive_data->Referee_Interactive_Flag.lid_flag = 0; } } @@ -290,40 +302,3 @@ static void Mode_Change_Check(Referee_Interactive_info_t *_Interactive_data) _Interactive_data->lid_last_mode = _Interactive_data->lid_mode; } } - -/** - * @brief 判断各种ID，选择客户端ID - * @param referee_info_t *_referee_info - * @retval none - * @attention - */ -static void DeterminRobotID(referee_info_t *_referee_info) -{ - // id小于7是红色,大于7是蓝色,0为红色，1为蓝色 #define Robot_Red 0 #define Robot_Blue 1 - _referee_info->referee_id.Robot_Color = _referee_info->GameRobotState.robot_id > 7 ? Robot_Blue : Robot_Red; - _referee_info->referee_id.Robot_ID = _referee_info->GameRobotState.robot_id; - _referee_info->referee_id.Cilent_ID = 0x0100 + _referee_info->referee_id.Robot_ID; // 计算客户端ID - _referee_info->referee_id.Receiver_Robot_ID = 0; -} - -/* 测试用函数 */ -static void UI_test_init(referee_info_t *_referee_info) -{ - Graph_Data_t graph[5]; - Graph_Data_t num[2]; - String_Data_t sdata[1]; - UIDelete(&_referee_info->referee_id, UI_Data_Del_ALL, 0); - - Line_Draw(&graph[0], "s0", UI_Graph_ADD, 0, UI_Color_White, 3, 710, 540, 1210, 540); - Rectangle_Draw(&graph[1], "s1", UI_Graph_ADD, 0, UI_Color_Yellow, 4, 600, 200, 800, 500); - Circle_Draw(&graph[2], "s2", UI_Graph_ADD, 0, UI_Color_Green, 5, 960, 540, 100); - Elliptical_Draw(&graph[3], "s3", UI_Graph_ADD, 0, UI_Color_Orange, 3, 960, 540, 100, 20); - Arc_Draw(&graph[4], "s4", UI_Graph_ADD, 0, UI_Color_Purplish_red, 30, 160, 3, 1200, 550, 50, 100); - - Float_Draw(&num[0], "s5", UI_Graph_ADD, 0, UI_Color_Pink, 50, 3, 5, 1050, 660, 1245545); - Integer_Draw(&num[1], "s6", UI_Graph_ADD, 0, UI_Color_Cyan, 50, 5, 1050, 460, 12345); - UI_ReFresh(&_referee_info->referee_id, 7, graph[0], graph[1], graph[2], graph[3], graph[4], num[0], num[1]); - - Char_Draw(&sdata[0], "s7", UI_Graph_ADD, 0, UI_Color_Green, 20, 2, 620, 710, "number:%d", 123); - Char_ReFresh(&_referee_info->referee_id, sdata[0]); -} diff --git a/modules/referee/referee_task.h b/modules/referee/referee_task.h index 4a2555b..c6c8ff2 100644 --- a/modules/referee/referee_task.h +++ b/modules/referee/referee_task.h @@ -8,7 +8,13 @@ * @brief 初始化裁判系统交互任务(UI和多机通信) * */ -void Referee_Interactive_init(); +referee_info_t *Referee_Interactive_init(UART_HandleTypeDef *referee_usart_handle, Referee_Interactive_info_t *UI_data); + +/** + * @brief 在referee task之前调用,添加在freertos.c中 + * + */ +void My_UI_init(); /** * @brief 裁判系统交互任务(UI和多机通信) diff --git a/modules/referee/rm_referee.c b/modules/referee/rm_referee.c index 8300dc2..41b9484 100644 --- a/modules/referee/rm_referee.c +++ b/modules/referee/rm_referee.c @@ -19,7 +19,6 @@ static USARTInstance *referee_usart_instance; // 裁判系统串口实例 static referee_info_t referee_info; // 裁判系统数据 -static Referee_Interactive_info_t *UI_tmp; // UI绘制需要的机器人状态数据 static void RefereeRxCallback(); static void JudgeReadData(uint8_t *buff); @@ -27,46 +26,17 @@ static void JudgeReadData(uint8_t *buff); uint8_t UI_Seq = 0; // 包序号，供整个referee文件使用 /* 裁判系统通信初始化 */ -referee_info_t *RefereeInit(UART_HandleTypeDef *referee_usart_handle, Referee_Interactive_info_t *UI_data) +referee_info_t *RefereeInit(UART_HandleTypeDef *referee_usart_handle) { USART_Init_Config_s conf; conf.module_callback = RefereeRxCallback; conf.usart_handle = referee_usart_handle; conf.recv_buff_size = RE_RX_BUFFER_SIZE; referee_usart_instance = USARTRegister(&conf); - UI_tmp = UI_data; return &referee_info; } -void RefereeGetUIData(referee_info_t **recv_info_pp, Referee_Interactive_info_t **UI_data_pp) -{ - *recv_info_pp = &referee_info; - *UI_data_pp = UI_tmp; -} -void CommBetweenRobotSend(referee_id_t *_id, robot_interactive_data_t *_data) -{ - Communicate_SendData_t SendData; - uint8_t temp_datalength = Interactive_Data_LEN_Head + Communicate_Data_LEN; // 计算交互数据长度 6+n,n为交互数据长度 - - SendData.FrameHeader.SOF = REFEREE_SOF; - SendData.FrameHeader.DataLength = temp_datalength; - SendData.FrameHeader.Seq = UI_Seq; - SendData.FrameHeader.CRC8 = Get_CRC8_Check_Sum((uint8_t *)&SendData, LEN_CRC8, 0xFF); - - SendData.CmdID = ID_student_interactive; - - SendData.datahead.data_cmd_id = Communicate_Data_ID; - SendData.datahead.sender_ID = _id->Robot_ID; - SendData.datahead.receiver_ID = _id->Receiver_Robot_ID; - - SendData.Data = *_data; - - SendData.frametail = Get_CRC16_Check_Sum((uint8_t *)&SendData, LEN_HEADER + LEN_CMDID + temp_datalength, 0xFFFF); - - RefereeSend((uint8_t *)&SendData, LEN_HEADER + LEN_CMDID + temp_datalength + LEN_TAIL); // 发送 - UI_Seq++; // 包序号+1 -} /** * @brief 裁判系统数据发送函数,由于使用 diff --git a/modules/referee/rm_referee.h b/modules/referee/rm_referee.h index 477a3e3..9db1748 100644 --- a/modules/referee/rm_referee.h +++ b/modules/referee/rm_referee.h @@ -68,8 +68,8 @@ typedef struct lid_mode_e lid_mode; // 弹舱盖打开 loader_mode_e loader_mode; // 单发...连发 Chassis_Power_Data_s Chassis_Power_Data; // 功率控制 - - //上一次的模式，用于flag判断 + + // 上一次的模式，用于flag判断 chassis_mode_e chassis_last_mode; // 底盘模式 gimbal_mode_e gimbal_last_mode; // 云台模式 shoot_mode_e shoot_last_mode; // 发射模式设置 @@ -81,35 +81,19 @@ typedef struct #pragma pack() /** - * @brief 裁判系统通信初始化, 该函数会初始化裁判系统串口,开启中断,同时将UI绘制的数据指针传入 - * + * @brief 裁判系统通信初始化,该函数会初始化裁判系统串口,开启中断 + * * @param referee_usart_handle 串口handle,C板一般用串口6 - * @param UI_data UI绘制数据指针,即保存着UI绘制的各种状态数据 * @return referee_info_t* 返回裁判系统反馈的数据,包括热量/血量/状态等 */ -referee_info_t *RefereeInit(UART_HandleTypeDef *referee_usart_handle, Referee_Interactive_info_t *UI_data); +referee_info_t *RefereeInit(UART_HandleTypeDef *referee_usart_handle); /** - * @brief 由UI绘制的任务初始化调用,用于获取裁判系统反馈的数据指针和UI绘制的数据指针,以便UI绘制任务使用 - * - * @param recv_info_pp 指向裁判系统反馈的数据指针 - * @param UI_data_pp - */ -void RefereeGetUIData(referee_info_t **recv_info_pp, Referee_Interactive_info_t **UI_data_pp); - -/** - * @brief 发送机器人间的交互数据 - * @param referee_id_t *_id sender为本机器人，receiver为接收方机器人，发送前设置Receiver_Robot_ID再调用该函数 - * robot_interactive_data_t *data 数据段 - * @retval none - * @attention - */ -void CommBetweenRobotSend(referee_id_t *_id, robot_interactive_data_t *_data); - -/** - * @brief 发送函数 - * @todo - * @param + * @brief UI绘制和交互数的发送接口,由UI绘制任务和多机通信函数调用 + * @note 内部包含了一个实时系统的延时函数,这是因为裁判系统接收CMD数据至高位10Hz + * + * @param send 发送数据首地址 + * @param tx_len 发送长度 */ void RefereeSend(uint8_t *send, uint16_t tx_len); From fb3472b556574817f0c779a64804f77031c6d852 Mon Sep 17 00:00:00 2001 From: Kidenygood <2979564623@qq.com> Date: Wed, 19 Apr 2023 22:50:26 +0800 Subject: [PATCH 09/11] =?UTF-8?q?UI=E5=8A=A8=E6=80=81=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=8C=E6=9C=AA=E6=8E=A5=E5=85=A5=E5=A4=96?= =?UTF-8?q?=E9=83=A8=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=9C=89=E5=B0=8F=E6=A6=82?= =?UTF-8?q?=E7=8E=87=E9=83=A8=E5=88=86=E5=88=9D=E5=A7=8B=E5=8C=96=E4=B8=8D?= =?UTF-8?q?=E6=88=90=E5=8A=9F=EF=BC=8C=E5=8F=AF=E8=83=BD=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/referee/referee.md | 49 ++++++++++++++++++++++++++++++++++ modules/referee/referee_UI.c | 2 +- modules/referee/referee_task.c | 1 + 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/modules/referee/referee.md b/modules/referee/referee.md index abf58c0..0bc3115 100644 --- a/modules/referee/referee.md +++ b/modules/referee/referee.md @@ -1,4 +1,53 @@ # referee +## 如何绘制你的自定义UI？以绘制超级电容能量条为例： +UI的绘制包含初始化和TASK两个部分，初始化部分在`My_UI_init`函数中，TASK部分在`My_UI_Refresh`函数中。 + +## 初始化部分： +初始化部分的UI主要有两个目的：静态UI的绘制、为动态UI的绘制做准备。 + +分析超级电容能量条功能可知，此UI包含如下： +voltage：xxx voltage为静态不变的，冒号后的xxx为变化的量。 +方框以及方框内的能量条：方框为静态不变的，能量条为变化的量。（参考游戏血条） + +因而，静态UI的绘制包含如下： +绘制字符“voltage:”、绘制矩形方框。 +为动态UI的准备如下： +绘制矩形方框内的初始能量条、绘制voltage的初始值。 + +### 绘制字符“voltage:”： +设置绘制用结构体，此处使用数组是因为需要绘制多个字符。本次绘制的字符为“voltage:”，只是用到了第6个，即xxx[5]： +```c +static String_Data_t UI_State_sta[6]; // 静态 +static String_Data_t UI_State_dyn[6]; // 动态 +``` +字符格式以及内容设置： +```c +// 底盘功率显示，静态 +Char_Draw(&UI_State_sta[5], "ss5", UI_Graph_ADD, 8, UI_Color_Green, 18, 2, 720, 210, "Voltage:"); +``` +各参数意义如下，函数定义中有详细注释： + + string String_Data类型变量指针，用于存放字符串数据 + stringname[3] 字符串名称，用于标识更改 + String_Operate 字符串操作，初始化时一般使用"UI_Graph_ADD" + String_Layer 图层0-9 + String_Color 字符串颜色 + String_Size 字号 + String_Width 字符串线宽 + Start_x、Start_y 开始坐标 + *stringdata 字符串数据 +设置完毕后，使用“Char_ReFresh”发送即可： +```c +// 底盘功率显示，静态 +Char_ReFresh(&_referee_info->referee_id, UI_State_sta[5]); +``` +### 绘制能量框： +定义一个图形类结构体，用于绘制能量框： +```c +static Graph_Data_t UI_energy_line[1]; // 电容能量条 +``` + + 若需要进行多机交互，可增加此函数： diff --git a/modules/referee/referee_UI.c b/modules/referee/referee_UI.c index d58a152..cd83ced 100644 --- a/modules/referee/referee_UI.c +++ b/modules/referee/referee_UI.c @@ -390,7 +390,7 @@ void UI_ReFresh(referee_id_t *_id, int cnt, ...) memcpy(buffer + (LEN_HEADER + LEN_CMDID + Interactive_Data_LEN_Head + UI_Operate_LEN_PerDraw * i), (uint8_t *)&graphData, UI_Operate_LEN_PerDraw); } Append_CRC16_Check_Sum(buffer, temp_datalength); - RefereeSend(buffer, temp_datalength); // 发送CRC16校验值 + RefereeSend(buffer, temp_datalength); va_end(ap); // 结束可变参数的获取 } diff --git a/modules/referee/referee_task.c b/modules/referee/referee_task.c index 123700e..8ff4694 100644 --- a/modules/referee/referee_task.c +++ b/modules/referee/referee_task.c @@ -51,6 +51,7 @@ void Referee_Interactive_task() } static Graph_Data_t UI_shoot_line[10]; // 射击准线 +static Graph_Data_t UI_energy_line[1]; // 电容能量条 static String_Data_t UI_State_sta[6]; // 机器人状态,静态只需画一次 static String_Data_t UI_State_dyn[6]; // 机器人状态,动态先add才能change static uint32_t shoot_line_location[10] = {540, 960, 490, 515, 565}; From 4bb45d1f18113dcd490669235c993a5222274ab5 Mon Sep 17 00:00:00 2001 From: Kidenygood <2979564623@qq.com> Date: Wed, 19 Apr 2023 22:51:02 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E6=9C=AA=E6=8F=90=E4=BA=A4=E7=9A=84=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/chassis/chassis.c | 5 +- modules/referee/referee.md | 114 +++++++++++++++++++++++++++++---- modules/referee/referee_task.c | 47 ++++++++++---- modules/referee/rm_referee.h | 14 ++-- 4 files changed, 145 insertions(+), 35 deletions(-) diff --git a/application/chassis/chassis.c b/application/chassis/chassis.c index 1e0a1a2..0d70798 100644 --- a/application/chassis/chassis.c +++ b/application/chassis/chassis.c @@ -43,7 +43,7 @@ static Chassis_Ctrl_Cmd_s chassis_cmd_recv; // 底盘接收到的控制 static Chassis_Upload_Data_s chassis_feedback_data; // 底盘回传的反馈数据 static referee_info_t* referee_data; // 用于获取裁判系统的数据 -static Referee_Interactive_info_t ui_data; // UI数据 +static Referee_Interactive_info_t ui_data; // UI数据，将底盘中的数据传入此结构体的对应变量中，UI会自动检测是否变化，对应显示UI static SuperCapInstance *cap; // 超级电容 static DJIMotorInstance *motor_lf, *motor_rf, *motor_lb, *motor_rb; // left right forward back @@ -105,9 +105,6 @@ void ChassisInit() referee_data = Referee_Interactive_init(&huart6,&ui_data); // 裁判系统初始化 - // while (referee_data->GameRobotState.robot_id ==0); - // Referee_Interactive_init(referee_data); - SuperCap_Init_Config_s cap_conf = { .can_config = { .can_handle = &hcan2, diff --git a/modules/referee/referee.md b/modules/referee/referee.md index 0bc3115..8417705 100644 --- a/modules/referee/referee.md +++ b/modules/referee/referee.md @@ -6,24 +6,22 @@ UI的绘制包含初始化和TASK两个部分，初始化部分在`My_UI_init` 初始化部分的UI主要有两个目的：静态UI的绘制、为动态UI的绘制做准备。 分析超级电容能量条功能可知，此UI包含如下： -voltage：xxx voltage为静态不变的，冒号后的xxx为变化的量。 +Power：xxx Power为静态不变的，冒号后的xxx为变化的量。 方框以及方框内的能量条：方框为静态不变的，能量条为变化的量。（参考游戏血条） 因而，静态UI的绘制包含如下： -绘制字符“voltage:”、绘制矩形方框。 +绘制字符“Power:”、绘制矩形方框。 为动态UI的准备如下： -绘制矩形方框内的初始能量条、绘制voltage的初始值。 +绘制矩形方框内的初始能量条、绘制Power的初始值。 -### 绘制字符“voltage:”： -设置绘制用结构体，此处使用数组是因为需要绘制多个字符。本次绘制的字符为“voltage:”，只是用到了第6个，即xxx[5]： +### 绘制字符“Power:”： +设置绘制用结构体，此处使用数组是因为需要绘制多个字符。本次绘制的字符为“Power:”，只是用到了第6个，即xxx[5]： ```c static String_Data_t UI_State_sta[6]; // 静态 -static String_Data_t UI_State_dyn[6]; // 动态 ``` 字符格式以及内容设置： ```c -// 底盘功率显示，静态 -Char_Draw(&UI_State_sta[5], "ss5", UI_Graph_ADD, 8, UI_Color_Green, 18, 2, 720, 210, "Voltage:"); +Char_Draw(&UI_State_sta[5], "ss5", UI_Graph_ADD, 7, UI_Color_Green, 18, 2, 620, 230, "Power:"); ``` 各参数意义如下，函数定义中有详细注释： @@ -38,18 +36,112 @@ Char_Draw(&UI_State_sta[5], "ss5", UI_Graph_ADD, 8, UI_Color_Green, 18, 2, 720, *stringdata 字符串数据 设置完毕后，使用“Char_ReFresh”发送即可： ```c -// 底盘功率显示，静态 -Char_ReFresh(&_referee_info->referee_id, UI_State_sta[5]); +Char_ReFresh(&referee_recv_info->referee_id, UI_State_sta[5]); ``` ### 绘制能量框： 定义一个图形类结构体，用于绘制能量框： ```c -static Graph_Data_t UI_energy_line[1]; // 电容能量条 +static Graph_Data_t UI_energy_line[3]; // 电容能量条 +``` +能量框参数设置以及发送函数： +```c +Rectangle_Draw(&UI_energy_line[0],"ss6", UI_Graph_ADD, 7, UI_Color_Green,20, 720, 220, 820, 240) +UI_ReFresh(&referee_recv_info->referee_id, 1,UI_energy_line[0]); +``` + +### 绘制power的初始值： +```c +Float_Draw(&UI_Energy[1], "sd5", UI_Graph_ADD, 8, UI_Color_Green, 18, 2, 2, 750, 230, 24000); +``` +### 绘制能量条的初始值： +```c +Line_Draw(&UI_Energy[2], "sd6", UI_Graph_ADD, 8, UI_Color_Pink, 30, 720, 160, 1020, 160); +``` +将两个图形打包发送 +``` +UI_ReFresh(&referee_recv_info->referee_id, 2, UI_Energy[1], UI_Energy[2]); +``` + +## TASK部分 +task中UI处于动态变化，此时需要检测所画的UI是否发生变化，若发生变化，则刷新对应UI。 +### 添加变化检测: +绘制功率部分UI，我们需要的是`Chassis_Power_Data_s`中的数据，我们定义`Chassis_Power_Data_s Chassis_Power_Data;`和`Chassis_Power_Data_s Chassis_last_Power_Data;`分别存储此次和上次的对应数据，本次和上次对应检测变化的需求。 +```c +typedef struct +{ + Referee_Interactive_Flag_t Referee_Interactive_Flag; + // 为UI绘制以及交互数据所用 + chassis_mode_e chassis_mode; // 底盘模式 + gimbal_mode_e gimbal_mode; // 云台模式 + shoot_mode_e shoot_mode; // 发射模式设置 + friction_mode_e friction_mode; // 摩擦轮关闭 + lid_mode_e lid_mode; // 弹舱盖打开 + Chassis_Power_Data_s Chassis_Power_Data; // 功率控制 + + // 上一次的模式，用于flag判断 + chassis_mode_e chassis_last_mode; + gimbal_mode_e gimbal_last_mode; + shoot_mode_e shoot_last_mode; + friction_mode_e friction_last_mode; + lid_mode_e lid_last_mode; + Chassis_Power_Data_s Chassis_last_Power_Data; + +} Referee_Interactive_info_t; +``` +添加功率变化标志位，`uint32_t Power_flag : 1;`，1为检测到变化，0为未检测到变换 +``` +typedef struct +{ + uint32_t chassis_flag : 1; + uint32_t gimbal_flag : 1; + uint32_t shoot_flag : 1; + uint32_t lid_flag : 1; + uint32_t friction_flag : 1; + uint32_t Power_flag : 1; +} Referee_Interactive_Flag_t; +``` +在变化检测函数中增加对应判断,由于voltage和能量条的变化对应同一个参数`Chassis_last_Power_Data.chassis_power_mx`的变化，所以只需要一个参数即可： +``` +static void Mode_Change_Check(Referee_Interactive_info_t *_Interactive_data) +{ + if (_Interactive_data->chassis_mode != _Interactive_data->chassis_last_mode) + ...... + ...... + if (_Interactive_data->lid_mode != _Interactive_data->lid_last_mode) + { + _Interactive_data->Referee_Interactive_Flag.lid_flag = 1; + _Interactive_data->lid_last_mode = _Interactive_data->lid_mode; + } + + if (_Interactive_data->Chassis_Power_Data.chassis_power_mx != _Interactive_data->Chassis_last_Power_Data.chassis_power_mx) + { + _Interactive_data->Referee_Interactive_Flag.Power_flag = 1; + _Interactive_data->Chassis_last_Power_Data.chassis_power_mx = _Interactive_data->Chassis_Power_Data.chassis_power_mx; + } +} +``` +### 根据功率的变化绘制UI： +在绘制变化的UI时，由于初始化时已经使用`UI_Graph_ADD`操作添加了UI，所以在绘制时，需要使用`UI_Graph_Change`操作，以便于刷新UI。 + +同时，完成UI刷新后，需要将对应的flag置0，以便于下次检测变化 +``` +if (_Interactive_data->Referee_Interactive_Flag.Power_flag == 1) +{ + Float_Draw(&UI_Energy[1], "sd5", UI_Graph_Change, 8, UI_Color_Green, 18, 2, 2, 750, 230, _Interactive_data->Chassis_Power_Data.chassis_power_mx * 1000); + Line_Draw(&UI_Energy[2], "sd6", UI_Graph_Change, 8, UI_Color_Pink, 30, 720, 160, (uint32_t)750 + _Interactive_data->Chassis_Power_Data.chassis_power_mx * 30, 160); + UI_ReFresh(&referee_recv_info->referee_id, 2, UI_Energy[1], UI_Energy[2]); + _Interactive_data->Referee_Interactive_Flag.Power_flag = 0; +} ``` + + +# +# +# 若需要进行多机交互，可增加此函数： ```c void CommBetweenRobotSend(referee_id_t *_id, robot_interactive_data_t *_data) diff --git a/modules/referee/referee_task.c b/modules/referee/referee_task.c index 8ff4694..8a1a077 100644 --- a/modules/referee/referee_task.c +++ b/modules/referee/referee_task.c @@ -12,7 +12,7 @@ #include "robot_def.h" #include "rm_referee.h" #include "referee_UI.h" - +#include "string.h" static Referee_Interactive_info_t *Interactive_data; // UI绘制需要的机器人状态数据 static referee_info_t *referee_recv_info; // 接收到的裁判系统数据 @@ -51,23 +51,24 @@ void Referee_Interactive_task() } static Graph_Data_t UI_shoot_line[10]; // 射击准线 -static Graph_Data_t UI_energy_line[1]; // 电容能量条 +static Graph_Data_t UI_Energy[3]; // 电容能量条 static String_Data_t UI_State_sta[6]; // 机器人状态,静态只需画一次 static String_Data_t UI_State_dyn[6]; // 机器人状态,动态先add才能change static uint32_t shoot_line_location[10] = {540, 960, 490, 515, 565}; void My_UI_init() { + while (referee_recv_info->GameRobotState.robot_id == 0) + ; DeterminRobotID(); UIDelete(&referee_recv_info->referee_id, UI_Data_Del_ALL, 0); // 清空UI - // // 绘制发射基准线 + // 绘制发射基准线 Line_Draw(&UI_shoot_line[0], "sl0", UI_Graph_ADD, 7, UI_Color_White, 3, 710, shoot_line_location[0], 1210, shoot_line_location[0]); Line_Draw(&UI_shoot_line[1], "sl1", UI_Graph_ADD, 7, UI_Color_White, 3, shoot_line_location[1], 340, shoot_line_location[1], 740); Line_Draw(&UI_shoot_line[2], "sl2", UI_Graph_ADD, 7, UI_Color_Yellow, 2, 810, shoot_line_location[2], 1110, shoot_line_location[2]); Line_Draw(&UI_shoot_line[3], "sl3", UI_Graph_ADD, 7, UI_Color_Yellow, 2, 810, shoot_line_location[3], 1110, shoot_line_location[3]); Line_Draw(&UI_shoot_line[4], "sl4", UI_Graph_ADD, 7, UI_Color_Yellow, 2, 810, shoot_line_location[4], 1110, shoot_line_location[4]); - UI_ReFresh(&referee_recv_info->referee_id, 5, UI_shoot_line[0], UI_shoot_line[1], UI_shoot_line[2], UI_shoot_line[3], UI_shoot_line[4]); // 绘制车辆状态标志指示 @@ -82,10 +83,6 @@ void My_UI_init() Char_Draw(&UI_State_sta[4], "ss4", UI_Graph_ADD, 8, UI_Color_Pink, 15, 2, 150, 550, "lid:"); Char_ReFresh(&referee_recv_info->referee_id, UI_State_sta[4]); - // 底盘功率显示，静态 - Char_Draw(&UI_State_sta[5], "ss5", UI_Graph_ADD, 8, UI_Color_Green, 18, 2, 720, 210, "Power:"); - Char_ReFresh(&referee_recv_info->referee_id, UI_State_sta[5]); - // 绘制车辆状态标志，动态 // 由于初始化时xxx_last_mode默认为0，所以此处对应UI也应该设为0时对应的UI，防止模式不变的情况下无法置位flag，导致UI无法刷新 Char_Draw(&UI_State_dyn[0], "sd0", UI_Graph_ADD, 8, UI_Color_Main, 15, 2, 270, 750, "zeroforce"); @@ -99,9 +96,18 @@ void My_UI_init() Char_Draw(&UI_State_dyn[4], "sd4", UI_Graph_ADD, 8, UI_Color_Pink, 15, 2, 270, 550, "open "); Char_ReFresh(&referee_recv_info->referee_id, UI_State_dyn[4]); + // 底盘功率显示，静态 + Char_Draw(&UI_State_sta[5], "ss5", UI_Graph_ADD, 7, UI_Color_Green, 18, 2, 620, 230, "Power:"); + Char_ReFresh(&referee_recv_info->referee_id, UI_State_sta[5]); + // 能量条框 + Rectangle_Draw(&UI_Energy[0], "ss6", UI_Graph_ADD, 7, UI_Color_Green, 2, 720, 140, 1220, 180); + UI_ReFresh(&referee_recv_info->referee_id, 1, UI_Energy[0]); + // 底盘功率显示,动态 - Char_Draw(&UI_State_dyn[5], "sd5", UI_Graph_ADD, 8, UI_Color_Green, 18, 2, 840, 210, "0000"); - Char_ReFresh(&referee_recv_info->referee_id, UI_State_dyn[5]); + Float_Draw(&UI_Energy[1], "sd5", UI_Graph_ADD, 8, UI_Color_Green, 18, 2, 2, 750, 230, 24000); + // 能量条初始状态 + Line_Draw(&UI_Energy[2], "sd6", UI_Graph_ADD, 8, UI_Color_Pink, 30, 720, 160, 1020, 160); + UI_ReFresh(&referee_recv_info->referee_id, 2, UI_Energy[1], UI_Energy[2]); } static uint8_t count = 0; @@ -123,6 +129,9 @@ static void robot_mode_change(Referee_Interactive_info_t *_Interactive_data) // _Interactive_data->shoot_mode = SHOOT_ON; _Interactive_data->friction_mode = FRICTION_ON; _Interactive_data->lid_mode = LID_OPEN; + _Interactive_data->Chassis_Power_Data.chassis_power_mx += 3.5; + if (_Interactive_data->Chassis_Power_Data.chassis_power_mx >= 18) + _Interactive_data->Chassis_Power_Data.chassis_power_mx = 0; break; } case 1: @@ -225,7 +234,7 @@ static void My_UI_Refresh(referee_info_t *referee_recv_info, Referee_Interactive Char_ReFresh(&referee_recv_info->referee_id, UI_State_dyn[2]); _Interactive_data->Referee_Interactive_Flag.shoot_flag = 0; } - + // friction if (_Interactive_data->Referee_Interactive_Flag.friction_flag == 1) { switch (_Interactive_data->friction_mode) @@ -244,7 +253,7 @@ static void My_UI_Refresh(referee_info_t *referee_recv_info, Referee_Interactive Char_ReFresh(&referee_recv_info->referee_id, UI_State_dyn[3]); _Interactive_data->Referee_Interactive_Flag.friction_flag = 0; } - + // lid if (_Interactive_data->Referee_Interactive_Flag.lid_flag == 1) { switch (_Interactive_data->lid_mode) @@ -263,6 +272,14 @@ static void My_UI_Refresh(referee_info_t *referee_recv_info, Referee_Interactive Char_ReFresh(&referee_recv_info->referee_id, UI_State_dyn[4]); _Interactive_data->Referee_Interactive_Flag.lid_flag = 0; } + // power + if (_Interactive_data->Referee_Interactive_Flag.Power_flag == 1) + { + Float_Draw(&UI_Energy[1], "sd5", UI_Graph_Change, 8, UI_Color_Green, 18, 2, 2, 750, 230, _Interactive_data->Chassis_Power_Data.chassis_power_mx * 1000); + Line_Draw(&UI_Energy[2], "sd6", UI_Graph_Change, 8, UI_Color_Pink, 30, 720, 160, (uint32_t)750 + _Interactive_data->Chassis_Power_Data.chassis_power_mx * 30, 160); + UI_ReFresh(&referee_recv_info->referee_id, 2, UI_Energy[1], UI_Energy[2]); + _Interactive_data->Referee_Interactive_Flag.Power_flag = 0; + } } /** @@ -302,4 +319,10 @@ static void Mode_Change_Check(Referee_Interactive_info_t *_Interactive_data) _Interactive_data->Referee_Interactive_Flag.lid_flag = 1; _Interactive_data->lid_last_mode = _Interactive_data->lid_mode; } + + if (_Interactive_data->Chassis_Power_Data.chassis_power_mx != _Interactive_data->Chassis_last_Power_Data.chassis_power_mx) + { + _Interactive_data->Referee_Interactive_Flag.Power_flag = 1; + _Interactive_data->Chassis_last_Power_Data.chassis_power_mx = _Interactive_data->Chassis_Power_Data.chassis_power_mx; + } } diff --git a/modules/referee/rm_referee.h b/modules/referee/rm_referee.h index 9db1748..1cf83b2 100644 --- a/modules/referee/rm_referee.h +++ b/modules/referee/rm_referee.h @@ -59,22 +59,20 @@ typedef struct { Referee_Interactive_Flag_t Referee_Interactive_Flag; // 为UI绘制以及交互数据所用 - Robot_Status_e Robot_Status; // 机器人状态 - App_Status_e App_Status; // 应用状态 chassis_mode_e chassis_mode; // 底盘模式 gimbal_mode_e gimbal_mode; // 云台模式 shoot_mode_e shoot_mode; // 发射模式设置 friction_mode_e friction_mode; // 摩擦轮关闭 lid_mode_e lid_mode; // 弹舱盖打开 - loader_mode_e loader_mode; // 单发...连发 Chassis_Power_Data_s Chassis_Power_Data; // 功率控制 // 上一次的模式，用于flag判断 - chassis_mode_e chassis_last_mode; // 底盘模式 - gimbal_mode_e gimbal_last_mode; // 云台模式 - shoot_mode_e shoot_last_mode; // 发射模式设置 - friction_mode_e friction_last_mode; // 摩擦轮关闭 - lid_mode_e lid_last_mode; // 弹舱盖打开 + chassis_mode_e chassis_last_mode; + gimbal_mode_e gimbal_last_mode; + shoot_mode_e shoot_last_mode; + friction_mode_e friction_last_mode; + lid_mode_e lid_last_mode; + Chassis_Power_Data_s Chassis_last_Power_Data; } Referee_Interactive_info_t; From 345dcfa588af4b19935617536c0d9928989c5ded Mon Sep 17 00:00:00 2001 From: NeoZng Date: Thu, 20 Apr 2023 10:42:13 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug,=E6=9B=B4=E6=96=B0r?= =?UTF-8?q?eadme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/referee/referee.md | 39 ++++++++++++++++++++++++++---- modules/referee/referee_task.c | 44 ++++------------------------------ 2 files changed, 38 insertions(+), 45 deletions(-) diff --git a/modules/referee/referee.md b/modules/referee/referee.md index 8417705..395d999 100644 --- a/modules/referee/referee.md +++ b/modules/referee/referee.md @@ -1,8 +1,16 @@ # referee + +## referee运行流程 + +首先在chassis的初始化中调用裁判系统初始化函数，将要绘制的uidata的指针传递给接口，接口会返回裁判系统的反馈数据指针。然后，在refereeUItask里进行UI初始化，确定ui发送的目标并绘制初始化UI。完成后，uitask会以10hz的频率按顺序更新UI。 + + ## 如何绘制你的自定义UI？以绘制超级电容能量条为例： + UI的绘制包含初始化和TASK两个部分，初始化部分在`My_UI_init`函数中，TASK部分在`My_UI_Refresh`函数中。 -## 初始化部分： +### 初始化部分： + 初始化部分的UI主要有两个目的：静态UI的绘制、为动态UI的绘制做准备。 分析超级电容能量条功能可知，此UI包含如下： @@ -15,16 +23,19 @@ Power：xxx Power为静态不变的，冒号后的xxx为变化的量。 绘制矩形方框内的初始能量条、绘制Power的初始值。 ### 绘制字符“Power:”： + 设置绘制用结构体，此处使用数组是因为需要绘制多个字符。本次绘制的字符为“Power:”，只是用到了第6个，即xxx[5]： + ```c static String_Data_t UI_State_sta[6]; // 静态 ``` + 字符格式以及内容设置： + ```c Char_Draw(&UI_State_sta[5], "ss5", UI_Graph_ADD, 7, UI_Color_Green, 18, 2, 620, 230, "Power:"); -``` -各参数意义如下，函数定义中有详细注释： +//各参数意义如下，函数定义中有详细注释： string String_Data类型变量指针，用于存放字符串数据 stringname[3] 字符串名称，用于标识更改 String_Operate 字符串操作，初始化时一般使用"UI_Graph_ADD" @@ -34,38 +45,53 @@ Char_Draw(&UI_State_sta[5], "ss5", UI_Graph_ADD, 7, UI_Color_Green, 18, 2, 620, String_Width 字符串线宽 Start_x、Start_y 开始坐标 *stringdata 字符串数据 -设置完毕后，使用“Char_ReFresh”发送即可： -```c + +//设置完毕后，使用“Char_ReFresh”发送即可： Char_ReFresh(&referee_recv_info->referee_id, UI_State_sta[5]); ``` + + + ### 绘制能量框： + 定义一个图形类结构体，用于绘制能量框： + ```c static Graph_Data_t UI_energy_line[3]; // 电容能量条 ``` + 能量框参数设置以及发送函数： + ```c Rectangle_Draw(&UI_energy_line[0],"ss6", UI_Graph_ADD, 7, UI_Color_Green,20, 720, 220, 820, 240) UI_ReFresh(&referee_recv_info->referee_id, 1,UI_energy_line[0]); ``` ### 绘制power的初始值： + ```c Float_Draw(&UI_Energy[1], "sd5", UI_Graph_ADD, 8, UI_Color_Green, 18, 2, 2, 750, 230, 24000); ``` + ### 绘制能量条的初始值： + ```c Line_Draw(&UI_Energy[2], "sd6", UI_Graph_ADD, 8, UI_Color_Pink, 30, 720, 160, 1020, 160); ``` + 将两个图形打包发送 + ``` UI_ReFresh(&referee_recv_info->referee_id, 2, UI_Energy[1], UI_Energy[2]); ``` ## TASK部分 + task中UI处于动态变化，此时需要检测所画的UI是否发生变化，若发生变化，则刷新对应UI。 ### 添加变化检测: + 绘制功率部分UI，我们需要的是`Chassis_Power_Data_s`中的数据，我们定义`Chassis_Power_Data_s Chassis_Power_Data;`和`Chassis_Power_Data_s Chassis_last_Power_Data;`分别存储此次和上次的对应数据，本次和上次对应检测变化的需求。 + ```c typedef struct { @@ -88,7 +114,9 @@ typedef struct } Referee_Interactive_info_t; ``` + 添加功率变化标志位，`uint32_t Power_flag : 1;`，1为检测到变化，0为未检测到变换 + ``` typedef struct { @@ -121,6 +149,7 @@ static void Mode_Change_Check(Referee_Interactive_info_t *_Interactive_data) } ``` ### 根据功率的变化绘制UI： + 在绘制变化的UI时，由于初始化时已经使用`UI_Graph_ADD`操作添加了UI，所以在绘制时，需要使用`UI_Graph_Change`操作，以便于刷新UI。 同时，完成UI刷新后，需要将对应的flag置0，以便于下次检测变化 diff --git a/modules/referee/referee_task.c b/modules/referee/referee_task.c index 8a1a077..53a104f 100644 --- a/modules/referee/referee_task.c +++ b/modules/referee/referee_task.c @@ -218,57 +218,21 @@ static void My_UI_Refresh(referee_info_t *referee_recv_info, Referee_Interactive // shoot if (_Interactive_data->Referee_Interactive_Flag.shoot_flag == 1) { - switch (_Interactive_data->shoot_mode) - { - case SHOOT_OFF: - { - Char_Draw(&UI_State_dyn[2], "sd2", UI_Graph_Change, 8, UI_Color_Orange, 15, 2, 270, 650, "off"); - break; - } - case SHOOT_ON: - { - Char_Draw(&UI_State_dyn[2], "sd2", UI_Graph_Change, 8, UI_Color_Orange, 15, 2, 270, 650, "on "); - break; - } - } + Char_Draw(&UI_State_dyn[2], "sd2", UI_Graph_Change, 8, UI_Color_Pink, 15, 2, 270, 650, _Interactive_data->shoot_mode == SHOOT_ON ? "on " : "off"); Char_ReFresh(&referee_recv_info->referee_id, UI_State_dyn[2]); _Interactive_data->Referee_Interactive_Flag.shoot_flag = 0; } // friction if (_Interactive_data->Referee_Interactive_Flag.friction_flag == 1) { - switch (_Interactive_data->friction_mode) - { - case FRICTION_OFF: - { - Char_Draw(&UI_State_dyn[3], "sd3", UI_Graph_Change, 8, UI_Color_Pink, 15, 2, 270, 600, "off"); - break; - } - case FRICTION_ON: - { - Char_Draw(&UI_State_dyn[3], "sd3", UI_Graph_Change, 8, UI_Color_Pink, 15, 2, 270, 600, "on "); - break; - } - } + Char_Draw(&UI_State_dyn[3], "sd3", UI_Graph_Change, 8, UI_Color_Pink, 15, 2, 270, 600, _Interactive_data->friction_mode == FRICTION_ON ? "on " : "off"); Char_ReFresh(&referee_recv_info->referee_id, UI_State_dyn[3]); _Interactive_data->Referee_Interactive_Flag.friction_flag = 0; } // lid if (_Interactive_data->Referee_Interactive_Flag.lid_flag == 1) { - switch (_Interactive_data->lid_mode) - { - case LID_CLOSE: - { - Char_Draw(&UI_State_dyn[4], "sd4", UI_Graph_Change, 8, UI_Color_Pink, 15, 2, 270, 550, "close"); - break; - } - case LID_OPEN: - { - Char_Draw(&UI_State_dyn[4], "sd4", UI_Graph_Change, 8, UI_Color_Pink, 15, 2, 270, 550, "open "); - break; - } - } + Char_Draw(&UI_State_dyn[4], "sd4", UI_Graph_Change, 8, UI_Color_Pink, 15, 2, 270, 550, _Interactive_data->lid_mode == LID_OPEN ? "open " : "close"); Char_ReFresh(&referee_recv_info->referee_id, UI_State_dyn[4]); _Interactive_data->Referee_Interactive_Flag.lid_flag = 0; } @@ -316,7 +280,7 @@ static void Mode_Change_Check(Referee_Interactive_info_t *_Interactive_data) if (_Interactive_data->lid_mode != _Interactive_data->lid_last_mode) { - _Interactive_data->Referee_Interactive_Flag.lid_flag = 1; + _Interactive_data->Referee_Interactive_Flag.lid_flag= 1; _Interactive_data->lid_last_mode = _Interactive_data->lid_mode; }