From ef1289736b2b35243ef827cc5f299f360c64283a Mon Sep 17 00:00:00 2001 From: PaulVua Date: Mon, 20 Jan 2025 17:49:29 +0100 Subject: [PATCH] update --- SARA/sara_setURL_uSpot_noSSL.py | 110 ++++++++++++++++++++++++ loop/1_NPM/send_data.py | 145 ++++++++++++++------------------ 2 files changed, 172 insertions(+), 83 deletions(-) create mode 100644 SARA/sara_setURL_uSpot_noSSL.py diff --git a/SARA/sara_setURL_uSpot_noSSL.py b/SARA/sara_setURL_uSpot_noSSL.py new file mode 100644 index 0000000..4c37f42 --- /dev/null +++ b/SARA/sara_setURL_uSpot_noSSL.py @@ -0,0 +1,110 @@ +''' +Script to set the URL for a HTTP request +Ex: +/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/sara_setURL_uSpot_noSSL.py ttyAMA2 api-prod.uspot.probesys.net +To do: need to add profile id as parameter + +First profile id: + AT+UHTTP=0,1,"data.nebuleair.fr" +Second profile id: + AT+UHTTP=1,1,"api-prod.uspot.probesys.net" +''' + +import serial +import time +import sys +import json + +parameter = sys.argv[1:] # Exclude the script name +#print("Parameters received:") +port='/dev/'+parameter[0] # ex: ttyAMA2 +url = parameter[1] # ex: data.mobileair.fr + + +profile_id = 1 + + +def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2): + response = bytearray() + serial_connection.timeout = timeout + end_time = time.time() + end_of_response_timeout + + while True: + if serial_connection.in_waiting > 0: + data = serial_connection.read(serial_connection.in_waiting) + response.extend(data) + end_time = time.time() + end_of_response_timeout # Reset timeout on new data + elif time.time() > end_time: + break + time.sleep(0.1) # Short sleep to prevent busy waiting + + return response.decode('utf-8', errors='replace') + +#get baudrate +def load_config(config_file): + try: + with open(config_file, 'r') as file: + config_data = json.load(file) + return config_data + except Exception as e: + print(f"Error loading config file: {e}") + return {} + +# Define the config file path +config_file = '/var/www/nebuleair_pro_4g/config.json' +# Load the configuration data +config = load_config(config_file) +# Access the shared variables +baudrate = config.get('SaraR4_baudrate', 115200) + +ser_sara = serial.Serial( + port=port, #USB0 or ttyS0 + baudrate=baudrate, #115200 ou 9600 + parity=serial.PARITY_NONE, #PARITY_NONE, PARITY_EVEN or PARITY_ODD + stopbits=serial.STOPBITS_ONE, + bytesize=serial.EIGHTBITS, + timeout = 2 +) + + + +print("****") +print("SET URL (SARA)") + +try: + #step 1: set url (op_code = 1) + print("****") + print("SET URL") + command = f'AT+UHTTP={profile_id},1,"{url}"\r' + ser_sara.write((command + '\r').encode('utf-8')) + response_SARA_5 = read_complete_response(ser_sara) + print(response_SARA_5) + time.sleep(1) + + #step 2: set url to SSL (op_code = 6) (http_secure = 1 for HTTPS and 0 for HTTP)(USECMNG_PROFILE = 2) + print("****") + print("SET SSL") + command = f'AT+UHTTP={profile_id},6,0\r' + ser_sara.write(command.encode('utf-8')) + response_SARA_5 = read_complete_response(ser_sara) + print(response_SARA_5) + time.sleep(1) + + #step 3: set PORT (op_code = 5) + print("****") + print("SET PORT") + command = f'AT+UHTTP={profile_id},5,81\r' + ser_sara.write((command + '\r').encode('utf-8')) + response_SARA_55 = read_complete_response(ser_sara) + print(response_SARA_55) + time.sleep(1) + +except serial.SerialException as e: + print(f"Error: {e}") + +finally: + if ser_sara.is_open: + ser_sara.close() + print("****") + #print("Serial closed") + diff --git a/loop/1_NPM/send_data.py b/loop/1_NPM/send_data.py index d3768f8..44767c5 100755 --- a/loop/1_NPM/send_data.py +++ b/loop/1_NPM/send_data.py @@ -501,107 +501,86 @@ try: ''' if send_uSpot: print(">>>>>>>>") - print("SEND TO MICRO SPOT:") + print(">>>>>>>>") + print(">>>>>>>>") + print("SEND TO MICRO SPOT (HTTP):") + profile_id = 1 + + #step 4: set url (op_code = 1) + print("****") + print("SET URL") + command = f'AT+UHTTP={profile_id},1,"api-prod.uspot.probesys.net"\r' + ser_sara.write((command + '\r').encode('utf-8')) + response_SARA_5 = read_complete_response(ser_sara, wait_for_line="OK") + print(response_SARA_5) + time.sleep(1) + + #step 4: set url to SSL (op_code = 6) (http_secure = 1 for HTTPS)(USECMNG_PROFILE = 2) + print("****") + print("SET SSL") + command = f'AT+UHTTP={profile_id},6,0\r' + ser_sara.write(command.encode('utf-8')) + response_SARA_5 = read_complete_response(ser_sara, wait_for_line="OK") + print(response_SARA_5) + time.sleep(1) + + #step 4: set PORT (op_code = 5) + print("****") + print("SET PORT") + command = f'AT+UHTTP={profile_id},5,81\r' + ser_sara.write((command + '\r').encode('utf-8')) + response_SARA_55 = read_complete_response(ser_sara, wait_for_line="OK") + print(response_SARA_55) + time.sleep(1) - payload_string = json.dumps(payload_json) # Convert dict to JSON string # Write Data to saraR4 - # 1. Open sensordata_csv.json (with correct data size) + + + # 1. Open sensordata_json.json (with correct data size) + print("Open JSON:") + payload_string = json.dumps(payload_json) # Convert dict to JSON string size_of_string = len(payload_string) command = f'AT+UDWNFILE="sensordata_json.json",{size_of_string}\r' ser_sara.write((command + '\r').encode('utf-8')) - response_SARA_1 = read_complete_response(ser_sara) - print("Open JSON:") + response_SARA_1 = read_complete_response(ser_sara, wait_for_line=">") print(response_SARA_1) time.sleep(1) #2. Write to shell + print("Write to memory:") ser_sara.write(payload_string.encode()) - response_SARA_2 = read_complete_response(ser_sara) - if need_to_log: - print("Write 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) - command= f'AT+UHTTPC=1,4,"nebuleair?token=2AFF6dQk68daFZ","server_response2.txt","sensordata_json.json",4\r' - ser_sara.write((command + '\r').encode('utf-8')) - response_SARA_3 = read_complete_response(ser_sara) - - print("Send data:") - print(response_SARA_3) + #step 4: trigger the request (http_command=1 for GET and http_command=1 for POST) + print("****") + print("Trigger POST REQUEST") + command = f'AT+UHTTPC={profile_id},4,"/nebuleair?token=2AFF6dQk68daFZ","http.resp","sensordata_json.json",4\r' + ser_sara.write(command.encode('utf-8')) - lines = response_SARA_3.strip().splitlines() + + response_SARA_3 = read_complete_response(ser_sara, timeout=5, end_of_response_timeout=30, wait_for_line="+UUHTTPCR") + print('

