|
|
@@ -64,10 +64,10 @@ int Read_Heat_Current(void);
|
|
|
|
|
|
// 定义滑动平均滤波器结构体
|
|
|
typedef struct {
|
|
|
- float* buffer;
|
|
|
+ rt_uint16_t* buffer;
|
|
|
int bufferSize;
|
|
|
int currentIndex;
|
|
|
- float sum;
|
|
|
+ rt_uint16_t sum;
|
|
|
} MovingAverageFilter;
|
|
|
|
|
|
// 初始化滑动平均滤波器
|
|
|
@@ -77,7 +77,7 @@ MovingAverageFilter* moving_average_filter_init(int size) {
|
|
|
return NULL;
|
|
|
}
|
|
|
|
|
|
- filter->buffer = (float*)calloc(size, sizeof(float));
|
|
|
+ filter->buffer = (rt_uint16_t*)calloc(size, sizeof(rt_uint16_t));
|
|
|
if (filter->buffer == NULL) {
|
|
|
free(filter);
|
|
|
return NULL;
|
|
|
@@ -91,7 +91,7 @@ MovingAverageFilter* moving_average_filter_init(int size) {
|
|
|
}
|
|
|
|
|
|
// 更新滑动平均滤波器
|
|
|
-float moving_average_filter_update(MovingAverageFilter* filter, float newValue) {
|
|
|
+rt_uint16_t moving_average_filter_update(MovingAverageFilter* filter, rt_uint16_t newValue) {
|
|
|
filter->sum -= filter->buffer[filter->currentIndex];
|
|
|
filter->buffer[filter->currentIndex] = newValue;
|
|
|
filter->sum += newValue;
|
|
|
@@ -108,40 +108,6 @@ void moving_average_filter_free(MovingAverageFilter* filter) {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
-/*串口初始化*/
|
|
|
-int UART_485_INIT(void)
|
|
|
-{
|
|
|
- serial_485 = rt_device_find(UART_485);
|
|
|
- /*修改串口配置参数*/
|
|
|
- uart_config_485.baud_rate = BAUD_RATE_9600; //修改波特率9600
|
|
|
- uart_config_485.data_bits = DATA_BITS_8; //数据位8
|
|
|
- uart_config_485.stop_bits = STOP_BITS_1; //停止位1
|
|
|
- #ifdef RT_USING_SERIAL_V2
|
|
|
- uart_config_485.rx_bufsz = 128;
|
|
|
- uart_config_485.tx_bufsz = 128;
|
|
|
- #else
|
|
|
- uart_config_485.bufsz = 128; //缓冲区128bytes
|
|
|
- #endif
|
|
|
- uart_config_485.parity = PARITY_NONE; //奇校验
|
|
|
- /* step3:控制串口设备。通过控制接口传入命令控制字,与控制参数 */
|
|
|
- rt_device_control(serial_485, RT_DEVICE_CTRL_CONFIG, &uart_config_485);
|
|
|
- /* step4:打开串口设备。以DMA接收及轮询发送模式打开串口设备 */
|
|
|
-
|
|
|
- #ifdef RT_USING_SERIAL_V2
|
|
|
- rt_err_t uart_res = rt_device_open(serial_485, RT_DEVICE_FLAG_RX_NON_BLOCKING | RT_DEVICE_FLAG_TX_BLOCKING); // 串口设备使用模式为 (发送阻塞 接收非阻塞) 模式
|
|
|
- #else
|
|
|
- rt_err_t uart_res = rt_device_open(serial_485, RT_DEVICE_FLAG_INT_RX);; //RT_DEVICE_FLAG_DMA_RX
|
|
|
- #endif
|
|
|
- if(uart_res!=RT_EOK)
|
|
|
- {
|
|
|
- LOG_E("%s打开失败!",UART_485);
|
|
|
- }else{
|
|
|
- LOG_I("%s Open Success!",UART_485);
|
|
|
- }
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
/* 入口函数 */
|
|
|
static void sht30_collect_thread_entry(void *parameter)
|
|
|
{
|
|
|
@@ -253,15 +219,14 @@ int Read_Real_Current(void)
|
|
|
}
|
|
|
HAL_ADCEx_Calibration_Start(adc_dev->parent.user_data);
|
|
|
rt_adc_enable(adc_dev, ADC_DEV_CHANNLE_1);
|
|
|
- rt_adc_enable(adc_dev, 17);
|
|
|
adc1_value = rt_adc_read(adc_dev, ADC_DEV_CHANNLE_1);
|
|
|
- in_adc_17 = rt_adc_read(adc_dev, 17);
|
|
|
/* 关闭通道 */
|
|
|
rt_adc_disable(adc_dev, ADC_DEV_CHANNLE_1);
|
|
|
- //LOG_D("Read_Real_Current:%d,%d",adc1_value,adc1_value * REFER_VOLTAGE/CONVERT_BITS*15);
|
|
|
#if PCB_V1 == 0
|
|
|
- return (adc0_value * REFER_VOLTAGE/CONVERT_BITS*12)+20;
|
|
|
+ return (adc1_value * REFER_VOLTAGE/CONVERT_BITS*15);
|
|
|
#else
|
|
|
+ rt_adc_enable(adc_dev, 17);
|
|
|
+ in_adc_17 = rt_adc_read(adc_dev, 17);
|
|
|
return (ADC_VOL_BASE * (adc1_value*1.0)/(in_adc_17*1.0))*100000;
|
|
|
#endif
|
|
|
}
|