forked from zietzm/Helmholtz_Test_Bench
Leons lost commit
This commit is contained in:
Generated
+1
-1
@@ -2,7 +2,7 @@
|
||||
<module type="PYTHON_MODULE" version="4">
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$" />
|
||||
<orderEntry type="jdk" jdkName="Python 3.7 (HelmholtzEnv)" jdkType="Python SDK" />
|
||||
<orderEntry type="jdk" jdkName="Python 3.9 (Helmholtz_Test_Bench)" jdkType="Python SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
<component name="PyDocumentationSettings">
|
||||
|
||||
Generated
+1
-1
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (HelmholtzEnv)" project-jdk-type="Python SDK" />
|
||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9 (Helmholtz_Test_Bench)" project-jdk-type="Python SDK" />
|
||||
</project>
|
||||
@@ -80,6 +80,17 @@ class HelmholtzCageDevice:
|
||||
# The axes talks to the HW objects (Arduino, PSU) referenced in this object
|
||||
self.axes.append(Axis(i, self))
|
||||
|
||||
# --- Preliminary PSU type info ---
|
||||
# Required post-initialization but before hardware has been connected
|
||||
psu_type_string = config_handling.read_from_config("Supplies", "supply_model",
|
||||
config_handling.CONFIG_OBJECT)
|
||||
if psu_type_string == "ps2000b":
|
||||
self.psu_type = PSUDevicePS2000B
|
||||
elif psu_type_string == "ql355tp":
|
||||
self.psu_type = PSUDeviceQL355TP
|
||||
else:
|
||||
raise Exception("Invalid psu model:\n{}".format(self.psu_type))
|
||||
|
||||
# --- HW COMMUNICATION THREAD ---
|
||||
self._cmd_exec_thread = Thread(target=self._cmd_exec_thread_method)
|
||||
self._cmd_exec_thread.start()
|
||||
|
||||
Reference in New Issue
Block a user