diff --git a/Kernel/Sys.cpp b/Kernel/Sys.cpp index 29dc2688..1e82060e 100644 --- a/Kernel/Sys.cpp +++ b/Kernel/Sys.cpp @@ -33,14 +33,13 @@ TSys::TSys() { OnInit(); - OnSleep = nullptr; + OnSleep = nullptr; Code = 0x0000; Ver = 0x0300; #ifndef TINY Name = "SmartOS"; Company = "NewLife_Embedded_Team"; - //BuildTime = "yyyy-MM-dd HH:mm:ss"; Interrupt.Init(); #endif @@ -69,9 +68,10 @@ void TSys::ShowInfo() const { #if DEBUG //byte* ver = (byte*)&Version; - debug_printf("%s::%s Code:%04X ", Company.GetBuffer(), Name.GetBuffer(), Code); + debug_printf("%s::%s Code:%04X ", Company, Name, Code); //debug_printf("Ver:%x.%x Build:%s\r\n", *ver++, *ver++, BuildTime); - debug_printf("Ver:%s Build:%s\r\n", Ver.ToString().GetBuffer(), Ver.Compile().ToString().GetBuffer()); + Version v(0, 0, Ver, 0); + debug_printf("Ver:%s Build:%s\r\n", v.ToString().GetBuffer(), v.Compile().ToString().GetBuffer()); OnShowInfo(); diff --git a/Kernel/Sys.h b/Kernel/Sys.h index 1ef65a41..e73c23ec 100644 --- a/Kernel/Sys.h +++ b/Kernel/Sys.h @@ -77,10 +77,10 @@ public: uint Clock; // 系统时钟 uint CystalClock;// 晶振时钟 - String Name; // 系统名称 - String Company; // 系统厂商 + cstring Name; // 系统名称 + cstring Company; // 系统厂商 ushort Code; // 产品代码 - Version Ver; // 系统版本 + ushort Ver; // 系统版本 byte ID[12]; // 芯片ID。 ushort DevID; // MCU编码。低字设备版本,高字子版本 ushort RevID; // MCU编码。低字设备版本,高字子版本 diff --git a/Platform/CortexM/Sys.cpp b/Platform/CortexM/Sys.cpp index 30c9caf7..5c6291d7 100644 --- a/Platform/CortexM/Sys.cpp +++ b/Platform/CortexM/Sys.cpp @@ -169,25 +169,11 @@ void TSys::OnInit() InitHeapStack(StackTop()); #endif - OnSleep = nullptr; - #ifdef STM32F1 // 关闭JTAG仿真接口,只打开SW仿真。 RCC->APB2ENR |= RCC_APB2ENR_AFIOEN; // 打开时钟 AFIO->MAPR |= AFIO_MAPR_SWJ_CFG_JTAGDISABLE; //关闭JTAG仿真接口,只打开SW仿真。 #endif - - Code = 0x0000; - Ver = 0x0300; -#ifndef TINY - Name = "SmartOS"; - Company = "NewLife_Embedded_Team"; - //BuildTime = "yyyy-MM-dd HH:mm:ss"; - - Interrupt.Init(); -#endif - - Started = false; } #pragma arm section code diff --git a/TinyNet/TinyClient.cpp b/TinyNet/TinyClient.cpp index ab9627e0..8a8aa7be 100644 --- a/TinyNet/TinyClient.cpp +++ b/TinyNet/TinyClient.cpp @@ -59,7 +59,7 @@ void TinyClient::Open() } HardCrc = Crc::Hash16(Buffer(Sys.ID, 16)); - if(Sys.Ver.Major > 1) Encryption = true; + if(Sys.Ver > 1) Encryption = true; Control->Mode = 0; // 客户端只接收自己的消息 Control->Open(); diff --git a/TokenNet/HelloMessage.cpp b/TokenNet/HelloMessage.cpp index 03bea728..2a641284 100644 --- a/TokenNet/HelloMessage.cpp +++ b/TokenNet/HelloMessage.cpp @@ -10,7 +10,7 @@ // 初始化消息,各字段为0 HelloMessage::HelloMessage() : Cipher(1), Key(0) { - Version = Sys.Ver.Major; + Version = Sys.Ver; ushort code = _REV16(Sys.Code); Type = Buffer(&code, 2).ToHex(); diff --git a/TokenNet/TokenConfig.cpp b/TokenNet/TokenConfig.cpp index ae0cfb65..23754bc3 100644 --- a/TokenNet/TokenConfig.cpp +++ b/TokenNet/TokenConfig.cpp @@ -19,7 +19,7 @@ void TokenConfig::Init() Length = Size(); ServerIP = 0; - SoftVer = Sys.Ver.Major; + SoftVer = Sys.Ver; PingTime = 10; //User[16] = '\0'; //Key[15] = '\0';