no special install script

Author: 256dpi

CMakeLists.txt

@@ -35,7 +35,6 @@ set(SOURCE_FILES
     src/YunMQTTClient.cpp
     src/YunMQTTClient.h
     examples/MQTTClient/MQTTClient.ino
-    examples/YunMQTTClient/YunMQTTClient.ino
-    examples/YunMQTTInstall/YunMQTTInstall.ino)
+    examples/YunMQTTClient/YunMQTTClient.ino)
 
 add_executable(arduino_mqtt ${SOURCE_FILES})

examples/YunMQTTClient/YunMQTTClient.ino

@@ -8,6 +8,11 @@ unsigned long lastMillis = 0;
 void setup() {
   Bridge.begin();
   Serial.begin(9600);
+
+  // this will install the required python files (pass true to force download)
+  // can also be commented out to save program space
+  client.installBridge(false);
+
   Serial.println("connecting...");
   if (client.connect("arduino", "demo", "demo")) {
     Serial.println("connected!");

examples/YunMQTTInstall/YunMQTTInstall.ino

@@ -1,18 +1,39 @@
 #include "YunMQTTClient.h"
 
+#include <FileIO.h>
+
 YunMQTTClient::YunMQTTClient(const char * _hostname, int _port) {
   this->hostname = _hostname;
   this->port = _port;
 }
 
+boolean YunMQTTClient::installBridge(boolean force) {
+  if(!force) {
+    boolean f1 = FileSystem.exists("/usr/mqtt/mqtt.py");
+    boolean f2 = FileSystem.exists("/usr/mqtt/bridge.py");
+
+    if(f1 && f2) {
+      return true;
+    }
+  }
+
+  Process p;
+
+  int r1 = p.runShellCommand("mkdir -p /usr/mqtt");
+  int r2 = p.runShellCommand("wget https://raw.githubusercontent.com/256dpi/arduino-mqtt/yun/mqtt.py --no-check-certificate -O /usr/mqtt/mqtt.py");
+  int r3 = p.runShellCommand("wget https://raw.githubusercontent.com/256dpi/arduino-mqtt/yun/bridge.py --no-check-certificate -O /usr/mqtt/bridge.py");
+
+  return r1 == 0 && r2 == 0 && r3 == 0;
+}
+
 boolean YunMQTTClient::connect(const char * clientId) {
   return this->connect(clientId, "", "");
 }
 
 boolean YunMQTTClient::connect(const char * clientId, const char * username, const char * password) {
   this->process.begin("python");
   this->process.addParameter("-u");
-  this->process.addParameter("/usr/client.py");
+  this->process.addParameter("/usr/mqtt/bridge.py");
   this->process.runAsynchronously();
   this->process.setTimeout(10000);
 

src/YunMQTTClient.cpp

@@ -2,7 +2,7 @@
 #define YUN_MQTT_CLIENT_H
 
 #include <Arduino.h>
-#include <Process.h>
+#include <Bridge.h>
 
 void messageReceived(String topic, String payload, char * bytes, unsigned int length);
 
@@ -14,6 +14,7 @@ class YunMQTTClient {
   boolean alive = false;
 public:
   YunMQTTClient(const char * hostname, int port);
+  boolean installBridge(boolean force);
   boolean connect(const char * clientId);
   boolean connect(const char * clientId, const char* username, const char* password);
   void publish(String topic);