v1.6.1: NSRT MK4 deconnexion — noise_status en base + ERR_NOISE dans error_flags

Meme modele que NPM: ecriture en base avec valeurs a 0 et noise_status=0xFF
si capteur deconnecte, flag ERR_NOISE (bit 5) dans byte 66 UDP, messages
explicites sur page capteurs et self-test.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
PaulVua
2026-03-19 11:42:10 +01:00
parent 11585b4783
commit 47d76be5df
8 changed files with 84 additions and 29 deletions

View File

@@ -1 +1 @@
1.6.0 1.6.1

View File

@@ -1,5 +1,26 @@
{ {
"versions": [ "versions": [
{
"version": "1.6.1",
"date": "2026-03-19",
"changes": {
"features": [
"Sonometre NSRT MK4: detection deconnexion avec message explicite (page capteurs + self-test)",
"Colonne noise_status dans data_NOISE (0x00=OK, 0xFF=deconnecte)",
"ERR_NOISE (bit 5, byte 66) dans error_flags UDP quand sonometre deconnecte"
],
"improvements": [
"Script NSRT_mk4_get_data.py ecrit en base meme si capteur deconnecte (valeurs a 0, noise_status=0xFF)",
"Script read.py: message d'erreur clair au lieu de l'exception Python brute",
"Self-test: affiche 'Capteur deconnecte — verifiez le cablage USB' au lieu de l'erreur technique"
],
"fixes": [],
"compatibility": [
"Migration automatique: colonne noise_status ajoutee via set_config.py lors du firmware update"
]
},
"notes": "Gestion de la deconnexion du sonometre NSRT MK4 alignee sur le modele NPM: ecriture en base avec status d'erreur, flag ERR_NOISE dans la payload UDP, et messages utilisateur explicites sur l'interface web."
},
{ {
"version": "1.6.0", "version": "1.6.0",
"date": "2026-03-18", "date": "2026-03-18",

View File

@@ -412,7 +412,10 @@ async function selfTestSequence() {
addSelfTestLog(`Noise response: ${JSON.stringify(noiseResult)}`); addSelfTestLog(`Noise response: ${JSON.stringify(noiseResult)}`);
if (noiseResult.error) { if (noiseResult.error) {
updateTestStatus(sensor.id, 'Failed', noiseResult.error, 'bg-danger'); const noiseMsg = noiseResult.disconnected
? 'Capteur déconnecté — vérifiez le câblage USB'
: noiseResult.error;
updateTestStatus(sensor.id, 'Failed', noiseMsg, 'bg-danger');
testsFailed++; testsFailed++;
} else if (noiseResult.LEQ > 0 && noiseResult.dBA > 0) { } else if (noiseResult.LEQ > 0 && noiseResult.dBA > 0) {
updateTestStatus(sensor.id, 'Passed', `LEQ: ${noiseResult.LEQ} dB | dB(A): ${noiseResult.dBA}`, 'bg-success'); updateTestStatus(sensor.id, 'Passed', `LEQ: ${noiseResult.LEQ} dB | dB(A): ${noiseResult.dBA}`, 'bg-success');

View File

@@ -1015,6 +1015,7 @@ try:
print("No data available in the database.") print("No data available in the database.")
# NOISE sensor # NOISE sensor
noise_disconnected = False
if NOISE_sensor: if NOISE_sensor:
print("Getting NOISE sensor values") print("Getting NOISE sensor values")
cursor.execute("SELECT * FROM data_NOISE ORDER BY rowid DESC LIMIT 1") cursor.execute("SELECT * FROM data_NOISE ORDER BY rowid DESC LIMIT 1")
@@ -1024,6 +1025,14 @@ try:
cur_LEQ = last_row[1] cur_LEQ = last_row[1]
cur_level = last_row[2] cur_level = last_row[2]
# noise_status: 0xFF = disconnected (column index 3)
noise_status_value = last_row[3] if len(last_row) > 3 and last_row[3] is not None else 0x00
if noise_status_value == 0xFF:
noise_disconnected = True
print("Noise status: 0xFF (disconnected)")
else:
print(f"Noise status: 0x{noise_status_value:02X}")
#Add data to payload CSV #Add data to payload CSV
payload_csv[6] = cur_level payload_csv[6] = cur_level
@@ -1149,6 +1158,8 @@ try:
error_flags |= ERR_RTC_RESET error_flags |= ERR_RTC_RESET
if npm_disconnected: if npm_disconnected:
error_flags |= ERR_NPM error_flags |= ERR_NPM
if noise_disconnected:
error_flags |= ERR_NOISE
payload.set_error_flags(error_flags) payload.set_error_flags(error_flags)
# ---- Firmware version (bytes 69-71) ---- # ---- Firmware version (bytes 69-71) ----

View File

@@ -28,8 +28,32 @@ write_fs(frequency: int) -> sampling freq
import nsrt_mk3_dev import nsrt_mk3_dev
import sqlite3 import sqlite3
# noise_status: 0x00 = OK, 0xFF = disconnected
noise_status = 0x00
leq_level_rounded = 0
weighted_level_rounded = 0
try:
nsrt = nsrt_mk3_dev.NsrtMk3Dev('/dev/ttyACM0') nsrt = nsrt_mk3_dev.NsrtMk3Dev('/dev/ttyACM0')
freq_level = nsrt.read_fs() #current sampling frequency
time_constant = nsrt.read_tau() #reads the current time constant
leq_level = nsrt.read_leq() #current running LEQ and starts the integration of a new LEQ.
weighting = nsrt.read_weighting() #weighting curve that is currently selected ( A ou C)
weighted_level = nsrt.read_level() #current running level in dB.
leq_level_rounded = round(leq_level, 2)
weighted_level_rounded = round(weighted_level, 2)
except Exception as e:
err_msg = str(e)
if "No such file or directory" in err_msg or "could not open port" in err_msg:
print(f"NSRT MK4 disconnected: {err_msg}")
noise_status = 0xFF
else:
print(f"NSRT MK4 error: {err_msg}")
noise_status = 0xFF
# Connect to the SQLite database # Connect to the SQLite database
conn = sqlite3.connect("/var/www/nebuleair_pro_4g/sqlite/sensors.db") conn = sqlite3.connect("/var/www/nebuleair_pro_4g/sqlite/sensors.db")
cursor = conn.cursor() cursor = conn.cursor()
@@ -39,34 +63,15 @@ cursor.execute("SELECT * FROM timestamp_table LIMIT 1")
row = cursor.fetchone() # Get the first (and only) row row = cursor.fetchone() # Get the first (and only) row
rtc_time_str = row[1] # '2025-02-07 12:30:45' rtc_time_str = row[1] # '2025-02-07 12:30:45'
freq_level = nsrt.read_fs() #current sampling frequency
time_constant = nsrt.read_tau() #reads the current time constant
leq_level = nsrt.read_leq() #current running LEQ and starts the integration of a new LEQ.
weighting = nsrt.read_weighting() #weighting curve that is currently selected ( A ou C)
weighted_level = nsrt.read_level() #current running level in dB.
#print(f'current sampling freq : {freq_level} Hz')
#print(f'current time constant : {time_constant} s')
#print(f'current LEQ level: {leq_level:0.2f} dB')
#print(f'{weighting} value: {weighted_level:0.2f} dBA')
# Round values to 2 decimal places before saving
leq_level_rounded = round(leq_level, 2)
weighted_level_rounded = round(weighted_level, 2)
#save to db
#save to sqlite database #save to sqlite database
try: try:
cursor.execute(''' cursor.execute('''
INSERT INTO data_NOISE (timestamp,current_LEQ, DB_A_value) VALUES (?,?,?)''' INSERT INTO data_NOISE (timestamp, current_LEQ, DB_A_value, noise_status) VALUES (?,?,?,?)'''
, (rtc_time_str,leq_level_rounded,weighted_level_rounded)) , (rtc_time_str, leq_level_rounded, weighted_level_rounded, noise_status))
# Commit and close the connection
conn.commit() conn.commit()
#print("Sensor data saved successfully!")
except Exception as e: except Exception as e:
print(f"Database error: {e}") print(f"Database error: {e}")
conn.close() conn.close()

View File

@@ -31,4 +31,10 @@ try:
print(json.dumps(data)) print(json.dumps(data))
except Exception as e: except Exception as e:
print(json.dumps({"error": str(e)})) err_msg = str(e)
if "No such file or directory" in err_msg or "could not open port" in err_msg:
print(json.dumps({"error": "Capteur déconnecté — vérifiez le câblage USB du sonomètre NSRT MK4 (/dev/ttyACM0)", "disconnected": True}))
elif "Permission denied" in err_msg:
print(json.dumps({"error": "Permission refusée sur /dev/ttyACM0 — exécutez: sudo chmod 777 /dev/ttyACM0", "disconnected": False}))
else:
print(json.dumps({"error": err_msg}))

View File

@@ -140,10 +140,18 @@ cursor.execute("""
CREATE TABLE IF NOT EXISTS data_NOISE ( CREATE TABLE IF NOT EXISTS data_NOISE (
timestamp TEXT, timestamp TEXT,
current_LEQ REAL, current_LEQ REAL,
DB_A_value REAL DB_A_value REAL,
noise_status INTEGER DEFAULT 0
) )
""") """)
# Add noise_status column to existing databases (migration)
try:
cursor.execute("ALTER TABLE data_NOISE ADD COLUMN noise_status INTEGER DEFAULT 0")
print("Added noise_status column to data_NOISE")
except:
pass # Column already exists
# Create a table MHZ19 (CO2 sensor) # Create a table MHZ19 (CO2 sensor)
cursor.execute(""" cursor.execute("""
CREATE TABLE IF NOT EXISTS data_MHZ19 ( CREATE TABLE IF NOT EXISTS data_MHZ19 (

View File

@@ -110,6 +110,7 @@ for connected, port, name, coefficient in envea_sondes:
# Database migrations (add columns to existing tables) # Database migrations (add columns to existing tables)
migrations = [ migrations = [
("data_NPM", "npm_status", "INTEGER DEFAULT 0"), ("data_NPM", "npm_status", "INTEGER DEFAULT 0"),
("data_NOISE", "noise_status", "INTEGER DEFAULT 0"),
] ]
for table, column, col_type in migrations: for table, column, col_type in migrations: