Merge branch 'master' into master

This commit is contained in:
Man, Jianting (Meco) 2021-12-08 23:14:17 -05:00 committed by GitHub
commit 75cf0916d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -10,9 +10,19 @@
#include <rtthread.h> #include <rtthread.h>
#include <pikaScript.h> #include <pikaScript.h>
#if 0 #ifdef PKG_PIKASCRIPT_USING_AUTORUNNING
#ifdef PKG_PIKASCRIPT_STACK_SIZE
#define PIKASCRIPT_STACK_SIZE PKG_PIKASCRIPT_STACK_SIZE
#else
#define PIKASCRIPT_STACK_SIZE 4096 #define PIKASCRIPT_STACK_SIZE 4096
#endif
#ifdef PKG_PIKASCRIPT_STACK_PRIO
#define PIKASCRIPT_STACK_PRIO PKG_PIKASCRIPT_STACK_PRIO
#else
#define PIKASCRIPT_STACK_PRIO 20 #define PIKASCRIPT_STACK_PRIO 20
#endif
static void pikascript_entry(void *parameter) static void pikascript_entry(void *parameter)
{ {
@ -38,7 +48,6 @@ static int rt_pika_init(void)
return 0; return 0;
} }
INIT_APP_EXPORT(rt_pika_init); INIT_APP_EXPORT(rt_pika_init);
#else #else
@ -48,4 +57,5 @@ static int pika_main(int argc, char *argv[])
return 0; return 0;
} }
MSH_CMD_EXPORT_ALIAS(pika_main, pika, run PikaScript); MSH_CMD_EXPORT_ALIAS(pika_main, pika, run PikaScript);
#endif
#endif /* PKG_PIKASCRIPT_USING_AUTORUNNING */