update

loop/SARA_send_data_v2.py

@@ -49,6 +49,11 @@ CSV PAYLOAD (AirCarto Servers)
     17  -> PM 5.0μm to 10μm quantity (Nb/L)
     18  -> NPM temp inside
     19  -> NPM hum inside
+    20  -> battery_voltage
+    21  -> battery_current
+    22  -> solar_voltage
+    23  -> solar_power
+    24  -> charger_status
 
 JSON PAYLOAD (Micro-Spot Servers)
     Same as NebuleAir wifi
@@ -115,7 +120,7 @@ if uptime_seconds < 120:
     sys.exit()
 
 #Payload CSV to be sent to data.nebuleair.fr
-payload_csv = [None] * 25
+payload_csv = [None] * 30
 #Payload JSON to be sent to uSpot
 payload_json = {
     "nebuleairid": "XXX",
@@ -210,6 +215,9 @@ baudrate = config.get('SaraR4_baudrate', 115200)                    #baudrate du
 device_id = config.get('deviceID', '').upper()                      #device ID en maj
 bme_280_config = config.get('BME280/get_data_v2.py', False)         #présence du BME280
 envea_cairsens= config.get('envea/read_value_v2.py', False)
+mppt_charger= config.get('MPPT/read.py', False)
+wind_meter= config.get('windMeter/read.py', False)
+
 send_aircarto = config.get('send_aircarto', True)                   #envoi sur AirCarto (data.nebuleair.fr)
 send_uSpot = config.get('send_uSpot', False)                        #envoi sur MicroSpot ()
 selected_networkID = int(config.get('SARA_R4_neworkID', 0))
@@ -355,7 +363,7 @@ try:
     #NextPM 5 channels
     if npm_5channel:
         print("➡️Getting NextPM 5 channels values (last 6 measures)")
-        cursor.execute("SELECT * FROM data_NPM_5channels ORDER BY timestamp DESC LIMIT 6")
+        cursor.execute("SELECT * FROM data_NPM_5channels ORDER BY rowid DESC LIMIT 6")
         rows = cursor.fetchall()
         # Exclude the timestamp column (assuming first column is timestamp)
         data_values = [row[1:] for row in rows]  # Exclude timestamp
@@ -373,7 +381,7 @@ try:
     #BME280
     if bme_280_config:
         print("➡️Getting BME280 values")
-        cursor.execute("SELECT * FROM data_BME280 ORDER BY timestamp DESC LIMIT 1")
+        cursor.execute("SELECT * FROM data_BME280 ORDER BY rowid DESC LIMIT 1")
         last_row = cursor.fetchone()
         if last_row:
             print("SQLite DB last available row:", last_row)
@@ -396,7 +404,7 @@ try:
     #envea
     if envea_cairsens:
         print("➡️Getting envea cairsens values")
-        cursor.execute("SELECT * FROM data_envea ORDER BY timestamp DESC LIMIT 6")
+        cursor.execute("SELECT * FROM data_envea ORDER BY rowid DESC LIMIT 6")
         rows = cursor.fetchall()
         # Exclude the timestamp column (assuming first column is timestamp)
         data_values = [row[1:] for row in rows]  # Exclude timestamp
@@ -420,6 +428,31 @@ try:
         payload_json["sensordatavalues"].append({"value_type": "CAIRSENS_NO2", "value": str(averages[1])})
         payload_json["sensordatavalues"].append({"value_type": "CAIRSENS_NH3", "value": str(averages[2])})
 
+    #Wind meter    
+    if wind_meter:
+        print("➡️Getting wind meter values")
+
+    #MPPT charger    
+    if mppt_charger:
+        print("➡️Getting MPPT charger values")
+        cursor.execute("SELECT * FROM data_MPPT ORDER BY rowid DESC LIMIT 1")
+        last_row = cursor.fetchone()
+        if last_row:
+            print("SQLite DB last available row:", last_row)
+            battery_voltage = last_row[1]  
+            battery_current = last_row[2]
+            solar_voltage = last_row[3]
+            solar_power = last_row[4]
+            charger_status = last_row[5]
+
+            #Add data to payload CSV
+            payload_csv[20] = battery_voltage 
+            payload_csv[21] = battery_current
+            payload_csv[22] = solar_voltage
+            payload_csv[23] = solar_power
+            payload_csv[24] = charger_status
+        else:
+            print("No data available in the database.")
 
     print("Verify SARA R4 connection")