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

more config stuff

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2014-11-17 21:57:02 +01:00
parent 5b30486f5b
commit 56b5586c58
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ModbusThermometer.cpp
View File

@ -85,6 +85,12 @@ void setup() {
modbus_configure(&Serial, MODBUS_BAUD, SERIAL_8N2, MODBUS_ID, MODBUS_TX_ENABLE_PIN, modbus_configure(&Serial, MODBUS_BAUD, SERIAL_8N2, MODBUS_ID, MODBUS_TX_ENABLE_PIN,
sizeof(modbusHoldingRegisters), (uint16_t*)(&modbusHoldingRegisters)); sizeof(modbusHoldingRegisters), (uint16_t*)(&modbusHoldingRegisters));
uptimeSeconds = 0; 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;
}
} }
void loop() { void loop() {
@ -94,13 +100,24 @@ void loop() {
modbusHoldingRegisters.channelVariables[i].adcU.in = ads1210[i].u; modbusHoldingRegisters.channelVariables[i].adcU.in = ads1210[i].u;
modbusHoldingRegisters.channelVariables[i].adcR.in = ads1210[i].r; modbusHoldingRegisters.channelVariables[i].adcR.in = ads1210[i].r;
thermometer[i].exec(ads1210[i].r); thermometer[i].exec(ads1210[i].r);
modbusHoldingRegisters.channelVariables[i].temperatureRaw.in = thermometer[i].temperatureRaw; modbusHoldingRegisters.channelVariables[i].temperatureRaw.in = thermometer[i].temperatureRaw;
modbusHoldingRegisters.channelVariables[i].temperature.in = thermometer[i].temperature; 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].calFactor != ads1210[i].calFactor) {
ads1210[i].calOffset = modbusHoldingRegisters.channelVariables[i].calFactor;
}
if (modbusHoldingRegisters.channelVariables[i].alpha != thermometer[i].alpha) {
thermometer[i].calOffset = modbusHoldingRegisters.channelVariables[i].alpha;
}
} }
modbus_update(); modbus_update();
if (secondTick.check() == 1) { if (secondTick.check() == 1) {
led.toggle(); led.toggle();