diff --git a/.cproject b/.cproject
index f5042a1..80231f8 100644
--- a/.cproject
+++ b/.cproject
@@ -71,6 +71,7 @@
+
@@ -150,4 +151,5 @@
+
diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index b8e2615..82daac9 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/Drivers/RingQueue2/ring_queue2.c b/Drivers/RingQueue2/ring_queue2.c
new file mode 100644
index 0000000..ce27fa3
--- /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 RING_QUEUE_DEBUG
+
+//#ifdef RING_QUEUE_DEBUG
+//#define //rq_debug term_printf
+//#else
+//void rq_debug(const char *fmt, ...){};
+//#endif
+
+#define RQ_OK 1
+#define RQ_ERROR 0
+#define RQ_OVERFLOW -2
+
+//初始化队列
+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..5decbe1
--- /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 unsigned char RQ_ElementType2;//元素类型
+
+typedef struct _ring_queue2
+{
+ RQ_ElementType2 *elems;
+ int size;
+ volatile int front, rear;
+}RingQueue2;
+
+//初始化队列,需传入保存队列状态的结构q,队列使用的buffer和buffer大小
+int InitRingQueue(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 InRingQueue(RingQueue2 *q,RQ_ElementType2 e);
+
+//从队首删除元素
+int OutRingQueue(RingQueue2 *q, RQ_ElementType2 *e);
+
+//队列中的元素个数
+int RingQueueLength(RingQueue2 *q);
+
+
+#endif /* DRIVERS_RINGQUEUE_RING_QUEUE_H_ */
diff --git a/obj/App/src/subdir.mk b/obj/App/src/subdir.mk
index fe10e20..d7bd845 100644
--- a/obj/App/src/subdir.mk
+++ b/obj/App/src/subdir.mk
@@ -37,6 +37,6 @@ C_DEPS += \
# Each subdirectory must supply rules for building sources it contributes
App/src/%.o: ../App/src/%.c
- @ @ riscv-none-embed-gcc -march=rv32imacxw -mabi=ilp32 -msmall-data-limit=8 -msave-restore -Os -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -fno-common -Wunused -Wuninitialized -g -I"D:\psx\MPPT\git\Debug" -I"D:\psx\MPPT\git\Core" -I"D:\psx\MPPT\git\User" -I"D:\psx\MPPT\git\Peripheral\inc" -I"D:\psx\MPPT\git\App\inc" -I"D:\psx\MPPT\git\Hardware\inc" -I"D:\psx\MPPT\git\Drivers\RingQueue" -I"D:\psx\MPPT\git\Drivers\TimeSliceOffset" -std=gnu99 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<"
+ @ @ riscv-none-embed-gcc -march=rv32imacxw -mabi=ilp32 -msmall-data-limit=8 -msave-restore -Os -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -fno-common -Wunused -Wuninitialized -g -I"D:\psx\MPPT\git\Debug" -I"D:\psx\MPPT\git\Core" -I"D:\psx\MPPT\git\User" -I"D:\psx\MPPT\git\Peripheral\inc" -I"D:\psx\MPPT\git\App\inc" -I"D:\psx\MPPT\git\Hardware\inc" -I"D:\psx\MPPT\git\Drivers\RingQueue" -I"D:\psx\MPPT\git\Drivers\TimeSliceOffset" -I"D:\psx\MPPT\git\Drivers\RingQueue2" -std=gnu99 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<"
@ @
diff --git a/obj/Core/subdir.mk b/obj/Core/subdir.mk
index bbabe24..7f617c6 100644
--- a/obj/Core/subdir.mk
+++ b/obj/Core/subdir.mk
@@ -16,6 +16,6 @@ C_DEPS += \
# Each subdirectory must supply rules for building sources it contributes
Core/%.o: ../Core/%.c
- @ @ riscv-none-embed-gcc -march=rv32imacxw -mabi=ilp32 -msmall-data-limit=8 -msave-restore -Os -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -fno-common -Wunused -Wuninitialized -g -I"D:\psx\MPPT\git\Debug" -I"D:\psx\MPPT\git\Core" -I"D:\psx\MPPT\git\User" -I"D:\psx\MPPT\git\Peripheral\inc" -I"D:\psx\MPPT\git\App\inc" -I"D:\psx\MPPT\git\Hardware\inc" -I"D:\psx\MPPT\git\Drivers\RingQueue" -I"D:\psx\MPPT\git\Drivers\TimeSliceOffset" -std=gnu99 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<"
+ @ @ riscv-none-embed-gcc -march=rv32imacxw -mabi=ilp32 -msmall-data-limit=8 -msave-restore -Os -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -fno-common -Wunused -Wuninitialized -g -I"D:\psx\MPPT\git\Debug" -I"D:\psx\MPPT\git\Core" -I"D:\psx\MPPT\git\User" -I"D:\psx\MPPT\git\Peripheral\inc" -I"D:\psx\MPPT\git\App\inc" -I"D:\psx\MPPT\git\Hardware\inc" -I"D:\psx\MPPT\git\Drivers\RingQueue" -I"D:\psx\MPPT\git\Drivers\TimeSliceOffset" -I"D:\psx\MPPT\git\Drivers\RingQueue2" -std=gnu99 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<"
@ @
diff --git a/obj/Debug/subdir.mk b/obj/Debug/subdir.mk
index 5d5dc03..5a91bea 100644
--- a/obj/Debug/subdir.mk
+++ b/obj/Debug/subdir.mk
@@ -16,6 +16,6 @@ C_DEPS += \
# Each subdirectory must supply rules for building sources it contributes
Debug/%.o: ../Debug/%.c
- @ @ riscv-none-embed-gcc -march=rv32imacxw -mabi=ilp32 -msmall-data-limit=8 -msave-restore -Os -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -fno-common -Wunused -Wuninitialized -g -I"D:\psx\MPPT\git\Debug" -I"D:\psx\MPPT\git\Core" -I"D:\psx\MPPT\git\User" -I"D:\psx\MPPT\git\Peripheral\inc" -I"D:\psx\MPPT\git\App\inc" -I"D:\psx\MPPT\git\Hardware\inc" -I"D:\psx\MPPT\git\Drivers\RingQueue" -I"D:\psx\MPPT\git\Drivers\TimeSliceOffset" -std=gnu99 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<"
+ @ @ riscv-none-embed-gcc -march=rv32imacxw -mabi=ilp32 -msmall-data-limit=8 -msave-restore -Os -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -fno-common -Wunused -Wuninitialized -g -I"D:\psx\MPPT\git\Debug" -I"D:\psx\MPPT\git\Core" -I"D:\psx\MPPT\git\User" -I"D:\psx\MPPT\git\Peripheral\inc" -I"D:\psx\MPPT\git\App\inc" -I"D:\psx\MPPT\git\Hardware\inc" -I"D:\psx\MPPT\git\Drivers\RingQueue" -I"D:\psx\MPPT\git\Drivers\TimeSliceOffset" -I"D:\psx\MPPT\git\Drivers\RingQueue2" -std=gnu99 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<"
@ @
diff --git a/obj/Drivers/RingQueue/subdir.mk b/obj/Drivers/RingQueue/subdir.mk
index eea85f5..cbd762a 100644
--- a/obj/Drivers/RingQueue/subdir.mk
+++ b/obj/Drivers/RingQueue/subdir.mk
@@ -16,6 +16,6 @@ C_DEPS += \
# Each subdirectory must supply rules for building sources it contributes
Drivers/RingQueue/%.o: ../Drivers/RingQueue/%.c
- @ @ riscv-none-embed-gcc -march=rv32imacxw -mabi=ilp32 -msmall-data-limit=8 -msave-restore -Os -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -fno-common -Wunused -Wuninitialized -g -I"D:\psx\MPPT\git\Debug" -I"D:\psx\MPPT\git\Core" -I"D:\psx\MPPT\git\User" -I"D:\psx\MPPT\git\Peripheral\inc" -I"D:\psx\MPPT\git\App\inc" -I"D:\psx\MPPT\git\Hardware\inc" -I"D:\psx\MPPT\git\Drivers\RingQueue" -I"D:\psx\MPPT\git\Drivers\TimeSliceOffset" -std=gnu99 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<"
+ @ @ riscv-none-embed-gcc -march=rv32imacxw -mabi=ilp32 -msmall-data-limit=8 -msave-restore -Os -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -fno-common -Wunused -Wuninitialized -g -I"D:\psx\MPPT\git\Debug" -I"D:\psx\MPPT\git\Core" -I"D:\psx\MPPT\git\User" -I"D:\psx\MPPT\git\Peripheral\inc" -I"D:\psx\MPPT\git\App\inc" -I"D:\psx\MPPT\git\Hardware\inc" -I"D:\psx\MPPT\git\Drivers\RingQueue" -I"D:\psx\MPPT\git\Drivers\TimeSliceOffset" -I"D:\psx\MPPT\git\Drivers\RingQueue2" -std=gnu99 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<"
@ @
diff --git a/obj/Drivers/RingQueue2/ring_queue2.d b/obj/Drivers/RingQueue2/ring_queue2.d
new file mode 100644
index 0000000..1544f95
--- /dev/null
+++ b/obj/Drivers/RingQueue2/ring_queue2.d
@@ -0,0 +1,4 @@
+Drivers/RingQueue2/ring_queue2.o: ../Drivers/RingQueue2/ring_queue2.c \
+ ../Drivers/RingQueue2/ring_queue2.h
+
+../Drivers/RingQueue2/ring_queue2.h:
diff --git a/obj/Drivers/RingQueue2/ring_queue2.o b/obj/Drivers/RingQueue2/ring_queue2.o
new file mode 100644
index 0000000..d6f93fc
Binary files /dev/null and b/obj/Drivers/RingQueue2/ring_queue2.o differ
diff --git a/obj/Drivers/RingQueue2/subdir.mk b/obj/Drivers/RingQueue2/subdir.mk
new file mode 100644
index 0000000..5efbfe2
--- /dev/null
+++ b/obj/Drivers/RingQueue2/subdir.mk
@@ -0,0 +1,21 @@
+################################################################################
+# MRS Version: 1.9.0
+# 自动生成的文件。不要编辑!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables
+C_SRCS += \
+../Drivers/RingQueue2/ring_queue2.c
+
+OBJS += \
+./Drivers/RingQueue2/ring_queue2.o
+
+C_DEPS += \
+./Drivers/RingQueue2/ring_queue2.d
+
+
+# Each subdirectory must supply rules for building sources it contributes
+Drivers/RingQueue2/%.o: ../Drivers/RingQueue2/%.c
+ @ @ riscv-none-embed-gcc -march=rv32imacxw -mabi=ilp32 -msmall-data-limit=8 -msave-restore -Os -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -fno-common -Wunused -Wuninitialized -g -I"D:\psx\MPPT\git\Debug" -I"D:\psx\MPPT\git\Core" -I"D:\psx\MPPT\git\User" -I"D:\psx\MPPT\git\Peripheral\inc" -I"D:\psx\MPPT\git\App\inc" -I"D:\psx\MPPT\git\Hardware\inc" -I"D:\psx\MPPT\git\Drivers\RingQueue" -I"D:\psx\MPPT\git\Drivers\TimeSliceOffset" -I"D:\psx\MPPT\git\Drivers\RingQueue2" -std=gnu99 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<"
+ @ @
+
diff --git a/obj/Drivers/TimeSliceOffset/subdir.mk b/obj/Drivers/TimeSliceOffset/subdir.mk
index 1e01a9c..dc10b9d 100644
--- a/obj/Drivers/TimeSliceOffset/subdir.mk
+++ b/obj/Drivers/TimeSliceOffset/subdir.mk
@@ -16,6 +16,6 @@ C_DEPS += \
# Each subdirectory must supply rules for building sources it contributes
Drivers/TimeSliceOffset/%.o: ../Drivers/TimeSliceOffset/%.c
- @ @ riscv-none-embed-gcc -march=rv32imacxw -mabi=ilp32 -msmall-data-limit=8 -msave-restore -Os -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -fno-common -Wunused -Wuninitialized -g -I"D:\psx\MPPT\git\Debug" -I"D:\psx\MPPT\git\Core" -I"D:\psx\MPPT\git\User" -I"D:\psx\MPPT\git\Peripheral\inc" -I"D:\psx\MPPT\git\App\inc" -I"D:\psx\MPPT\git\Hardware\inc" -I"D:\psx\MPPT\git\Drivers\RingQueue" -I"D:\psx\MPPT\git\Drivers\TimeSliceOffset" -std=gnu99 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<"
+ @ @ riscv-none-embed-gcc -march=rv32imacxw -mabi=ilp32 -msmall-data-limit=8 -msave-restore -Os -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -fno-common -Wunused -Wuninitialized -g -I"D:\psx\MPPT\git\Debug" -I"D:\psx\MPPT\git\Core" -I"D:\psx\MPPT\git\User" -I"D:\psx\MPPT\git\Peripheral\inc" -I"D:\psx\MPPT\git\App\inc" -I"D:\psx\MPPT\git\Hardware\inc" -I"D:\psx\MPPT\git\Drivers\RingQueue" -I"D:\psx\MPPT\git\Drivers\TimeSliceOffset" -I"D:\psx\MPPT\git\Drivers\RingQueue2" -std=gnu99 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<"
@ @
diff --git a/obj/Hardware/src/subdir.mk b/obj/Hardware/src/subdir.mk
index 47250fb..e3868de 100644
--- a/obj/Hardware/src/subdir.mk
+++ b/obj/Hardware/src/subdir.mk
@@ -31,6 +31,6 @@ C_DEPS += \
# Each subdirectory must supply rules for building sources it contributes
Hardware/src/%.o: ../Hardware/src/%.c
- @ @ riscv-none-embed-gcc -march=rv32imacxw -mabi=ilp32 -msmall-data-limit=8 -msave-restore -Os -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -fno-common -Wunused -Wuninitialized -g -I"D:\psx\MPPT\git\Debug" -I"D:\psx\MPPT\git\Core" -I"D:\psx\MPPT\git\User" -I"D:\psx\MPPT\git\Peripheral\inc" -I"D:\psx\MPPT\git\App\inc" -I"D:\psx\MPPT\git\Hardware\inc" -I"D:\psx\MPPT\git\Drivers\RingQueue" -I"D:\psx\MPPT\git\Drivers\TimeSliceOffset" -std=gnu99 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<"
+ @ @ riscv-none-embed-gcc -march=rv32imacxw -mabi=ilp32 -msmall-data-limit=8 -msave-restore -Os -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -fno-common -Wunused -Wuninitialized -g -I"D:\psx\MPPT\git\Debug" -I"D:\psx\MPPT\git\Core" -I"D:\psx\MPPT\git\User" -I"D:\psx\MPPT\git\Peripheral\inc" -I"D:\psx\MPPT\git\App\inc" -I"D:\psx\MPPT\git\Hardware\inc" -I"D:\psx\MPPT\git\Drivers\RingQueue" -I"D:\psx\MPPT\git\Drivers\TimeSliceOffset" -I"D:\psx\MPPT\git\Drivers\RingQueue2" -std=gnu99 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<"
@ @
diff --git a/obj/Peripheral/src/subdir.mk b/obj/Peripheral/src/subdir.mk
index 44aa787..a25e7e1 100644
--- a/obj/Peripheral/src/subdir.mk
+++ b/obj/Peripheral/src/subdir.mk
@@ -76,6 +76,6 @@ C_DEPS += \
# Each subdirectory must supply rules for building sources it contributes
Peripheral/src/%.o: ../Peripheral/src/%.c
- @ @ riscv-none-embed-gcc -march=rv32imacxw -mabi=ilp32 -msmall-data-limit=8 -msave-restore -Os -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -fno-common -Wunused -Wuninitialized -g -I"D:\psx\MPPT\git\Debug" -I"D:\psx\MPPT\git\Core" -I"D:\psx\MPPT\git\User" -I"D:\psx\MPPT\git\Peripheral\inc" -I"D:\psx\MPPT\git\App\inc" -I"D:\psx\MPPT\git\Hardware\inc" -I"D:\psx\MPPT\git\Drivers\RingQueue" -I"D:\psx\MPPT\git\Drivers\TimeSliceOffset" -std=gnu99 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<"
+ @ @ riscv-none-embed-gcc -march=rv32imacxw -mabi=ilp32 -msmall-data-limit=8 -msave-restore -Os -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -fno-common -Wunused -Wuninitialized -g -I"D:\psx\MPPT\git\Debug" -I"D:\psx\MPPT\git\Core" -I"D:\psx\MPPT\git\User" -I"D:\psx\MPPT\git\Peripheral\inc" -I"D:\psx\MPPT\git\App\inc" -I"D:\psx\MPPT\git\Hardware\inc" -I"D:\psx\MPPT\git\Drivers\RingQueue" -I"D:\psx\MPPT\git\Drivers\TimeSliceOffset" -I"D:\psx\MPPT\git\Drivers\RingQueue2" -std=gnu99 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<"
@ @
diff --git a/obj/User/subdir.mk b/obj/User/subdir.mk
index b212e0c..9b01319 100644
--- a/obj/User/subdir.mk
+++ b/obj/User/subdir.mk
@@ -22,6 +22,6 @@ C_DEPS += \
# Each subdirectory must supply rules for building sources it contributes
User/%.o: ../User/%.c
- @ @ riscv-none-embed-gcc -march=rv32imacxw -mabi=ilp32 -msmall-data-limit=8 -msave-restore -Os -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -fno-common -Wunused -Wuninitialized -g -I"D:\psx\MPPT\git\Debug" -I"D:\psx\MPPT\git\Core" -I"D:\psx\MPPT\git\User" -I"D:\psx\MPPT\git\Peripheral\inc" -I"D:\psx\MPPT\git\App\inc" -I"D:\psx\MPPT\git\Hardware\inc" -I"D:\psx\MPPT\git\Drivers\RingQueue" -I"D:\psx\MPPT\git\Drivers\TimeSliceOffset" -std=gnu99 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<"
+ @ @ riscv-none-embed-gcc -march=rv32imacxw -mabi=ilp32 -msmall-data-limit=8 -msave-restore -Os -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -fno-common -Wunused -Wuninitialized -g -I"D:\psx\MPPT\git\Debug" -I"D:\psx\MPPT\git\Core" -I"D:\psx\MPPT\git\User" -I"D:\psx\MPPT\git\Peripheral\inc" -I"D:\psx\MPPT\git\App\inc" -I"D:\psx\MPPT\git\Hardware\inc" -I"D:\psx\MPPT\git\Drivers\RingQueue" -I"D:\psx\MPPT\git\Drivers\TimeSliceOffset" -I"D:\psx\MPPT\git\Drivers\RingQueue2" -std=gnu99 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<"
@ @
diff --git a/obj/makefile b/obj/makefile
index 1994308..c3cdef1 100644
--- a/obj/makefile
+++ b/obj/makefile
@@ -14,6 +14,7 @@ RM := rm -rf
-include Peripheral/src/subdir.mk
-include Hardware/src/subdir.mk
-include Drivers/TimeSliceOffset/subdir.mk
+-include Drivers/RingQueue2/subdir.mk
-include Drivers/RingQueue/subdir.mk
-include Debug/subdir.mk
-include Core/subdir.mk
diff --git a/obj/mppt_Nos_V0.4.map b/obj/mppt_Nos_V0.4.map
index 4e24560..a9453e0 100644
--- a/obj/mppt_Nos_V0.4.map
+++ b/obj/mppt_Nos_V0.4.map
@@ -1346,6 +1346,29 @@ Discarded input sections
0x0000000000000000 0x32 ./Drivers/TimeSliceOffset/timeSliceOffset.o
.text.TimeSliceOffset_Start
0x0000000000000000 0x2a ./Drivers/TimeSliceOffset/timeSliceOffset.o
+ .text 0x0000000000000000 0x0 ./Drivers/RingQueue2/ring_queue2.o
+ .data 0x0000000000000000 0x0 ./Drivers/RingQueue2/ring_queue2.o
+ .bss 0x0000000000000000 0x0 ./Drivers/RingQueue2/ring_queue2.o
+ .text.InitRingQueue2
+ 0x0000000000000000 0x10 ./Drivers/RingQueue2/ring_queue2.o
+ .text.ShowRingQueue2
+ 0x0000000000000000 0xc ./Drivers/RingQueue2/ring_queue2.o
+ .text.InRingQueue2
+ 0x0000000000000000 0x2c ./Drivers/RingQueue2/ring_queue2.o
+ .text.OutRingQueue2
+ 0x0000000000000000 0x26 ./Drivers/RingQueue2/ring_queue2.o
+ .text.RingQueueLength2
+ 0x0000000000000000 0x10 ./Drivers/RingQueue2/ring_queue2.o
+ .debug_info 0x0000000000000000 0xa9c ./Drivers/RingQueue2/ring_queue2.o
+ .debug_abbrev 0x0000000000000000 0x23a ./Drivers/RingQueue2/ring_queue2.o
+ .debug_loc 0x0000000000000000 0xd7 ./Drivers/RingQueue2/ring_queue2.o
+ .debug_aranges
+ 0x0000000000000000 0x40 ./Drivers/RingQueue2/ring_queue2.o
+ .debug_ranges 0x0000000000000000 0x30 ./Drivers/RingQueue2/ring_queue2.o
+ .debug_line 0x0000000000000000 0x3c3 ./Drivers/RingQueue2/ring_queue2.o
+ .debug_str 0x0000000000000000 0x5f1 ./Drivers/RingQueue2/ring_queue2.o
+ .comment 0x0000000000000000 0x34 ./Drivers/RingQueue2/ring_queue2.o
+ .debug_frame 0x0000000000000000 0x60 ./Drivers/RingQueue2/ring_queue2.o
.text 0x0000000000000000 0x0 ./Drivers/RingQueue/ring_queue.o
.data 0x0000000000000000 0x0 ./Drivers/RingQueue/ring_queue.o
.bss 0x0000000000000000 0x0 ./Drivers/RingQueue/ring_queue.o
@@ -1901,6 +1924,7 @@ LOAD ./Hardware/src/pwm.o
LOAD ./Hardware/src/rs485.o
LOAD ./Hardware/src/tim.o
LOAD ./Drivers/TimeSliceOffset/timeSliceOffset.o
+LOAD ./Drivers/RingQueue2/ring_queue2.o
LOAD ./Drivers/RingQueue/ring_queue.o
LOAD ./Debug/debug.o
LOAD ./Core/core_riscv.o
diff --git a/obj/sources.mk b/obj/sources.mk
index 186b475..9e2951f 100644
--- a/obj/sources.mk
+++ b/obj/sources.mk
@@ -27,6 +27,7 @@ App/src \
Core \
Debug \
Drivers/RingQueue \
+Drivers/RingQueue2 \
Drivers/TimeSliceOffset \
Hardware/src \
Peripheral/src \