add retained publish option

Author: chavee

AuthClient.cpp

@@ -320,7 +320,7 @@ int AuthClient::getGearToken(char mode, char* token, char* tokensecret, char* en
 
         writeln("Accept: */*");
         writeln("Connection: close");
-        writeln("User-Agent: Arduigear");
+        writeln("User-Agent: E8A");
         writeln("Content-length: 0");
         writeln("Content-Type: application/x-www-form-urlencoded");
         writeln(NULL);

AuthClient.h

@@ -49,4 +49,4 @@ class AuthClient {
         void addParam(char*, char*, char*, bool);
 		unsigned long bootts;
 };
-#endif // HTTPCLIENT_H
+#endif

MicroGear.cpp

@@ -190,8 +190,7 @@ void MicroGear::getToken(char *gkey, char *galias, char* token, char* tokensecre
     tokensecret[0] = '\0';
 
     readEEPROM(ekey,EEPROM_KEYOFFSET,KEYSIZE);
-    if (strncmp(gkey,ekey,KEYSIZE)!=0)
-        resetToken();
+    if (strncmp(gkey,ekey,KEYSIZE)!=0) resetToken();
 
     readEEPROM(state,EEPROM_STATEOFFSET,1);
     #ifdef DEBUG_H
@@ -268,6 +267,7 @@ void MicroGear::getToken(char *gkey, char *galias, char* token, char* tokensecre
                     #ifdef DEBUG_H
                         Serial.println("authclient is disconnected");
                     #endif
+	                authclient->stop();
                     delay(1000);
                 }
             }
@@ -347,7 +347,7 @@ void MicroGear::getToken(char *gkey, char *galias, char* token, char* tokensecre
     authclient->stop();
 }
 
-boolean MicroGear::connect(char* appid) {
+bool MicroGear::connect(char* appid) {
     char username[USERNAMESIZE+1];
     char password[PASSWORDSIZE+1];
     char buff[2*TOKENSECRETSIZE+2];
@@ -423,7 +423,6 @@ boolean MicroGear::connect(char* appid) {
 
                     if (cb_connected)
                         cb_connected(NULL,NULL,0);
-
                     break;
             case CLIENT_NOTCONNECT :
                     if (backoff < MAXBACKOFFTIME) backoff = 2*backoff;
@@ -435,7 +434,7 @@ boolean MicroGear::connect(char* appid) {
     else return false;
 }
 
-boolean MicroGear::connected() {
+bool MicroGear::connected() {
     if (constate == CLIENT_NOTCONNECT) return CLIENT_NOTCONNECT;
     else return this->mqttclient->connected();
     //return this->sockclient->connected();
@@ -458,11 +457,15 @@ void MicroGear::unsubscribe(char* topic) {
 }
 
 void MicroGear::publish(char* topic, char* message) {
+    publish(topic, message, false);
+}
+
+void MicroGear::publish(char* topic, char* message, bool retained) {
     char top[MAXTOPICSIZE] = "/";
 
     strcat(top,appid);
     strcat(top,topic);
-    mqttclient->publish(top, message);
+    mqttclient->publish(top, message, retained);
 }
 
 /*
@@ -505,7 +508,6 @@ int MicroGear::init(char* gearkey,char* gearsecret,char* gearalias) {
 }
 
 int MicroGear::init(char* gearkey,char* gearsecret,char* gearalias, char* scope) {
-    //this->gearid = gearkey;
     this->gearkey = gearkey;
     this->gearsecret = gearsecret;
     this->gearalias = gearalias;

MicroGear.h

@@ -24,7 +24,6 @@
 #define MINBACKOFFTIME             10
 #define MAXBACKOFFTIME             10000
 #define MAXENDPOINTLENGTH          200
-#define MAXGEARIDSIZE              64
 #define MAXTOPICSIZE               128
 
 #define KEYSIZE                    16
@@ -70,12 +69,9 @@ class MicroGear {
         char* gearsecret;
         char* gearalias;
         char* scope;
-		char* app_topic;
-		char* group_topic;
         char* token;
         char* tokensecret;
         char* endpoint;
-		char  gearid[MAXGEARIDSIZE];
 		char  mqtt_client_type;
 		unsigned long bootts;
 		int eepromoffset;
@@ -100,9 +96,10 @@ class MicroGear {
 		MicroGear(Client&);
 		void setName(char*);
 		void setAlias(char*);
-		boolean connect(char*);
-		boolean connected();
+		bool connect(char*);
+		bool connected();
 		void publish(char*, char*);
+		void publish(char*, char*, bool);
 		void subscribe(char*);
 		void unsubscribe(char*);
 		void chat(char*, char*);