Merge pull request #1 from armink/master

【修复】一处单词拼写错误。 fixed #15
pull/18/head
linghu 7 years ago committed by GitHub
commit e9c2f567fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -140,7 +140,7 @@ static const char * const print_info[] = {
[PRINT_DFSR_EXTERNAL] = "Debug fault is caused by EDBGRQ signal asserted", [PRINT_DFSR_EXTERNAL] = "Debug fault is caused by EDBGRQ signal asserted",
[PRINT_MMAR] = "The memory management fault occurred address is %08x", [PRINT_MMAR] = "The memory management fault occurred address is %08x",
[PRINT_BFAR] = "The bus fault occurred address is %08x", [PRINT_BFAR] = "The bus fault occurred address is %08x",
#elif (CMB_PRINT_LANGUAGE == CMB_PRINT_LANUUAGE_CHINESE) #elif (CMB_PRINT_LANGUAGE == CMB_PRINT_LANGUAGE_CHINESE)
[PRINT_FIRMWARE_INFO] = "固件名称:%s硬件版本号%s软件版本号%s", [PRINT_FIRMWARE_INFO] = "固件名称:%s硬件版本号%s软件版本号%s",
[PRINT_ASSERT_ON_THREAD] = "在线程(%s)中发生断言", [PRINT_ASSERT_ON_THREAD] = "在线程(%s)中发生断言",
[PRINT_ASSERT_ON_HANDLER] = "在中断或裸机环境下发生断言", [PRINT_ASSERT_ON_HANDLER] = "在中断或裸机环境下发生断言",

@ -42,5 +42,5 @@
/* enable dump stack information */ /* enable dump stack information */
/* #define CMB_USING_DUMP_STACK_INFO */ /* #define CMB_USING_DUMP_STACK_INFO */
/* language of print information */ /* language of print information */
/* #define CMB_PRINT_LANGUAGE CMB_PRINT_LANGUAGE_ENGLISH(default) or CMB_PRINT_LANUUAGE_CHINESE */ /* #define CMB_PRINT_LANGUAGE CMB_PRINT_LANGUAGE_ENGLISH(default) or CMB_PRINT_LANGUAGE_CHINESE */
#endif /* _CMB_CFG_H_ */ #endif /* _CMB_CFG_H_ */

@ -48,7 +48,7 @@
#define CMB_OS_PLATFORM_RTX5 4 #define CMB_OS_PLATFORM_RTX5 4
#define CMB_PRINT_LANGUAGE_ENGLISH 0 #define CMB_PRINT_LANGUAGE_ENGLISH 0
#define CMB_PRINT_LANUUAGE_CHINESE 1 #define CMB_PRINT_LANGUAGE_CHINESE 1
/* name max length, default size: 32 */ /* name max length, default size: 32 */
#ifndef CMB_NAME_MAX #ifndef CMB_NAME_MAX

Loading…
Cancel
Save