Merge pull request #16 from obastemur/false_fix

improvements and bug fixes
Azure · Jul 16, 2018 · 4e9c466 · 4e9c466
2 parents 8bde679 + 9760678
commit 4e9c466
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 27 deletions.
diff --git a/AZ3166/.gitignore b/AZ3166/.gitignore
diff --git a/AZ3166/inc/globals.h b/AZ3166/inc/globals.h
@@ -74,7 +74,7 @@ struct Globals
 #define IOT_CENTRAL_MAX_LEN       STRING_BUFFER_128
 #define AZIOTC_FW_MAJOR_VERSION 1
 #define AZIOTC_FW_MINOR_VERSION 4
-#define AZIOTC_FW_PATCH_VERSION 1
+#define AZIOTC_FW_PATCH_VERSION 2
 #define AZIOTC_FW_VERSION         TO_STRING(AZIOTC_FW_MAJOR_VERSION AZIOTC_FW_MINOR_VERSION AZIOTC_FW_PATCH_VERSION) "-MSIOTC"
 
 #include "definitions.h"

diff --git a/AZ3166/iotc.json b/AZ3166/iotc.json
diff --git a/AZ3166/iotz.json b/AZ3166/iotz.json
@@ -2,6 +2,5 @@
   "name": "iot central firmware example for AZ3166",
   "toolchain": "arduino",
   "target": "AZ3166:stm32f4:MXCHIP_AZ3166",
-  "filename": "iotCentral.ino",
-  "has_libs": false
+  "filename": "iotCentral.ino"
 }
diff --git a/AZ3166/src/config.cpp b/AZ3166/src/config.cpp
@@ -17,7 +17,11 @@ void ConfigController::storeWiFi(AutoString &ssid, AutoString &password) {
     EEPROMInterface eeprom;
 
     eeprom.write((uint8_t*) *ssid, ssid.getLength(), WIFI_SSID_ZONE_IDX);
-    eeprom.write((uint8_t*) *password, password.getLength(), WIFI_PWD_ZONE_IDX);
+    if (password.getLength()) {
+        eeprom.write((uint8_t*) *password, password.getLength(), WIFI_PWD_ZONE_IDX);
+    } else {
+        eeprom.write((uint8_t*) "", 0, WIFI_PWD_ZONE_IDX);
+    }
 }
 
 void ConfigController::storeConnectionString(AutoString &connectionString) {

diff --git a/AZ3166/src/onboarding.cpp b/AZ3166/src/onboarding.cpp
@@ -244,8 +244,8 @@ void OnboardingController::processResultRequest(WiFiClient &client, String &requ
         pch = strtok(NULL, "&");
     }
 
-    if (ssid.getLength() == 0 || password.getLength() == 0 || connStr.getLength() == 0) {
-        LOG_ERROR("Missing ssid, password or connStr. Responsed with START page");
+    if (ssid.getLength() == 0 || connStr.getLength() == 0) {
+        LOG_ERROR("Missing ssid or connStr. Responsed with START page");
         processStartRequest(client);
         return;
     } else if (!pincodePasses) {
@@ -254,7 +254,7 @@ void OnboardingController::processResultRequest(WiFiClient &client, String &requ
     }
 
     // store the settings in EEPROM
-    assert(ssid.getLength() != 0 && password.getLength() != 0);
+    assert(ssid.getLength() != 0);
     ConfigController::storeWiFi(ssid, password);
 
     assert(connStr.getLength() != 0);

diff --git a/AZ3166/src/telemetry.cpp b/AZ3166/src/telemetry.cpp
@@ -117,7 +117,7 @@ void TelemetryController::loop() {
 
         // SEND EVENT example
         // build the event payload
-        const char * eventString = "{\"ButtonBPressed\": 1}";
+        const char * eventString = "{\"ButtonBPressed\": \"occurred\"}";
         if (iothubClient->sendTelemetry(eventString)) {
             LOG_VERBOSE("Event successfully sent");
             StatsController::incrementReportedCount();