add config page and terminal page

CLAUDE.md

@@ -0,0 +1,24 @@
+# NebuleAir Pro 4G Development Guidelines
+
+## Commands
+- `sudo systemctl restart master_nebuleair.service` - Restart main service
+- `sudo systemctl status master_nebuleair.service` - Check service status
+- Manual testing: Run individual Python scripts (e.g., `sudo python3 NPM/get_data_modbus_v3.py`)
+- Installation: `sudo ./installation_part1.sh` followed by `sudo ./installation_part2.sh`
+
+## Code Style
+- **Language:** Python 3 with HTML/JS/CSS for web interface
+- **Structure:** Organized by component (BME280, NPM, RTC, SARA, etc.)
+- **Naming:** snake_case for variables/functions, version suffix for iterations (e.g., `_v2.py`)
+- **Documentation:** Include docstrings with script purpose and usage instructions
+- **Error Handling:** Use try/except blocks for I/O operations, print errors to logs
+- **Configuration:** All settings in `config.json`, avoid hardcoding values
+- **Web Components:** Follow Bootstrap patterns, use fetch() for AJAX
+
+## Best Practices
+- Check if features are enabled in config before execution
+- Close database connections after use
+- Round sensor readings to appropriate precision
+- Keep web interface mobile-responsive
+- Include error handling for network operations
+- Follow existing patterns when adding new functionality

GPIO/control.py

@@ -1,40 +0,0 @@
-'''
-   ____ ____ ___ ___  
-  / ___|  _ \_ _/ _ \ 
- | |  _| |_) | | | | |
- | |_| |  __/| | |_| |
-  \____|_|  |___\___/ 
-                      
-script to control GPIO output
-
-GPIO 16 -> SARA 5V
-GPIO 20 -> SARA PWR ON
-
-option 1:
-CLI tool like pinctrl
-pinctrl set 16 op
-pinctrl set 16 dh
-pinctrl set 16 dl
-
-option 2:
-python library RPI.GPIO
-
-
-/usr/bin/python3 /var/www/nebuleair_pro_4g/GPIO/control.py
-'''
-
-import RPi.GPIO as GPIO
-import time
-
-selected_GPIO = 16 
-
-GPIO.setmode(GPIO.BCM)  # Use BCM numbering
-GPIO.setup(selected_GPIO, GPIO.OUT)  # Set GPIO17 as an output
-
-while True:
-    GPIO.output(selected_GPIO, GPIO.HIGH)  # Turn ON
-    time.sleep(1)  # Wait 1 sec
-    GPIO.output(selected_GPIO, GPIO.LOW)   # Turn OFF
-    time.sleep(1)  # Wait 1 sec
-
-

MPPT/read.py

@@ -1,225 +0,0 @@
-'''
-  __  __ ____  ____ _____ 
- |  \/  |  _ \|  _ \_   _|
- | |\/| | |_) | |_) || |  
- | |  | |  __/|  __/ | |  
- |_|  |_|_|   |_|    |_|  
-                        
-Chargeur solaire Victron MPPT interface UART
-
-MPPT connections
-5V / Rx / TX / GND
-RPI connection
--- / GPIO9 / GPIO8 / GND
-* pas besoin de connecter le 5V (le GND uniquement)
-
-typical response from uart:
-
-PID     0xA075          ->product ID
-FW      164             ->firmware version
-SER#    HQ2249VJV9W     ->serial num
-
-V       13310           ->Battery voilatage in mV
-I       -130            ->Battery current in mA (negative means its discharging)
-VPV     10              ->Solar Panel voltage
-PPV     0               ->Solar Panel power (in W)
-CS      0               ->Charger status: 
-                                0=off (no charging), 
-                                2=Bulk (Max current is being delivered to the battery), 
-                                3=Absorbtion (battery is nearly full,voltage is held constant.), 
-                                4=Float (Battery is fully charged, only maintaining charge)
-MPPT    0               ->MPPT (Maximum Power Point Tracking) state: 0 = Off, 1 = Active, 2 = Not tracking
-OR      0x00000001
-ERR     0
-LOAD    ON
-IL      100
-H19     18              ->historical data (Total energy absorbed in kWh)
-H20     0               -> Total energy discharged in kWh
-H21     0
-H22     9
-H23     92
-HSDS    19
-Checksum        u
-
-sudo /usr/bin/python3 /var/www/nebuleair_pro_4g/MPPT/read.py
-
-'''
-import serial
-import time
-import sqlite3
-
-# Connect to the SQLite database
-conn = sqlite3.connect("/var/www/nebuleair_pro_4g/sqlite/sensors.db")
-cursor = conn.cursor()
-
-
-def read_vedirect(port='/dev/ttyAMA4', baudrate=19200, timeout=20, max_attempts=3):
-    """
-    Read and parse data from Victron MPPT controller with retry logic
-    Returns parsed data as a dictionary or None if all attempts fail
-    """
-    required_keys = ['V', 'I', 'VPV', 'PPV', 'CS']  # Essential keys we need
-    
-    for attempt in range(max_attempts):
-        try:
-            print(f"Attempt {attempt+1} of {max_attempts}...")
-            ser = serial.Serial(port, baudrate, timeout=1)
-            
-            # Initialize data dictionary and tracking variables
-            data = {}
-            start_time = time.time()
-            
-            while time.time() - start_time < timeout:
-                line = ser.readline().decode('utf-8', errors='ignore').strip()
-                
-                if not line:
-                    continue
-                    
-                # Check if line contains a key-value pair
-                if '\t' in line:
-                    key, value = line.split('\t', 1)
-                    data[key] = value
-                    print(f"{key}: {value}")
-                else:
-                    print(f"Info: {line}")
-                
-                # Check if we have a complete data block
-                if 'Checksum' in data:
-                    # Check if we have all required keys
-                    missing_keys = [key for key in required_keys if key not in data]
-                    if not missing_keys:
-                        ser.close()
-                        return data
-                    else:
-                        print(f"Incomplete data, missing: {', '.join(missing_keys)}")
-                        # Clear data and continue reading
-                        data = {}
-            
-            # Timeout occurred
-            print(f"Timeout on attempt {attempt+1}: Could not get complete data")
-            ser.close()
-            
-            # Add small delay between attempts
-            if attempt < max_attempts - 1:
-                print("Waiting before next attempt...")
-                time.sleep(2)
-                
-        except Exception as e:
-            print(f"Error on attempt {attempt+1}: {e}")
-            try:
-                ser.close()
-            except:
-                pass
-    
-    print("All attempts failed")
-    return None
-
-def parse_values(data):
-    """Convert string values to appropriate types"""
-    if not data:
-        return None
-        
-    parsed = {}
-    
-    # Define conversions for each key
-    conversions = {
-        'PID': str,
-        'FW': int,
-        'SER#': str,
-        'V': lambda x: float(x)/1000,  # Convert mV to V
-        'I': lambda x: float(x)/1000,  # Convert mA to A
-        'VPV': lambda x: float(x)/1000 if x != '---' else 0,  # Convert mV to V
-        'PPV': int,
-        'CS': int,
-        'MPPT': int,
-        'OR': str,
-        'ERR': int,
-        'LOAD': str,
-        'IL': int,
-        'H19': int,  # Total energy absorbed in kWh
-        'H20': int,  # Total energy discharged in kWh
-        'H21': int,
-        'H22': int,
-        'H23': int,
-        'HSDS': int
-    }
-    
-    # Convert values according to their type
-    for key, value in data.items():
-        if key in conversions:
-            try:
-                parsed[key] = conversions[key](value)
-            except (ValueError, TypeError):
-                parsed[key] = value  # Keep as string if conversion fails
-        else:
-            parsed[key] = value
-    
-    return parsed
-
-def get_charger_status(cs_value):
-    """Convert CS numeric value to human-readable status"""
-    status_map = {
-        0: "Off",
-        1: "Low power mode",
-        2: "Fault",
-        3: "Bulk",
-        4: "Absorption",
-        5: "Float",
-        6: "Storage",
-        7: "Equalize",
-        9: "Inverting",
-        11: "Power supply",
-        245: "Starting-up",
-        247: "Repeated absorption",
-        252: "External control"
-    }
-    return status_map.get(cs_value, f"Unknown ({cs_value})")
-
-if __name__ == "__main__":
-    # Read data (with retry logic)
-    raw_data = read_vedirect()
-    
-    if raw_data:
-        # Parse data
-        parsed_data = parse_values(raw_data)
-        
-        if parsed_data:
-            # Check if we have valid battery voltage
-            if parsed_data.get('V', 0) > 0:
-                print("\n===== MPPT Summary =====")
-                print(f"Battery: {parsed_data.get('V', 0):.2f}V, {parsed_data.get('I', 0):.2f}A")
-                print(f"Solar: {parsed_data.get('VPV', 0):.2f}V, {parsed_data.get('PPV', 0)}W")
-                print(f"Charger status: {get_charger_status(parsed_data.get('CS', 0))}")
-
-                # Save to SQLite
-                cursor.execute("SELECT * FROM timestamp_table LIMIT 1")
-                row = cursor.fetchone()
-                rtc_time_str = row[1]
-
-                # Extract values
-                battery_voltage = parsed_data.get('V', 0)
-                battery_current = parsed_data.get('I', 0)
-                solar_voltage = parsed_data.get('VPV', 0)
-                solar_power = parsed_data.get('PPV', 0)
-                charger_status = parsed_data.get('CS', 0)
-
-                try:
-                    cursor.execute('''
-                        INSERT INTO data_MPPT (timestamp, battery_voltage, battery_current, solar_voltage, solar_power, charger_status) 
-                        VALUES (?, ?, ?, ?, ?, ?)''', 
-                        (rtc_time_str, battery_voltage, battery_current, solar_voltage, solar_power, charger_status))
-
-                    conn.commit()
-                    print("MPPT data saved successfully!")
-
-                except Exception as e:
-                    print(f"Database error: {e}")
-            else:
-                print("Invalid data: Battery voltage is zero or missing")
-        else:
-            print("Failed to parse data")
-    else:
-        print("No valid data received from MPPT controller")
-    
-    # Always close the connection
-    conn.close()

NPM/get_data_modbus_v3.py

@@ -52,7 +52,9 @@ def load_config(config_file):
         return {}
 
 # Load the configuration data
-npm_solo_port = "/dev/ttyAMA5"  #port du NPM solo
+config_file = '/var/www/nebuleair_pro_4g/config.json'
+config = load_config(config_file)
+npm_solo_port = config.get('NPM_solo_port', '')  #port du NPM solo
 
 #GET RTC TIME from SQlite
 cursor.execute("SELECT * FROM timestamp_table LIMIT 1")

README.md

@@ -28,19 +28,17 @@ Line by line installation.
 
 ```
 sudo apt update
-sudo apt install git gh apache2 sqlite3 php php-sqlite3 python3 python3-pip jq autossh i2c-tools python3-smbus -y
+sudo apt install git gh apache2 php php-sqlite3 python3 python3-pip jq autossh i2c-tools python3-smbus -y
-sudo pip3 install pyserial requests RPi.GPIO adafruit-circuitpython-bme280 crcmod psutil ntplib pytz gpiozero adafruit-circuitpython-ads1x15 numpy --break-system-packages
+sudo pip3 install pyserial requests RPi.GPIO adafruit-circuitpython-bme280 crcmod psutil ntplib pytz --break-system-packages
 sudo mkdir -p /var/www/.ssh
 sudo ssh-keygen -t rsa -b 4096 -f /var/www/.ssh/id_rsa -N ""
 sudo ssh-copy-id -i /var/www/.ssh/id_rsa.pub -p 50221 airlab_server1@aircarto.fr
 sudo git clone http://gitea.aircarto.fr/PaulVua/nebuleair_pro_4g.git /var/www/nebuleair_pro_4g
 sudo mkdir /var/www/nebuleair_pro_4g/logs
 sudo touch /var/www/nebuleair_pro_4g/logs/app.log /var/www/nebuleair_pro_4g/logs/loop.log /var/www/nebuleair_pro_4g/wifi_list.csv
-/usr/bin/python3 /var/www/nebuleair_pro_4g/sqlite/create_db.py
+sudo cp /var/www/nebuleair_pro_4g/config.json.dist /var/www/nebuleair_pro_4g/config.json
-/usr/bin/python3 /var/www/nebuleair_pro_4g/sqlite/set_config.py
 sudo chmod -R 777 /var/www/nebuleair_pro_4g/
 git config --global core.fileMode false
-git -C /var/www/nebuleair_pro_4g config core.fileMode false
 git config --global --add safe.directory /var/www/nebuleair_pro_4g
 sudo crontab /var/www/nebuleair_pro_4g/cron_jobs
 sudo /usr/bin/python3 /var/www/nebuleair_pro_4g/sqlite/create_db.py
@@ -59,8 +57,6 @@ ALL ALL=(ALL) NOPASSWD: /usr/bin/nmcli, /usr/sbin/reboot
 www-data ALL=(ALL) NOPASSWD: /usr/bin/git pull
 www-data ALL=(ALL) NOPASSWD: /usr/bin/ssh
 www-data ALL=(ALL) NOPASSWD: /usr/bin/python3 *
-www-data ALL=(ALL) NOPASSWD: /bin/systemctl *
-www-data ALL=(ALL) NOPASSWD: /var/www/nebuleair_pro_4g/*
 ```
 ## Serial
 

RTC/set_with_NTP.py

@@ -1,15 +1,11 @@
-#!/usr/bin/python3
 """
-  ____ _____ ____ 
+Script to set the RTC using an NTP server.
- |  _ \_   _/ ___|
- | |_) || || |    
- |  _ < | || |___ 
- |_| \_\|_| \____|
-
-Script to set the RTC using an NTP server (script used by web UI)
 RPI needs to be connected to the internet (WIFI).
 Requires ntplib and pytz:
 sudo pip3 install ntplib pytz --break-system-packages
+
+/usr/bin/python3 /var/www/nebuleair_pro_4g/RTC/set_with_NTP.py
+
 """
 import smbus2
 import time
@@ -53,95 +49,29 @@ def set_time(bus, year, month, day, hour, minute, second):
     ])
 
 def read_time(bus):
-    """Read the RTC time and validate the values."""
+    """Read the RTC time."""
-    try:
     data = bus.read_i2c_block_data(DS3231_ADDR, REG_TIME, 7)
-        
-        # Convert from BCD
     second = bcd_to_dec(data[0] & 0x7F)
     minute = bcd_to_dec(data[1])
     hour = bcd_to_dec(data[2] & 0x3F)
     day = bcd_to_dec(data[4])
     month = bcd_to_dec(data[5])
     year = bcd_to_dec(data[6]) + 2000
-        
-        # Print raw values for debugging
-        print(f"Raw RTC values: {data}")
-        print(f"Decoded values: Y:{year} M:{month} D:{day} H:{hour} M:{minute} S:{second}")
-        
-        # Validate date values
-        if not (1 <= month <= 12):
-            print(f"Invalid month value: {month}, using default")
-            month = 1
-            
-        # Check days in month (simplified)
-        days_in_month = [0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
-        if not (1 <= day <= days_in_month[month]):
-            print(f"Invalid day value: {day} for month {month}, using default")
-            day = 1
-            
-        # Validate time values
-        if not (0 <= hour <= 23):
-            print(f"Invalid hour value: {hour}, using default")
-            hour = 0
-            
-        if not (0 <= minute <= 59):
-            print(f"Invalid minute value: {minute}, using default")
-            minute = 0
-            
-        if not (0 <= second <= 59):
-            print(f"Invalid second value: {second}, using default")
-            second = 0
-            
     return (year, month, day, hour, minute, second)
 
-    except Exception as e:
-        print(f"Error reading RTC: {e}")
-        # Return a safe default date (2023-01-01 00:00:00)
-        return (2023, 1, 1, 0, 0, 0)
-
 def get_internet_time():
     """Get the current time from an NTP server."""
     ntp_client = ntplib.NTPClient()
-    # Try multiple NTP servers in case one fails
+    response = ntp_client.request('pool.ntp.org')
-    servers = ['pool.ntp.org', 'time.google.com', 'time.windows.com', 'time.apple.com']
-    
-    for server in servers:
-        try:
-            print(f"Trying NTP server: {server}")
-            response = ntp_client.request(server, timeout=2)
     utc_time = datetime.utcfromtimestamp(response.tx_time)
-            print(f"Successfully got time from {server}")
     return utc_time
-        except Exception as e:
-            print(f"Failed to get time from {server}: {e}")
-    
-    # If all servers fail, raise exception
-    raise Exception("All NTP servers failed")
 
 def main():
-    try:
     bus = smbus2.SMBus(1)
 
-        # Test if RTC is accessible
-        try:
-            bus.read_byte(DS3231_ADDR)
-            print("RTC module is accessible")
-        except Exception as e:
-            print(f"Error accessing RTC module: {e}")
-            print("Please check connections and I2C configuration")
-            return
-
     # Get the current time from the RTC
-        try:
     year, month, day, hours, minutes, seconds = read_time(bus)
-            # Create datetime object with validation to handle invalid dates
     rtc_time = datetime(year, month, day, hours, minutes, seconds)
-            print(f"Actual RTC Time              : {rtc_time.strftime('%Y-%m-%d %H:%M:%S')}")
-        except ValueError as e:
-            print(f"Invalid date/time read from RTC: {e}")
-            print("Will proceed with setting RTC from internet time")
-            rtc_time = None
 
     # Get current UTC time from an NTP server
     try:
@@ -149,35 +79,19 @@ def main():
         print(f"Time from Internet (UTC)     : {internet_utc_time.strftime('%Y-%m-%d %H:%M:%S')}")
     except Exception as e:
         print(f"Error retrieving time from the internet: {e}")
-            if rtc_time is None:
-                print("Cannot proceed without either valid RTC time or internet time")
-                return
-            print("Will keep current RTC time")
         return
 
+    # Print current RTC time
+    print(f"Actual RTC Time              : {rtc_time.strftime('%Y-%m-%d %H:%M:%S')}")
+
     # Set the RTC to UTC time
-        print("Setting RTC to internet time...")
     set_time(bus, internet_utc_time.year, internet_utc_time.month, internet_utc_time.day, 
              internet_utc_time.hour, internet_utc_time.minute, internet_utc_time.second)
 
     # Read and print the new time from RTC
-        print("Reading back new RTC time...")
     year, month, day, hour, minute, second = read_time(bus)
     rtc_time_new = datetime(year, month, day, hour, minute, second)
     print(f"New RTC Time (UTC)           : {rtc_time_new.strftime('%Y-%m-%d %H:%M:%S')}")
 
-        # Calculate difference to verify accuracy
-        time_diff = abs((rtc_time_new - internet_utc_time).total_seconds())
-        print(f"Time difference             : {time_diff:.2f} seconds")
-        
-        if time_diff > 5:
-            print("Warning: RTC time differs significantly from internet time")
-            print("You may need to retry or check RTC module")
-        else:
-            print("RTC successfully synchronized with internet time")
-            
-    except Exception as e:
-        print(f"Unexpected error: {e}")
-
 if __name__ == "__main__":
     main()

RTC/set_with_browserTime.py

@@ -1,11 +1,5 @@
 """
-  ____ _____ ____ 
+Script to set the RTC using the browser time.
- |  _ \_   _/ ___|
- | |_) || || |    
- |  _ < | || |___ 
- |_| \_\|_| \____|
-
-Script to set the RTC using the browser time (script used by the web UI).
 
 /usr/bin/python3 /var/www/nebuleair_pro_4g/RTC/set_with_browserTime.py '2024-01-30 12:48:39'
 

SARA/R5/setPDP.py

@@ -1,166 +0,0 @@
-'''
-  ____    _    ____      _    
- / ___|  / \  |  _ \    / \   
- \___ \ / _ \ | |_) |  / _ \  
-  ___) / ___ \|  _ <  / ___ \ 
- |____/_/   \_\_| \_\/_/   \_\
-                              
-Script to set the PDP context for the SARA R5
-
-
-/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/R5/setPDP.py
-
-'''
-import serial
-import time
-import sys
-import json
-import re
-
-#get data from config
-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 {}
-
-#Fonction pour mettre à jour le JSON de configuration
-def update_json_key(file_path, key, value):
-    """
-    Updates a specific key in a JSON file with a new value.
-
-    :param file_path: Path to the JSON file.
-    :param key: The key to update in the JSON file.
-    :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 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.")
-            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
-        
-        print(f"💾 updating '{key}' to '{value}'.")
-    except Exception as e:
-        print(f"Error updating the JSON file: {e}")
-
-# Define the config file path
-config_file = '/var/www/nebuleair_pro_4g/config.json'
-# Load the configuration data
-config = load_config(config_file)
-baudrate = config.get('SaraR4_baudrate', 115200)       #baudrate du sara R4
-device_id = config.get('deviceID', '').upper()         #device ID en maj
-
-ser_sara = serial.Serial(
-    port='/dev/ttyAMA2',
-    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
-)
-
-def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2, wait_for_lines=None, debug=True):
-    '''
-    Fonction très importante !!!
-    Reads the complete response from a serial connection and waits for specific lines.
-    '''
-    if wait_for_lines is None:
-        wait_for_lines = []  # Default to an empty list if not provided
-
-    response = bytearray()
-    serial_connection.timeout = timeout
-    end_time = time.time() + end_of_response_timeout
-    start_time = time.time()
-
-    while True:
-        elapsed_time = time.time() - start_time  # Time since function start
-        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
-
-            # Decode and check for any target line
-            decoded_response = response.decode('utf-8', errors='replace')
-            for target_line in wait_for_lines:
-                if target_line in decoded_response:
-                    if debug:
-                        print(f"[DEBUG] 🔎 Found target line: {target_line} (in {elapsed_time:.2f}s)")
-                    return decoded_response  # Return response immediately if a target line is found
-        elif time.time() > end_time:
-            if debug:
-                print(f"[DEBUG] Timeout reached. No more data received.")
-            break
-        time.sleep(0.1)  # Short sleep to prevent busy waiting
-
-    # Final response and debug output
-    total_elapsed_time = time.time() - start_time
-    if debug:
-        print(f"[DEBUG] ⏱️ elapsed time: {total_elapsed_time:.2f}s. ⏱️")
-    # Check if the elapsed time exceeded 10 seconds
-    if total_elapsed_time > 10 and debug:
-        print(f"[ALERT] 🚨 The operation took too long 🚨")
-        print(f'<span style="color: red;font-weight: bold;">[ALERT] ⚠️{total_elapsed_time:.2f}s⚠️</span>')
-
-    return response.decode('utf-8', errors='replace')  # Return the full response if no target line is found
-
-try:
-    print('Start script')
-
-    # 1. Check connection
-    print('➡️Check SARA R5 connexion')
-    command = f'ATI0\r'
-    ser_sara.write(command.encode('utf-8'))
-    response_SARA_1 = read_complete_response(ser_sara, wait_for_lines=["OK"])
-    print(response_SARA_1, end="")
-    time.sleep(1)
-
-    # 2. Activate PDP context 1
-    print('➡️Activate PDP context 1')
-    command = f'AT+CGACT=1,1\r'
-    ser_sara.write(command.encode('utf-8'))
-    response_SARA_2 = read_complete_response(ser_sara, wait_for_lines=["OK"])
-    print(response_SARA_2, end="")
-    time.sleep(1)
-
-    # 2. Set the PDP type
-    print('➡️Set the PDP type to IPv4 referring to the outputof the +CGDCONT read command')
-    command = f'AT+UPSD=0,0,0\r'
-    ser_sara.write(command.encode('utf-8'))
-    response_SARA_3 = read_complete_response(ser_sara, wait_for_lines=["OK"])
-    print(response_SARA_3, end="")
-    time.sleep(1)
-
-    # 2. Profile #0 is mapped on CID=1.
-    print('➡️Profile #0 is mapped on CID=1.')
-    command = f'AT+UPSD=0,100,1\r'
-    ser_sara.write(command.encode('utf-8'))
-    response_SARA_3 = read_complete_response(ser_sara, wait_for_lines=["OK"])
-    print(response_SARA_3, end="")
-    time.sleep(1)
-
-    # 2. Set the PDP type
-    print('➡️Activate the PSD profile #0: the IPv4 address is already assigned by the network.')
-    command = f'AT+UPSDA=0,3\r'
-    ser_sara.write(command.encode('utf-8'))
-    response_SARA_3 = read_complete_response(ser_sara, wait_for_lines=["OK","+UUPSDA"])
-    print(response_SARA_3, end="")
-    time.sleep(1)
-
-   
-
-except Exception as e:
-    print("An error occurred:", e)
-    traceback.print_exc()  # This prints the full traceback

SARA/SSL/full_test_HTTP.py

@@ -25,8 +25,23 @@ url = parameter[1]  # ex: data.mobileair.fr
 
 profile_id = 3
 
-baudrate = 115200
+#get baudrate
-send_uSpot = False
+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)
+send_uSpot = config.get('send_uSpot', False) 
 
 def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2, wait_for_line=None):
     response = bytearray()

SARA/SSL/full_test_HTTPS.py

@@ -26,8 +26,23 @@ url = parameter[1]  # ex: data.mobileair.fr
 
 profile_id = 3
 
-baudrate = 115200
+#get baudrate
-send_uSpot = False
+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)
+send_uSpot = config.get('send_uSpot', False) 
 
 def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2):
     response = bytearray()

SARA/SSL/full_test_HTTPS_POST.py

@@ -28,8 +28,23 @@ url = parameter[1]  # ex: data.mobileair.fr
 endpoint = parameter[2]
 profile_id = 2
 
-baudrate = 115200
+#get baudrate
-send_uSpot = False
+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)
+send_uSpot = config.get('send_uSpot', False) 
 
 def color_text(text, color):
     colors = {

SARA/SSL/full_test_HTTP_POST.py

@@ -31,8 +31,23 @@ endpoint = parameter[2]
 
 profile_id = 3
 
-baudrate = 115200
+#get baudrate
-send_uSpot = False
+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)
+send_uSpot = config.get('send_uSpot', False) 
 
 def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2):
     response = bytearray()

SARA/SSL/prepareUspotProfile.py

@@ -21,8 +21,23 @@ port='/dev/'+parameter[0] # ex: ttyAMA2
 url = parameter[1]  # ex: data.mobileair.fr
 
 
-baudrate = 115200
+#get baudrate
-send_uSpot = False
+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)
+send_uSpot = config.get('send_uSpot', False) 
 
 def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2):
     response = bytearray()

SARA/SSL/prepareUspotProfile_V2.py

@@ -23,8 +23,24 @@ parameter = sys.argv[1:]  # Exclude the script name
 port='/dev/'+parameter[0] # ex: ttyAMA2
 url = parameter[1]  # ex: data.mobileair.fr
 
-baudrate = 115200
+
-send_uSpot = False
+#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)
+send_uSpot = config.get('send_uSpot', False) 
 
 def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2):
     response = bytearray()

SARA/SSL/sara_add_certif_v2.py

@@ -14,7 +14,19 @@ parameter = sys.argv[1:]  # Exclude the script name
 port = '/dev/' + parameter[0]  # e.g., ttyAMA2
 timeout = float(parameter[1])  # e.g., 2 seconds
 
-baudrate = 115200
+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'
+config = load_config(config_file)
+baudrate = config.get('SaraR4_baudrate', 115200)
 
 def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2):
     response = bytearray()

SARA/cellLocate/server_conf.py

@@ -1,103 +0,0 @@
-'''
-  ____    _    ____      _    
- / ___|  / \  |  _ \    / \   
- \___ \ / _ \ | |_) |  / _ \  
-  ___) / ___ \|  _ <  / ___ \ 
- |____/_/   \_\_| \_\/_/   \_\
-                              
-Script to Configures the network connection to a Multi GNSS Assistance (MGA) server used also per CellLocate
-
-/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/cellLocate/server_conf.py ttyAMA2 1
-
-AT+UGSRV="cell-live1.services.u-blox.com","cell-live2.services.u-blox.com","XkEKfGqVSbmNE1eZfBZm4Q"
-
-
-'''
-
-import serial
-import time
-import sys
-import json
-
-parameter = sys.argv[1:]  # Exclude the script name
-port='/dev/'+parameter[0] # ex: ttyAMA2
-timeout = float(parameter[1])  # ex:2
-
-
-#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 = 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 = timeout
-)
-
-def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2, wait_for_lines=None, debug=True):
-    '''
-    Fonction très importante !!!
-    Reads the complete response from a serial connection and waits for specific lines.
-    '''
-    if wait_for_lines is None:
-        wait_for_lines = []  # Default to an empty list if not provided
-
-    response = bytearray()
-    serial_connection.timeout = timeout
-    end_time = time.time() + end_of_response_timeout
-    start_time = time.time()
-
-    while True:
-        elapsed_time = time.time() - start_time  # Time since function start
-        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
-
-            # Decode and check for any target line
-            decoded_response = response.decode('utf-8', errors='replace')
-            for target_line in wait_for_lines:
-                if target_line in decoded_response:
-                    if debug:
-                        print(f"[DEBUG] 🔎 Found target line: {target_line} (in {elapsed_time:.2f}s)")
-                    return decoded_response  # Return response immediately if a target line is found
-        elif time.time() > end_time:
-            if debug:
-                print(f"[DEBUG] Timeout reached. No more data received.")
-            break
-        time.sleep(0.1)  # Short sleep to prevent busy waiting
-
-    # Final response and debug output
-    total_elapsed_time = time.time() - start_time
-    if debug:
-        print(f"[DEBUG] ⏱️ elapsed time: {total_elapsed_time:.2f}s. ⏱️")
-    # Check if the elapsed time exceeded 10 seconds
-    if total_elapsed_time > 10 and debug:
-        print(f"[ALERT] 🚨 The operation took too long 🚨")
-        print(f'<span style="color: red;font-weight: bold;">[ALERT] ⚠️{total_elapsed_time:.2f}s⚠️</span>')
-
-    return response.decode('utf-8', errors='replace')  # Return the full response if no target line is found
-
-
-#command = f'ATI\r'
-command = f'AT+UGSRV="cell-live1.services.u-blox.com","cell-live2.services.u-blox.com","XkEKfGqVSbmNE1eZfBZm4Q"\r'
-ser.write((command + '\r').encode('utf-8'))
-
-response = read_complete_response(ser, wait_for_lines=["+UULOC"])
-print(response)

SARA/reboot/start.py

@@ -13,110 +13,57 @@ Script that starts at the boot of the RPI (with cron)
 
 '''
 import serial
-import RPi.GPIO as GPIO
 import time
 import sys
 import json
 import re
-import sqlite3
 
-#GPIO
+#get data from config
-SARA_power_GPIO = 16 
+def load_config(config_file):
-SARA_ON_GPIO = 20
-
-GPIO.setmode(GPIO.BCM)  # Use BCM numbering
-GPIO.setup(SARA_power_GPIO, GPIO.OUT)  # Set GPIO17 as an output
-
-# 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:
-        # Query the config table
+            config_data = json.load(file)
-        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 from SQLite: {e}")
+        print(f"Error loading config file: {e}")
         return {}
 
-def update_sqlite_config(key, value):
+#Fonction pour mettre à jour le JSON de configuration
+def update_json_key(file_path, key, value):
     """
-    Updates a specific key in the SQLite config_table with a new value.
+    Updates a specific key in a JSON file with a new value.
 
-    :param key: The key to update in the config_table.
+    :param file_path: Path to the JSON file.
+    :param key: The key to update in the JSON file.
     :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
+        # Check if the key exists in the JSON file
-        cursor.execute("SELECT type FROM config_table WHERE key = ?", (key,))
+        if key in data:
-        result = cursor.fetchone()
+            data[key] = value  # Update the key with the new value
-        
+        else:
-        if result is None:
+            print(f"Key '{key}' not found in the JSON file.")
-            print(f"Key '{key}' not found in the config_table.")
-            conn.close()
             return
         
-        # Get the type of the value from the database
+        # Write the updated data back to the file
-        value_type = result[0]
+        with open(file_path, "w") as file:
+            json.dump(data, file, indent=2)  # Use indent for pretty printing
         
-        # Convert the value to the appropriate string representation based on its type
+        print(f"💾 updating '{key}' to '{value}'.")
-        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 SQLite database: {e}")
+        print(f"Error updating the JSON file: {e}")
 
-#Load config
+# Define the config file path
-config = load_config_sqlite()
+config_file = '/var/www/nebuleair_pro_4g/config.json'
-#config
+# Load the configuration data
+config = load_config(config_file)
 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',
     baudrate=baudrate, #115200 ou 9600
@@ -173,46 +120,20 @@ def read_complete_response(serial_connection, timeout=2, end_of_response_timeout
 try:
     print('<h3>Start reboot python script</h3>')
 
-    #First we need to power on the module (if connected to mosfet via gpio16)
-    GPIO.output(SARA_power_GPIO, GPIO.HIGH)
-    time.sleep(5)
-
     #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)
-    # Check for SARA model with more robust regex
+    model = match.group(1).strip() if match else "Unknown"  # Strip unwanted characters
-    model = "Unknown"
+    print(f" Model: {model}")
-    if "SARA-R410M" in response_SARA_ATI:
+    update_json_key(config_file, "modem_version", model)
-        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
-    '''
-    # 1. Set AIRCARTO URL (profile id = 0)
     print('➡️Set aircarto URL')
     aircarto_profile_id = 0
     aircarto_url="data.nebuleair.fr"
@@ -222,155 +143,26 @@ try:
     print(response_SARA_1)
     time.sleep(1)
 
-    '''
+    #2. Set uSpot URL
-    uSpot
+    print('➡️Set uSpot URL')
-    '''
-    print("➡️➡️Set uSpot URL with SSL")
-
-    security_profile_id = 1
     uSpot_profile_id = 1
     uSpot_url="api-prod.uspot.probesys.net"
-
-
-    #step 1: import the certificate
-    print("➡️ import certificate")
-    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)
-
-    # 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("➡️ add certificate")
-    ser_sara.write(certificate)
-    response_SARA_2 = read_complete_response(ser_sara)
-    print(response_SARA_2)
-
-    time.sleep(0.5)
-
-    # op_code:  0 -> certificate validation level 
-        # param_val : 0 -> Level 0 No validation; 1-> Level 1 Root certificate validation
-    print("➡️Set the security profile (params)")
-    certification_level=0
-    command = f'AT+USECPRF={security_profile_id},0,{certification_level}\r'
-    ser_sara.write((command + '\r').encode('utf-8'))
-    response_SARA_5b = read_complete_response(ser_sara,  wait_for_lines=["OK"])
-    print(response_SARA_5b)
-    time.sleep(0.5)
-
-    # op_code:  1 -> minimum SSL/TLS version
-        # param_val : 0 -> any; server can use any version for the connection; 1-> LSv1.0; 2->TLSv1.1; 3->TLSv1.2;
-    print("➡️Set the security profile (params)")
-    minimum_SSL_version = 0
-    command = f'AT+USECPRF={security_profile_id},1,{minimum_SSL_version}\r'
-    ser_sara.write((command + '\r').encode('utf-8'))
-    response_SARA_5bb = read_complete_response(ser_sara,  wait_for_lines=["OK"])
-    print(response_SARA_5bb)
-    time.sleep(0.5)
-
-    #op_code: 2 ->  legacy cipher suite selection
-        # 0 (factory-programmed value): a list of default cipher suites is proposed at the beginning of handshake process, and a cipher suite will be negotiated among the cipher suites proposed in the list.
-    print("➡️Set cipher")
-    cipher_suite = 0
-    command = f'AT+USECPRF={security_profile_id},2,{cipher_suite}\r'
-    ser_sara.write((command + '\r').encode('utf-8'))
-    response_SARA_5cc = read_complete_response(ser_sara,  wait_for_lines=["OK"])
-    print(response_SARA_5cc)
-    time.sleep(0.5)
-
-        # op_code:  3 -> trusted root certificate internal name
-    print("➡️Set the security profile (choose cert)")
-    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)
-
-     # op_code:  10 -> SNI (server name indication)
-    print("➡️Set the SNI")
-    command = f'AT+USECPRF={security_profile_id},10,"{uSpot_url}"\r'
-    ser_sara.write((command + '\r').encode('utf-8'))
-    response_SARA_5cf = read_complete_response(ser_sara,  wait_for_lines=["OK"])
-    print(response_SARA_5cf)
-    time.sleep(0.5)
-
-    #step 4: set url (op_code = 1)
-    print("➡️SET URL")
     command = f'AT+UHTTP={uSpot_profile_id},1,"{uSpot_url}"\r'
-    ser_sara.write((command + '\r').encode('utf-8'))
+    ser_sara.write(command.encode('utf-8'))
-    response_SARA_5 = read_complete_response(ser_sara,  wait_for_lines=["OK"])
+    response_SARA_2 = read_complete_response(ser_sara, wait_for_lines=["OK"])
-    print(response_SARA_5)
+    print(response_SARA_2)
     time.sleep(1)
 
-    #step 4: set PORT (op_code = 5)
+    print("set port 81")
-    print("➡️SET PORT")
+    command = f'AT+UHTTP={uSpot_profile_id},5,81\r'
-    port = 443
-    command = f'AT+UHTTP={uSpot_profile_id},5,{port}\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("➡️SET SSL")
-    http_secure = 1
-    command = f'AT+UHTTP={uSpot_profile_id},6,{http_secure},{security_profile_id}\r'
-
-    ser_sara.write(command.encode('utf-8'))
-    response_SARA_5fg = read_complete_response(ser_sara, wait_for_lines=["OK"])
-    print(response_SARA_5fg)
-    time.sleep(1)
-
-
-    '''
-    SARA R5
-    '''
-
-    if sara_r5_DPD_setup:
-        print("➡️➡️SARA R5 PDP SETUP")
-        # 2. Activate PDP context 1
-        print('➡️Activate PDP context 1')
-        command = f'AT+CGACT=1,1\r'
-        ser_sara.write(command.encode('utf-8'))
-        response_SARA_2 = read_complete_response(ser_sara, wait_for_lines=["OK"])
-        print(response_SARA_2, end="")
-        time.sleep(1)
-
-        # 2. Set the PDP type
-        print('➡️Set the PDP type to IPv4 referring to the outputof the +CGDCONT read command')
-        command = f'AT+UPSD=0,0,0\r'
-        ser_sara.write(command.encode('utf-8'))
-        response_SARA_3 = read_complete_response(ser_sara, wait_for_lines=["OK"])
-        print(response_SARA_3, end="")
-        time.sleep(1)
-
-        # 2. Profile #0 is mapped on CID=1.
-        print('➡️Profile #0 is mapped on CID=1.')
-        command = f'AT+UPSD=0,100,1\r'
-        ser_sara.write(command.encode('utf-8'))
-        response_SARA_3 = read_complete_response(ser_sara, wait_for_lines=["OK"])
-        print(response_SARA_3, end="")
-        time.sleep(1)
-
-        # 2. Set the PDP type
-        print('➡️Activate the PSD profile #0: the IPv4 address is already assigned by the network.')
-        command = f'AT+UPSDA=0,3\r'
-        ser_sara.write(command.encode('utf-8'))
-        response_SARA_3 = read_complete_response(ser_sara, wait_for_lines=["OK","+UUPSDA"])
-        print(response_SARA_3, end="")
-        time.sleep(1)
-
-
     #3. Get localisation (CellLocate)
-    mode = 2    #single shot position
+    mode = 2
-    sensor = 2  #use cellular CellLocate® location information
+    sensor = 2 
     response_type = 0
     timeout_s = 2
     accuracy_m = 1
@@ -387,9 +179,9 @@ try:
     else:
         print("❌ Failed to extract coordinates.")
 
-    #update sqlite table
+    #update config.json
-    update_sqlite_config("latitude_raw", float(latitude))
+    update_json_key(config_file, "latitude_raw", float(latitude))
-    update_sqlite_config("longitude_raw", float(longitude))
+    update_json_key(config_file, "longitude_raw", float(longitude))
 
     time.sleep(1)
 

SARA/sara.py

@@ -7,8 +7,6 @@
                               
 Script to see if the SARA-R410 is running
 ex: 
-python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 ATI 2
-ex 1 (get SIM infos)
 python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 AT+CCID? 2
 ex 2 (turn on blue light):
 python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 AT+UGPIOC=16,2 2
@@ -16,8 +14,6 @@ ex 3 (reconnect network)
 python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 AT+COPS=1,2,20801 20
 ex 4 (get HTTP Profiles)
 python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 AT+UHTTP? 2
