update

loop/SARA_send_data_v2.py

@@ -220,6 +220,7 @@ wind_meter= config.get('windMeter/read.py', False)
 
 send_aircarto = config.get('send_aircarto', True)                   #envoi sur AirCarto (data.nebuleair.fr)
 send_uSpot = config.get('send_uSpot', False)                        #envoi sur MicroSpot ()
+reset_uSpot_url = False
 selected_networkID = int(config.get('SARA_R4_neworkID', 0))
 npm_5channel = config.get('NextPM_5channels', False)                #5 canaux du NPM
 
@@ -587,10 +588,9 @@ try:
             led_thread.start()
 
         else:
-        # 2.Si la réponse contient une réponse HTTP valide
-        # Extract HTTP response code from the last line
-        # ATTENTION: lines[-1] renvoie l'avant dernière ligne et il peut y avoir un soucis avec le OK
-        # rechercher plutot 
+        # 2.Si la réponse contient une réponse UUHTTPCR
+        # Extract UUHTTPCR response code from the last line
+
             http_response = lines[-1]  # "+UUHTTPCR: 0,4,0"
             parts = http_response.split(',')
 
@@ -629,7 +629,8 @@ try:
                 73  Secure socket connect error
                 '''
 
-                #Essayer un reboot du SARA R4
+                #Reboot du SARA R4
+                #ATTENTION: sur le SARA R5 la commande renvoie une erreur
                 print('<span style="color: orange;font-weight: bold;">🔄SARA reboot!🔄</span>')
                 command = f'AT+CFUN=15\r'
                 ser_sara.write(command.encode('utf-8'))    
@@ -638,6 +639,8 @@ try:
                 print(response_SARA_9r)
                 print("</p>")
 
+                reset_uSpot_url = True
+
                 print("Sleep 10 secs before continuing")
                 time.sleep(10)
 
@@ -651,14 +654,14 @@ try:
                 print("</p>", end="")
 
 
-            # 2.2 code 1 (HHTP succeded)
+            # 2.2 code 1 (✅✅HHTP / UUHTTPCR succeded✅✅)
             else:
-                # Si la commande HTTP a réussi 
                 print('<span style="font-weight: bold;">✅✅HTTP operation successful.</span>')
                 update_json_key(config_file, "SARA_R4_network_status", "connected")
                 print("Blink blue LED")
                 led_thread = Thread(target=blink_led, args=(23, 5, 0.5))
                 led_thread.start()
+
                 #4. Read reply from server   
                 print("Reply from server:")                                                                         
                 ser_sara.write(b'AT+URDFILE="aircarto_server_response.txt"\r')              
@@ -797,6 +800,72 @@ try:
     if send_uSpot:
         print('➡️<p class="fw-bold">SEND TO uSPOT SERVERS</p>')
 
+        if reset_uSpot_url:
+            #2. Set uSpot URL (profile id = 1)
+            print('➡️Set uSpot URL')
+            uSpot_profile_id = 1
+            uSpot_url="api-prod.uspot.probesys.net"
+            security_profile_id = 1
+
+            #step 1: import the certificate
+            print("****")
+            certificate_name = "e6"
+            with open("/var/www/nebuleair_pro_4g/SARA/SSL/certificate/e6.pem", "rb") as cert_file:
+                certificate = cert_file.read()
+            size_of_string = len(certificate)
+
+            print("\033[0;33m Import certificate\033[0m")
+            # AT+USECMNG=0,<type>,<internal_name>,<data_size>
+            # type-> 0 -> trusted root CA
+            command = f'AT+USECMNG=0,0,"{certificate_name}",{size_of_string}\r'
+            ser_sara.write((command + '\r').encode('utf-8'))
+            response_SARA_1 = read_complete_response(ser_sara)
+            print(response_SARA_1)
+
+            time.sleep(0.5)
+
+            print("\033[0;33mAdd certificate\033[0m")
+            ser_sara.write(certificate)
+            response_SARA_2 = read_complete_response(ser_sara)
+            print(response_SARA_2)
+
+            time.sleep(0.5)
+
+            # SECURITY PROFILE
+                # op_code:  3 -> trusted root certificate internal name
+            print("\033[0;33mSet the security profile (choose cert)\033[0m")
+            command = f'AT+USECPRF={security_profile_id},3,"{certificate_name}"\r'
+            ser_sara.write((command + '\r').encode('utf-8'))
+            response_SARA_5c = read_complete_response(ser_sara, wait_for_lines=["OK"])
+            print(response_SARA_5c)
+            time.sleep(0.5)
+
+            #step 4: set url (op_code = 1)
+            command = f'AT+UHTTP={uSpot_profile_id},1,"{uSpot_url}"\r'
+            ser_sara.write(command.encode('utf-8'))
+            response_SARA_2 = read_complete_response(ser_sara, wait_for_lines=["OK"])
+            print(response_SARA_2)
+            time.sleep(1)
+
+            #step 4: set PORT (op_code = 5)
+            print("set port 443")
+            command = f'AT+UHTTP={uSpot_profile_id},5,443\r'
+            ser_sara.write((command + '\r').encode('utf-8'))
+            response_SARA_55 = read_complete_response(ser_sara, wait_for_lines=["OK"])
+            print(response_SARA_55)
+            time.sleep(1)
+
+            #step 4: set url to SSL (op_code = 6) (http_secure = 1 for HTTPS)(USECMNG_PROFILE = 2)
+            print("\033[0;33mSET SSL\033[0m")
+            http_secure = 1
+            command = f'AT+UHTTP={uSpot_profile_id},6,{http_secure},{security_profile_id}\r'
+            #command = f'AT+UHTTP={profile_id},6,{http_secure}\r'
+
+            ser_sara.write(command.encode('utf-8'))
+            response_SARA_5 = read_complete_response(ser_sara, wait_for_lines=["OK"])
+            print(response_SARA_5)
+            time.sleep(1)
+
         # 1. Open sensordata_json.json (with correct data size)
         print("Open JSON:")
         payload_string = json.dumps(payload_json)  # Convert dict to JSON string