From 6cff784cc6f0aadecbf28ea53a98f9370aa0f7ff Mon Sep 17 00:00:00 2001 From: fauresystems <34378695+fauresystems@users.noreply.github.com> Date: Wed, 15 Apr 2020 10:55:37 +0200 Subject: [PATCH] Props to prop no plural --- ArduinoProps.vcxitems | 31 ++-- ArduinoProps.vcxitems.filters | 51 +++--- ArduinoProps.zip | Bin 484024 -> 483233 bytes EXAMPLES.md | 112 ++++++------- README.md | 72 ++++---- .../BlinkOnBridgeProp.ino} | 56 +++---- .../BlinkOnBridgePropInFench.ino} | 58 +++---- .../BlinkOnBridgePubSub.ino | 32 ++-- .../BlinkOnEthernetProp.ino} | 44 ++--- .../BlinkOnWifiProp.ino} | 50 +++--- help/Arduino_Props.md | 22 +-- help/{Props.md => Prop.md} | 154 +++++++++--------- help/{PropsAction.md => PropAction.md} | 12 +- help/PropData.md | 76 +++++++++ help/PropsData.md | 76 --------- keywords.txt | 18 +- src/ArduinoProps.cpp | 2 +- src/ArduinoProps.h | 12 +- src/{BridgeProps.cpp => BridgeProp.cpp} | 10 +- src/{BridgeProps.h => BridgeProp.h} | 12 +- src/{EthernetProps.cpp => EthernetProp.cpp} | 8 +- src/{EthernetProps.h => EthernetProp.h} | 12 +- src/{Props.cpp => Prop.cpp} | 6 +- src/{Props.h => Prop.h} | 18 +- src/{PropsAction.cpp => PropAction.cpp} | 20 +-- src/{PropsAction.h => PropAction.h} | 8 +- src/{PropsData.cpp => PropData.cpp} | 46 +++--- src/{PropsData.h => PropData.h} | 22 +-- src/{WifiProps.cpp => WifiProp.cpp} | 8 +- src/{WifiProps.h => WifiProp.h} | 12 +- 30 files changed, 532 insertions(+), 528 deletions(-) rename examples/{BlinkOnBridgeProps/BlinkOnBridgeProps.ino => BlinkOnBridgeProp/BlinkOnBridgeProp.ino} (65%) rename examples/{BlinkOnBridgePropsInFench/BlinkOnBridgePropsInFench.ino => BlinkOnBridgePropInFench/BlinkOnBridgePropInFench.ino} (62%) rename examples/{BlinkOnEthernetProps/BlinkOnEthernetProps.ino => BlinkOnEthernetProp/BlinkOnEthernetProp.ino} (71%) rename examples/{BlinkOnWifiProps/BlinkOnWifiProps.ino => BlinkOnWifiProp/BlinkOnWifiProp.ino} (71%) rename help/{Props.md => Prop.md} (63%) rename help/{PropsAction.md => PropAction.md} (75%) create mode 100644 help/PropData.md delete mode 100644 help/PropsData.md rename src/{BridgeProps.cpp => BridgeProp.cpp} (62%) rename src/{BridgeProps.h => BridgeProp.h} (70%) rename src/{EthernetProps.cpp => EthernetProp.cpp} (63%) rename src/{EthernetProps.h => EthernetProp.h} (66%) rename src/{Props.cpp => Prop.cpp} (97%) rename src/{Props.h => Prop.h} (87%) rename src/{PropsAction.cpp => PropAction.cpp} (69%) rename src/{PropsAction.h => PropAction.h} (84%) rename src/{PropsData.cpp => PropData.cpp} (63%) rename src/{PropsData.h => PropData.h} (70%) rename src/{WifiProps.cpp => WifiProp.cpp} (71%) rename src/{WifiProps.h => WifiProp.h} (74%) diff --git a/ArduinoProps.vcxitems b/ArduinoProps.vcxitems index 1a7f882..a3e6a9f 100644 --- a/ArduinoProps.vcxitems +++ b/ArduinoProps.vcxitems @@ -21,10 +21,11 @@ - + + - - + + @@ -36,21 +37,21 @@ - - - - - - + + + + + + - - - - - - + + + + + + diff --git a/ArduinoProps.vcxitems.filters b/ArduinoProps.vcxitems.filters index 54a39b3..6e499c4 100644 --- a/ArduinoProps.vcxitems.filters +++ b/ArduinoProps.vcxitems.filters @@ -24,18 +24,6 @@ - - Examples - - - Examples - - - Examples - - - Examples - @@ -54,27 +42,42 @@ Help + + Examples + + + Examples + + + Examples + + + Examples + + + Examples + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files @@ -82,22 +85,22 @@ Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files diff --git a/ArduinoProps.zip b/ArduinoProps.zip index 87753af2deb9020fafd4cc683a0b66f07144dc1c..ae1fcc28697c47b0caa01141b7b1b75358610bf2 100644 GIT binary patch delta 37439 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

