系统内核Time.h改名为TTime.h,否则在gcc和clang上会跟C库的time.h冲突。

同时,MDK不支持<ctime>的引用方式,用宏解决
This commit is contained in:
Stone 2016-06-22 09:50:16 +00:00
parent 4db2dd0736
commit 33e387f863
21 changed files with 55 additions and 29 deletions

View File

@ -1,5 +1,10 @@
#include "Button_GrayLevel.h"
#include "Time.h"
#include "Sys.h"
#include "Port.h"
#include "TTime.h"
#include "Timer.h"
#include "Button_GrayLevel.h"
//#include "Platform\stm32.h"

View File

@ -1,7 +1,6 @@
#ifndef __BUTTON_GRAY_LEVEL_H__
#define __BUTTON_GRAY_LEVEL_H__
#include "Sys.h"
#include "Port.h"
#include "Timer.h"
#include "Message\DataStore.h"

View File

@ -1,5 +1,7 @@
#include "IR.h"
#include "Time.h"
#include "Sys.h"
#include "TTime.h"
#include "IR.h"
//#include "Platform\stm32.h"

View File

@ -262,7 +262,7 @@ void SetWiFiTask(void* param)
assert(rs, "OnInvoke");
debug_printf("Invoke测试通过");
debug_printf("Invoke测试通过\r\n");
#endif
}

View File

@ -3,7 +3,11 @@
#include "SString.h"
#include "DateTime.h"
#include <time.h>
#if defined(__CC_ARM)
#include <time.h>
#else
#include <ctime>
#endif
/************************************************ DateTime ************************************************/

View File

@ -1,13 +1,22 @@
#include <stdlib.h>
#include <time.h>
#include "Buffer.h"
#include "Buffer.h"
#include "Environment.h"
#if defined(__CC_ARM)
#include <time.h>
#else
#include <ctime>
#endif
const TEnvironment Environment;
/************************************************ TEnvironment ************************************************/
TEnvironment::TEnvironment()
{
}
// 获取系统启动后经过的毫秒数
UInt64 TEnvironment::TickCount() const { return clock(); }

View File

@ -5,6 +5,8 @@
class TEnvironment
{
public:
TEnvironment();
// 获取系统启动后经过的毫秒数
UInt64 TickCount() const;

View File

@ -1,5 +1,5 @@
#include "RTC.h"
#include "Time.h"
#include "TTime.h"
/************************************************ HardRTC ************************************************/

View File

@ -1,6 +1,6 @@
#include "Sys.h"
#include "Task.h"
#include "Time.h"
#include "TTime.h"
#include "Esp8266.h"
#include "EspTcp.h"

View File

@ -1,6 +1,7 @@
#include "Sim900A.h"
#include "TTime.h"
#include "SerialPort.h"
#include "Time.h"
#include "Sim900A.h"
Sim900A::Sim900A()
{

View File

@ -11,7 +11,7 @@
#include "Net\DNS.h"
#include "W5500.h"
#include "Time.h"
#include "TTime.h"
#include "Task.h"
#define NET_DEBUG DEBUG

View File

@ -94,7 +94,7 @@ SmartIRQ::~SmartIRQ()
/*================================ 锁 ================================*/
#include "Time.h"
#include "TTime.h"
// 智能锁。初始化时锁定一个整数,销毁时解锁
Lock::Lock(int& ref)

View File

@ -1,6 +1,6 @@
#include "Sys.h"
#include "Time.h"
#include "TTime.h"
TSys Sys;
const TTime Time;

View File

@ -1,7 +1,7 @@
#include "Core\DateTime.h"
#include "DateTime.h"
#include "Task.h"
#include "Time.h"
#include "TTime.h"
Task::Task()
{

View File

@ -1,9 +1,13 @@
#include <time.h>
#include "Time.h"
#include "TTime.h"
#include "Environment.h"
#if defined(__CC_ARM)
#include <time.h>
#else
#include <ctime>
#endif
#define TIME_DEBUG 0
#define UTC true // utc 从1970/1/1 开始计时

View File

@ -1,5 +1,5 @@
#include "Sys.h"
#include "Time.h"
#include "TTime.h"
#include "ITransport.h"
#include "Socket.h"

View File

@ -1,5 +1,5 @@
#include "String.h"
#include "Time.h"
#include "SString.h"
#include "TTime.h"
#if DEBUG

View File

@ -1,4 +1,4 @@
#include "Time.h"
#include "TTime.h"
#include "Icmp.h"
#include "Arp.h"

View File

@ -1,4 +1,4 @@
#include "Time.h"
#include "TTime.h"
#include "TinyClient.h"
#include "Security\Crc.h"

View File

@ -1,4 +1,4 @@
#include "Time.h"
#include "TTime.h"
#include "Net\Socket.h"