TODO-1027: WIP

opentrv · Nov 30, 2016 · af85bf8 · af85bf8
1 parent 44a9694
commit af85bf8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/Arduino/V0p2_Main/Control.cpp b/Arduino/V0p2_Main/Control.cpp
@@ -577,12 +577,10 @@ static void wireComponentsTogether()
 static void updateSensorsFromStats()
   {
 #if defined(ENABLE_AMBLIGHT_SENSOR) && defined(ENABLE_OCCUPANCY_DETECTION_FROM_AMBLIGHT)
-  // Update with rolling stats to adapt to sensors and local environment.
-  // ...and prevailing mode, so may take a while to adjust.
+  // Update with rolling stats to adapt to sensors and local environment...
+  // ...and prevailing bias, so may take a while to adjust.
   AmbLight.setTypMinMax(
           eeStats.getByHourStatRTC(OTV0P2BASE::NVByHourByteStatsBase::STATS_SET_AMBLIGHT_BY_HOUR_SMOOTHED),
-          eeStats.getMinByHourStat(OTV0P2BASE::NVByHourByteStatsBase::STATS_SET_AMBLIGHT_BY_HOUR),
-          eeStats.getMaxByHourStat(OTV0P2BASE::NVByHourByteStatsBase::STATS_SET_AMBLIGHT_BY_HOUR),
           eeStats.getMinByHourStat(OTV0P2BASE::NVByHourByteStatsBase::STATS_SET_AMBLIGHT_BY_HOUR_SMOOTHED),
           eeStats.getMaxByHourStat(OTV0P2BASE::NVByHourByteStatsBase::STATS_SET_AMBLIGHT_BY_HOUR_SMOOTHED),
           !tempControl.hasEcoBias());

diff --git a/Arduino/V0p2_Main/V0p2_Generic_Config.h b/Arduino/V0p2_Main/V0p2_Generic_Config.h
@@ -61,10 +61,10 @@ Author(s) / Copyright (s): Damon Hart-Davis 2013--2016
 //#define CONFIG_Trial2013Winter_Round2_BOILERHUB // REV2 cut4 as plain boiler hub.
 //#define CONFIG_Trial2013Winter_Round2_STATSHUB // REV2 cut4 as stats hub.
 //#define CONFIG_Trial2013Winter_Round2_NOHUB // REV2 cut4 as TX-only leaf node.
-//#define CONFIG_DORM1 // REV7 / DORM1 all-in-one valve unit, secure TX.
+#define CONFIG_DORM1 // REV7 / DORM1 / TRV1.x all-in-one valve unit, secure TX.
 //#define CONFIG_DORM1_BOILER // REV8 / DORM1 boiler-control unit.
 //#define CONFIG_REV10_AS_GSM_RELAY_ONLY // REV10: stats relay only.
-#define CONFIG_REV10_SECURE_BHR // REV10: secure stats relay and boiler hub.
+//#define CONFIG_REV10_SECURE_BHR // REV10: secure stats relay and boiler hub.
 //#define CONFIG_REV11_RAW_JSON // REV11 as raw JSON-only stats/sensor leaf.
 //#define CONFIG_REV14_WORKSHOP // REV14 w/ light sensor, SHT21, for Launchpad workshop.