diff --git a/install_local_mqtt_broker.sh b/install_local_mqtt_broker.sh old mode 100644 new mode 100755 diff --git a/mqtt_controller.py b/mqtt_controller.py index df30e2a045c29bded19790a1ec5872722748c20d..93abf662492cb34d58fc86b3ad1746fb24529a94 100644 --- a/mqtt_controller.py +++ b/mqtt_controller.py @@ -15,7 +15,7 @@ publisher_config['topic'] = MQTT_CONTROL_CONFIG['ctrl_topic'] publisher_config.pop('ctrl_topic') settings = { 'injection_duration': 0.2, - 'nbr_meas': 100, + 'nbr_meas': 1, 'sequence_delay': 1, 'nb_stack': 1, 'export_path': 'data/measurement.csv' diff --git a/ohmpi.py b/ohmpi.py index 64a8f4655f9a1c5bb98ab1133d34e7f771431101..3db2c402f749d3dfe93a9c77749942c31c7b989e 100644 --- a/ohmpi.py +++ b/ohmpi.py @@ -810,8 +810,9 @@ print(current_time.strftime("%Y-%m-%d %H:%M:%S")) # for testing if __name__ == "__main__": # start interface - Popen(['python', CONTROL_CONFIG['interface']]) + #Popen(['python', CONTROL_CONFIG['interface']]) ohmpi = OhmPi(settings='ohmpi_settings.json') + diff --git a/ohmpi_settings.json b/ohmpi_settings.json index eea474050b8be42722a4e2f54488cfc901cb954e..273f22904d72553ed4c5140379992cd9672d0462 100644 --- a/ohmpi_settings.json +++ b/ohmpi_settings.json @@ -1,7 +1,7 @@ { "nb_electrodes": 64, "injection_duration":0.2, - "nbr_meas": 100, + "nbr_meas": 1, "sequence_delay": 1, "nb_stack": 1, "export_path": "data/measurement.csv" diff --git a/webserver.py b/webserver.py index d925f57962624fc1712b576f858bdd2d248d5fc7..f9d5dabccdd210ff08e45f53a843118495c2ea4a 100644 --- a/webserver.py +++ b/webserver.py @@ -18,8 +18,8 @@ serverPort = 8080 # https://gist.github.com/MichaelCurrie/19394abc19abd0de4473b595c0e37a3a -with open('ohmpi_param.json') as json_file: - pardict = json.load(json_file) +#with open('ohmpi_settings.json') as json_file: +# pardict = json.load(json_file) #ohmpi = OhmPi(pardict, sequence='dd.txt') #ohmpi = OhmPi(pardict, sequence='dd16s0no8.txt')