绝对路径引用Sys.h，避免与lwip冲突

App/Alarm.h

@@ -1,7 +1,7 @@
 #ifndef __Alarm_H__
 #define __Alarm_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\Timer.h"
 #include "Device\Port.h"
 #include "Config.h"

App/BlinkPort.h

@@ -1,7 +1,7 @@
 #ifndef __BlinkPort_H__
 #define __BlinkPort_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\Port.h"
 
 // 闪烁端口

App/Button.h

@@ -1,7 +1,7 @@
 #ifndef __BUTTON_H__
 #define __BUTTON_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\Port.h"
 #include "Message\DataStore.h"
 

App/Button_GrayLevel.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Kernel\Task.h"
 #include "Device\Port.h"
 

App/Button_magnetic.h

@@ -1,7 +1,7 @@
 #ifndef __BUTTON_H__
 #define __BUTTON_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\Port.h"
 
 // 面板按钮

App/CommandPort.h

@@ -1,7 +1,7 @@
 #ifndef __CommandPort_H__
 #define __CommandPort_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\Port.h"
 
 // 命令端口。通过命令来控制输出口开关、取反、延时打开、打开延迟等高级功能

App/Dimmer.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 #include "Device/Pwm.h"
 

App/Dimmer.h

@@ -1,7 +1,7 @@
 #ifndef __Dimmer_H_
 #define __Dimmer_H_
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Platform\Pin.h"
 
 class Pwm;

App/FlushPort.h

@@ -1,7 +1,7 @@
 #ifndef __FlushPort_H__
 #define __FlushPort_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\Port.h"
 #include "Message\DataStore.h"
 

App/IR.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Kernel\TTime.h"
 
 #include "IR.h"

App/IR.h

@@ -2,7 +2,7 @@
 #ifndef __IR_H__
 #define __IR_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\Pwm.h"
 #include "Device\Port.h"
 

App/IRcoding.h

@@ -2,7 +2,7 @@
 #ifndef __IRCODING_H__
 #define __IRCODING_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "..\Storage\Storage.h"
 
 /*	

App/PowerUps.h

@@ -2,7 +2,7 @@
 #ifndef __Music_H__
 #define __Music_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "../Core/Delegate.h"
 
 

App/Raster.h

@@ -1,7 +1,7 @@
 #ifndef __RASTER__H__
 #define __RASTER__H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 #pragma pack(push)
 #pragma pack(1)

App/Sensor.h

@@ -1,7 +1,7 @@
 #ifndef __SENSOR_H__
 #define __SENSOR_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\Port.h"
 
 

App/Sound.h

@@ -2,7 +2,7 @@
 #ifndef __Music_H__
 #define __Music_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\Timer.h"
 #include "Device\Port.h"
 

Board/AP0103.h

@@ -1,7 +1,7 @@
 #ifndef _AP0103_H_
 #define _AP0103_H_
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Net\ITransport.h"
 #include "Net\Socket.h"
 

Board/AP0104.h

@@ -1,7 +1,7 @@
 #ifndef _AP0104_H_
 #define _AP0104_H_
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Net\ITransport.h"
 #include "Net\Socket.h"
 

Board/AP0801.h

@@ -1,7 +1,7 @@
 #ifndef _AP0801_H_
 #define _AP0801_H_
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Net\ITransport.h"
 #include "Net\Socket.h"
 

Board/AP0802.h

@@ -1,7 +1,7 @@
 #ifndef _AP0802_H_
 #define _AP0802_H_
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Net\ITransport.h"
 #include "Net\Socket.h"
 

Board/BaseBoard.h

@@ -1,7 +1,7 @@
 #ifndef _BaseBoard_H_
 #define _BaseBoard_H_
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\RTC.h"
 
 /*struct

Board/IOK026X.h

@@ -1,7 +1,7 @@
 #ifndef _IOK026X_H_
 #define _IOK026X_H_
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Net\ITransport.h"
 #include "Net\Socket.h"
 

Board/IOK027X.h

@@ -1,7 +1,7 @@
 #ifndef _IOK027X_H_
 #define _IOK027X_H_
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Net\ITransport.h"
 #include "Net\Socket.h"
 

Board/IOK0612.h

@@ -1,7 +1,7 @@
 #ifndef _IOK0612_H_
 #define _IOK0612_H_
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Net\ITransport.h"
 #include "Net\Socket.h"
 

Board/NH3_0317.h

@@ -1,7 +1,7 @@
 #ifndef _NH3_0317_H_
 #define _NH3_0317_H_
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Net\ITransport.h"
 #include "Net\Socket.h"
 

Board/Pandora.h

@@ -1,7 +1,7 @@
 #ifndef _Pandora_H_
 #define _Pandora_H_
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Net\ITransport.h"
 #include "Net\Socket.h"
 

BootConfig.h

@@ -1,7 +1,7 @@
 #ifndef __BootConfig__H__
 #define __BootConfig__H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Config.h"
 
 #pragma pack(push)

Config.h

@@ -1,7 +1,7 @@
 #ifndef __Config_H__
 #define __Config_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Storage\Storage.h"
 
 // 配置管理

Device/ADC.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "ADC.h"
 
 //Pin _Pins[] = ADC1_PINS;

Device/CAN.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 #include "Can.h"
 

Device/CAN.h

@@ -1,7 +1,7 @@
 #ifndef __CAN_H__
 #define __CAN_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 // CAN类
 class Can

Device/DAC.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\Port.h"
 #include "DAC.h"
 

Device/DMA.cpp

@@ -1,2 +1,2 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "DMA.h"

Device/I2C.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 #include "I2C.h"
 

Device/Port.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\Port.h"
 
 /******************************** Port ********************************/

