Skip to content
Snippets Groups Projects
Commit f1387c82 authored by Vincent Hardion's avatar Vincent Hardion
Browse files

20327 : Vera++ Compliance (no more noeol)

parent a65ee878
No related branches found
No related tags found
No related merge requests found
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>fr.soleil</groupId>
<artifactId>super-pom-C-CPP-device</artifactId>
<groupId>fr.soleil</groupId>
<version>RELEASE</version>
</parent>
<groupId>fr.soleil.device</groupId>
<artifactId>Lakeshore_336-${aol}-${mode}</artifactId>
<version>1.0.1</version>
<version>1.0.2</version>
<packaging>nar</packaging>
<!--This field 'name' will define the name of the application.-->
<name>Lakeshore_336</name>
<developers>
<developer>
<id>coquet</id>
<name>coquet</name>
<url>http://controle/</url>
<organization>Synchrotron Soleil</organization>
<organizationUrl>http://www.synchrotron-soleil.fr</organizationUrl>
<roles>
<role>galerien</role>
</roles>
<timezone>1</timezone>
</developer>
</developers>
<scm>
<connection>${scm.connection.cvs.tango-ds}:Instrumentation/Lakeshore_336</connection>
<developerConnection>${scm.developerConnection.cvs.tango-ds}:Instrumentation/Lakeshore_336</developerConnection>
<url>${scm.url.cvs.tango-ds}/Instrumentation/Lakeshore_336</url>
</scm>
<build>
<plugins>
<plugin>
<groupId>org.freehep</groupId>
<artifactId>freehep-nar-plugin</artifactId>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>fr.soleil.lib</groupId>
......@@ -32,28 +48,4 @@
<artifactId>YAT-${aol}-${library}-${mode}</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.freehep</groupId>
<artifactId>freehep-nar-plugin</artifactId>
</plugin>
</plugins>
</build>
<developers>
<developer>
<id>coquet</id>
<name>coquet</name>
<url>http://controle/</url>
<organization>Synchrotron Soleil</organization>
<organizationUrl>http://www.synchrotron-soleil.fr</organizationUrl>
<roles>
<role>galerien</role>
</roles>
<timezone>1</timezone>
</developer>
</developers>
</project>
......@@ -94,7 +94,7 @@ namespace rsm_ns
void RampingStateMachine::check_ramp_progress(void)
{
DEBUG_STREAM << "RampingStateMachine::check_ramp_progress(): entering... !" << endl;
//- depassement de bande morte : retour à la valeur REGUL_RUNNING
//- depassement de bande morte : retour la valeur REGUL_RUNNING
//- overlapped the deadband
if (fabs(this->temperature - this->setpoint) > this->deadband)
{
......@@ -154,7 +154,7 @@ namespace rsm_ns
{
if(this->temperature > this->setpoint)
{
DEBUG_STREAM << "RampingStateMachine::is_setpoint_crossed() : traversée positive consigne " << endl;
DEBUG_STREAM << "RampingStateMachine::is_setpoint_crossed() : traverse positive consigne " << endl;
return true;
}
}
......@@ -162,11 +162,11 @@ namespace rsm_ns
{
if(this->setpoint > this->temperature)
{
DEBUG_STREAM << "RampingStateMachine::is_setpoint_crossed() : traversée negative consigne " << endl;
DEBUG_STREAM << "RampingStateMachine::is_setpoint_crossed() : traverse negative consigne " << endl;
return true;
}
}
DEBUG_STREAM << "RampingStateMachine::is_setpoint_crossed() : pas traversée consigne" << endl;
DEBUG_STREAM << "RampingStateMachine::is_setpoint_crossed() : pas traverse consigne" << endl;
return false;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment