Commit dc25cfc1 authored by Jerome Locatelli's avatar Jerome Locatelli
Browse files

commit stereo update for ICPcon and stereo watch dog. Repository deosn't...

commit stereo update for ICPcon and stereo watch dog. Repository deosn't compiled (unit test on jenkins)
parent 36f0b960
......@@ -97,13 +97,12 @@ void StereoWatchdogController::Loop() {
if(temperature()>temperaturemax()||level1()||level2()) safe.set(false); // the experiment is not safe
else safe.set(true);
if(safe()){
//d0.set(m_Driver->readDigitalOutput(0));
d0.set(m_Driver->readDigitalOutput(0));
if(d0()==0) value=1;
else value=0;
m_Driver->writeDigitalOutput(0,value);
sleep(15);
d0.set(m_Driver->readDigitalOutput(0));
sleep(15);
sleep(5);
}
else sleep(5);
}
......
StereoWatchdog.temperaturePrefix=Temperature
StereoWatchdog.level1Prefix=Level 1
StereoWatchdog.level2Prefix=Level 2
StereoWatchdog.safePrefix=Safe state
StereoWatchdog.d0Prefix=D0
\ No newline at end of file
StereoWatchdog.temperaturemaxPrefix=Temperature Max
StereoWatchdog.level1Prefix=Level 1:
StereoWatchdog.level2Prefix=Level 2:
StereoWatchdog.safePrefix=Safe:
StereoWatchdog.d0Prefix=D0:
\ No newline at end of file
......@@ -2,7 +2,7 @@
<controller type="stereo_watchdog_controller" role="StereoWatchdogController1"/>
<label role="StereoWatchdogController1" property="temperature" prefix="StereoWatchdog.temperaturePrefix"/>
<text role="StereoWatchdogController1" property="temperaturemax"/>
<text role="StereoWatchdogController1" property="temperaturemax" prefix="StereoWatchdog.temperaturemaxPrefix"/>
<newLine/>
<label role="StereoWatchdogController1" property="level1" prefix="StereoWatchdog.level1Prefix"/>
<newLine/>
......
Markdown is supported
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