fuxiaoer/RTK_base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

更改main 优先级 更改部分malloc为rt malloc

Browse Source
This commit is contained in:
fize 2022-06-22 19:32:53 +08:00
parent 8d00c17d2d
commit 4ff028180d
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.config
View File

@ -91,7 +91,7 @@ CONFIG_ARCH_ARM_CORTEX_M4=y
CONFIG_RT_USING_COMPONENTS_INIT=y CONFIG_RT_USING_COMPONENTS_INIT=y
CONFIG_RT_USING_USER_MAIN=y CONFIG_RT_USING_USER_MAIN=y
CONFIG_RT_MAIN_THREAD_STACK_SIZE=2048 CONFIG_RT_MAIN_THREAD_STACK_SIZE=2048
CONFIG_RT_MAIN_THREAD_PRIORITY=20 CONFIG_RT_MAIN_THREAD_PRIORITY=5
# #
# C++ features # C++ features
@ -502,7 +502,6 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y
# end of PainterEngine: A cross-platform graphics application framework written in C language # end of PainterEngine: A cross-platform graphics application framework written in C language
# CONFIG_PKG_USING_MCURSES is not set # CONFIG_PKG_USING_MCURSES is not set
# CONFIG_PKG_USING_TERMBOX is not set
# CONFIG_PKG_USING_VT100 is not set # CONFIG_PKG_USING_VT100 is not set
# CONFIG_PKG_USING_QRCODE is not set # CONFIG_PKG_USING_QRCODE is not set
# CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_GUIENGINE is not set

8
RTK/ST_rtksvr.c
View File

@ -738,7 +738,7 @@ int rtksvrinit(rtksvr_t *svr)
svr->obs[i][j].data = &(svr_obsd[i][j]); svr->obs[i][j].data = &(svr_obsd[i][j]);
} }
#else #else
if (!(svr->nav.eph = (eph_t *)malloc(sizeof(eph_t) * MAXSAT * 1))) if (!(svr->nav.eph = (eph_t *)rt_malloc(sizeof(eph_t) * MAXSAT * 1)))
{ {
tracet(1, "rtksvrinit: malloc error\n"); tracet(1, "rtksvrinit: malloc error\n");
return 0; return 0;
@ -748,7 +748,7 @@ int rtksvrinit(rtksvr_t *svr)
svr->nav.n = MAXSAT * 1; svr->nav.n = MAXSAT * 1;
#ifdef ENAGLO #ifdef ENAGLO
geph_t geph0 = {0, -1}; geph_t geph0 = {0, -1};
if (!(svr->nav.geph = (geph_t *)malloc(sizeof(geph_t) * NSATGLO * 1))) if (!(svr->nav.geph = (geph_t *)rt_malloc(sizeof(geph_t) * NSATGLO * 1)))
{ {
tracet(1, "rtksvrinit: malloc error\n"); tracet(1, "rtksvrinit: malloc error\n");
return 0; return 0;
@ -759,7 +759,7 @@ int rtksvrinit(rtksvr_t *svr)
#endif #endif
#ifdef ENASBS #ifdef ENASBS
seph_t seph0 = {0}; seph_t seph0 = {0};
if (!(svr->nav.seph = (seph_t *)malloc(sizeof(seph_t) * NSATSBS * 1))) if (!(svr->nav.seph = (seph_t *)rt_malloc(sizeof(seph_t) * NSATSBS * 1)))
{ {
tracet(1, "rtksvrinit: malloc error\n"); tracet(1, "rtksvrinit: malloc error\n");
return 0; return 0;
@ -772,7 +772,7 @@ int rtksvrinit(rtksvr_t *svr)
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
for (j = 0; j < MAXOBSBUF; j++) for (j = 0; j < MAXOBSBUF; j++)
{ {
if (!(svr->obs[i][j].data = (obsd_t *)malloc(sizeof(obsd_t) * MAXOBS))) if (!(svr->obs[i][j].data = (obsd_t *)rt_malloc(sizeof(obsd_t) * MAXOBS)))
{ {
tracet(1, "rtksvrinit: malloc error\n"); tracet(1, "rtksvrinit: malloc error\n");
return 0; return 0;

6
rtconfig.h
View File

@ -59,7 +59,7 @@
#define RT_USING_COMPONENTS_INIT #define RT_USING_COMPONENTS_INIT
#define RT_USING_USER_MAIN #define RT_USING_USER_MAIN
#define RT_MAIN_THREAD_STACK_SIZE 2048 #define RT_MAIN_THREAD_STACK_SIZE 2048
#define RT_MAIN_THREAD_PRIORITY 20 #define RT_MAIN_THREAD_PRIORITY 5
/* C++ features */ /* C++ features */
@ -261,10 +261,6 @@
/* end of enhanced kernel services */ /* end of enhanced kernel services */
/* POSIX extension functions */
/* end of POSIX extension functions */
/* acceleration: Assembly language or algorithmic acceleration packages */ /* acceleration: Assembly language or algorithmic acceleration packages */
/* end of acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */