...
 
Commits (3)
...@@ -116,22 +116,22 @@ void HumidityChamber::postConfiguration() { ...@@ -116,22 +116,22 @@ void HumidityChamber::postConfiguration() {
updateHumidity(); updateHumidity();
updatePressure(); updatePressure();
registerUpdater(m_BathReservoir->sampleTemperatureCelsius, &HumidityChamber::updateActualProperty, this, m_BathReservoir->sampleTemperatureCelsius, TbathReservoir); registerUpdater(m_BathReservoir->sampleTemperature, &HumidityChamber::updateActualProperty, this, m_BathReservoir->sampleTemperature, TbathReservoir);
updateActualProperty(m_BathReservoir->sampleTemperatureCelsius, TbathReservoir); updateActualProperty(m_BathReservoir->sampleTemperature, TbathReservoir);
registerUpdater(m_BathReservoir->wantedTemperatureCelsius, &HumidityChamber::updateSetpointProperty, this, m_BathReservoir->wantedTemperatureCelsius, TbathReservoir); registerUpdater(m_BathReservoir->wantedTemperature, &HumidityChamber::updateSetpointProperty, this, m_BathReservoir->wantedTemperature, TbathReservoir);
updateSetpointProperty(m_BathReservoir->wantedTemperatureCelsius, TbathReservoir); updateSetpointProperty(m_BathReservoir->wantedTemperature, TbathReservoir);
registerUpdater(m_BathSample->sampleTemperatureCelsius, &HumidityChamber::updateActualProperty, this, m_BathSample->sampleTemperatureCelsius, TbathSample); registerUpdater(m_BathSample->sampleTemperature, &HumidityChamber::updateActualProperty, this, m_BathSample->sampleTemperature, TbathSample);
updateActualProperty(m_BathSample->sampleTemperatureCelsius, TbathSample); updateActualProperty(m_BathSample->sampleTemperature, TbathSample);
registerUpdater(m_BathSample->wantedTemperatureCelsius, &HumidityChamber::updateSetpointProperty, this, m_BathSample->wantedTemperatureCelsius, TbathSample); registerUpdater(m_BathSample->wantedTemperature, &HumidityChamber::updateSetpointProperty, this, m_BathSample->wantedTemperature, TbathSample);
updateSetpointProperty(m_BathSample->wantedTemperatureCelsius, TbathSample); updateSetpointProperty(m_BathSample->wantedTemperature, TbathSample);
registerUpdater(m_SampleTempMain->regulationTemperatureCelsius, &HumidityChamber::updateActualProperty, this, m_SampleTempMain->regulationTemperatureCelsius, Tgonio); registerUpdater(m_SampleTempMain->regulationTemperature, &HumidityChamber::updateActualProperty, this, m_SampleTempMain->regulationTemperature, Tgonio);
updateActualProperty(m_SampleTempMain->regulationTemperatureCelsius, Tgonio); updateActualProperty(m_SampleTempMain->regulationTemperature, Tgonio);
registerUpdater(m_SampleTempMain->sampleTempAverageCelsius, &HumidityChamber::updateProperty, this, m_SampleTempMain->sampleTempAverageCelsius, Tres); registerUpdater(m_SampleTempMain->sampleTempAverage, &HumidityChamber::updateProperty, this, m_SampleTempMain->sampleTempAverage, Tres);
updateProperty(m_SampleTempMain->sampleTempAverageCelsius, Tres); updateProperty(m_SampleTempMain->sampleTempAverage, Tres);
registerUpdater(m_SampleTempMain->temp3TemperatureCelsius, &HumidityChamber::updateProperty, this, m_SampleTempMain->temp3TemperatureCelsius, TsampleTop); registerUpdater(m_SampleTempMain->temp3Temperature, &HumidityChamber::updateProperty, this, m_SampleTempMain->temp3Temperature, TsampleTop);
updateProperty(m_SampleTempMain->temp3TemperatureCelsius, TsampleTop); updateProperty(m_SampleTempMain->temp3Temperature, TsampleTop);
registerUpdater(m_SampleTempMain->temp4TemperatureCelsius, &HumidityChamber::updateProperty, this, m_SampleTempMain->temp4TemperatureCelsius, TsampleBot); registerUpdater(m_SampleTempMain->temp4Temperature, &HumidityChamber::updateProperty, this, m_SampleTempMain->temp4Temperature, TsampleBot);
updateProperty(m_SampleTempMain->temp4TemperatureCelsius, TsampleBot); updateProperty(m_SampleTempMain->temp4Temperature, TsampleBot);
registerUpdater(Tres, &HumidityChamber::updateRelativeHumidity, this); registerUpdater(Tres, &HumidityChamber::updateRelativeHumidity, this);
registerUpdater(TsampleTop, &HumidityChamber::updateRelativeHumidity, this); registerUpdater(TsampleTop, &HumidityChamber::updateRelativeHumidity, this);
...@@ -188,7 +188,7 @@ void HumidityChamber::start() { ...@@ -188,7 +188,7 @@ void HumidityChamber::start() {
// Write Bath temperature // Write Bath temperature
m_BathReservoir->wantedTemperature = TbathReservoir.setpoint(); m_BathReservoir->wantedTemperature = TbathReservoir.setpoint();
m_BathSample->wantedTemperature = TbathSample.setpoint(); m_BathSample->wantedTemperature = TbathSample.setpoint();
m_SampleTempMain->wantedTemperatureCelsius = Tgonio.setpoint(); m_SampleTempMain->wantedTemperature = Tgonio.setpoint();
Parallel::begin(); Parallel::begin();
m_BathReservoir->startParallel(); m_BathReservoir->startParallel();
......
...@@ -38,10 +38,10 @@ L336.ipaddress=Address ...@@ -38,10 +38,10 @@ L336.ipaddress=Address
L336.port=Port L336.port=Port
L336.modePrefix=Mode L336.modePrefix=Mode
L336.sampleLabel=Sample L336.samplemodeLabel=Sample
L336.sampleValue=sample_temp L336.samplemodeValue=sample_temp
L336.singleLabel=Single L336.singlemodeLabel=Single
L336.singleValue=single_temp L336.singlemodeValue=single_temp
L336.versionPrefix=Version: L336.versionPrefix=Version:
L336.tolerancePrefix=Tolerance L336.tolerancePrefix=Tolerance
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<label role="L3361" property="version" prefix="L336.versionPrefix"/> <label role="L3361" property="version" prefix="L336.versionPrefix"/>
<newLine/> <newLine/>
<combo role="L3361" property="mode" valuesAndLabels="L336.sample,L336.single" prefix="L336.modePrefix"/> --> <combo role="L3361" property="mode" valuesAndLabels="L336.samplemode,L336.singlemode" prefix="L336.modePrefix"/>
<newLine/> <newLine/>
<switchable_composite switch_values="sample_temp" switcher_key="modeSwitcher"> <switchable_composite switch_values="sample_temp" switcher_key="modeSwitcher">
<combo role="L3361" property="regulation_channel" prefix="L336.regulationChannelPrefix" valuesAndLabels="L336.channelA,L336.channelB,L336.channelC,L336.channelD"/> <combo role="L3361" property="regulation_channel" prefix="L336.regulationChannelPrefix" valuesAndLabels="L336.channelA,L336.channelB,L336.channelC,L336.channelD"/>
......