Release of version 2.2.0

Author: liuszeng

AWS-IoT-Arduino-Yun-Library/aws_iot_error.h

@@ -57,7 +57,8 @@ typedef enum {
 	JSON_FILE_NOT_FOUND = -37,
 	JSON_KEY_NOT_FOUND = -38,
 	JSON_GENERIC_ERROR = -39,
-	PUBLISH_QUEUE_FULL = -40
+	PUBLISH_QUEUE_FULL = -40,
+	PUBLISH_QUEUE_DISABLED = -41
 } IoT_Error_t;
 
 #endif

AWS-IoT-Arduino-Yun-Library/aws_iot_mqtt.cpp

@@ -17,8 +17,8 @@
 #define version_h
 
 #define VERSION_MAJOR 2
-#define VERSION_MINOR 1
-#define VERSION_PATCH 1
+#define VERSION_MINOR 2
+#define VERSION_PATCH 0
 #define VERSION_TAG ""
 
 #endif

AWS-IoT-Arduino-Yun-Library/aws_iot_version.h

@@ -41,7 +41,7 @@ void setup() {
   while(!Serial);
   //
   char curr_version[80];
-  sprintf(curr_version, "AWS IoT SDK Version(dev) %d.%d.%d-%s\n", VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_TAG);
+  snprintf_P(curr_version, 80, PSTR("AWS IoT SDK Version(dev) %d.%d.%d-%s\n"), VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_TAG);
   Serial.println(curr_version);
   // Set up the client
   if((rc = myClient.setup(AWS_IOT_CLIENT_ID)) == 0) {
@@ -57,17 +57,17 @@ void setup() {
         }
       }
       else {
-        Serial.println("Connect failed!");
+        Serial.println(F("Connect failed!"));
         Serial.println(rc);
       }
     }
     else {
-      Serial.println("Config failed!");
+      Serial.println(F("Config failed!"));
       Serial.println(rc);
     }
   }
   else {
-    Serial.println("Setup failed!");
+    Serial.println(F("Setup failed!"));
     Serial.println(rc);
   }
   // Delay to make sure SUBACK is received, delay time could vary according to the server
