Commit cebf8acd authored by Guillaume Blanchy's avatar Guillaume Blanchy
Browse files

update webserver

Showing with 6 additions and 5 deletions
+6 -5
File mode changed from 100644 to 100755
...@@ -15,7 +15,7 @@ publisher_config['topic'] = MQTT_CONTROL_CONFIG['ctrl_topic'] ...@@ -15,7 +15,7 @@ publisher_config['topic'] = MQTT_CONTROL_CONFIG['ctrl_topic']
publisher_config.pop('ctrl_topic') publisher_config.pop('ctrl_topic')
settings = { settings = {
'injection_duration': 0.2, 'injection_duration': 0.2,
'nbr_meas': 100, 'nbr_meas': 1,
'sequence_delay': 1, 'sequence_delay': 1,
'nb_stack': 1, 'nb_stack': 1,
'export_path': 'data/measurement.csv' 'export_path': 'data/measurement.csv'
......
...@@ -810,8 +810,9 @@ print(current_time.strftime("%Y-%m-%d %H:%M:%S")) ...@@ -810,8 +810,9 @@ print(current_time.strftime("%Y-%m-%d %H:%M:%S"))
# for testing # for testing
if __name__ == "__main__": if __name__ == "__main__":
# start interface # start interface
Popen(['python', CONTROL_CONFIG['interface']]) #Popen(['python', CONTROL_CONFIG['interface']])
ohmpi = OhmPi(settings='ohmpi_settings.json') ohmpi = OhmPi(settings='ohmpi_settings.json')
{ {
"nb_electrodes": 64, "nb_electrodes": 64,
"injection_duration":0.2, "injection_duration":0.2,
"nbr_meas": 100, "nbr_meas": 1,
"sequence_delay": 1, "sequence_delay": 1,
"nb_stack": 1, "nb_stack": 1,
"export_path": "data/measurement.csv" "export_path": "data/measurement.csv"
......
...@@ -18,8 +18,8 @@ serverPort = 8080 ...@@ -18,8 +18,8 @@ serverPort = 8080
# https://gist.github.com/MichaelCurrie/19394abc19abd0de4473b595c0e37a3a # https://gist.github.com/MichaelCurrie/19394abc19abd0de4473b595c0e37a3a
with open('ohmpi_param.json') as json_file: #with open('ohmpi_settings.json') as json_file:
pardict = json.load(json_file) # pardict = json.load(json_file)
#ohmpi = OhmPi(pardict, sequence='dd.txt') #ohmpi = OhmPi(pardict, sequence='dd.txt')
#ohmpi = OhmPi(pardict, sequence='dd16s0no8.txt') #ohmpi = OhmPi(pardict, sequence='dd16s0no8.txt')
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment