Mr_Fang/Power-Pico
1
0
Fork 0
mirror of https://github.com/No-Chicken/Power-Pico.git synced 2026-04-03 13:02:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

取消全局变量通知更新固件，改为osThreadFlagsWait

Browse Source
This commit is contained in:
不吃油炸鸡
2026-03-25 16:00:47 +08:00
parent 58b3446ef5
commit 26b6bded24
4 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
software/Power_Pico/USB_DEVICE/App/usbd_cdc_if.c
View File

@@ -23,14 +23,8 @@
/* USER CODE BEGIN INCLUDE */ /* USER CODE BEGIN INCLUDE */
/* 全局标志位，供 main.c 检测跳转 */ #include "user_TasksInit.h"
volatile bool g_update_req = false;
bool get_update_request(void) {
return g_update_req;
}
void set_update_request(bool req) {
g_update_req = req;
}
/* USER CODE END INCLUDE */ /* USER CODE END INCLUDE */
/* Private typedef -----------------------------------------------------------*/ /* Private typedef -----------------------------------------------------------*/
@@ -276,7 +270,9 @@ static int8_t CDC_Receive_FS(uint8_t* Buf, uint32_t *Len)
Buf[*Len] = 0; // 截断 Buf[*Len] = 0; // 截断
if (strstr((char*)Buf, "update") != NULL) { if (strstr((char*)Buf, "update") != NULL) {
set_update_request(true); // 置位，主循环看到后执行 JumpToBootloader if (MessageReceiveTaskHandle != NULL) {
osThreadFlagsSet(MessageReceiveTaskHandle, FLAG_USB_UPDATE_REQ);
}
} }
Buf[*Len] = temp_char; // 恢复 (虽然这里可能不需要) Buf[*Len] = temp_char; // 恢复 (虽然这里可能不需要)

3
software/Power_Pico/USB_DEVICE/App/usbd_cdc_if.h
View File

@@ -109,8 +109,7 @@ extern USBD_CDC_ItfTypeDef USBD_Interface_fops_FS;
uint8_t CDC_Transmit_FS(uint8_t* Buf, uint16_t Len); uint8_t CDC_Transmit_FS(uint8_t* Buf, uint16_t Len);
/* USER CODE BEGIN EXPORTED_FUNCTIONS */ /* USER CODE BEGIN EXPORTED_FUNCTIONS */
void set_update_request(bool req);
bool get_update_request(void);
/* USER CODE END EXPORTED_FUNCTIONS */ /* USER CODE END EXPORTED_FUNCTIONS */
/** /**

6
software/Power_Pico/User/Tasks/Inc/user_TasksInit.h
View File

@@ -17,10 +17,12 @@ typedef struct {
// 定义一个标志位，表示 ADC 数据已经准备好，在ADC DMA中断中被置位 // 定义一个标志位，表示 ADC 数据已经准备好，在ADC DMA中断中被置位
// 在 MessageSendTask 中等待这个标志位，表示可以发送 ADC 数据了 // 在 MessageSendTask 中等待这个标志位，表示可以发送 ADC 数据了
#define FLAG_ADC_HALF_READY 0x0001U // 0000 0001 #define FLAG_ADC_HALF_READY 0x0001U // 0000 0001 ADC 半满
#define FLAG_ADC_FULL_READY 0x0002U // 0000 0010 #define FLAG_ADC_FULL_READY 0x0002U // 0000 0010 ADC 全满
#define FLAG_USB_UPDATE_REQ 0x0004U // 0000 0100 USB 请求升级
extern osThreadId_t MessageSendTaskHandle; extern osThreadId_t MessageSendTaskHandle;
extern osThreadId_t MessageReceiveTaskHandle;
extern osMessageQueueId_t Key_MessageQueue; extern osMessageQueueId_t Key_MessageQueue;
extern osMessageQueueId_t PD_cmd_MessageQueue; extern osMessageQueueId_t PD_cmd_MessageQueue;

39
software/Power_Pico/User/Tasks/Src/user_MessageTask.c
View File

@@ -3,7 +3,6 @@
#include "adc.h" #include "adc.h"
#include "user_TasksInit.h" #include "user_TasksInit.h"
#include "user_MessageTask.h" #include "user_MessageTask.h"
#include "usbd_cdc_if.h"
#include "usb_device.h" #include "usb_device.h"
#include "BL24C02.h" #include "BL24C02.h"
@@ -13,6 +12,9 @@
/* Private variables ---------------------------------------------------------*/ /* Private variables ---------------------------------------------------------*/
/* 10kHz / 100 / 10 = 10Hz UI data refresh rate */
#define UI_UPDATE_DIV 10
/* Private function prototypes -----------------------------------------------*/ /* Private function prototypes -----------------------------------------------*/
@@ -23,12 +25,14 @@
*/ */
void MessageReceiveTask(void *argument) void MessageReceiveTask(void *argument)
{ {
uint32_t flags;
while(1) while(1)
{ {
if(get_update_request()) { flags = osThreadFlagsWait(FLAG_USB_UPDATE_REQ,
osFlagsWaitAny,
osWaitForever);
// clear the flag if ((flags & 0x80000000U) == 0U) {
set_update_request(false);
// set the EEPROM flag // set the EEPROM flag
EEPROM_UpdateCommand_Write(true); EEPROM_UpdateCommand_Write(true);
HAL_Delay(100); HAL_Delay(100);
@@ -38,7 +42,7 @@ void MessageReceiveTask(void *argument)
// reset // reset
NVIC_SystemReset(); NVIC_SystemReset();
} }
osDelay(500); HAL_Delay(500);
} }
} }
@@ -49,6 +53,7 @@ void MessageReceiveTask(void *argument)
void MessageSendTask(void *argument) void MessageSendTask(void *argument)
{ {
uint32_t flags; uint32_t flags;
uint32_t ui_div_cnt = 0;
while (1) while (1)
{ {
// 1. 等待两个标志中的任意一个 (osFlagsWaitAny) // 1. 等待两个标志中的任意一个 (osFlagsWaitAny)
@@ -72,19 +77,21 @@ void MessageSendTask(void *argument)
Process_ADC_Chunk(&adc_raw_buffer[ADC_TIMES][0], 1); Process_ADC_Chunk(&adc_raw_buffer[ADC_TIMES][0], 1);
} }
// 发送数据给UI层进行显示 // 4. 限频：每 UI_UPDATE_DIV 次才往队列写一次
PowerData_t newData; if (++ui_div_cnt >= UI_UPDATE_DIV)
Data_Monitor_Get_Values(&newData.voltage, &newData.current); {
ui_div_cnt = 0;
// 尝试发送，如果不等待直接返回错误，说明队列可能满了 PowerData_t newData;
osStatus_t status = osMessageQueuePut(PowerDataQueue, &newData, 0, 0); Data_Monitor_Get_Values(&newData.voltage, &newData.current);
if (status == osErrorResource) { osStatus_t status = osMessageQueuePut(PowerDataQueue, &newData, 0, 0);
PowerData_t dummy; if (status == osErrorResource) {
// 1. 强行从队列头部取出一个旧数据（丢弃） PowerData_t dummy;
osMessageQueueGet(PowerDataQueue, &dummy, NULL, 0); // 队列满：丢弃旧数据，写入新数据
// 2. 再次存入新数据 osMessageQueueGet(PowerDataQueue, &dummy, NULL, 0);
osMessageQueuePut(PowerDataQueue, &newData, 0, 0); osMessageQueuePut(PowerDataQueue, &newData, 0, 0);
}
} }
} }
} }