wn/ModbusThermometer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small fixes

Browse Source
This commit is contained in:
hg
2014-11-17 22:08:58 +01:00
parent 56b5586c58
commit 404975ec06
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ModbusThermometer.cpp
View File

@ -87,9 +87,9 @@ void setup() {
uptimeSeconds = 0;
for (uint8_t i = 0; i < NUM_OF_CHANNELS; i++) {
modbusHoldingRegisters.channelVariables[i].calOffset = ads1210[i].calOffset;
modbusHoldingRegisters.channelVariables[i].calFactor = ads1210[i].calFactor;
modbusHoldingRegisters.channelVariables[i].alpha = thermometer[i].alpha;
modbusHoldingRegisters.channelVariables[i].calOffset.in = ads1210[i].calOffset;
modbusHoldingRegisters.channelVariables[i].calFactor.in = ads1210[i].calFactor;
modbusHoldingRegisters.channelVariables[i].alpha.in = thermometer[i].alpha;
}
}
@ -104,14 +104,14 @@ void loop() {
modbusHoldingRegisters.channelVariables[i].temperatureRaw.in = thermometer[i].temperatureRaw;
modbusHoldingRegisters.channelVariables[i].temperature.in = thermometer[i].temperature;
if (modbusHoldingRegisters.channelVariables[i].calOffset != ads1210[i].calOffset) {
ads1210[i].calOffset = modbusHoldingRegisters.channelVariables[i].calOffset;
if (modbusHoldingRegisters.channelVariables[i].calOffset.in != ads1210[i].calOffset) {
ads1210[i].calOffset = modbusHoldingRegisters.channelVariables[i].calOffset.in;
}
if (modbusHoldingRegisters.channelVariables[i].calFactor != ads1210[i].calFactor) {
ads1210[i].calOffset = modbusHoldingRegisters.channelVariables[i].calFactor;
if (modbusHoldingRegisters.channelVariables[i].calFactor.in != ads1210[i].calFactor) {
ads1210[i].calOffset = modbusHoldingRegisters.channelVariables[i].calFactor.in;
}
if (modbusHoldingRegisters.channelVariables[i].alpha != thermometer[i].alpha) {
thermometer[i].calOffset = modbusHoldingRegisters.channelVariables[i].alpha;
if (modbusHoldingRegisters.channelVariables[i].alpha.in != thermometer[i].alpha) {
thermometer[i].alpha = modbusHoldingRegisters.channelVariables[i].alpha.in;
}
}

2
Thermometer.cpp
View File

@ -22,7 +22,7 @@ void Thermometer::begin(bool initializeConfig, int eepromAddr) {
}
m_lastSmoothedTemperature = INVALID_TEMPERATURE;
alpha = Config::setFloat(m_eepromAddr + CONFIG_ALPHA);
alpha = Config::getFloat(m_eepromAddr + CONFIG_ALPHA);
}

4
ads1210.cpp
View File

@ -112,8 +112,8 @@ void ADS1210::begin(uint8_t csPin, uint8_t drdyPin, bool initializeConfig, int e
if (initializeConfig) {
// set default values
Config::setFloat(m_eepromAddr + CONFIG_CAL_OFFSET, 0.0);
Config::setFloat(m_eepromAddr + CONFIG_CAL_FACTOR, 1.0)
Config::setFloat(m_eepromAddr + CONFIG_CAL_OFFSET, 0.0);
Config::setFloat(m_eepromAddr + CONFIG_CAL_FACTOR, 1.0);
}
// initialization of SPI