Consulter la base de donnée
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -68,8 +81,18 @@
Télécharger les données
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -123,11 +146,6 @@
-
-
-
-
-
window.onload = function() {
fetch('../config.json') // Replace 'deviceID.txt' with 'config.json'
.then(response => response.json()) // Parse response as JSON
@@ -168,11 +186,21 @@
// TABLE PM
-function get_data_sqlite(table, limit, download) {
- console.log("Getting data for table mesure PM");
+function get_data_sqlite(table, limit, download , startDate = "", endDate = "") {
+ console.log(`Getting data for table: ${table}, limit: ${limit}, download: ${download}, start: ${startDate}, end: ${endDate}`);
+ // Construct URL parameters dynamically
+ let url = `launcher.php?type=table_mesure&table=${table}&limit=${limit}&download=${download}`;
+
+ // Add date parameters if downloading
+ if (download) {
+ url += `&start_date=${startDate}&end_date=${endDate}`;
+ }
+
+ console.log(url);
+
$.ajax({
- url: 'launcher.php?type=table_mesurePM&table='+table+'&limit='+limit+'&download='+download,
+ url: url,
dataType: 'text', // Specify that you expect a JSON response
method: 'GET', // Use GET or POST depending on your needs
success: function(response) {
@@ -207,6 +235,16 @@ function get_data_sqlite(table, limit, download) {
Humidity (%) |
Pressure (hPa) |
`;
+ } else if (table === "data_NPM_5channels") {
+ tableHTML += `
+
Timestamp |
+
PM_ch1 (nb/L) |
+
PM_ch2 (nb/L) |
+
PM_ch3 (nb/L) |
+
PM_ch4 (nb/L) |
+
PM_ch5 (nb/L) |
+
+ `;
}
tableHTML += `
`;
@@ -233,6 +271,17 @@ function get_data_sqlite(table, limit, download) {
${columns[3]} |
`;
}
+ else if (table === "data_NPM_5channels") {
+ tableHTML += `
+ ${columns[0]} |
+ ${columns[1]} |
+ ${columns[2]} |
+ ${columns[3]} |
+ ${columns[4]} |
+ ${columns[5]} |
+
+ `;
+ }
tableHTML += "";
});
@@ -250,6 +299,19 @@ function get_data_sqlite(table, limit, download) {
}
+
+function getSelectedLimit() {
+ return document.getElementById("records_limit").value;
+}
+
+function getStartDate() {
+ return document.getElementById("start_date").value || "2025-01-01"; // Default to a safe date
+}
+
+function getEndDate() {
+ return document.getElementById("end_date").value || "2025-12-31"; // Default to a safe date
+}
+
function downloadCSV(response, table) {
let rows = response.trim().split("\n");
@@ -257,9 +319,12 @@ function downloadCSV(response, table) {
// Add headers based on table type
if (table === "data_NPM") {
- csvContent += "Timestamp,PM1,PM2.5,PM10,Temperature (°C),Humidity (%)\n";
+ csvContent += "TimestampUTC,PM1,PM2.5,PM10,Temperature_sensor,Humidity_sensor\n";
} else if (table === "data_BME280") {
- csvContent += "Timestamp,Temperature (°C),Humidity (%),Pressure (hPa)\n";
+ csvContent += "TimestampUTC,Temperature (°C),Humidity (%),Pressure (hPa)\n";
+ }
+ else if (table === "data_NPM_5channels") {
+ csvContent += "TimestampUTC,PM_ch1,PM_ch2,PM_ch3,PM_ch4,PM_ch5\n";
}
// Format rows as CSV
diff --git a/html/launcher.php b/html/launcher.php
index 6bb7186..4dbb49a 100755
--- a/html/launcher.php
+++ b/html/launcher.php
@@ -203,14 +203,23 @@ if ($type == "BME280") {
}
-if ($type == "table_mesurePM") {
+if ($type == "table_mesure") {
$table=$_GET['table'];
$limit=$_GET['limit'];
$download=$_GET['download'];
- $command = 'sudo /usr/bin/python3 /var/www/nebuleair_pro_4g/sqlite/read.py '.$table.' '.$limit;
- $output = shell_exec($command);
- echo $output;
+ if ($download==="false") {
+ $command = 'sudo /usr/bin/python3 /var/www/nebuleair_pro_4g/sqlite/read.py '.$table.' '.$limit;
+ $output = shell_exec($command);
+ echo $output;
+ } else{
+ $start_date=$_GET['start_date'];
+ $end_date=$_GET['end_date'];
+ $command = 'sudo /usr/bin/python3 /var/www/nebuleair_pro_4g/sqlite/read_select_date.py '.$table.' '.$start_date.' '.$end_date;
+ $output = shell_exec($command);
+ echo $output;
+ }
+
}
# SARA R4 COMMANDS
diff --git a/master.py b/master.py
index 805995b..ee80591 100644
--- a/master.py
+++ b/master.py
@@ -64,26 +64,33 @@ def load_config():
with open(CONFIG_FILE, "r") as f:
return json.load(f)
-def run_script(script_name, interval):
- """Run a script in a loop with a delay."""
+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])
- time.sleep(interval)
+
+ # 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 = [
- ("NPM/get_data_v2.py", 60), # Get NPM data every 60s
- ("loop/SARA_send_data_v2.py", 60), # Send data every 60 seconds
- ("RTC/save_to_db.py", 1), # SAVE RTC time every 1 second
- ("BME280/get_data_v2.py", 120) # Get BME280 data every 120 seconds
+ ("RTC/save_to_db.py", 1, 0), # SAVE RTC time every 1 second, no delay
+ ("NPM/get_data_v2.py", 60, 0), # Get NPM data every 60s, no delay
+ ("NPM/get_data_modbus.py", 10, 2), # 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
]
# Start threads for enabled scripts
-for script_name, interval in SCRIPTS:
- thread = threading.Thread(target=run_script, args=(script_name, interval), daemon=True)
+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
diff --git a/sqlite/read.py b/sqlite/read.py
index 6a283ad..39732dd 100755
--- a/sqlite/read.py
+++ b/sqlite/read.py
@@ -8,6 +8,13 @@
Script to read data from a sqlite database
/usr/bin/python3 /var/www/nebuleair_pro_4g/sqlite/read.py data_NPM 10
+Available table are
+data_NPM
+data_NPM_5channels
+data_BME280
+data_envea
+timestamp_table
+
'''
import sqlite3
diff --git a/sqlite/read_select_date.py b/sqlite/read_select_date.py
new file mode 100644
index 0000000..7ac6535
--- /dev/null
+++ b/sqlite/read_select_date.py
@@ -0,0 +1,59 @@
+'''
+ ____ ___ _ _ _
+ / ___| / _ \| | (_) |_ ___
+ \___ \| | | | | | | __/ _ \
+ ___) | |_| | |___| | || __/
+ |____/ \__\_\_____|_|\__\___|
+
+Script to read data from a sqlite database using start date and end date
+
+/usr/bin/python3 /var/www/nebuleair_pro_4g/sqlite/read_select_date.py data_NPM 2025-02-09 2025-02-11
+
+Available table are
+data_NPM
+data_NPM_5channels
+data_BME280
+data_envea
+timestamp_table
+
+'''
+
+import sqlite3
+import sys
+
+parameter = sys.argv[1:] # Exclude the script name
+#print("Parameters received:")
+table_name=parameter[0]
+start_date=parameter[1]
+end_date=parameter[2]
+
+# Convert to full timestamp range
+start_timestamp = f"{start_date} 00:00:00"
+end_timestamp = f"{end_date} 23:59:59"
+
+# Connect to the SQLite database
+conn = sqlite3.connect("/var/www/nebuleair_pro_4g/sqlite/sensors.db")
+cursor = conn.cursor()
+
+# Retrieve the last 10 sensor readings
+#cursor.execute("SELECT * FROM data_NPM ORDER BY timestamp DESC LIMIT 10")
+#cursor.execute("SELECT * FROM data_BME280 ORDER BY timestamp DESC LIMIT 10")
+#cursor.execute("SELECT * FROM timestamp_table")
+if table_name == "timestamp_table":
+ cursor.execute("SELECT * FROM timestamp_table")
+
+else:
+ query = f"SELECT * FROM {table_name} WHERE timestamp BETWEEN ? AND ? ORDER BY timestamp ASC"
+ cursor.execute(query, (start_timestamp, end_timestamp))
+
+
+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()