update

SARA/reboot/start.py

@@ -17,52 +17,96 @@ import time
 import sys
 import json
 import re
+import sqlite3
 
-#get data from config
-def load_config(config_file):
+# database connection
+conn = sqlite3.connect("/var/www/nebuleair_pro_4g/sqlite/sensors.db")
+cursor = conn.cursor()
+
+#get config data from SQLite table
+def load_config_sqlite():
+    """
+    Load configuration data from SQLite config table
+    
+    Returns:
+        dict: Configuration data with proper type conversion
+    """
     try:
-        with open(config_file, 'r') as file:
-            config_data = json.load(file)
+
+        # Query the config table
+        cursor.execute("SELECT key, value, type FROM config_table")
+        rows = cursor.fetchall()
+        
+        # Create config dictionary
+        config_data = {}
+        for key, value, type_name in rows:
+            # Convert value based on its type
+            if type_name == 'bool':
+                config_data[key] = value == '1' or value == 'true'
+            elif type_name == 'int':
+                config_data[key] = int(value)
+            elif type_name == 'float':
+                config_data[key] = float(value)
+            else:
+                config_data[key] = value
+        
         return config_data
+        
     except Exception as e:
-        print(f"Error loading config file: {e}")
+        print(f"Error loading config from SQLite: {e}")
         return {}
 
-#Fonction pour mettre à jour le JSON de configuration
-def update_json_key(file_path, key, value):
+def update_sqlite_config(key, value):
     """
-    Updates a specific key in a JSON file with a new value.
+    Updates a specific key in the SQLite config_table with a new value.
 
-    :param file_path: Path to the JSON file.
-    :param key: The key to update in the JSON file.
+    :param key: The key to update in the config_table.
     :param value: The new value to assign to the key.
     """
     try:
-        # Load the existing data
-        with open(file_path, "r") as file:
-            data = json.load(file)
+
+        # Check if the key exists and get its type
+        cursor.execute("SELECT type FROM config_table WHERE key = ?", (key,))
+        result = cursor.fetchone()
         
-        # Check if the key exists in the JSON file
-        if key in data:
-            data[key] = value  # Update the key with the new value
-        else:
-            print(f"Key '{key}' not found in the JSON file.")
+        if result is None:
+            print(f"Key '{key}' not found in the config_table.")
+            conn.close()
             return
         
-        # Write the updated data back to the file
-        with open(file_path, "w") as file:
-            json.dump(data, file, indent=2)  # Use indent for pretty printing
+        # Get the type of the value from the database
+        value_type = result[0]
         
-        print(f"💾 updating '{key}' to '{value}'.")
+        # Convert the value to the appropriate string representation based on its type
+        if value_type == 'bool':
+            # Convert Python boolean or string 'true'/'false' to '1'/'0'
+            if isinstance(value, bool):
+                str_value = '1' if value else '0'
+            else:
+                str_value = '1' if str(value).lower() in ('true', '1', 'yes', 'y') else '0'
+        elif value_type == 'int':
+            str_value = str(int(value))
+        elif value_type == 'float':
+            str_value = str(float(value))
+        else:
+            str_value = str(value)
+        
+        # Update the value in the database
+        cursor.execute("UPDATE config_table SET value = ? WHERE key = ?", (str_value, key))
+        
+        # Commit the changes and close the connection
+        conn.commit()
+   
+        print(f"💾 Updated '{key}' to '{value}' in database.")
     except Exception as e:
-        print(f"Error updating the JSON file: {e}")
+        print(f"Error updating the SQLite database: {e}")
 
-# Define the config file path
-config_file = '/var/www/moduleair_pro_4g/config.json'
-# Load the configuration data
-config = load_config(config_file)
+#Load config
+config = load_config_sqlite()
+#config
 baudrate = config.get('SaraR4_baudrate', 115200)       #baudrate du sara R4
 device_id = config.get('deviceID', '').upper()         #device ID en maj
+sara_r5_DPD_setup = False
 
 ser_sara = serial.Serial(
     port='/dev/ttyAMA2',
@@ -117,21 +161,46 @@ def read_complete_response(serial_connection, timeout=2, end_of_response_timeout
 
     return response.decode('utf-8', errors='replace')  # Return the full response if no target line is found
 
+
+
 try:
     print('<h3>Start reboot python script</h3>')
 
     #check modem status
+    #Attention:
+        # SARA R4 response: Manufacturer: u-blox Model: SARA-R410M-02B
+        # SArA R5 response: SARA-R500S-01B-00    
     print("⚙️Check SARA Status")
     command = f'ATI\r'
     ser_sara.write(command.encode('utf-8'))
     response_SARA_ATI = read_complete_response(ser_sara, wait_for_lines=["IMEI"])
     print(response_SARA_ATI)
-    match = re.search(r"Model:\s*(.+)", response_SARA_ATI)
-    model = match.group(1).strip() if match else "Unknown"  # Strip unwanted characters
-    print(f" Model: {model}")
-    update_json_key(config_file, "modem_version", model)
+
+    # Check for SARA model with more robust regex
+    model = "Unknown"
+    if "SARA-R410M" in response_SARA_ATI:
+        model = "SARA-R410M"
+        print("📱 Detected SARA R4 modem")
+    elif "SARA-R500" in response_SARA_ATI:
+        model = "SARA-R500"
+        print("📱 Detected SARA R5 modem")
+        sara_r5_DPD_setup = True
+    else:
+        # Fallback to regex match if direct string match fails
+        match = re.search(r"Model:\s*([A-Za-z0-9\-]+)", response_SARA_ATI)
+        if match:
+            model = match.group(1).strip()
+        else:
+            model = "Unknown"
+            print("⚠️ Could not identify modem model")
+
+    print(f"🔍 Model: {model}")
+    update_sqlite_config("modem_version", model)
     time.sleep(1)
     
+    '''
+    AIRCARTO
+    '''
 
     # 1. Set AIRCARTO URL
     print('➡️Set aircarto URL')
@@ -143,6 +212,10 @@ try:
     print(response_SARA_1)
     time.sleep(1)
 
+    '''
+    uSpot
+    '''
+
     #2. Set uSpot URL
     print('➡️Set uSpot URL')
     uSpot_profile_id = 1
@@ -179,9 +252,9 @@ try:
     else:
         print("❌ Failed to extract coordinates.")
 
-    #update config.json
-    update_json_key(config_file, "latitude_raw", float(latitude))
-    update_json_key(config_file, "longitude_raw", float(longitude))
+    #update sqlite table
+    update_sqlite_config("latitude_raw", float(latitude))
+    update_sqlite_config("longitude_raw", float(longitude))
 
     time.sleep(1)