Changeset 224 for rtos_arduino/trunk/arduino_lib/libraries/Ciao/src/Ciao.h

Timestamp:

Apr 30, 2016, 11:29:25 PM (8 years ago)

Author:

ertl-honda

Message:

1.7.10のファイルに更新

File:

• rtos_arduino/trunk/arduino_lib/libraries/Ciao/src/Ciao.h (modified) (7 diffs)

rtos_arduino/trunk/arduino_lib/libraries/Ciao/src/Ciao.h

@@ -30 +30 @@
 
 #include <Arduino.h>
+#include <Stream.h>
 #include "lib/CiaoData.h"
 #if defined(__AVR_ATmega328P__)
-#include "lib/rest.h"
 #include "lib/SC16IS750.h"
-#include "lib/espduino.h"
-#else
-#include <Stream.h>
 #endif
 
@@ -44 +41 @@
 #define BAUDRATE 250000
 #elif defined(ARDUINO_ARCH_SAMD)
-#define BAUDRATE 115200
+#define BAUDRATE 4000000
 #endif
 
@@ -55 +52 @@
                 CiaoData parse( String, String);
                 void println(String log){};
-                #if defined(__AVR_ATmega32U4__) 
                 CiaoClass(Stream &_stream);
-                #elif defined(ARDUINO_ARCH_SAMD)
-                CiaoClass(Serial_ stream);
-                #endif
 
         private:
                 void dropAll();
                 bool started;
-                #if defined(__AVR_ATmega32U4__)
                 Stream &stream;
-                #elif defined(ARDUINO_ARCH_SAMD)
-                Serial_ stream;
-                #endif
 };
 
@@ -80 +69 @@
                 }
                 #elif defined(ARDUINO_ARCH_SAMD)
-                SerialCiaoClass(Serial_ serial)
-                        : CiaoClass(serial){
-                        // Empty        
+                SerialCiaoClass(Serial_ &_serial)
+                        : CiaoClass(_serial), serial(_serial) {
+                        // Empty
                 }
                 #endif
@@ -93 +82 @@
                 HardwareSerial &serial;
                 #elif defined(ARDUINO_ARCH_SAMD)
-                Serial_ serial;
+                Serial_ &serial;
                 #endif
 };
@@ -103 +92 @@
 #else
 
-// class CiaoData {
-//      public:
-                
-//              char* get(int index){
-//                      return msg_split[index];
-//              }
-  
-//      public:
-//              char* msg_split[3];
-                
-// };
+class ArduinoWifiClass : public WifiData
+{
 
-class CiaoClass {
+        public:
+                void begin();           
+
+                boolean connected();
+                void connect(char* , char*);
+
+                void powerON();
+                void powerOFF();
+
+
+};
+
+class CiaoClass : public WifiData
+{
         public:
                 void begin();
@@ -124 +117 @@
                 CiaoData write( char*, char*, String );            // “rest”, ”hostname”, ”Stringone”,              
                 CiaoData write( char*, char*, String, char*);      // “rest”, ”hostname”, ”Stringone”, ”method”
-                
-                void print(String str);
-                void println(String str);
         
 };
+
+
 extern CiaoClass Ciao;
+extern ArduinoWifiClass Wifi;
 
 #endif