Skip to content
Snippets Groups Projects
Commit 3ef145b0 authored by Jean Coquet's avatar Jean Coquet
Browse files

* correction bug sur initialisation du num�ro de loop dans HWProxy.cpp

* suppression de caract�res unicode ajout�s
parent ccef51ee
No related branches found
No related tags found
No related merge requests found
...@@ -43,10 +43,10 @@ namespace HWProxy_ns ...@@ -43,10 +43,10 @@ namespace HWProxy_ns
read_timeout_ms = _src.read_timeout_ms; read_timeout_ms = _src.read_timeout_ms;
periodic_timeout_ms = _src.periodic_timeout_ms; periodic_timeout_ms = _src.periodic_timeout_ms;
time_in_deadband = _src.time_in_deadband; time_in_deadband = _src.time_in_deadband;
if (_src.loop_number > 0 && loop_number < 3) if (_src.loop_number > 0 && _src.loop_number < 3)
loop_number = _src.loop_number; loop_number = _src.loop_number;
else else
loop_number = 1; loop_number = 0;
} }
...@@ -844,9 +844,13 @@ namespace HWProxy_ns ...@@ -844,9 +844,13 @@ namespace HWProxy_ns
return "Initialisation error"; return "Initialisation error";
status_str.clear (); status_str.clear ();
std::stringstream s;
s << "Loop Number <" << conf.loop_number << "> uses Input <" << this->input_number << "> as process variable" << std::endl;
status_str = s.str ();
//- Operation Status Register //- Operation Status Register
if (this->opstr_state != 0) if (this->opstr_state != 0)
status_str = "OPSTR Status : \n"; status_str += "OPSTR Status : \n";
if ((this->opstr_state & ALARM) != 0) if ((this->opstr_state & ALARM) != 0)
status_str += "Lakeshore in ALARM\n"; status_str += "Lakeshore in ALARM\n";
if ((this->opstr_state & OVLD) != 0) if ((this->opstr_state & OVLD) != 0)
......
...@@ -94,7 +94,7 @@ namespace rsm_ns ...@@ -94,7 +94,7 @@ namespace rsm_ns
void RampingStateMachine::check_ramp_progress(void) void RampingStateMachine::check_ramp_progress(void)
{ {
DEBUG_STREAM << "RampingStateMachine::check_ramp_progress(): entering... !" << endl; DEBUG_STREAM << "RampingStateMachine::check_ramp_progress(): entering... !" << endl;
//- depassement de bande morte : retour la valeur REGUL_RUNNING //- depassement de bande morte : retour a la valeur REGUL_RUNNING
//- overlapped the deadband //- overlapped the deadband
if (fabs(this->temperature - this->setpoint) > this->deadband) if (fabs(this->temperature - this->setpoint) > this->deadband)
{ {
...@@ -154,7 +154,7 @@ namespace rsm_ns ...@@ -154,7 +154,7 @@ namespace rsm_ns
{ {
if(this->temperature > this->setpoint) if(this->temperature > this->setpoint)
{ {
DEBUG_STREAM << "RampingStateMachine::is_setpoint_crossed() : traverse positive consigne " << endl; DEBUG_STREAM << "RampingStateMachine::is_setpoint_crossed() : traversee positive consigne " << endl;
return true; return true;
} }
} }
...@@ -162,11 +162,11 @@ namespace rsm_ns ...@@ -162,11 +162,11 @@ namespace rsm_ns
{ {
if(this->setpoint > this->temperature) if(this->setpoint > this->temperature)
{ {
DEBUG_STREAM << "RampingStateMachine::is_setpoint_crossed() : traverse negative consigne " << endl; DEBUG_STREAM << "RampingStateMachine::is_setpoint_crossed() : traversee negative consigne " << endl;
return true; return true;
} }
} }
DEBUG_STREAM << "RampingStateMachine::is_setpoint_crossed() : pas traverse consigne" << endl; DEBUG_STREAM << "RampingStateMachine::is_setpoint_crossed() : pas traversee consigne" << endl;
return false; return false;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment