X-Git-Url: https://zdv2.bktei.com/gitweb/EVA-2020-02-2.git/blobdiff_plain/a36c0e8d8d94eae0353e5bff14ac837e17139671..e72e5682757a38fb94317d68758b874c61d55dd1:/examples/luftdaten.py

diff --git a/examples/luftdaten.py b/examples/luftdaten.py
index 9995914..84f1117 100755
--- a/examples/luftdaten.py
+++ b/examples/luftdaten.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import requests
 import ST7735
@@ -7,6 +7,7 @@ from bme280 import BME280
 from pms5003 import PMS5003, ReadTimeoutError
 from subprocess import PIPE, Popen, check_output
 from PIL import Image, ImageDraw, ImageFont
+from fonts.ttf import RobotoMedium as UserFont
 
 try:
     from smbus2 import SMBus
@@ -74,7 +75,6 @@ def read_values():
 def get_cpu_temperature():
     process = Popen(['vcgencmd', 'measure_temp'], stdout=PIPE, universal_newlines=True)
     output, _error = process.communicate()
-    output = output.decode()
     return float(output[output.index('=') + 1:output.rindex("'")])
 
 
@@ -115,32 +115,35 @@ def send_to_luftdaten(values, id):
     pm_values = dict(i for i in values.items() if i[0].startswith("P"))
     temp_values = dict(i for i in values.items() if not i[0].startswith("P"))
 
-    resp_1 = requests.post("https://api.luftdaten.info/v1/push-sensor-data/",
-             json={
-                 "software_version": "enviro-plus 0.0.1",
-                 "sensordatavalues": [{"value_type": key, "value": val} for
-                                      key, val in pm_values.items()]
-             },
-             headers={
-                 "X-PIN":    "1",
-                 "X-Sensor": id,
-                 "Content-Type": "application/json",
-                 "cache-control": "no-cache"
-             }
+    pm_values_json = [{"value_type": key, "value": val} for key, val in pm_values.items()]
+    temp_values_json = [{"value_type": key, "value": val} for key, val in temp_values.items()]
+
+    resp_1 = requests.post(
+        "https://api.luftdaten.info/v1/push-sensor-data/",
+        json={
+            "software_version": "enviro-plus 0.0.1",
+            "sensordatavalues": pm_values_json
+        },
+        headers={
+            "X-PIN": "1",
+            "X-Sensor": id,
+            "Content-Type": "application/json",
+            "cache-control": "no-cache"
+        }
     )
 
-    resp_2 = requests.post("https://api.luftdaten.info/v1/push-sensor-data/",
-             json={
-                 "software_version": "enviro-plus 0.0.1",
-                 "sensordatavalues": [{"value_type": key, "value": val} for
-                                      key, val in temp_values.items()]
-             },
-             headers={
-                 "X-PIN":    "11",
-                 "X-Sensor": id,
-                 "Content-Type": "application/json",
-                 "cache-control": "no-cache"
-             }
+    resp_2 = requests.post(
+        "https://api.luftdaten.info/v1/push-sensor-data/",
+        json={
+            "software_version": "enviro-plus 0.0.1",
+            "sensordatavalues": temp_values_json
+        },
+        headers={
+            "X-PIN": "11",
+            "X-Sensor": id,
+            "Content-Type": "application/json",
+            "cache-control": "no-cache"
+        }
     )
 
     if resp_1.ok and resp_2.ok:
@@ -150,7 +153,7 @@ def send_to_luftdaten(values, id):
 
 
 # Compensation factor for temperature
-comp_factor = 1.2
+comp_factor = 2.25
 
 # Raspberry Pi ID to send to Luftdaten
 id = "raspi-" + get_serial_number()
@@ -161,7 +164,7 @@ HEIGHT = disp.height
 
 # Text settings
 font_size = 16
-font = ImageFont.truetype("fonts/Asap/Asap-Bold.ttf", font_size)
+font = ImageFont.truetype(UserFont, font_size)
 
 # Display Raspberry Pi serial and Wi-Fi status
 print("Raspberry Pi serial: {}".format(get_serial_number()))