Skip to content

Commit 95e6b69

Browse files
yangjie11yangjie11
authored
sync and update all projects (#7138)
* sync and update
1 parent 517b5eb commit 95e6b69

File tree

1,036 files changed

+111538
-90388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,036 files changed

+111538
-90388
lines changed

‎bsp/CME_M7/.config

Lines changed: 329 additions & 79 deletions
Large diffs are not rendered by default.

‎bsp/CME_M7/project.uvproj

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -361,9 +361,9 @@
361361
<useXO>0</useXO>
362362
<VariousControls>
363363
<MiscControls />
364-
<Define>RT_USING_LIBC, __RTTHREAD__, __STDC_LIMIT_MACROS, RT_USING_ARM_LIBC, __CLK_TCK=RT_TICK_PER_SECOND</Define>
364+
<Define>RT_USING_LIBC, RT_USING_ARMLIBC, __STDC_LIMIT_MACROS, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND</Define>
365365
<Undefine />
366-
<IncludePath>applications;.;CMSIS\CME_M7;CMSIS\CMSIS\Include;..\..\components\libc\compilers\common\include;..\..\components\libc\compilers\common\extension;..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m3;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;drivers;..\..\components\dfs\include;..\..\components\dfs\filesystems\elmfat;..\..\components\finsh;.;..\..\include;StdPeriph_Driver\inc;..\..\components\net\lwip\lwip-2.0.3\src\include;..\..\components\net\lwip\lwip-2.0.3\src\include\ipv4;..\..\components\net\lwip\lwip-2.0.3\src\include\netif;..\..\components\net\lwip\lwip-2.0.3\src\include\posix;..\..\components\net\lwip\port;..\..\components\libc\posix\io\poll;..\..\components\libc\posix\io\stdio;..\..\components\libc\posix\ipc</IncludePath>
366+
<IncludePath>.;..\..\components\libc\compilers\common\extension;..\..\libcpu\arm\cortex-m3;..\..\include;CMSIS\CMSIS\Include;..\..\components\net\lwip\lwip-2.0.3\src\include\netif;..\..\components\net\lwip\lwip-2.0.3\src\include\posix;applications;..\..\components\finsh;..\..\components\drivers\include;..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\components\libc\posix\io\stdio;..\..\components\dfs\filesystems\elmfat;..\..\components\drivers\include;..\..\components\dfs\include;..\..\components\net\lwip\lwip-2.0.3\src\include\ipv4;StdPeriph_Driver\inc;..\..\components\drivers\include;..\..\libcpu\arm\common;..\..\components\libc\posix\ipc;CMSIS\CME_M7;..\..\components\net\lwip\port;..\..\components\libc\posix\io\poll;..\..\components\libc\compilers\common\include;drivers;..\..\components\net\lwip\lwip-2.0.3\src\include</IncludePath>
367367
</VariousControls>
368368
</Cads>
369369
<Aads>
@@ -407,9 +407,9 @@
407407
<GroupName>Applications</GroupName>
408408
<Files>
409409
<File>
410-
<FileName>startup.c</FileName>
410+
<FileName>application.c</FileName>
411411
<FileType>1</FileType>
412-
<FilePath>applications\startup.c</FilePath>
412+
<FilePath>applications\application.c</FilePath>
413413
</File>
414414
</Files>
415415
<Files>
@@ -421,9 +421,9 @@
421421
</Files>
422422
<Files>
423423
<File>
424-
<FileName>application.c</FileName>
424+
<FileName>startup.c</FileName>
425425
<FileType>1</FileType>
426-
<FilePath>applications\application.c</FilePath>
426+
<FilePath>applications\startup.c</FilePath>
427427
</File>
428428
</Files>
429429
</Group>
@@ -507,9 +507,9 @@
507507
<GroupName>CPU</GroupName>
508508
<Files>
509509
<File>
510-
<FileName>backtrace.c</FileName>
510+
<FileName>atomic_arm.c</FileName>
511511
<FileType>1</FileType>
512-
<FilePath>..\..\libcpu\arm\common\backtrace.c</FilePath>
512+
<FilePath>..\..\libcpu\arm\common\atomic_arm.c</FilePath>
513513
</File>
514514
</Files>
515515
<Files>
@@ -802,9 +802,9 @@
802802
</Files>
803803
<Files>
804804
<File>
805-
<FileName>scheduler.c</FileName>
805+
<FileName>scheduler_up.c</FileName>
806806
<FileType>1</FileType>
807-
<FilePath>..\..\src\scheduler.c</FilePath>
807+
<FilePath>..\..\src\scheduler_up.c</FilePath>
808808
</File>
809809
</Files>
810810
<Files>
@@ -833,37 +833,37 @@
833833
</Files>
834834
<Files>
835835
<File>
836-
<FileName>cmem7_dma.c</FileName>
836+
<FileName>cmem7_adc.c</FileName>
837837
<FileType>1</FileType>
838-
<FilePath>StdPeriph_Driver\src\cmem7_dma.c</FilePath>
838+
<FilePath>StdPeriph_Driver\src\cmem7_adc.c</FilePath>
839839
</File>
840840
</Files>
841841
<Files>
842842
<File>
843-
<FileName>cmem7_uart.c</FileName>
843+
<FileName>cmem7_misc.c</FileName>
844844
<FileType>1</FileType>
845-
<FilePath>StdPeriph_Driver\src\cmem7_uart.c</FilePath>
845+
<FilePath>StdPeriph_Driver\src\cmem7_misc.c</FilePath>
846846
</File>
847847
</Files>
848848
<Files>
849849
<File>
850-
<FileName>cmem7_wdg.c</FileName>
850+
<FileName>cmem7_can.c</FileName>
851851
<FileType>1</FileType>
852-
<FilePath>StdPeriph_Driver\src\cmem7_wdg.c</FilePath>
852+
<FilePath>StdPeriph_Driver\src\cmem7_can.c</FilePath>
853853
</File>
854854
</Files>
855855
<Files>
856856
<File>
857-
<FileName>cmem7_ddr.c</FileName>
857+
<FileName>cmem7_uart.c</FileName>
858858
<FileType>1</FileType>
859-
<FilePath>StdPeriph_Driver\src\cmem7_ddr.c</FilePath>
859+
<FilePath>StdPeriph_Driver\src\cmem7_uart.c</FilePath>
860860
</File>
861861
</Files>
862862
<Files>
863863
<File>
864-
<FileName>cmem7_aes.c</FileName>
864+
<FileName>cmem7_efuse.c</FileName>
865865
<FileType>1</FileType>
866-
<FilePath>StdPeriph_Driver\src\cmem7_aes.c</FilePath>
866+
<FilePath>StdPeriph_Driver\src\cmem7_efuse.c</FilePath>
867867
</File>
868868
</Files>
869869
<Files>
@@ -875,72 +875,72 @@
875875
</Files>
876876
<Files>
877877
<File>
878-
<FileName>cmem7_rtc.c</FileName>
878+
<FileName>cmem7_usb.c</FileName>
879879
<FileType>1</FileType>
880-
<FilePath>StdPeriph_Driver\src\cmem7_rtc.c</FilePath>
880+
<FilePath>StdPeriph_Driver\src\cmem7_usb.c</FilePath>
881881
</File>
882882
</Files>
883883
<Files>
884884
<File>
885-
<FileName>cmem7_efuse.c</FileName>
885+
<FileName>cmem7_gpio.c</FileName>
886886
<FileType>1</FileType>
887-
<FilePath>StdPeriph_Driver\src\cmem7_efuse.c</FilePath>
887+
<FilePath>StdPeriph_Driver\src\cmem7_gpio.c</FilePath>
888888
</File>
889889
</Files>
890890
<Files>
891891
<File>
892-
<FileName>cmem7_usb.c</FileName>
892+
<FileName>cmem7_aes.c</FileName>
893893
<FileType>1</FileType>
894-
<FilePath>StdPeriph_Driver\src\cmem7_usb.c</FilePath>
894+
<FilePath>StdPeriph_Driver\src\cmem7_aes.c</FilePath>
895895
</File>
896896
</Files>
897897
<Files>
898898
<File>
899-
<FileName>cmem7_adc.c</FileName>
899+
<FileName>cmem7_i2c.c</FileName>
900900
<FileType>1</FileType>
901-
<FilePath>StdPeriph_Driver\src\cmem7_adc.c</FilePath>
901+
<FilePath>StdPeriph_Driver\src\cmem7_i2c.c</FilePath>
902902
</File>
903903
</Files>
904904
<Files>
905905
<File>
906-
<FileName>cmem7_i2c.c</FileName>
906+
<FileName>cmem7_rtc.c</FileName>
907907
<FileType>1</FileType>
908-
<FilePath>StdPeriph_Driver\src\cmem7_i2c.c</FilePath>
908+
<FilePath>StdPeriph_Driver\src\cmem7_rtc.c</FilePath>
909909
</File>
910910
</Files>
911911
<Files>
912912
<File>
913-
<FileName>cmem7_misc.c</FileName>
913+
<FileName>cmem7_tim.c</FileName>
914914
<FileType>1</FileType>
915-
<FilePath>StdPeriph_Driver\src\cmem7_misc.c</FilePath>
915+
<FilePath>StdPeriph_Driver\src\cmem7_tim.c</FilePath>
916916
</File>
917917
</Files>
918918
<Files>
919919
<File>
920-
<FileName>cmem7_spi.c</FileName>
920+
<FileName>cmem7_dma.c</FileName>
921921
<FileType>1</FileType>
922-
<FilePath>StdPeriph_Driver\src\cmem7_spi.c</FilePath>
922+
<FilePath>StdPeriph_Driver\src\cmem7_dma.c</FilePath>
923923
</File>
924924
</Files>
925925
<Files>
926926
<File>
927-
<FileName>cmem7_tim.c</FileName>
927+
<FileName>cmem7_spi.c</FileName>
928928
<FileType>1</FileType>
929-
<FilePath>StdPeriph_Driver\src\cmem7_tim.c</FilePath>
929+
<FilePath>StdPeriph_Driver\src\cmem7_spi.c</FilePath>
930930
</File>
931931
</Files>
932932
<Files>
933933
<File>
934-
<FileName>cmem7_gpio.c</FileName>
934+
<FileName>cmem7_wdg.c</FileName>
935935
<FileType>1</FileType>
936-
<FilePath>StdPeriph_Driver\src\cmem7_gpio.c</FilePath>
936+
<FilePath>StdPeriph_Driver\src\cmem7_wdg.c</FilePath>
937937
</File>
938938
</Files>
939939
<Files>
940940
<File>
941-
<FileName>cmem7_can.c</FileName>
941+
<FileName>cmem7_ddr.c</FileName>
942942
<FileType>1</FileType>
943-
<FilePath>StdPeriph_Driver\src\cmem7_can.c</FilePath>
943+
<FilePath>StdPeriph_Driver\src\cmem7_ddr.c</FilePath>
944944
</File>
945945
</Files>
946946
</Group>

‎bsp/CME_M7/rtconfig.h

Lines changed: 42 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535

3636
/* Memory Management */
3737

38+
#define RT_PAGE_MAX_ORDER 11
3839
#define RT_USING_MEMPOOL
3940
#define RT_USING_SMALL_MEM
4041
#define RT_USING_SMALL_MEM_AS_HEAP
@@ -46,9 +47,10 @@
4647
#define RT_USING_CONSOLE
4748
#define RT_CONSOLEBUF_SIZE 128
4849
#define RT_CONSOLE_DEVICE_NAME "uart2"
49-
#define RT_VER_NUM 0x40101
50-
#define ARCH_ARM
50+
#define RT_VER_NUM 0x50000
51+
#define RT_USING_HW_ATOMIC
5152
#define RT_USING_CPU_FFS
53+
#define ARCH_ARM
5254
#define ARCH_ARM_CORTEX_M
5355
#define ARCH_ARM_CORTEX_M3
5456

@@ -93,6 +95,7 @@
9395
/* Device Drivers */
9496

9597
#define RT_USING_DEVICE_IPC
98+
#define RT_UNAMED_PIPE_NUMBER 64
9699
#define RT_USING_SERIAL
97100
#define RT_USING_SERIAL_V1
98101
#define RT_SERIAL_USING_DMA
@@ -202,9 +205,6 @@
202205
/* u8g2: a monochrome graphic library */
203206

204207

205-
/* PainterEngine: A cross-platform graphics application framework written in C language */
206-
207-
208208
/* tools packages */
209209

210210

@@ -224,13 +224,21 @@
224224

225225
/* peripheral libraries and drivers */
226226

227+
/* sensors drivers */
228+
229+
230+
/* touch drivers */
231+
227232

228233
/* Kendryte SDK */
229234

230235

231236
/* AI packages */
232237

233238

239+
/* Signal Processing and Control Algorithm Packages */
240+
241+
234242
/* miscellaneous packages */
235243

236244
/* project laboratory */
@@ -241,13 +249,39 @@
241249
/* entertainment: terminal games and other interesting software packages */
242250

243251

244-
/* Privated Packages of RealThread */
252+
/* Arduino libraries */
253+
254+
255+
/* Projects */
256+
257+
258+
/* Sensors */
259+
260+
261+
/* Display */
262+
263+
264+
/* Timing */
265+
266+
267+
/* Data Processing */
268+
269+
270+
/* Data Storage */
271+
272+
/* Communication */
273+
274+
275+
/* Device Control */
276+
277+
278+
/* Other */
245279

246280

247-
/* Network Utilities */
281+
/* Signal IO */
248282

249283

250-
/* RT-Thread Smart */
284+
/* Uncategorized */
251285

252286
#define SOC_CME_M7
253287

0 commit comments

Comments
 (0)