Changeset 459 for azure_iot_hub_riscv/trunk/app_iothub_client/src/esp_at_socket.c

Timestamp:

Sep 25, 2020, 7:28:35 PM (4 years ago)

Author:

coas-nagasima

Message:

Azure IoT への送信内容を、検出したpersonとcarの数を送信するよう変更。
Azure IoT CentralからLEDのON/OFFが出来るよう更新。

File:

• azure_iot_hub_riscv/trunk/app_iothub_client/src/esp_at_socket.c (modified) (10 diffs)

azure_iot_hub_riscv/trunk/app_iothub_client/src/esp_at_socket.c

@@ -61 +61 @@
 #include "azure_c_shared_utility/optimize_size.h"
 
+#ifdef _MSC_VER
+extern int sprintf_s(char* dst, size_t dstSizeInBytes, const char* format, ...);
+#endif // _MSC_VER
+
 //#define AT_DEBUG
 time_t MINIMUM_YEAR;
@@ -306 +310 @@
 {
         struct tm tm = {
-                0,  /* tm_sec */
-                0,  /* tm_min */
-                0,  /* tm_hour */
-                1,  /* tm_mday */
-                0,  /* tm_mon */
-                2020 - 1900,  /* tm_year */
+        0,  /* tm_sec */
+        0,  /* tm_min */
+        0,  /* tm_hour */
+        1,  /* tm_mday */
+        0,  /* tm_mon */
+        2020 - 1900,  /* tm_year */
         };
         MINIMUM_YEAR = mktime(&tm);
@@ -426 +430 @@
                                 return false;
                         }
+#ifdef AT_DEBUG
+                        else{
+                                append_char(esp_state, '\0');
+                                printf("\"%s\"\r\n", esp_state->string);
+                        }
+#endif
                 }
                 else if (isalpha(c) || isdigit(c) || c == ' ') {
@@ -432 +442 @@
                         return false;
                 }
+#ifdef AT_DEBUG
+                else{
+                        append_char(esp_state, '\0');
+                        printf("\"%s\"\r\n", esp_state->string);
+                }
+#endif
                 break;
         case at_link_id:
@@ -634 +650 @@
 #ifdef AT_DEBUG
         if (esp_state->parse_state != at_none)
-                printf("\033[35mparse error. state:%d\033[0m\r\n", esp_state->parse_state);
+                printf("\033[35mparse error. state:%d, char:%d\033[0m\r\n", esp_state->parse_state, c);
 #endif
         esp_state->parse_state = at_none;
@@ -1487 +1503 @@
                 }
 
-                sprintf(temp, "AT+CWJAP=\"%s\",\"%s\"\r\n", esp_state->ssid, esp_state->pwd);
+                sprintf_s(temp, sizeof(temp), "AT+CWJAP=\"%s\",\"%s\"\r\n", esp_state->ssid, esp_state->pwd);
                 ret = esp_serial_write(esp_state, temp, &res_kind, 20000);
                 if ((ret != E_OK) || (res_kind != at_response_kind_ok)) {
@@ -1495 +1511 @@
                 esp_state->esp_state = esp_state_update_time;
         case esp_state_update_time:
-                sprintf(temp, "AT+CIPSNTPCFG=%d,%d,\"%s\"\r\n", 1, 9, "ntp.nict.jp");
+                sprintf_s(temp, sizeof(temp), "AT+CIPSNTPCFG=%d,%d,\"%s\"\r\n", 1, 9, "ntp.nict.jp");
                 ret = esp_serial_write(esp_state, temp, &res_kind, 10000);
                 if ((ret != E_OK) || (res_kind != at_response_kind_ok)) {
@@ -1591 +1607 @@
 
         ER ret;
-        char temp[64];
-        sprintf(temp, "AT+CIPSTART=%d,\"%s\",\"%s\",%d\r\n", connection->link_id, connection->ssl, host, port);
+        char temp[128];
+        sprintf_s(temp, sizeof(temp), "AT+CIPSTART=%d,\"%s\",\"%s\",%d\r\n", connection->link_id, connection->ssl, host, port);
         ret = esp_serial_write(connection->esp_state, temp, &res_kind, 10000);
         if ((ret != E_OK) || (res_kind != at_response_kind_connect)) {
@@ -1630 +1646 @@
         ER ret;
         char temp[64];
-        sprintf(temp, "AT+CIPCLOSE=%d\r\n", connection->link_id);
+        sprintf_s(temp, sizeof(temp), "AT+CIPCLOSE=%d\r\n", connection->link_id);
         ret = esp_serial_write(connection->esp_state, temp, &res_kind, 10000);
         if (ret == E_OK) {
@@ -1656 +1672 @@
         ER ret;
         char temp[64];
-        sprintf(temp, "AT+CIPSEND=%d,%d\r\n", connection->link_id, length);
+        sprintf_s(temp, sizeof(temp), "AT+CIPSEND=%d,%d\r\n", connection->link_id, length);
         ret = esp_serial_write(connection->esp_state, temp, &res_kind, 10000);
         if ((ret != E_OK) || (res_kind != at_response_kind_ok)) {