eleksir/simpleclock
1
Fork 0
Code Activity

Bits of cleanup, fix indentaion and coding style

Browse Source
This commit is contained in:
eleksir
2019-05-12 07:52:44 +03:00
parent 825c3096f2
commit 2900e78ca4
2 changed files with 75 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.hgignore
View File

@@ -2,4 +2,5 @@
\.swp$ \.swp$
\.bak$ \.bak$
\.old$ \.old$
\.orig$ \.orig$
\.clang-format

159
simpleclock.ino
View File

@@ -1,41 +1,42 @@
/* /*
* 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 /* This software distributed under BSD 2 Clause License
*
* Copyright (c) Sergei Fedosoff, All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* Redistributions of source code must retain the above copyright
* notice, this listof conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITYOF SUCH DAMAGE.
*/
Copyright (c) Sergei Fedosoff, All rights reserved. /* DS1307 lib by FrankieChu for Seeed RTC module, in my case
* Grove___RTC_DS1307-1.0.0.zip */
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
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
disclaimer in the documentation and/or other materials provided with the
distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
OF SUCH DAMAGE.
*/
#include <SevSeg.h>
#include <Wire.h>
#include <TimeLib.h>
// DS1307 lib by FrankieChu for Seeed RTC module
#include <DS1307.h> #include <DS1307.h>
#include <SevSeg.h>
DS1307 clock; DS1307 clock;
SevSeg Display; SevSeg Display;
@@ -58,14 +59,15 @@ void setup()
byte numDigits = 4; byte numDigits = 4;
byte digitPins[] = {9, 10, 11, 12}; byte digitPins[] = {9, 10, 11, 12};
byte segmentPins[] = {2, 3, 4, 5, 6, 7, 8, 13}; byte segmentPins[] = {2, 3, 4, 5, 6, 7, 8, 13};
bool resistorsOnSegments = true; // 8 resistors, 330 Ohms each bool resistorsOnSegments = true; // 8 resistors, 330 Ohms each
bool updateWithDelays = false; // Default. Recommended bool updateWithDelays = false; // Default. Recommended
/* without it there is visual bug at 0 o'clock, and in current version of
* SevSeg' setChars() does not dots at all */ /* without it there is visual bug at 0 o'clock, and in current version
bool leadingZeros = false; * of SevSeg' setChars() does not dots at all */
bool leadingZeros = false;
Display.begin(hardwareConfig, numDigits, digitPins, segmentPins, Display.begin(hardwareConfig, numDigits, digitPins, segmentPins,
resistorsOnSegments, updateWithDelays, leadingZeros); resistorsOnSegments, updateWithDelays, leadingZeros);
Display.setBrightness(90); Display.setBrightness(90);
// setup clock // setup clock
@@ -74,12 +76,11 @@ void setup()
// if rtc returns incorrect time, reset it to some default value // if rtc returns incorrect time, reset it to some default value
clock.getTime(); clock.getTime();
if (( clock.hour > 23 ) || (clock.minute > 59)) if ((clock.hour > 23) || (clock.minute > 59)) {
{ clock.fillByYMD(2019, 2, 23); // 23 Feb 2019
clock.fillByYMD(2019,2,23); // 23 Feb 2013 clock.fillByHMS(15, 52, 30); // 15:52:30"
clock.fillByHMS(15,52,30); // 15:52 30" clock.fillDayOfWeek(SAT); // Saturday
clock.fillDayOfWeek(SAT); // Saturday clock.setTime(); // put date to rtc
clock.setTime(); // put date to rtc
} }
// setup control buttons // setup control buttons
@@ -87,87 +88,73 @@ void setup()
pinMode(min_btn, INPUT_PULLUP); pinMode(min_btn, INPUT_PULLUP);
} }
void loop() void loop()
{ {
unsigned long currentMillis = millis(); unsigned long currentMillis = millis();
char str[4]; char str[4];
float d; float d;
if (currentMillis - previousMillis >= interval) if (currentMillis - previousMillis >= interval) {
{
previousMillis = currentMillis; previousMillis = currentMillis;
if (dot == false) if (dot == false) {
{
dot = true; dot = true;
if (digitalRead(hrs_btn) == LOW) if (digitalRead(hrs_btn) == LOW) {
{
clock.getTime(); clock.getTime();
hours = clock.hour + 1; hours = clock.hour + 1;
(hours > 23)? hours = 0: hours; (hours > 23) ? hours = 0 : hours;
clock.fillByHMS(hours, clock.minute, 0); clock.fillByHMS(hours, clock.minute, 0);
clock.setTime(); clock.setTime();
} }
if (digitalRead(min_btn) == LOW) if (digitalRead(min_btn) == LOW) {
{
clock.getTime(); clock.getTime();
minutes = clock.minute + 1; minutes = clock.minute + 1;
(minutes > 59)? minutes = 0: minutes; (minutes > 59) ? minutes = 0 : minutes;
clock.fillByHMS(clock.hour, minutes, 0); clock.fillByHMS(clock.hour, minutes, 0);
clock.setTime(); clock.setTime();
} }
} } else {
else
{
dot = false; dot = false;
} }
} }
clock.getTime(); clock.getTime();
/* /*
* Let's implement time compenstion for individual rtc module time * Let's implement time compenstion for individual rtc module time
* charachteristics. In in my case quartz resonator as inaccurate as * charachteristics. In in my case quartz resonator as inaccurate as
* +/- about 5-8 seconds per 24 hours, maybe its require more EMI * +/- about 5-8 seconds per 24 hours, maybe its require more EMI
* sheilding? * shielding?
*/ */
if ((clock.hour == 21) and (clock.minute == 21) and (clock.second == 21) and (compflag == 0)) { if ((clock.hour == 21) and (clock.minute == 21) and
(clock.second == 21) and (compflag == 0)) {
clock.second = 14; clock.second = 14;
clock.fillByHMS(clock.hour,clock.minute,clock.second); clock.fillByHMS(clock.hour, clock.minute, clock.second);
clock.setTime(); clock.setTime();
compflag = 1; compflag = 1;
} }
if ((clock.hour == 21) and (clock.minute == 21) and (clock.second == 23) and (compflag == 1)) { if ((clock.hour == 21) and (clock.minute == 21) and
(clock.second == 23) and (compflag == 1)) {
compflag = 0; compflag = 0;
} }
// make blinking dot // make blinking dot
if (clock.hour > 0) if (clock.hour > 0) {
{ if (dot == true) {
if (dot == true)
{
Display.setNumber((clock.hour * 100 + clock.minute), 2); Display.setNumber((clock.hour * 100 + clock.minute), 2);
} } else {
else
{
Display.setNumber((clock.hour * 100 + clock.minute)); Display.setNumber((clock.hour * 100 + clock.minute));
} }
} } else {
else /* 0 o'clock is an exception, we don't want to see "00.00", we
{ want see "0.00" or "0 00", so we have to use this "hack" */
/* 0 o'clock is an exception, we dont want to see "00.00", we want see if (dot == true) {
* "0.00" or "0 00", so we have to use this "hack" */
if (dot == true)
{
d = float(clock.minute) / 100; d = float(clock.minute) / 100;
Display.setNumber(d, 2); Display.setNumber(d, 2);
} } else {
else
{
sprintf(str, "%2d%02d", clock.hour, clock.minute); sprintf(str, "%2d%02d", clock.hour, clock.minute);
Display.setChars(str); Display.setChars(str);
} }