Commit 4048daba authored by Abdelali Elaazzouzi's avatar Abdelali Elaazzouzi

bug

parent 484ce0da
......@@ -116,22 +116,22 @@ void HumidityChamber::postConfiguration() {
updateHumidity();
updatePressure();
registerUpdater(m_BathReservoir->sampleTemperatureCelsius, &HumidityChamber::updateActualProperty, this, m_BathReservoir->sampleTemperatureCelsius, TbathReservoir);
updateActualProperty(m_BathReservoir->sampleTemperatureCelsius, TbathReservoir);
registerUpdater(m_BathReservoir->wantedTemperatureCelsius, &HumidityChamber::updateSetpointProperty, this, m_BathReservoir->wantedTemperatureCelsius, TbathReservoir);
updateSetpointProperty(m_BathReservoir->wantedTemperatureCelsius, TbathReservoir);
registerUpdater(m_BathSample->sampleTemperatureCelsius, &HumidityChamber::updateActualProperty, this, m_BathSample->sampleTemperatureCelsius, TbathSample);
updateActualProperty(m_BathSample->sampleTemperatureCelsius, TbathSample);
registerUpdater(m_BathSample->wantedTemperatureCelsius, &HumidityChamber::updateSetpointProperty, this, m_BathSample->wantedTemperatureCelsius, TbathSample);
updateSetpointProperty(m_BathSample->wantedTemperatureCelsius, TbathSample);
registerUpdater(m_SampleTempMain->regulationTemperatureCelsius, &HumidityChamber::updateActualProperty, this, m_SampleTempMain->regulationTemperatureCelsius, Tgonio);
updateActualProperty(m_SampleTempMain->regulationTemperatureCelsius, Tgonio);
registerUpdater(m_SampleTempMain->sampleTempAverageCelsius, &HumidityChamber::updateProperty, this, m_SampleTempMain->sampleTempAverageCelsius, Tres);
updateProperty(m_SampleTempMain->sampleTempAverageCelsius, Tres);
registerUpdater(m_SampleTempMain->temp3TemperatureCelsius, &HumidityChamber::updateProperty, this, m_SampleTempMain->temp3TemperatureCelsius, TsampleTop);
updateProperty(m_SampleTempMain->temp3TemperatureCelsius, TsampleTop);
registerUpdater(m_SampleTempMain->temp4TemperatureCelsius, &HumidityChamber::updateProperty, this, m_SampleTempMain->temp4TemperatureCelsius, TsampleBot);
updateProperty(m_SampleTempMain->temp4TemperatureCelsius, TsampleBot);
registerUpdater(m_BathReservoir->sampleTemperature, &HumidityChamber::updateActualProperty, this, m_BathReservoir->sampleTemperature, TbathReservoir);
updateActualProperty(m_BathReservoir->sampleTemperature, TbathReservoir);
registerUpdater(m_BathReservoir->wantedTemperature, &HumidityChamber::updateSetpointProperty, this, m_BathReservoir->wantedTemperature, TbathReservoir);
updateSetpointProperty(m_BathReservoir->wantedTemperature, TbathReservoir);
registerUpdater(m_BathSample->sampleTemperature, &HumidityChamber::updateActualProperty, this, m_BathSample->sampleTemperature, TbathSample);
updateActualProperty(m_BathSample->sampleTemperature, TbathSample);
registerUpdater(m_BathSample->wantedTemperature, &HumidityChamber::updateSetpointProperty, this, m_BathSample->wantedTemperature, TbathSample);
updateSetpointProperty(m_BathSample->wantedTemperature, TbathSample);
registerUpdater(m_SampleTempMain->regulationTemperature, &HumidityChamber::updateActualProperty, this, m_SampleTempMain->regulationTemperature, Tgonio);
updateActualProperty(m_SampleTempMain->regulationTemperature, Tgonio);
registerUpdater(m_SampleTempMain->sampleTempAverage, &HumidityChamber::updateProperty, this, m_SampleTempMain->sampleTempAverage, Tres);
updateProperty(m_SampleTempMain->sampleTempAverage, Tres);
registerUpdater(m_SampleTempMain->temp3Temperature, &HumidityChamber::updateProperty, this, m_SampleTempMain->temp3Temperature, TsampleTop);
updateProperty(m_SampleTempMain->temp3Temperature, TsampleTop);
registerUpdater(m_SampleTempMain->temp4Temperature, &HumidityChamber::updateProperty, this, m_SampleTempMain->temp4Temperature, TsampleBot);
updateProperty(m_SampleTempMain->temp4Temperature, TsampleBot);
registerUpdater(Tres, &HumidityChamber::updateRelativeHumidity, this);
registerUpdater(TsampleTop, &HumidityChamber::updateRelativeHumidity, this);
......@@ -188,7 +188,7 @@ void HumidityChamber::start() {
// Write Bath temperature
m_BathReservoir->wantedTemperature = TbathReservoir.setpoint();
m_BathSample->wantedTemperature = TbathSample.setpoint();
m_SampleTempMain->wantedTemperatureCelsius = Tgonio.setpoint();
m_SampleTempMain->wantedTemperature = Tgonio.setpoint();
Parallel::begin();
m_BathReservoir->startParallel();
......
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