Peter M. Groen / EasyOpenTherm

Commit 3ba70b09a99639409c0783b336151bf5365067ca

Authored by Jeroen88
1 parent 0989e966

Renamed a few #define labels

Inline Side-by-side
Showing 1 changed file with 12 additions and 12 deletions
examples/MQTT_Advanced_Thermostat/MQTT_Advanced_Thermostat.ino
  View file @3ba70b0
... ... @@ -125,11 +125,11 @@
125 125 #define CH_MIN_SETPOINT (10.0f)
126 126  
127 127 // If the boiler supports Central Heating (CH), use the boiler for heating
128   -#define ENABLE_HEATING (true)
  128 +#define BOILER_HEATING_MODE (true)
129 129 // If the boiler supports cooling, use the boiler for cooling.
130   -#define ENABLE_COOLING (true)
  130 +#define BOILER_COOLING_MODE (true)
131 131 // If the boiler supports Domestic Hot Water (DHW), use the boiler for DHW
132   -#define ENABLE_DOMESTIC_HOT_WATER (true)
  132 +#define BOILER_DOMESTIC_HOT_WATER_MODE (true)
133 133  
134 134  
135 135 // Cheap sensor tend to be inaccurate. Accuracy can be increased by adding two temperatures as measured by the sensor and the 'real' temperature as measured with a calibrated thermometer
... ... @@ -138,9 +138,9 @@
138 138 // Make sure that the difference between both lower temperatures and both higher temperatures is about the same, otherwise your temperature sensor is really bad and you might get strange results from recalculateTemperatures();
139 139 // https://www.letscontrolit.com/wiki/index.php?title=Basics:_Calibration_and_Accuracy
140 140 #define LOWER_MEASURED_TEMPERATURE (19.0)
141   -#define LOWER_CALIBRATED_TEMPERATURE (17.1)
142   -#define HIGHER_MEASURED_TEMPERATURE (20.9)
143   -#define HIGHER_CALIBRATED_TEMPERATURE (18.5)
  141 +#define LOWER_CALIBRATED_TEMPERATURE (19.0)
  142 +#define HIGHER_MEASURED_TEMPERATURE (21.0)
  143 +#define HIGHER_CALIBRATED_TEMPERATURE (21.0)
144 144  
145 145  
146 146 // Update these with values suitable for your network.
... ... @@ -373,20 +373,20 @@ void showCapabilities(uint8_t secondaryFlags, uint8_t secondaryMemberIDCode) {
373 373 uint8_t requestServices(float CHSetpoint) {
374 374 uint8_t primaryFlags = 0;
375 375  
376   - // ENABLE_DOMESTIC_HOT_WATER is a #define. If defined 'true' then domestic hot water is enabled
377   - if(ENABLE_DOMESTIC_HOT_WATER) {
  376 + // BOILER_DOMESTIC_HOT_WATER_MODE is a #define. If defined 'true' then domestic hot water is enabled
  377 + if(BOILER_DOMESTIC_HOT_WATER_MODE) {
378 378 Serial.println("+ Enable Domestic Hot Water (DHW)");
379 379 primaryFlags |= uint8_t(OpenTherm::STATUS_FLAGS::PRIMARY_DHW_ENABLE);
380 380 }
381 381  
382   - // ENABLE_HEATING is a #define. If defined 'true' then central heating is enabled.
383   - if(ENABLE_HEATING && CHSetpoint > CH_MIN_SETPOINT) {
  382 + // BOILER_HEATING_MODE is a #define. If defined 'true' then central heating is enabled.
  383 + if(BOILER_HEATING_MODE && CHSetpoint > CH_MIN_SETPOINT) {
384 384 Serial.println("+ Enable Central Heating (CH)");
385 385 primaryFlags |= uint8_t(OpenTherm::STATUS_FLAGS::PRIMARY_CH_ENABLE);
386 386 }
387 387  
388   - // ENABLE_COOLING is a #define. If defined 'true' then cooling is enabled
389   - if(ENABLE_COOLING) {
  388 + // BOILER_COOLING_MODE is a #define. If defined 'true' then cooling is enabled
  389 + if(BOILER_COOLING_MODE) {
390 390 Serial.println("+ Enable cooling");
391 391 primaryFlags |= uint8_t(OpenTherm::STATUS_FLAGS::PRIMARY_COOLING_ENABLE);
392 392 }
... ...