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

Timestamp:

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

Author:

ertl-honda

Message:

1.7.10のファイルに更新

Location:

rtos_arduino/trunk/arduino_lib/libraries/Ciao/src

Files:

• Ciao.h (modified) (7 diffs)
• lib/Ciao.cpp (modified) (2 diffs)
• lib/SC16IS750.cpp (modified) (2 diffs)
• lib/SC16IS750.h (modified) (1 diff)
• lib/espduino.cpp (modified) (2 diffs)
• lib/espduino.h (modified) (1 diff)
• lib/wifi.cpp (added)

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

rtos_arduino/trunk/arduino_lib/libraries/Ciao/src/lib/Ciao.cpp

@@ -24 +24 @@
 */
 
-#include "Ciao.h"
 
 #if defined(__AVR_ATmega32U4__) || defined(ARDUINO_ARCH_SAMD)
 
-#if defined(__AVR_ATmega32U4__)
+#include "Ciao.h"
+
 CiaoClass::CiaoClass(Stream &_stream) :
         stream(_stream), started(false) {
   // Empty
 }
-#elif defined(ARDUINO_ARCH_SAMD)
-CiaoClass::CiaoClass(Serial_ stream){
-  // Empty
-}
-#endif
 
 void CiaoClass::begin() {
@@ -60 +55 @@
     }
         do{ 
-                #if defined(__AVR_ATmega32U4__)
                 stream.print(F("run-ciao\n"));                          //start bridge python
                 stream.readStringUntil(END_TX_CHAR);
-                #endif
                 delay(3000);
                 stream.println("ciao;r;status");                                //check if bridge python is running

rtos_arduino/trunk/arduino_lib/libraries/Ciao/src/lib/SC16IS750.cpp

@@ -27 +27 @@
 #define WIRE Wire
 
-
-WifiData::WifiData(uint8_t prtcl, uint8_t addr_sspin)
-{
-    protocol = prtcl;
-    if ( protocol == SC16IS750_PROTOCOL_I2C ) {
-        device_address_sspin = (addr_sspin>>1);
-    } else {
-        device_address_sspin = addr_sspin;
-    }
+WifiData::WifiData()
+{
+    device_address_sspin = (SC16IS750_ADDRESS_AA >> 1);
     peek_flag = 0;
 }
@@ -41 +35 @@
 void WifiData::begin(uint32_t baud)
 {
-    //Serial.println("1111111111111111");
+
     if ( protocol == SC16IS750_PROTOCOL_I2C) {
-    //Serial.println("22222222222222");
         WIRE.begin();
     } 

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

@@ -104 +104 @@
 #define     SC16IS750_PROTOCOL_I2C  (0)
 #define     SC16IS750_PROTOCOL_I2C  (0)
-#define     END     "<!--~-->"
+#define     DELIMITER     "<!--~-->"
+#define     EOL           '\0'
 
 class WifiData : public Stream
 { 
     public:
-        WifiData(uint8_t prtcl = SC16IS750_PROTOCOL_I2C, uint8_t addr = SC16IS750_ADDRESS_AD);
+        WifiData();
         void begin(uint32_t baud);                               
         int read();

rtos_arduino/trunk/arduino_lib/libraries/Ciao/src/lib/espduino.cpp

@@ -188 +188 @@
 }
 
-ESP::ESP(Stream *serial, int chip_pd):
-_serial(serial), _chip_pd(chip_pd)
+ESP::ESP(Stream *serial):
+_serial(serial)
 {
   _debugEn = false;
@@ -195 +195 @@
 }
 
-ESP::ESP(Stream *serial, Stream* debug, int chip_pd):
-_serial(serial), _debug(debug), _chip_pd(chip_pd)
-{
-    _debugEn = true;
-    //_serial = _debug;
-    init();
-}
+
 void ESP::enable()
 {

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

@@ -92 +92 @@
 {
 public:
-  ESP(Stream *serial, Stream* debug, int chip_pd);
-  ESP(Stream *serial, int chip_pd);
+  //ESP(Stream *serial, Stream* debug, int chip_pd);
+  ESP(Stream *serial); //ok
   Stream *_debug;