Migrate Grove RTC DS1307 -> uRTCLib

* move Time Compensation feature under define
* translte last few eol to unix style
* make correction: in my case with bad chrystal rtc runs faster about
  9.5 seconds per day

.gitignore

@@ -0,0 +1,6 @@
+.vscode/*
+*.swp
+*.bak
+*.old
+*.orig
+*.clang-format

README.md

@@ -4,13 +4,25 @@
 
 ### Component base is very simple:
 
-* Arduino NANO v3 chinese replica
+* Arduino NANO v3 chinese replica (on Atmega-168 chip)
-* 7 segment 4 digit LED indicator with common anode, FYQ-5641BG-21
+* 7 segment 4 digit LED indicator with common anode, FYQ-5641BD-21 (red LEDs)
 * 8 resistors that limiting current on LED segments, 330 Ohms, 0.25 watts
-* RTC Module GEEGROW with DS1307 chip
+* RTC Module GEEGROW with DS1307 chip (very basic, only RTC chip, quartz resonator, button battery, no additional memory chip)
 * 5x7 cm single side prototyping board
 * usb phone charger as power supply
 * 2 push buttons
 * 1 on/off switch
+* 1 photoresistor
+* 1 resistor to make secund shoulder of photosensitive "bridge", 10 kOhms, 0.25 watts
 * Gainta G521G enclosure (92x66.5x28мм)
 * 5m power cord
+
+### Optionally you may need:
+
+* Capasitor with well capacity if your charger has small capasitor on output
+* Fuse, to protect your device
+* DC/DC transformer if you have power supply that gives more than 5 volts or less than 4.5 volts (this will give additional surge protection if your power supply dies, this can happen after 3-5 years of uninterrupted work)
+
+### Additional Notes:
+
+My RTC module is not very accurate due to bad quartz chrystal calibration, looks like it is not exactly 32768 Hz and clock runs faster than it should be, giving about 5-8 seconds runaway per day. So i have to implement time correction in software (temperature changes during day/month/year is not very big - about 10 degrees Celsius, so we can use software compensation without thermal compensation).

simpleclock.ino

@@ -1,137 +1,345 @@
-/*  
+/*
- *           7 Segment 4 Digits clock with digit point separator
+ * 7 Segment 4 Digits clock with digit point separator
- *  
+ *
- *           It uses display module with common anode and DS1307
+ * It uses display module with common anode and DS1307 RTC module to enhance
- *           RTC module to enhance time keeping ability of
+ * time keeping ability of Atmega 328p based Arduino Nano microcontroller and
- *           Atmega 328p based Arduino nano microcontroller and
+ * 2 buttons for adjusting time.
- *           2 buttons for adjusting time.
+ */
- */
+
-
+/*
-/* This software distributed under BSD 2 Clause License
+ * uRTCLib
-
+ * https://github.com/Naguissa/uRTCLib
-Copyright (c) Sergei Fedosoff, All rights reserved.
+ * it has support for both DS1307 and DS3231, that i own.
-
+ * It is more fat than ds1307-dedicated or ds3231-dedicated lib, but i do not
-Redistribution and use in source and binary forms, with or without modification,
+ * want to invent wheel if i have one.
-are permitted provided that the following conditions are met:
+ */
-
+#include <uRTCLib.h>
-Redistributions of source code must retain the above copyright notice, this list
+
-of conditions and the following disclaimer. Redistributions in binary form must
+/*
-reproduce the above copyright notice, this list of conditions and the following
+ * SevSeg
-disclaimer in the documentation and/or other materials provided with the
+ * https://github.com/DeanIsMe/SevSeg
-distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * it has simple api and ideally works in my case
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ */
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+#include <SevSeg.h>
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+/* disable time compensation
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * as we borrow more accurate chrystal and solder it to rtc breakboard
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ */
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+//#define TIMECOMP
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+/* 0.5 second/day compensation flag */
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+//#define OFIVECOMP
-OF SUCH DAMAGE.
+
-*/
+#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
-
+#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
-#include <SevSeg.h>
+
-#include <Wire.h>
+uRTCLib clock;
-#include <TimeLib.h>
+SevSeg Display;
-// DS1307 lib by FrankieChu for Seeed RTC module
+
-#include <DS1307.h>
+/* push button stuff */
-
+const long initial_delay = 600;   // wait a bit before spin numbers
-DS1307 clock;
+const long adjust_interval = 200; // delay between consecutive number increments
-SevSeg Display;
+const long bounce_delay = 20;     // contact bounce compensation
-
+const int hrs_btn = A0;           // put hour adjusting button on A0 lane
-unsigned long currentMillis;
+const int min_btn = A1;           // put minute adjusting button on A1 lane
-unsigned long previousMillis = 0;
+volatile bool btn_pushed = false; // is button pushed?
-const long interval = 500;
+unsigned long previousPushTimer = 0;
-const int hrs_btn = A0;
+
-const int min_btn = A1;
+/* dot blinking stuff */
-bool dot = true;
+volatile bool dot = true;
-uint8_t minutes;
+
-uint8_t hours;
+#ifdef TIMECOMP
-
+/* time inaccuracy compensation flag */
-void setup()
+volatile bool compflag1 = true;
-{
+volatile bool compflag2 = false;
-	// setup display
+const uint8_t timeSkew = 9;          // assume that clock runs faster than should
-	byte hardwareConfig = COMMON_ANODE;
+#ifdef OFIVECOMP
-	byte numDigits = 4;
+volatile bool timeSkewEven = false;  // comp. 1 additional second per 2 days
-	byte digitPins[] = {9, 10, 11, 12};
+#endif
-	byte segmentPins[] = {2, 3, 4, 5, 6, 7, 8, 13};
+#endif
-	bool resistorsOnSegments = true;   // 8 resistors, 330 Ohms each
+
-	bool updateWithDelays = false;     // Default. Recommended
+/* ambient light compensation aka night mode */
-	/* without it there is visual bug at 0 o'clock, and in current version of
+const int photoPin = A2;
-	 * SevSeg' setChars() does not dots at all */
+volatile bool measureAmbLight = true;
-	bool leadingZeros = true;          
+unsigned int ambLight = 0;           // actual value
-
+unsigned int ambLight2 = 0;          // previous med. value
-	Display.begin(hardwareConfig, numDigits, digitPins, segmentPins,
+unsigned int ambLight3 = 0;          // pre-previous med. value
-                      resistorsOnSegments, updateWithDelays, leadingZeros);
+unsigned long previousLightTimer = 0;
-	Display.setBrightness(90);
+const long refresh_interval = 40;    // refresh rate 25Hz
-
+
-	// setup clock
+/* time vars */
-	clock.begin();
+volatile uint8_t mysecond;
-
+volatile uint8_t myminute;
-	// if rtc returns incorrect time, reset it to some default value
+volatile uint8_t myhour;
-	clock.getTime();
+
-
+/* rtc sync flag */
-	if (( clock.hour > 23 ) || (clock.minute > 59))
+volatile bool rtcsync = true;
-	{
+
-		clock.fillByYMD(2019,2,23);  // 23 Feb 2013
+void setup()
-		clock.fillByHMS(15,52,30);   // 15:52 30"
+{
-		clock.fillDayOfWeek(SAT);    // Saturday
+	// setup display
-		clock.setTime();             // put date to rtc
+	byte hardwareConfig = COMMON_ANODE;
-	}
+	byte numDigits = 4;
-
+	byte digitPins[] = {9, 10, 11, 12};
-	// setup control buttons
+	byte segmentPins[] = {2, 3, 4, 5, 6, 7, 8, 13};
-	pinMode(hrs_btn, INPUT_PULLUP);
+	bool resistorsOnSegments = true; // 8 resistors, 330 Ohms each
-	pinMode(min_btn, INPUT_PULLUP);
+	/* updateWithDelays defaults to false and it is recommended value,
-}
+	 * but i was unable to make my display to change brightness notably with
-
+	 * recommended value, so i have to use updateWithDelays=true,
-
+	 * in this case brightness gets changed.
-void loop()
+	 */
-{
+	bool updateWithDelays = true;
-	unsigned long currentMillis = millis();
+
-
+	/* without it there is visual bug at 0 o'clock, and in current version
-	if (currentMillis - previousMillis >= interval)
+	 * of SevSeg' setChars() does not dots at all */
-	{
+	bool leadingZeros = false;
-		previousMillis = currentMillis;
+
-
+	Display.begin(hardwareConfig, numDigits, digitPins, segmentPins,
-		if (dot == false)
+	              resistorsOnSegments, updateWithDelays, leadingZeros);
-		{
+	Display.setBrightness(100);
-			dot = true;
+
-
+	// setup clock
-			if (digitalRead(hrs_btn) == LOW)
+	Wire.begin();
-			{
+	clock.set_rtc_address(0x68);
-				clock.getTime();
+
-				hours = clock.hour + 1;
+	// if rtc returns incorrect time, reset it to some default value
-				(hours > 23)? hours = 0: hours;
+	clock.refresh();
-				clock.fillByHMS(hours, clock.minute, 0);
+
-				clock.setTime();
+	if ((clock.hour() > 23) || (clock.minute() > 59)) {
-			}
+		clock.set(30, 52, 15, 6, 23, 2, 19); // Saturday, 23 Feb 2019 15:52:30
-
+	}
-			if (digitalRead(min_btn) == LOW)
+
-			{
+	// setup control buttons
-				clock.getTime();
+	pinMode(hrs_btn, INPUT_PULLUP);
-				minutes = clock.minute + 1;
+	pinMode(min_btn, INPUT_PULLUP);
-				(minutes > 59)? minutes = 0: minutes;
+
-				clock.fillByHMS(clock.hour, minutes, 0);
+/* Timer stuff
-				clock.setTime();
+ * timer0 being used in millis() micros() delay() etc, it has 8 bit resolution
-			}
+ * timer2 being used in analogWrite() tone() notone(), it has 8 bit resolution
-		}
+ * timer1 being used in servo lib has 16 bit resolution
-		else
+ * We'll use timer1, since we have no mechanical parts and don't need servo lib
-		{
+ */
-			dot = false;
+	// initialize timer1
-		}
+	noInterrupts();           // disable all interrupts
-	}
+	TCCR1A = 0;
-
+	TCCR1B = 0;
-	clock.getTime();
+
-
+	TCNT1 = 34286;            // preload timer 65536-16MHz/256/2Hz
-	// make blinking dot
+	TCCR1B |= (1 << CS12);    // 256 prescaler 
-	if (dot == true) {
+	TIMSK1 |= (1 << TOIE1);   // enable timer overflow interrupt
-		Display.setNumber((clock.hour * 100 + clock.minute), 2);
+	interrupts();             // enable all interrupts
-	} else {
+
-		Display.setNumber((clock.hour * 100 + clock.minute));
+/* increase sampling rate of analogRead()
-	}
+ * by setting an ADC prescale from 128 to 16, so it takes less time to read
-
+ * sensor
-	Display.refreshDisplay();
+ */
-}
+	sbi(ADCSRA, ADPS2);
-
+	cbi(ADCSRA, ADPS1);
-/* vim: set filetype=cpp: */
+	cbi(ADCSRA, ADPS0);
+
+	// setup ambient brigtness sensor
+	pinMode(photoPin, INPUT);
+	ambLight = analogRead(photoPin);
+}
+
+ISR(TIMER1_OVF_vect)
+{
+/* Feed clock twice per second */
+	TCNT1 = 34286;            // preload timer
+	// do not read rtc if time beng adjusted by buttons
+	(btn_pushed) ? rtcsync : rtcsync = true;
+
+/* Also switch dot */
+	if (dot)
+		dot = false;
+	else
+		dot = true;
+
+#ifdef TIMECOMP
+/* time compensation magic */
+	if ((myhour == 21) and (myminute == 21) and (mysecond == 21)
+	    and (compflag2)) {
+		compflag1 = true;
+#ifdef OFIVECOMP
+		(timeSkewEven) ? timeSkewEven = false : timeSkewEven;
+#endif
+	}
+
+	if ((myhour == 21) and (myminute == 21) and (mysecond == 23)) {
+		compflag1 = false;
+		compflag2 = true;
+	}
+#endif
+}
+
+void loop()
+{
+	unsigned long currentMillis = millis();
+
+#ifdef TIMECOMP
+/*
+ * Let's implement time compenstion for individual rtc module time
+ * charachteristics. In in my case quartz resonator as inaccurate as
+ * about +9.5 seconds per 24 hours
+ */
+	if (compflag1 && compflag2) {
+#ifdef OFIVECOMP
+		if (timeSkewEven) {
+			clock.set(
+				(mysecond - timeSkew - 1),
+				clock.minute(),
+				clock.hour(),
+				clock.dayOfWeek(),
+				clock.day(),
+				clock.month(),
+				clock.year()
+			);
+		} else {
+#endif
+			clock.set(
+				(mysecond - timeSkew),
+				clock.minute(),
+				clock.hour(),
+				clock.dayOfWeek(),
+				clock.day(),
+				clock.month(),
+				clock.year()
+			);
+#ifdef OFIVECOMP
+		}
+#endif
+
+		compflag2 = false;
+	}
+#endif
+
+	if (rtcsync) {
+		clock.refresh();
+		mysecond = clock.second();
+		myminute = clock.minute();
+		myhour = clock.hour();
+		updateTimeStr(myhour, myminute);
+		rtcsync = false;
+	}
+
+	// push button magic
+	if ((!btn_pushed) and
+	    ((digitalRead(hrs_btn) == LOW) or (digitalRead(min_btn) == LOW))) {
+		if (currentMillis - previousPushTimer >= initial_delay) {
+			previousPushTimer = currentMillis;
+			btn_pushed = true;
+		}
+	}
+
+	if (btn_pushed and
+	    (digitalRead(hrs_btn) != LOW) and (digitalRead(min_btn) != LOW)) {
+		// compensate possible contact bounce with delay
+		if (currentMillis - previousPushTimer >= bounce_delay) {
+			btn_pushed = false;
+		}
+	}
+
+	if (btn_pushed) {
+		if (currentMillis - previousPushTimer >= adjust_interval) {
+			previousPushTimer = currentMillis;
+
+			if (digitalRead(hrs_btn) == LOW) {
+				myhour++;
+				(myhour > 23) ? myhour = 0 : myhour;
+				clock.set(
+					0,
+					myminute,
+					myhour,
+					clock.dayOfWeek(),
+					clock.day(),
+					clock.month(),
+					clock.year()
+				);
+			}
+
+			if (digitalRead(min_btn) == LOW) {
+				myminute++;
+				(myminute > 59) ? myminute = 0 : myminute;
+				clock.set(
+					0,
+					myminute,
+					myhour,
+					clock.dayOfWeek(),
+					clock.day(),
+					clock.month(),
+					clock.year()
+				);
+			}
+		}
+
+		updateTimeStr(myhour, myminute);
+	}
+
+	if ((currentMillis - previousLightTimer >= refresh_interval) or
+	    (previousLightTimer > currentMillis)) { // millis() reset every ~49 days
+		previousLightTimer = currentMillis;
+		ambLight = analogRead(photoPin);
+		ambLight = (ambLight + ambLight2 + ambLight3) / 3;
+
+/* Ambient light compensation
+ * ambLight can be in range of 0..1023, if it 910+, it has point to use
+ * fullbright.
+ * Use table comparsion (not function of ambLight) because of non-linear
+ * charachteristics of led indicator, that cannot be described via simple
+ * formula.
+ */
+		if (ambLight >= 910) {
+			Display.setBrightness(100);
+		} else if ((ambLight < 900) and (ambLight >= 860)) {
+			Display.setBrightness(75);
+		} else if ((ambLight < 850) and (ambLight >= 810)) { 
+			Display.setBrightness(45);
+		} else if ((ambLight < 800) and (ambLight >= 760)) {
+			Display.setBrightness(25);
+		} else if ((ambLight < 750) and (ambLight >= 710)) {
+			Display.setBrightness(18);
+		} else if ((ambLight < 700) and (ambLight >= 660)) {
+			Display.setBrightness(12);
+		} else if ((ambLight < 650) and (ambLight >= 610)) {
+			Display.setBrightness(10);
+		} else if ((ambLight < 600) and (ambLight >= 560)) {
+			Display.setBrightness(7);
+		} else if ((ambLight < 550) and (ambLight >= 410)) {
+			Display.setBrightness(4);
+		} else if ((ambLight < 400) and (ambLight >= 360)) {
+			Display.setBrightness(0);
+		} else if ((ambLight < 350) and (ambLight >= 310)) {
+			Display.setBrightness(-3);
+		} else if ((ambLight < 300) and (ambLight >= 260)) {
+			Display.setBrightness(-6);
+		} else if ((ambLight < 250) and (ambLight >= 210)) {
+			Display.setBrightness(-10);
+		} else if ((ambLight < 200) and (ambLight >= 160)) {
+			Display.setBrightness(-14);
+		} else if ((ambLight < 150) and (ambLight >= 110)) {
+			Display.setBrightness(-18);
+		} else if (ambLight < 100) {
+			Display.setBrightness(-22);
+		}
+
+		ambLight3 = ambLight2;
+		ambLight2 = ambLight;
+	}
+
+	Display.refreshDisplay();
+}
+
+void updateTimeStr(uint8_t h, uint8_t m)
+{
+	if (dot) {
+		char str[5];
+		sprintf(str, "%2d.%02d", h, m);
+		Display.setChars(str);
+	} else {
+		char str[4];
+		sprintf(str, "%2d%02d", h, m);
+		Display.setChars(str);
+	}
+}
+
+
+/* vim: set filetype=cpp: */