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

fixes in config stuff

Browse Source
This commit is contained in:
hg
2014-11-16 18:45:13 +01:00
parent 70d589da45
commit cb329623af
5 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.cproject
View File

@ -26,6 +26,7 @@
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ModbusThermometer/Libraries/SPI}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/ModbusThermometer/Libraries/SPI}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ModbusThermometer/arduino/core}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/ModbusThermometer/arduino/core}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ModbusThermometer/arduino/variant}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/ModbusThermometer/arduino/variant}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ModbusThermometer/Libraries/EEPROM}&quot;"/>
</option> </option>
<inputType id="it.baeyens.arduino.compiler.cpp.sketch.input.1599065484" name="CPP source files" superClass="it.baeyens.arduino.compiler.cpp.sketch.input"/> <inputType id="it.baeyens.arduino.compiler.cpp.sketch.input.1599065484" name="CPP source files" superClass="it.baeyens.arduino.compiler.cpp.sketch.input"/>
</tool> </tool>
@ -34,6 +35,7 @@
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ModbusThermometer/Libraries/SPI}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/ModbusThermometer/Libraries/SPI}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ModbusThermometer/arduino/core}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/ModbusThermometer/arduino/core}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ModbusThermometer/arduino/variant}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/ModbusThermometer/arduino/variant}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ModbusThermometer/Libraries/EEPROM}&quot;"/>
</option> </option>
<inputType id="it.baeyens.arduino.compiler.c.sketch.input.487192470" name="C Source Files" superClass="it.baeyens.arduino.compiler.c.sketch.input"/> <inputType id="it.baeyens.arduino.compiler.c.sketch.input.487192470" name="C Source Files" superClass="it.baeyens.arduino.compiler.c.sketch.input"/>
</tool> </tool>

5
.project
View File

@ -26,6 +26,11 @@
<nature>it.baeyens.arduinonature</nature> <nature>it.baeyens.arduinonature</nature>
</natures> </natures>
<linkedResources> <linkedResources>
<link>
<name>Libraries/EEPROM</name>
<type>2</type>
<locationURI>ArduinoHardwareLibPath/EEPROM</locationURI>
</link>
<link> <link>
<name>Libraries/SPI</name> <name>Libraries/SPI</name>
<type>2</type> <type>2</type>

3
Config.cpp
View File

@ -1,3 +1,4 @@
#include <EEPROM.h>
#include "Config.h" #include "Config.h"
@ -17,7 +18,7 @@ void Config::setFloat(int pos, float value) {
} }
} }
unsigned int Config::getUInt32(int pos) { uint32_t Config::getUInt32(int pos) {
u_uint32 u; u_uint32 u;
for (uint8_t i = 0; i < sizeof(uint32_t); i++) { for (uint8_t i = 0; i < sizeof(uint32_t); i++) {
u.e[i] = EEPROM.read(pos + i); u.e[i] = EEPROM.read(pos + i);

4
ModbusThermometer.cpp
View File

@ -64,8 +64,8 @@ void setup() {
delay(100); delay(100);
Config::initialize(); Config::initialize();
led.begin(LED_PIN); led.begin(LED_PIN);
ads1210_1.begin(ADC_1_CS_PIN, ADC_1_RDY_PIN); ads1210_1.begin(ADC_1_CS_PIN, ADC_1_RDY_PIN, Config::ADC1START);
ads1210_2.begin(ADC_2_CS_PIN, ADC_2_RDY_PIN); ads1210_2.begin(ADC_2_CS_PIN, ADC_2_RDY_PIN, Config::ADC2START);
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;

3
ads1210.cpp
View File

@ -97,11 +97,12 @@ void ADS1210::setGain(uint8_t gain) const {
writeRegister(ADDR_CMR2, cmr); writeRegister(ADDR_CMR2, cmr);
} }
void ADS1210::begin(uint8_t csPin, uint8_t drdyPin) { void ADS1210::begin(uint8_t csPin, uint8_t drdyPin, int eepromAddr) {
static bool onlyOnce = false; static bool onlyOnce = false;
m_csPin = csPin; m_csPin = csPin;
m_drdyPin = drdyPin; m_drdyPin = drdyPin;
m_eepromAddr = eepromAddr;
// initialization of SPI // initialization of SPI
// Serial << "Start SPI initialization ... "; // Serial << "Start SPI initialization ... ";