-ex 5 (get IP addr)
-python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 AT+CGPADDR=1 2
 
 '''
 
@@ -32,64 +28,68 @@ port='/dev/'+parameter[0] # ex: ttyAMA2
 command = parameter[1]  # ex: AT+CCID?
 timeout = float(parameter[2])  # ex:2
 
+#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 = 115200
+baudrate = config.get('SaraR4_baudrate', 115200)
 
-try:
+ser = serial.Serial(
-
-    ser = 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 = timeout
-    )
+)
 
-    ser.write((command + '\r').encode('utf-8'))
+ser.write((command + '\r').encode('utf-8'))
 
-    #ser.write(b'ATI\r')            #General Information
+#ser.write(b'ATI\r')            #General Information
-    #ser.write(b'AT+CCID?\r')       #SIM card number
+#ser.write(b'AT+CCID?\r')       #SIM card number
-    #ser.write(b'AT+CPIN?\r')       #Check the status of the SIM card
+#ser.write(b'AT+CPIN?\r')       #Check the status of the SIM card
-    #ser.write(b'AT+CIND?\r')       #Indication state (last number is SIM detection: 0 no SIM detection, 1 SIM detected, 2 not available)
+#ser.write(b'AT+CIND?\r')       #Indication state (last number is SIM detection: 0 no SIM detection, 1 SIM detected, 2 not available)
-    #ser.write(b'AT+UGPIOR=?\r')   #Reads the current value of the specified GPIO pin
+#ser.write(b'AT+UGPIOR=?\r')   #Reads the current value of the specified GPIO pin
-    #ser.write(b'AT+UGPIOC?\r')     #GPIO select configuration
+#ser.write(b'AT+UGPIOC?\r')     #GPIO select configuration
-    #ser.write(b'AT+COPS=?\r')     #Check the network and cellular technology the modem is currently using
+#ser.write(b'AT+COPS=?\r')     #Check the network and cellular technology the modem is currently using
-    #ser.write(b'AT+COPS=1,2,20801') #connext to orange
+#ser.write(b'AT+COPS=1,2,20801') #connext to orange
-    #ser.write(b'AT+CFUN=?\r')     #Selects/read the level of functionality 
+#ser.write(b'AT+CFUN=?\r')     #Selects/read the level of functionality 
-    #ser.write(b'AT+URAT=?\r')     #Radio Access Technology 
+#ser.write(b'AT+URAT=?\r')     #Radio Access Technology 
-    #ser.write(b'AT+USIMSTAT?')
+#ser.write(b'AT+USIMSTAT?')
-    #ser.write(b'AT+IPR=115200')           #Check/Define baud rate
+#ser.write(b'AT+IPR=115200')           #Check/Define baud rate
-    #ser.write(b'AT+CMUX=?')
+#ser.write(b'AT+CMUX=?')
 
 
+
+try:
     # Read lines until a timeout occurs
     response_lines = []
-    start_time = time.time()
+    while True:
-
+        line = ser.readline().decode('utf-8').strip()
-    while (time.time() - start_time) < timeout:
+        if not line:
-        line = ser.readline().decode('utf-8', errors='ignore').strip()
+            break  # Break the loop if an empty line is encountered
-        if line:
         response_lines.append(line)
 
-    # Check if we received any data
-    if not response_lines:
-        print(f"ERROR: No response received from {port} after sending command: {command}")
-        sys.exit(1)
-
     # Print the response
     for line in response_lines:
         print(line)
 
 except serial.SerialException as e:
-    print(f"ERROR: Serial communication error: {e}")
+    print(f"Error: {e}")
-    sys.exit(1)
+
-except Exception as e:
-    print(f"ERROR: Unexpected error: {e}")
-    sys.exit(1)
 finally:
-    # Close the serial port if it's open
+    if ser.is_open:
-    if 'ser' in locals() and ser.is_open:
         ser.close()
-
+        #print("Serial closed")
 

SARA/sara_checkDNS.py

@@ -1,63 +0,0 @@
-'''
-  ____    _    ____      _    
- / ___|  / \  |  _ \    / \   
- \___ \ / _ \ | |_) |  / _ \  
-  ___) / ___ \|  _ <  / ___ \ 
- |____/_/   \_\_| \_\/_/   \_\
-                              
-Script to resolve DNS (get IP from domain name) with AT+UDNSRN command
-Ex:
-/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/sara_checkDNS.py ttyAMA2 data.nebuleair.fr
-To do: need to add profile id as parameter
-
-'''
-
-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
-
-baudrate = 115200
-
-ser = 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
-)
-
-command = f'AT+UDNSRN=0,"{url}"\r'
-ser.write((command + '\r').encode('utf-8'))
-
-print("****")
-print("DNS check")
-
-try:
-    # Read lines until a timeout occurs
-    response_lines = []
-    while True:
-        line = ser.readline().decode('utf-8').strip()
-        if not line:
-            break  # Break the loop if an empty line is encountered
-        response_lines.append(line)
-
-    # Print the response
-    for line in response_lines:
-        print(line)
-
-except serial.SerialException as e:
-    print(f"Error: {e}")
-
-finally:
-    if ser.is_open:
-        ser.close()
-        print("****")
-        #print("Serial closed")
-

SARA/sara_connectNetwork.py

@@ -26,54 +26,22 @@ networkID = parameter[1]  # ex: 20801
 timeout = float(parameter[2])  # ex:2
 
 
+#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
-def read_complete_response(serial_connection, timeout=2, end_of_response_timeout=2, wait_for_lines=None, debug=True):
+config_file = '/var/www/nebuleair_pro_4g/config.json'
-    '''
+# Load the configuration data
-    Fonction très importante !!!
+config = load_config(config_file)
-    Reads the complete response from a serial connection and waits for specific lines.
+# Access the shared variables
-    '''
+baudrate = config.get('SaraR4_baudrate', 115200)
-    if wait_for_lines is None:
-        wait_for_lines = []  # Default to an empty list if not provided
-
-    response = bytearray()
-    serial_connection.timeout = timeout
-    end_time = time.time() + end_of_response_timeout
-    start_time = time.time()
-
-    while True:
-        elapsed_time = time.time() - start_time  # Time since function start
-        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
-
-            # Decode and check for any target line
-            decoded_response = response.decode('utf-8', errors='replace')
-            for target_line in wait_for_lines:
-                if target_line in decoded_response:
-                    if debug:
-                        print(f"[DEBUG] 🔎 Found target line: {target_line} (in {elapsed_time:.2f}s)")
-                    return decoded_response  # Return response immediately if a target line is found
-        elif time.time() > end_time:
-            if debug:
-                print(f"[DEBUG] Timeout reached. No more data received.")
-            break
-        time.sleep(0.1)  # Short sleep to prevent busy waiting
-
-    # Final response and debug output
-    total_elapsed_time = time.time() - start_time
-    if debug:
-        print(f"[DEBUG] ⏱️ elapsed time: {total_elapsed_time:.2f}s. ⏱️")
-    # Check if the elapsed time exceeded 10 seconds
-    if total_elapsed_time > 10 and debug:
-        print(f"[ALERT] 🚨 The operation took too long 🚨")
-        print(f'<span style="color: red;font-weight: bold;">[ALERT] ⚠️{total_elapsed_time:.2f}s⚠️</span>')
-
-    return response.decode('utf-8', errors='replace')  # Return the full response if no target line is found
-
-
-baudrate = 115200
 
 ser = serial.Serial(
     port=port,  #USB0 or ttyS0
@@ -89,11 +57,17 @@ ser.write((command + '\r').encode('utf-8'))
 
 
 try:
-    response = read_complete_response(ser, wait_for_lines=["OK", "ERROR"],timeout=5, end_of_response_timeout=120, debug=True)
+    # Read lines until a timeout occurs
+    response_lines = []
+    while True:
+        line = ser.readline().decode('utf-8').strip()
+        if not line:
+            break  # Break the loop if an empty line is encountered
+        response_lines.append(line)
 
-    print('<p class="text-danger-emphasis">')
+    # Print the response
-    print(response)
+    for line in response_lines:
-    print("</p>", end="")
+        print(line)
 
 except serial.SerialException as e:
     print(f"Error: {e}")

SARA/sara_eraseMessage.py

@@ -11,7 +11,22 @@ parameter = sys.argv[1:]  # Exclude the script name
 port='/dev/'+parameter[0] # ex: ttyAMA2
 message = parameter[1]  # ex: Hello
 
-baudrate = 115200
+#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 = serial.Serial(
     port=port,  #USB0 or ttyS0

SARA/sara_google_ping.py

@@ -18,7 +18,24 @@ import sys
 import json
 
 
-baudrate = 115200
+
+
+#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 = serial.Serial(
     port='/dev/ttyAMA2',

SARA/sara_ping.py

@@ -17,7 +17,23 @@ import json
 # SARA R4 UHTTPC profile IDs
 aircarto_profile_id = 0
 
-baudrate = 115200
+
+#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='/dev/ttyAMA2',
@@ -73,24 +89,6 @@ 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
 
 
-def extract_error_code(response):
-    """
-    Extract just the error code from AT+UHTTPER response
-    """
-    for line in response.split('\n'):
-        if '+UHTTPER' in line:
-            try:
-                # Split the line and get the third value (error code)
-                parts = line.split(':')[1].strip().split(',')
-                if len(parts) >= 3:
-                    error_code = int(parts[2])
-                    return error_code
-            except:
-                pass
-    
-    # Return None if we couldn't find the error code
-    return None
-
 try:
     #3. Send to endpoint (with device ID)
     print("Send data (GET REQUEST):")
@@ -113,36 +111,7 @@ try:
             parts = http_response.split(',')
              # 2.1 code 0 (HTTP failed) ⛔⛔⛔
             if len(parts) == 3 and parts[-1] == '0':  # The third value indicates success
-                print("⛔⛔ATTENTION: HTTP operation failed")
+                print("⛔ATTENTION: HTTP operation failed")
-                #get error code
-                print("Getting error code (11->Server connection error, 73->Secure socket connect error)")
-                command = f'AT+UHTTPER={aircarto_profile_id}\r'
-                ser_sara.write(command.encode('utf-8'))    
-                response_SARA_9 = read_complete_response(ser_sara, wait_for_lines=["OK"], debug=False)
-                print('<p class="text-danger-emphasis">')
-                print(response_SARA_9)
-                print("</p>", end="")
-                # Extract just the error code
-                error_code = extract_error_code(response_SARA_9)
-                if error_code is not None:
-                    # Display interpretation based on error code
-                    if error_code == 0:
-                        print('<p class="text-success">No error detected</p>')
-                    elif error_code == 4:
-                        print('<p class="text-danger">Error 4: Invalid server Hostname</p>')
-                    elif error_code == 11:
-                        print('<p class="text-danger">Error 11: Server connection error</p>')
-                    elif error_code == 22:
-                        print('<p class="text-danger">Error 22: PSD or CSD connection not established</p>')
-                    elif error_code == 73:
-                        print('<p class="text-danger">Error 73: Secure socket connect error</p>')
-                    else:
-                        print(f'<p class="text-danger">Unknown error code: {error_code}</p>')
-                else:
-                    print('<p class="text-danger">Could not extract error code from response</p>')
-                    
-
-
             # 2.2 code 1 (HHTP succeded)
             else:
                 # Si la commande HTTP a réussi 

SARA/sara_readMessage.py

@@ -11,7 +11,22 @@ parameter = sys.argv[1:]  # Exclude the script name
 port='/dev/'+parameter[0] # ex: ttyAMA2
 message = parameter[1]  # ex: Hello
 
-baudrate = 115200
+#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 = serial.Serial(
     port=port,  #USB0 or ttyS0

SARA/sara_sendMessage.py

@@ -12,7 +12,22 @@ port='/dev/'+parameter[0] # ex: ttyAMA2
 endpoint = parameter[1]  # ex: /pro_4G/notif_message.php
 profile_id = parameter[2]
 
-baudrate = 115200
+#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 = serial.Serial(
     port=port,  #USB0 or ttyS0

SARA/sara_setAPN.py

@@ -21,7 +21,23 @@ port='/dev/'+parameter[0] # ex: ttyAMA2
 apn_address = parameter[1]  # ex: data.mono
 timeout = float(parameter[2])  # ex:2
 
-baudrate = 115200
+
+#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 = serial.Serial(
     port=port,  #USB0 or ttyS0
@@ -33,8 +49,6 @@ ser = serial.Serial(
 )
 
 command = f'AT+CGDCONT=1,"IP","{apn_address}"\r'
-#command = f'AT+CGDCONT=1,"IPV4V6","{apn_address}"\r'
-#command = f'AT+CGDCONT=1,"IP","{apn_address}",0,0\r'
 ser.write((command + '\r').encode('utf-8'))
 
 

SARA/sara_setURL.py

@@ -8,6 +8,7 @@
 Script to set the URL for a HTTP request
 Ex:
 /usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/sara_setURL.py ttyAMA2 data.nebuleair.fr 0
+To do: need to add profile id as parameter
 
 First profile id:
     AT+UHTTP=0,1,"data.nebuleair.fr"
@@ -27,7 +28,22 @@ url = parameter[1]  # ex: data.mobileair.fr
 profile_id = parameter[2] #ex: 0
 
 
-baudrate = 115200
+#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 = serial.Serial(
     port=port,  #USB0 or ttyS0

SARA/sara_setURL_uSpot_noSSL.py

@@ -40,7 +40,22 @@ def read_complete_response(serial_connection, timeout=2, end_of_response_timeout
 
     return response.decode('utf-8', errors='replace')
 
-baudrate = 115200
+#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

SARA/sara_writeMessage.py

@@ -12,7 +12,21 @@ port='/dev/'+parameter[0] # ex: ttyAMA2
 message = parameter[1]  # ex: Hello
 
 #get baudrate
-baudrate = 115200
+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 = serial.Serial(
     port=port,  #USB0 or ttyS0

boot_hotspot.sh

@@ -2,10 +2,9 @@
 
 # Script to check if wifi is connected and start hotspot if not
 # will also retreive unique RPi ID and store it to deviceID.txt
-# script that starts at boot:
-# @reboot /var/www/nebuleair_pro_4g/boot_hotspot.sh >> /var/www/nebuleair_pro_4g/logs/app.log 2>&1
 
 OUTPUT_FILE="/var/www/nebuleair_pro_4g/wifi_list.csv"
+JSON_FILE="/var/www/nebuleair_pro_4g/config.json"
 
 
 echo "-------------------"
@@ -13,8 +12,6 @@ echo "-------------------"
 
 echo "NebuleAir pro started at $(date)"
 
-chmod -R 777 /var/www/nebuleair_pro_4g/
-
 # Blink GPIO 23 and 24 five times
 for i in {1..5}; do
     # Turn GPIO 23 and 24 ON
@@ -28,19 +25,15 @@ for i in {1..5}; do
     sleep 1
 done
 
-echo "getting RPI serial number"
+echo "getting SARA R4 serial number"
 # Get the last 8 characters of the serial number and write to text file
 serial_number=$(cat /proc/cpuinfo | grep Serial | awk '{print substr($3, length($3) - 7)}')
-
+# Use jq to update the "deviceID" in the JSON file
-# update Sqlite database
+jq --arg serial_number "$serial_number" '.deviceID = $serial_number' "$JSON_FILE" > temp.json && mv temp.json "$JSON_FILE"
-echo "Updating SQLite database with device ID: $serial_number"
-sqlite3 /var/www/nebuleair_pro_4g/sqlite/sensors.db "UPDATE config_table SET value='$serial_number' WHERE key='deviceID';"
-
 echo "id: $serial_number"
 
-
+#get the SSH port for tunneling
-# Get SSH tunnel port from SQLite config_table
+SSH_TUNNEL_PORT=$(jq -r '.sshTunnel_port' "$JSON_FILE")
-SSH_TUNNEL_PORT=$(sqlite3 /var/www/nebuleair_pro_4g/sqlite/sensors.db "SELECT value FROM config_table WHERE key='sshTunnel_port'")
 
 #need to wait for the network manager to be ready
 sleep 20
@@ -58,16 +51,19 @@ if [ "$STATE" == "30 (disconnected)" ]; then
     echo "Starting hotspot..."
     sudo nmcli device wifi hotspot ifname wlan0 ssid nebuleair_pro password nebuleaircfg
 
-    # Update SQLite to reflect hotspot mode
+    # Update JSON to reflect hotspot mode
-    sqlite3 /var/www/nebuleair_pro_4g/sqlite/sensors.db "UPDATE config_table SET value='hotspot' WHERE key='WIFI_status'"
+    jq --arg status "hotspot" '.WIFI_status = $status' "$JSON_FILE" > temp.json && mv temp.json "$JSON_FILE"
+
 
 else
     echo "🛜Success: wlan0 is connected!🛜"
     CONN_SSID=$(nmcli -g GENERAL.CONNECTION device show wlan0)
     echo "Connection: $CONN_SSID"
 
-    # Update SQLite to reflect hotspot mode
+    #update config JSON file
-    sqlite3 /var/www/nebuleair_pro_4g/sqlite/sensors.db "UPDATE config_table SET value='connected' WHERE key='WIFI_status'"
+    jq --arg status "connected" '.WIFI_status = $status' "$JSON_FILE" > temp.json && mv temp.json "$JSON_FILE"
+
+    sudo chmod 777 "$JSON_FILE"
 
     # Lancer le tunnel SSH
     #echo "Démarrage du tunnel SSH sur le port $SSH_TUNNEL_PORT..."

config.json.dist

@@ -5,11 +5,8 @@
   "RTC/save_to_db.py": true,
   "BME280/get_data_v2.py": true,
   "envea/read_value_v2.py": false,
-  "MPPT/read.py": false,
-  "windMeter/read.py": false,
   "sqlite/flush_old_data.py": true,
   "deviceID": "XXXX",
-  "npm_5channel": false,
   "latitude_raw": 0,
   "longitude_raw":0,
   "latitude_precision": 0,
@@ -28,7 +25,7 @@
   "SARA_R4_general_status": "connected",
   "SARA_R4_SIM_status": "connected",
   "SARA_R4_network_status": "connected",
-  "SARA_R4_neworkID": 20810,
+  "SARA_R4_neworkID": 0,
   "WIFI_status": "connected",
   "MQTT_GUI": false,
   "send_aircarto": true,

cron_jobs

@@ -4,10 +4,4 @@
 
 @reboot sleep 30 && /usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/reboot/start.py >> /var/www/nebuleair_pro_4g/logs/app.log 2>&1
 
-#0 0 * * * > /var/www/nebuleair_pro_4g/logs/master.log
+0 0 * * * > /var/www/nebuleair_pro_4g/logs/master.log
-#0 0 * * * > /var/www/nebuleair_pro_4g/logs/master_errors.log
-#0 0 * * * > /var/www/nebuleair_pro_4g/logs/app.log
-
-0 0 * * * find /var/www/nebuleair_pro_4g/logs -name "*.log" -type f -exec truncate -s 0 {} \;
-
-

envea/read_value_v2.py

@@ -28,14 +28,31 @@ cursor.execute("SELECT * FROM timestamp_table LIMIT 1")
 row = cursor.fetchone()  # Get the first (and only) row
 rtc_time_str = row[1]  # '2025-02-07 12:30:45'
 
-# Fetch connected ENVEA sondes from SQLite config table
+# Function to load config data
-cursor.execute("SELECT port, name, coefficient FROM envea_sondes_table WHERE connected = 1")
+def load_config(config_file):
-connected_envea_sondes = cursor.fetchall()  # List of tuples (port, name, coefficient)
+    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)
+
+# Initialize sensors and serial connections
+envea_sondes = config.get('envea_sondes', [])
+connected_envea_sondes = [sonde for sonde in envea_sondes if sonde.get('connected', False)]
 serial_connections = {}
 
 if connected_envea_sondes:
-    for port, name, coefficient in connected_envea_sondes:
+    for device in connected_envea_sondes:
+        port = device.get('port', 'Unknown')
+        name = device.get('name', 'Unknown')
         try:
             serial_connections[name] = serial.Serial(
                 port=f'/dev/{port}',
@@ -57,7 +74,9 @@ data_nh3 = 0
 
 try:
     if connected_envea_sondes:
-        for port, name, coefficient in connected_envea_sondes:
+        for device in connected_envea_sondes:
+            name = device.get('name', 'Unknown')
+            coefficient = device.get('coefficient', 1)
             if name in serial_connections:
                 serial_connection = serial_connections[name]
                 try:

html/config.html

@@ -0,0 +1,344 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>NebuleAir - Config Editor</title>
+  <link rel="stylesheet" href="assets/css/bootstrap.min.css">
+  <style>
+    body {
+      overflow-x: hidden;
+    }
+    #sidebar a.nav-link {
+        position: relative;
+        display: flex;
+        align-items: center;
+    }
+    #sidebar a.nav-link:hover {
+        background-color: rgba(0, 0, 0, 0.5);
+    }
+    #sidebar a.nav-link svg {
+        margin-right: 8px; /* Add spacing between icons and text */
+    }
+    #sidebar {
+      transition: transform 0.3s ease-in-out;
+    }
+    .offcanvas-backdrop {
+      z-index: 1040;
+    }
+    #jsonEditor {
+      width: 100%;
+      min-height: 400px;
+      font-family: monospace;
+      font-size: 14px;
+      border: 1px solid #ccc;
+      padding: 10px;
+      white-space: pre;
+    }
+    .password-popup {
+      display: none;
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+      background-color: rgba(0, 0, 0, 0.5);
+      z-index: 2000;
+      justify-content: center;
+      align-items: center;
+    }
+    .password-container {
+      background-color: white;
+      padding: 20px;
+      border-radius: 5px;
+      box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+      width: 300px;
+    }
+  </style>
+</head>
+<body>
+  <!-- Topbar -->
+   <span id="topbar"></span>
+
+  <!-- Sidebar Offcanvas for Mobile -->
+  <div class="offcanvas offcanvas-start text-white bg-dark" tabindex="-1" id="sidebarOffcanvas" aria-labelledby="sidebarOffcanvasLabel">
+    <div class="offcanvas-header">
+      <h5 class="offcanvas-title" id="sidebarOffcanvasLabel">NebuleAir</h5>
+      <button type="button" class="btn-close btn-close-white" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+    </div>
+    <div class="offcanvas-body" id="sidebar_mobile">
+    </div>
+  </div>
+
+  <div class="container-fluid mt-5">
+    <div class="row">
+      <!-- Side bar -->
+      <aside class="col-md-2 col-lg-1 d-none d-md-block vh-100 position-fixed bg-dark text-white" id="sidebar">
+      </aside>
+      <!-- Main content -->
+      <main class="col-md-10 ms-sm-auto col-lg-11 offset-md-2 offset-lg-1 px-md-4">
+        <h1 class="mt-4">Configuration Editor</h1>
+        
+        <div class="row mb-3">
+          <div class="col-12">
+            <div class="alert alert-warning">
+              <strong>Warning:</strong> Editing the configuration file directly can affect system functionality. 
+              Make changes carefully and ensure valid JSON format.
+            </div>
+            
+            <div class="card">
+              <div class="card-header d-flex justify-content-between align-items-center">
+                <h5 class="mb-0">config.json</h5>
+                <div>
+                  <button id="editBtn" class="btn btn-primary me-2">Edit</button>
+                  <button id="saveBtn" class="btn btn-success me-2" disabled>Save</button>
+                  <button id="cancelBtn" class="btn btn-secondary" disabled>Cancel</button>
+                </div>
+              </div>
+              <div class="card-body">
+                <div id="jsonEditor" class="mb-3" readonly></div>
+                <div id="errorMsg" class="alert alert-danger" style="display:none;"></div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+    </div>
+  </div>
+
+  <!-- Password Modal -->
+  <div class="password-popup" id="passwordModal">
+    <div class="password-container">
+      <h5>Authentication Required</h5>
+      <p>Please enter the admin password to edit configuration:</p>
+      <div class="mb-3">
+        <input type="password" class="form-control" id="adminPassword" placeholder="Password">
+      </div>
+      <div class="mb-3 d-flex justify-content-between">
+        <button class="btn btn-secondary" id="cancelPasswordBtn">Cancel</button>
+        <button class="btn btn-primary" id="submitPasswordBtn">Submit</button>
+      </div>
+      <div id="passwordError" class="text-danger mt-2" style="display:none;"></div>
+    </div>
+  </div>
+
+<!-- JAVASCRIPT -->
+
+<!-- Link Ajax locally -->
+<script src="assets/jquery/jquery-3.7.1.min.js"></script>
+<!-- Link Bootstrap JS and Popper.js locally -->
+<script src="assets/js/bootstrap.bundle.js"></script>
+
+<script>
+ document.addEventListener('DOMContentLoaded', function () {
+    const elementsToLoad = [
+        { id: 'topbar', file: 'topbar.html' },
+        { id: 'sidebar', file: 'sidebar.html' },
+        { id: 'sidebar_mobile', file: 'sidebar.html' }
+    ];
+
+    elementsToLoad.forEach(({ id, file }) => {
+        fetch(file)
+            .then(response => response.text())
+            .then(data => {
+                const element = document.getElementById(id);
+                if (element) {
+                    element.innerHTML = data;
+                }
+            })
+            .catch(error => console.error(`Error loading ${file}:`, error));
+    });
+});
+
+// Add admin password (should be changed to something more secure)
+const ADMIN_PASSWORD = "nebuleair123";
+
+// Global variables for editor
+let originalConfig = '';
+let jsonEditor;
+let editBtn;
+let saveBtn;
+let cancelBtn;
+let passwordModal;
+let adminPassword;
+let submitPasswordBtn;
+let cancelPasswordBtn;
+let passwordError;
+let errorMsg;
+
+// Initialize DOM references after document is loaded
+function initializeElements() {
+    jsonEditor = document.getElementById('jsonEditor');
+    editBtn = document.getElementById('editBtn');
+    saveBtn = document.getElementById('saveBtn');
+    cancelBtn = document.getElementById('cancelBtn');
+    passwordModal = document.getElementById('passwordModal');
+    adminPassword = document.getElementById('adminPassword');
+    submitPasswordBtn = document.getElementById('submitPasswordBtn');
+    cancelPasswordBtn = document.getElementById('cancelPasswordBtn');
+    passwordError = document.getElementById('passwordError');
+    errorMsg = document.getElementById('errorMsg');
+}
+
+// Load config file
+function loadConfigFile() {
+    fetch('../config.json')
+        .then(response => response.text())
+        .then(data => {
+            originalConfig = data;
+            // Format JSON for display with proper indentation
+            try {
+                const jsonObj = JSON.parse(data);
+                const formattedJSON = JSON.stringify(jsonObj, null, 2);
+                jsonEditor.textContent = formattedJSON;
+            } catch (e) {
+                jsonEditor.textContent = data;
+                console.error("Error parsing JSON:", e);
+            }
+        })
+        .catch(error => {
+            console.error('Error loading config.json:', error);
+            jsonEditor.textContent = "Error loading configuration file.";
+        });
+}
+
+// Event listeners
+document.addEventListener('DOMContentLoaded', function() {
+    // Initialize DOM elements
+    initializeElements();
+    
+    // Load config file
+    loadConfigFile();
+    
+    // Edit button
+    editBtn.addEventListener('click', function() {
+        passwordModal.style.display = 'flex';
+        adminPassword.value = ''; // Clear password field
+        passwordError.style.display = 'none';
+        adminPassword.focus();
+    });
+    
+    // Password submit button
+    submitPasswordBtn.addEventListener('click', function() {
+        if (adminPassword.value === ADMIN_PASSWORD) {
+            passwordModal.style.display = 'none';
+            enableEditing();
+        } else {
+            passwordError.textContent = 'Invalid password';
+            passwordError.style.display = 'block';
+        }
+    });
+    
+    // Enter key for password
+    adminPassword.addEventListener('keypress', function(e) {
+        if (e.key === 'Enter') {
+            submitPasswordBtn.click();
+        }
+    });
+    
+    // Cancel password button
+    cancelPasswordBtn.addEventListener('click', function() {
+        passwordModal.style.display = 'none';
+    });
+    
+    // Save button
+    saveBtn.addEventListener('click', function() {
+        saveConfig();
+    });
+    
+    // Cancel button
+    cancelBtn.addEventListener('click', function() {
+        cancelEditing();
+    });
+});
+
+// Enable editing mode
+function enableEditing() {
+    jsonEditor.setAttribute('contenteditable', 'true');
+    jsonEditor.focus();
+    jsonEditor.classList.add('border-primary');
+    editBtn.disabled = true;
+    saveBtn.disabled = false;
+    cancelBtn.disabled = false;
+}
+
+// Cancel editing
+function cancelEditing() {
+    jsonEditor.setAttribute('contenteditable', 'false');
+    jsonEditor.classList.remove('border-primary');
+    jsonEditor.textContent = originalConfig;
+    // Reformat JSON
+    try {
+        const jsonObj = JSON.parse(originalConfig);
+        const formattedJSON = JSON.stringify(jsonObj, null, 2);
+        jsonEditor.textContent = formattedJSON;
+    } catch (e) {
+        jsonEditor.textContent = originalConfig;
+    }
+    editBtn.disabled = false;
+    saveBtn.disabled = true;
+    cancelBtn.disabled = true;
+    errorMsg.style.display = 'none';
+}
+
+// Save config
+function saveConfig() {
+    const newConfig = jsonEditor.textContent;
+    
+    // Validate JSON
+    try {
+        JSON.parse(newConfig);
+        
+        // Send to server
+        $.ajax({
+            url: 'launcher.php',
+            method: 'POST',
+            data: { 
+                type: 'save_config',
+                config: newConfig 
+            },
+            dataType: 'json',
+            success: function(response) {
+                if (response.success) {
+                    originalConfig = newConfig;
+                    jsonEditor.setAttribute('contenteditable', 'false');
+                    jsonEditor.classList.remove('border-primary');
+                    editBtn.disabled = false;
+                    saveBtn.disabled = true;
+                    cancelBtn.disabled = true;
+                    
+                    // Show success message
+                    errorMsg.textContent = 'Configuration saved successfully!';
+                    errorMsg.classList.remove('alert-danger');
+                    errorMsg.classList.add('alert-success');
+                    errorMsg.style.display = 'block';
+                    
+                    // Hide success message after 3 seconds
+                    setTimeout(() => {
+                        errorMsg.style.display = 'none';
+                    }, 3000);
+                } else {
+                    errorMsg.textContent = 'Error saving configuration: ' + response.message;
+                    errorMsg.classList.remove('alert-success');
+                    errorMsg.classList.add('alert-danger');
+                    errorMsg.style.display = 'block';
+                }
+            },
+            error: function(xhr, status, error) {
+                errorMsg.textContent = 'Error saving configuration: ' + error;
+                errorMsg.classList.remove('alert-success');
+                errorMsg.classList.add('alert-danger');
+                errorMsg.style.display = 'block';
+            }
+        });
+    } catch (e) {
+        errorMsg.textContent = 'Invalid JSON format: ' + e.message;
+        errorMsg.classList.remove('alert-success');
+        errorMsg.classList.add('alert-danger');
+        errorMsg.style.display = 'block';
+    }
+}
+</script>
+
+</body>
+</html>

html/database.html

@@ -71,8 +71,6 @@
                 <button class="btn btn-primary" onclick="get_data_sqlite('data_BME280',getSelectedLimit(),false)">Mesures Temp/Hum</button>
                 <button class="btn btn-primary" onclick="get_data_sqlite('data_NPM_5channels',getSelectedLimit(),false)">Mesures PM (5 canaux)</button>
                 <button class="btn btn-primary" onclick="get_data_sqlite('data_envea',getSelectedLimit(),false)">Sonde Cairsens</button>
-                <button class="btn btn-primary" onclick="get_data_sqlite('data_WIND',getSelectedLimit(),false)">Sonde Vent</button>
-
                 <button class="btn btn-warning" onclick="get_data_sqlite('timestamp_table',getSelectedLimit(),false)">Timestamp Table</button>
 
               </div>
@@ -149,37 +147,23 @@
 
   
 
-window.onload = function() {
+    window.onload = function() {
+    fetch('../config.json') // Replace 'deviceID.txt' with 'config.json'
+        .then(response => response.json()) // Parse response as JSON
+        .then(data => {
+          console.log("Getting config file (onload)");
+            //get device ID
+            const deviceID = data.deviceID.trim().toUpperCase();
+            //document.getElementById('pageTitle_plus_ID').innerText = 'token: ' + deviceID;
 
+             //get device Name
+             const deviceName = data.deviceName;
            
-  //NEW way to get data from SQLITE
-  $.ajax({
-  url: 'launcher.php?type=get_config_sqlite',
-  dataType:'json',
-  //dataType: 'json', // Specify that you expect a JSON response
-  method: 'GET', // Use GET or POST depending on your needs
-  success: function(response) {
-              console.log("Getting SQLite config table:");
-              console.log(response);
-
-              //get device Name (for the side bar)
-              const deviceName = response.deviceName;
            const elements = document.querySelectorAll('.sideBar_sensorName');
            elements.forEach((element) => {
                element.innerText = deviceName;
            });
 
-                      //device name html page title
-      if (response.deviceName) {
-      document.title = response.deviceName;
-    }
-                
-          },
-          error: function(xhr, status, error) {
-              console.error('AJAX request failed:', status, error);
-          }
-  }); //end ajax
-
 
             //get local RTC
             $.ajax({
@@ -194,10 +178,11 @@ window.onload = function() {
                         error: function(xhr, status, error) {
                             console.error('AJAX request failed:', status, error);
                         }
-      }); //end AJAX
+                });
 
-
+        })
-}
+        .catch(error => console.error('Error loading config.json:', error));
+        }
 
 
 
@@ -214,6 +199,7 @@ function get_data_sqlite(table, limit, download , startDate = "", endDate = "")
 
   console.log(url);
   
+
   $.ajax({
     url: url,
     dataType: 'text', // Specify that you expect a JSON response
@@ -274,12 +260,6 @@ function get_data_sqlite(table, limit, download , startDate = "", endDate = "")
           tableHTML += `
               <th>Timestamp</th>
           `;
-      }else if (table === "data_WIND") {
-          tableHTML += `
-              <th>Timestamp</th>
-              <th>speed (km/h)</th>
-              <th>Direction (V)</th>
-          `;
       }
 
       tableHTML += `</tr></thead><tbody>`;
@@ -330,12 +310,6 @@ function get_data_sqlite(table, limit, download , startDate = "", endDate = "")
                     tableHTML += `
                         <td>${columns[1]}</td>
                     `;
-                }else if (table === "data_WIND") {
-                    tableHTML += `
-                        <td>${columns[0]}</td>
-                        <td>${columns[1]}</td>
-                        <td>${columns[2]}</td>
-                    `;
                 }
 
                 tableHTML += "</tr>";

html/index.html

@@ -135,35 +135,6 @@
 
 window.onload = function() {
 
-    //NEW way to get data from SQLITE
-    $.ajax({
-    url: 'launcher.php?type=get_config_sqlite',
-    dataType:'json',
-    //dataType: 'json', // Specify that you expect a JSON response
-    method: 'GET', // Use GET or POST depending on your needs
-    success: function(response) {
-                console.log("Getting SQLite config table:");
-                console.log(response);
-
-                //get device Name (for the side bar)
-                const deviceName = response.deviceName;
-                const elements = document.querySelectorAll('.sideBar_sensorName');
-                elements.forEach((element) => {
-                      element.innerText = deviceName;
-                  });
-
-                        //device name html page title
-      if (response.deviceName) {
-      document.title = response.deviceName;
-    }
-                  
-            },
-            error: function(xhr, status, error) {
-                console.error('AJAX request failed:', status, error);
-            }
-    }); //end ajax
-
-    /* OLD way of getting config data
     fetch('../config.json') // Replace 'deviceID.txt' with 'config.json'
         .then(response => response.json()) // Parse response as JSON
         .then(data => {
@@ -181,11 +152,6 @@ window.onload = function() {
                 element.innerText = deviceName;
             });
 
-        //end fetch config
-        })
-        .catch(error => console.error('Error loading config.json:', error));
-        //end windows on load
-      */
             //get local RTC
             $.ajax({
                 url: 'launcher.php?type=RTC_time',
@@ -455,6 +421,10 @@ window.onload = function() {
 
 
 
+        //end fetch config
+        })
+        .catch(error => console.error('Error loading config.json:', error));
+        //end windows on load
       }
 
 </script>

html/launcher.php

@@ -1,16 +1,14 @@
 <?php
-//Prevents caching → Adds headers to ensure fresh response.
+// ✅ Prevents caching → Adds headers to ensure fresh response.
-// to test this page http://192.168.1.127/html/launcher.php?type=get_config_scripts_sqlite
 header("Content-Type: application/json");
 header("Cache-Control: no-store, no-cache, must-revalidate, max-age=0");
 header("Pragma: no-cache");
 
-$database_path = "/var/www/nebuleair_pro_4g/sqlite/sensors.db";
+// Get request type from GET or POST parameters
-
+$type = isset($_GET['type']) ? $_GET['type'] : (isset($_POST['type']) ? $_POST['type'] : '');
-
-$type=$_GET['type'];
 
 if ($type == "get_npm_sqlite_data") {
+    $database_path = "/var/www/nebuleair_pro_4g/sqlite/sensors.db";
     //echo "Getting data from sqlite database";
     try {
         $db = new PDO("sqlite:$database_path");
@@ -28,281 +26,8 @@ if ($type == "get_npm_sqlite_data") {
     }
 }
 
-/*
-
-*/
-//GETING data from config_table (SQLite DB)
-if ($type == "get_config_sqlite") {
-    try {
-        $db = new PDO("sqlite:$database_path");
-        $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        
-        // Get all main configuration entries
-        $config_query = $db->query("SELECT key, value, type FROM config_table");
-        $config_data = $config_query->fetchAll(PDO::FETCH_ASSOC);
-        
-        // Convert data types according to their 'type' field
-        $result = [];
-        foreach ($config_data as $item) {
-            $key = $item['key'];
-            $value = $item['value'];
-            $type = $item['type'];
-            
-            // Convert value based on its type
-            switch ($type) {
-                case 'bool':
-                    $parsed_value = ($value == '1' || $value == 'true') ? true : false;
-                    break;
-                case 'int':
-                    $parsed_value = intval($value);
-                    break;
-                case 'float':
-                    $parsed_value = floatval($value);
-                    break;
-                default:
-                    $parsed_value = $value;
-            }
-            
-            $result[$key] = $parsed_value;
-        }
-        
-        // Return JSON response
-        header('Content-Type: application/json');
-        echo json_encode($result, JSON_PRETTY_PRINT);
-        
-    } catch (PDOException $e) {
-        // Return error as JSON
-        header('Content-Type: application/json');
-        echo json_encode(['error' => 'Database error: ' . $e->getMessage()]);
-    }
-}
-
-/*
-
-*/
-//GETING data from config_scrips_table (SQLite DB)
-if ($type == "get_config_scripts_sqlite") {
-
-    try {
-        $db = new PDO("sqlite:$database_path");
-        $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        
-        // Get all main configuration entries
-        $config_query = $db->query("SELECT * FROM config_scripts_table");
-        $config_data = $config_query->fetchAll(PDO::FETCH_ASSOC);
-        
-        // Convert data types according to their 'type' field
-        $result = [];
-        foreach ($config_data as $item) {
-            $script_path = $item['script_path'];
-            $enabled = $item['enabled'];
-            
-            // Convert the enabled field to a proper boolean
-            $result[$script_path] = ($enabled == 1);
-        }
-        
-        // Return JSON response
-        header('Content-Type: application/json');
-        echo json_encode($result, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
-        
-    } catch (PDOException $e) {
-        // Return error as JSON
-        header('Content-Type: application/json');
-        echo json_encode(['error' => 'Database error: ' . $e->getMessage()]);
-    }
-
-}
-
-/*
-
-*/
-//GETING data from envea_sondes_table (SQLite DB)
-if ($type == "get_envea_sondes_table_sqlite") {
-
-    try {
-        $db = new PDO("sqlite:$database_path");
-        $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        
-         // Get all entries from envea_sondes_table
-         $query = $db->query("SELECT id, connected, port, name, coefficient FROM envea_sondes_table");
-         $data = $query->fetchAll(PDO::FETCH_ASSOC);
-        
-        // Convert data types appropriately
-        $result = [];
-        foreach ($data as $item) {
-            // Create object for each sonde with proper data types
-            $sonde = [
-                'id' => (int)$item['id'],
-                'connected' => $item['connected'] == 1,  // Convert to boolean
-                'port' => $item['port'],
-                'name' => $item['name'],
-                'coefficient' => (float)$item['coefficient']  // Convert to float
-            ];
-            
-            // Add to results array
-            $result[] = $sonde;
-        }
-        
-        
-        // Return JSON response
-        header('Content-Type: application/json');
-        echo json_encode($result, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
-        
-    } catch (PDOException $e) {
-        // Return error as JSON
-        header('Content-Type: application/json');
-        echo json_encode(['error' => 'Database error: ' . $e->getMessage()]);
-    }
-
-}
-
-
-
-
-//UPDATING the config_table from SQLite DB
-if ($type == "update_config_sqlite") {
-    $param = $_GET['param'] ?? null;
-    $value = $_GET['value'] ?? null;
-    
-    if ($param === null || $value === null) {
-        echo json_encode(["error" => "Missing parameter or value"]);
-        exit;
-    }
-    
-    try {
-        $db = new PDO("sqlite:$database_path");
-        $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        
-        // First, check if parameter exists and get its type
-        $checkStmt = $db->prepare("SELECT type FROM config_table WHERE key = :param");
-        $checkStmt->bindParam(':param', $param);
-        $checkStmt->execute();
-        $result = $checkStmt->fetch(PDO::FETCH_ASSOC);
-        
-        if ($result) {
-            // Parameter exists, determine type and update
-            $type = $result['type'];
-            
-            // Convert value according to type if needed
-            $convertedValue = $value;
-            if ($type == "bool") {
-                // Convert various boolean representations to 0/1
-                $convertedValue = (filter_var($value, FILTER_VALIDATE_BOOLEAN)) ? "1" : "0";
-            } elseif ($type == "int") {
-                $convertedValue = (string)intval($value);
-            } elseif ($type == "float") {
-                $convertedValue = (string)floatval($value);
-            }
-            
-            // Update the value
-            $updateStmt = $db->prepare("UPDATE config_table SET value = :value WHERE key = :param");
-            $updateStmt->bindParam(':value', $convertedValue);
-            $updateStmt->bindParam(':param', $param);
-            $updateStmt->execute();
-            
-            echo json_encode([
-                "success" => true,
-                "message" => "Configuration updated successfully",
-                "param" => $param,
-                "value" => $convertedValue,
-                "type" => $type
-            ]);
-        } else {
-            echo json_encode([
-                "error" => "Parameter not found in configuration",
-                "param" => $param
-            ]);
-        }
-    } catch (PDOException $e) {
-        echo json_encode(["error" => $e->getMessage()]);
-    }
-}
-
-
-//UPDATING the envea_sondes_table table from SQLite DB
-if ($type == "update_sonde") {
-    $id = $_GET['id'] ?? null;
-    $field = $_GET['field'] ?? null;
-    $value = $_GET['value'] ?? null;
-    
-   // Validate parameters
-    if ($id === null || $field === null || $value === null) {
-        echo json_encode([
-            "success" => false,
-            "error" => "Missing required parameters (id, field, or value)"
-        ]);
-        exit;
-    }
-
-    // Validate field name (whitelist approach for security)
-    $allowed_fields = ['connected', 'port', 'name', 'coefficient'];
-    if (!in_array($field, $allowed_fields)) {
-        echo json_encode([
-            "success" => false,
-            "error" => "Invalid field name: " . $field
-        ]);
-        exit;
-    }
-
-    try {
-        // Connect to the database
-        $db = new PDO("sqlite:$database_path");
-        $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        
-        // Check if the sonde exists
-        $checkStmt = $db->prepare("SELECT id FROM envea_sondes_table WHERE id = :id");
-        $checkStmt->bindParam(':id', $id, PDO::PARAM_INT);
-        $checkStmt->execute();
-        
-        if (!$checkStmt->fetch()) {
-            echo json_encode([
-                "success" => false,
-                "error" => "Sonde with ID $id not found"
-            ]);
-            exit;
-        }
-        
-        // Process value based on field type
-        if ($field == 'connected') {
-            // Convert to integer (0 or 1)
-            $processedValue = filter_var($value, FILTER_VALIDATE_BOOLEAN) ? 1 : 0;
-            $paramType = PDO::PARAM_INT;
-        } else if ($field == 'coefficient') {
-            // Convert to float
-            $processedValue = floatval($value);
-            $paramType = PDO::PARAM_STR; // SQLite doesn't have PARAM_FLOAT
-        } else {
-            // For text fields (port, name)
-            $processedValue = $value;
-            $paramType = PDO::PARAM_STR;
-        }
-        
-        // Update the sonde record
-        $updateStmt = $db->prepare("UPDATE envea_sondes_table SET $field = :value WHERE id = :id");
-        $updateStmt->bindParam(':value', $processedValue, $paramType);
-        $updateStmt->bindParam(':id', $id, PDO::PARAM_INT);
-        $updateStmt->execute();
-        
-        // Return success response
-        echo json_encode([
-            "success" => true,
-            "message" => "Sonde $id updated successfully",
-            "field" => $field,
-            "value" => $processedValue
-        ]);
-        
-    } catch (PDOException $e) {
-        // Return error as JSON
-        echo json_encode([
-            "success" => false,
-            "error" => "Database error: " . $e->getMessage()
-        ]);
-    }
-}
-
-//update the config (old JSON updating)
 if ($type == "update_config") {
-    echo "updating.... ";
+    echo "updating....";
     $param=$_GET['param'];
     $value=$_GET['value'];
     $configFile = '../config.json';
@@ -349,20 +74,6 @@ if ($type == "git_pull") {
     echo $output;
 }
 
-if ($type == "update_firmware") {
-    // Execute the comprehensive update script
-    $command = 'sudo /var/www/nebuleair_pro_4g/update_firmware.sh 2>&1';
-    $output = shell_exec($command);
-    
-    // Return the output as JSON for better web display
-    header('Content-Type: application/json');
-    echo json_encode([
-        'success' => true,
-        'output' => $output,
-        'timestamp' => date('Y-m-d H:i:s')
-    ]);
-}
-
 if ($type == "set_RTC_withNTP") {
     $command = 'sudo /usr/bin/python3 /var/www/nebuleair_pro_4g/RTC/set_with_NTP.py';
     $output = shell_exec($command);
@@ -391,50 +102,9 @@ if ($type == "set_RTC_withBrowser") {
 
 
 if ($type == "clear_loopLogs") {
-    $response = array();
+    $command = 'truncate -s 0 /var/www/nebuleair_pro_4g/logs/loop.log';
-    
+    $output = shell_exec($command);
-    try {
+    echo $output;
-        $logPath = '/var/www/nebuleair_pro_4g/logs/master.log';
-        
-        // Check if file exists and is writable
-        if (!file_exists($logPath)) {
-            throw new Exception("Log file does not exist");
-        }
-        
-        if (!is_writable($logPath)) {
-            throw new Exception("Log file is not writable");
-        }
-        
-        // Execute the command
-        $command = 'truncate -s 0 ' . escapeshellarg($logPath);
-        $output = shell_exec($command . ' 2>&1');
-        
-        // Check if there was any error output
-        if (!empty($output)) {
-            throw new Exception("Command error: " . $output);
-        }
-        
-        // Success response
-        $response = array(
-            'status' => 'success',
-            'message' => 'Logs cleared successfully',
-            'timestamp' => date('Y-m-d H:i:s')
-        );
-    } catch (Exception $e) {
-        // Error response
-        $response = array(
-            'status' => 'error',
-            'message' => $e->getMessage(),
-            'timestamp' => date('Y-m-d H:i:s')
-        );
-    }
-    
-    // Set content type to JSON
-    header('Content-Type: application/json');
-    
-    // Return the JSON response
-    echo json_encode($response);
-    exit;
 }
 
 if ($type == "database_size") {
@@ -599,58 +269,38 @@ if ($type == "sara_connectNetwork") {
     $port=$_GET['port'];
     $timeout=$_GET['timeout'];
     $networkID=$_GET['networkID'];
-    $param="SARA_R4_neworkID";
-
-    //echo "updating SARA_R4_networkID in config file";
-
-    //OLD way to store data (JSON file)
 
+    echo "updating SARA_R4_networkID in config file";
     // Convert `networkID` to an integer (or float if needed)
-    //$networkID = is_numeric($networkID) ? (strpos($networkID, '.') !== false ? (float)$networkID : (int)$networkID) : 0;
+    $networkID = is_numeric($networkID) ? (strpos($networkID, '.') !== false ? (float)$networkID : (int)$networkID) : 0;
     #save to config.json
-    //$configFile = '/var/www/nebuleair_pro_4g/config.json';
+    $configFile = '/var/www/nebuleair_pro_4g/config.json';
     // Read the JSON file
-    //$jsonData = file_get_contents($configFile);
+    $jsonData = file_get_contents($configFile);
     // Decode JSON data into an associative array
-    //$config = json_decode($jsonData, true);
+    $config = json_decode($jsonData, true);
     // Check if decoding was successful
-    //if ($config === null) {
+    if ($config === null) {
-    //    die("Error: Could not decode JSON file.");
+        die("Error: Could not decode JSON file.");
-    //}
+    }
     // Update the value of SARA_R4_networkID
-    //$config['SARA_R4_neworkID'] = $networkID; // Replace 42 with the desired value
+    $config['SARA_R4_neworkID'] = $networkID; // Replace 42 with the desired value
     // Encode the array back to JSON with pretty printing
-    //$newJsonData = json_encode($config, JSON_PRETTY_PRINT);
+    $newJsonData = json_encode($config, JSON_PRETTY_PRINT);
     // Check if encoding was successful
-    //if ($newJsonData === false) {
+    if ($newJsonData === false) {
-    //    die("Error: Could not encode JSON data.");
+        die("Error: Could not encode JSON data.");
-    //}
-
-    // Write the updated JSON back to the file
-    //if (file_put_contents($configFile, $newJsonData) === false) {
-    //    die("Error: Could not write to JSON file.");
-    //}
-
-    //echo "SARA_R4_networkID updated successfully.";
-
-    //NEW way to store data -> use SQLITE
-    try {
-        $db = new PDO("sqlite:$database_path");
-        $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-
-        $updateStmt = $db->prepare("UPDATE config_table SET value = :value WHERE key = :param");
-        $updateStmt->bindParam(':value', $networkID);
-        $updateStmt->bindParam(':param', $param);
-        $updateStmt->execute();
-        echo "SARA_R4_networkID updated successfully.";
-
-    } catch (PDOException $e) {
-        // Return error as JSON
-        header('Content-Type: application/json');
-        echo json_encode(['error' => 'Database error: ' . $e->getMessage()]);
     }
 
-    //echo "connecting to network... please wait...";
+    // Write the updated JSON back to the file
+    if (file_put_contents($configFile, $newJsonData) === false) {
+        die("Error: Could not write to JSON file.");
+    }
+
+    echo "SARA_R4_networkID updated successfully.";
+
+
+    echo "connecting to network... please wait...";
     $command = 'sudo /usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/sara_connectNetwork.py ' . $port . ' ' . $networkID . ' ' . $timeout;
     $output = shell_exec($command);
     echo $output;
@@ -836,14 +486,57 @@ if ($type == "wifi_scan_old") {
 
 }
 
-/*
+// Save config.json with password protection
-  _____                   _             _ 
+if ($type == "save_config") {
- |_   _|__ _ __ _ __ ___ (_)_ __   __ _| |
+    // Verify that the request is using POST method
-   | |/ _ \ '__| '_ ` _ \| | '_ \ / _` | |
+    if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
-   | |  __/ |  | | | | | | | | | | (_| | |
+        echo json_encode(['success' => false, 'message' => 'Invalid request method']);
-   |_|\___|_|  |_| |_| |_|_|_| |_|\__,_|_|
+        exit;
+    }
     
-*/
+    // Get the config content from POST data
+    $config = isset($_POST['config']) ? $_POST['config'] : '';
+    
+    if (empty($config)) {
+        echo json_encode(['success' => false, 'message' => 'No configuration data provided']);
+        exit;
+    }
+    
+    // Validate that the content is valid JSON
+    $decodedConfig = json_decode($config);
+    if (json_last_error() !== JSON_ERROR_NONE) {
+        echo json_encode([
+            'success' => false, 
+            'message' => 'Invalid JSON format: ' . json_last_error_msg()
+        ]);
+        exit;
+    }
+    
+    // Path to the configuration file
+    $configFile = '/var/www/nebuleair_pro_4g/config.json';
+    
+    // Create a backup of the current config
+    $backupFile = '/var/www/nebuleair_pro_4g/config.json.backup-' . date('Y-m-d-H-i-s');
+    if (file_exists($configFile)) {
+        copy($configFile, $backupFile);
+    }
+    
+    // Write the updated configuration to the file
+    $result = file_put_contents($configFile, $config);
+    
+    if ($result === false) {
+        echo json_encode([
+            'success' => false, 
+            'message' => 'Failed to write configuration file. Check permissions.'
+        ]);
+    } else {
+        echo json_encode([
+            'success' => true, 
+            'message' => 'Configuration saved successfully',
+            'bytes_written' => $result
+        ]);
+    }
+}
 
 // Execute shell command with security restrictions
 if ($type == "execute_command") {
@@ -865,7 +558,7 @@ if ($type == "execute_command") {
     $allowedCommands = [
         'ls', 'cat', 'cd', 'pwd', 'df', 'free', 'ifconfig', 'ip', 'ps', 'date', 'uptime', 
         'systemctl status', 'whoami', 'hostname', 'uname', 'grep', 'tail', 'head', 'find',
-        'less', 'more', 'du', 'echo', 'git'
+        'less', 'more', 'du', 'echo'
     ];
     
     // Check if command is allowed
@@ -904,7 +597,7 @@ if ($type == "execute_command") {
     $prohibitedPatterns = [
         'sudo rm', ';', '&&', '||', '|', '>', '>>', '&',
         'wget', 'curl', 'nc', 'ssh', 'scp', 'ftp', 'telnet',
-        'iptables', 'passwd', 'chown', 'chmod', 'mkfs', ' dd ',
+        'iptables', 'passwd', 'chown', 'chmod', 'mkfs', 'dd',
         'mount', 'umount', 'kill', 'killall'
     ];
     
@@ -982,219 +675,3 @@ if ($type == "execute_command") {
         ]);
     }
 }
-
-/*
-   ____            _                 ____                      _          __  __                                                   _   
-  / ___| _   _ ___| |_ ___ _ __ ___ |  _ \  / ___|  ___ _ ____   _(_) ___ ___|  \/  | __ _ _ __   __ _  __ _  ___ _ __ ___   ___ _ __ | |_ 
-  \___ \| | | / __| __/ _ \ '_ ` _ \| | | | \___ \ / _ \ '__\ \ / / |/ __/ _ \ |\/| |/ _` | '_ \ / _` |/ _` |/ _ \ '_ ` _ \ / _ \ '_ \| __|
-   ___) | |_| \__ \ ||  __/ | | | | | |_| |  ___) |  __/ |   \ V /| | (_|  __/ |  | | (_| | | | | (_| | (_| |  __/ | | | | |  __/ | | | |_ 
-  |____/ \__, |___/\__\___|_| |_| |_|____/  |____/ \___|_|    \_/ |_|\___\___|_|  |_|\__,_|_| |_|\__,_|\__, |\___|_| |_| |_|\___|_| |_|\__|
-         |___/                                                                                          |___/                              
-*/
-
-// Get systemd services status
-if ($type == "get_systemd_services") {
-    try {
-        // List of NebuleAir services to monitor with descriptions and frequencies
-        $services = [
-            'nebuleair-npm-data.timer' => [
-                'description' => 'Collects particulate matter data from NextPM sensor',
-                'frequency' => 'Every 10 seconds'
-            ],
-            'nebuleair-envea-data.timer' => [
-                'description' => 'Reads environmental data from Envea sensors',
-                'frequency' => 'Every 10 seconds'
-            ],
-            'nebuleair-sara-data.timer' => [
-                'description' => 'Transmits collected data via 4G cellular modem',
-                'frequency' => 'Every 60 seconds'
-            ],
-            'nebuleair-bme280-data.timer' => [
-                'description' => 'Monitors temperature and humidity (BME280)',
-                'frequency' => 'Every 2 minutes'
-            ],
-            'nebuleair-mppt-data.timer' => [
-                'description' => 'Tracks solar panel and battery status',
-                'frequency' => 'Every 2 minutes'
-            ],
-            'nebuleair-db-cleanup-data.timer' => [
-                'description' => 'Cleans up old data from database',
-                'frequency' => 'Daily'
-            ]
-        ];
-        
-        $serviceStatus = [];
-        
-        foreach ($services as $service => $serviceInfo) {
-            // Get service active status
-            $activeCmd = "systemctl is-active " . escapeshellarg($service) . " 2>/dev/null";
-            $activeStatus = trim(shell_exec($activeCmd));
-            $isActive = ($activeStatus === 'active');
-            
-            // Get service enabled status
-            $enabledCmd = "systemctl is-enabled " . escapeshellarg($service) . " 2>/dev/null";
-            $enabledStatus = trim(shell_exec($enabledCmd));
-            $isEnabled = ($enabledStatus === 'enabled');
-            
-            // Clean up service name for display
-            $displayName = str_replace(['.timer', 'nebuleair-', '-data'], '', $service);
-            $displayName = ucfirst(str_replace('-', ' ', $displayName));
-            
-            $serviceStatus[] = [
-                'name' => $service,
-                'display_name' => $displayName,
-                'description' => $serviceInfo['description'],
-                'frequency' => $serviceInfo['frequency'],
-                'active' => $isActive,
-                'enabled' => $isEnabled
-            ];
-        }
-        
-        echo json_encode([
-            'success' => true,
-            'services' => $serviceStatus
-        ], JSON_PRETTY_PRINT);
-        
-    } catch (Exception $e) {
-        echo json_encode([
-            'success' => false,
-            'error' => $e->getMessage()
-        ]);
-    }
-}
-
-// Restart a systemd service
-if ($type == "restart_systemd_service") {
-    $service = $_GET['service'] ?? null;
-    
-    if (empty($service)) {
-        echo json_encode([
-            'success' => false,
-            'error' => 'No service specified'
-        ]);
-        exit;
-    }
-    
-    // Validate service name (security check)
-    $allowedServices = [
-        'nebuleair-npm-data.timer',
-        'nebuleair-envea-data.timer', 
-        'nebuleair-sara-data.timer',
-        'nebuleair-bme280-data.timer',
-        'nebuleair-mppt-data.timer',
-        'nebuleair-db-cleanup-data.timer'
-    ];
-    
-    if (!in_array($service, $allowedServices)) {
-        echo json_encode([
-            'success' => false,
-            'error' => 'Invalid service name'
-        ]);
-        exit;
-    }
-    
-    try {
-        // Restart the service
-        $command = "sudo systemctl restart " . escapeshellarg($service) . " 2>&1";
-        $output = shell_exec($command);
-        
-        // Check if restart was successful
-        $statusCmd = "systemctl is-active " . escapeshellarg($service) . " 2>/dev/null";
-        $status = trim(shell_exec($statusCmd));
-        
-        if ($status === 'active' || empty($output)) {
-            echo json_encode([
-                'success' => true,
-                'message' => "Service $service restarted successfully"
-            ]);
-        } else {
-            echo json_encode([
-                'success' => false,
-                'error' => "Failed to restart service: $output"
-            ]);
-        }
-        
-    } catch (Exception $e) {
-        echo json_encode([
-            'success' => false,
-            'error' => $e->getMessage()
-        ]);
-    }
-}
-
-// Enable/disable a systemd service
-if ($type == "toggle_systemd_service") {
-    $service = $_GET['service'] ?? null;
-    $enable = $_GET['enable'] ?? null;
-    
-    if (empty($service) || $enable === null) {
-        echo json_encode([
-            'success' => false,
-            'error' => 'Missing service name or enable parameter'
-        ]);
-        exit;
-    }
-    
-    // Validate service name (security check)
-    $allowedServices = [
-        'nebuleair-npm-data.timer',
-        'nebuleair-envea-data.timer', 
-        'nebuleair-sara-data.timer',
-        'nebuleair-bme280-data.timer',
-        'nebuleair-mppt-data.timer',
-        'nebuleair-db-cleanup-data.timer'
-    ];
-    
-    if (!in_array($service, $allowedServices)) {
-        echo json_encode([
-            'success' => false,
-            'error' => 'Invalid service name'
-        ]);
-        exit;
-    }
-    
-    try {
-        $enable = filter_var($enable, FILTER_VALIDATE_BOOLEAN);
-        $action = $enable ? 'enable' : 'disable';
-        
-        // Enable/disable the service
-        $command = "sudo systemctl $action " . escapeshellarg($service) . " 2>&1";
-        $output = shell_exec($command);
-        
-        // If disabling, also stop the service
-        if (!$enable) {
-            $stopCommand = "sudo systemctl stop " . escapeshellarg($service) . " 2>&1";
-            $stopOutput = shell_exec($stopCommand);
-        }
-        
-        // If enabling, also start the service
-        if ($enable) {
-            $startCommand = "sudo systemctl start " . escapeshellarg($service) . " 2>&1";
-            $startOutput = shell_exec($startCommand);
-        }
-        
-        // Check if the operation was successful
-        $statusCmd = "systemctl is-enabled " . escapeshellarg($service) . " 2>/dev/null";
-        $status = trim(shell_exec($statusCmd));
-        
-        $expectedStatus = $enable ? 'enabled' : 'disabled';
-        
-        if ($status === $expectedStatus) {
-            echo json_encode([
-                'success' => true,
-                'message' => "Service $service " . ($enable ? 'enabled and started' : 'disabled and stopped') . " successfully"
-            ]);
-        } else {
-            echo json_encode([
-                'success' => false,
-                'error' => "Failed to $action service: $output"
-            ]);
-        }
-        
-    } catch (Exception $e) {
-        echo json_encode([
-            'success' => false,
-            'error' => $e->getMessage()
-        ]);
-    }
-}

html/logs.html

@@ -56,10 +56,7 @@
           <div class="col-lg-6 col-12">
             <div class="card" style="height: 80vh;">
               <div class="card-header">
-                Sara logs  
+                Master logs  <button type="submit" class="btn btn-secondary btn-sm" onclick="clear_loopLogs()">Clear</button>
-                <button type="submit" class="btn btn-secondary btn-sm" id="refresh-master-log">Refresh</button>
-                <button type="submit" class="btn btn-secondary btn-sm" onclick="clear_loopLogs()">Clear</button>
-
                   <span id="script_running"></span>
               </div>
               <div class="card-body overflow-auto" id="card_loop_content">
@@ -72,7 +69,6 @@
             <div class="card" style="height: 80vh;">
               <div class="card-header">
                 Boot logs
-                <button type="submit" class="btn btn-secondary btn-sm" id="refresh-boot-log">Refresh</button>
               </div>
               <div class="card-body overflow-auto" id="card_boot_content">
 
@@ -115,17 +111,65 @@
     const boot_card_content = document.getElementById('card_boot_content');
 
     //Getting Master logs
-    console.log("Getting SARA logs");
+    console.log("Getting master logs");
-    displayLogFile('../logs/sara_service.log', loop_card_content, true, 1000);
+
+    fetch('../logs/master.log')
+      .then((response) => {
+        console.log("OK");
+
+        if (!response.ok) {
+          throw new Error('Failed to fetch the log file.');
+        }
+        return response.text();
+      })
+      .then((data) => {
+        const lines = data.split('\n');
+
+        // Format log content
+        const formattedLog = lines
+          .map((line) => line.trim()) // Remove extra whitespace
+          .filter((line) => line) // Remove empty lines
+          .join('<br>'); // Join formatted lines with line breaks
+
+          loop_card_content.innerHTML = `<pre style="white-space: pre-wrap; word-wrap: break-word; margin: 0;">${formattedLog}</pre>`;
+          loop_card_content.scrollTop = loop_card_content.scrollHeight; // Scroll to the bottom
+
+        })
+      .catch((error) => {
+        console.error(error);
+        loop_card_content.textContent = 'Error loading log file.';
+      });
 
       console.log("Getting app/boot logs");
-    displayLogFile('../logs/app.log', boot_card_content, true, 1000);
 
-    // Setup master log with refresh button
+      //Getting App logs
-    setupLogRefreshButton('refresh-master-log', '../logs/sara_service.log', 'card_loop_content', 3000);
+      fetch('../logs/app.log')
+      .then((response) => {
+        console.log("OK");
+        
+        if (!response.ok) {
+          throw new Error('Failed to fetch the log file.');
+        }
+        return response.text();
+      })
+      .then((data) => {
+        const lines = data.split('\n');
+
+        // Format log content
+        const formattedLog = lines
+          .map((line) => line.trim()) // Remove extra whitespace
+          .filter((line) => line) // Remove empty lines
+          .join('<br>'); // Join formatted lines with line breaks
+
+          boot_card_content.innerHTML = `<pre style="white-space: pre-wrap; word-wrap: break-word; margin: 0;">${formattedLog}</pre>`;
+          boot_card_content.scrollTop = loop_card_content.scrollHeight; // Scroll to the bottom
+
+        })
+      .catch((error) => {
+        console.error(error);
+        boot_card_content.textContent = 'Error loading log file.';
+      });
         
-    // Setup boot log with refresh button
-    setupLogRefreshButton('refresh-boot-log', '../logs/app.log', 'card_boot_content', 300);
 
 
 });
@@ -135,33 +179,21 @@ window.onload = function() {
   getModem_busy_status();
   setInterval(getModem_busy_status, 2000);
 
-  //NEW way to get config (SQLite)
+    fetch('../config.json') // Replace 'deviceID.txt' with 'config.json'
-  $.ajax({
+        .then(response => response.json()) // Parse response as JSON
-    url: 'launcher.php?type=get_config_sqlite',
+        .then(data => {
-    dataType:'json',
+          console.log("Getting config file (onload)");
-    //dataType: 'json', // Specify that you expect a JSON response
+            //get device ID
-    method: 'GET', // Use GET or POST depending on your needs
+            const deviceID = data.deviceID.trim().toUpperCase();
-    success: function(response) {
+           // document.getElementById('pageTitle_plus_ID').innerText = 'token: ' + deviceID;
-      console.log("Getting SQLite config table:");
+             //get device Name
-      console.log(response);
+             const deviceName = data.deviceName;
            
-      //device name_side bar
            const elements = document.querySelectorAll('.sideBar_sensorName');
            elements.forEach((element) => {
-            element.innerText = response.deviceName;
+               element.innerText = deviceName;
            });
 
-      //device name html page title
-      if (response.deviceName) {
-      document.title = response.deviceName;
-    }
-
-  },
-  error: function(xhr, status, error) {
-      console.error('AJAX request failed:', status, error);
-  }
-    });//end AJAX
-
 
             //get local RTC
             $.ajax({
@@ -178,78 +210,10 @@ window.onload = function() {
                         }
                 });
 
-
-    }//end onload
-
-function displayLogFile(logFilePath, containerElement, scrollToBottom = true, maxLines = 0) {
-  // Show loading indicator
-  containerElement.innerHTML = '<div class="text-center"><i>Loading log file...</i></div>';
-  
-  return fetch(logFilePath)
-    .then((response) => {
-      if (!response.ok) {
-        throw new Error(`Failed to fetch the log file: ${response.status} ${response.statusText}`);
-      }
-      return response.text();
         })
-    .then((data) => {
+        .catch(error => console.error('Error loading config.json:', error));
-      // Split the log into lines
-      let lines = data.split('\n');
-      
-      // Apply max lines limit if specified
-      if (maxLines > 0 && lines.length > maxLines) {
-        lines = lines.slice(-maxLines); // Get only the last N lines
         }
 
-      // Format log content
-      const formattedLog = lines
-        .map((line) => line.trim()) // Remove extra whitespace
-        .filter((line) => line)     // Remove empty lines
-        .join('<br>');              // Join formatted lines with line breaks
-      
-      // Display the formatted log
-      containerElement.innerHTML = `<pre style="white-space: pre-wrap; word-wrap: break-word; margin: 0;">${formattedLog}</pre>`;
-      
-      // Scroll to bottom if requested
-      if (scrollToBottom) {
-        containerElement.scrollTop = containerElement.scrollHeight;
-      }
-      
-      return formattedLog; // Return the formatted log in case the caller needs it
-    })
-    .catch((error) => {
-      console.error(`Error loading log file ${logFilePath}:`, error);
-      containerElement.innerHTML = `<div class="text-danger">Error loading log file: ${error.message}</div>`;
-      throw error; // Re-throw the error for the caller to handle if needed
-    });
-}
-
-/**
- * Set up a refresh button for a log file
- * @param {string} buttonId - ID of the button element
- * @param {string} logFilePath - Path to the log file
- * @param {string} containerId - ID of the container to display the log in
- * @param {number} maxLines - Maximum number of lines to display (0 for all)
- */
- function setupLogRefreshButton(buttonId, logFilePath, containerId, maxLines = 0) {
-  console.log("Refreshing logs");
-  
-  const button = document.getElementById(buttonId);
-  const container = document.getElementById(containerId);
-  
-  if (!button || !container) {
-    console.error('Button or container element not found');
-    return;
-  }
-  
-  // Initial load
-  displayLogFile(logFilePath, container, true, maxLines);
-  
-  // Set up button click handler
-  button.addEventListener('click', () => {
-    displayLogFile(logFilePath, container, true, maxLines);
-  });
-}
 
 function clear_loopLogs(){
     console.log("Clearing loop logs");

html/saraR4.html

@@ -59,12 +59,11 @@
         </div>
 
         <span id="modem_status_message"></span>
-      <!-- 
         <h3>
           Status 
             <span id="modem-status" class="badge">Loading...</span>
           </h3>
-          -->
+          
           <div class="row mb-3">
 
             <div class="col-sm-3">
@@ -72,7 +71,7 @@
              
                 <div class="card-body">
                   <p class="card-text">General information. </p>
-                  <button class="btn btn-primary" onclick="getData_saraR4('ttyAMA2', 'ATI', 1)">Get Data</button>
+                  <button class="btn btn-primary" onclick="getData_saraR4('ttyAMA2', 'ATI', 2)">Get Data</button>
                   <div id="loading_ttyAMA2_ATI" class="spinner-border spinner-border-sm" style="display: none;" role="status"></div>
                   <div id="response_ttyAMA2_ATI"></div>
       
@@ -85,7 +84,7 @@
            
                 <div class="card-body">
                   <p class="card-text">SIM card information.</p>
-                  <button class="btn btn-primary" onclick="getData_saraR4('ttyAMA2', 'AT+CCID?', 1)">Get Data</button>
+                  <button class="btn btn-primary" onclick="getData_saraR4('ttyAMA2', 'AT+CCID?', 2)">Get Data</button>
                   <div id="loading_ttyAMA2_AT_CCID_" class="spinner-border spinner-border-sm" style="display: none;" role="status"></div>
                   <div id="response_ttyAMA2_AT_CCID_"></div>
                 </div>
@@ -110,7 +109,7 @@
               <div class="card">
                 <div class="card-body">
                   <p class="card-text">Signal strength </p>
-                  <button class="btn btn-primary" onclick="getData_saraR4('ttyAMA2', 'AT+CSQ', 1)">Get Data</button>
+                  <button class="btn btn-primary" onclick="getData_saraR4('ttyAMA2', 'AT+CSQ', 2)">Get Data</button>
                   <div id="loading_ttyAMA2_AT_CSQ" class="spinner-border spinner-border-sm" style="display: none;" role="status"></div>
                   <div id="response_ttyAMA2_AT_CSQ"></div>
                   </table>
@@ -122,7 +121,7 @@
               <div class="card">
                 <div class="card-body">
                   <p class="card-text">Modem Reset </p>
-                  <button class="btn btn-danger" onclick="getData_saraR4('ttyAMA2', 'AT+CFUN=15', 1)">Reset</button>
+                  <button class="btn btn-danger" onclick="getData_saraR4('ttyAMA2', 'AT+CFUN=15', 2)">Reset</button>
                   <div id="loading_ttyAMA2_AT_CFUN_15" class="spinner-border spinner-border-sm" style="display: none;" role="status"></div>
                   <div id="response_ttyAMA2_AT_CFUN_15"></div>
                   </table>
@@ -306,19 +305,6 @@
       
         </div>
     
-        <!-- toast -->
-
-        <div class="toast-container position-fixed bottom-0 end-0 p-3">
-          <div id="liveToast" class="toast align-items-center text-bg-primary border-1" role="alert" aria-live="assertive" aria-atomic="true">
-            <div class="d-flex">
-              <div class="toast-body">
-                Hello, world! This is a toast message.
-              </div>
-              <button type="button" class="btn-close btn-close-white me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button>
-            </div>
-          </div>
-      </div>
-
     </main>
     </div>
   </div>
@@ -331,7 +317,7 @@
 <script src="assets/js/bootstrap.bundle.js"></script>
 
 <script>
-document.addEventListener('DOMContentLoaded', function () {
+ document.addEventListener('DOMContentLoaded', function () {
     const elementsToLoad = [
         { id: 'topbar', file: 'topbar.html' },
         { id: 'sidebar', file: 'sidebar.html' },
@@ -350,8 +336,6 @@ document.addEventListener('DOMContentLoaded', function () {
             .catch(error => console.error(`Error loading ${file}:`, error));
     });
 
-  //OLD way to retreive data from JSON
-  /*
     fetch('../config.json') // Replace 'deviceID.txt' with 'config.json'
         .then(response => response.json()) // Parse response as JSON
         .then(data => {
@@ -360,89 +344,11 @@ document.addEventListener('DOMContentLoaded', function () {
           const check_modem_configMode = document.getElementById("check_modem_configMode");
           check_modem_configMode.checked = data.modem_config_mode;
           console.log("Modem configuration: " + data.modem_config_mode);
+        
         })
-  */
-
-  //NEW way to get data from SQLITE
-  $.ajax({
-    url: 'launcher.php?type=get_config_sqlite',
-    dataType:'json',
-    //dataType: 'json', // Specify that you expect a JSON response
-    method: 'GET', // Use GET or POST depending on your needs
-    success: function(response) {
-                console.log("Getting SQLite config table:");
-                console.log(response);
-                //modem_version
-                const modem_version_html = document.getElementById("modem_version");
-                modem_version_html.innerText = response.modem_version;
-
-                // Set checkbox state based on the response data
-                const check_modem_configMode = document.getElementById("check_modem_configMode");
-                if (check_modem_configMode) {
-                    check_modem_configMode.checked = response.modem_config_mode;
-                    console.log("Modem configuration: " + response.modem_config_mode);
-                } else {
-                    console.error("Checkbox element not found");
-                }
-
-            },
-            error: function(xhr, status, error) {
-                console.error('AJAX request failed:', status, error);
-            }
-    }); 
 
 });
 
-window.onload = function() {
-  getModem_busy_status();
-  setInterval(getModem_busy_status, 1000);
-
-  //NEW way to get config (SQLite)
-  $.ajax({
-    url: 'launcher.php?type=get_config_sqlite',
-    dataType:'json',
-    //dataType: 'json', // Specify that you expect a JSON response
-    method: 'GET', // Use GET or POST depending on your needs
-    success: function(response) {
-      console.log("Getting SQLite config table:");
-      console.log(response);
-      //device name_side bar
-      const elements = document.querySelectorAll('.sideBar_sensorName');
-        elements.forEach((element) => {
-            element.innerText = response.deviceName;
-        });
-              //device name html page title
-      if (response.deviceName) {
-      document.title = response.deviceName;
-    }
-  },
-  error: function(xhr, status, error) {
-      console.error('AJAX request failed:', status, error);
-  }
-    });//end AJAX
-
-
-  //get local RTC
-  $.ajax({
-      url: 'launcher.php?type=RTC_time',
-      dataType: 'text', // Specify that you expect a JSON response
-      method: 'GET', // Use GET or POST depending on your needs
-      success: function(response) {
-                  console.log("Local RTC: " + response);
-                  const RTC_Element = document.getElementById("RTC_time");
-                  RTC_Element.textContent = response;
-
-              },
-              error: function(xhr, status, error) {
-                  console.error('AJAX request failed:', status, error);
-              }
-      });
-
-
- 
-      }
-
-
 function getData_saraR4(port, command, timeout){
         console.log("Data from SaraR4");
         console.log("Port: " + port );
@@ -524,10 +430,8 @@ function getData_saraR4(port, command, timeout){
                             } else{
                               // si c'est une commande AT normale
                               // Replace newline characters with <br> tags
-                            const formattedResponse = response.replace(/\n/g, "<br>")
+                            const formattedResponse = response.replace(/\n/g, "<br>");
-                                                              .replace(/\b(OK)\b/g, '<span style="color: green; font-weight: bold;">$1</span>');;
                             $("#response_"+port+"_"+safeCommand).html(formattedResponse);
-
                             }
                         },
                         error: function(xhr, status, error) {
@@ -796,75 +700,84 @@ function getModem_busy_status() {
 }
 
 function update_modem_configMode(param, checked){
-  //change ('modem_config_mode', '0', 'bool') inside SQLITE db
-  // response type: {"success":true,"message":"Configuration updated successfully","param":"modem_config_mode","value":"0","type":"bool"}
-  const toastLiveExample = document.getElementById('liveToast')
-  const toastBody = toastLiveExample.querySelector('.toast-body');
-
   console.log("updating modem config mode to :" + checked);
   $.ajax({
-      url: 'launcher.php?type=update_config_sqlite&param='+param+'&value='+checked,
+      url: 'launcher.php?type=update_config&param='+param+'&value='+checked,
-      dataType: 'json', // Specify that you expect a JSON response
+      dataType: 'text', // Specify that you expect a JSON response
       method: 'GET', // Use GET or POST depending on your needs
       cache: false, // Prevent AJAX from caching
       success: function(response) {
-        
-                console.log("AJAX success:");
                   console.log(response);
-
-                // Format the response nicely
-                  let formattedMessage = '';
-                  
-                  if (response.success) {
-                      // Success message
-                      toastLiveExample.classList.remove('text-bg-danger');
-                      toastLiveExample.classList.add('text-bg-success');
-                      
-                      formattedMessage = `
-                        <strong>Success!</strong><br>
-                        Parameter: ${response.param || param}<br>
-                        Value: ${response.value || checked}<br>
-                        ${response.message || ''}
-                      `;
-                  } else {
-                      // Error message
-                      toastLiveExample.classList.remove('text-bg-success');
-                      toastLiveExample.classList.add('text-bg-danger');
-                      
-                      formattedMessage = `
-                        <strong>Error!</strong><br>
-                        ${response.error || 'Unknown error'}<br>
-                        Parameter: ${response.param || param}
-                      `;
-                  }
-                  
-                  // Update the toast body with formatted content
-                  toastBody.innerHTML = formattedMessage;
-                  // Show the toast
-                const toastBootstrap = bootstrap.Toast.getOrCreateInstance(toastLiveExample)
-                toastBootstrap.show()
-
-
               },
               error: function(xhr, status, error) {
                   console.error('AJAX request failed:', status, error);
-                  // Update toast with error message
-                  toastBody.textContent = 'Error: ' + error;
-                  
-                  // Set toast to danger color
-                  toastLiveExample.classList.remove('text-bg-success');
-                  toastLiveExample.classList.add('text-bg-danger');
-                  
-                  // Show the toast for errors too
-                  const toastBootstrap = bootstrap.Toast.getOrCreateInstance(toastLiveExample);
-                  toastBootstrap.show();
               }
       });
 }
 
 
 
+window.onload = function() {
+  getModem_busy_status();
+  setInterval(getModem_busy_status, 1000);
 
+    fetch('../config.json') // Replace 'deviceID.txt' with 'config.json'
+        .then(response => response.json()) // Parse response as JSON
+        .then(data => {
+            //get device ID
+            const deviceID = data.deviceID.trim().toUpperCase();
+            //document.getElementById('pageTitle_plus_ID').innerText = 'token: ' + deviceID;
+             //get device Name
+             const deviceName = data.deviceName;
+
+             //get modem version
+             const modem_version = data.modem_version;
+             const modem_version_html = document.getElementById("modem_version");
+             modem_version_html.textContent = modem_version;
+
+
+           
+           const elements = document.querySelectorAll('.sideBar_sensorName');
+           elements.forEach((element) => {
+               element.innerText = deviceName;
+           });
+
+
+            //get SARA_R4 connection status
+            const SARA_statusElement = document.getElementById("modem-status");
+            console.log("SARA R4 is: " + data.SARA_R4_network_status);
+            
+            if (data.SARA_R4_network_status === "connected") {
+              SARA_statusElement.textContent = "Connected";
+              SARA_statusElement.className = "badge text-bg-success";
+            } else if (data.SARA_R4_network_status === "disconnected") {
+              SARA_statusElement.textContent = "Disconnected";
+              SARA_statusElement.className = "badge text-bg-danger";
+            } else {
+              SARA_statusElement.textContent = "Unknown";
+              SARA_statusElement.className = "badge text-bg-secondary";
+            }
+
+            //get local RTC
+            $.ajax({
+                url: 'launcher.php?type=RTC_time',
+                dataType: 'text', // Specify that you expect a JSON response
+                method: 'GET', // Use GET or POST depending on your needs
+                success: function(response) {
+                            console.log("Local RTC: " + response);
+                            const RTC_Element = document.getElementById("RTC_time");
+                            RTC_Element.textContent = response;
+
+                        },
+                        error: function(xhr, status, error) {
+                            console.error('AJAX request failed:', status, error);
+                        }
+                });
+  
+
+        })
+        .catch(error => console.error('Error loading config.json:', error));
+      }
 </script>
 
 </body>

html/sensors.html

@@ -144,25 +144,27 @@ function getNPM_values(port){
         }
         
 function getENVEA_values(port, name){
-    console.log("Data from Envea " + name + " (port " + port + "):");
+      console.log("Data from Envea "+ name+" (port "+port+"):");
-    $("#loading_envea" + name).show();
+      $("#loading_envea"+name).show();
 
             $.ajax({
-        url: 'launcher.php?type=envea&port=' + port + '&name=' + name,
+              url: 'launcher.php?type=envea&port='+port+'&name='+name,
-        dataType: 'json',
+              dataType: 'json', // Specify that you expect a JSON response
-        method: 'GET',
+              method: 'GET', // Use GET or POST depending on your needs
               success: function(response) {
                         console.log(response);
-            const tableBody = document.getElementById("data-table-body_envea" + name);
+                        const tableBody = document.getElementById("data-table-body_envea"+name);
                         tableBody.innerHTML = "";
 
-            $("#loading_envea" + name).hide();
+                        $("#loading_envea"+name).hide();
-
+                        // Create an array of the desired keys
+                       // Create an array of the desired keys
                        const keysToShow = [name];
+                        // Add only the specified elements to the table
                         keysToShow.forEach(key => {
-                if (response !== undefined) {
+                            if (response !== undefined) { // Check if the key exists in the response
                                 const value = response;
-                    $("#data-table-body_envea" + name).append(`
+                                $("#data-table-body_envea"+name).append(`
                                     <tr>
                                         <td>${key}</td>
                                         <td>${value} ppb</td>
@@ -173,21 +175,9 @@ function getENVEA_values(port, name){
                     },
                     error: function(xhr, status, error) {
                         console.error('AJAX request failed:', status, error);
-            const tableBody = document.getElementById("data-table-body_envea" + name);
-            $("#loading_envea" + name).hide();
-
-            tableBody.innerHTML = `
-                <tr>
-                    <td colspan="2" class="text-danger">
-                        ❌ Error: unable to get data from sensor.<br>
-                        <small>${status}: ${error}</small>
-                    </td>
-                </tr>
-            `;
                     }
             });
-}
+        }
-
 
 function getNoise_values(){
       console.log("Data from I2C Noise Sensor:");
@@ -271,68 +261,92 @@ function getBME280_values(){
 
 
 window.onload = function() {
+    fetch('../config.json') // Replace 'deviceID.txt' with 'config.json'
+        .then(response => response.json()) // Parse response as JSON
+        .then(data => {
+            //get device ID
+            const deviceID = data.deviceID.trim().toUpperCase();
+            //document.getElementById('pageTitle_plus_ID').innerText = 'token: ' + deviceID;
+            //get device Name
+            const deviceName = data.deviceName;
                       
-  //NEW way to get config (SQLite)
-$.ajax({
-  url: 'launcher.php?type=get_config_sqlite',
-  dataType:'json',
-  //dataType: 'json', // Specify that you expect a JSON response
-  method: 'GET', // Use GET or POST depending on your needs
-  success: function(response) {
-    console.log("Getting SQLite config table:");
-    console.log(response);
-
-    
-    //device name_side bar
                       const elements = document.querySelectorAll('.sideBar_sensorName');
                       elements.forEach((element) => {
-          element.innerText = response.deviceName;
+                          element.innerText = deviceName;
                       });
 
-    },
-error: function(xhr, status, error) {
-    console.error('AJAX request failed:', status, error);
-}
-  });//end AJAX
 
- //getting config_scripts table
+
+            //get local RTC
             $.ajax({
-    url: 'launcher.php?type=get_config_scripts_sqlite',
+                url: 'launcher.php?type=RTC_time',
-    dataType:'json',
+                dataType: 'text', // Specify that you expect a JSON response
-    //dataType: 'json', // Specify that you expect a JSON response
                 method: 'GET', // Use GET or POST depending on your needs
                 success: function(response) {
-      console.log("Getting SQLite config scripts table:");
+                            console.log("Local RTC: " + response);
-      console.log(response);
+                            const RTC_Element = document.getElementById("RTC_time");
+                            RTC_Element.textContent = response;
+
+                        },
+                        error: function(xhr, status, error) {
+                            console.error('AJAX request failed:', status, error);
+                        }
+                });
 
             const container = document.getElementById('card-container'); // Conteneur des cartes
             
-    //creates NPM card
+            //creates NPM cards
-    if (response["NPM/get_data_modbus_v3.py"]) {
+            const NPM_ports = data.NextPM_ports; // Récupère les ports
+            NPM_ports.forEach((port, index) => {
               const cardHTML = `
                 <div class="col-sm-3">
                   <div class="card">
                     <div class="card-header">
-            Port UART
+                      Port UART ${port.replace('ttyAMA', '')}
                     </div>
                     <div class="card-body">
-            <h5 class="card-title">NextPM</h5>
+                      <h5 class="card-title">NextPM ${String.fromCharCode(65 + index)}</h5>
                       <p class="card-text">Capteur particules fines.</p>
-            <button class="btn btn-primary" onclick="getNPM_values('ttyAMA5')">Get Data</button>
+                      <button class="btn btn-primary" onclick="getNPM_values('${port}')">Get Data</button>
-            <br>
+                      <div id="loading_${port}" class="spinner-border spinner-border-sm" style="display: none;" role="status"></div>
-            <div id="loading_ttyAMA5" class="spinner-border spinner-border-sm" style="display: none;" role="status"></div>
                       <table class="table table-striped-columns">
-              <tbody id="data-table-body_ttyAMA5"></tbody>
+                        <tbody id="data-table-body_${port}"></tbody>
                       </table>
                     </div>
                   </div>
                 </div>`;
+              container.innerHTML += cardHTML; // Ajouter la carte au conteneur
+            });
 
-    container.innerHTML += cardHTML; // Add the I2C card if condition is met
+            //creates ENVEA cards
-  }
+            const ENVEA_sensors = data.envea_sondes.filter(sonde => sonde.connected); // Filter only connected sondes
+
+            ENVEA_sensors.forEach((sensor, index) => {
+                const port = sensor.port; // Port from the sensor object
+                const name = sensor.name; // Port from the sensor object
+                const coefficient = sensor.coefficient;
+              const cardHTML = `
+                <div class="col-sm-3">
+                  <div class="card">
+                    <div class="card-header">
+                      Port UART ${port.replace('ttyAMA', '')}
+                    </div>
+                    <div class="card-body">
+                      <h5 class="card-title">Sonde Envea ${name}</h5>
+                      <p class="card-text">Capteur gas.</p>
+                      <button class="btn btn-primary" onclick="getENVEA_values('${port}','${name}','${coefficient}')">Get Data</button>
+                      <div id="loading_envea${name}" class="spinner-border spinner-border-sm" style="display: none;" role="status"></div>
+                      <table class="table table-striped-columns">
+                        <tbody id="data-table-body_envea${name}"></tbody>
+                      </table>
+                    </div>
+                  </div>
+                </div>`;
+              container.innerHTML += cardHTML; // Ajouter la carte au conteneur
+            });
 
             //creates i2c BME280 card
- if (response["BME280/get_data_v2.py"]) {
+            if (data["BME280/get_data_v2.py"]) {
               const i2C_BME_HTML = `
                 <div class="col-sm-3">
                   <div class="card">
@@ -356,7 +370,7 @@ error: function(xhr, status, error) {
             }
 
              //creates i2c sound card
-    if (response.i2C_sound) {
+             if (data.i2C_sound) {
               const i2C_HTML = `
                 <div class="col-sm-3">
                   <div class="card">
@@ -381,80 +395,9 @@ error: function(xhr, status, error) {
               container.innerHTML += i2C_HTML; // Add the I2C card if condition is met
             }
 
-  //Si on a des SONDES ENVEA connectée il faut faire un deuxième call dans la table envea_sondes_table
+        })
-  //creates ENVEA cards
+        .catch(error => console.error('Error loading config.json:', error));
-  if (response["envea/read_value_v2.py"]) {
-    console.log("Need to display ENVEA sondes");
-    //getting config_scripts table
-    $.ajax({
-      url: 'launcher.php?type=get_envea_sondes_table_sqlite',
-      dataType:'json',
-      //dataType: 'json', // Specify that you expect a JSON response
-      method: 'GET', // Use GET or POST depending on your needs
-      success: function(sondes) {
-        console.log("Getting SQLite envea sondes table:");
-        console.log(sondes);
-        const ENVEA_sensors = sondes.filter(sonde => sonde.connected); // Filter only connected sondes
-
-        ENVEA_sensors.forEach((sensor, index) => {
-            const port = sensor.port; // Port from the sensor object
-            const name = sensor.name; // Port from the sensor object
-            const coefficient = sensor.coefficient;
-          const cardHTML = `
-            <div class="col-sm-3">
-              <div class="card">
-                <div class="card-header">
-                  Port UART ${port.replace('ttyAMA', '')}
-                </div>
-                <div class="card-body">
-                  <h5 class="card-title">Sonde Envea ${name}</h5>
-                  <p class="card-text">Capteur gas.</p>
-                  <button class="btn btn-primary" onclick="getENVEA_values('${port}','${name}')">Get Data</button>
-                  <div id="loading_envea${name}" class="spinner-border spinner-border-sm" style="display: none;" role="status"></div>
-                  <table class="table table-striped-columns">
-                    <tbody id="data-table-body_envea${name}"></tbody>
-                  </table>
-                </div>
-              </div>
-            </div>`;
-          container.innerHTML += cardHTML; // Ajouter la carte au conteneur
-        });
-                
-
-
-    },
-    error: function(xhr, status, error) {
-        console.error('AJAX request failed:', status, error);
       }
-      });//end AJAX envea Sondes
-
-
-  }//end if
-  
-
-},
-  error: function(xhr, status, error) {
-      console.error('AJAX request failed:', status, error);
-  }
-    });//end AJAX (config_scripts)
-
-    //get local RTC
-    $.ajax({
-      url: 'launcher.php?type=RTC_time',
-      dataType: 'text', // Specify that you expect a JSON response
-      method: 'GET', // Use GET or POST depending on your needs
-      success: function(response) {
-                  console.log("Local RTC: " + response);
-                  const RTC_Element = document.getElementById("RTC_time");
-                  RTC_Element.textContent = response;
-
-              },
-              error: function(xhr, status, error) {
-                  console.error('AJAX request failed:', status, error);
-              }
-      });
-
-} //end windows onload
 </script>
 
 </body>

html/sidebar.html

@@ -47,6 +47,12 @@
         </svg>
         Carte
       </a>
+      <a class="nav-link text-white" href="config.html">
+        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-gear-fill" viewBox="0 0 16 16">
+          <path d="M9.405 1.05c-.413-1.4-2.397-1.4-2.81 0l-.1.34a1.464 1.464 0 0 1-2.105.872l-.31-.17c-1.283-.698-2.686.705-1.987 1.987l.169.311c.446.82.023 1.841-.872 2.105l-.34.1c-1.4.413-1.4 2.397 0 2.81l.34.1a1.464 1.464 0 0 1 .872 2.105l-.17.31c-.698 1.283.705 2.686 1.987 1.987l.311-.169a1.464 1.464 0 0 1 2.105.872l.1.34c.413 1.4 2.397 1.4 2.81 0l.1-.34a1.464 1.464 0 0 1 2.105-.872l.31.17c1.283.698 2.686-.705 1.987-1.987l-.169-.311a1.464 1.464 0 0 1 .872-2.105l.34-.1c1.4-.413 1.4-2.397 0-2.81l-.34-.1a1.464 1.464 0 0 1-.872-2.105l.17-.31c.698-1.283-.705-2.686-1.987-1.987l-.311.169a1.464 1.464 0 0 1-2.105-.872l-.1-.34zM8 10.93a2.929 2.929 0 1 1 0-5.86 2.929 2.929 0 0 1 0 5.858z"/>
+        </svg>
+        Config
+      </a>
       <a class="nav-link text-white" href="terminal.html">
         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-terminal-fill" viewBox="0 0 16 16">
           <path d="M0 3a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V3zm9.5 5.5h-3a.5.5 0 0 0 0 1h3a.5.5 0 0 0 0-1zm-6.354-.354a.5.5 0 1 0 .708.708l2-2a.5.5 0 0 0 0-.708l-2-2a.5.5 0 1 0-.708.708L4.793 6.5 3.146 8.146z"/>

html/terminal.html

@@ -141,8 +141,8 @@
               <div class="card-body p-0">
                 <div class="command-container" id="commandContainer">
                   <div id="terminal">Welcome to NebuleAir Terminal Console
-                    Type your commands below. Type 'help' for a list of commands.
+Type your commands below. Type 'help' for a list of commands.
-                    </div>
+</div>
                   <input type="text" id="cmdLine" placeholder="Enter command..." disabled>
                 </div>
                 <div id="errorMsg" class="alert alert-danger m-3" style="display:none;"></div>
@@ -200,34 +200,8 @@
       initializeElements();
     });
 
-    window.onload = function() {
-
-        //NEW way to get config (SQLite)
-        $.ajax({
-        url: 'launcher.php?type=get_config_sqlite',
-        dataType:'json',
-        //dataType: 'json', // Specify that you expect a JSON response
-        method: 'GET', // Use GET or POST depending on your needs
-        success: function(response) {
-        console.log("Getting SQLite config table:");
-        console.log(response);
-
-        
-        //device name_side bar
-        const elements = document.querySelectorAll('.sideBar_sensorName');
-            elements.forEach((element) => {
-                element.innerText = response.deviceName;
-            });
-
-        },
-        error: function(xhr, status, error) {
-        console.error('AJAX request failed:', status, error);
-        }
-        });//end AJAX
-    }
-
     // Add admin password (should be changed to something more secure)
-    const ADMIN_PASSWORD = "123plouf";
+    const ADMIN_PASSWORD = "nebuleair123";
 
     // Global variables
     let terminal;
@@ -364,6 +338,23 @@
         return;
       }
 
+      if (command === 'help') {
+        terminal.innerHTML += `
+Available commands:
+  help             - Show this help message
+  clear            - Clear the terminal
+  ls [options]     - List directory contents
+  df -h            - Show disk usage
+  free -h          - Show memory usage
+  cat [file]       - Display file contents
+  systemctl        - Control system services
+  ifconfig         - Show network configuration
+  reboot           - Reboot the system (use with caution)
+  
+  [Any other Linux command]\n`;
+        terminal.scrollTop = terminal.scrollHeight;
+        return;
+      }
 
       // Filter dangerous commands
       const dangerousCommands = [
@@ -384,16 +375,13 @@
 
       // Execute the command via AJAX
       $.ajax({
-        url: 'launcher.php?type=execute_command',
+        url: 'launcher.php',
         method: 'POST',
-        dataType:'json',
         data: {
           type: 'execute_command',
           command: command
         },
         success: function(response) {
-            console.log(response);
-            
           if (response.success) {
             // Add command output to terminal
             terminal.innerHTML += `<span style="color: #00ff00;">${response.output}</span>\n`;

html/wifi.html

@@ -302,11 +302,6 @@ function get_internet(){
                element.innerText = deviceName;
            });
 
-                 //device name html page title
-      if (response.deviceName) {
-      document.title = response.deviceName;
-    }
-
 
             //get wifi connection status
             const WIFI_statusElement = document.getElementById("wifi-status");

installation_part1.sh

@@ -23,27 +23,40 @@ fi
 
 # Update and install necessary packages
 info "Updating package list and installing necessary packages..."
-sudo apt update && sudo apt install -y git gh apache2 sqlite3 php php-sqlite3 python3 python3-pip jq autossh i2c-tools python3-smbus || error "Failed to install required packages."
+sudo apt update && sudo apt install -y git gh apache2 php php-sqlite3 python3 python3-pip jq autossh i2c-tools python3-smbus || error "Failed to install required packages."
 
 # Install Python libraries
 info "Installing Python libraries..."
-sudo pip3 install pyserial requests RPi.GPIO adafruit-circuitpython-bme280 crcmod psutil gpiozero ntplib pytz --break-system-packages || error "Failed to install Python libraries."
+sudo pip3 install pyserial requests RPi.GPIO adafruit-circuitpython-bme280 crcmod psutil ntplib pytz --break-system-packages || error "Failed to install Python libraries."
+
+# Ask user if they want to set up SSH keys
+read -p "Do you want to set up an SSH key for /var/www? (y/n): " answer
+answer=${answer,,}  # Convert to lowercase
+
+if [[ "$answer" == "y" ]]; then
+    info "Setting up SSH keys..."
+    
+    sudo mkdir -p /var/www/.ssh
+    sudo chmod 700 /var/www/.ssh
+    
+    if [[ ! -f /var/www/.ssh/id_rsa ]]; then
+        sudo ssh-keygen -t rsa -b 4096 -f /var/www/.ssh/id_rsa -N ""
+        success "SSH key generated successfully."
+    else
+        warning "SSH key already exists. Skipping key generation."
+    fi
+    
+    sudo ssh-copy-id -i /var/www/.ssh/id_rsa.pub -p 50221 airlab_server1@aircarto.fr || warning "Failed to copy SSH key. Please check the server connection."
+
+    success "SSH setup complete!"
+else
+    warning "Skipping SSH key setup."
+fi
 
 # Clone the repository (check if it exists first)
 REPO_DIR="/var/www/nebuleair_pro_4g"
 if [[ -d "$REPO_DIR" ]]; then
-    warning "Repository already exists. Will update instead of clone."
+    warning "Repository already exists. Skipping clone."
-    # Save current directory
-    local current_dir=$(pwd)
-    # Navigate to repository directory
-    cd "$REPO_DIR"
-    # Stash any local changes
-    sudo git stash || warning "Failed to stash local changes"
-    # Pull latest changes
-    sudo git pull || error "Failed to pull latest changes"
-    # Return to original directory
-    cd "$current_dir"
-    success "Repository updated successfully!"
 else
     info "Cloning the NebuleAir Pro 4G repository..."
     sudo git clone http://gitea.aircarto.fr/PaulVua/nebuleair_pro_4g.git "$REPO_DIR" || error "Failed to clone repository."
@@ -53,6 +66,7 @@ fi
 info "Setting up repository files and permissions..."
 sudo mkdir -p "$REPO_DIR/logs"
 sudo touch "$REPO_DIR/logs/app.log" "$REPO_DIR/logs/master.log" "$REPO_DIR/logs/master_errors.log" "$REPO_DIR/wifi_list.csv"
+sudo cp "$REPO_DIR/config.json.dist" "$REPO_DIR/config.json"
 sudo chmod -R 755 "$REPO_DIR/"
 sudo chown -R www-data:www-data "$REPO_DIR/"
 sudo git config --global core.fileMode false
@@ -77,15 +91,6 @@ else
     warning "Database creation script not found."
 fi
 
-# Set config
-info "Set config..."
-if [[ -f "$REPO_DIR/sqlite/set_config.py" ]]; then
-    sudo /usr/bin/python3 "$REPO_DIR/sqlite/set_config.py" || error "Failed to set config."
-    success "Databases created successfully."
-else
-    warning "Database creation script not found."
-fi
-
 # Configure Apache
 info "Configuring Apache..."
 APACHE_CONF="/etc/apache2/sites-available/000-default.conf"
@@ -100,7 +105,7 @@ fi
 # Add sudo authorization (prevent duplicate entries)
 info "Setting up sudo authorization..."
 if ! sudo grep -q "/usr/bin/nmcli" /etc/sudoers; then
-    echo -e "ALL ALL=(ALL) NOPASSWD: /usr/bin/nmcli, /usr/sbin/reboot\nwww-data ALL=(ALL) NOPASSWD: /usr/bin/git pull\nwww-data ALL=(ALL) NOPASSWD: /usr/bin/ssh\nwww-data ALL=(ALL) NOPASSWD: /usr/bin/python3 * www-data ALL=(ALL) NOPASSWD: /bin/systemctl * www-data ALL=(ALL) NOPASSWD: /var/www/nebuleair_pro_4g/*" | sudo tee -a /etc/sudoers > /dev/null
+    echo -e "ALL ALL=(ALL) NOPASSWD: /usr/bin/nmcli, /usr/sbin/reboot\nwww-data ALL=(ALL) NOPASSWD: /usr/bin/git pull\nwww-data ALL=(ALL) NOPASSWD: /usr/bin/ssh\nwww-data ALL=(ALL) NOPASSWD: /usr/bin/python3 *" | sudo tee -a /etc/sudoers > /dev/null
     success "Sudo authorization added."
 else
     warning "Sudo authorization already set. Skipping."
@@ -128,6 +133,7 @@ success "I2C ports enabled."
 info "Creates sqlites databases..."
 /usr/bin/python3 /var/www/nebuleair_pro_4g/sqlite/create_db.py
 
+
 # Completion message
 success "Setup completed successfully!"
 info "System will reboot in 5 seconds..."

installation_part2.sh

@@ -22,21 +22,11 @@ error() { echo -e "${RED}[ERROR]${NC} $1"; exit 1; }
 if [[ "$EUID" -ne 0 ]]; then
     error "This script must be run as root. Use 'sudo ./installation.sh'"
 fi
-REPO_DIR="/var/www/nebuleair_pro_4g"
+
 #set up the RTC
 info "Set up the RTC"
 /usr/bin/python3 /var/www/nebuleair_pro_4g/RTC/set_with_NTP.py
 
-#Wake up SARA
-info "Wake Up SARA"
-pinctrl set 16 op
-pinctrl set 16 dh
-sleep 5
-
-#Check SARA connection
-info "Check SARA connection"
-/usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/sara.py ttyAMA2 ATI 2
-
 #set up SARA R4 APN
 info "Set up Monogoto APN"
 /usr/bin/python3 /var/www/nebuleair_pro_4g/SARA/sara_setAPN.py ttyAMA2 data.mono 2
@@ -49,45 +39,29 @@ info "Activate blue LED"
 info "Connect SARA R4 to network"
 python3 /var/www/nebuleair_pro_4g/SARA/sara_connectNetwork.py ttyAMA2 20810 60
 
-#Need to create the two service
+#Add master_nebuleair.service
-# 1. start the scripts to set-up the services
+SERVICE_FILE="/etc/systemd/system/master_nebuleair.service"
-# 2. rtc_save_to_db
+info "Setting up systemd service for master_nebuleair..."
-
-#1. set-up the services (SARA, NPM, BME280, etc)
-info "Setting up systemd services..."
-    
-if [[ -f "$REPO_DIR/services/setup_services.sh" ]]; then
-    sudo chmod +x "$REPO_DIR/services/setup_services.sh"
-    sudo "$REPO_DIR/services/setup_services.sh" || warning "Failed to set up systemd services"
-    success "Systemd services set up successfully."
-else
-    warning "Systemd services setup script not found."
-fi
-
-#2. Add rtc_save_to_db.service
-SERVICE_FILE_2="/etc/systemd/system/rtc_save_to_db.service"
-info "Setting up systemd service for rtc_save_to_db..."
 
 # Create the systemd service file (overwrite if necessary)
-sudo bash -c "cat > $SERVICE_FILE_2" <<EOF
+sudo bash -c "cat > $SERVICE_FILE" <<EOF
 [Unit]
-Description=RTC Save to DB Script
+Description=Master manager for the Python loop scripts
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/RTC/save_to_db.py
+ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/master.py
 Restart=always
-RestartSec=1
 User=root
 WorkingDirectory=/var/www/nebuleair_pro_4g
-StandardOutput=append:/var/www/nebuleair_pro_4g/logs/rtc_save_to_db.log
+StandardOutput=append:/var/www/nebuleair_pro_4g/logs/master.log
-StandardError=append:/var/www/nebuleair_pro_4g/logs/rtc_save_to_db_errors.log
+StandardError=append:/var/www/nebuleair_pro_4g/logs/master_errors.log
 
 [Install]
 WantedBy=multi-user.target
 EOF
 
-success "Systemd service file created: $SERVICE_FILE_2"
+success "Systemd service file created: $SERVICE_FILE"
 
 # Reload systemd to recognize the new service
 info "Reloading systemd daemon..."
@@ -95,8 +69,8 @@ sudo systemctl daemon-reload
 
 # Enable the service to start on boot
 info "Enabling the service to start on boot..."
-sudo systemctl enable rtc_save_to_db.service
+sudo systemctl enable master_nebuleair.service
 
 # Start the service immediately
 info "Starting the service..."
-sudo systemctl start rtc_save_to_db.service
+sudo systemctl start master_nebuleair.service

master.py

@@ -0,0 +1,100 @@
+'''
+  __  __           _            
+ |  \/  | __ _ ___| |_ ___ _ __ 
+ | |\/| |/ _` / __| __/ _ \ '__|
+ | |  | | (_| \__ \ ||  __/ |   
+ |_|  |_|\__,_|___/\__\___|_|   
+                                
+Master Python script that will trigger other scripts at every chosen time pace
+This script is triggered as a systemd service used as an alternative to cronjobs
+
+Attention: 
+    to do -> prevent SARA R4 Script to run again if it's taking more than 60 secs to finish (using a lock file ??) 
+
+First time: need to create the service file
+
+--> sudo nano /etc/systemd/system/master_nebuleair.service
+
+⬇️
+[Unit]
+Description=Master manager for the Python loop scripts
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/master.py
+Restart=always
+User=root
+WorkingDirectory=/var/www/nebuleair_pro_4g
+StandardOutput=append:/var/www/nebuleair_pro_4g/logs/master.log
+StandardError=append:/var/www/nebuleair_pro_4g/logs/master_errors.log
+
+[Install]
+WantedBy=multi-user.target
+⬆️
+
+Reload systemd (first time after creating the service):
+    sudo systemctl daemon-reload
+
+Enable (once), start (once and after stopping) and restart (after modification)systemd:
+    sudo systemctl enable master_nebuleair.service
+    sudo systemctl start master_nebuleair.service
+    sudo systemctl restart master_nebuleair.service
+
+Check the service status:
+    sudo systemctl status master_nebuleair.service
+
+
+Specific scripts can be disabled with config.json
+    Exemple: stop gathering data from NPM
+    Exemple: stop sending data with SARA R4
+
+'''
+import time
+import threading
+import subprocess
+import json
+import os
+
+# Base directory where scripts are stored
+SCRIPT_DIR = "/var/www/nebuleair_pro_4g/"
+CONFIG_FILE = "/var/www/nebuleair_pro_4g/config.json"
+
+def load_config():
+    """Load the configuration file to determine which scripts to run."""
+    with open(CONFIG_FILE, "r") as f:
+        return json.load(f)
+
+def run_script(script_name, interval, delay=0):
+    """Run a script in a synchronized loop with an optional start delay."""
+    script_path = os.path.join(SCRIPT_DIR, script_name)  # Build full path
+    next_run = time.monotonic() + delay  # Apply the initial delay
+
+    while True:
+        config = load_config()
+        if config.get(script_name, True):  # Default to True if not found
+            subprocess.run(["python3", script_path])
+        
+        # Wait until the next exact interval
+        next_run += interval
+        sleep_time = max(0, next_run - time.monotonic())  # Prevent negative sleep times
+        time.sleep(sleep_time)
+
+# Define scripts and their execution intervals (seconds)
+SCRIPTS = [
+    #("RTC/save_to_db.py", 1, 0),                # SAVE RTC time every 1 second, no delay
+    ("NPM/get_data_modbus_v3.py", 10, 0),       # Get NPM data (modbus 5 channels) every 10s, with 2s delay
+    ("envea/read_value_v2.py", 10, 0),          # Get NPM data (modbus 5 channels) every 10s, with 2s delay
+    ("loop/SARA_send_data_v2.py", 60, 1),       # Send data every 60 seconds, with 2s delay
+    ("BME280/get_data_v2.py", 120, 0),          # Get BME280 data every 120 seconds, no delay
+    ("sqlite/flush_old_data.py", 86400, 0)        # flush old data inside db every day ()
+]
+
+# Start threads for enabled scripts
+for script_name, interval, delay in SCRIPTS:
+    thread = threading.Thread(target=run_script, args=(script_name, interval, delay), daemon=True)
+    thread.start()
+
+# Keep the main script running
+while True:
+    time.sleep(1)
+

old/master.py

@@ -1,166 +0,0 @@
-'''
-  __  __           _            
- |  \/  | __ _ ___| |_ ___ _ __ 
- | |\/| |/ _` / __| __/ _ \ '__|
- | |  | | (_| \__ \ ||  __/ |   
- |_|  |_|\__,_|___/\__\___|_|   
-                                
-Master Python script that will trigger other scripts at every chosen time pace
-This script is triggered as a systemd service used as an alternative to cronjobs
-
-Attention: 
-    to do -> prevent SARA R4 Script to run again if it's taking more than 60 secs to finish (using a lock file ??) 
-
-First time: need to create the service file
-
---> sudo nano /etc/systemd/system/master_nebuleair.service
-
-⬇️
-[Unit]
-Description=Master manager for the Python loop scripts
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/master.py
-Restart=always
-User=root
-WorkingDirectory=/var/www/nebuleair_pro_4g
-StandardOutput=append:/var/www/nebuleair_pro_4g/logs/master.log
-StandardError=append:/var/www/nebuleair_pro_4g/logs/master_errors.log
-
-[Install]
-WantedBy=multi-user.target
-⬆️
-
-Reload systemd (first time after creating the service):
-    sudo systemctl daemon-reload
-
-Enable (once), start (once and after stopping) and restart (after modification)systemd:
-    sudo systemctl enable master_nebuleair.service
-    sudo systemctl start master_nebuleair.service
-    sudo systemctl restart master_nebuleair.service
-
-Check the service status:
-    sudo systemctl status master_nebuleair.service
-
-
-Specific scripts can be disabled with config.json
-    Exemple: stop gathering data from NPM
-    Exemple: stop sending data with SARA R4
-
-'''
-import time
-import threading
-import subprocess
-import os
-import sqlite3
-
-
-# Base directory where scripts are stored
-SCRIPT_DIR = "/var/www/nebuleair_pro_4g/"
-DB_PATH = "/var/www/nebuleair_pro_4g/sqlite/sensors.db"
-
-# Lock file path for SARA script
-SARA_LOCK_FILE = "/var/www/nebuleair_pro_4g/sara_script.lock"
-
-
-def is_script_enabled(script_name):
-    """Check if a script is enabled in the database."""
-    try:
-        conn = sqlite3.connect(DB_PATH)
-        cursor = conn.cursor()
-        
-        cursor.execute(
-            "SELECT enabled FROM config_scripts_table WHERE script_path = ?",
-            (script_name,)
-        )
-        
-        result = cursor.fetchone()
-        conn.close()
-        
-        if result is None:
-            return True  # Default to enabled if not found in database
-        
-        return bool(result[0])
-    except Exception:
-        # If any database error occurs, default to enabled
-        return True
-
-
-def create_lock_file():
-    """Create a lock file for the SARA script."""
-    with open(SARA_LOCK_FILE, 'w') as f:
-        f.write(str(int(time.time())))
-
-
-def remove_lock_file():
-    """Remove the SARA script lock file."""
-    if os.path.exists(SARA_LOCK_FILE):
-        os.remove(SARA_LOCK_FILE)
-
-
-def is_script_locked():
-    """Check if the SARA script is currently locked."""
-    if not os.path.exists(SARA_LOCK_FILE):
-        return False
-    
-    # Check if lock is older than 60 seconds (stale)
-    with open(SARA_LOCK_FILE, 'r') as f:
-        try:
-            lock_time = int(f.read().strip())
-            if time.time() - lock_time > 60:
-                # Lock is stale, remove it
-                remove_lock_file()
-                return False
-        except ValueError:
-            # Invalid lock file content
-            remove_lock_file()
-            return False
-    
-    return True
-
-
-def run_script(script_name, interval, delay=0):
-    """Run a script in a synchronized loop with an optional start delay."""
-    script_path = os.path.join(SCRIPT_DIR, script_name)  # Build full path
-    next_run = time.monotonic() + delay  # Apply the initial delay
-
-    while True:
-        if is_script_enabled(script_name):
-            # Special handling for SARA script to prevent concurrent runs
-            if script_name == "loop/SARA_send_data_v2.py":
-                if not is_script_locked():
-                    create_lock_file()
-                    try:
-                        subprocess.run(["python3", script_path], timeout=200)
-                    finally:
-                        remove_lock_file()
-            else:
-                # Run other scripts normally
-                subprocess.run(["python3", script_path])
-        
-        # Wait until the next exact interval
-        next_run += interval
-        sleep_time = max(0, next_run - time.monotonic())  # Prevent negative sleep times
-        time.sleep(sleep_time)
-
-
-# Define scripts and their execution intervals (seconds)
-SCRIPTS = [
-    # Format: (script_name, interval_in_seconds, start_delay_in_seconds)
-    ("NPM/get_data_modbus_v3.py", 10, 0),       # Get NPM data (modbus 5 channels) every 10s
-    ("envea/read_value_v2.py", 10, 0),          # Get Envea data every 10s
-    ("loop/SARA_send_data_v2.py", 60, 1),       # Send data every 60 seconds, with 1s delay
-    ("BME280/get_data_v2.py", 120, 0),          # Get BME280 data every 120 seconds
-    ("MPPT/read.py", 120, 0),                   # Get MPPT data every 120 seconds
-    ("sqlite/flush_old_data.py", 86400, 0)      # Flush old data inside db every day
-]
-
-# Start threads for scripts
-for script_name, interval, delay in SCRIPTS:
-    thread = threading.Thread(target=run_script, args=(script_name, interval, delay), daemon=True)
-    thread.start()
-
-# Keep the main script running
-while True:
-    time.sleep(1)

services/README.md

@@ -1,18 +0,0 @@
-# NebuleAir Pro Services
-
-Les scripts importants tournent à l'aide d'un service et d'un timer associé.
-
-Pour les installer:
-
-sudo chmod +x /var/www/nebuleair_pro_4g/services/setup_services.sh
-sudo /var/www/nebuleair_pro_4g/services/setup_services.sh
-
-Supprimer l'ancien master:
-sudo systemctl stop master_nebuleair.service
-sudo systemctl disable master_nebuleair.service
-
-# Check les services
-
-SARA: 
-sudo systemctl status nebuleair-sara-data.service
-

services/check_services.sh

@@ -1,39 +0,0 @@
-#!/bin/bash
-# File: /var/www/nebuleair_pro_4g/services/check_services.sh
-# Purpose: Check status of all NebuleAir services and logs
-# Install:
-#  sudo chmod +x /var/www/nebuleair_pro_4g/services/check_services.sh
-#   sudo /var/www/nebuleair_pro_4g/services/check_services.sh
-
-echo "=== NebuleAir Services Status ==="
-echo ""
-
-# Check status of all timers
-echo "--- TIMER STATUS ---"
-systemctl list-timers | grep nebuleair
-echo ""
-
-# Check status of all services
-echo "--- SERVICE STATUS ---"
-for service in npm envea sara bme280 mppt db-cleanup; do
-    status=$(systemctl is-active nebuleair-$service-data.service)
-    timer_status=$(systemctl is-active nebuleair-$service-data.timer)
-    
-    echo "nebuleair-$service-data: Service=$status, Timer=$timer_status"
-done
-echo ""
-
-# Show recent logs for each service
-echo "--- RECENT LOGS (last 5 entries per service) ---"
-for service in npm envea sara bme280 mppt db-cleanup; do
-    echo "[$service service logs]"
-    journalctl -u nebuleair-$service-data.service -n 5 --no-pager
-    echo ""
-done
-
-echo "=== End of Report ==="
-echo ""
-echo "For detailed logs use:"
-echo "  sudo journalctl -u nebuleair-[service]-data.service -f"
-echo "To restart a specific service timer:"
-echo "  sudo systemctl restart nebuleair-[service]-data.timer"

services/setup_services.sh

@@ -1,228 +0,0 @@
-#!/bin/bash
-# File: /var/www/nebuleair_pro_4g/services/setup_services.sh
-# Purpose: Set up all systemd services for NebuleAir data collection
-# to install: 
-#   sudo chmod +x /var/www/nebuleair_pro_4g/services/setup_services.sh
-#   sudo /var/www/nebuleair_pro_4g/services/setup_services.sh
-
-echo "Setting up NebuleAir systemd services and timers..."
-
-# Create directory for logs if it doesn't exist
-mkdir -p /var/www/nebuleair_pro_4g/logs
-
-# Create service and timer files for NPM Data
-cat > /etc/systemd/system/nebuleair-npm-data.service << 'EOL'
-[Unit]
-Description=NebuleAir NPM Data Collection Service
-After=network.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/NPM/get_data_modbus_v3.py
-User=root
-WorkingDirectory=/var/www/nebuleair_pro_4g
-StandardOutput=append:/var/www/nebuleair_pro_4g/logs/npm_service.log
-StandardError=append:/var/www/nebuleair_pro_4g/logs/npm_service_errors.log
-
-[Install]
-WantedBy=multi-user.target
-EOL
-
-cat > /etc/systemd/system/nebuleair-npm-data.timer << 'EOL'
-[Unit]
-Description=Run NebuleAir NPM Data Collection every 10 seconds
-Requires=nebuleair-npm-data.service
-
-[Timer]
-OnBootSec=10s
-OnUnitActiveSec=10s
-AccuracySec=1s
-
-[Install]
-WantedBy=timers.target
-EOL
-
-# Create service and timer files for Envea Data
-cat > /etc/systemd/system/nebuleair-envea-data.service << 'EOL'
-[Unit]
-Description=NebuleAir Envea Data Collection Service
-After=network.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/envea/read_value_v2.py
-User=root
-WorkingDirectory=/var/www/nebuleair_pro_4g
-StandardOutput=append:/var/www/nebuleair_pro_4g/logs/envea_service.log
-StandardError=append:/var/www/nebuleair_pro_4g/logs/envea_service_errors.log
-
-[Install]
-WantedBy=multi-user.target
-EOL
-
-cat > /etc/systemd/system/nebuleair-envea-data.timer << 'EOL'
-[Unit]
-Description=Run NebuleAir Envea Data Collection every 10 seconds
-Requires=nebuleair-envea-data.service
-
-[Timer]
-OnBootSec=10s
-OnUnitActiveSec=10s
-AccuracySec=1s
-
-[Install]
-WantedBy=timers.target
-EOL
-
-# Create service and timer files for SARA Data (No Lock File Needed)
-cat > /etc/systemd/system/nebuleair-sara-data.service << 'EOL'
-[Unit]
-Description=NebuleAir SARA Data Transmission Service
-After=network.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/loop/SARA_send_data_v2.py
-User=root
-WorkingDirectory=/var/www/nebuleair_pro_4g
-StandardOutput=append:/var/www/nebuleair_pro_4g/logs/sara_service.log
-StandardError=append:/var/www/nebuleair_pro_4g/logs/sara_service_errors.log
-RuntimeMaxSec=200s
-
-[Install]
-WantedBy=multi-user.target
-EOL
-
-cat > /etc/systemd/system/nebuleair-sara-data.timer << 'EOL'
-[Unit]
-Description=Run NebuleAir SARA Data Transmission every 60 seconds
-Requires=nebuleair-sara-data.service
-
-[Timer]
-OnBootSec=60s
-OnUnitActiveSec=60s
-AccuracySec=1s
-# This is the key setting that prevents overlap
-Persistent=true
-
-[Install]
-WantedBy=timers.target
-EOL
-
-# Create service and timer files for BME280 Data
-cat > /etc/systemd/system/nebuleair-bme280-data.service << 'EOL'
-[Unit]
-Description=NebuleAir BME280 Data Collection Service
-After=network.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/BME280/get_data_v2.py
-User=root
-WorkingDirectory=/var/www/nebuleair_pro_4g
-StandardOutput=append:/var/www/nebuleair_pro_4g/logs/bme280_service.log
-StandardError=append:/var/www/nebuleair_pro_4g/logs/bme280_service_errors.log
-
-[Install]
-WantedBy=multi-user.target
-EOL
-
-cat > /etc/systemd/system/nebuleair-bme280-data.timer << 'EOL'
-[Unit]
-Description=Run NebuleAir BME280 Data Collection every 120 seconds
-Requires=nebuleair-bme280-data.service
-
-[Timer]
-OnBootSec=120s
-OnUnitActiveSec=120s
-AccuracySec=1s
-
-[Install]
-WantedBy=timers.target
-EOL
-
-# Create service and timer files for MPPT Data
-cat > /etc/systemd/system/nebuleair-mppt-data.service << 'EOL'
-[Unit]
-Description=NebuleAir MPPT Data Collection Service
-After=network.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/MPPT/read.py
-User=root
-WorkingDirectory=/var/www/nebuleair_pro_4g
-StandardOutput=append:/var/www/nebuleair_pro_4g/logs/mppt_service.log
-StandardError=append:/var/www/nebuleair_pro_4g/logs/mppt_service_errors.log
-
-[Install]
-WantedBy=multi-user.target
-EOL
-
-cat > /etc/systemd/system/nebuleair-mppt-data.timer << 'EOL'
-[Unit]
-Description=Run NebuleAir MPPT Data Collection every 120 seconds
-Requires=nebuleair-mppt-data.service
-
-[Timer]
-OnBootSec=120s
-OnUnitActiveSec=120s
-AccuracySec=1s
-
-[Install]
-WantedBy=timers.target
-EOL
-
-# Create service and timer files for Database Cleanup
-cat > /etc/systemd/system/nebuleair-db-cleanup-data.service << 'EOL'
-[Unit]
-Description=NebuleAir Database Cleanup Service
-After=network.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/sqlite/flush_old_data.py
-User=root
-WorkingDirectory=/var/www/nebuleair_pro_4g
-StandardOutput=append:/var/www/nebuleair_pro_4g/logs/db_cleanup_service.log
-StandardError=append:/var/www/nebuleair_pro_4g/logs/db_cleanup_service_errors.log
-
-[Install]
-WantedBy=multi-user.target
-EOL
-
-cat > /etc/systemd/system/nebuleair-db-cleanup-data.timer << 'EOL'
-[Unit]
-Description=Run NebuleAir Database Cleanup daily
-Requires=nebuleair-db-cleanup-data.service
-
-[Timer]
-OnBootSec=1h
-OnUnitActiveSec=24h
-AccuracySec=1h
-
-[Install]
-WantedBy=timers.target
-EOL
-
-# Reload systemd to recognize new services
-systemctl daemon-reload
-
-# Enable and start all timers
-echo "Enabling and starting all services..."
-for service in npm envea sara bme280 mppt db-cleanup; do
-    systemctl enable nebuleair-$service-data.timer
-    systemctl start nebuleair-$service-data.timer
-    echo "Started nebuleair-$service-data timer"
-done
-
-echo "Checking status of all timers..."
-systemctl list-timers | grep nebuleair
-
-echo "Setup complete. All NebuleAir services are now running."
-echo "To check the status of a specific service:"
-echo "  sudo systemctl status nebuleair-npm-data.service"
-echo "To view logs for a specific service:"
-echo "  sudo journalctl -u nebuleair-npm-data.service"
-echo "To restart a specific timer:"
-echo "  sudo systemctl restart nebuleair-npm-data.timer"

sqlite/create_db.py

@@ -18,26 +18,6 @@ import sqlite3
 conn = sqlite3.connect("/var/www/nebuleair_pro_4g/sqlite/sensors.db")
 cursor = conn.cursor()
 
-#create a config table
-cursor.execute("""
-CREATE TABLE IF NOT EXISTS config_table  (
-    key TEXT PRIMARY KEY,
-    value TEXT NOT NULL,
-    type TEXT NOT NULL
-)
-""")
-
-#creates a config table for envea sondes
-cursor.execute("""
-CREATE TABLE IF NOT EXISTS envea_sondes_table   (
-     id INTEGER PRIMARY KEY AUTOINCREMENT,
-    connected INTEGER NOT NULL,
-    port TEXT NOT NULL,
-    name TEXT NOT NULL,
-    coefficient REAL NOT NULL
-)
-""")
-
 # Create a table timer
 cursor.execute("""
 CREATE TABLE IF NOT EXISTS timestamp_table  (
@@ -50,14 +30,7 @@ cursor.execute("""
     VALUES (1, CURRENT_TIMESTAMP);
 """)
 
-#create a modem status table
+
-cursor.execute("""
-CREATE TABLE IF NOT EXISTS modem_status (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    timestamp TEXT,
-    status TEXT
-)
-""")
 
 # Create a table NPM
 cursor.execute("""
@@ -105,26 +78,6 @@ CREATE TABLE IF NOT EXISTS data_NPM_5channels (
 )
 """)
 
-# Create a table WIND
-cursor.execute("""
-CREATE TABLE IF NOT EXISTS data_WIND (
-    timestamp TEXT,
-    wind_speed REAL,
-    wind_direction REAL
-)
-""")
-
-# Create a table MPPT
-cursor.execute("""
-CREATE TABLE IF NOT EXISTS data_MPPT (
-    timestamp TEXT,
-    battery_voltage REAL,
-    battery_current REAL,
-    solar_voltage REAL,
-    solar_power REAL,
-    charger_status INTEGER
-)
-""")
 
 
 # Commit and close the connection

sqlite/flush_old_data.py

@@ -45,7 +45,7 @@ if row:
     print(f"[INFO] Deleting records older than: {cutoff_date_str}")
 
     # List of tables to delete old data from
-    tables_to_clean = ["data_NPM", "data_NPM_5channels", "data_BME280", "data_envea","data_WIND", "data_MPPT"]
+    tables_to_clean = ["data_NPM", "data_NPM_5channels", "data_BME280", "data_envea"]
 
     # Loop through each table and delete old data
     for table in tables_to_clean:

sqlite/read.py

@@ -14,8 +14,6 @@ data_NPM_5channels
 data_BME280
 data_envea
 timestamp_table
-data_MPPT
-data_WIND
 
 '''
 
@@ -36,6 +34,7 @@ cursor = conn.cursor()
 #cursor.execute("SELECT * FROM timestamp_table")
 if table_name == "timestamp_table":
   cursor.execute("SELECT * FROM timestamp_table")
+
 else:
   query = f"SELECT * FROM {table_name} ORDER BY timestamp DESC LIMIT ?"
   cursor.execute(query, (limit_num,))

sqlite/read_config.py

@@ -1,43 +0,0 @@
-'''
-  ____   ___  _     _ _       
- / ___| / _ \| |   (_) |_ ___ 
- \___ \| | | | |   | | __/ _ \
-  ___) | |_| | |___| | ||  __/
- |____/ \__\_\_____|_|\__\___|
-                              
-Script to read data from a sqlite database
-/usr/bin/python3 /var/www/nebuleair_pro_4g/sqlite/read_config.py config_table
-
-Available table are
-config_table
-config_scripts_table
-envea_sondes_table
-
-'''
-
-import sqlite3
-import sys
-parameter = sys.argv[1:]  # Exclude the script name
-#print("Parameters received:")
-table_name=parameter[0]
-
-
-# Connect to the SQLite database
-conn = sqlite3.connect("/var/www/nebuleair_pro_4g/sqlite/sensors.db")
-cursor = conn.cursor()
-
-# Retrieve the data
-query = f"SELECT * FROM {table_name}"
-cursor.execute(query)
-
-
-rows = cursor.fetchall()
-rows.reverse()  # Reverse the order in Python (to get ascending order)
-
-
-# Display the results
-for row in rows:
-    print(row)
-
-# Close the database connection
-conn.close()

sqlite/set_config.py

@@ -1,77 +0,0 @@
-'''
-  ____   ___  _     _ _       
- / ___| / _ \| |   (_) |_ ___ 
- \___ \| | | | |   | | __/ _ \
-  ___) | |_| | |___| | ||  __/
- |____/ \__\_\_____|_|\__\___|
-                              
-Script to set the config
-/usr/bin/python3 /var/www/nebuleair_pro_4g/sqlite/set_config.py
-
-in case of readonly error:
-sudo chmod 777 /var/www/nebuleair_pro_4g/sqlite/sensors.db
-'''
-
-import sqlite3
-
-# Connect to (or create if not existent) the database
-conn = sqlite3.connect("/var/www/nebuleair_pro_4g/sqlite/sensors.db")
-cursor = conn.cursor()
-
-print(f"Connected to database")
-
-# Note: Using INSERT OR IGNORE to add only new configurations without overwriting existing ones
-print("Adding new configurations (existing ones will be preserved)")
-
-
-# Insert general configurations
-config_entries = [
-    ("modem_config_mode", "0", "bool"),
-    ("deviceID", "XXXX", "str"),
-    ("latitude_raw", "0", "int"),
-    ("longitude_raw", "0", "int"),
-    ("latitude_precision", "0", "int"),
-    ("longitude_precision", "0", "int"),
-    ("deviceName", "NebuleAir-proXXX", "str"),
-    ("SaraR4_baudrate", "115200", "int"),
-    ("NPM_solo_port", "/dev/ttyAMA5", "str"),
-    ("sshTunnel_port", "59228", "int"),
-    ("SARA_R4_general_status", "connected", "str"),
-    ("SARA_R4_SIM_status", "connected", "str"),
-    ("SARA_R4_network_status", "connected", "str"),
-    ("SARA_R4_neworkID", "20810", "int"),
-    ("WIFI_status", "connected", "str"),
-    ("send_uSpot", "0", "bool"),
-    ("npm_5channel", "0", "bool"),
-    ("envea", "0", "bool"),
-    ("windMeter", "0", "bool"),
-    ("BME280", "0", "bool"),
-    ("MPPT", "0", "bool"),
-    ("modem_version", "XXX", "str")
-]
-
-for key, value, value_type in config_entries:
-    cursor.execute(
-        "INSERT OR IGNORE INTO config_table (key, value, type) VALUES (?, ?, ?)",
-        (key, value, value_type)
-    )
-
-# Insert envea sondes
-envea_sondes = [
-    (False, "ttyAMA4", "h2s", 4),
-    (False, "ttyAMA3", "no2", 1),
-    (False, "ttyAMA2", "o3", 1)
-]
-
-for connected, port, name, coefficient in envea_sondes:
-    cursor.execute(
-        "INSERT OR IGNORE INTO envea_sondes_table (connected, port, name, coefficient) VALUES (?, ?, ?, ?)",
-        (1 if connected else 0, port, name, coefficient)
-    )
-
-
-# Commit and close the connection
-conn.commit()
-conn.close()
-
-print("Database updated successfully!")

update_firmware.sh

@@ -1,118 +0,0 @@
-#!/bin/bash
-
-# NebuleAir Pro 4G - Comprehensive Update Script
-# This script performs a complete system update including git pull,
-# config initialization, and service management
-
-echo "======================================"
-echo "NebuleAir Pro 4G - Firmware Update"
-echo "======================================"
-echo "Started at: $(date)"
-echo ""
-
-# Set working directory
-cd /var/www/nebuleair_pro_4g
-
-# Function to print status messages
-print_status() {
-    echo "[$(date '+%H:%M:%S')] $1"
-}
-
-# Function to check command success
-check_status() {
-    if [ $? -eq 0 ]; then
-        print_status "✓ $1 completed successfully"
-    else
-        print_status "✗ $1 failed"
-        return 1
-    fi
-}
-
-# Step 1: Git operations
-print_status "Step 1: Updating firmware from repository..."
-git fetch origin
-check_status "Git fetch"
-
-# Show current branch and any changes
-print_status "Current branch: $(git branch --show-current)"
-if [ -n "$(git status --porcelain)" ]; then
-    print_status "Warning: Local changes detected:"
-    git status --short
-fi
-
-# Pull latest changes
-git pull origin $(git branch --show-current)
-check_status "Git pull"
-
-# Step 2: Update database configuration
-print_status ""
-print_status "Step 2: Updating database configuration..."
-/usr/bin/python3 /var/www/nebuleair_pro_4g/sqlite/set_config.py
-check_status "Database configuration update"
-
-# Step 3: Check and fix file permissions
-print_status ""
-print_status "Step 3: Checking file permissions..."
-sudo chmod +x /var/www/nebuleair_pro_4g/update_firmware.sh
-sudo chmod 755 /var/www/nebuleair_pro_4g/sqlite/*.py
-sudo chmod 755 /var/www/nebuleair_pro_4g/NPM/*.py
-sudo chmod 755 /var/www/nebuleair_pro_4g/BME280/*.py
-sudo chmod 755 /var/www/nebuleair_pro_4g/SARA/*.py
-sudo chmod 755 /var/www/nebuleair_pro_4g/envea/*.py
-check_status "File permissions update"
-
-# Step 4: Restart critical services if they exist
-print_status ""
-print_status "Step 4: Managing system services..."
-
-# List of services to check and restart
-services=(
-    "nebuleair-npm-data.timer"
-    "nebuleair-envea-data.timer"
-    "nebuleair-sara-data.timer"
-    "nebuleair-bme280-data.timer"
-    "nebuleair-mppt-data.timer"
-)
-
-for service in "${services[@]}"; do
-    if systemctl list-unit-files | grep -q "$service"; then
-        print_status "Restarting service: $service"
-        sudo systemctl restart "$service"
-        if systemctl is-active --quiet "$service"; then
-            print_status "✓ $service is running"
-        else
-            print_status "⚠ $service may not be active"
-        fi
-    else
-        print_status "ℹ Service $service not found (may not be installed)"
-    fi
-done
-
-# Step 5: System health check
-print_status ""
-print_status "Step 5: System health check..."
-
-# Check disk space
-disk_usage=$(df / | awk 'NR==2 {print $5}' | sed 's/%//')
-if [ "$disk_usage" -gt 90 ]; then
-    print_status "⚠ Warning: Disk usage is high ($disk_usage%)"
-else
-    print_status "✓ Disk usage is acceptable ($disk_usage%)"
-fi
-
-# Check if database is accessible
-if [ -f "/var/www/nebuleair_pro_4g/sqlite/sensors.db" ]; then
-    print_status "✓ Database file exists"
-else
-    print_status "⚠ Warning: Database file not found"
-fi
-
-# Step 6: Final cleanup
-print_status ""
-print_status "Step 6: Cleaning up..."
-sudo find /var/www/nebuleair_pro_4g/logs -name "*.log" -size +10M -exec truncate -s 0 {} \;
-check_status "Log cleanup"
-
-print_status "Update completed successfully!"
-
-exit 0

windMeter/ads115.py

@@ -1,27 +0,0 @@
-'''
-Script to test the abs115 an analog-to-digital converter
-sudo /usr/bin/python3 /var/www/nebuleair_pro_4g/windMeter/ads115.py
-
-'''
-import time
-import board
-import busio
-import adafruit_ads1x15.ads1115 as ADS
-from adafruit_ads1x15.analog_in import AnalogIn
-
-i2c = busio.I2C(board.SCL, board.SDA)
-ads = ADS.ADS1115(i2c)
-channel = AnalogIn(ads, ADS.P0)
-
-print("Testing ADS1115 readings...")
-readings = []
-
-for i in range(5):
-    voltage = channel.voltage
-    readings.append(voltage)
-    print(f"Voltage: {voltage:.6f}V")
-    time.sleep(1)
-
-# Calculate and display the mean
-mean_voltage = sum(readings) / len(readings)
-print(f"\nMean voltage: {mean_voltage:.6f}V")

windMeter/read.py

@@ -1,140 +0,0 @@
-'''
- __        _____ _   _ ____  
- \ \      / /_ _| \ | |  _ \ 
-  \ \ /\ / / | ||  \| | | | |
-   \ V  V /  | || |\  | |_| |
-    \_/\_/  |___|_| \_|____/ 
-
-Script to read wind speed from a Davis Anémomètre-girouette Vantage Pro (6410)
-https://www.shapemaker.io/blog/wind-speed-measurements-with-anemometer-and-a-raspberry-pi
-
-Connexion:
-black (wind speed )     -> gpio21
-green (wind direction)  -> ADS1115 (module I2C) 
-Yellow                  -> 5v
-RED                     -> GND
-
-Attention:  The Raspberry Pi doesn't have analog inputs, so we need an analog-to-digital converter (ADC) to read the wind direction.
-
-sudo /usr/bin/python3 /var/www/nebuleair_pro_4g/windMeter/read.py
-
-this need to run as a service
-
---> sudo nano /etc/systemd/system/windMeter.service
-
-⬇️
-[Unit]
-Description=Master manager for the Python wind meter scripts
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/python3 /var/www/nebuleair_pro_4g/windMeter/read.py
-Restart=always
-User=root
-WorkingDirectory=/var/www/nebuleair_pro_4g
-StandardOutput=append:/var/www/nebuleair_pro_4g/logs/wind.log
-StandardError=append:/var/www/nebuleair_pro_4g/logs/wind_errors.log
-
-[Install]
-WantedBy=multi-user.target
-⬆️
-
-Reload systemd (first time after creating the service):
-    sudo systemctl daemon-reload
-
-Enable (once), start (once and after stopping) and restart (after modification)systemd:
-    sudo systemctl enable windMeter.service
-    sudo systemctl start windMeter.service
-    sudo systemctl restart windMeter.service
-
-Check the service status:
-    sudo systemctl status windMeter.service
-
-'''
-#!/usr/bin/python3
-import time
-import sqlite3
-import board
-import busio
-import numpy as np
-import threading
-import adafruit_ads1x15.ads1115 as ADS
-from adafruit_ads1x15.analog_in import AnalogIn
-from gpiozero import Button
-from datetime import datetime
-
-# Constants
-DB_PATH = "/var/www/nebuleair_pro_4g/sqlite/sensors.db"
-
-# Initialize I2C & ADS1115
-i2c = busio.I2C(board.SCL, board.SDA)
-ads = ADS.ADS1115(i2c)
-channel = AnalogIn(ads, ADS.P0)  # Connect to A0 on the ADS1115
-
-# Wind speed sensor setup
-wind_speed_sensor = Button(21)
-wind_count = 0
-wind_lock = threading.Lock()
-
-def spin():
-    global wind_count
-    with wind_lock:
-        wind_count += 1
-
-def reset_wind():
-    global wind_count
-    with wind_lock:
-        wind_count = 0
-
-wind_speed_sensor.when_activated = spin  # More reliable
-
-def calc_speed(spins, interval):
-    return spins * (2.25 / interval) * 1.60934  # Convert MPH to km/h
-
-def get_wind_direction():
-    voltage = channel.voltage
-    return voltage
-
-def save_to_database(wind_speed, wind_direction, spin_count):
-    """Save wind data to SQLite database."""
-    try:
-        conn = sqlite3.connect(DB_PATH)
-        cursor = conn.cursor()
-        
-        cursor.execute("SELECT * FROM timestamp_table LIMIT 1")
-        row = cursor.fetchone()
-        rtc_time_str = row[1] if row else datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-
-        cursor.execute('''
-        INSERT INTO data_wind (timestamp, wind_speed, wind_direction)
-        VALUES (?, ?, ?)
-        ''', (rtc_time_str, round(wind_speed, 2), round(wind_direction, 2)))
-        
-        conn.commit()
-        conn.close()
-        print(f"Saved: {rtc_time_str}, {wind_speed:.2f} km/h, {wind_direction:.2f}V, Spins: {spin_count}")
-        
-    except Exception as e:
-        print(f"Database error: {e}")
-
-def main():
-    print("Wind monitoring started...")
-    
-    try:
-        while True:
-            reset_wind()
-            print("Measuring for 60 seconds...")
-            time.sleep(60)
-            
-            wind_speed_kmh = calc_speed(wind_count, 60)
-            wind_direction = get_wind_direction()
-            
-            save_to_database(wind_speed_kmh, wind_direction, wind_count)
-            
-    except KeyboardInterrupt:
-        print("\nMonitoring stopped.")
-    except Exception as e:
-        print(f"Error: {e}")
-
-if __name__ == "__main__":
-    main()

windMeter/read_wind_direction.py

@@ -1,84 +0,0 @@
-'''
- __        _____ _   _ ____  
- \ \      / /_ _| \ | |  _ \ 
-  \ \ /\ / / | ||  \| | | | |
-   \ V  V /  | || |\  | |_| |
-    \_/\_/  |___|_| \_|____/ 
-                             
-
-Script to read wind speed from a Davis Anémomètre-girouette Vantage Pro (6410)
-https://www.shapemaker.io/blog/wind-speed-measurements-with-anemometer-and-a-raspberry-pi
-
-Connexion:
-black (wind speed )     -> gpio21
-green (wind direction)  -> ADS1115 (module I2C) 
-Yellow                  -> 5v
-RED                     -> GND
-
-Attention:  The Raspberry Pi doesn't have analog inputs, so we need an analog-to-digital converter (ADC) to read the wind direction.
-
-sudo /usr/bin/python3 /var/www/nebuleair_pro_4g/windMeter/read_wind_direction.py
-
-'''
-import time
-import board
-import busio
-import adafruit_ads1x15.ads1115 as ADS
-from adafruit_ads1x15.analog_in import AnalogIn
-
-# Create the I2C bus and ADC object
-i2c = busio.I2C(board.SCL, board.SDA)
-ads = ADS.ADS1115(i2c)
-
-# Connect to the channel with your Davis wind vane
-wind_dir_sensor = AnalogIn(ads, ADS.P0)
-
-# Check the current voltage range
-min_voltage = 9999
-max_voltage = -9999
-
-def get_wind_direction():
-    """Get wind direction angle from Davis Vantage Pro2 wind vane"""
-    global min_voltage, max_voltage
-    
-    # Read voltage from ADS1115
-    voltage = wind_dir_sensor.voltage
-    
-    # Update min/max for calibration
-    if voltage < min_voltage:
-        min_voltage = voltage
-    if voltage > max_voltage:
-        max_voltage = voltage
-    
-    # We'll use a safer mapping approach
-    # Assuming the Davis sensor is linear from 0° to 360°
-    estimated_max = 3.859 # Initial estimate, will refine
-    
-    # Calculate angle with bounds checking
-    angle = (voltage / estimated_max) * 360.0
-    
-    # Ensure angle is in 0-360 range
-    angle = angle % 360
-    
-    return voltage, angle
-
-# Main loop
-try:
-    print("Reading wind direction. Press Ctrl+C to exit.")
-    print("Voltage, Angle, Min Voltage, Max Voltage")
-    while True:
-        voltage, angle = get_wind_direction()
-        print(f"{voltage:.3f}V, {angle:.1f}°, {min_voltage:.3f}V, {max_voltage:.3f}V")
-        time.sleep(1)
-except KeyboardInterrupt:
-    print("\nProgram stopped")
-    print(f"Observed voltage range: {min_voltage:.3f}V to {max_voltage:.3f}V")
-    
-    # Suggest calibration if we have enough data
-    if max_voltage > min_voltage:
-        print("\nSuggested calibration for your setup:")
-        print(f"max_voltage = {max_voltage:.3f}")
-        print(f"def get_wind_direction():")
-        print(f"    voltage = wind_dir_sensor.voltage")
-        print(f"    angle = (voltage / {max_voltage:.3f}) * 360.0")
-        print(f"    return angle % 360")

windMeter/read_wind_speed.py

@@ -1,67 +0,0 @@
-'''
- __        _____ _   _ ____  
- \ \      / /_ _| \ | |  _ \ 
-  \ \ /\ / / | ||  \| | | | |
-   \ V  V /  | || |\  | |_| |
-    \_/\_/  |___|_| \_|____/ 
-                             
-
-Script to read wind speed from a Davis Anémomètre-girouette Vantage Pro (6410)
-https://www.shapemaker.io/blog/wind-speed-measurements-with-anemometer-and-a-raspberry-pi
-
-Connexion:
-black (wind speed )     -> gpio21
-green (wind direction)  -> ADS1115 (module I2C) 
-Yellow                  -> 5v
-RED                     -> GND
-
-Attention:  The Raspberry Pi doesn't have analog inputs, so we need an analog-to-digital converter (ADC) to read the wind direction.
-
-sudo /usr/bin/python3 /var/www/nebuleair_pro_4g/windMeter/read_wind_speed.py
-
-'''
-
-
-import time
-from gpiozero import Button
-from signal import pause
-
-# Setup wind speed sensor on GPIO pin 21 (instead of 5)
-wind_speed_sensor = Button(21)
-wind_count = 0
-
-def spin():
-    global wind_count
-    wind_count = wind_count + 1
-
-def calc_speed(spins, interval):
-    # Davis anemometer formula: V = P*(2.25/T) in MPH
-    # P = pulses per sample period, T = sample period in seconds
-    wind_speed_mph = spins * (2.25 / interval)
-    return wind_speed_mph
-
-def reset_wind():
-    global wind_count
-    wind_count = 0
-
-# Register the event handler for the sensor
-wind_speed_sensor.when_pressed = spin
-
-try:
-    print("Wind speed measurement started. Press Ctrl+C to exit.")
-    
-    while True:
-        # Reset the counter
-        reset_wind()
-        
-        # Wait for 3 seconds and count rotations
-        print("Measuring for 3 seconds...")
-        time.sleep(3)
-        
-        # Calculate and display wind speed
-        wind_speed = calc_speed(wind_count, 3)
-        print(f"Wind count: {wind_count} spins")
-        print(f"Wind speed: {wind_speed:.2f} mph ({wind_speed * 1.60934:.2f} km/h)")
-        
-except KeyboardInterrupt:
-    print("\nMeasurement stopped by user")