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

修改ADC数据发送与处理，通知外部的高优先任务处理

Browse Source
This commit is contained in:
不吃油炸鸡
2026-03-15 11:20:39 +08:00
parent a700af365e
commit 94b79163ec
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
software/Power_Pico/Core/Inc/adc.h
View File

@@ -107,6 +107,7 @@ void MX_ADC1_Init(void);
/* USER CODE BEGIN Prototypes */
void Process_ADC_Chunk(uint16_t *chunk_ptr, uint8_t packet_idx);
void Data_Monitor_Get_Values(float *out_vol_v, float *out_cur_ua);
void Data_Monitor_Clear(void);

15
software/Power_Pico/Core/Src/adc.c
View File

@@ -26,6 +26,7 @@
#include "usb_device.h"
#include "usbd_cdc_if.h"
#include "gate.h"
#include "user_TasksInit.h"
// DMA 双缓冲原始数据 [200行][5列]
uint16_t adc_raw_buffer[ADC_TIMES * 2][ADC_CHANNELS];
@@ -304,7 +305,7 @@ void Data_Monitor_Clear(void)
}
// 处理 ADC 数据块的核心函数，负责数据选择、切换决策和USB发送
static void Process_ADC_Chunk(uint16_t *chunk_ptr, uint8_t packet_idx)
void Process_ADC_Chunk(uint16_t *chunk_ptr, uint8_t packet_idx)
{
USB_ADC_Packet_t *pkg = &usb_packet_buffer[packet_idx];
@@ -427,8 +428,10 @@ static void Process_ADC_Chunk(uint16_t *chunk_ptr, uint8_t packet_idx)
low_underload_cnt = 0;
}
// USB 发送 (非阻塞)
CDC_Transmit_FS((uint8_t*)pkg, sizeof(USB_ADC_Packet_t));
// USB 发送前，检查设备状态是否为 CONFIGURED
if (USER_USB_is_Configured()) {
CDC_Transmit_FS((uint8_t*)pkg, sizeof(USB_ADC_Packet_t));
}
//
monitor_chunk_counter++;
@@ -445,14 +448,16 @@ void HAL_ADC_ConvHalfCpltCallback(ADC_HandleTypeDef* hadc)
{
// 处理前半段 (Buffer 行 0 ~ 99)
// 传入 &adc_raw_buffer[0][0]
Process_ADC_Chunk(&adc_raw_buffer[0][0], 0);
// Process_ADC_Chunk(&adc_raw_buffer[0][0], 0);
osThreadFlagsSet(MessageSendTaskHandle, FLAG_ADC_HALF_READY); // 交给task中进行处理
}
void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef* hadc)
{
// 处理后半段 (Buffer 行 100 ~ 199)
// 传入 &adc_raw_buffer[ADC_TIMES][0]
Process_ADC_Chunk(&adc_raw_buffer[ADC_TIMES][0], 1);
// Process_ADC_Chunk(&adc_raw_buffer[ADC_TIMES][0], 1);
osThreadFlagsSet(MessageSendTaskHandle, FLAG_ADC_FULL_READY); // 交给task中进行处理
}
/* USER CODE END 1 */