(3m$i1S*BpFr8fYlL@(
z;2PqD;CaLYg8Ab)FDaP!72cp=UIV?9;MK%Kg1d-^1#ci85xkW+E%;dCGX=kic#q&y
zh%@i~HT
zAU;>{EyU*uzMJ@b!Ti4MvC&AsB)(Aa?}^_j_<7=Y3Fa#a@7;p&y2N^Bf!D)<&+t?M!3%f$W+
z@rMNeotOiNREc|KPj4XkUCiSHE~M?mR|rlLUnzKu_@jc~PJET%_Yi+f@D;>Y3%;J1
z56O^zLHu#SPZH~ouwEg)R_s+}z@HGjkoY>m{NCYxQZS!)c-ITwNPL4}ei!gQCHP&$
zpB8*M@n-~INBmjAHxu6|_#4DG2|hr~iH!6Jv3>!1n)nN1{~Pfa1@m7*yqg8r5`Rf>
z1Mw|_TZwNKyq@?r!MwlqzASh*vEGai5r0+e1!A287ZB?gLOxgVz9v4OAihKJ&BS*K
z{toe7g3rKacp9|(cK6wudK8E-gf_D@DQt+k3pA!6W
z;ztDEMf@wl_7_Eu3a*_2`(uKa5BIbc9n5XQ)BZ0fo+18o
zh;=OLfP*n24#sE!eRSLx(?{zi4(3AxeRN(er;oOUIGArM>7(Ogq*m6S1#8x6_U_z(nk;&%LyB
z;v*6J>hnF?*=QtUUwwW``z)~&`|87Y8jaOrC-&9nN!q!XkcfTt`6KP@NF-ukef~oG
zo5fD-t4|dD&^S-*#J=_w-}^Pzi=Eh4AKuF~&KEneuReUQ(#U~ABKFnijkGTmJF%}m
z9kd@Jc4A+B*3!OP?8LtM97p?7u@n0`j=N}Y5IeE2KD=*iTqbs6UwwvYZxlPRuRde6
zH;J9tSD#7RIk}LCef2qyc5Yfo#J>8xhjw4=#J>7mMtif^iGB6CiuRRaC-&9nI@%8t
zJF%}mH`4wFu@n31b1Us{6g#o6K76Or$c2kU?5hvotu(fXo!D0&zGG=@6+5x7J`d7<
zir9&L^?8c+4zUyax~86^y;JPOzWV%w_BCQB_SMJ38f@$mJF%}m{13UtwPGjs)u)#B
zZm|>l>T?L~Jz^*J)u)MeUO-_10x7dx@9KKx$LxIyg1zWQvX
zofjn}VqbmwXg^Zy#J>8RO#4Q$6Z`6OI_;apPVB4C5bc}APVB2smi8@TC-&86oc6bf
zo!D2Oi)lYv?8N?2f-j?edkOpMa~18!h@IG1pX+EpR_w&S`rJr+pV*0g^|^)i7)d*XjVF>x#Lc#%Znb)l)oLW`T#Zm$dK&n3iv)?wmw
zZ(3xb#m#ExbPV)4b-X3w!(nb(UBb<3-%20VXP0>~@nQ3tn2AK(toEJ2f&XseZTLW<
zMAHctTHLI5)0#hfw2&CU89&{$=aB&6ce@4CDnCmf$mdNf4Xx9Dwl2nL&vRPGQ<+5I
zUVMUsr$iAU~UCx_j`p;N?p$1bI@E!ngTpY+4@vq`rqWs*n2EjxNVdMn=#Dx2lX?~nWRdmo4#K+~~>g@n$9YG5GcEM1FW20s~hj~mrURv1)%p=d^
zaP{_s`#6FW=w)GW^%b4z-cPC@PBz_wPxD!HF77AIIU=8*MY@
z*A>!^O3hhY@&^@5l#LuG%4Uyzu`W6m_c
z3$Ss!Ybo$MRQ-bTx5Mv@fZ)uSm=?m%jjwN`G0(xy_M(W*V|>(ghTSY!h*)rq;QFsp
j4fgj898NcwmAH2*{f?p3XS}?)e(N_G^F~&pDS-b4rhq}A
literal 0
HcmV?d00001
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 \
|