Changeset 224 for rtos_arduino/trunk/arduino_lib/libraries/Ciao/src/Ciao.h
- Timestamp:
- Apr 30, 2016, 11:29:25 PM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
rtos_arduino/trunk/arduino_lib/libraries/Ciao/src/Ciao.h
r175 r224 30 30 31 31 #include <Arduino.h> 32 #include <Stream.h> 32 33 #include "lib/CiaoData.h" 33 34 #if defined(__AVR_ATmega328P__) 34 #include "lib/rest.h"35 35 #include "lib/SC16IS750.h" 36 #include "lib/espduino.h"37 #else38 #include <Stream.h>39 36 #endif 40 37 … … 44 41 #define BAUDRATE 250000 45 42 #elif defined(ARDUINO_ARCH_SAMD) 46 #define BAUDRATE 11520043 #define BAUDRATE 4000000 47 44 #endif 48 45 … … 55 52 CiaoData parse( String, String); 56 53 void println(String log){}; 57 #if defined(__AVR_ATmega32U4__)58 54 CiaoClass(Stream &_stream); 59 #elif defined(ARDUINO_ARCH_SAMD)60 CiaoClass(Serial_ stream);61 #endif62 55 63 56 private: 64 57 void dropAll(); 65 58 bool started; 66 #if defined(__AVR_ATmega32U4__)67 59 Stream &stream; 68 #elif defined(ARDUINO_ARCH_SAMD)69 Serial_ stream;70 #endif71 60 }; 72 61 … … 80 69 } 81 70 #elif defined(ARDUINO_ARCH_SAMD) 82 SerialCiaoClass(Serial_ serial)83 : CiaoClass( serial){84 // Empty 71 SerialCiaoClass(Serial_ &_serial) 72 : CiaoClass(_serial), serial(_serial) { 73 // Empty 85 74 } 86 75 #endif … … 93 82 HardwareSerial &serial; 94 83 #elif defined(ARDUINO_ARCH_SAMD) 95 Serial_ serial;84 Serial_ &serial; 96 85 #endif 97 86 }; … … 103 92 #else 104 93 105 // class CiaoData { 106 // public: 107 108 // char* get(int index){ 109 // return msg_split[index]; 110 // } 111 112 // public: 113 // char* msg_split[3]; 114 115 // }; 94 class ArduinoWifiClass : public WifiData 95 { 116 96 117 class CiaoClass { 97 public: 98 void begin(); 99 100 boolean connected(); 101 void connect(char* , char*); 102 103 void powerON(); 104 void powerOFF(); 105 106 107 }; 108 109 class CiaoClass : public WifiData 110 { 118 111 public: 119 112 void begin(); … … 124 117 CiaoData write( char*, char*, String ); // ârestâ, âhostnameâ, âStringoneâ, 125 118 CiaoData write( char*, char*, String, char*); // ârestâ, âhostnameâ, âStringoneâ, âmethodâ 126 127 void print(String str);128 void println(String str);129 119 130 120 }; 121 122 131 123 extern CiaoClass Ciao; 124 extern ArduinoWifiClass Wifi; 132 125 133 126 #endif
Note:
See TracChangeset
for help on using the changeset viewer.