@@ -79,7 +79,7 @@ void loop() {
     // Generate a new message in each loop and publish to "topic1"
     sprintf(msg, "new message %d", cnt);
     if((rc = myClient.publish("topic1", msg, strlen(msg), 1, false)) != 0) {
-      Serial.println("Publish failed!");
+      Serial.println(F("Publish failed!"));
       Serial.println(rc);
     }
 
@@ -90,7 +90,7 @@ void loop() {
     }
 
     // Done with the current loop
-    sprintf(msg, "loop %d done", cnt++);
+    sprintf_P(msg, PSTR("loop %d done"), cnt++);
     Serial.println(msg);
 
     delay(1000);

AWS-IoT-Arduino-Yun-Library/examples/BasicPubSub/BasicPubSub.ino

@@ -29,18 +29,23 @@ bool success_connect = false;
 bool print_log(const char* src, int code) {
   bool ret = true;
   if(code == 0) {
-    Serial.print("[LOG] command: ");
-    Serial.print(src);
-    Serial.println(" completed.");
+    #ifdef AWS_IOT_DEBUG
+      Serial.print(F("[LOG] command: "));
+      Serial.print(src);
+      Serial.println(F(" completed."));
+    #endif
     ret = true;
   }
   else {
-    Serial.print("[ERR] command: ");
-    Serial.print(src);
-    Serial.print(" code: ");
-    Serial.println(code);
+    #ifdef AWS_IOT_DEBUG
+      Serial.print(F("[ERR] command: "));
+      Serial.print(src);
+      Serial.print(F(" code: "));
+      Serial.println(code);
+    #endif
     ret = false;
   }
+  Serial.flush();
   return ret;
 }
 
@@ -57,7 +62,7 @@ void setup() {
   while(!Serial);
 
   char curr_version[80];
-  sprintf(curr_version, "AWS IoT SDK Version(dev) %d.%d.%d-%s\n", VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_TAG);
+  snprintf_P(curr_version, 80, PSTR("AWS IoT SDK Version(dev) %d.%d.%d-%s\n"), VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_TAG);
   Serial.println(curr_version);
 
   if(print_log("setup", myClient.setup(AWS_IOT_CLIENT_ID))) {
@@ -79,7 +84,7 @@ void loop() {
     else if(reportedTemp - desiredTemp > 0.001) {reportedTemp -= 0.1;}
     dtostrf(reportedTemp, 4, 1, float_buf);
     float_buf[4] = '\0';
-    sprintf(JSON_buf, "{\"state\":{\"reported\":{\"Temp\":%s}}}", float_buf);
+    sprintf_P(JSON_buf, PSTR("{\"state\":{\"reported\":{\"Temp\":%s}}}"), float_buf);
     print_log("shadow update", myClient.shadow_update(AWS_IOT_MY_THING_NAME, JSON_buf, strlen(JSON_buf), NULL, 5));
     if(myClient.yield()) {
       Serial.println("Yield failed.");

AWS-IoT-Arduino-Yun-Library/examples/ThermostatSimulatorDevice/ThermostatSimulatorDevice.ino

@@ -25,6 +25,7 @@
 #define AWS_IOT_ROOT_CA_FILENAME "aws-iot-rootCA.crt"           // your root-CA filename
 #define AWS_IOT_CERTIFICATE_FILENAME "certificate.pem.crt"                 // your certificate filename
 #define AWS_IOT_PRIVATE_KEY_FILENAME "private.pem.key"              // your private key filename
+#define AWS_IOT_DEBUG										// Enable debug logging. Remove it if you want to disable it.
 //===============================================================
 // SDK config, DO NOT modify it
 #define AWS_IOT_PATH_PREFIX "../certs/"

AWS-IoT-Arduino-Yun-Library/examples/ThermostatSimulatorDevice/aws_iot_config.h

@@ -26,18 +26,23 @@ bool success_connect = false;
 bool print_log(const char* src, int code) {
   bool ret = true;
   if(code == 0) {
-    Serial.print("[LOG] command: ");
-    Serial.print(src);
-    Serial.println(" completed.");
+    #ifdef AWS_IOT_DEBUG
+      Serial.print(F("[LOG] command: "));
+      Serial.print(src);
+      Serial.println(F(" completed."));
+    #endif
     ret = true;
   }
   else {
-    Serial.print("[ERR] command: ");
-    Serial.print(src);
-    Serial.print(" code: ");
-    Serial.println(code);
+    #ifdef AWS_IOT_DEBUG
+      Serial.print(F("[ERR] command: "));
+      Serial.print(src);
+      Serial.print(F(" code: "));
+     Serial.println(code);
+    #endif
     ret = false;
   }
+  Serial.flush();
   return ret;
 }
 
@@ -58,7 +63,7 @@ void setup() {
   while(!Serial);
 
   char curr_version[80];
-  sprintf(curr_version, "AWS IoT SDK Version(dev) %d.%d.%d-%s\n", VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_TAG);
+  snprintf_P(curr_version, 80, PSTR("AWS IoT SDK Version(dev) %d.%d.%d-%s\n"), VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_TAG);
   Serial.println(curr_version);
 
   if(print_log("setup", myClient.setup(AWS_IOT_CLIENT_ID))) {
@@ -75,7 +80,7 @@ void setup() {
 void loop() {
   if(success_connect) {
     if(myClient.yield()) {
-      Serial.println("Yield failed.");
+      Serial.println(F("Yield failed."));
     }
     delay(1000); // check for incoming delta per 100 ms
   }

AWS-IoT-Arduino-Yun-Library/examples/ThingShadowEcho/ThingShadowEcho.ino

@@ -25,6 +25,7 @@
 #define AWS_IOT_ROOT_CA_FILENAME "aws-iot-rootCA.crt"           // your root-CA filename
 #define AWS_IOT_CERTIFICATE_FILENAME "cert.pem"                 // your certificate filename
 #define AWS_IOT_PRIVATE_KEY_FILENAME "privkey.pem"              // your private key filename
+#define AWS_IOT_DEBUG										// Enable debug logging. Remove it if you want to disable it.
 //===============================================================
 // SDK config, DO NOT modify it
 #define AWS_IOT_PATH_PREFIX "../certs/"