Obbart/NasoScopio
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cosine

Browse Source
This commit is contained in:
Emanuele
2021-02-26 12:19:01 +01:00
parent 476458303b
commit f9696979cf
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nasomain.py
View File

@@ -341,7 +341,7 @@ if __name__ == '__main__':
for idx,rec in enumerate(tempSamples[ax][reg]): for idx,rec in enumerate(tempSamples[ax][reg]):
tempSamples[ax][reg][idx]=(tempSamples[ax][reg][idx][templates.SAM_TS], tempSamples[ax][reg][idx]=(tempSamples[ax][reg][idx][templates.SAM_TS],
tempSamples[ax][reg][idx][templates.SAM_VAL]) tempSamples[ax][reg][idx][templates.SAM_VAL])
if settings["sendMqtt"]: if not settings["sendMqtt"]:
if tempSamples[ax][reg][idx][templates.SAM_TS] > settings["recordTime"]: if tempSamples[ax][reg][idx][templates.SAM_TS] > settings["recordTime"]:
samples[ax][reg] = samples[ax][reg][-(len(samples)-len(tempSamples)):] samples[ax][reg] = samples[ax][reg][-(len(samples)-len(tempSamples)):]
if bufferFull < 1: if bufferFull < 1:
@@ -356,8 +356,9 @@ if __name__ == '__main__':
samples[ax][reg]+=tempSamples[ax][reg] samples[ax][reg]+=tempSamples[ax][reg]
else: else:
sendSamples(tempSamples) sendSamples(tempSamples)
elif settings['sendInflux']: else:
influxMeas = list() influxMeas = list()
LOGGER.debug("Invio Influx")
for idx,record in enumerate(tempSamples[ax][reg]): for idx,record in enumerate(tempSamples[ax][reg]):
ts = tempSamples[ax][reg][idx][templates.SAM_TS]+firstTS*1000000 ts = tempSamples[ax][reg][idx][templates.SAM_TS]+firstTS*1000000
influxMeas.append({ influxMeas.append({
@@ -376,8 +377,6 @@ if __name__ == '__main__':
LOGGER.error(f'Impossibile scrivere nel database: {e}') LOGGER.error(f'Impossibile scrivere nel database: {e}')
LOGGER.error(f'TS da controllo: {datetime.fromtimestamp(ts).strftime("%d/%m/%y_%H:%M:%S,%f")}') LOGGER.error(f'TS da controllo: {datetime.fromtimestamp(ts).strftime("%d/%m/%y_%H:%M:%S,%f")}')
stat='STOP' stat='STOP'
else:
pass
pass pass
pass pass
pass pass