From fae62a6f615a8c5200d6db6212e2dd5df7218b85 Mon Sep 17 00:00:00 2001
From: fauresystems <34378695+fauresystems@users.noreply.github.com>
Date: Sat, 25 Apr 2020 08:19:55 +0200
Subject: [PATCH] Remove French from examples

---
 .../BlinkOnBridgeProp/BlinkOnBridgeProp.ino   | 36 ++++++++++++++-----
 .../BlinkOnEthernetProp.ino                   | 22 ++++++------
 examples/BlinkOnWifiProp/BlinkOnWifiProp.ino  | 22 ++++++------
 3 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/examples/BlinkOnBridgeProp/BlinkOnBridgeProp.ino b/examples/BlinkOnBridgeProp/BlinkOnBridgeProp.ino
index 74bf70b..564ab8c 100644
--- a/examples/BlinkOnBridgeProp/BlinkOnBridgeProp.ino
+++ b/examples/BlinkOnBridgeProp/BlinkOnBridgeProp.ino
@@ -15,6 +15,9 @@
 #include <Bridge.h>
 #include "ArduinoProps.h"
 
+// Uncomment if the board is connected via WiFi
+//#define REPORT_WIFI_RSSI
+
 // If you're running xcape.io Room software you have to respect prop inbox/outbox
 // topicw syntax: Room/[escape room name]/Props/[propsname]/inbox|outbox
 // https://xcape.io/go/room
@@ -22,18 +25,23 @@
 BridgeProp prop(u8"Arduino Blink", // as MQTT client id, should be unique per client for given broker
                   u8"Room/My room/Props/Arduino Blink/inbox",
                   u8"Room/My room/Props/Arduino Blink/outbox",
-                  "192.168.1.53", // your MQTT server IP address
+                  "192.168.1.42", // your MQTT server IP address
                   1883); // your MQTT server port;
 
 PropDataLogical blinking(u8"blink", u8"yes", u8"no", true);
 PropDataLogical led(u8"led");
+
+#if defined(REPORT_WIFI_RSSI) 
 PropDataText rssi(u8"rssi");
+#endif
 
-void clignote(); // forward
-PropAction blinkingAction = PropAction(1000, clignote);
+void blink(); // forward
+PropAction blinkingAction = PropAction(1000, blink);
 
-void lireRssi(); // forward
-PropAction lireRssiAction = PropAction(30000, lireRssi);
+#if defined(REPORT_WIFI_RSSI) 
+void readRssi(); // forward
+PropAction readRssiAction = PropAction(30000, readRssi);
+#endif
 
 void setup()
 {
@@ -42,13 +50,18 @@ void setup()
 
   prop.addData(&blinking);
   prop.addData(&led);
+
+#if defined(REPORT_WIFI_RSSI) 
   prop.addData(&rssi);
+#endif
 
   prop.begin(InboxMessage::run);
 
   pinMode(LED_BUILTIN, OUTPUT); // initialize digital pin LED_BUILTIN as an output
 
-  lireRssi();
+#if defined(REPORT_WIFI_RSSI) 
+  readRssi();
+#endif
 
   // At this point, the broker is not connected yet
 }
@@ -60,10 +73,13 @@ void loop()
   led.setValue(digitalRead(LED_BUILTIN)); // read I/O
 
   blinkingAction.check(); // do your stuff, don't freeze the loop with delay() calls
-  lireRssiAction.check();
+
+#if defined(REPORT_WIFI_RSSI) 
+  readRssiAction.check();
+#endif
 }
 
-void clignote()
+void blink()
 {
   if (blinking.value()) {
     led.setValue(!led.value());
@@ -71,7 +87,8 @@ void clignote()
   }
 }
 
-void lireRssi()
+#if defined(REPORT_WIFI_RSSI) 
+void readRssi()
 {
   Process _process; // a process call takes about 50 milliseconds
   _process.runShellCommand("cat /proc/net/wireless | awk 'NR==3 {print $4}'");
@@ -84,6 +101,7 @@ void lireRssi()
   b.trim();
   rssi.setValue(b + " dBm");
 }
+#endif
 
 void InboxMessage::run(String a) {
 
diff --git a/examples/BlinkOnEthernetProp/BlinkOnEthernetProp.ino b/examples/BlinkOnEthernetProp/BlinkOnEthernetProp.ino
index 3629dd9..ac87340 100644
--- a/examples/BlinkOnEthernetProp/BlinkOnEthernetProp.ino
+++ b/examples/BlinkOnEthernetProp/BlinkOnEthernetProp.ino
@@ -33,11 +33,11 @@ String ip = "192.168.1.19"; //<<< ENTER YOUR IP ADDRESS HERE ("" for DHCP)
 #undef LED_BUILTIN
 #define LED_BUILTIN 8
 
-PropDataLogical clignoter(u8"clignote", u8"oui", u8"non", true);
+PropDataLogical blinking(u8"blink", u8"yes", u8"no", true);
 PropDataLogical led(u8"led");
 
-void clignote(); // forward
-PropAction clignoteAction = PropAction(1000, clignote);
+void blink(); // forward
+PropAction blinkingAction = PropAction(1000, blink);
 
 void setup()
 {
@@ -60,7 +60,7 @@ void setup()
   //Ethernet.setGatewayIP(IPAddress(192, 168, 1, 1));
   //Ethernet.setDnsServerIP(IPAddress(192, 168, 1, 1));
 
-  prop.addData(&clignoter);
+  prop.addData(&blinking);
   prop.addData(&led);
 
   prop.begin(InboxMessage::run);
@@ -76,12 +76,12 @@ void loop()
 
   led.setValue(digitalRead(LED_BUILTIN)); // read I/O
 
-  clignoteAction.check(); // do your stuff, don't freeze the loop with delay() calls
+  blinkingAction.check(); // do your stuff, don't freeze the loop with delay() calls
 }
 
-void clignote()
+void blink()
 {
-  if (clignoter.value()) {
+  if (blinking.value()) {
     led.setValue(!led.value());
     digitalWrite(LED_BUILTIN, led.value() ? HIGH : LOW);
   }
@@ -98,16 +98,16 @@ void InboxMessage::run(String a) {
   {
     prop.resetMcu();
   }
-  else if (a == "clignoter:1")
+  else if (a == "blink:1")
   {
-    clignoter.setValue(true);
+    blinking.setValue(true);
 
     prop.sendAllData(); // all data change, we don't have to be selctive then
     prop.sendDone(a); // acknowledge prop command action
   }
-  else if (a == "clignoter:0")
+  else if (a == "blink:0")
   {
-    clignoter.setValue(false);
+    blinking.setValue(false);
 
     prop.sendAllData(); // all data change, we don't have to be selctive then
     prop.sendDone(a); // acknowledge prop command action
diff --git a/examples/BlinkOnWifiProp/BlinkOnWifiProp.ino b/examples/BlinkOnWifiProp/BlinkOnWifiProp.ino
index 49e3904..de2ab8e 100644
--- a/examples/BlinkOnWifiProp/BlinkOnWifiProp.ino
+++ b/examples/BlinkOnWifiProp/BlinkOnWifiProp.ino
@@ -32,12 +32,12 @@ WifiProp prop(u8"Arduino Blink", // as MQTT client id, should be unique per clie
 #undef LED_BUILTIN
 #define LED_BUILTIN 8
 
-PropDataLogical clignoter(u8"clignote", u8"oui", u8"non", true);
+PropDataLogical blinking(u8"blink", u8"yes", u8"no", true);
 PropDataLogical led(u8"led");
 PropDataText rssi(u8"rssi");
 
-void clignote(); // forward
-PropAction clignoteAction = PropAction(1000, clignote);
+void blink(); // forward
+PropAction blinkAction = PropAction(1000, blink);
 
 bool wifiBegun(false);
 
@@ -45,7 +45,7 @@ void setup()
 {
   Serial.begin(9600);
 
-  prop.addData(&clignoter);
+  prop.addData(&blinking);
   prop.addData(&led);
   prop.addData(&rssi);
   
@@ -93,12 +93,12 @@ void loop()
 
   led.setValue(digitalRead(LED_BUILTIN)); // read I/O
 
-  clignoteAction.check(); // do your stuff, don't freeze the loop with delay() calls
+  blinkAction.check(); // do your stuff, don't freeze the loop with delay() calls
 }
 
-void clignote()
+void blink()
 {
-  if (clignoter.value()) {
+  if (blinking.value()) {
     led.setValue(!led.value());
     digitalWrite(LED_BUILTIN, led.value() ? HIGH : LOW);
   }
@@ -115,16 +115,16 @@ void InboxMessage::run(String a) {
   {
     prop.resetMcu();
   }
-  else if (a == "clignoter:1")
+  else if (a == "blink:1")
   {
-    clignoter.setValue(true);
+    blinking.setValue(true);
 
     prop.sendAllData(); // all data change, we don't have to be selctive then
     prop.sendDone(a); // acknowledge prop command action
   }
-  else if (a == "clignoter:0")
+  else if (a == "blink:0")
   {
-    clignoter.setValue(false);
+    blinking.setValue(false);
 
     prop.sendAllData(); // all data change, we don't have to be selctive then
     prop.sendDone(a); // acknowledge prop command action