Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| db79d903aa | |||
| 14c0148d3a | |||
| 2e52959f53 |
@@ -130,3 +130,6 @@ dmypy.json
|
|||||||
|
|
||||||
# Smartmeter Konfigurationsfile
|
# Smartmeter Konfigurationsfile
|
||||||
wetterconfig.toml
|
wetterconfig.toml
|
||||||
|
|
||||||
|
# WeeWx SQLDatenbank
|
||||||
|
weewx.sdb
|
||||||
|
|||||||
+1
-1
@@ -46,7 +46,7 @@ def status_auswerten(r, logger, daten):
|
|||||||
def sende_daten(url, table, headers, daten, logger):
|
def sende_daten(url, table, headers, daten, logger):
|
||||||
url = f"{url}{table}"
|
url = f"{url}{table}"
|
||||||
for data in daten:
|
for data in daten:
|
||||||
data.ts = datetime.datetime.fromtimestamp(int(data.ts)).strftime("%Y-%m-%d %H:%M:%S")
|
data.ts = data.ts.strftime("%Y-%m-%d %H:%M:%S")
|
||||||
logger.debug(f"Folgende Daten werden gesendet an {table}:\n {daten}")
|
logger.debug(f"Folgende Daten werden gesendet an {table}:\n {daten}")
|
||||||
r = requests.post(url, headers=headers, json=[data.to_dict() for data in daten])
|
r = requests.post(url, headers=headers, json=[data.to_dict() for data in daten])
|
||||||
status_auswerten(r, logger, daten)
|
status_auswerten(r, logger, daten)
|
||||||
|
|||||||
+4
-1
@@ -45,7 +45,9 @@ def rohdaten_laden(timestamp, stationsname):
|
|||||||
zusatzwetterdaten_liste = []
|
zusatzwetterdaten_liste = []
|
||||||
for nr, datensatz in enumerate(query):
|
for nr, datensatz in enumerate(query):
|
||||||
LOGGER.debug(f"Datensatz {nr + 1} von {gesamtzahl}")
|
LOGGER.debug(f"Datensatz {nr + 1} von {gesamtzahl}")
|
||||||
rohdaten = {"ts": datensatz.date_time}
|
ts = datensatz.date_time
|
||||||
|
ts_with_tz = ts.replace(tzinfo=datetime.timezone.utc)
|
||||||
|
rohdaten = {"ts": ts_with_tz}
|
||||||
if datensatz.us_units == 1:
|
if datensatz.us_units == 1:
|
||||||
rohdaten["outtemp"] = mwu.temperaturumrechner(datensatz.out_temp)
|
rohdaten["outtemp"] = mwu.temperaturumrechner(datensatz.out_temp)
|
||||||
rohdaten["inTemp"] = mwu.temperaturumrechner(datensatz.in_temp)
|
rohdaten["inTemp"] = mwu.temperaturumrechner(datensatz.in_temp)
|
||||||
@@ -120,6 +122,7 @@ def freigabe_setzen(zusatzwetterdaten_liste):
|
|||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
if sys.platform == "linux":
|
||||||
laufende_prozesse = check_process()
|
laufende_prozesse = check_process()
|
||||||
if laufende_prozesse > 1:
|
if laufende_prozesse > 1:
|
||||||
print("EXIT aufgrund laufender Prozesse")
|
print("EXIT aufgrund laufender Prozesse")
|
||||||
|
|||||||
+1
-1
@@ -18,7 +18,7 @@ class Archive(BaseModel):
|
|||||||
altimeter = FloatField(null=True)
|
altimeter = FloatField(null=True)
|
||||||
barometer = FloatField(null=True)
|
barometer = FloatField(null=True)
|
||||||
cons_battery_voltage = FloatField(column_name='consBatteryVoltage', null=True)
|
cons_battery_voltage = FloatField(column_name='consBatteryVoltage', null=True)
|
||||||
date_time = AutoField(column_name='dateTime')
|
date_time = TimestampField(column_name='dateTime', primary_key=True, utc=True)
|
||||||
dewpoint = FloatField(null=True)
|
dewpoint = FloatField(null=True)
|
||||||
extra_humid1 = FloatField(column_name='extraHumid1', null=True)
|
extra_humid1 = FloatField(column_name='extraHumid1', null=True)
|
||||||
extra_humid2 = FloatField(column_name='extraHumid2', null=True)
|
extra_humid2 = FloatField(column_name='extraHumid2', null=True)
|
||||||
|
|||||||
Reference in New Issue
Block a user