PowLu/TencentOS-tiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #117 from DavidLin1577/patch-2

Browse Source 
Improve readability of codes
This commit is contained in:
Arthur
2020-03-07 10:47:51 +08:00
committed by GitHub
parent 63ed9c91ed 2956d75b37
commit 6d0c6d3721
3 changed files with 57 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
board/Nuvoton_M251/BSP/Src/main.c
View File

@@ -3,7 +3,7 @@
#include "tos_k.h" #include "tos_k.h"
#define task1_size 240 // size of task1 stack #define task1_size 240 // size of task1 stack
#define task2_size 240 #define task2_size 240
k_task_t task1; //structure of task1 k_task_t task1; // structure of task1
k_task_t task2; k_task_t task2;
k_stack_t task1_stack[task1_size]; //stack of task1 k_stack_t task1_stack[task1_size]; //stack of task1
@@ -23,7 +23,7 @@ void SYS_Init(void)
/* Disable digital input path of analog pin XT1_OUT to prevent leakage */ /* Disable digital input path of analog pin XT1_OUT to prevent leakage */
GPIO_DISABLE_DIGITAL_PATH(PF, BIT2 | BIT3); GPIO_DISABLE_DIGITAL_PATH(PF, BIT2 | BIT3);
/* Enable<EFBFBD><EFBFBD> HXT clock */ /* Enable£¬ HXT clock */
CLK_EnableXtalRC(CLK_PWRCTL_HXTEN_Msk); CLK_EnableXtalRC(CLK_PWRCTL_HXTEN_Msk);
/* Switch HCLK clock source to external */ /* Switch HCLK clock source to external */
@@ -59,19 +59,16 @@ void UART0_Init()
//task1 function //task1 function
void task1_fun(void *Parameter) void task1_fun(void *Parameter)
{ {
while(1) while(1)
{ {
printf("Task1 <EFBFBD><EFBFBD>Thansplant CORTEX-M23 Succeed\r\n"); printf("Task1: Thansplant CORTEX-M23 Succeed\r\n");
PB14 =~ PB14; PB14 =~ PB14;
tos_task_delay(1000); tos_task_delay(1000);
} }
} }
void task2_task(void *Parameter) void task2_task(void *Parameter)
{ {
k_err_t err; k_err_t err;
while(1) while(1)
{ {
@@ -89,7 +86,8 @@ int main()
/* Init System, peripheral clock and multi-function I/O */ /* Init System, peripheral clock and multi-function I/O */
SYS_Init(); SYS_Init();
tos_knl_init(); //tos init ,include SystickInit,should init after protected registers unlock /* tos init ,include SystickInit,should init after protected registers unlock */
tos_knl_init();
/* Lock protected registers */ /* Lock protected registers */
SYS_LockReg(); SYS_LockReg();
@@ -109,8 +107,7 @@ int main()
2, 2,
task1_stack, task1_stack,
task1_size, task1_size,
100 100);
);
err = tos_task_create( err = tos_task_create(
&task2, &task2,
@@ -123,9 +120,7 @@ int main()
100); 100);
if(err != K_ERR_NONE) if(err != K_ERR_NONE)
printf("TenentOS creat task fail! code is %d\r\n",err); printf("TencentOS create task fail! errcode is %d\r\n",err);
tos_knl_start(); //Start TOS TINY tos_knl_start(); //Start TOS TINY
} }

5
board/Nuvoton_M251/BSP/Src/system_M251.c
View File

@@ -145,11 +145,9 @@ void Uart0DefaultMPF(void)
} }
//systick interrupt Handler function //systick interrupt Handler function
void SysTick_Handler(void) void SysTick_Handler(void)
{ {
if (tos_knl_is_running()) if (tos_knl_is_running())
{ {
tos_knl_irq_enter(); tos_knl_irq_enter();
@@ -157,6 +155,3 @@ void SysTick_Handler(void)
tos_knl_irq_leave(); tos_knl_irq_leave();
} }
} }

2
board/Nuvoton_M251/readme.md
View File

@@ -176,7 +176,7 @@ int main()
oled_size, //任务堆栈大小 oled_size, //任务堆栈大小
100); //时间片轮转机制下当前任务的时间片大小。当timeslice为0时，任务调度时间片会被设置为默认大小（TOS_CFG_CPU_TICK_PER_SECOND / 10），系统时钟滴答（systick）数 / 10。 100); //时间片轮转机制下当前任务的时间片大小。当timeslice为0时，任务调度时间片会被设置为默认大小（TOS_CFG_CPU_TICK_PER_SECOND / 10），系统时钟滴答（systick）数 / 10。
if(err != K_ERR_NONE) if(err != K_ERR_NONE)
printf("TenentOS creat task fail! code is %d\r\n",err); printf("TencentOS create task fail! code is %d\r\n",err);
tos_knl_start(); //Start TOS TINY tos_knl_start(); //Start TOS TINY
} }