update
This commit is contained in:
@@ -28,16 +28,16 @@ CSV PAYLOAD (AirCarto Servers)
|
||||
|
||||
ATTENTION : do not change order !
|
||||
CSV size: 18
|
||||
{PM1},{PM25},{PM10},{temp},{hum},{press},{avg_noise},{max_noise},{min_noise},{envea_no2},{envea_h2s},{envea_nh3},{4g_signal_quality}
|
||||
{PM1},{PM25},{PM10},{temp},{hum},{press},{current LEQ},{current level},{FREE},{envea_no2},{envea_h2s},{envea_nh3},{4g_signal_quality}
|
||||
0 -> PM1 (μg/m3)
|
||||
1 -> PM25 (μg/m3)
|
||||
2 -> PM10 (μg/m3)
|
||||
3 -> temp
|
||||
4 -> hum
|
||||
5 -> press
|
||||
6 -> avg_noise (DB_A)
|
||||
7 -> max_noise
|
||||
8 -> min_noise
|
||||
6 -> sound (current LEQ)
|
||||
7 -> sound (current level)
|
||||
8 -> FREE
|
||||
9 -> envea_no2
|
||||
10 -> envea_h2s
|
||||
11 -> envea_nh3
|
||||
@@ -946,9 +946,10 @@ try:
|
||||
if last_row:
|
||||
print("SQLite DB last available row:", last_row)
|
||||
cur_LEQ = last_row[1]
|
||||
DB_A_value = last_row[2]
|
||||
cur_level = last_row[2]
|
||||
|
||||
#Add data to payload CSV
|
||||
<<<<<<< HEAD
|
||||
payload_csv[6] = DB_A_value
|
||||
|
||||
#Add data to payload UDP
|
||||
@@ -957,6 +958,10 @@ try:
|
||||
max_noise=None, # Add if available
|
||||
min_noise=None # Add if available
|
||||
)
|
||||
=======
|
||||
payload_csv[6] = cur_LEQ
|
||||
payload_csv[7] = cur_level
|
||||
>>>>>>> refs/remotes/origin/main
|
||||
|
||||
#print("Verify SARA connection (AT)")
|
||||
|
||||
|
||||
@@ -19,14 +19,20 @@ write_fs(frequency: int) -> sampling freq
|
||||
'''
|
||||
|
||||
import nsrt_mk3_dev
|
||||
from nsrt_mk3_dev import Weighting
|
||||
#from nsrt_mk3_dev import Weighting
|
||||
#from nsrt_mk3_dev.nsrt_mk3_dev import NsrtMk3Dev, Weighting
|
||||
from enum import Enum
|
||||
|
||||
class Weighting(Enum):
|
||||
DB_A = 1
|
||||
DB_C = 2
|
||||
DB_Z = 3
|
||||
|
||||
nsrt = nsrt_mk3_dev.NsrtMk3Dev('/dev/ttyACM0')
|
||||
|
||||
#####################
|
||||
#change time constant
|
||||
nsrt.write_tau(60)
|
||||
nsrt.write_tau(1)
|
||||
#####################
|
||||
|
||||
#####################
|
||||
|
||||
Reference in New Issue
Block a user