diff options
| author | Meco Man <[email protected]> | 2022-08-28 13:25:47 -0400 |
|---|---|---|
| committer | Man, Jianting (Meco) <[email protected]> | 2022-09-07 10:11:45 -0400 |
| commit | ce16945cbab89543aa1e2674accfdbdd9fd8e686 (patch) | |
| tree | 8da0ef2fa6ee44815b543aae3b7368415418b573 /bsp | |
| parent | c75f52ff3a0b40a70a2eb2651b63241bb48c7428 (diff) | |
[kernel][version] 采用新的版本宏定义
版本控制规范：https://semver.org/
目前的版本子号不是很规范，其中RT_VERSION甚至和VS那边造成了冲突
```c
/* RT-Thread version information */
#define RT_VERSION 4L /**< major version number */
#define RT_SUBVERSION 1L /**< minor version number */
#define RT_REVISION 1L /**< revise version number */
```
参考ESP32：
```c
/** Major version number (X.x.x) */
#define ESP_ARDUINO_VERSION_MAJOR 2
/** Minor version number (x.X.x) */
#define ESP_ARDUINO_VERSION_MINOR 0
/** Patch version number (x.x.X) */
#define ESP_ARDUINO_VERSION_PATCH 3
```
建议改成：
```c
/* Major version number (X.x.x) */
#define RT_VERSION_MAJOR 4
/* Minor version number (x.X.x) */
#define RT_VERSION_MINOR 2
/* Patch version number (x.x.X) */
#define RT_VERSION_PATCH 0
```
Diffstat (limited to 'bsp')
| -rw-r--r-- | bsp/nuvoton/libraries/nu_packages/Demo/slcd_show_tick.c | 2 | ||||
| -rw-r--r-- | bsp/simulator/drivers/SConscript | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/bsp/nuvoton/libraries/nu_packages/Demo/slcd_show_tick.c b/bsp/nuvoton/libraries/nu_packages/Demo/slcd_show_tick.c index 5b1141134d..f5ae9c4fde 100644 --- a/bsp/nuvoton/libraries/nu_packages/Demo/slcd_show_tick.c +++ b/bsp/nuvoton/libraries/nu_packages/Demo/slcd_show_tick.c @@ -118,7 +118,7 @@ void slcd_demo_hook(void) /* Show RTT version. */ { LCDLIB_SetSymbol(SYMBOL_VERSION, 1); - rt_snprintf(au8Str, sizeof(au8Str), "%d%02d%03d", RT_VERSION, RT_SUBVERSION, RT_REVISION); + rt_snprintf(au8Str, sizeof(au8Str), "%d%02d%03d", RT_VERSION_MAJOR, RT_VERSION_MINOR, RT_VERSION_PATCH); LCDLIB_Printf(ZONE_VER_DIGIT, &au8Str[0]); LCDLIB_SetSymbol(SYMBOL_VER_DIG_P1, 1); LCDLIB_SetSymbol(SYMBOL_VER_DIG_P2, 1); diff --git a/bsp/simulator/drivers/SConscript b/bsp/simulator/drivers/SConscript index d43216fa34..101b630ae1 100644 --- a/bsp/simulator/drivers/SConscript +++ b/bsp/simulator/drivers/SConscript @@ -21,8 +21,6 @@ if rtconfig.CROSS_TOOL == 'msvc': '_CRT_NO_TIME_T', # disable deprecation of unsafe functions, such as strncpy '_CRT_SECURE_NO_WARNINGS', - # RT_VESRION conflicts in winuser.h - 'NORESOURCE', # lean and mean for Windows.h, exclude winsock.h when include Windows.h # avoid conlicts between sys/select.h, time.h, and winsock.h # such as fd_set related, struct timeval... |