...
 
Commits (5)
...@@ -50,6 +50,7 @@ HPStickController::~HPStickController() { ...@@ -50,6 +50,7 @@ HPStickController::~HPStickController() {
void HPStickController::postConfiguration() { void HPStickController::postConfiguration() {
SampleTemperatureController::postConfiguration(); SampleTemperatureController::postConfiguration();
stickTemp.set(temp3Temperature());
stickTemp.setUnit(temperatureUnit()); stickTemp.setUnit(temperatureUnit());
registerUpdater(m_SampleDriver->vacuum, &HPStickController::updateVacuum, this); registerUpdater(m_SampleDriver->vacuum, &HPStickController::updateVacuum, this);
registerUpdater(m_SampleDriver->temp3, &HPStickController::updatestickTemp, this); registerUpdater(m_SampleDriver->temp3, &HPStickController::updatestickTemp, this);
......
...@@ -54,7 +54,7 @@ static const char SET_DECELERATION[] = "DEC 1 "; ...@@ -54,7 +54,7 @@ static const char SET_DECELERATION[] = "DEC 1 ";
static const char SET_LIMIT_MIN_MODE[] = "TMN 1 "; static const char SET_LIMIT_MIN_MODE[] = "TMN 1 ";
static const char SET_LIMIT_MAX_MODE[] = "TMX 1 "; static const char SET_LIMIT_MAX_MODE[] = "TMX 1 ";
static const char SET_POWER_ON[] = "SVO 1 1"; static const char SET_POWER_ON[] = "SVO 1 1";
static const char SET_REFERENCE[] = "FRF 1"; static const char SET_REFERENCE[] = "FNL 1";
static const char DEFINE_HOME[] = "DFH "; static const char DEFINE_HOME[] = "DFH ";
static const char MOVE_ABSOLUTE[] = "MOV 1 "; static const char MOVE_ABSOLUTE[] = "MOV 1 ";
static const char MOVE_RELATIVE[] = "MVR 1 "; static const char MOVE_RELATIVE[] = "MVR 1 ";
......
...@@ -110,7 +110,7 @@ void PIC867Driver::execute(const std::string& aCommand) { ...@@ -110,7 +110,7 @@ void PIC867Driver::execute(const std::string& aCommand) {
} else if (aCommand == COMMAND_RESET) { } else if (aCommand == COMMAND_RESET) {
// Stop command // Stop command
startActivated = false; startActivated = false;
currentState->reset(); currentState->init();
} else if (aCommand == driver::STOP_COMMAND) { } else if (aCommand == driver::STOP_COMMAND) {
// Stop command // Stop command
startActivated = false; startActivated = false;
......
# Commands # Commands
PIC867.writeParam=Write Param PIC867.writeParam=Write Param
PIC867.manualMove=Manual Move PIC867.init=Init
PIC867.stop=Stop PIC867.stop=Stop
PIC867.versionPrefix=version: PIC867.versionPrefix=version:
......
...@@ -12,9 +12,11 @@ ...@@ -12,9 +12,11 @@
</property> </property>
<property name="max_position" type="Double" max_length="10"> <property name="max_position" type="Double" max_length="10">
<decimal_format nb_decimal_places="5"/>
</property> </property>
<property name="min_position" type="Double" max_length="10"> <property name="min_position" type="Double" max_length="10">
<decimal_format nb_decimal_places="5"/>
</property> </property>
<property name="wanted_velocity" type="Double" max_length="6"> <property name="wanted_velocity" type="Double" max_length="6">
...@@ -33,7 +35,7 @@ ...@@ -33,7 +35,7 @@
<property name="tolerance" type="Double" max_length="8"> <property name="tolerance" type="Double" max_length="8">
<decimal_format nb_decimal_places="3"/> <decimal_format nb_decimal_places="5"/>
</property> </property>
<property name="tolerance" type="Double" max_length="8"> <property name="tolerance" type="Double" max_length="8">
<decimal_format nb_decimal_places="5"/> <decimal_format nb_decimal_places="5"/>
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
<newLine/> <newLine/>
<newLine/> <newLine/>
<button role="PIC8671" command="writeParam" prefix="PIC867.writeParam"/> <button role="PIC8671" command="writeParam" prefix="PIC867.writeParam"/>
<button role="PIC8671" command="reset" prefix="PIC867.init"/>
<summary> <summary>
......