') + print(response_SARA_3) + print("

") - # 1.Vérifier si la réponse contient un message d'erreur CME - if "+CME ERROR" in lines[-1]: - print("*****") - print('ATTENTION: CME ERROR') - print("error:", lines[-1]) - print("*****") - #update status - update_json_key(config_file, "SARA_R4_network_status", "disconnected") + #READ REPLY + print("****") + print("Read reply from server") + ser_sara.write(b'AT+URDFILE="http.resp"\r') + response_SARA_7 = read_complete_response(ser_sara, wait_for_line="OK") + print('

') + print(response_SARA_7) + print('

') - # Gestion de l'erreur spécifique - if "No connection to phone" in lines[-1]: - print("No connection to the phone. Retrying or reset may be required.") - # Actions spécifiques pour ce type d'erreur (par exemple, réinitialiser ou tenter de reconnecter) - # need to reconnect to network - # and reset HTTP profile (AT+UHTTP=0) -> ne fonctionne pas.. - # tester un reset avec CFUN 15 - # 1.Reconnexion au réseau (AT+COPS) - command = f'AT+COPS=1,2,"{selected_networkID}"\r' - ser_sara.write((command + '\r').encode('utf-8')) - responseReconnect = read_complete_response(ser_sara) - print("Response reconnect:") - print(responseReconnect) - print("End response reconnect") - - elif "Operation not allowed" in lines[-1]: - print("Operation not allowed. This may require a different configuration.") - # Actions spécifiques pour ce type d'erreur - - 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 - http_response = lines[-1] # "+UUHTTPCR: 0,4,0" - parts = http_response.split(',') - - # 2.1 code 0 (HTTP failed) - if len(parts) == 3 and parts[-1] == '0': # The third value indicates success - print("*****") - print('ATTENTION: HTTP operation failed') - print("*****") - - - # 2.2 code 1 (HHTP succeded) - else: - # Si la commande HTTP a réussi - print('HTTP operation successful.') - update_json_key(config_file, "SARA_R4_network_status", "connected") - print("Turning on the blue LED...") - for _ in range(4): # Faire clignoter 4 fois - GPIO.output(23, GPIO.HIGH) # Allumer la LED - time.sleep(0.1) # Attendre 100 ms - 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 - ser_sara.write(b'AT+URDFILE="server_response2.txt"\r') - response_SARA_4 = read_complete_response(ser_sara) - if need_to_log: - print("Reply from server:") - print('

') - print(response_SARA_4) - print('

') #5. empty json + print("Empty SARA memory:") ser_sara.write(b'AT+UDELFILE="sensordata_json.json"\r') - response_SARA_5 = read_complete_response(ser_sara) - if need_to_log: - print("Empty JSON:") - print(response_SARA_5) + response_SARA_8 = read_complete_response(ser_sara, wait_for_line="OK") + print(response_SARA_8) +