add more size to username password and fix some annoyances

dycodex · Nov 25, 2018 · 6c91a94 · 6c91a94
1 parent 6c99895
commit 6c91a94
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/esp_sara_at.c b/esp_sara_at.c
@@ -250,7 +250,7 @@ esp_err_t esp_sara_set_clean_session(bool session)
 
 esp_err_t esp_sara_set_mqtt_auth(const char *username, const char *password)
 {
-    char cmd[64];
+    char cmd[128];
     int len = sprintf(cmd, "AT+UMQTT=4,\"%s\",\"%s\"\r\n", username, password);
     return esp_sara_send_at_command(cmd, len, 1000);
 }

diff --git a/esp_sara_nbiot.c b/esp_sara_nbiot.c
@@ -31,7 +31,8 @@ typedef enum
 typedef enum
 {
     SARA_MQTT_DISCONNECTED = 0,
-    SARA_MQTT_CONNECTED
+    SARA_MQTT_CONNECTED,
+    SARA_MQTT_CONNECTING
 } esp_sara_mqtt_state_t;
 
 typedef enum
@@ -346,9 +347,17 @@ static void esp_sara_event_task(void *param)
 
                 if (result == 0)
                     esp_sara_get_mqtt_error();
-        
+
                 switch (op)
                 {
+                case SARA_UMQTTC_OP_LOGIN:
+                {
+                    if (result)
+                    {
+                        client->mqtt_state = SARA_MQTT_CONNECTING;
+                    }
+                }
+                break;
                 case SARA_UMQTTC_OP_PUBLISH:
                 {
                     if (result)
@@ -358,7 +367,6 @@ static void esp_sara_event_task(void *param)
                     else
                     {
                         event.event_id = SARA_EVENT_PUBLISH_FAILED;
-                        esp_sara_get_mqtt_error();
                     }
                     should_callback = true;
                 }
@@ -381,8 +389,8 @@ static void esp_sara_event_task(void *param)
                 {
                     if (result == 0)
                     {
-                        esp_sara_logout_mqtt(client);
-                        esp_sara_login_mqtt(client);
+                        //esp_sara_logout_mqtt(client);
+                        //esp_sara_login_mqtt(client);
                     }
                 }
                 break;
@@ -451,7 +459,7 @@ static void esp_sara_event_task(void *param)
                 *(int *)(event.payload + 4) = supl_err;
 
                 event.payload_size = 2 * sizeof(int);
-
+                event.event_id = SARA_EVENT_MQTT_ERR;
                 should_callback = err != 0;
             }
             else if (strstr(ch, "+CME ERROR:") != NULL)

diff --git a/include/esp_sara_mqtt_err.h b/include/esp_sara_mqtt_err.h
@@ -0,0 +1,6 @@
+#ifndef ESP_SARA_MQTT_ERR_H
+#define ESP_SARA_MQTT_ERR_H
+
+
+
+#endif