/elec/propeller-clock : revision 14

To get this branch, use:

bzr branch
http://bzr.ed.am/elec/propeller-clock

« back to all changes in this revision

Viewing changes to src/time.cc

Committer: edam
Date: 2011-11-17 13:06:43 UTC
Revision ID: edam@waxworlds.org-20111117130643-0azy70bj8ueoq8cn

moved GPL to top-level dir

files added:
COPYING

propeller-clock.sch

files removed:
.bzrignore

arduino.mk

pcb.psd

project

project/propeller-clock.pro

project/propeller-clock.sch

src/analogue_clock_mode.cc

src/analogue_clock_mode.h

src/button.cc

src/button.h

src/config.h

src/drawer.cc

src/drawer.h

src/major_mode.h

src/minor_mode.cc

src/minor_mode.h

src/mode_switcher.cc

src/mode_switcher.h

src/test_mode.cc

src/test_mode.h

src/time.cc

src/time.h

src/util

src/util/Bounce.cpp

src/util/Bounce.h

src/util/DS1307.cpp

src/util/DS1307.h

src/utility

src/utility/Jamfile

src/utility/Makefile

src/utility/README.md

src/utility/StandardCplusplus.h

src/utility/algorithm

src/utility/algorithm.cpp

src/utility/associative_base

src/utility/associative_base.cpp

src/utility/basic_definitions

src/utility/bitset

src/utility/bitset.cpp

src/utility/cassert

src/utility/cctype

src/utility/cerrno

src/utility/cfloat

src/utility/char_traits

src/utility/char_traits.cpp

src/utility/climits

src/utility/clocale

src/utility/cmath

src/utility/complex

src/utility/complex.cpp

src/utility/csetjmp

src/utility/csignal

src/utility/cstdarg

src/utility/cstddef

src/utility/cstdio

src/utility/cstdlib

src/utility/cstring

src/utility/ctime

src/utility/cwchar

src/utility/cwctype

src/utility/del_op.cpp

src/utility/del_opnt.cpp

src/utility/del_opv.cpp

src/utility/del_opvnt.cpp

src/utility/deque

src/utility/deque.cpp

src/utility/eh_alloc.cpp

src/utility/eh_globals.cpp

src/utility/exception

src/utility/exception.cpp

src/utility/fstream

src/utility/fstream.cpp

src/utility/func_exception

src/utility/func_exception.cpp

src/utility/functional

src/utility/iomanip

src/utility/iomanip.cpp

src/utility/ios

src/utility/ios.cpp

src/utility/iosfwd

src/utility/iostream

src/utility/iostream.cpp

src/utility/istream

src/utility/istream.cpp

src/utility/istream_helpers

src/utility/iterator

src/utility/iterator.cpp

src/utility/iterator_base

src/utility/limits

src/utility/limits.cpp

src/utility/list

src/utility/list.cpp

src/utility/locale

src/utility/locale.cpp

src/utility/map

src/utility/map.cpp

src/utility/memory

src/utility/new

src/utility/new_handler.cpp

src/utility/new_op.cpp

src/utility/new_opnt.cpp

src/utility/new_opv.cpp

src/utility/new_opvnt.cpp

src/utility/numeric

src/utility/numeric.cpp

src/utility/ostream

src/utility/ostream.cpp

src/utility/ostream_helpers

src/utility/queue

src/utility/queue.cpp

src/utility/serstream

src/utility/set

src/utility/set.cpp

src/utility/sstream

src/utility/sstream.cpp

src/utility/stack

src/utility/stack.cpp

src/utility/stdexcept

src/utility/stdexcept.cpp

src/utility/streambuf

src/utility/streambuf.cpp

src/utility/string

src/utility/string.cpp

src/utility/string_iostream

src/utility/support

src/utility/support.cpp

src/utility/system_configuration.h

src/utility/type_traits

src/utility/typeinfo

src/utility/typeinfo.cpp

src/utility/uartbuf

src/utility/unwind-cxx.h

src/utility/utility.cpp

src/utility/utility.h

src/utility/valarray

src/utility/valarray.cpp

src/utility/vector

src/utility/vector.cpp

test/fan-test

test/fan-test/Makefile

test/led-test

test/led-test/Makefile

test/led-test/led-test.ino

test/phantom-button-presses

test/phantom-button-presses/Makefile

test/phantom-button-presses/main.ino

files renamed:
src/Makefile@ => Makefile

notes => Notes

test/ => fan-test/

test/fan-test/fan-test.ino => fan-test/fan-test.pde

src/ => propeller-clock/

src/propeller-clock.ino => propeller-clock/propeller-clock.pde

files modified:
electronics-information

Show diffs side-by-side

added added

removed removed

src/time.cc

#include "time.h"

#include <DS1307.h>

#include <Wire.h>

Time &Time::get_instance()

{

static Time time;

return time;

}

int Time::get_hours()

{

return _hours;

}

int Time::get_minutes()

{

return _minutes;

}

int Time::get_seconds()

{

return _seconds;

}

void Time::update()

{

// how many milliseonds have elapsed since we last checked?

unsigned long millis = ::millis();

unsigned long delta = millis - _last_millis + _carry;

// update the previous time and carried-over milliseconds

_last_millis = millis;

_carry = delta % 1000;

// add the seconds that have passed to the time

_seconds += delta / 1000;

while( _seconds >= 60 ) {

_seconds -= 60;

_minutes++;

if( _minutes >= 60 ) {

_minutes -= 60;

_hours++;

if( _hours >= 24 )

_hours -= 24;

}

Time::Time()

_last_millis( millis() ),

_carry( 0 )

{

// get the time from the real-time clock

int rtc_data[ 7 ];

RTC.get( rtc_data, true );

_hours = rtc_data[ DS1307_HR ];

_minutes = rtc_data[ DS1307_MIN ];

_seconds = rtc_data[ DS1307_SEC ];

}

Older »