From 97efee906dc76bb7c72eac4cab36006ee8f80fbe Mon Sep 17 00:00:00 2001
From: PaulVua <you@example.com>
Date: Mon, 20 Jan 2025 16:38:58 +0100
Subject: [PATCH] update

---
 loop/1_NPM/send_data.py | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/loop/1_NPM/send_data.py b/loop/1_NPM/send_data.py
index c574041..d3768f8 100755
--- a/loop/1_NPM/send_data.py
+++ b/loop/1_NPM/send_data.py
@@ -331,7 +331,7 @@ try:
     # Getting the LTE Signal
     print("-> Getting LTE signal <-")
     ser_sara.write(b'AT+CSQ\r')
-    response2 = read_complete_response(ser_sara)
+    response2 = read_complete_response(ser_sara, wait_for_line="OK")
     print('<p class="text-danger-emphasis">')
     print(response2)
     print("</p>")
@@ -352,27 +352,25 @@ try:
     # 1. Open sensordata_csv.json (with correct data size)
     csv_string = ','.join(str(value) if value is not None else '' for value in payload_csv)
     size_of_string = len(csv_string)
+    print("Open JSON:")
     command = f'AT+UDWNFILE="sensordata_csv.json",{size_of_string}\r'
     ser_sara.write(command.encode('utf-8'))
-    response_SARA_1 = read_complete_response(ser_sara)
-    #if need_to_log:        
-        #print("Open JSON:")
-        #print(response_SARA_1)
+    response_SARA_1 = read_complete_response(ser_sara, wait_for_line=">")
+    print(response_SARA_1)
     time.sleep(1)
 
     #2. Write to shell
+    print("Write data to memory:")
     ser_sara.write(csv_string.encode())
-    response_SARA_2 = read_complete_response(ser_sara)
-    if need_to_log:        
-        print("Write data to memory:")
-        print(response_SARA_2)
+    response_SARA_2 = read_complete_response(ser_sara, wait_for_line="OK")
+    print(response_SARA_2)
 
     #3. Send to endpoint (with device ID)
     print("Send data (POST REQUEST):")
     command= f'AT+UHTTPC=0,4,"/pro_4G/data.php?sensor_id={device_id}","server_response.txt","sensordata_csv.json",4\r'                                                                                            
     ser_sara.write(command.encode('utf-8'))
 
-    response_SARA_3 = read_complete_response(ser_sara, timeout=5, end_of_response_timeout=10, wait_for_line="+UUHTTPCR")
+    response_SARA_3 = read_complete_response(ser_sara, timeout=5, end_of_response_timeout=30, wait_for_line="+UUHTTPCR")
 
     print('<p class="text-danger-emphasis">')
     print(response_SARA_3)
@@ -482,21 +480,21 @@ try:
                     GPIO.output(23, GPIO.LOW)  # Éteindre la LED
                     time.sleep(0.1)  # Attendre 100 ms
                 GPIO.output(23, GPIO.HIGH)  # Turn on the LED
-                #4. Read reply from server                                                                            
+                #4. Read reply from server   
+                print("Reply from server:")                                                                         
                 ser_sara.write(b'AT+URDFILE="server_response.txt"\r')              
-                response_SARA_4 = read_complete_response(ser_sara)
-                if need_to_log:
-                    print("Reply from server:")
-                    print('<p class="text-success">')
-                    print(response_SARA_4)
-                    print('</p>')
+                response_SARA_4 = read_complete_response(ser_sara, wait_for_line="OK")
+                print('<p class="text-success">')
+                print(response_SARA_4)
+                print('</p>')
     else:
         print('<span style="color: red;font-weight: bold;">No UUHTTPCR response</span>')
 
     #5. empty json
     print("Empty SARA memory:")
     ser_sara.write(b'AT+UDELFILE="sensordata_csv.json"\r')
-    response_SARA_5 = read_complete_response(ser_sara)
+    response_SARA_5 = read_complete_response(ser_sara, wait_for_line="OK")
+    print(response_SARA_5)
 
     '''
     SEND TO MICRO SPOT