Add Class OTA (Ameba-AIoT#274)

* Add Class OTA

- Update API: change header OTA to Class OTA

* Update ota_drv.c

- removed default server port and ip address

Author: kevinlookl

Arduino_package/hardware/libraries/OTA/examples/OTA/OTA.ino

@@ -1,11 +1,16 @@
-#include "ota_thread.h"
+#include "OTA.h"
 #include "WiFi.h"
 
 
-char ssid[] = "Network_SSID";    // your network SSID (name)
-char pass[] = "Password";        // your network password
+char ssid[] = "Network_SSID5";    // your network SSID (name)
+char pass[] = "Password";         // your network password
 int status = WL_IDLE_STATUS;
 
+int port = 3000;                  // your server port number
+char* server = "192.168.3.14";    // your server ip address
+
+OTA ota;
+
 void setup()
 {
     Serial.begin(115200);
@@ -19,7 +24,7 @@ void setup()
     }
 
     // Set up the threads
-    start_OTA_threads();
+    ota.start_OTA_threads(port, server);
 }
 
 void loop()

Arduino_package/hardware/libraries/OTA/src/ota_thread.cpp renamed to Arduino_package/hardware/libraries/OTA/src/OTA.cpp

@@ -1,7 +1,7 @@
 #define ARDUINOJSON_STRING_LENGTH_SIZE_4
 
 #include <Arduino.h>
-#include "ota_thread.h"
+#include "OTA.h"
 #include <WiFi.h>
 #include <ArduinoJson.h>
 
@@ -16,17 +16,20 @@ char buffer[1024];
 uint32_t thread1_id, thread2_id, thread3_id, stack_size1, stack_size2;
 int priority1;
 
+OTA::OTA(){};
 
-void sendPostRequest()
+OTA::~OTA(){};
+
+void OTA::sendPostRequest()
 {
     doc["OTA_state"] = g_otaState;
     serializeJson(doc, jsonString);
     WiFiClient wifiClient;
 
-    if (wifiClient.connect(server, PORT)) {
+    if (wifiClient.connect(_server, _port)) {
         // Send POST request
         wifiClient.println("POST /api/connectedclients HTTP/1.1");
-        wifiClient.println("Host: " + String(server));
+        wifiClient.println("Host: " + String(_server));
         wifiClient.println("Content-Type: application/json");                    // Use appropriate content type
         wifiClient.println("Content-Length: " + String(jsonString.length()));    // Specify the length of the content
         wifiClient.println("Connection: keep-alive");
@@ -40,14 +43,14 @@ void sendPostRequest()
     delay(3000);
 }
 
-void thread1_task(const void *argument)
+void OTA::thread1_task(const void *argument)
 {
     while (1) {
         sendPostRequest();
     }
 }
 
-void thread2_task(const void *argument)
+void OTA::thread2_task(const void *argument)
 {
     WiFiServer server(5000);
     server.begin();
@@ -79,8 +82,10 @@ void thread2_task(const void *argument)
 }
 
 
-void start_OTA_threads()
+void OTA::start_OTA_threads(int port, char *server)
 {
+    _port = port;
+    _server = server;
     priority1 = osPriorityNormal;
     stack_size1 = 1024;
     thread1_id = os_thread_create_arduino(thread1_task, NULL, priority1, stack_size1);

Arduino_package/hardware/libraries/OTA/src/OTA.h

@@ -0,0 +1,23 @@
+#ifndef OTA_H
+#define OTA_H
+
+#include <Arduino.h>
+#include <httpd/httpd.h>
+#include <WiFi.h>
+
+class OTA {
+public:
+    OTA(void);
+    ~OTA(void);
+
+    // To start OTA firmware update process via HTTP
+    void start_OTA_threads(int port, char *server);
+
+
+private:
+    static void thread1_task(const void *argument);
+    static void thread2_task(const void *argument);
+
+    static void sendPostRequest();
+};
+#endif    // OTA_H

Arduino_package/hardware/libraries/OTA/src/ota_drv.c

@@ -5,8 +5,8 @@
 #include <ota_8735b.h>
 #include "ota_drv.h"
 
-const int PORT = 3000;                      // MODIFY THIS FOR YOUR HTTP SERVER PORT
-const char *server = "192.168.3.4";         // MODIFY THIS FOR YOUR HTTP SERVER IP ADDRESS
+int _port;
+char *_server;
 const char *resource = "api/uploadfile";    // DO NOT MODIFY
 
 
@@ -26,7 +26,7 @@ void http_update_ota_task(void *param)
 
     g_otaState = OtaState[2];
 
-    ret = http_update_ota((char *)server, PORT, (char *)resource);
+    ret = http_update_ota((char *)_server, _port, (char *)resource);
 
     g_otaState = OtaState[3];
 

Arduino_package/hardware/libraries/OTA/src/ota_drv.h

@@ -1,7 +1,7 @@
 #pragma once
 
-extern const int PORT;
-extern const char *server;
+extern int _port;
+extern char *_server;
 extern const char *resource;
 
 extern const char *OtaState[];