Merge branch 'master' into mueller_branch

3db281ef · Robin Mueller · 19076d19 · 237770b6 · 3db281ef
Commit 3db281ef authored 5 years ago by Robin Mueller
--- a/config/OBSW_Config.py
+++ b/config/OBSW_Config.py
@@ -47,7 +47,7 @@ displayMode = "long"
 comIF = 0
 # COM Port for serial communication
 comPort = 'COM0'
-serialTimeout = 0.003
+serialTimeout = 0.01
 # Time related
 tmTimeout = 10
 tcSendTimeoutFactor = 2.0