From ea6d12ca1108b75fa4e0a57b8fd2064be15f4c15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B7=E5=BA=8A=E5=B0=B1=E7=8A=AF=E5=9B=B0?=
<11730503+psx123456@user.noreply.gitee.com>
Date: Mon, 14 Oct 2024 10:39:02 +0800
Subject: [PATCH] =?UTF-8?q?adc+tim+dma=E9=87=87=E9=9B=86=E6=9C=89=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.cproject | 7 +-
.settings/language.settings.xml | 2 +-
App/inc/collect_Conversion.h | 2 +-
App/src/collect_Conversion.c | 158 +-
App/src/mppt_control.c | 4 +-
App/src/task.c | 8 +-
Drivers/RingQueue/ring_queue.c | 4 +
Drivers/RingQueue/ring_queue.h | 3 -
Drivers/RingQueue2/ring_queue2.c | 91 +
Drivers/RingQueue2/ring_queue2.h | 43 +
Hardware/inc/adc.h | 26 +-
Hardware/src/adc.c | 57 +-
obj/App/src/collect_Conversion.d | 7 +-
obj/App/src/collect_Conversion.o | Bin 47280 -> 40888 bytes
obj/App/src/mppt_control.d | 8 +-
obj/App/src/mppt_control.o | Bin 73376 -> 73136 bytes
obj/App/src/subdir.mk | 2 +-
obj/App/src/task.d | 7 +-
obj/App/src/task.o | Bin 103640 -> 104320 bytes
obj/App/src/uart_dev.o | Bin 44100 -> 44100 bytes
obj/Core/subdir.mk | 2 +-
obj/Debug/subdir.mk | 2 +-
obj/Drivers/RingQueue/ring_queue.o | Bin 18136 -> 18136 bytes
obj/Drivers/RingQueue/subdir.mk | 2 +-
obj/Drivers/RingQueue2/ring_queue2.d | 4 +
obj/Drivers/RingQueue2/ring_queue2.o | Bin 0 -> 18400 bytes
obj/Drivers/RingQueue2/subdir.mk | 21 +
obj/Drivers/TimeSliceOffset/subdir.mk | 2 +-
obj/Hardware/src/adc.d | 5 +-
obj/Hardware/src/adc.o | Bin 53852 -> 57896 bytes
obj/Hardware/src/rs485.o | Bin 40840 -> 40840 bytes
obj/Hardware/src/subdir.mk | 2 +-
obj/Peripheral/src/subdir.mk | 2 +-
obj/User/subdir.mk | 2 +-
obj/makefile | 1 +
obj/mppt_Nos_V0.4.bin | Bin 23812 -> 23992 bytes
obj/mppt_Nos_V0.4.elf | Bin 365364 -> 370092 bytes
obj/mppt_Nos_V0.4.hex | 2327 ++---
obj/mppt_Nos_V0.4.lst | 12590 ++++++++++++------------
obj/mppt_Nos_V0.4.map | 1086 +-
obj/sources.mk | 1 +
41 files changed, 8406 insertions(+), 8072 deletions(-)
create mode 100644 Drivers/RingQueue2/ring_queue2.c
create mode 100644 Drivers/RingQueue2/ring_queue2.h
create mode 100644 obj/Drivers/RingQueue2/ring_queue2.d
create mode 100644 obj/Drivers/RingQueue2/ring_queue2.o
create mode 100644 obj/Drivers/RingQueue2/subdir.mk
diff --git a/.cproject b/.cproject
index f5042a1..9f226e3 100644
--- a/.cproject
+++ b/.cproject
@@ -69,8 +69,9 @@
-
+
+
@@ -123,9 +124,10 @@
-
+
+
@@ -150,4 +152,5 @@
+
diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index b8e2615..fca74d6 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/App/inc/collect_Conversion.h b/App/inc/collect_Conversion.h
index 1f6f133..2ae8165 100644
--- a/App/inc/collect_Conversion.h
+++ b/App/inc/collect_Conversion.h
@@ -17,6 +17,6 @@ float get_DSG_CURR(void);
float get_PV_VOLT_IN(void);
float get_SYS_VOLT_IN(void);
float get_MOSFET_Temper(void);
-float get_PV2_VOLT_IN(void);
+//float get_PV2_VOLT_IN(void);
#endif /* APP_INC_COLLECT_CONVERSION_H_ */
diff --git a/App/src/collect_Conversion.c b/App/src/collect_Conversion.c
index 4995108..8631418 100644
--- a/App/src/collect_Conversion.c
+++ b/App/src/collect_Conversion.c
@@ -141,6 +141,7 @@ static uint16_t get_adc(uint8_t ADC_Channel);
static uint16_t get_aftercalculationAdc(uint8_t ADC_Channel);
static uint16_t middleAverageFilter(uint8_t ADC_Channel);
static uint16_t get_adcDmaTim_middleAverageFilter(uint8_t ADC_Channel);
+static uint16_t Get_ConversionVal(int16_t val);
/**
* @brief 获取计算后的adc的值
@@ -169,58 +170,68 @@ uint16_t get_aftercalculationAdc1(uint8_t ADC_Channel)
*/
uint16_t get_adcDmaTim_middleAverageFilter(uint8_t ADC_Channel)
{
- uint16_t i,j,k;
- uint16_t temp,sum = 0;
- uint16_t value_buf[g_adcData.num];
-
if (ADC_Channel == CHG_CURR) {
- for(i = 0; i < g_adcData.num; ++i) {
- value_buf[i] = g_adcData.CHG_CURR_array[i];
- }
-// } else if (ADC_Channel == PV_VOLT_OUT) {
-// for(i = 0; i < g_adcData.num; ++i) {
-// value_buf[i] = g_adcData.PV_VOLT_OUT_array[i];
-// }
- } else if (ADC_Channel == DSG_CURR) {
- for(i = 0; i < g_adcData.num; ++i) {
- value_buf[i] = g_adcData.DSG_CURR_array[i];
- }
-// } else if (ADC_Channel == PV_VOLT_IN) {
-// for(i = 0; i < g_adcData.num; ++i) {
-// value_buf[i] = g_adcData.PV_VOLT_IN_array[i];
-// }
-// } else if (ADC_Channel == SYS_VOLT_IN) {
-// for(i = 0; i < g_adcData.num; ++i) {
-// value_buf[i] = g_adcData.SYS_VOLT_IN_array[i];
-// }
-// } else if (ADC_Channel == MOSFET_Temper) {
-// for(i = 0; i < g_adcData.num; ++i) {
-// value_buf[i] = g_adcData.MOSFET_Temper_array[i];
-// }
- } else {
- return 0;
+ return Get_ConversionVal(g_adcData.total_CHG_CURR / adcBuffSize);
}
- /*从小到大冒泡排序*/
- for(j = 0; j < g_adcData.num-1; ++j)
- {
- for(k = 0; k < g_adcData.num-j-1; ++k)
- {
- if(value_buf[k] > value_buf[k+1])
- {
- temp = value_buf[k];
- value_buf[k] = value_buf[k+1];
- value_buf[k+1] = temp;
- }
- }
+ if (ADC_Channel == DSG_CURR) {
+ return Get_ConversionVal(g_adcData.total_DSG_CURR / adcBuffSize);
}
- for(i = 2; i < g_adcData.num - 2; ++i)
- {
- sum += value_buf[i];
- }
+ return 0;
- return sum / (g_adcData.num - 4);
+// uint16_t i,j,k;
+// uint16_t temp,sum = 0;
+// uint16_t value_buf[g_adcData.num];
+//
+// if (ADC_Channel == CHG_CURR) {
+// for(i = 0; i < g_adcData.num; ++i) {
+// value_buf[i] = g_adcData.CHG_CURR_array[i];
+// }
+//// } else if (ADC_Channel == PV_VOLT_OUT) {
+//// for(i = 0; i < g_adcData.num; ++i) {
+//// value_buf[i] = g_adcData.PV_VOLT_OUT_array[i];
+//// }
+// } else if (ADC_Channel == DSG_CURR) {
+// for(i = 0; i < g_adcData.num; ++i) {
+// value_buf[i] = g_adcData.DSG_CURR_array[i];
+// }
+//// } else if (ADC_Channel == PV_VOLT_IN) {
+//// for(i = 0; i < g_adcData.num; ++i) {
+//// value_buf[i] = g_adcData.PV_VOLT_IN_array[i];
+//// }
+//// } else if (ADC_Channel == SYS_VOLT_IN) {
+//// for(i = 0; i < g_adcData.num; ++i) {
+//// value_buf[i] = g_adcData.SYS_VOLT_IN_array[i];
+//// }
+//// } else if (ADC_Channel == MOSFET_Temper) {
+//// for(i = 0; i < g_adcData.num; ++i) {
+//// value_buf[i] = g_adcData.MOSFET_Temper_array[i];
+//// }
+// } else {
+// return 0;
+// }
+//
+// /*从小到大冒泡排序*/
+// for(j = 0; j < g_adcData.num-1; ++j)
+// {
+// for(k = 0; k < g_adcData.num-j-1; ++k)
+// {
+// if(value_buf[k] > value_buf[k+1])
+// {
+// temp = value_buf[k];
+// value_buf[k] = value_buf[k+1];
+// value_buf[k+1] = temp;
+// }
+// }
+// }
+//
+// for(i = 2; i < g_adcData.num - 2; ++i)
+// {
+// sum += value_buf[i];
+// }
+//
+// return sum / (g_adcData.num - 4);
}
@@ -302,6 +313,7 @@ float get_CHG_CURR(void)
// I_ADC = Get_ConversionVal(get_adc(CHG_CURR));
I_ADC = get_aftercalculationAdc(CHG_CURR);
+
// I_ADC = g_adcData.total_CHG_CURR / g_adcData.num;
// I_ADC = get_adc(CHG_CURR);
@@ -328,8 +340,8 @@ float get_PV_VOLT_OUT(void)
uint16_t V_ADC;
// V_ADC = Get_ConversionVal(get_adc(PV_VOLT_OUT));
-// V_ADC = get_aftercalculationAdc1(PV_VOLT_OUT);
- V_ADC = get_aftercalculationAdc(PV_VOLT_OUT);
+ V_ADC = get_aftercalculationAdc1(PV_VOLT_OUT);
+// V_ADC = get_aftercalculationAdc(PV_VOLT_OUT);
// V_ADC = g_adcData.total_PV_VOLT_OUT / g_adcData.num;
// V_ADC = get_adc(PV_VOLT_OUT);
@@ -477,31 +489,31 @@ float get_MOSFET_Temper(void)
return T;
}
-/**
- * @brief 得到光伏2开路电压
- * @param
- * @retval V 电压值
- */
-float get_PV2_VOLT_IN(void)
-{
- float V;
- uint16_t V_ADC;
-
-// GPIO_WriteBit(G_FFMOS_CON2_GPIO, G_FFMOS_CON2_PIN, SET);
-// V_ADC = Get_ConversionVal(get_adc(PV2_VOLT_IN));
- V_ADC = get_aftercalculationAdc(PV2_VOLT_IN);
-// V_ADC = get_adc(PV2_VOLT_IN);
-// GPIO_WriteBit(G_FFMOS_CON2_GPIO, G_FFMOS_CON2_PIN, RESET);
-
- V = (float)(V_ADC) * P_PV2_VOLT_IN;
-
-#ifdef enable_Printf_VI
- printf("\n PV2_VOLT_IN ADC : %d \n", V_ADC);
- printf(" PV2_VOLT_IN V : %d /100 \n", (int)(V * 100));
-#endif
-
- return V;
-}
+///**
+// * @brief 得到光伏2开路电压
+// * @param
+// * @retval V 电压值
+// */
+//float get_PV2_VOLT_IN(void)
+//{
+// float V;
+// uint16_t V_ADC;
+//
+//// GPIO_WriteBit(G_FFMOS_CON2_GPIO, G_FFMOS_CON2_PIN, SET);
+//// V_ADC = Get_ConversionVal(get_adc(PV2_VOLT_IN));
+//// V_ADC = get_aftercalculationAdc(PV2_VOLT_IN);
+//// V_ADC = get_adc(PV2_VOLT_IN);
+//// GPIO_WriteBit(G_FFMOS_CON2_GPIO, G_FFMOS_CON2_PIN, RESET);
+//
+// V = (float)(V_ADC) * P_PV2_VOLT_IN;
+//
+//#ifdef enable_Printf_VI
+// printf("\n PV2_VOLT_IN ADC : %d \n", V_ADC);
+// printf(" PV2_VOLT_IN V : %d /100 \n", (int)(V * 100));
+//#endif
+//
+// return V;
+//}
diff --git a/App/src/mppt_control.c b/App/src/mppt_control.c
index a57966d..e851490 100644
--- a/App/src/mppt_control.c
+++ b/App/src/mppt_control.c
@@ -822,7 +822,7 @@ void test(void)
// printf("Discharg_Current = %d/1000 \n", (int)(g_Mppt_Para.Discharg_Current * 1000));
// printf("\n\n\n");
- printf("%d\n", g_adcData.num);
+// printf("%d\n", g_adcData.num);
printf("%d\n", (int)(g_Mppt_Para.Charg_Current * 1000));
printf("%d\n", (int)(g_Mppt_Para.Output_Voltage * 1000));
printf("%d\r\n", (int)(g_Mppt_Para.Discharg_Current * 1000));
@@ -831,7 +831,7 @@ void test(void)
// printf("get_PV_VOLT_IN1 = %d/1000 \n", (int)(get_PV_VOLT_IN1() * 1000));
// printf("HighSideMos_Temperature = %d/1000 \n", (int)(g_Mppt_Para.HighSideMos_Temperature * 1000));
- g_adcData.num = 0;
+// g_adcData.num = 0;
//// mppt_readjust();
//// Get_OutputPower();
diff --git a/App/src/task.c b/App/src/task.c
index fd8a963..7d90a24 100644
--- a/App/src/task.c
+++ b/App/src/task.c
@@ -816,9 +816,6 @@ void task_Init(void)
// TimeSliceOffset_Register(&m_startMpptControl, Task_startMpptControl
// , startMpptControl_reloadVal, startMpptControl_offset);
-
- ADC_TIM_DMA_Init();
-
TimeSliceOffset_Start(); /* 启动时间片轮询 */
}
@@ -841,14 +838,15 @@ void hardware_Init(void)
POW_OUT_CON_Init();
DSG_PROT_Init();
WORK_VOLT_INT_Init();
+ ADC_TIM_DMA_Init();
// EnPowerSupply_Init();
// Set_duty_ratio(&g_duty_ratio);
// uart_dev_write(g_bat485_uart3_handle, " hello world \n", sizeof(" hello world \n"));
-// TIM3_Init(10000);
-// TIM_Cmd(TIM3, ENABLE); //TIM3使能
+ TIM3_Init(300);
+ TIM_Cmd(TIM3, ENABLE); //TIM3使能
g_duty_ratio = 0.8;
Set_duty_ratio(&g_duty_ratio);
diff --git a/Drivers/RingQueue/ring_queue.c b/Drivers/RingQueue/ring_queue.c
index dfbbff6..6c3c57c 100644
--- a/Drivers/RingQueue/ring_queue.c
+++ b/Drivers/RingQueue/ring_queue.c
@@ -19,6 +19,10 @@
//void rq_debug(const char *fmt, ...){};
//#endif
+#define RQ_OK 1
+#define RQ_ERROR 0
+#define RQ_OVERFLOW -2
+
//初始化队列
int InitRingQueue(RingQueue *q, RQ_ElementType *buff, int size)
{
diff --git a/Drivers/RingQueue/ring_queue.h b/Drivers/RingQueue/ring_queue.h
index 2c30210..7f275b0 100644
--- a/Drivers/RingQueue/ring_queue.h
+++ b/Drivers/RingQueue/ring_queue.h
@@ -11,9 +11,6 @@
//#define RING_QUEUE_DEBUG //定义本宏会打印RingQueue的调试信息
-#define RQ_OK 1
-#define RQ_ERROR 0
-#define RQ_OVERFLOW -2
typedef unsigned char RQ_ElementType;//元素类型
typedef struct _ring_queue
diff --git a/Drivers/RingQueue2/ring_queue2.c b/Drivers/RingQueue2/ring_queue2.c
new file mode 100644
index 0000000..e0df57c
--- /dev/null
+++ b/Drivers/RingQueue2/ring_queue2.c
@@ -0,0 +1,91 @@
+/*
+ * ring_queue.c
+ *
+ * Created on: 2024年6月21日
+ * Author: psx
+ */
+
+
+//循环队列
+#include
+#include
+#include "ring_queue2.h"
+
+
+#define RQ_OK 1
+#define RQ_ERROR 0
+#define RQ_OVERFLOW -2
+//#define RING_QUEUE_DEBUG
+
+//#ifdef RING_QUEUE_DEBUG
+//#define //rq_debug term_printf
+//#else
+//void rq_debug(const char *fmt, ...){};
+//#endif
+
+//初始化队列
+int InitRingQueue2(RingQueue2 *q, RQ_ElementType2 *buff, int size)
+{
+ q->elems = buff;
+ q->size = size;
+ q->front=q->rear=0;
+ return RQ_OK;
+}
+
+//遍历队列,
+//消费者使用，故对生产者可能修改的rear先读取缓存
+int ShowRingQueue2(RingQueue2 *q)
+{
+ //int i;
+ int rear = q->rear;
+
+ if(q->front == rear)
+ {
+ //rq_debug("队列为空\n");
+ return RQ_ERROR;
+ }
+ //rq_debug("队列中的元素为:\n");
+ //for(i=((q->front)%q->size); i != rear; i=((i+1)%q->size))
+ //rq_debug(" %c\n",q->elems[i]);
+
+ //rq_debug("\n");
+ //rq_debug("队首元素为%c\n",q->elems[q->front]);
+ //rq_debug("队尾元素为%c\n",q->elems[rear - 1]);
+ return RQ_OK;
+}
+
+//向队尾插入元素e
+int InRingQueue2(RingQueue2 *q,RQ_ElementType2 e)
+{
+ if(RingQueueFull2(q))
+ {
+ //rq_debug("空间不足\n");
+ return(RQ_OVERFLOW);
+ }
+ q->elems[q->rear] = e;
+ q->rear = (q->rear+1) % q->size;
+ //rq_debug("rear = %d\n",q->rear);
+ return RQ_OK;
+}
+
+//从队首取回并删除元素
+int OutRingQueue2(RingQueue2 *q, RQ_ElementType2 *e)
+{
+ if(RingQueueEmpty2(q))
+ {
+ //rq_debug("队列为空\n");
+ return RQ_ERROR;
+ }
+ *e = q->elems[q->front];
+ //rq_debug("被删除的队首元素为%c\n",q->elems[q->front]);
+ q->front = (q->front+1) % q->size;
+ return RQ_OK;
+}
+
+//队列中的元素个数
+int RingQueueLength2(RingQueue2 *q)
+{
+ return ((q->rear - q->front) + q->size) % q->size;
+}
+
+
diff --git a/Drivers/RingQueue2/ring_queue2.h b/Drivers/RingQueue2/ring_queue2.h
new file mode 100644
index 0000000..c5af685
--- /dev/null
+++ b/Drivers/RingQueue2/ring_queue2.h
@@ -0,0 +1,43 @@
+/*
+ * ring_queue.h
+ *
+ * Created on: 2024年6月21日
+ * Author: psx
+ */
+
+#ifndef DRIVERS_RINGQUEUE_RING_QUEUE2_H_
+#define DRIVERS_RINGQUEUE_RING_QUEUE2_H_
+
+
+//#define RING_QUEUE_DEBUG //定义本宏会打印RingQueue的调试信息
+
+typedef uint16_t RQ_ElementType2;//元素类型
+
+typedef struct _ring_queue2
+{
+ RQ_ElementType2 *elems;
+ int size;
+ volatile int front, rear;
+}RingQueue2;
+
+//初始化队列,需传入保存队列状态的结构q，队列使用的buffer和buffer大小
+int InitRingQueue2(RingQueue2 *q, RQ_ElementType2 *buff, int size);
+
+#define RingQueueFull2(q) (((q)->rear+1) % (q)->size == (q)->front)
+#define RingQueueEmpty2(q) ((q)->front == (q)->rear)
+
+//遍历队列,
+//消费者使用，故对生产者可能修改的rear先读取缓存
+int ShowRingQueue2(RingQueue2 *q);
+
+//向队尾插入元素e
+int InRingQueue2(RingQueue2 *q,RQ_ElementType2 e);
+
+//从队首删除元素
+int OutRingQueue2(RingQueue2 *q, RQ_ElementType2 *e);
+
+//队列中的元素个数
+int RingQueueLength2(RingQueue2 *q);
+
+
+#endif /* DRIVERS_RINGQUEUE_RING_QUEUE_H_ */
diff --git a/Hardware/inc/adc.h b/Hardware/inc/adc.h
index 52b2f80..d6c3d6b 100644
--- a/Hardware/inc/adc.h
+++ b/Hardware/inc/adc.h
@@ -2,6 +2,7 @@
#define __ADC_H
#include "ch32l103.h"
+#include "ring_queue2.h"
//typedef struct _ADC_DATA {
// uint16_t total_CHG_CURR; /* 一个控制周期中，adc采集的值之和 充电电流 */
@@ -18,23 +19,26 @@
// uint16_t num_MOSFET_Temper;
//}ADC_DATA;
-#define data_len 50
-
-typedef struct _ADC_DATA {
- uint16_t num; /* 一个控制周期中，adc采集次数 */
- uint16_t CHG_CURR_array[data_len]; /* 充电电流 */
- uint16_t PV_VOLT_OUT_array[data_len]; /* 输出电压 */
- uint16_t DSG_CURR_array[data_len]; /* 放电电流 */
- uint16_t PV_VOLT_IN_array[data_len]; /* 太阳能板输出电压 */
- uint16_t SYS_VOLT_IN_array[data_len]; /* 系统输入电压 */
- uint16_t MOSFET_Temper_array[data_len]; /* mos管温度 */
-}ADC_DATA;
+//#define data_len 50
//typedef struct _ADC_DATA {
// uint16_t num; /* 一个控制周期中，adc采集次数 */
// uint16_t CHG_CURR_array[data_len]; /* 充电电流 */
+// uint16_t PV_VOLT_OUT_array[data_len]; /* 输出电压 */
// uint16_t DSG_CURR_array[data_len]; /* 放电电流 */
+// uint16_t PV_VOLT_IN_array[data_len]; /* 太阳能板输出电压 */
+// uint16_t SYS_VOLT_IN_array[data_len]; /* 系统输入电压 */
+// uint16_t MOSFET_Temper_array[data_len]; /* mos管温度 */
//}ADC_DATA;
+#define adcBuffSize 100
+
+typedef struct _ADC_DATA {
+ RingQueue2 RQCHG_CURR;
+ uint32_t total_CHG_CURR; /* 充电电流一段时间中adc值的和 */
+ RingQueue2 RQDSG_CURR;
+ uint32_t total_DSG_CURR; /* 放电电流一段时间中adc值的和 */
+}ADC_DATA;
+
extern ADC_DATA g_adcData;
extern int16_t Calibrattion_Val;
diff --git a/Hardware/src/adc.c b/Hardware/src/adc.c
index 1141ab0..2336fb9 100644
--- a/Hardware/src/adc.c
+++ b/Hardware/src/adc.c
@@ -136,15 +136,35 @@ void TIM1_Init1(u16 arr,u16 psc)
#define MOSFET_Temper ADC_Channel_6
#define PV2_VOLT_IN ADC_Channel_7
+static uint16_t CHG_CURR_buff[adcBuffSize];
+static uint16_t DSG_CURR_buff[adcBuffSize];
+
/*
* 通过定时器和DMA完成adc的采集
* 定时器采用定时器1的cc1完成ADC的外部触发 PA8 --> TIM1_CH1
* ADC通过DMA的通道1完成数据的传输
*
* */
-volatile uint16_t ADC_ConvertedValue[3]; //ADC采样的数据
+volatile uint16_t ADC_ConvertedValue[2]; //ADC采样的数据
void ADC_TIM_DMA_Init(void)
{
+ InitRingQueue2(&g_adcData.RQCHG_CURR, CHG_CURR_buff, adcBuffSize);
+ InitRingQueue2(&g_adcData.RQDSG_CURR, DSG_CURR_buff, adcBuffSize);
+ for (int var = 0; var < adcBuffSize; ++var) {
+ InRingQueue2(&g_adcData.RQCHG_CURR, 0);
+ InRingQueue2(&g_adcData.RQDSG_CURR, 0);
+ }
+// while (RingQueueLength2(&g_adcData.RQCHG_CURR) != adcBuffSize) {
+// InRingQueue2(&g_adcData.RQCHG_CURR, 0);
+// };
+ g_adcData.total_CHG_CURR = 0;
+
+// while (RingQueueLength2(&g_adcData.RQDSG_CURR) != adcBuffSize) {
+// InRingQueue2(&g_adcData.RQDSG_CURR, 0);
+// };
+ g_adcData.total_DSG_CURR = 0;
+
+
ADC_InitTypeDef ADC_InitStructure = {0};
GPIO_InitTypeDef GPIO_InitStructure = {0};
@@ -155,7 +175,7 @@ void ADC_TIM_DMA_Init(void)
// GPIO_InitStructure.GPIO_Pin = GPIO_Pin_1|GPIO_Pin_2|GPIO_Pin_3|GPIO_Pin_4|GPIO_Pin_5|GPIO_Pin_6; //PA1~7对应ADC通道1~7
// GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AIN;
// GPIO_Init(GPIOA, &GPIO_InitStructure);
- GPIO_InitStructure.GPIO_Pin = GPIO_Pin_1|GPIO_Pin_2|GPIO_Pin_3; //PA1~7对应ADC通道1~7
+ GPIO_InitStructure.GPIO_Pin = GPIO_Pin_1 | GPIO_Pin_3; //PA1~7对应ADC通道1~7
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AIN;
GPIO_Init(GPIOA, &GPIO_InitStructure);
@@ -168,7 +188,7 @@ void ADC_TIM_DMA_Init(void)
ADC_InitStructure.ADC_ExternalTrigConv = ADC_ExternalTrigConv_T1_CC1;
ADC_InitStructure.ADC_DataAlign = ADC_DataAlign_Right;
// ADC_InitStructure.ADC_NbrOfChannel = 1;
- ADC_InitStructure.ADC_NbrOfChannel = 3;
+ ADC_InitStructure.ADC_NbrOfChannel = 2;
ADC_Init(ADC1, &ADC_InitStructure);
//使能ADC、DMA
@@ -193,17 +213,16 @@ void ADC_TIM_DMA_Init(void)
// ADC_RegularChannelConfig(ADC1, SYS_VOLT_IN, 5, ADC_SampleTime_CyclesMode5);
// ADC_RegularChannelConfig(ADC1, MOSFET_Temper, 6, ADC_SampleTime_CyclesMode5);
- ADC_RegularChannelConfig(ADC1, CHG_CURR, 1, ADC_SampleTime_CyclesMode5);
- ADC_RegularChannelConfig(ADC1, PV_VOLT_OUT, 2, ADC_SampleTime_CyclesMode5);
- ADC_RegularChannelConfig(ADC1, DSG_CURR, 3, ADC_SampleTime_CyclesMode5);
+ ADC_RegularChannelConfig(ADC1, CHG_CURR, 1, ADC_SampleTime_CyclesMode5);
+ ADC_RegularChannelConfig(ADC1, DSG_CURR, 2, ADC_SampleTime_CyclesMode5);
// /* 设置定时器输出的周期为1S */
// TIM1_Init1(1000, 48000);
/* 设置定时器输出的周期为30mS */
- TIM1_Init1(30, 48000);
+// TIM1_Init1(30, 48000);
/* 设置定时器输出的周期为100uS */
-// TIM1_Init1(300, 48);
- DMA_Tx_Init((u32)&ADC_ConvertedValue, 3);
+ TIM1_Init1(10, 48000);
+ DMA_Tx_Init((u32)&ADC_ConvertedValue, 2);
@@ -253,8 +272,20 @@ void DMA1_Channel1_IRQHandler(void)
// printf("\r\nEnter DMA interrupt\r\n");
if(DMA_GetITStatus(DMA1_IT_TC1)!=RESET)
{
- DMA_ClearITPendingBit(DMA1_IT_TC1);
//中断处理代码
+ static uint16_t temp;
+
+ OutRingQueue2(&g_adcData.RQCHG_CURR, &temp);
+ g_adcData.total_CHG_CURR -= temp;
+ OutRingQueue2(&g_adcData.RQDSG_CURR, &temp);
+ g_adcData.total_DSG_CURR -= temp;
+
+ g_adcData.total_CHG_CURR += ADC_ConvertedValue[0];
+ g_adcData.total_DSG_CURR += ADC_ConvertedValue[1];
+ InRingQueue2(&g_adcData.RQCHG_CURR, ADC_ConvertedValue[0]);
+ InRingQueue2(&g_adcData.RQDSG_CURR, ADC_ConvertedValue[1]);
+
+ DMA_ClearITPendingBit(DMA1_IT_TC1);
// g_adcData.CHG_CURR_array[g_adcData.num] = Get_ConversionVal1(ADC_ConvertedValue[0]);
// g_adcData.PV_VOLT_OUT_array[g_adcData.num] = Get_ConversionVal1(ADC_ConvertedValue[1]);
// g_adcData.DSG_CURR_array[g_adcData.num] = Get_ConversionVal1(ADC_ConvertedValue[2]);
@@ -273,9 +304,9 @@ void DMA1_Channel1_IRQHandler(void)
// g_adcData.total_CHG_CURR += Get_ConversionVal1(ADC_ConvertedValue[0]);
- printf("%d\n", ADC_ConvertedValue[0]);
- printf("%d\n", ADC_ConvertedValue[1]);
- printf("%d\r\n", ADC_ConvertedValue[2]);
+// printf("%d\n", ADC_ConvertedValue[0]);
+// printf("%d\n", ADC_ConvertedValue[1]);
+
// printf("%d\n", ADC_ConvertedValue[3]);
// printf("%d\n", ADC_ConvertedValue[4]);
// printf("%d\r\n", ADC_ConvertedValue[5]);
diff --git a/obj/App/src/collect_Conversion.d b/obj/App/src/collect_Conversion.d
index a5984d7..131ffc8 100644
--- a/obj/App/src/collect_Conversion.d
+++ b/obj/App/src/collect_Conversion.d
@@ -26,8 +26,9 @@ App/src/collect_Conversion.o: ../App/src/collect_Conversion.c \
D:\psx\MPPT\git\Peripheral\inc/ch32l103_misc.h \
D:\psx\MPPT\git\Peripheral\inc/ch32l103_lptim.h \
D:\psx\MPPT\git\Peripheral\inc/ch32l103_opa.h \
- D:\psx\MPPT\git\Hardware\inc/adc.h D:\psx\MPPT\git\Hardware\inc/gpio.h \
- D:\psx\MPPT\git\App\inc/uart_dev.h \
+ D:\psx\MPPT\git\Hardware\inc/adc.h \
+ D:\psx\MPPT\git\Drivers\RingQueue2/ring_queue2.h \
+ D:\psx\MPPT\git\Hardware\inc/gpio.h D:\psx\MPPT\git\App\inc/uart_dev.h \
D:\psx\MPPT\git\Drivers\RingQueue/ring_queue.h \
D:\psx\MPPT\git\Hardware\inc/rs485.h
@@ -91,6 +92,8 @@ D:\psx\MPPT\git\Peripheral\inc/ch32l103_opa.h:
D:\psx\MPPT\git\Hardware\inc/adc.h:
+D:\psx\MPPT\git\Drivers\RingQueue2/ring_queue2.h:
+
D:\psx\MPPT\git\Hardware\inc/gpio.h:
D:\psx\MPPT\git\App\inc/uart_dev.h:
diff --git a/obj/App/src/collect_Conversion.o b/obj/App/src/collect_Conversion.o
index 418e4e772e496c50af96eb150acdfc5c3caada4c..ca71be6ab410e630d7ed531beccdc525e399bf66 100644
GIT binary patch
literal 40888
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
xt}sod2o|B|e0g4nk5w)l
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
WpC8bm4~ihUcDLT({;ovWSN{i2-j>P$
diff --git a/obj/App/src/mppt_control.d b/obj/App/src/mppt_control.d
index b8a64c0..c94ff2f 100644
--- a/obj/App/src/mppt_control.d
+++ b/obj/App/src/mppt_control.d
@@ -27,8 +27,10 @@ App/src/mppt_control.o: ../App/src/mppt_control.c \
D:\psx\MPPT\git\Peripheral\inc/ch32l103_lptim.h \
D:\psx\MPPT\git\Peripheral\inc/ch32l103_opa.h \
D:\psx\MPPT\git\App\inc/collect_Conversion.h \
- D:\psx\MPPT\git\Hardware\inc/adc.h D:\psx\MPPT\git\Hardware\inc/pwm.h \
- D:\psx\MPPT\git\App\inc/inflash.h D:\psx\MPPT\git\Hardware\inc/gpio.h \
+ D:\psx\MPPT\git\Hardware\inc/adc.h \
+ D:\psx\MPPT\git\Drivers\RingQueue2/ring_queue2.h \
+ D:\psx\MPPT\git\Hardware\inc/pwm.h D:\psx\MPPT\git\App\inc/inflash.h \
+ D:\psx\MPPT\git\Hardware\inc/gpio.h \
D:\psx\MPPT\git\App\inc/sl_protocol.h D:\psx\MPPT\git\App\inc/uart_dev.h \
D:\psx\MPPT\git\Drivers\RingQueue/ring_queue.h \
D:\psx\MPPT\git\Hardware\inc/rs485.h D:\psx\MPPT\git\App\inc/task.h \
@@ -97,6 +99,8 @@ D:\psx\MPPT\git\App\inc/collect_Conversion.h:
D:\psx\MPPT\git\Hardware\inc/adc.h:
+D:\psx\MPPT\git\Drivers\RingQueue2/ring_queue2.h:
+
D:\psx\MPPT\git\Hardware\inc/pwm.h:
D:\psx\MPPT\git\App\inc/inflash.h:
diff --git a/obj/App/src/mppt_control.o b/obj/App/src/mppt_control.o
index 243232004cadd193839e732e26184c8314ade935..dd194bd1c8aa8fa024892776bd7b07c009e0ea56 100644
GIT binary patch
literal 73136
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