Update API (Ameba-AIoT#286)

- Fix warning issue
- Add audio deinit and sd gpio deinit function after playing mp3

Author: kevinlookl

Arduino_package/hardware/libraries/FileSystem/src/AmebaFatFS.cpp

@@ -35,6 +35,7 @@ void AmebaFatFS::end(void)
     fatfs_sd_close();
     memset(&fatfs_sd, 0, sizeof(fatfs_sd_params_t));
     fatfs_sd.drv_num = -1;
+    sd_gpio_deinit();
 }
 
 File AmebaFatFS::open(const String &path)

Arduino_package/hardware/libraries/Multimedia/src/helix_mp3_drv.c

@@ -75,6 +75,8 @@ void audio_play_binary_array(uint8_t *srcbuf, uint32_t len)
         }
     }
 
+    audio_deinit(&g_taudio);
+    printf("audio deinitialized\r\n");
     printf("decoding finished\r\n");
 }
 

Arduino_package/hardware/libraries/NeuralNetwork/examples/GenAIVision/GenAIVision.ino

@@ -46,7 +46,7 @@ void initWiFi()
         Serial.print("Connecting to ");
         Serial.println(wifi_ssid);
 
-        long int StartTime = millis();
+        uint32_t StartTime = millis();
         while (WiFi.status() != WL_CONNECTED) {
             delay(500);
             if ((StartTime + 5000) < millis()) {
@@ -59,7 +59,6 @@ void initWiFi()
             Serial.println("STAIP address: ");
             Serial.println(WiFi.localIP());
             Serial.println("");
-
             break;
         }
     }
@@ -83,10 +82,10 @@ void setup()
     Camera.getImage(0, &img_addr, &img_len);
 
     // openAI vision prompt
-    llm.openaivision(openAI_key, prompt_msg, img_addr, img_len, client);
+    // llm.openaivision(openAI_key, prompt_msg, img_addr, img_len, client);
 
     // Gemini vision prompt
-    // llm.geminivision(Gemini_key, prompt_msg, img_addr, img_len, client);
+    llm.geminivision(Gemini_key, prompt_msg, img_addr, img_len, client);
 
     // Llama vision prompt
     // llm.llamavision(Llama_key, prompt_msg, img_addr, img_len, client);

Arduino_package/hardware/libraries/NeuralNetwork/src/NNGenAIVision.cpp

@@ -20,12 +20,12 @@ void NNGenAIVision::openaivision(String key, String message, uint32_t img_addr,
         Serial.println("Connection successful");
 
         uint8_t *fbBuf = (uint8_t *)img_addr;
-        size_t fbLen = img_len;
+        uint32_t fbLen = img_len;
 
         char *input = (char *)fbBuf;
         char output[base64_enc_len(3)];
         String imageFile = "data:image/jpeg;base64,";
-        for (int i = 0; i < fbLen; i++) {
+        for (uint32_t i = 0; i < fbLen; i++) {
             base64_encode(output, (input++), 3);
             if (i % 3 == 0) {
                 imageFile += String(output);
@@ -41,13 +41,13 @@ void NNGenAIVision::openaivision(String key, String message, uint32_t img_addr,
         client.println("Connection: close");
         client.println();
 
-        int Index;
+        unsigned int Index;
         for (Index = 0; Index < Data.length(); Index = Index + 1024) {
             client.print(Data.substring(Index, Index + 1024));
         }
 
-        int waitTime = 10000;
-        long startTime = millis();
+        uint32_t waitTime = 10000;
+        uint32_t startTime = millis();
         boolean state = false;
         boolean markState = false;
         while ((startTime + waitTime) > millis()) {
@@ -79,7 +79,7 @@ void NNGenAIVision::openaivision(String key, String message, uint32_t img_addr,
         client.stop();
 
         JsonObject obj;
-        DynamicJsonDocument doc(4096);
+        JsonDocument doc;
         deserializeJson(doc, Feedback);
         obj = doc.as<JsonObject>();
         getResponse = obj["choices"][0]["message"]["content"].as<String>();
@@ -103,11 +103,11 @@ void NNGenAIVision::geminivision(String key, String message, uint32_t img_addr,
         Serial.println("Connection successful");
 
         uint8_t *fbBuf = (uint8_t *)img_addr;
-        size_t fbLen = img_len;
+        uint32_t fbLen = img_len;
         char *input = (char *)fbBuf;
         char output[base64_enc_len(3)];
         String imageFile = "";
-        for (int i = 0; i < fbLen; i++) {
+        for (uint32_t i = 0; i < fbLen; i++) {
             base64_encode(output, (input++), 3);
             if (i % 3 == 0) {
                 imageFile += String(output);
@@ -123,13 +123,13 @@ void NNGenAIVision::geminivision(String key, String message, uint32_t img_addr,
         client.println("Connection: close");
         client.println();
 
-        int Index;
+        unsigned int Index;
         for (Index = 0; Index < Data.length(); Index = Index + 1024) {
             client.print(Data.substring(Index, Index + 1024));
         }
 
-        int waitTime = 10000;
-        long startTime = millis();
+        uint32_t waitTime = 10000;
+        uint32_t startTime = millis();
         boolean state = false;
         boolean markState = false;
         while ((startTime + waitTime) > millis()) {
@@ -161,7 +161,7 @@ void NNGenAIVision::geminivision(String key, String message, uint32_t img_addr,
         client.stop();
 
         JsonObject obj;
-        DynamicJsonDocument doc(4096);
+        JsonDocument doc;
         deserializeJson(doc, Feedback);
         obj = doc.as<JsonObject>();
         getResponse = obj["candidates"][0]["content"]["parts"][0]["text"].as<String>();
@@ -185,12 +185,12 @@ void NNGenAIVision::llamavision(String key, String message, uint32_t img_addr, u
         Serial.println("Connection successful");
 
         uint8_t *fbBuf = (uint8_t *)img_addr;
-        size_t fbLen = img_len;
+        uint32_t fbLen = img_len;
 
         char *input = (char *)fbBuf;
         char output[base64_enc_len(3)];
         String imageFile = "data:image/jpeg;base64,";
-        for (int i = 0; i < fbLen; i++) {
+        for (uint32_t i = 0; i < fbLen; i++) {
             base64_encode(output, (input++), 3);
             if (i % 3 == 0) {
                 imageFile += String(output);
@@ -206,13 +206,13 @@ void NNGenAIVision::llamavision(String key, String message, uint32_t img_addr, u
         client.println("Connection: close");
         client.println();
 
-        int Index;
+        unsigned int Index;
         for (Index = 0; Index < Data.length(); Index = Index + 1024) {
             client.print(Data.substring(Index, Index + 1024));
         }
 
-        int waitTime = 10000;
-        long startTime = millis();
+        uint32_t waitTime = 10000;
+        uint32_t startTime = millis();
         boolean state = false;
         boolean markState = false;
         while ((startTime + waitTime) > millis()) {
@@ -244,7 +244,7 @@ void NNGenAIVision::llamavision(String key, String message, uint32_t img_addr, u
         client.stop();
 
         JsonObject obj;
-        DynamicJsonDocument doc(4096);
+        JsonDocument doc;
         deserializeJson(doc, Feedback);
         obj = doc.as<JsonObject>();
         getResponse = obj["choices"][0]["message"]["content"].as<String>();