Commit bb5888ec authored by Abdelali Elaazzouzi's avatar Abdelali Elaazzouzi Committed by Franck Cecillon

adds

parent fa7189be
......@@ -425,7 +425,7 @@ void PolarizationController::start() {
startPhase (stateValue() , consign1 , consign2 );
commandProgression = 50;
usleep(1000); //wait for 1 msec
usleep(delay()*1000); //wait for 1 msec
consign1 = down1Value.setpoint();
consign2 = down2Value.setpoint();
......
......@@ -4,11 +4,11 @@ polarization.wantedValuePrefix=Wanted polarization
polarization.upValuePrefix=Polarization + state
polarization.downValuePrefix=Polarization - state
polarization.pulsedPrefix=Pulsed
polarization.delayPrefix=Delay
polarization.delayPrefix=Pulse Duration
polarization.voltSuffix=V
polarization.ampsSuffix=A
polarization.delaySuffix=s
polarization.delaySuffix=ms
polarization.pulsedCheckedValue=true
polarization.pulsedUncheckedValue=false
......
......@@ -18,7 +18,7 @@
<newLine/>
<text role="lsswavelength1" property="angle_factor" prefix="lsswavelength.angle_factorPrefix"/>
<newLine/>
<label role="lsswavelength1" property="sel_tt_angle" prefix="lsswavelength.sel_tt_anglePrefix"/>
<text role="lsswavelength1" property="sel_tt_angle" prefix="lsswavelength.sel_tt_anglePrefix"/>
</group>
<newLine/>
<group title="lsswavelength1.resolutionTitle">
......
......@@ -188,7 +188,7 @@ void RealFugHCPDriver::start() {
} else {
positive();
}
writeCurrent(fabs(owner()->currentLimit()));
// writeCurrent(fabs(owner()->currentLimit()));
writeVoltage(fabs(owner()->voltage.setpoint()));
}
......
......@@ -127,7 +127,7 @@ void RealD33AstriumChopperComputerDriver::setDir(DeviceDriver* aDeviceDriver) {
w_dir = trim(any_cast<std::string>(aDeviceDriver->getValue(D33ASTRIUMCHOPPER_WANTED_DIRECTION_DEVICE_CONTAINER)));
buf_conf <<D33ASTRIUMCHOPPER_DIR_COMMAND<< channel<<": "<<w_dir<<D33ASTRIUMCHOPPER_ENDL;
// cout<< "send setDir "<< D33ASTRIUMCHOPPER_DIR_COMMAND<< channel<<D33ASTRIUMCHOPPER_SEPARATOR<<w_dir<< endl;
cout<< "send setDir "<< D33ASTRIUMCHOPPER_DIR_COMMAND<< channel<<D33ASTRIUMCHOPPER_SEPARATOR<<w_dir<< endl;
m_owner->write(buf_conf.str());
string buf_poubelle;
......@@ -151,12 +151,12 @@ void RealD33AstriumChopperComputerDriver::setGear(DeviceDriver* aDeviceDriver) {
int32 w_gear = any_cast<int32>(aDeviceDriver->getValue(D33ASTRIUMCHOPPER_WANTED_GEAR_DEVICE_CONTAINER));
uint32 channel = aDeviceDriver->getChannel();
buf_conf <<D33ASTRIUMCHOPPER_GEAR_COMMAND<< channel<<": "<<w_gear <<D33ASTRIUMCHOPPER_ENDL;
// cout<< "send setGear "<< D33ASTRIUMCHOPPER_GEAR_COMMAND<< channel<<":"<<w_gear<< endl;
cout<< "send setGear "<< D33ASTRIUMCHOPPER_GEAR_COMMAND<< channel<<":"<<w_gear<< endl;
m_owner->write(buf_conf.str());
string buf_poubelle;
m_owner->read(buf_poubelle, D33ASTRIUMCHOPPER_ENDL); // just for clear the second string
// cout<< "return setGear "<<buf_poubelle<< endl;
cout<< "return setGear "<<buf_poubelle<< endl;
sleep(1);
}
......
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