E|iXYV(3>P=G=+eeZyDBUd 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�fP^6uu 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 delta 37975 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 z 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 cI6)|kPK(9S+7Nick O'Leary PubSubClient* library for MQTT. MQTT is a lightweight ![](help/install-shot.png) publish/subscribe messaging protocol designed for M2M (machine to machine) telemetry in low bandwidth environments. ### Props with *Raspberry* -Escape room 2.0 props can be powered with Raspberry Pi or any Pythonic nanocomputer using *MqttApp*, our pure Python 3 class based on Eclipse Paho™ MQTT Python Client. +Escape room 2.0 prop can be powered with Raspberry Pi or any Pythonic nanocomputer using *MqttApp*, our pure Python 3 class based on Eclipse Paho™ MQTT Python Client. -You will find Raspberry Pi libraries for escape room 2.0 props at [https://github.com/fauresystems](https://github.com/fauresystems), to build props with RPi.GPIO, Pi Hats, Guizero, Pygames, PyQt5 or Kivi. +You will find Raspberry Pi libraries for escape room 2.0 prop at [https://github.com/fauresystems](https://github.com/fauresystems), to build prop with RPi.GPIO, Pi Hats, Guizero, Pygames, PyQt5 or Kivi. ## 3. *ArduinoProps library* value for escape room 2.0 -*Nick O'Leary PubSubClient* library is sufficient to write escape room 2.0 props Arduino code. +*Nick O'Leary PubSubClient* library is sufficient to write escape room 2.0 prop Arduino code. -The *ArduinoProps library* relies on *Nick O'Leary PubSubClient* for MQTT messaging and provides a framework and protocol for helping and accelerating the coding of Arduino props. If you will help build simple and complex props with reliable code. +The *ArduinoProps library* relies on *Nick O'Leary PubSubClient* for MQTT messaging and provides a framework and protocol for helping and accelerating the coding of Arduino prop. If you will help build simple and complex prop with reliable code. -Since 2016, *ArduinoProps library* is used extensively in many escape rooms with up to 20 props per room (which is no limit at all), with a high level of availability and sustainability. +Since 2016, *ArduinoProps library* is used extensively in many escape rooms with up to 20 prop per room (which is no limit at all), with a high level of availability and sustainability. ### Inbox/oubox messaging Instead of usual MQTT topic structure which sends every data value in a different topic for every variable, *ArduinoProps library* sends data via a unique outbox topic. @@ -83,9 +83,9 @@ example: MQTT supports UTF-8 encoding. ### Sending messages only when appropriate -Usually Arduino IoT sketches send MQTT data for every variable at every loop. When the loop is fast, you can get tons of useless messages, and usually a sleeping delay is added at every loop to slow down the message flow ; this can slow down significantly the props response time to human supervision and automation commands. +Usually Arduino IoT sketches send MQTT data for every variable at every loop. When the loop is fast, you can get tons of useless messages, and usually a sleeping delay is added at every loop to slow down the message flow ; this can slow down significantly the prop response time to human supervision and automation commands. -While Arduino sketch is sending a message it isn't doing props sensor/actuator processing, and it takes about 20 to 40 milliseconds to send a message. With too many messsages it's too much processing time wasted. +While Arduino sketch is sending a message it isn't doing prop sensor/actuator processing, and it takes about 20 to 40 milliseconds to send a message. With too many messsages it's too much processing time wasted. *ArduinoProps library* sends all data periodically every 30 seconds (default parameter) and sends data changes over a period of time you choose (typical 400 milliseconds for real-time behavior, but you may choose every 100 milliseconds, 1 or 3 seconds: your choice for your application). @@ -103,14 +103,14 @@ And on Yun this same code line can switch MQTT server IP address (can be helpful ### Simple human-readable text protocol An escape room 2.0 is typically centrally controlled from a Windows PC which provides the Game Master with monitoring and control information as well as some automation. -To unifiy escape room 2.0 development, *ArduinoProps library* provides a simple [protocol](https://github.com/xcape-io/PyProps/blob/master/PROTOCOL.md) between props and room controller at application level: +To unifiy escape room 2.0 development, *ArduinoProps library* provides a simple [protocol](https://github.com/xcape-io/PyProps/blob/master/PROTOCOL.md) between prop and room controller at application level: ```csharp DATA -> send variables to control MESG -> send text to display in control DONE -> acknowledge that a command has been performed OMIT -> acknowledge that a command has been ignored OVER -> notify that a challenge is over - REQU -> request a command to another props + REQU -> request a command to another prop PROG -> request a control program ``` @@ -127,9 +127,9 @@ DATA messages when many I/O like on Arduino Mega 2560 and MESG information messa *ArduinoProps library* seamlessly splits long messages smartly when required. -## 4. Application protocol for escape room 2.0 props +## 4. Application protocol for escape room 2.0 prop -A *level 7* [protocol](https://github.com/xcape-io/PyProps/blob/master/PROTOCOL.md) (*application level*) is necessary for connected props to report data and to be controlled for the escape room automation and game play. +A *level 7* [protocol](https://github.com/xcape-io/PyProps/blob/master/PROTOCOL.md) (*application level*) is necessary for connected prop to report data and to be controlled for the escape room automation and game play. We have defined a simple human-readable text protocol. Messages are encoded in UTF-8, in Arduino sketches use: ```csharp @@ -148,7 +148,7 @@ Props connection state is handled in the outbox topic: More MQTT topics can be use for anything (room scenario, etc.). -#### Messages sent from the Arduino props are formatted +#### Messages sent from the Arduino prop are formatted ```csharp DATA sensor=24.26 light=on challenge=pinball MESG Warning: sensor not detected @@ -159,7 +159,7 @@ More MQTT topics can be use for anything (room scenario, etc.). PROG audio-final:start ``` -#### Message received by the Arduino props have no particular format +#### Message received by the Arduino prop have no particular format ```csharp power:1 for example to power on the room porte-salon:ouvrir for example to open a door @@ -169,7 +169,7 @@ More MQTT topics can be use for anything (room scenario, etc.). #### @PING-PONG special messages ```csharp - @PING is received in inbox then the props sends just PONG in outbox + @PING is received in inbox then the prop sends just PONG in outbox -> so the escape room controller can monitor response time at application level ``` @@ -184,10 +184,10 @@ More MQTT topics can be use for anything (room scenario, etc.). - Arduino MKR VIDOR 4000 - Any Arduino + Ethernet Shield -For WiFi props, please update the WiFiNINA firmware: [WiFiNINA firmware update](help/WifiNinaFirmware.md). +For WiFi prop, please update the WiFiNINA firmware: [WiFiNINA firmware update](help/WifiNinaFirmware.md). -To use other WiFi hardware compatible with any *Nick O'Leary PubSubClient* library you have to fork `WifiProps.h` and `WifiProps.cpp` and to replace `WiFiNINA.h` with appropriate WiFi library (`ESP8266WiFi.h` for example): +To use other WiFi hardware compatible with any *Nick O'Leary PubSubClient* library you have to fork `WifiProp.h` and `WifiProp.cpp` and to replace `WiFiNINA.h` with appropriate WiFi library (`ESP8266WiFi.h` for example): - Arduino WiFi Shield - Sparkfun WiFly Shield – [library](https://github.com/dpslwk/WiFly) - TI CC3000 WiFi - [library](https://github.com/sparkfun/SFE_CC3000_Library) @@ -197,19 +197,19 @@ To use other WiFi hardware compatible with any * /root/broker && reset-mcu + prop.resetMcu(); // we prefer SSH command: echo %BROKER%> /root/broker && reset-mcu } else if (a == "blink:1") { blinking.setValue(true); - props.sendAllData(); // all data change, we don't have to be selctive then - props.sendDone(a); // acknowledge props command action + prop.sendAllData(); // all data change, we don't have to be selctive then + prop.sendDone(a); // acknowledge prop command action } else if (a == "blink:0") { blinking.setValue(false); - props.sendAllData(); // all data change, we don't have to be selctive then - props.sendDone(a); // acknowledge props command action + prop.sendAllData(); // all data change, we don't have to be selctive then + prop.sendDone(a); // acknowledge prop command action } else { - // acknowledge omition of the props command - props.sendOmit(a); + // acknowledge omition of the prop command + prop.sendOmit(a); } } -void updateBrokerAdressFromFile(const char* broker_file, BridgeProps* props) +void updateBrokerAdressFromFile(const char* broker_file, BridgeProp* prop) { // broker IP address is stored in Linino file systems and updated with ssh command by Room 2.0 IPAddress ip; @@ -132,5 +132,5 @@ void updateBrokerAdressFromFile(const char* broker_file, BridgeProps* props) } b.trim(); - if (ip.fromString(b.c_str())) props->setBrokerIpAddress(ip); + if (ip.fromString(b.c_str())) prop->setBrokerIpAddress(ip); } diff --git a/examples/BlinkOnBridgePropsInFench/BlinkOnBridgePropsInFench.ino b/examples/BlinkOnBridgePropInFench/BlinkOnBridgePropInFench.ino similarity index 62% rename from examples/BlinkOnBridgePropsInFench/BlinkOnBridgePropsInFench.ino rename to examples/BlinkOnBridgePropInFench/BlinkOnBridgePropInFench.ino index 78e0be1..04c7949 100644 --- a/examples/BlinkOnBridgePropsInFench/BlinkOnBridgePropsInFench.ino +++ b/examples/BlinkOnBridgePropInFench/BlinkOnBridgePropInFench.ino @@ -1,11 +1,11 @@ -/* BlinkOnBridgeProps.ino +/* BlinkOnBridgeProp.ino MIT License (c) Marie Faure Adapt the Blink example (https://www.arduino.cc/en/tutorial/blink) as a - simple MQTT props. Avoid delay() calls (except short ones) in loop() to - ensure CPU for MQTT protocol. Use PropsAction checks instead. + simple MQTT prop. Avoid delay() calls (except short ones) in loop() to + ensure CPU for MQTT protocol. Use PropAction checks instead. - Copy and change it to build your first Arduino connected props, you will + Copy and change it to build your first Arduino connected prop, you will only be limited by your imagination. Requirements: @@ -14,36 +14,36 @@ #include #include "ArduinoProps.h" -// If you're running xcape.io Room software you have to respect props inbox/outbox -// topicw syntax: Room/[escape room name]/Props/[propsname]/inbox|outbox +// If you're running xcape.io Room software you have to respect prop inbox/outbox +// topicw syntax: Room/[escape room name]/Props/[propname]/inbox|outbox // https://xcape.io/go/room -BridgeProps props(u8"Arduino Blink", // as MQTT client id, should be unique per client for given broker +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 1883); // your MQTT server port; -PropsDataLogical clignoter(u8"clignote", u8"oui", u8"non", true); -PropsDataLogical led(u8"led"); -PropsDataText rssi(u8"rssi"); +PropDataLogical clignoter(u8"clignote", u8"oui", u8"non", true); +PropDataLogical led(u8"led"); +PropDataText rssi(u8"rssi"); void clignote(); // forward -PropsAction clignoteAction = PropsAction(1000, clignote); +PropAction clignoteAction = PropAction(1000, clignote); void lireRssi(); // forward -PropsAction lireRssiAction = PropsAction(30000, lireRssi); +PropAction lireRssiAction = PropAction(30000, lireRssi); void setup() { Bridge.begin(); - //updateBrokerAdressFromFile("/root/broker", &props); // if you're running our Escape Room control software (Room 2.0) + //updateBrokerAdressFromFile("/root/broker", &prop); // if you're running our Escape Room control software (Room 2.0) - props.addData(&clignoter); - props.addData(&led); - props.addData(&rssi); + prop.addData(&clignoter); + prop.addData(&led); + prop.addData(&rssi); - props.begin(InboxMessage::run); + prop.begin(InboxMessage::run); pinMode(LED_BUILTIN, OUTPUT); // initialize digital pin LED_BUILTIN as an output @@ -54,7 +54,7 @@ void setup() void loop() { - props.loop(); + prop.loop(); led.setValue(digitalRead(LED_BUILTIN)); // read I/O @@ -88,35 +88,35 @@ void InboxMessage::run(String a) { if (a == u8"app:startup") { - props.sendAllData(); - props.sendDone(a); + prop.sendAllData(); + prop.sendDone(a); } else if (a == u8"reset-mcu") { - props.resetMcu(); // we prefer SSH command: echo %BROKER%> /root/broker && reset-mcu + prop.resetMcu(); // we prefer SSH command: echo %BROKER%> /root/broker && reset-mcu } else if (a == "clignoter:1") { clignoter.setValue(true); - props.sendAllData(); // all data change, we don't have to be selctive then - props.sendDone(a); // acknowledge props command action + 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") { clignoter.setValue(false); - props.sendAllData(); // all data change, we don't have to be selctive then - props.sendDone(a); // acknowledge props command action + prop.sendAllData(); // all data change, we don't have to be selctive then + prop.sendDone(a); // acknowledge prop command action } else { - // acknowledge omition of the props command - props.sendOmit(a); + // acknowledge omition of the prop command + prop.sendOmit(a); } } -void updateBrokerAdressFromFile(const char* broker_file, BridgeProps* props) +void updateBrokerAdressFromFile(const char* broker_file, BridgeProp* prop) { // broker IP address is stored in Linino file systems and updated with ssh command by Room 2.0 IPAddress ip; @@ -132,5 +132,5 @@ void updateBrokerAdressFromFile(const char* broker_file, BridgeProps* props) } b.trim(); - if (ip.fromString(b.c_str())) props->setBrokerIpAddress(ip); + if (ip.fromString(b.c_str())) prop->setBrokerIpAddress(ip); } diff --git a/examples/BlinkOnBridgePubSub/BlinkOnBridgePubSub.ino b/examples/BlinkOnBridgePubSub/BlinkOnBridgePubSub.ino index 781d781..7e7daff 100644 --- a/examples/BlinkOnBridgePubSub/BlinkOnBridgePubSub.ino +++ b/examples/BlinkOnBridgePubSub/BlinkOnBridgePubSub.ino @@ -2,7 +2,7 @@ MIT License (c) Marie Faure Adapt the Blink example (https://www.arduino.cc/en/tutorial/blink) as a - simple MQTT props with PubSubClient. + simple MQTT prop with PubSubClient. */ #include #include @@ -10,14 +10,14 @@ #include #include -// If you're running xcape.io Room software you have to respect props inbox/outbox +// 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 #define BROKER "192.168.1.53" // your MQTT server IP address -#define PROPS_NAME u8"Arduino Blink" // as MQTT client id, should be unique per client for given broker -#define PROPS_INBOX u8"Room/My room/Props/Arduino Blink/inbox" -#define PROPS_OUTBOX u8"Room/My room/Props/Arduino Blink/outbox" +#define PROP_NAME u8"Arduino Blink" // as MQTT client id, should be unique per client for given broker +#define PROP_INBOX u8"Room/My room/Props/Arduino Blink/inbox" +#define PROP_OUTBOX u8"Room/My room/Props/Arduino Blink/outbox" // Yun can store broker IP address in Linino file systems, and updatred with ssh command #define YUN_BROKER_FILE "/root/broker" @@ -118,10 +118,10 @@ void loop() { lastReconnection += 5000L; - if (_client.connect(PROPS_NAME, PROPS_OUTBOX, 2, true, "DISCONNECTED")) + if (_client.connect(PROP_NAME, PROP_OUTBOX, 2, true, "DISCONNECTED")) { - _client.publish(PROPS_OUTBOX, "CONNECTED", true); - _client.subscribe(PROPS_INBOX, 1); // max QoS is 1 for PubSubClient subsciption + _client.publish(PROP_OUTBOX, "CONNECTED", true); + _client.subscribe(PROP_INBOX, 1); // max QoS is 1 for PubSubClient subsciption lastReconnection = 0L; } } @@ -143,7 +143,7 @@ void publishAll() buf += u8" clignote=" + (blinking.blink ? String("oui") : String("non")); blink_ref = blinking.blink; - _client.publish(PROPS_OUTBOX, buf.c_str()); + _client.publish(PROP_OUTBOX, buf.c_str()); } void publishChanges() @@ -165,13 +165,13 @@ void publishChanges() } if (buf.length() > 4) - _client.publish(PROPS_OUTBOX, buf.c_str()); + _client.publish(PROP_OUTBOX, buf.c_str()); } void publishDone(String a) { a = "DONE " + a; - _client.publish(PROPS_OUTBOX, a.c_str()); + _client.publish(PROP_OUTBOX, a.c_str()); } void onInboxMessage(String a) { @@ -187,7 +187,7 @@ void onInboxMessage(String a) { blinking.blink = true; publishAll(); // all data change, we don't have to be selctive then - publishDone(a); // acknowledge props command action + publishDone(a); // acknowledge prop command action } else if (a == "clignoter:0") { @@ -195,12 +195,12 @@ void onInboxMessage(String a) { blinking.blink = false; publishAll(); // all data change, we don't have to be selctive then - publishDone(a); // acknowledge props command action + publishDone(a); // acknowledge prop command action } else { - // acknowledge omition of the props command - _client.publish(PROPS_OUTBOX, String("OMIT " + a).c_str()); + // acknowledge omition of the prop command + _client.publish(PROP_OUTBOX, String("OMIT " + a).c_str()); } } @@ -212,7 +212,7 @@ void callback(char* topic, byte* payload, unsigned int len) memcpy(p, payload, len); p[len] = '\0'; if (String(p) == "@PING") - _client.publish(PROPS_OUTBOX, "PONG"); + _client.publish(PROP_OUTBOX, "PONG"); else onInboxMessage(p); free(p); diff --git a/examples/BlinkOnEthernetProps/BlinkOnEthernetProps.ino b/examples/BlinkOnEthernetProp/BlinkOnEthernetProp.ino similarity index 71% rename from examples/BlinkOnEthernetProps/BlinkOnEthernetProps.ino rename to examples/BlinkOnEthernetProp/BlinkOnEthernetProp.ino index 76a2b9d..6874155 100644 --- a/examples/BlinkOnEthernetProps/BlinkOnEthernetProps.ino +++ b/examples/BlinkOnEthernetProp/BlinkOnEthernetProp.ino @@ -1,11 +1,11 @@ -/* BlinkOnEthernetProps.ino +/* BlinkOnEthernetProp.ino MIT License (c) Marie Faure Adapt the Blink example (https://www.arduino.cc/en/tutorial/blink) as a - simple MQTT props. Avoid delay() calls (except short ones) in loop() to - ensure CPU for MQTT protocol. Use PropsAction checks instead. + simple MQTT prop. Avoid delay() calls (except short ones) in loop() to + ensure CPU for MQTT protocol. Use PropAction checks instead. - Copy and change it to build your first Arduino connected props, you will + Copy and change it to build your first Arduino connected prop, you will only be limited by your imagination. Requirements: @@ -15,11 +15,11 @@ #include #include "ArduinoProps.h" -// If you're running xcape.io Room software you have to respect props inbox/outbox +// 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 -EthernetProps props(u8"Arduino Blink", // as MQTT client id, should be unique per client for given broker +EthernetProp 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 @@ -32,11 +32,11 @@ String ip = "192.168.1.19"; //<<< ENTER YOUR IP ADDRESS HERE ("" for DHCP) #undef LED_BUILTIN #define LED_BUILTIN 8 -PropsDataLogical clignoter(u8"clignote", u8"oui", u8"non", true); -PropsDataLogical led(u8"led"); +PropDataLogical clignoter(u8"clignote", u8"oui", u8"non", true); +PropDataLogical led(u8"led"); void clignote(); // forward -PropsAction clignoteAction = PropsAction(1000, clignote); +PropAction clignoteAction = PropAction(1000, clignote); void setup() { @@ -59,10 +59,10 @@ void setup() //Ethernet.setGatewayIP(IPAddress(192, 168, 1, 1)); //Ethernet.setDnsServerIP(IPAddress(192, 168, 1, 1)); - props.addData(&clignoter); - props.addData(&led); + prop.addData(&clignoter); + prop.addData(&led); - props.begin(InboxMessage::run); + prop.begin(InboxMessage::run); pinMode(LED_BUILTIN, OUTPUT); // initialize digital pin LED_BUILTIN as an output @@ -71,7 +71,7 @@ void setup() void loop() { - props.loop(); + prop.loop(); led.setValue(digitalRead(LED_BUILTIN)); // read I/O @@ -90,30 +90,30 @@ void InboxMessage::run(String a) { if (a == u8"app:startup") { - props.sendAllData(); - props.sendDone(a); + prop.sendAllData(); + prop.sendDone(a); } else if (a == u8"reset-mcu") { - props.resetMcu(); + prop.resetMcu(); } else if (a == "clignoter:1") { clignoter.setValue(true); - props.sendAllData(); // all data change, we don't have to be selctive then - props.sendDone(a); // acknowledge props command action + 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") { clignoter.setValue(false); - props.sendAllData(); // all data change, we don't have to be selctive then - props.sendDone(a); // acknowledge props command action + prop.sendAllData(); // all data change, we don't have to be selctive then + prop.sendDone(a); // acknowledge prop command action } else { - // acknowledge omition of the props command - props.sendOmit(a); + // acknowledge omition of the prop command + prop.sendOmit(a); } } diff --git a/examples/BlinkOnWifiProps/BlinkOnWifiProps.ino b/examples/BlinkOnWifiProp/BlinkOnWifiProp.ino similarity index 71% rename from examples/BlinkOnWifiProps/BlinkOnWifiProps.ino rename to examples/BlinkOnWifiProp/BlinkOnWifiProp.ino index 11fabbb..ef73d60 100644 --- a/examples/BlinkOnWifiProps/BlinkOnWifiProps.ino +++ b/examples/BlinkOnWifiProp/BlinkOnWifiProp.ino @@ -1,11 +1,11 @@ -/* BlinkOnWifiProps.ino +/* BlinkOnWifiProp.ino MIT License (c) Marie Faure Adapt the Blink example (https://www.arduino.cc/en/tutorial/blink) as a - simple MQTT props. Avoid delay() calls (except short ones) in loop() to - ensure CPU for MQTT protocol. Use PropsAction checks instead. + simple MQTT prop. Avoid delay() calls (except short ones) in loop() to + ensure CPU for MQTT protocol. Use PropAction checks instead. - Copy and change it to build your first Arduino connected props, you will + Copy and change it to build your first Arduino connected prop, you will only be limited by your imagination. Requirements: @@ -17,11 +17,11 @@ const char* ssid = ""; const char *passphrase = ""; -// If you're running xcape.io Room software you have to respect props inbox/outbox +// 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 -WifiProps props(u8"Arduino Blink", // as MQTT client id, should be unique per client for given broker +WifiProp 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 @@ -31,12 +31,12 @@ WifiProps props(u8"Arduino Blink", // as MQTT client id, should be unique per cl #undef LED_BUILTIN #define LED_BUILTIN 8 -PropsDataLogical clignoter(u8"clignote", u8"oui", u8"non", true); -PropsDataLogical led(u8"led"); -PropsDataText rssi(u8"rssi"); +PropDataLogical clignoter(u8"clignote", u8"oui", u8"non", true); +PropDataLogical led(u8"led"); +PropDataText rssi(u8"rssi"); void clignote(); // forward -PropsAction clignoteAction = PropsAction(1000, clignote); +PropAction clignoteAction = PropAction(1000, clignote); bool wifiBegun(false); @@ -44,11 +44,11 @@ void setup() { Serial.begin(9600); - props.addData(&clignoter); - props.addData(&led); - props.addData(&rssi); + prop.addData(&clignoter); + prop.addData(&led); + prop.addData(&rssi); - props.begin(InboxMessage::run); + prop.begin(InboxMessage::run); pinMode(LED_BUILTIN, OUTPUT); // initialize digital pin LED_BUILTIN as an output @@ -60,7 +60,7 @@ void loop() if (!wifiBegun) { WiFi.begin(ssid, passphrase); Serial.println(WiFi.firmwareVersion()); - delay(250); // acceptable freeze for this props (otherwise use PropsAction for async-like behavior) + delay(250); // acceptable freeze for this prop (otherwise use PropAction for async-like behavior) // do static IP configuration disabling the dhcp client, must be called after every WiFi.begin() String fv = WiFi.firmwareVersion(); if (fv.startsWith("1.0")) { @@ -86,7 +86,7 @@ void loop() wifiBegun = false; } - props.loop(); + prop.loop(); rssi.setValue(WiFi.RSSI() + String(" dBm")); // https://www.metageek.com/training/resources/understanding-rssi.html @@ -107,30 +107,30 @@ void InboxMessage::run(String a) { if (a == u8"app:startup") { - props.sendAllData(); - props.sendDone(a); + prop.sendAllData(); + prop.sendDone(a); } else if (a == u8"reset-mcu") { - props.resetMcu(); + prop.resetMcu(); } else if (a == "clignoter:1") { clignoter.setValue(true); - props.sendAllData(); // all data change, we don't have to be selctive then - props.sendDone(a); // acknowledge props command action + 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") { clignoter.setValue(false); - props.sendAllData(); // all data change, we don't have to be selctive then - props.sendDone(a); // acknowledge props command action + prop.sendAllData(); // all data change, we don't have to be selctive then + prop.sendDone(a); // acknowledge prop command action } else { - // acknowledge omition of the props command - props.sendOmit(a); + // acknowledge omition of the prop command + prop.sendOmit(a); } } diff --git a/help/Arduino_Props.md b/help/Arduino_Props.md index ba113d0..26561af 100644 --- a/help/Arduino_Props.md +++ b/help/Arduino_Props.md @@ -1,8 +1,8 @@ # Arduino Props for Escape Room 2.0 -The *ArduinoProps library* for Arduino has been designed to build *escape room 2.0 props*. +The *ArduinoProps library* for Arduino has been designed to build *escape room 2.0 prop*. -Specificities of props for escape rooms: +Specificities of prop for escape rooms: - very high uptime (near 100%) - fast problem fixing - real-time (human scale) notification and control @@ -15,7 +15,7 @@ Benefits and specificities of the *ArduinoProps library* - constant sustaining of Arduino code (YUN) - real-time notification, monitoring and control (human scale) -# Escape room 2.0 constraints on props +# Escape room 2.0 constraints on prop Escape game are opened 7 days a week and particularly booked during weekends and usually until midnight. Therefore their uptime must be close to 100% and incidents must be worked-around immediately by the game master (manual commands). Escape Room Props operation and performance impact directly escape game customer experience. Therefore notifications must be processed in human-scale real-time, automatically or manually by a non-technological user (the game master). @@ -24,7 +24,7 @@ Escape Room Props TCO (Total Cost of Ownership) must be affordable by escape gam ![TCO](tco.jpg) -IT professional 24/7 support must be avoided for cost reasons. Therefore props code must be the most reliable. +IT professional 24/7 support must be avoided for cost reasons. Therefore prop code must be the most reliable. # *ArduinoProps library* for escape room 2.0 @@ -39,10 +39,10 @@ IT professional 24/7 support must be avoided for cost reasons. Therefore props c How does *ArduinoProps library* use MQTT efficiently in escape rooms: -- Every props has two MQTT topics assigned as inbox and outbox. +- Every prop has two MQTT topics assigned as inbox and outbox. - More MQTT topics can be used to share game countdown, scenario or any common useful dynamic data for the escape game. -- Notifying the props is done by publishing a message on its inbox topic. -- Other props or software controllers can subscribe to the props outbox topic to receive all its notifications. +- Notifying the prop is done by publishing a message on its inbox topic. +- Other prop or software controllers can subscribe to the prop outbox topic to receive all its notifications. - *ArduinoProps library* includes a ping process at application level, in LAN network the round-trip-delay is around 50 milliseconds. - *ArduinoProps library* is defaulted to publish QoS 0 messages and to subscribe at QoS 1. @@ -61,7 +61,7 @@ Arduino YUN can be rebooted or its MCU resetted remotely with simple SSH command Moreover, SSH command can be used to remotely change the MQTT server IP address, *ArduinoProps library* read this address at sketch start. -Therefore, **Arduino YUN or YUN shield is the preferred solution for props with Arduino boards** because it will be very easy to sustain over time and greatly facilitates fallback plans to ensure maximum uptime: +Therefore, **Arduino YUN or YUN shield is the preferred solution for prop with Arduino boards** because it will be very easy to sustain over time and greatly facilitates fallback plans to ensure maximum uptime: - **Arduino Yún** - **Arduino Yún Rev 2** - **Arduino Mega 2560 Rev3 + Dragino Yún Shield** @@ -71,7 +71,7 @@ Therefore, **Arduino YUN or YUN shield is the preferred solution for props with # Arduino Ethernet and Wifi -Arduino with Ethernet or Wifi shield is suitable to build an Escape Room Props, however the sketch must be uploaded with an USB cable, so it is not convenient for props design and worse for props in production, which can lead to an unexpected significant increase in TCO. +Arduino with Ethernet or Wifi shield is suitable to build an Escape Room Props, however the sketch must be uploaded with an USB cable, so it is not convenient for prop design and worse for prop in production, which can lead to an unexpected significant increase in TCO. # Compatible hardware @@ -85,9 +85,9 @@ Arduino with Ethernet or Wifi shield is suitable to build an Escape Room Props, - Arduino Ethernet - Arduino Ethernet Shield -For WiFi props, please update the WiFiNINA firmware: [WiFiNINA firmware update](WifiNinaFirmware.md). +For WiFi prop, please update the WiFiNINA firmware: [WiFiNINA firmware update](WifiNinaFirmware.md). -To use other WiFi hardware compatible with any *Nick O'Leary PubSubClient* library you have to fork `WifiProps.h` and `WifiProps.cpp` and to replace `WiFiNINA.h` whih appropriate WiFi library (`ESP8266WiFi.h` for example): +To use other WiFi hardware compatible with any *Nick O'Leary PubSubClient* library you have to fork `WifiProp.h` and `WifiProp.cpp` and to replace `WiFiNINA.h` whih appropriate WiFi library (`ESP8266WiFi.h` for example): - Arduino WiFi Shield - Sparkfun WiFly Shield – [library](https://github.com/dpslwk/WiFly) - TI CC3000 WiFi - [library](https://github.com/sparkfun/SFE_CC3000_Library) diff --git a/help/Props.md b/help/Prop.md similarity index 63% rename from help/Props.md rename to help/Prop.md index 1551301..63b6abe 100644 --- a/help/Props.md +++ b/help/Prop.md @@ -1,28 +1,28 @@ -# *Props* class reference +# *Prop* class reference -*Props* is a base class for 3 connected props, depending on their network interface: -* ***BridgeProps*** for Yun board and Yun shield -* ***EthernetProps*** for Ethernet shield -* ***WifiProps*** for WiFiNINA boards +*Prop* is a base class for 3 connected prop, depending on their network interface: +* ***BridgeProp*** for Yun board and Yun shield +* ***EthernetProp*** for Ethernet shield +* ***WifiProp*** for WiFiNINA boards -*Props* class reference: -1. Define the *Props* - * Defining a *BridgeProps* - * Defining an *EthernetProps* - * Defining a *WifiProps* -2. Setup the *Props* +*Prop* class reference: +1. Define the *Prop* + * Defining a *BridgeProp* + * Defining an *EthernetProp* + * Defining a *WifiProp* +2. Setup the *Prop* * Change timings 3. Call in sketch *loop()* 4. Implement `InboxMessage::run()` callback -5. Update broker address from SSH (*BridgeProps*) +5. Update broker address from SSH (*BridgeProp*) 6. Examples 7. Compatible hardware -## 1. Defines the *Props* -Defining a Bridge (Yun), Ethernet or Wifi *Props* is slighlty different. +## 1. Defines the *Prop* +Defining a Bridge (Yun), Ethernet or Wifi *Prop* is slighlty different. -### Defining a *BridgeProps* +### Defining a *BridgeProp* ```csharp #include #include "ArduinoProps.h" @@ -31,23 +31,23 @@ Defining a Bridge (Yun), Ethernet or Wifi *Props* is slighlty different. // prpos inbox/outbox syntax Room/[escape room name]/Props/[propsname]/inbox|outbox // https://live-escape.net/go/room -BridgeProps props(u8"Arduino Contrôleur", // as MQTT client id, should be unique per client for given broker +BridgeProp prop(u8"Arduino Contrôleur", // as MQTT client id, should be unique per client for given broker u8"Room/Demoniak/Props/Arduino Contrôleur/inbox", u8"Room/Demoniak/Props/Arduino Contrôleur/outbox", "192.168.1.42", // your MQTT server IP address 1883); // your MQTT server port; -PropsDataLogical clignoter(u8"clignote", u8"oui", u8"non", true); -PropsDataLogical led(u8"led"); +PropDataLogical clignoter(u8"clignote", u8"oui", u8"non", true); +PropDataLogical led(u8"led"); void clignote(); // forward -PropsAction clignoteAction = PropsAction(1000, clignote); +PropAction clignoteAction = PropAction(1000, clignote); ``` -Create *BridgeProps* instance with MQTT parameters, then create *PropsData* instances and *PropsActions*. +Create *BridgeProp* instance with MQTT parameters, then create *PropData* instances and *PropsActions*. The *Bridge* instance is created by `#include `. -### Defining an *EthernetProps* +### Defining an *EthernetProp* ```csharp #include #include @@ -64,25 +64,25 @@ String ip = "192.168.1.19"; //<<< ENTER YOUR IP ADDRESS HERE ("" for DHCP) // prpos inbox/outbox syntax Room/[escape room name]/Props/[propsname]/inbox|outbox // https://live-escape.net/go/room -EthernetProps props(u8"Arduino Contrôleur", // as MQTT client id, should be unique per client for given broker +EthernetProp prop(u8"Arduino Contrôleur", // as MQTT client id, should be unique per client for given broker u8"Room/Demoniak/Props/Arduino Contrôleur/inbox", u8"Room/Demoniak/Props/Arduino Contrôleur/outbox", "192.168.1.42", // your MQTT server IP address 1883); // your MQTT server port; -PropsDataLogical clignoter(u8"clignote", u8"oui", u8"non", true); -PropsDataLogical led(u8"led"); +PropDataLogical clignoter(u8"clignote", u8"oui", u8"non", true); +PropDataLogical led(u8"led"); void clignote(); // forward -PropsAction clignoteAction = PropsAction(1000, clignote); +PropAction clignoteAction = PropAction(1000, clignote); ``` Create MAC address (which must be unique, it's the hardware ID in the netwprk). -Create *EthernetProps* instance with MQTT parameters, then create *PropsData* instances and *PropsActions*. +Create *EthernetProp* instance with MQTT parameters, then create *PropData* instances and *PropsActions*. The *Ethernet* instance is created by `#include `. -### Defining a *WifiProps* +### Defining a *WifiProp* ```csharp #include "ArduinoProps.h" @@ -98,69 +98,69 @@ const char *passphrase = ""; // prpos inbox/outbox syntax Room/[escape room name]/Props/[propsname]/inbox|outbox // https://live-escape.net/go/room -WifiProps props(u8"Arduino Contrôleur", // as MQTT client id, should be unique per client for given broker +WifiProp prop(u8"Arduino Contrôleur", // as MQTT client id, should be unique per client for given broker u8"Room/Demoniak/Props/Arduino Contrôleur/inbox", u8"Room/Demoniak/Props/Arduino Contrôleur/outbox", "192.168.1.42", // your MQTT server IP address 1883); // your MQTT server port; -PropsDataLogical clignoter(u8"clignote", u8"oui", u8"non", true); -PropsDataLogical led(u8"led"); +PropDataLogical clignoter(u8"clignote", u8"oui", u8"non", true); +PropDataLogical led(u8"led"); void clignote(); // forward -PropsAction clignoteAction = PropsAction(1000, clignote); +PropAction clignoteAction = PropAction(1000, clignote); ``` The *AduinoProps* library uses **WiFiNINA** WiFi library for **Arduino Uno WiFi Rev 2**, **Arduino NANO 33 IoT**, **Arduino MKR WiFi 1010** and **Arduino MKR VIDOR 4000**. Please update the WiFiNINA firmware: [WiFiNINA firmware update](WifiNinaFirmware.md). -Create *WifiProps* instance with MQTT parameters, then create *PropsData* instances and *PropsActions*. +Create *WifiProp* instance with MQTT parameters, then create *PropData* instances and *PropsActions*. #### MQTT topics -The props listens to the *inbox* topic for command messages and send data and messages into the *outbox* topic. +The prop listens to the *inbox* topic for command messages and send data and messages into the *outbox* topic. If you're running Live Escape Room 2.0 control software, you have to respect *inbox*/*outbox* syntax: Room 2.0 *inbox* topic: ```csharp -format: Room/[escape room name]/Props/[props name]/inbox +format: Room/[escape room name]/Props/[prop name]/inbox example: u8"Room/Demoniak/Props/Arduino Contrôleur/inbox" ``` Room 2.0 *outbox* topic: ```csharp -format: Room/[escape room name]/Props/[props name]/outbox +format: Room/[escape room name]/Props/[prop name]/outbox example: u8"Room/Demoniak/Props/Arduino Contrôleur/outbox" ``` -See [README.md](../README.md): **4. Application protocol for escape room 2.0 props**. +See [README.md](../README.md): **4. Application protocol for escape room 2.0 prop**. -#### *PropsData* instances -*PropsData* provides a facility to monitor data sent into MQTT outbox. +#### *PropData* instances +*PropData* provides a facility to monitor data sent into MQTT outbox. -See [PropsData.md](PropsData.md) for *PropsData* reference. +See [PropData.md](PropData.md) for *PropData* reference. -#### *PropsAction* instances -To maintain a non-blocking asynchronous behavior of your props, use *PropsAction* objects to trigger action periodically. +#### *PropAction* instances +To maintain a non-blocking asynchronous behavior of your prop, use *PropAction* objects to trigger action periodically. Reading I/O and simple computing (arithmetics) can be done at every sketch loop but long computing have to run periodically. For example, to blink a led, don't block the skecth with a `delay(1000)` call to switch the output: instead, ***check if 1 second is elapsed to switch the output***. -See [PropsAction.md](PropsData.md) for *PropsAction* reference. +See [PropAction.md](PropData.md) for *PropAction* reference. -## 2. Setup the *Props* +## 2. Setup the *Prop* `InboxMessage::run` is the callback executed when a message is received in the MQTT inbox. ```csharp void setup() { // CODE TO BEGIN THE INTERNET CONNECTION - ... see below the different code for BridgeProps, EthenetProps and WifiProps + ... see below the different code for BridgeProp, EthenetProps and WifiProp // SAME CODE FOR ALL PROPS - props.addData(&clignoter); - props.addData(&led); + prop.addData(&clignoter); + prop.addData(&led); - props.begin(InboxMessage::run); + prop.begin(InboxMessage::run); pinMode(LED_BUILTIN, OUTPUT); // initialize digital pin LED_BUILTIN as an output @@ -169,20 +169,20 @@ void setup() ``` -*BridgeProps*, *EthenetProps* and *WifiProps* has the exactly same setup: +*BridgeProp*, *EthenetProps* and *WifiProp* has the exactly same setup: -- add *PropsData* references to the props -- call `props.begin(InboxMessage::run)` +- add *PropData* references to the prop +- call `prop.begin(InboxMessage::run)` The setup code is slighlty different to start the network client (bridge, ethernet of wifi): ```csharp void setup() { -#if defined(BRIDGEPROPS_H) +#if defined(BRIDGEPROP_H) Bridge.begin(); - updateBrokerAdressFromFile("/root/broker", &props); // if you're running our Escape Room control software (Room 2.0) + updateBrokerAdressFromFile("/root/broker", &prop); // if you're running our Escape Room control software (Room 2.0) -#elif defined(ETHERNETPROPS_H) +#elif defined(ETHERNETPROP_H) // can do more static IP configuration //Ethernet.setSubnetMask(IPAddress()); //Ethernet.setGatewayIP(IPAddress()); @@ -201,7 +201,7 @@ void setup() } delay(1500); // time for shield stuff -#elif defined(WIFIPROPS_H) +#elif defined(WIFIPROP_H) // can do more static IP configuration //WiFi.config(IPAddress(), IPAddress(), IPAddress()); //WiFi.config(IPAddress(), IPAddress()); @@ -221,11 +221,11 @@ void setup() ### Change timings Default timings are: * check data changes every 400 milliseconds -* *Props* remains silent for up to 30 seconds +* *Prop* remains silent for up to 30 seconds Timings can be changed anywhere in the code with `resetIntervals()`: ```csharp - props.resetIntervals(250, 15); // check data changes every 250 milliseconds, silent up to 15 seconds + prop.resetIntervals(250, 15); // check data changes every 250 milliseconds, silent up to 15 seconds ``` @@ -233,7 +233,7 @@ Timings can be changed anywhere in the code with `resetIntervals()`: ```csharp void loop() { - props.loop(); + prop.loop(); led.setValue(digitalRead(LED_BUILTIN)); // read I/O @@ -243,7 +243,7 @@ void loop() ``` Couldn't be more simple! -Just call `props.loop()` when entering the sketch `loop()`, it will maintain MQTT broker connection and run callback when receiving MQTT messages. +Just call `prop.loop()` when entering the sketch `loop()`, it will maintain MQTT broker connection and run callback when receiving MQTT messages. ## 4. Implement `InboxMessage::run()` callback @@ -255,40 +255,40 @@ void InboxMessage::run(String a) { if (a == u8"app:startup") { - props.sendAllData(); - props.sendDone(a); + prop.sendAllData(); + prop.sendDone(a); } else if (a == "clignoter:1") { clignoter.setValue(true); - props.sendAllData(); // all data change, we don't have to be selctive then - props.sendDone(a); // acknowledge props command action + 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") { clignoter.setValue(false); - props.sendAllData(); // all data change, we don't have to be selctive then - props.sendDone(a); // acknowledge props command action + prop.sendAllData(); // all data change, we don't have to be selctive then + prop.sendDone(a); // acknowledge prop command action } else { - // acknowledge omition of the props command - props.sendOmit(a); + // acknowledge omition of the prop command + prop.sendOmit(a); } } ``` -## 5. Update broker address from SSH (*BridgeProps*) +## 5. Update broker address from SSH (*BridgeProp*) Room 2.0 use a SSH command to change remotely the broker IP address (in /root/broker file) and to relaunch to sketch: ```bash ssh 'echo 192.168.1.14> /root/broker && reset-mcu' ``` -On the *BridgeProps* you can read the broker IP address from Linino filesystem with this code: +On the *BridgeProp* you can read the broker IP address from Linino filesystem with this code: ```csharp -void updateBrokerAdressFromFile(const char* broker_file, BridgeProps* props) +void updateBrokerAdressFromFile(const char* broker_file, BridgeProp* prop) { // broker IP address is stored in Linino file systems and updated with ssh command by Room 2.0 IPAddress ip; @@ -304,7 +304,7 @@ void updateBrokerAdressFromFile(const char* broker_file, BridgeProps* props) } b.trim(); - if (ip.fromString(b.c_str())) props->setBrokerIpAddress(ip); + if (ip.fromString(b.c_str())) prop->setBrokerIpAddress(ip); } ``` @@ -312,12 +312,12 @@ void updateBrokerAdressFromFile(const char* broker_file, BridgeProps* props) ## 6. Examples The library comes with a number of example sketches. See **File > Examples > ArduinoProps** within the Arduino IDE application. -See [EXAMPLES.md](../EXAMPLES.md) for an adaptation of the Blink example (https://www.arduino.cc/en/tutorial/blink) as a simple MQTT props: +See [EXAMPLES.md](../EXAMPLES.md) for an adaptation of the Blink example (https://www.arduino.cc/en/tutorial/blink) as a simple MQTT prop: -1. **BlinkOnBridgeProps**: the Blink example on a Yun props with *ArduinoProps library* -2. **BlinkOnEthernetProps**: the Blink example on an Ethernet props with *ArduinoProps library* -3. **BlinkOnWifiProps**: the Blink example on a Wifi props with *ArduinoProps library* -4. **BlinkOnBridgePubSub**: the Blink example on props using *PubSubClient* directly +1. **BlinkOnBridgeProps**: the Blink example on a Yun prop with *ArduinoProps library* +2. **BlinkOnEthernetProps**: the Blink example on an Ethernet prop with *ArduinoProps library* +3. **BlinkOnWifiProps**: the Blink example on a Wifi prop with *ArduinoProps library* +4. **BlinkOnBridgePubSub**: the Blink example on prop using *PubSubClient* directly ## 7. Compatible hardware @@ -331,9 +331,9 @@ See [EXAMPLES.md](../EXAMPLES.md) for an adaptation of the Blink example (https: - Arduino Ethernet - Arduino Ethernet Shield -For WiFi props, please update the WiFiNINA firmware: [WiFiNINA firmware update](WifiNinaFirmware.md). +For WiFi prop, please update the WiFiNINA firmware: [WiFiNINA firmware update](WifiNinaFirmware.md). -To use other WiFi hardware compatible with any *Nick O'Leary PubSubClient* library you have to fork `WifiProps.h` and `WifiProps.cpp` and to replace `WiFiNINA.h` whih appropriate WiFi library (`ESP8266WiFi.h` for example): +To use other WiFi hardware compatible with any *Nick O'Leary PubSubClient* library you have to fork `WifiProp.h` and `WifiProp.cpp` and to replace `WiFiNINA.h` whih appropriate WiFi library (`ESP8266WiFi.h` for example): - Arduino WiFi Shield - Sparkfun WiFly Shield – [library](https://github.com/dpslwk/WiFly) - TI CC3000 WiFi - [library](https://github.com/sparkfun/SFE_CC3000_Library) diff --git a/help/PropsAction.md b/help/PropAction.md similarity index 75% rename from help/PropsAction.md rename to help/PropAction.md index 3adeda9..dac1731 100644 --- a/help/PropsAction.md +++ b/help/PropAction.md @@ -1,11 +1,11 @@ -# *PropsAction* class reference +# *PropAction* class reference -*PropsAction* brings asynchronous-like behavior to sketch `loop()`. +*PropAction* brings asynchronous-like behavior to sketch `loop()`. ## Constructors -* `PropsAction()` -* `PropsAction(unsigned long interval, void (*function)())` +* `PropAction()` +* `PropAction(unsigned long interval, void (*function)())` `function` is the callback executed at every `interval` milliseconds. @@ -30,9 +30,9 @@ void clignote() } ``` -### Create a *PropsAction* instance +### Create a *PropAction* instance ```csharp -PropsAction clignoteAction = PropsAction(1000, clignote); // interval every 1000 milliseconds +PropAction clignoteAction = PropAction(1000, clignote); // interval every 1000 milliseconds ``` ### Call the instance `check()` method ine the sketch `loop()` diff --git a/help/PropData.md b/help/PropData.md new file mode 100644 index 0000000..6547f08 --- /dev/null +++ b/help/PropData.md @@ -0,0 +1,76 @@ +# *PropData* reference + +*PropData* tracks data changes and provides escape room 2.0 propocol `DATA` ready string format. + +See **4. Application protocol for escape room 2.0 prop** in [README.md](../README.md). + +*PropData* is an interface (base class) implemented by 4 classes: +* ***PropDataDecimal*** +* ***PropDataInteger*** +* ***PropDataLogical*** +* ***PropDataText*** + +## Constructors +* `PropDataDecimal(const char *, uint8_t digits = 2, double precision = 0.1, double initial = 0)` +* `PropDataInteger(const char *, double precision = 0.1, long initial = 0)` +* `PropDataLogical(const char *, const char *trueval = NULL, const char *falseval = NULL, bool initial = false)` +* `PropDataText(const char *)` + +By default for *PropDataLogical*, `trueval` is `"1"` band `falseval` is `"0"`. + +For *PropDataDecimal*, `digits` is the number of decimal digits in the display string. + +For *PropDataDecimal* and *PropDataInteger*, `precision` is the percentage threshold for deciding whether a change has occurred or not. + +## Interface +* `String fetch()` +* `String fetchChange()` + +*fetch()* always returns the `"var=value "` string ready to be sent in a `DATA` protocol message and update the `_previous` value. + +*fetchChange()* checks whether a change has occurred or not. If a change occured, returns the `"var=value "` string ready to be sent in a `DATA` protocol message and update the `_previous` value. If no change occured, returns and empty string. + +## Accessors and Mutators +* `void setValue(const double|long|bool|String)` +* `double|long|bool|String value() const` + +Accessors and Mutators are typed according to *PropData* type. + +## Usage + +### Create a *PropData* instance +```csharp +PropDataLogical clignoter(u8"clignote", u8"oui", u8"non", true); +``` + +### Add the *PropData* instance to managed data of the *Props* +```csharp +void setup() +{ + ... + + Props::addManagedLogicalData(&clignoter); + + ... +} +``` + +### Use the *PropData* instance anywhere +```csharp +clignoter.setValue(true); + +... + +if (clignoter.value()) { + digitalWrite(LED_BUILTIN, !digitalRead(LED_BUILTIN)); + led.setValue(digitalRead(LED_BUILTIN)); +} +``` + +## Author + +**Marie FAURE** (Oct 18th, 2019) +* company: FAURE SYSTEMS SAS +* mail: *dev at faure dot systems* +* github: fauresystems +* web: Faure Systems \ No newline at end of file diff --git a/help/PropsData.md b/help/PropsData.md deleted file mode 100644 index fa19da2..0000000 --- a/help/PropsData.md +++ /dev/null @@ -1,76 +0,0 @@ -# *PropsData* reference - -*PropsData* tracks data changes and provides escape room 2.0 propocol `DATA` ready string format. - -See **4. Application protocol for escape room 2.0 props** in [README.md](../README.md). - -*PropsData* is an interface (base class) implemented by 4 classes: -* ***PropsDataDecimal*** -* ***PropsDataInteger*** -* ***PropsDataLogical*** -* ***PropsDataText*** - -## Constructors -* `PropsDataDecimal(const char *, uint8_t digits = 2, double precision = 0.1, double initial = 0)` -* `PropsDataInteger(const char *, double precision = 0.1, long initial = 0)` -* `PropsDataLogical(const char *, const char *trueval = NULL, const char *falseval = NULL, bool initial = false)` -* `PropsDataText(const char *)` - -By default for *PropsDataLogical*, `trueval` is `"1"` band `falseval` is `"0"`. - -For *PropsDataDecimal*, `digits` is the number of decimal digits in the display string. - -For *PropsDataDecimal* and *PropsDataInteger*, `precision` is the percentage threshold for deciding whether a change has occurred or not. - -## Interface -* `String fetch()` -* `String fetchChange()` - -*fetch()* always returns the `"var=value "` string ready to be sent in a `DATA` protocol message and update the `_previous` value. - -*fetchChange()* checks whether a change has occurred or not. If a change occured, returns the `"var=value "` string ready to be sent in a `DATA` protocol message and update the `_previous` value. If no change occured, returns and empty string. - -## Accessors and Mutators -* `void setValue(const double|long|bool|String)` -* `double|long|bool|String value() const` - -Accessors and Mutators are typed according to *PropsData* type. - -## Usage - -### Create a *PropsData* instance -```csharp -PropsDataLogical clignoter(u8"clignote", u8"oui", u8"non", true); -``` - -### Add the *PropsData* instance to managed data of the *Props* -```csharp -void setup() -{ - ... - - Props::addManagedLogicalData(&clignoter); - - ... -} -``` - -### Use the *PropsData* instance anywhere -```csharp -clignoter.setValue(true); - -... - -if (clignoter.value()) { - digitalWrite(LED_BUILTIN, !digitalRead(LED_BUILTIN)); - led.setValue(digitalRead(LED_BUILTIN)); -} -``` - -## Author - -**Marie FAURE** (Oct 18th, 2019) -* company: FAURE SYSTEMS SAS -* mail: *dev at faure dot systems* -* github: fauresystems -* web: Faure Systems \ No newline at end of file diff --git a/keywords.txt b/keywords.txt index f14911b..81555f4 100644 --- a/keywords.txt +++ b/keywords.txt @@ -7,15 +7,15 @@ ####################################### Props KEYWORD1 -BridgeProps KEYWORD1 -EthernetProps KEYWORD1 -WifiProps KEYWORD1 -PropsAction KEYWORD1 -PropsData KEYWORD1 -PropsDataDecimal KEYWORD1 -PropsDataInteger KEYWORD1 -PropsDataLogical KEYWORD1 -PropsDataText KEYWORD1 +BridgeProp KEYWORD1 +EthernetProp KEYWORD1 +WifiProp KEYWORD1 +PropAction KEYWORD1 +PropData KEYWORD1 +PropDataDecimal KEYWORD1 +PropDataInteger KEYWORD1 +PropDataLogical KEYWORD1 +PropDataText KEYWORD1 PropsCallback KEYWORD1 PropsMessageReceived KEYWORD1 InboxMessage KEYWORD1 diff --git a/src/ArduinoProps.cpp b/src/ArduinoProps.cpp index 3049d30..1023262 100644 --- a/src/ArduinoProps.cpp +++ b/src/ArduinoProps.cpp @@ -5,7 +5,7 @@ Editor: https://github.com/fauresystems License: MIT License (c) Marie Faure - Library to make props sketch for Escape Room 2.0 (connected props). + Library to make prop sketch for Escape Room 2.0 (connected prop). */ #include "ArduinoProps.h" diff --git a/src/ArduinoProps.h b/src/ArduinoProps.h index 3a85481..6d70729 100644 --- a/src/ArduinoProps.h +++ b/src/ArduinoProps.h @@ -5,7 +5,7 @@ Editor: https://github.com/fauresystems License: MIT License (c) Marie Faure - Library to make props sketch for Escape Room 2.0 (connected props). + Library to make prop sketch for Escape Room 2.0 (connected prop). */ #ifndef _ArduinoProps_h @@ -17,10 +17,10 @@ #include "WProgram.h" #endif -#include "BridgeProps.h" -#include "EthernetProps.h" -#include "WifiProps.h" -#include "PropsAction.h" -#include "PropsData.h" +#include "BridgeProp.h" +#include "EthernetProp.h" +#include "WifiProp.h" +#include "PropAction.h" +#include "PropData.h" #endif diff --git a/src/BridgeProps.cpp b/src/BridgeProp.cpp similarity index 62% rename from src/BridgeProps.cpp rename to src/BridgeProp.cpp index 5763c87..87832be 100644 --- a/src/BridgeProps.cpp +++ b/src/BridgeProp.cpp @@ -1,5 +1,5 @@ /* - Name: BridgeProps.cpp + Name: BridgeProp.cpp Created: 29/10/2019 09:20:31 Author: Marie Faure Editor: https://github.com/fauresystems @@ -8,20 +8,20 @@ Class Props for Arduino Yun and Dragino Yun shield. */ -#include "BridgeProps.h" +#include "BridgeProp.h" -BridgeProps::BridgeProps(const char* client_id, const char* in_box, const char* out_box, const char* broker, const int port) +BridgeProp::BridgeProp(const char* client_id, const char* in_box, const char* out_box, const char* broker, const int port) : Props(client_id, in_box, out_box, broker, port) { _client.setClient(_bridgeClient); } -void BridgeProps::begin(void(*on_message)(String)) +void BridgeProp::begin(void(*on_message)(String)) { if (on_message) onInboxMessageReceived = on_message; } -void BridgeProps::setBrokerIpAddress(IPAddress ip, uint16_t port) +void BridgeProp::setBrokerIpAddress(IPAddress ip, uint16_t port) { _brokerIpAddress = ip; _client.setServer(_brokerIpAddress, port); diff --git a/src/BridgeProps.h b/src/BridgeProp.h similarity index 70% rename from src/BridgeProps.h rename to src/BridgeProp.h index c72cdff..0e03a46 100644 --- a/src/BridgeProps.h +++ b/src/BridgeProp.h @@ -1,5 +1,5 @@ /* - Name: BridgeProps.h + Name: BridgeProp.h Created: 29/10/2019 09:20:31 Author: Marie Faure Editor: https://github.com/fauresystems @@ -7,17 +7,17 @@ Class Props for Arduino Yun and Dragino Yun shield. */ -#ifndef BRIDGEPROPS_H -#define BRIDGEPROPS_H +#ifndef BRIDGEPROP_H +#define BRIDGEPROP_H #include #include -#include "Props.h" +#include "Prop.h" -class BridgeProps : public Props +class BridgeProp : public Props { public: - BridgeProps(const char*, const char*, const char*, const char*, const int); + BridgeProp(const char*, const char*, const char*, const char*, const int); void begin(void(*)(String) = NULL); void setBrokerIpAddress(IPAddress, uint16_t port = 1883); diff --git a/src/EthernetProps.cpp b/src/EthernetProp.cpp similarity index 63% rename from src/EthernetProps.cpp rename to src/EthernetProp.cpp index f5160ca..44eb589 100644 --- a/src/EthernetProps.cpp +++ b/src/EthernetProp.cpp @@ -1,5 +1,5 @@ /* - Name: EthernetProps.cpp + Name: EthernetProp.cpp Created: 29/10/2019 09:20:31 Author: Marie Faure Editor: https://github.com/fauresystems @@ -8,15 +8,15 @@ Class Props for Arduino with Ethernet shield. */ -#include "EthernetProps.h" +#include "EthernetProp.h" -EthernetProps::EthernetProps(const char* client_id, const char* in_box, const char* out_box, const char* broker, const int port) +EthernetProp::EthernetProp(const char* client_id, const char* in_box, const char* out_box, const char* broker, const int port) : Props(client_id, in_box, out_box, broker, port) { _client.setClient(_ethernetClient); } -void EthernetProps::begin(void(*on_message)(String)) +void EthernetProp::begin(void(*on_message)(String)) { if (on_message) onInboxMessageReceived = on_message; } diff --git a/src/EthernetProps.h b/src/EthernetProp.h similarity index 66% rename from src/EthernetProps.h rename to src/EthernetProp.h index d649baa..2f9044c 100644 --- a/src/EthernetProps.h +++ b/src/EthernetProp.h @@ -1,5 +1,5 @@ /* - Name: EthernetProps.h + Name: EthernetProp.h Created: 29/10/2019 09:20:31 Author: Marie Faure Editor: https://github.com/fauresystems @@ -7,19 +7,19 @@ Class Props for Arduino with Ethernet shield. */ -#ifndef ETHERNETPROPS_H -#define ETHERNETPROPS_H +#ifndef ETHERNETPROP_H +#define ETHERNETPROP_H #include #include #include -#include "Props.h" +#include "Prop.h" -class EthernetProps : public Props +class EthernetProp : public Props { public: - EthernetProps(const char*, const char*, const char*, const char*, const int); + EthernetProp(const char*, const char*, const char*, const char*, const int); void begin(void(*)(String) = NULL); private: diff --git a/src/Props.cpp b/src/Prop.cpp similarity index 97% rename from src/Props.cpp rename to src/Prop.cpp index c655736..4e30049 100644 --- a/src/Props.cpp +++ b/src/Prop.cpp @@ -5,10 +5,10 @@ Editor: https://github.com/fauresystems License: MIT License (c) Marie Faure - Base class to make props sketch for Escape Room 2.0 (connected). + Base class to make prop sketch for Escape Room 2.0 (connected). */ -#include "Props.h" +#include "Prop.h" #include #if defined(__AVR__) #include @@ -58,7 +58,7 @@ Props::Props(const char* client_id, const char* in_box, const char* out_box, con _sendDataAction.reset(400); // check data changes every 400 milliseconds } -void Props::addData(PropsData* d) +void Props::addData(PropData* d) { _dataTable.Add(d); } diff --git a/src/Props.h b/src/Prop.h similarity index 87% rename from src/Props.h rename to src/Prop.h index 3800152..bceecf0 100644 --- a/src/Props.h +++ b/src/Prop.h @@ -1,14 +1,14 @@ /* - Name: Props.h + Name: Prop.h Created: 29/10/2019 09:20:31 Author: Marie Faure Editor: https://github.com/fauresystems License: MIT License (c) Marie Faure - Base class to make props sketch for Escape Room 2.0 (connected). + Base class to make prop sketch for Escape Room 2.0 (connected). */ -#ifndef PROPS_H -#define PROPS_H +#ifndef PROP_H +#define PROP_H #if defined(ARDUINO) && ARDUINO >= 100 #include "arduino.h" @@ -19,8 +19,8 @@ #include #include #include -#include "PropsAction.h" -#include "PropsData.h" +#include "PropAction.h" +#include "PropData.h" #ifndef MQTT_MAX_PACKET_SIZE #define MQTT_MAX_PACKET_SIZE 128 // Bridge tranfer stuff (see PubSubClient) @@ -53,7 +53,7 @@ class Props public: Props(const char*, const char*, const char*, const char*, const int=1883); virtual void begin(void(*)(String) = NULL) = 0; - void addData(PropsData*); + void addData(PropData*); void loop(); void resetIntervals(const int changes, const int silent); void resetMcu(); @@ -86,8 +86,8 @@ class Props uint8_t _maximumSilentPeriod; unsigned long _nextReconAttempt; uint8_t _payloadMax; - PropsAction _sendDataAction; - List _dataTable; + PropAction _sendDataAction; + List _dataTable; }; #endif diff --git a/src/PropsAction.cpp b/src/PropAction.cpp similarity index 69% rename from src/PropsAction.cpp rename to src/PropAction.cpp index 564f646..9ba792f 100644 --- a/src/PropsAction.cpp +++ b/src/PropAction.cpp @@ -1,5 +1,5 @@ /* - Name: PropsAction.h + Name: PropAction.h Created: 29/10/2019 09:20:31 Author: Marie Faure Editor: https://github.com/fauresystems @@ -8,9 +8,9 @@ Provide an easy way of triggering functions at a set _interval. */ -#include "PropsAction.h" +#include "PropAction.h" -PropsAction::PropsAction() +PropAction::PropAction() { _active = true; _previous = 0; @@ -18,7 +18,7 @@ PropsAction::PropsAction() _execute = NULL; } -PropsAction::PropsAction(unsigned long intervl, void (*function)()) +PropAction::PropAction(unsigned long intervl, void (*function)()) { _active = true; _previous = 0; @@ -26,24 +26,24 @@ PropsAction::PropsAction(unsigned long intervl, void (*function)()) _execute = function; } -void PropsAction::reset(unsigned long intervl) +void PropAction::reset(unsigned long intervl) { _active = true; _previous = 0; _interval = intervl; } -void PropsAction::disable() +void PropAction::disable() { _active = false; } -void PropsAction::enable() +void PropAction::enable() { _active = true; } -void PropsAction::check() { +void PropAction::check() { if (_active && (millis() - _previous >= _interval)) { _previous = millis(); @@ -51,7 +51,7 @@ void PropsAction::check() { } } -bool PropsAction::tick() { +bool PropAction::tick() { if (_active && (millis() - _previous >= _interval)) { _previous = millis(); @@ -60,7 +60,7 @@ bool PropsAction::tick() { return false; } -unsigned long PropsAction::getInterval() +unsigned long PropAction::getInterval() { return _interval; } diff --git a/src/PropsAction.h b/src/PropAction.h similarity index 84% rename from src/PropsAction.h rename to src/PropAction.h index ee6a0b3..6f38bb1 100644 --- a/src/PropsAction.h +++ b/src/PropAction.h @@ -1,5 +1,5 @@ /* - Name: PropsAction.h + Name: PropAction.h Created: 29/10/2019 09:20:31 Author: Marie Faure Editor: https://github.com/fauresystems @@ -19,11 +19,11 @@ class Props; -class PropsAction { +class PropAction { public: - PropsAction(); - PropsAction(unsigned long interval, void (*function)()); + PropAction(); + PropAction(unsigned long interval, void (*function)()); void reset(unsigned long interval); void disable(); diff --git a/src/PropsData.cpp b/src/PropData.cpp similarity index 63% rename from src/PropsData.cpp rename to src/PropData.cpp index a8356f8..071a8d0 100644 --- a/src/PropsData.cpp +++ b/src/PropData.cpp @@ -1,18 +1,18 @@ /* - Name: PropsData.cpp + Name: PropData.cpp Created: 29/10/2019 09:20:31 Author: Marie Faure Editor: https://github.com/fauresystems License: MIT License (c) Marie Faure - Variable wrapper for connected props. + Variable wrapper for connected prop. */ -#include "PropsData.h" +#include "PropData.h" #include // ---- Decimal -PropsDataDecimal::PropsDataDecimal(const char * id, uint8_t digits, double precision, double initial) { +PropDataDecimal::PropDataDecimal(const char * id, uint8_t digits, double precision, double initial) { _id = id; _current = initial; _previous = _current; @@ -20,12 +20,12 @@ PropsDataDecimal::PropsDataDecimal(const char * id, uint8_t digits, double preci _digits = digits; } -String PropsDataDecimal::fetch() { +String PropDataDecimal::fetch() { _previous = _current; return String(_id) + "=" + String(_current, _digits) + " "; } -String PropsDataDecimal::fetchChange() { +String PropDataDecimal::fetchChange() { if (_current != _previous && _current && abs(_current - _previous) / _current >= _precision) { return fetch(); } @@ -35,28 +35,28 @@ String PropsDataDecimal::fetchChange() { return String(); } -void PropsDataDecimal::setValue(const double v) { +void PropDataDecimal::setValue(const double v) { _current = v; } -double PropsDataDecimal::value() const { +double PropDataDecimal::value() const { return _current; } // ---- Integer -PropsDataInteger::PropsDataInteger(const char * id, double precision, long initial) { +PropDataInteger::PropDataInteger(const char * id, double precision, long initial) { _id = id; _current = initial; _previous = _current; _precision = precision; } -String PropsDataInteger::fetch() { +String PropDataInteger::fetch() { _previous = _current; return String(_id) + "=" + String(_current) + " "; } -String PropsDataInteger::fetchChange() { +String PropDataInteger::fetchChange() { if (_current != _previous && _current && abs(_current - _previous) / _current >= _precision) { return fetch(); } @@ -66,16 +66,16 @@ String PropsDataInteger::fetchChange() { return String(); } -void PropsDataInteger::setValue(const long v) { +void PropDataInteger::setValue(const long v) { _current = v; } -long PropsDataInteger::value() const { +long PropDataInteger::value() const { return _current; } // ---- Logical -PropsDataLogical::PropsDataLogical(const char * id, const char *trueval, const char *falseval, bool initial) { +PropDataLogical::PropDataLogical(const char * id, const char *trueval, const char *falseval, bool initial) { _id = id; _current = initial; _previous = _current; @@ -83,7 +83,7 @@ PropsDataLogical::PropsDataLogical(const char * id, const char *trueval, const c _falseString = falseval; } -String PropsDataLogical::fetch() { +String PropDataLogical::fetch() { String str(String(_id) + "="); if (_current) { str += _trueString ? _trueString : "1"; @@ -95,42 +95,42 @@ String PropsDataLogical::fetch() { return str; } -String PropsDataLogical::fetchChange() { +String PropDataLogical::fetchChange() { if (_current != _previous) { return fetch(); } return String(); } -void PropsDataLogical::setValue(const bool v) { +void PropDataLogical::setValue(const bool v) { _current = v; } -bool PropsDataLogical::value() const { +bool PropDataLogical::value() const { return _current; } // ---- Text -PropsDataText::PropsDataText(const char * id) { +PropDataText::PropDataText(const char * id) { _id = id; } -String PropsDataText::fetch() { +String PropDataText::fetch() { _previous = _current; return String(_id) + "=" + _current + " "; } -String PropsDataText::fetchChange() { +String PropDataText::fetchChange() { if (_current != _previous) { return fetch(); } return String(); } -void PropsDataText::setValue(String v) { +void PropDataText::setValue(String v) { _current = v; } -String PropsDataText::value() const { +String PropDataText::value() const { return _current; } diff --git a/src/PropsData.h b/src/PropData.h similarity index 70% rename from src/PropsData.h rename to src/PropData.h index 13ec1cf..555e45e 100644 --- a/src/PropsData.h +++ b/src/PropData.h @@ -1,11 +1,11 @@ /* - Name: PropsData.h + Name: PropData.h Created: 29/10/2019 09:20:31 Author: Marie Faure Editor: https://github.com/fauresystems License: MIT License (c) Marie Faure - Variable wrapper for connected props. + Variable wrapper for connected prop. */ #ifndef PROPSDATA_H #define PROPSDATA_H @@ -19,17 +19,17 @@ #include #include -class PropsData +class PropData { public: virtual String fetch() = 0; virtual String fetchChange() = 0; }; -class PropsDataDecimal : public PropsData +class PropDataDecimal : public PropData { public: - PropsDataDecimal(const char *, uint8_t digits = 2, double precision = 0.1, double initial = 0); + PropDataDecimal(const char *, uint8_t digits = 2, double precision = 0.1, double initial = 0); String fetch(); String fetchChange(); void setValue(const double); @@ -42,10 +42,10 @@ class PropsDataDecimal : public PropsData uint8_t _digits; }; -class PropsDataInteger : public PropsData +class PropDataInteger : public PropData { public: - PropsDataInteger(const char *, double precision = 0.1, long initial = 0); + PropDataInteger(const char *, double precision = 0.1, long initial = 0); String fetch(); String fetchChange(); void setValue(const long); @@ -57,10 +57,10 @@ class PropsDataInteger : public PropsData double _precision; }; -class PropsDataLogical : public PropsData +class PropDataLogical : public PropData { public: - PropsDataLogical(const char *, const char *trueval = NULL, const char *falseval = NULL, bool initial = false); + PropDataLogical(const char *, const char *trueval = NULL, const char *falseval = NULL, bool initial = false); String fetch(); String fetchChange(); void setValue(const bool); @@ -73,10 +73,10 @@ class PropsDataLogical : public PropsData const char *_falseString; }; -class PropsDataText : public PropsData +class PropDataText : public PropData { public: - PropsDataText(const char *); + PropDataText(const char *); String fetch(); String fetchChange(); void setValue(String); diff --git a/src/WifiProps.cpp b/src/WifiProp.cpp similarity index 71% rename from src/WifiProps.cpp rename to src/WifiProp.cpp index d0aa230..79f1cdc 100644 --- a/src/WifiProps.cpp +++ b/src/WifiProp.cpp @@ -1,5 +1,5 @@ /* - Name: WifiProps.cpp + Name: WifiProp.cpp Created: 29/10/2019 09:20:31 Author: Marie Faure Editor: https://github.com/fauresystems @@ -8,19 +8,19 @@ Class Props for Arduino with WiFiNINA. */ -#include "WifiProps.h" +#include "WifiProp.h" #if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_SAMD_MKRVIDOR4000) -WifiProps::WifiProps(const char* client_id, const char* in_box, const char* out_box, const char* broker, const int port) +WifiProp::WifiProp(const char* client_id, const char* in_box, const char* out_box, const char* broker, const int port) : Props(client_id, in_box, out_box, broker, port) { _client.setClient(_wifiClient); } -void WifiProps::begin(void(*on_message)(String)) +void WifiProp::begin(void(*on_message)(String)) { if (on_message) onInboxMessageReceived = on_message; } diff --git a/src/WifiProps.h b/src/WifiProp.h similarity index 74% rename from src/WifiProps.h rename to src/WifiProp.h index 2c8cd92..c67dbb3 100644 --- a/src/WifiProps.h +++ b/src/WifiProp.h @@ -1,5 +1,5 @@ /* - Name: WifiProps.h + Name: WifiProp.h Created: 29/10/2019 09:20:31 Author: Marie Faure Editor: https://github.com/fauresystems @@ -7,8 +7,8 @@ Class Props for Arduino with WiFiNINA. */ -#ifndef WIFIPROPS_H -#define WIFIPROPS_H +#ifndef WIFIPROP_H +#define WIFIPROP_H #if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_SAMD_MKRVIDOR4000) @@ -18,12 +18,12 @@ #include #include -#include "Props.h" +#include "Prop.h" -class WifiProps : public Props +class WifiProp : public Props { public: - WifiProps(const char*, const char*, const char*, const char*, const int); + WifiProp(const char*, const char*, const char*, const char*, const int); void begin(void(*)(String) = NULL); private: