Fixed issue with setting date over Bluetooth

lexus2k · Sep 24, 2017 · 4ad3753 · 4ad3753
1 parent f592ca4
commit 4ad3753
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/doxygen.cfg b/doxygen.cfg
@@ -38,7 +38,7 @@ PROJECT_NAME           = "Nixie Library"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.1.2
+PROJECT_NUMBER         = 1.1.3
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/examples/nixie_clock_in14_v1/clock_bluetooth.cpp b/examples/nixie_clock_in14_v1/clock_bluetooth.cpp
@@ -173,7 +173,7 @@ void bluetoothCheck()
                 g_btSerial.write("son,soff - scroll test\n");
                 g_btSerial.write("d|r|n - get/set light sensor settings\n");
                 g_btSerial.write("tHH:MM:SS - set time\n");
-                g_btSerial.write("tdYYYY/MM/DD - set date\n");
+                g_btSerial.write("tdYY/MM/DD - set date\n");
                 g_btSerial.write("c - set night highlight 0-9\n");
                 break;
         }

diff --git a/examples/nixie_clock_in14_v1/clock_diorama.cpp b/examples/nixie_clock_in14_v1/clock_diorama.cpp
@@ -40,16 +40,14 @@ void enableDioramaLights(bool enable)
 
 static inline bool inDoorLightsTime()
 {
-    return g_sensor.brightness() >= INDOOR_LIGHT_THRESHOLD_LOW
-           && g_sensor.brightness() <= INDOOR_LIGHT_THRESHOLD_HIGH
+    return (g_sensor.brightness() >= INDOOR_LIGHT_THRESHOLD_LOW)
+           && ((g_sensor.brightness() <= INDOOR_LIGHT_THRESHOLD_HIGH) || (g_rtc.m_hours>=0x21))
            && indoorLightEnable;
 }
 
 static inline bool notInDoorLightsTime()
 {
-    return g_sensor.brightness() < INDOOR_LIGHT_THRESHOLD_LOW
-           || g_sensor.brightness() > INDOOR_LIGHT_THRESHOLD_HIGH
-           || !indoorLightEnable;
+    return !inDoorLightsTime();
 }
 
 

diff --git a/examples/nixie_clock_in14_v1/clock_fine_tuning.h b/examples/nixie_clock_in14_v1/clock_fine_tuning.h
@@ -56,9 +56,9 @@
 /** Number of period before diorama lights power off */
 #define DIORAMA_LIGHTS_OFF_TIMEOUT_PERIODS 10
 /** Minimum brightness of Outdoor lights (0-32) */
-#define OUTDOOR_LIGHT_MIN_BRIGHTNESS   12
+#define OUTDOOR_LIGHT_MIN_BRIGHTNESS   16
 /** Maximum brightness of Outdoor lights (0-32) */
-#define OUTDOOR_LIGHT_MAX_BRIGHTNESS   32
+#define OUTDOOR_LIGHT_MAX_BRIGHTNESS   28
 
 #define OUTDOOR_LIGHT_THRESHOLD_LOW    (6)
 #define OUTDOOR_LIGHT_THRESHOLD_HIGH   (13)

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=NixieLibrary
-version=1.1.2
+version=1.1.3
 author=Alexey Dynda
 maintainer=Alexey Dynda <[email protected]>
 sentence=Nixie Library is intended for Nixie Clock software development.