/elec/propeller-clock : revision 70

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: 2012-03-12 15:22:57 UTC
Revision ID: tim@ed.am-20120312152257-gb30ihjxq8jb0lss

added newline

files added:
src/common.cc

src/common.h

src/digital_clock.cc

src/digital_clock.h

src/text.cc

src/text.h

src/text_renderer.cc

src/text_renderer.h

src/util/PString.cpp

src/util/PString.h

test/rtc-test

test/rtc-test/Makefile

test/rtc-test/rtc-ds1307.ino

test/rtc-test/util

test/rtc-test/util/DS1307.cpp

test/rtc-test/util/DS1307.h

files removed:
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/util/Bounce.cpp

src/util/Bounce.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

files renamed:
src/analogue_clock_mode.cc => src/analogue_clock.cc

src/analogue_clock_mode.h => src/analogue_clock.h

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

src/test_mode.cc => src/test_pattern.cc

src/test_mode.h => src/test_pattern.h

files modified:
.bzrignore

arduino.mk

electronics-information

notes

src/Makefile

src/button.cc

src/button.h

src/config.h

src/time.cc

src/time.h

Show diffs side-by-side

added added

removed removed

src/time.cc

* time.cc

* This file is part of propeller-clock (hereafter referred to as "this

* program"). See http://ed.am/dev/software/arduino/propeller-clock for more

* information.

* This program is free software: you can redistribute it and/or modify

* it under the terms of the GNU Lesser General Public License as published

* by the Free Software Foundation, either version 3 of the License, or

* (at your option) any later version.

* This program is distributed in the hope that it will be useful,

* but WITHOUT ANY WARRANTY; without even the implied warranty of

* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

* GNU Lesser General Public License for more details.

* You should have received a copy of the GNU Lesser General Public License

* along with this program. If not, see <http://www.gnu.org/licenses/>.

#include "time.h"

#include <DS1307.h>

#include <Wire.h>

Time &Time::get_instance()

{

static Time time;

return time;

// year

static int _year;

// month

static int _month;

// day

static int _day;

// hours

static int _hours;

// minutes

static int _minutes;

// seconds

static int _seconds;

// milliseconds at last update

static unsigned long _last_millis = millis();

// milliseconds carries over from last update

static unsigned long _carry = 0;

static void probe_rtc()

{

// get the time from the real-time clock

int rtc_data[ 7 ];

RTC.get( rtc_data, true );

_year = rtc_data[ DS1307_YR ];

_month = rtc_data[ DS1307_MTH ];

_day = rtc_data[ DS1307_DAY ];

_hours = rtc_data[ DS1307_HR ];

_minutes = rtc_data[ DS1307_MIN ];

_seconds = rtc_data[ DS1307_SEC ];

}

int Time::get_year()

{

return _year;

}

int Time::get_month()

{

return _month;

}

const char *Time::get_month_name()

{

static const char *months[] = {

"January",

"February",

"March",

"April",

"May",

"June",

"July",

"August",

"September",

"October",

"November",

"December",

};

return months[ _month - 1 ];

}

100

int Time::get_day()

101

{

102

return _day;

103

}

104

105

106

const char *Time::get_day_suffix()

107

{

108

switch( _day )

109

{

110

case 1:

111

case 21:

112

case 31:

113

return "st";

114

case 2:

115

case 22:

116

return "nd";

117

case 3:

118

case 23:

119

return "rd";

120

default:

121

return "th";

122

}

123

}

124

125

143

144

void Time::update()

145

{

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

146

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

147

unsigned long millis = ::millis();

148

unsigned long delta = millis - _last_millis + _carry;

149

159

if( _minutes >= 60 ) {

160

_minutes -= 60;

161

_hours++;

if( _hours >= 24 )

162

if( _hours >= 24 ) {

163

_hours -= 24;

164

165

// I mean we *could* work out the day... but FUCK IT! We bought

166

// some god damn HARDWARE to do that shit!

167

probe_rtc();

168

}

169

}

170

}

171

}

172

173

Time::Time()

_last_millis( millis() ),

_carry( 0 )

174

void Time::init()

175

{