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

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/examples

Files:

• CiaoRestClient/CiaoRestClient.ino (modified) (2 diffs)
• CiaoRestServer/CiaoRestServer.ino (modified) (7 diffs)

rtos_arduino/trunk/arduino_lib/libraries/Ciao/examples/CiaoRestClient/CiaoRestClient.ino

@@ -3 +3 @@
 
 #define CONNECTOR     "rest" 
-#define SERVER_ADDR   "192.168.0.100" // change ip address with your server ip address
+#define SERVER_ADDR   "192.168.1.1" // change ip address with your server ip address
 
-int buttonState = LOW; //this variable tracks the state of the button, low if not pressed, high if pressed
-int ledState = -1; //this variable tracks the state of the LED, negative if off, positive if on
+int buttonState; //this variable tracks the state of the button, low if not pressed, high if pressed
+int ledState = HIGH; //this variable tracks the state of the LED, negative if off, positive if on
 long lastDebounceTime = 0;  // the last time the output pin was toggled
 long debounceDelay = 50;    // the debounce time; increase if the output flickers
+String command = "/arduino/mode/13/output";
+int previous_value = LOW;
 
 void setup() {
   Ciao.begin();
+  Ciao.write(CONNECTOR, SERVER_ADDR, command);
   pinMode(2, INPUT);
   
@@ -20 +23 @@
   //sample the state of the button - is it pressed or not?
   buttonState = digitalRead(2);
- 
+  
   //filter out any noise by setting a time buffer
-  if ( (millis() - lastDebounceTime) > debounceDelay) {
- 
-    //if the button has been pressed, lets toggle the LED from "off to on" or "on to off"
-    if ( (buttonState == HIGH) && (ledState < 0) ) {
- 
-      CiaoData data = Ciao.write(CONNECTOR, SERVER_ADDR, "/arduino/digital/12/1"); //turn LED on
-      ledState = -ledState; //now the LED is on, we need to change the state
-      lastDebounceTime = millis(); //set the current time
+  if ( (buttonState == HIGH) && (previous_value == LOW) && (millis() - lastDebounceTime) > debounceDelay ) {
+    if (ledState == HIGH){
+      command = "/arduino/digital/13/0";
+      ledState = LOW;
     }
-    else if ( (buttonState == HIGH) && (ledState > 0) ) {
- 
-      CiaoData data = Ciao.write(CONNECTOR, SERVER_ADDR, "/arduino/digital/12/0"); //turn LED off
-      ledState = -ledState; //now the LED is off, we need to change the state
-      lastDebounceTime = millis(); //set the current time
-        
-      if (!data.isEmpty()){
-        Ciao.println( "State: " + String (data.get(1)) );
-        Ciao.println( "Response: " + String (data.get(2)) );
-      }
-      else{ 
-        Ciao.println ("Write Error");
-      }
-              
+    else{
+      command = "/arduino/digital/13/1";
+      ledState = HIGH;
     }
- 
+     
+    lastDebounceTime = millis(); //set the current time
+    CiaoData data = Ciao.write(CONNECTOR, SERVER_ADDR, command);  
+    if (!data.isEmpty()){
+      Ciao.println( "State: " + String (data.get(1)) );
+      Ciao.println( "Response: " + String (data.get(2)) );
+    }
+    else{ 
+      Ciao.println ("Write Error");
+    }
+
   }
  
+  previous_value = buttonState;
+ 
 }

rtos_arduino/trunk/arduino_lib/libraries/Ciao/examples/CiaoRestServer/CiaoRestServer.ino

@@ -1 +1 @@
 /*
 
- This sketch uses the xmpp connector to receive command for the MCU from a xmpp client.
+ This sketch uses the restserver connector receive rest calls. It allows access to
+ the analog and digital pin of the board via rest calls.
+
+ supported boards: Yun,Tian.
 
  Possible commands to send from the xmpp client:
 
- * "digital/PIN"        -> to read a digital PIN
- * "digital/PIN/VALUE"  -> to write a digital PIN (VALUE: 1/0)
- * "analog/PIN/VALUE"   -> to write in a PWM PIN(VALUE range: 0 - 255);
- * "analog/PIN"         -> to read a analog PIN
- * "servo/PIN/VALUE"      -> to write angle in a SERVO PIN(VALUE range: 0 - 180);
- * "mode/PIN/VALUE"     -> to set the PIN mode (VALUE: input / output)
- * "ledon"              -> turn on led 13
- * "ledoff"             -> turn off led 13
- * "ciao"               -> random answers in 5 different languages
- 
- NOTE: be sure to activate and configure xmpp connector on Linino OS
-       http://labs.arduino.org/Ciao
-   
+ * "/arduino/digital/PIN"       -> to read a digital PIN
+ * "/arduino/digital/PIN/VALUE" -> to write a digital PIN (VALUE: 1/0)
+ * "/arduino/analog/PIN/VALUE"  -> to write in a PWM PIN(VALUE range: 0 - 255);
+ * "/arduino/analog/PIN"        -> to read a analog PIN
+ * "/arduino/servo/PIN/VALUE"   -> to write angle in a SERVO PIN(VALUE range: 0 - 180);
+ * "/arduino/mode/PIN/VALUE"    -> to set the PIN mode (VALUE: input / output)
+
+ Example:
+ "/arduino/mode/13/output" -> pinMode(13, OUTPUT)
+ "/arduino/digital/13/1"     -> digitalWrite(13, HIGH)
+
+
+ NOTE: be sure to activate and configure restserver connector on Linino OS
+  http://labs.arduino.org/Ciao
+
  created September 2015
  by andrea[at]arduino[dot]org
- 
+
  */
- 
+
 #include <Ciao.h>
 #include <Servo.h>
@@ -35 +40 @@
 void loop() {
 
-  CiaoData data = Ciao.read("restserver");   
-  if(!data.isEmpty()){  
+  CiaoData data = Ciao.read("restserver");
+  if(!data.isEmpty()){
     String id = data.get(0);
     String sender = data.get(1);
     String message = data.get(2);
-    
+
     message.toUpperCase();
-    
+
     String command[3];
-          
+
     splitString(message,"/",command,3);
     execute(command,id);
@@ -71 +76 @@
 void servoCommand(String cmd[], String id){
    int pin, value;
-  
+
   pin = (cmd[1]).toInt();
-  
+
   if (cmd[2] != "-1") {
     value = (cmd[2]).toInt();
@@ -85 +90 @@
   }
   else
-    Ciao.writeResponse("restserver",id,"Invalid command");  
+    Ciao.writeResponse("restserver",id,"Invalid command");
 }
 
 void digitalCommand(String cmd[], String id) {
   int pin, value;
-  
+
   pin = (cmd[1]).toInt();
-  
+
   if (cmd[2] != "-1") {
     value = (cmd[2]).toInt();
@@ -99 +104 @@
       Ciao.writeResponse("restserver",id,"Pin D"+String(pin)+" ON");
     else if(value == 0)
-      Ciao.writeResponse("restserver",id,"Pin D"+String(pin)+" OFF");   
+      Ciao.writeResponse("restserver",id,"Pin D"+String(pin)+" OFF");
   }
   else if (cmd[2] == "-1") {
@@ -111 +116 @@
 
   pin = (cmd[1]).toInt();
-  
+
   if (cmd[2] != "-1") {
     value =(cmd[2]).toInt();
@@ -127 +132 @@
 
   pin = (cmd[1]).toInt();
-  
+
   if (cmd[2] == "INPUT") {
     pinMode(pin, INPUT);