NewLife
/
SmartOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

转UTF8编码

This commit is contained in:
WangQiang 2015-01-19 08:21:04 +00:00
parent e1e22d3646
commit 1765360137
44 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
App/Button.cpp
View File

@ -1,4 +1,4 @@
#include "Button.h" #include "Button.h"
void Button::Init() void Button::Init()
{ {

2
App/Button.h
View File

@ -1,4 +1,4 @@
#ifndef __BUTTON_H__ #ifndef __BUTTON_H__
#define __BUTTON_H__ #define __BUTTON_H__
#include "Sys.h" #include "Sys.h"

2
App/Button_magnetic.cpp
View File

@ -1,4 +1,4 @@
#include "Button_magnetic.h" #include "Button_magnetic.h"
void Button_magnetic::Init() void Button_magnetic::Init()
{ {

2
App/Button_magnetic.h
View File

@ -1,4 +1,4 @@
#ifndef __BUTTON_H__ #ifndef __BUTTON_H__
#define __BUTTON_H__ #define __BUTTON_H__
#include "Sys.h" #include "Sys.h"

6
App/Sensor.cpp
View File

@ -1,12 +1,12 @@
#include "Sensor.h" #include "Sensor.h"
void Sensor::Init() void Sensor::Init()
{ {
Key = NULL; Key = NULL;
Led = NULL; Led = NULL;
Buzzer = NULL; Buzzer = NULL;
Pir=NULL; //门磁 Pir=NULL; //门磁
Pir=NULL; //人体感应 Pir=NULL; //人体感应
Name = NULL; Name = NULL;
Index = 0; Index = 0;

22
App/Sensor.h
View File

@ -1,4 +1,4 @@
#ifndef __SENSOR_H__ #ifndef __SENSOR_H__
#define __SENSOR_H__ #define __SENSOR_H__
#include "Sys.h" #include "Sys.h"
@ -11,22 +11,22 @@ class Sensor
public: public:
string Name; //名字 string Name; //名字
int Index; //索引号 int Index; //索引号
OutputPort* Led; // 指示灯 OutputPort* Led; // 指示灯
OutputPort* Buzzer; // 蜂鸣器 OutputPort* Buzzer; // 蜂鸣器
InputPort* Key; // 输入按键 InputPort* Key; // 输入按键
InputPort* Pir; //人体感应 InputPort* Pir; //人体感应
InputPort* Mag; //门磁 InputPort* Mag; //门磁
//I2C* Ifrared //红外转发 //I2C* Ifrared //红外转发
// 构造函数。指示灯和继电器一般开漏输出，需要倒置 // 构造函数。指示灯和继电器一般开漏输出，需要倒置
Sensor() { Init(); } Sensor() { Init(); }
Sensor(Pin key, Pin led = P0, bool ledInvert = true, Pin buzzer = P0, bool keyInvert=true); Sensor(Pin key, Pin led = P0, bool ledInvert = true, Pin buzzer = P0, bool keyInvert=true);
Sensor(Pin key, Pin led = P0, Pin buzzer = P0); Sensor(Pin key, Pin led = P0, Pin buzzer = P0);
@ -48,7 +48,7 @@ private:
void* _Param; void* _Param;
private: private:
bool _Value; // 状态 bool _Value; // 状态
}; };
#endif #endif

2
Modbus/Master.cpp
View File

@ -1 +1 @@
#include "Master.h" #include "Master.h"

2
Modbus/Modbus.cpp
View File

@ -1,4 +1,4 @@
#include "Modbus.h" #include "Modbus.h"
Modbus::Modbus() Modbus::Modbus()
{ {

2
Modbus/Slave.cpp
View File

@ -1,4 +1,4 @@
#include "Slave.h" #include "Slave.h"
Slave(ITransport* port) Slave(ITransport* port)
{ {

2
Net/ESP8266.cpp
View File

@ -1,4 +1,4 @@
#include "Zigbee.h" #include "Zigbee.h"
Zigbee::Zigbee(ITransport* port, Pin rst) Zigbee::Zigbee(ITransport* port, Pin rst)
{ {

2
Net/ITransport.h
View File

@ -1,4 +1,4 @@
#ifndef __ITransport_H__ #ifndef __ITransport_H__
#define __ITransport_H__ #define __ITransport_H__
#include "Sys.h" #include "Sys.h"

2
Net/Net.h
View File

@ -1,4 +1,4 @@
#ifndef _Net_H_ #ifndef _Net_H_
#define _Net_H_ #define _Net_H_
#include "Sys.h" #include "Sys.h"

2
Net/Zigbee.cpp
View File

@ -1,4 +1,4 @@
#include "Zigbee.h" #include "Zigbee.h"
Zigbee::Zigbee() Zigbee::Zigbee()
{ {

2
Net/Zigbee.h
View File

@ -1,4 +1,4 @@
#ifndef __Zigbee_H__ #ifndef __Zigbee_H__
#define __Zigbee_H__ #define __Zigbee_H__
#include "Sys.h" #include "Sys.h"

8
Net/zigbee速率.txt
View File

@ -1,12 +1,12 @@
主站个数 从站个数 包大小 传输方向 大概速度<字节/每秒> 主站个数 从站个数 包大小 传输方向 大概速度<字节/每秒>
1 1 42 主-》从 84 1 1 42 主-》从 84
32 99 32 99
42 从-》主 发送210 收到400+ 42 从-》主 发送210 收到400+
32 发送160 收到280+ 32 发送160 收到280+

2
Platform/Boot_F0.cpp
View File

@ -1,4 +1,4 @@
#include "stm32.h" #include "stm32.h"
extern "C" extern "C"
{ {

2
Platform/Boot_F1.cpp
View File

@ -1,4 +1,4 @@
#include "stm32.h" #include "stm32.h"
extern "C" extern "C"
{ {

2
Platform/Boot_F4.cpp
View File

@ -1,4 +1,4 @@
#include "stm32.h" #include "stm32.h"
extern "C" extern "C"
{ {

2
Platform/Pin.h
View File

@ -1,4 +1,4 @@
#ifndef _PIN_H_ #ifndef _PIN_H_
#define _PIN_H_ #define _PIN_H_
/* 针脚 ------------------------------------------------------------------*/ /* 针脚 ------------------------------------------------------------------*/

2
Platform/Pin_STM32F0.h
View File

@ -1,4 +1,4 @@
#ifndef _PIN_STM32F0_H_ #ifndef _PIN_STM32F0_H_
#define _PIN_STM32F0_H_ 1 #define _PIN_STM32F0_H_ 1
#include "Pin.h" #include "Pin.h"

2
Platform/Pin_STM32F1.h
View File

@ -1,4 +1,4 @@
#ifndef _PIN_STM32F1_H_ #ifndef _PIN_STM32F1_H_
#define _PIN_STM32F1_H_ 1 #define _PIN_STM32F1_H_ 1
#include "Pin.h" #include "Pin.h"

2
Platform/Pin_STM32F4.h
View File

@ -1,4 +1,4 @@
#ifndef _PIN_STM32F4_H_ #ifndef _PIN_STM32F4_H_
#define _PIN_STM32F4_H_ #define _PIN_STM32F4_H_
#include "Pin.h" #include "Pin.h"

2
Platform/startup_stm32f0xx.s
View File

@ -1,4 +1,4 @@
;!!!全局的类对象构造函数会在SmartOS重设RAM位置之前执行，要确保它们栈充足 ;!!!全局的类对象构造函数会在SmartOS重设RAM位置之前执行，要确保它们栈充足
; 栈空间意义不大，SmartOS将会重新设定到RAM最大值，这里分配的栈空间仅用于TSys构造函数重新指定栈之前 ; 栈空间意义不大，SmartOS将会重新设定到RAM最大值，这里分配的栈空间仅用于TSys构造函数重新指定栈之前
Stack_Size EQU 0x00000400 Stack_Size EQU 0x00000400

2
Platform/startup_stm32f10x.s
View File

@ -1,4 +1,4 @@
;!!!全局的类对象构造函数会在SmartOS重设RAM位置之前执行，要确保它们栈充足 ;!!!全局的类对象构造函数会在SmartOS重设RAM位置之前执行，要确保它们栈充足
; 栈空间意义不大，SmartOS将会重新设定到RAM最大值，这里分配的栈空间仅用于TSys构造函数重新指定栈之前 ; 栈空间意义不大，SmartOS将会重新设定到RAM最大值，这里分配的栈空间仅用于TSys构造函数重新指定栈之前
Stack_Size EQU 0x00001000 Stack_Size EQU 0x00001000

2
Platform/startup_stm32f4xx.s
View File

@ -1,4 +1,4 @@
;!!!全局的类对象构造函数会在SmartOS重设RAM位置之前执行，要确保它们栈充足 ;!!!全局的类对象构造函数会在SmartOS重设RAM位置之前执行，要确保它们栈充足
; 栈空间意义不大，SmartOS将会重新设定到RAM最大值，这里分配的栈空间仅用于TSys构造函数重新指定栈之前 ; 栈空间意义不大，SmartOS将会重新设定到RAM最大值，这里分配的栈空间仅用于TSys构造函数重新指定栈之前
Stack_Size EQU 0x00001000 Stack_Size EQU 0x00001000

2
Platform/stm32.h
View File

@ -1,4 +1,4 @@
#ifndef __STM32_H #ifndef __STM32_H
#define __STM32_H #define __STM32_H
#if defined (STM32F0XX_LD) || defined (STM32F030X6) || defined (STM32F0XX_MD) || defined (STM32F030X8) #if defined (STM32F0XX_LD) || defined (STM32F030X6) || defined (STM32F0XX_MD) || defined (STM32F030X8)

2
Test/AT45DBTest.cpp
View File

@ -1,4 +1,4 @@
#include "AT45DB.h" #include "AT45DB.h"
const byte Tx_Buffer[] = "STM32F10x SPI Firmware Library Example: communication with an AT45DB SPI FLASH"; const byte Tx_Buffer[] = "STM32F10x SPI Firmware Library Example: communication with an AT45DB SPI FLASH";
Spi* _spi; Spi* _spi;

2
Test/EthernetTest.cpp
View File

@ -1,4 +1,4 @@
#include "Sys.h" #include "Sys.h"
#include "Enc28j60.h" #include "Enc28j60.h"
#include "SerialPort.h" #include "SerialPort.h"
#include "TinyIP\TinyIP.h" #include "TinyIP\TinyIP.h"

2
Test/FlashTest.cpp
View File

@ -1,4 +1,4 @@
#include "Flash.h" #include "Flash.h"
#include <stdlib.h> #include <stdlib.h>
void TestFlash() void TestFlash()

2
Test/NRF24L01Test.cpp
View File

@ -1,4 +1,4 @@
#include "Sys.h" #include "Sys.h"
#include "NRF24L01.h" #include "NRF24L01.h"
#include "conf.h" #include "conf.h"

2
Test/SerialTest.cpp
View File

@ -1,4 +1,4 @@
#include "SerialPort.h" #include "SerialPort.h"
uint OnUsartRead(ITransport* transport, byte* buf, uint len, void* param) uint OnUsartRead(ITransport* transport, byte* buf, uint len, void* param)
{ {

2
Test/ThreadTest.cpp
View File

@ -1,4 +1,4 @@
#include "Sys.h" #include "Sys.h"
#include "Port.h" #include "Port.h"
#include "Thread.h" #include "Thread.h"

2
Test/TimerTest.cpp
View File

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

2
Test/conf.h
View File

@ -1,4 +1,4 @@
#ifndef __TEST_CONF__H__ #ifndef __TEST_CONF__H__
#define __TEST_CONF__H__ #define __TEST_CONF__H__
#include "Sys.h" #include "Sys.h"

2
TinyIP/Arp.h
View File

@ -1,4 +1,4 @@
#ifndef _TinyIP_ARP_H_ #ifndef _TinyIP_ARP_H_
#define _TinyIP_ARP_H_ #define _TinyIP_ARP_H_
#include "TinyIP.h" #include "TinyIP.h"

2
TinyIP/Dhcp.h
View File

@ -1,4 +1,4 @@
#ifndef _TinyIP_DHCP_H_ #ifndef _TinyIP_DHCP_H_
#define _TinyIP_DHCP_H_ #define _TinyIP_DHCP_H_
#include "Udp.h" #include "Udp.h"

2
TinyIP/HttpClient.h
View File

@ -1,4 +1,4 @@
#ifndef _TinyIP_HttpClient_H_ #ifndef _TinyIP_HttpClient_H_
#define _TinyIP_HttpClient_H_ #define _TinyIP_HttpClient_H_
#include "TinyIP.h" #include "TinyIP.h"

2
TinyIP/Icmp.h
View File

@ -1,4 +1,4 @@
#ifndef _TinyIP_ICMP_H_ #ifndef _TinyIP_ICMP_H_
#define _TinyIP_ICMP_H_ #define _TinyIP_ICMP_H_
#include "Sys.h" #include "Sys.h"

2
TinyIP/Tcp.h
View File

@ -1,4 +1,4 @@
#ifndef _TinyIP_TCP_H_ #ifndef _TinyIP_TCP_H_
#define _TinyIP_TCP_H_ #define _TinyIP_TCP_H_
#include "TinyIP.h" #include "TinyIP.h"

2
TinyIP/TinyIP.h
View File

@ -1,4 +1,4 @@
#ifndef _TinyIP_H_ #ifndef _TinyIP_H_
#define _TinyIP_H_ #define _TinyIP_H_
// 模块开发使用说明见后 // 模块开发使用说明见后

2
TinyIP/Udp.h
View File

@ -1,4 +1,4 @@
#ifndef _TinyIP_UDP_H_ #ifndef _TinyIP_UDP_H_
#define _TinyIP_UDP_H_ #define _TinyIP_UDP_H_
#include "TinyIP.h" #include "TinyIP.h"

2
TinyNet/Gateway.cpp
View File

@ -1,4 +1,4 @@
#include "Gateway.h" #include "Gateway.h"
#include "TinyMessage.h" #include "TinyMessage.h"
#include "TokenMessage.h" #include "TokenMessage.h"

2
TinyNet/Gateway.h
View File

@ -1,4 +1,4 @@
#ifndef __SERVER__H__ #ifndef __SERVER__H__
#define __SERVER__H__ #define __SERVER__H__
#include "Sys.h" #include "Sys.h"

2
TinyNet/TokenMessage.cpp
View File

@ -1,4 +1,4 @@
#include "TokenMessage.h" #include "TokenMessage.h"
TokenMessage::TokenMessage(byte code) : Message(code) TokenMessage::TokenMessage(byte code) : Message(code)
{ {