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 20:08:49 +01:00
parent c5a21fd827
commit 5b30486f5b
6 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ModbusThermometer.cpp
View File

@ -46,6 +46,14 @@ struct {
float in;
uint16_t modbusRegisters[2];
} adcR;
union {
float in;
uint16_t modbusRegisters[2];
} calOffset;
union {
float in;
uint16_t modbusRegisters[2];
} calFactor;
union {
float in;
uint16_t modbusRegisters[2];
@ -54,6 +62,10 @@ struct {
float in;
uint16_t modbusRegisters[2];
} temperature;
union {
float in;
uint16_t modbusRegisters[2];
} alpha;
} channelVariables[NUM_OF_CHANNELS];
union {
uint32_t in;
@ -76,22 +88,23 @@ void setup() {
}
void loop() {
modbus_update();
for (uint8_t i = 0; i < NUM_OF_CHANNELS; i++) {
ads1210[i].exec();
modbusHoldingRegisters.channelVariables[i].adcValue.in = ads1210[i].value;
modbusHoldingRegisters.channelVariables[i].adcU.in = ads1210[i].u;
modbusHoldingRegisters.channelVariables[i].adcR.in = ads1210[i].r;
thermometer[i].exec(ads1210[i].r);
modbusHoldingRegisters.channelVariables[i].temperatureRaw.in = thermometer[i].temperatureRaw;
modbusHoldingRegisters.channelVariables[i].temperature.in = thermometer[i].temperature;
}
modbus_update();
if (secondTick.check() == 1) {
led.toggle();
uptimeSeconds++;
modbusHoldingRegisters.uptimeSeconds.in = uptimeSeconds;
uptimeSeconds++;
modbusHoldingRegisters.uptimeSeconds.in = uptimeSeconds;
}
}