Device/Port.h

@@ -1,7 +1,7 @@
 #ifndef _Port_H_
 #define _Port_H_
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 #ifdef STM32F4
 	#define GPIO_MAX_SPEED 100

Device/Power.h

@@ -1,7 +1,7 @@
 #ifndef __Power_H__
 #define __Power_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 // 电源管理接口
 class Power

Device/Proxy.h

@@ -1,7 +1,7 @@
 #ifndef __Proxy_H__
 #define __Proxy_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\SerialPort.h"
 #include "ProxyConfig.h"
 

Device/ProxyConfig.h

@@ -1,7 +1,7 @@
 #ifndef __ProxyCfg_H__
 #define __ProxyCfg_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Config.h"
 
 class ProxyConfig : public ConfigBase

Device/Pwm.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 #include "Port.h"
 #include "Pwm.h"

Device/RTC.h

@@ -1,7 +1,7 @@
 #ifndef __RTC_H__
 #define __RTC_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 // 实时时钟
 class HardRTC

Device/SerialPort.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Kernel\Task.h"
 
 #include "SerialPort.h"

Device/Spi.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 #include "Spi.h"
 

Device/Timer.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 #include "Timer.h"
 

Device/Timer.h

@@ -1,7 +1,7 @@
 #ifndef __Timer_H__
 #define __Timer_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\Port.h"
 
 // 定时器

Device/UTPort.h

@@ -1,7 +1,7 @@
 #ifndef __UTPort_H__
 #define __UTPort_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\SerialPort.h"
 #include "Message/Pair.h"
 

Device/WatchDog.h

@@ -1,7 +1,7 @@
 #ifndef __WatchDog_H__
 #define __WatchDog_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 // 看门狗
 class WatchDog

Drivers/AT45DB.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\Port.h"
 #include "Device\Spi.h"
 #include "AT45DB.h"

Drivers/AT45DB.h

@@ -1,7 +1,7 @@
 #ifndef __AT45DB_H__
 #define __AT45DB_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\Spi.h"
 
 // AT45DB存储Flash

Drivers/BH1750.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 #include "Device\I2C.h"
 

Drivers/Enc28j60.h

@@ -1,7 +1,7 @@
 #ifndef __Enc28j60_H__
 #define __Enc28j60_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\Spi.h"
 #include "Device\Power.h"
 #include "Net\ITransport.h"

Drivers/Esp8266/Esp8266.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Kernel\Task.h"
 #include "Kernel\TTime.h"
 

Drivers/Esp8266/WaitExpect.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 #include "WaitExpect.h"
 

Drivers/JTW8953.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "JTW8953.h"
 
 #include "Device\I2C.h"

Drivers/NRF24L01.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\Port.h"
 #include "NRF24L01.h"
 

Drivers/ShunCom.h

@@ -1,7 +1,7 @@
 #ifndef __ShunCom_H__
 #define __ShunCom_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\Port.h"
 #include "Device\Power.h"
 #include "Net\ITransport.h"

Drivers/W5500.cpp

@@ -1,6 +1,6 @@
 #include "stddef.h"
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\Spi.h"
 #include "Device\Power.h"
 #include "Net\ITransport.h"

Drivers/nrf24l01.h

@@ -1,7 +1,7 @@
 #ifndef __NRF24L01_H__
 #define __NRF24L01_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\Spi.h"
 #include "Net\ITransport.h"
 #include "Device\Power.h"

Kernel/Heap.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Interrupt.h"
 
 #include "Heap.h"

Kernel/Interrupt.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 #include "Interrupt.h"
 

Kernel/Sys.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 #include "Interrupt.h"
 #include "TTime.h"

Kernel/TTime.h

@@ -1,7 +1,7 @@
 #ifndef __TIME_H__
 #define __TIME_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 // 时间类
 // 使用双计数时钟，TIMx专用于毫秒级系统计时，SysTick用于微秒级延迟，秒级以及以上采用全局整数累加

Kernel/Task.h

@@ -1,7 +1,7 @@
 #ifndef __Task_H__
 #define __Task_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 class TaskScheduler;
 

Kernel/Thread.h

@@ -1,7 +1,7 @@
 #ifndef __Thread_H__
 #define __Thread_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Core\LinkedList.h"
 
 class Thread;

Message/BinaryPair.h

@@ -1,7 +1,7 @@
 #ifndef __BinaryPair_H__
 #define __BinaryPair_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Pair.h"
 
 #include "Net\IPEndPoint.h"

