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

manda le cose su mqtt

Browse Source
This commit is contained in:
Emanuele
2021-02-19 17:26:04 +01:00
parent 0d4735d28d
commit c7b9dcadad
2 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
NasoScope/config.json
View File

@@ -1,6 +1,6 @@
{ {
"version": "0.1c", "version": "0.2",
"logFile": "D:\\Test\\Nasoscope.log", "logFile": "./Nasoscope.log",
"logFormat": "%(asctime)s|%(levelname)-7s|%(funcName)-10s|%(lineno)-3d: %(message)-50s", "logFormat": "%(asctime)s|%(levelname)-7s|%(funcName)-10s|%(lineno)-3d: %(message)-50s",
"logTimeFormat": "%m-%d %H:%M:%S", "logTimeFormat": "%m-%d %H:%M:%S",
"URL": "http://localhost:8081", "URL": "http://localhost:8081",
@@ -8,7 +8,7 @@
"loopPeriod": 0.5, "loopPeriod": 0.5,
"recordTime": 3600, "recordTime": 3600,
"fileSaveTime": 360, "fileSaveTime": 360,
"fileSaveDir": "D:\\Test\\Traces3015\\{}_CL3015HSD.{fType}", "fileSaveDir": "./{}_CL3015HSD.{fType}",
"fileType": "csv", "fileType": "csv",
"variables": [ {"deviceID":1, "variables": [ {"deviceID":1,
"name": "AsseX", "name": "AsseX",
@@ -41,8 +41,10 @@
"descr": ["ActualFeed","FollowingError","MeasuredPosition","CalculatedAcceleration","Jerk","ServoPoint"] "descr": ["ActualFeed","FollowingError","MeasuredPosition","CalculatedAcceleration","Jerk","ServoPoint"]
} }
], ],
"mqttHost": "192.168.10.81", "mqttHost": "localhost",
"mqttPort": 1883, "mqttPort": 1883,
"mqttSend": "nasoscope/cnc2recorder", "mqttSend": "nasoscope/cnc2recorder",
"mqttReceive": "nasoscope/recorder2cnc" "mqttReceive": "nasoscope/recorder2cnc",
"sendMqtt": true,
"mqttSendSamples": "nasoscope/samples"
} }

30
NasoScope/nasomain.py
View File

@@ -197,6 +197,10 @@ def saveSamples(s, fileName = None):
dataOut.write(json.dumps(s)) dataOut.write(json.dumps(s))
pass pass
def sendSamples(s):
client.publish(settings['mqttSendSamples']json.dumps(s))
def onMessage(cli, userdata, msg): def onMessage(cli, userdata, msg):
global stat global stat
msg=str(msg.payload) msg=str(msg.payload)
@@ -326,18 +330,21 @@ 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]-firstTS)/10**6, tempSamples[ax][reg][idx]=((tempSamples[ax][reg][idx][templates.SAM_TS]-firstTS)/10**6,
tempSamples[ax][reg][idx][templates.SAM_VAL]) tempSamples[ax][reg][idx][templates.SAM_VAL])
if tempSamples[ax][reg][idx][templates.SAM_TS] > settings["recordTime"]: if not settings["sendMqtt"]:
samples[ax][reg] = samples[ax][reg][-(len(samples)-len(tempSamples)):] if tempSamples[ax][reg][idx][templates.SAM_TS] > settings["recordTime"]:
if bufferFull < 1: samples[ax][reg] = samples[ax][reg][-(len(samples)-len(tempSamples)):]
bufferFull = 1 if bufferFull < 1:
elif bufferFull == 1: bufferFull = 1
LOGGER.warning("Buffer Campioni Pieno, inizio roll") elif bufferFull == 1:
bufferFull = 2 LOGGER.warning("Buffer Campioni Pieno, inizio roll")
else: bufferFull = 2
else:
pass
pass pass
pass pass
pass samples[ax][reg]+=tempSamples[ax][reg]
samples[ax][reg]+=tempSamples[ax][reg] else:
sendSamples(tempSamples)
pass pass
pass pass
pass pass
@@ -352,7 +359,8 @@ if __name__ == '__main__':
elif stat == "STOP": elif stat == "STOP":
stopSampling() stopSampling()
closeChannel() closeChannel()
saveSamples(samples) if not settings['sendMqtt']:
saveSamples(samples)
LOGGER.warning("Chiudo il Canale") LOGGER.warning("Chiudo il Canale")
stat = "IDLE" stat = "IDLE"
firstLoop = True firstLoop = True