Message/Controller.h

@@ -1,7 +1,7 @@
 #ifndef __Controller_H__
 #define __Controller_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Net\ITransport.h"
 
 #include "Message.h"

Message/DataStore.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 #include "DataStore.h"
 

Message/Message.h

@@ -1,7 +1,7 @@
 #ifndef __Message_H__
 #define __Message_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 // 消息基类
 class Message

Message/MessageBase.h

@@ -1,7 +1,7 @@
 #ifndef __MessageBase_H__
 #define __MessageBase_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Message.h"
 
 // 应用消息基类

Message/Pair.h

@@ -1,7 +1,7 @@
 #ifndef __Pair_H__
 #define __Pair_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Message.h"
 
 #include "Net\IPEndPoint.h"

Message/ProxyFactory.h

@@ -1,7 +1,7 @@
 #ifndef __ProxyFactory_H__
 #define __ProxyFactory_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Message\Pair.h"
 #include "TokenNet\TokenClient.h"
 #include "Device\Proxy.h"

Message/UTPacket.h

@@ -1,7 +1,7 @@
 #ifndef __UTPacket_H__
 #define __UTPacket_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "TokenNet\TokenMessage.h"
 #include "Message\Pair.h"
 #include "Device\UTPort.h"

Message/WeakStore.h

@@ -1,7 +1,7 @@
 #ifndef __WeakStore_H__
 #define __WeakStore_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 // 弱存储。
 // 采用全局变量或者堆分配的变量在系统启动时会被清空。

Modbus/Master.h

@@ -1,7 +1,7 @@
 #ifndef __Master_H__
 #define __Master_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 // Modbus主机
 class Master

Modbus/Modbus.h

@@ -1,7 +1,7 @@
 #ifndef __Slave_H__
 #define __Slave_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 class ModbusErrors
 {

Modbus/Slave.h

@@ -1,7 +1,7 @@
 #ifndef __Slave_H__
 #define __Slave_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 // Modbus从机
 class Slave

Net/Blu40.h

@@ -1,7 +1,7 @@
 #ifndef __BLU40_H__
 #define __BLU40_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\Port.h"
 #include "Net\ITransport.h"
 

Net/DNS.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Kernel\TTime.h"
 #include "ITransport.h"
 

Net/Dhcp.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "ITransport.h"
 
 #include "Socket.h"

Net/Ethernet.h

@@ -1,7 +1,7 @@
 #ifndef _Ethernet_H_
 #define _Ethernet_H_
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 // TCP/IP协议头部结构体
 

Net/IPAddress.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 #include "IPAddress.h"
 

Net/ITransport.h

@@ -1,7 +1,7 @@
 #ifndef __ITransport_H__
 #define __ITransport_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 class ITransport;
 

Net/Zigbee.h

@@ -1,7 +1,7 @@
 #ifndef __Zigbee_H__
 #define __Zigbee_H__
 
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\Port.h"
 #include "Net\ITransport.h"
 

Platform/CortexM/Interrupt.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 #include "Kernel\Interrupt.h"
 //#include "SerialPort.h"

Platform/CortexM/Port.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Kernel\Interrupt.h"
 #include "Device\Port.h"
 

Platform/CortexM/SerialPort.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Kernel\Task.h"
 #include "Kernel\Interrupt.h"
 #include "Device\SerialPort.h"

Platform/CortexM/Sys.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include <stdarg.h>
 //#include "WatchDog.h"
 

Platform/CortexM/Time.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Kernel\Interrupt.h"
 #include "Kernel\TTime.h"
 #include "Device\Timer.h"

Platform/GD32F1x0/I2C.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Device\I2C.h"
 
 #include "Platform\stm32.h"

Platform/GD32F1x0/Interrupt.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 #include "Kernel\Interrupt.h"
 

Platform/GD32F1x0/Port.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Kernel\Interrupt.h"
 #include "Device\Port.h"
 

Platform/GD32F1x0/Pwm.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 #include "Device\Pwm.h"
 

Platform/GD32F1x0/SerialPort.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Kernel\Task.h"
 #include "Kernel\Interrupt.h"
 #include "Device\SerialPort.h"

Platform/GD32F1x0/Spi.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 #include "Device\Spi.h"
 

Platform/GD32F1x0/Timer.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Kernel\Interrupt.h"
 #include "Device\Timer.h"
 

Platform/STM32F0/Interrupt.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 #include "Kernel\Interrupt.h"
 //#include "SerialPort.h"

Platform/STM32F0/Port.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Kernel\Interrupt.h"
 #include "Device\Port.h"
 

Platform/STM32F0/Pwm.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 
 #include "Device\Pwm.h"
 

Platform/STM32F0/SerialPort.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Kernel\Task.h"
 #include "Kernel\Interrupt.h"
 #include "Device\SerialPort.h"

Platform/STM32F1/CAN.cpp

@@ -1,4 +1,4 @@
-#include "Sys.h"
+#include "Kernel\Sys.h"
 #include "Kernel\Interrupt.h"
 #include "Device\Port.h"