/elec/propeller-clock : revision 58

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-02-25 14:54:33 UTC
Revision ID: edam@waxworlds.org-20120225145433-kih8qs45x05cum46

removed Bounce library and updated/fixed new code

files added:
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/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 removed:
src/TODO

src/common.cc

src/common.h

src/modes

src/modes/digital_clock_mode.cc

src/modes/digital_clock_mode.h

src/modes/info_mode.cc

src/modes/info_mode.h

src/modes/major_mode.cc

src/modes/major_mode.h

src/modes/mode.cc

src/modes/mode.h

src/modes/settings_major_mode.cc

src/modes/settings_major_mode.h

src/modes/switcher_major_mode.cc

src/modes/switcher_major_mode.h

src/nvram.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 renamed:
src/modes/analogue_clock_mode.cc => src/analogue_clock_mode.cc

src/modes/analogue_clock_mode.h => src/analogue_clock_mode.h

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

src/modes/test_pattern_mode.cc => src/test_mode.cc

src/modes/test_pattern_mode.h => src/test_mode.h

files modified:
.bzrignore

arduino.mk

electronics-information

notes

project/propeller-clock.sch

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

#include <Wire.h>

#define YEAR_MAX 2030

#define YEAR_MIN 2012

// year

static int _year = 2012;

// month

static int _month = 5;

// day

static int _day = 18;

// hours

static int _hours = 15;

// minutes

static int _minutes = 36;

// seconds

static int _seconds = 0;

// milliseconds at last update

static unsigned long _last_millis = millis();

// milliseconds carries over from last update

static unsigned long _carry = 0;

static int days_in_month( int month, int year )

{

if( month == 2 )

return !( year % 4 ) && ( ( year % 100 ) || !( year % 400 ) )? 29 : 28;

else if( month == 9 || month == 6 || month == 4 || month == 11 )

return 30;

else

return 31;

}

void Time::load_time()

{

// 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 ];

// make sure some numbers are in range

if( _year < YEAR_MIN || _year > YEAR_MAX ) _year = YEAR_MIN;

if( _month < 1 || _month > 12 ) _month = 1;

if( _day < 1 || _day > days_in_month( _year, _month ) ) _day = 1;

}

void Time::save_time()

{

// set the time on the real-time clock

RTC.stop();

RTC.set( DS1307_YR, _year );

RTC.set( DS1307_MTH, _month );

RTC.set( DS1307_DAY, _day );

RTC.set( DS1307_HR, _hours );

RTC.set( DS1307_MIN, _minutes );

RTC.set( DS1307_SEC, _seconds );

RTC.start();

}

100

101

int Time::get_year()

102

{

103

return _year;

104

}

105

106

107

int Time::get_month()

108

{

109

return _month;

110

}

111

112

113

const char *Time::get_month_name()

114

{

115

static const char *months[] = {

116

"January",

117

"February",

118

"March",

119

"April",

120

"May",

121

"June",

122

"July",

123

"August",

124

"September",

125

"October",

126

"November",

127

"December",

128

};

129

130

return months[ _month - 1 ];

131

}

132

133

134

int Time::get_day()

135

{

136

return _day;

137

}

138

139

140

const char *Time::get_day_suffix()

141

{

142

switch( _day )

143

{

144

case 1:

145

case 21:

146

case 31:

147

return "st";

148

case 2:

149

case 22:

150

return "nd";

151

case 3:

152

case 23:

153

return "rd";

154

default:

155

return "th";

156

}

Time &Time::get_instance()

{

static Time time;

return time;

157

}

158

159

177

178

void Time::update()

179

{

180

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

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

181

unsigned long millis = ::millis();

182

unsigned long delta = millis - _last_millis + _carry;

183

193

if( _minutes >= 60 ) {

194

_minutes -= 60;

195

_hours++;

196

if( _hours >= 24 ) {

if( _hours >= 24 )

197

_hours -= 24;

198

199

// We *could* manually work out the day here... but we might as

200

// well ask the RTC hardware. We can't do this *all* the time

201

// though, because it isn't fast enough and will actually cause

202

// a minor display glitch.

203

load_time();

204

}

205

}

206

}

207

}

208

209

210

void Time::inc_hours()

211

{

212

if( ++_hours >= 24 )

213

_hours = 0;

214

}

215

216

217

void Time::inc_minutes()

218

{

219

if( ++_minutes >= 60 )

220

_minutes = 0;

221

}

222

223

224

void Time::reset_seconds()

225

{

226

_seconds = 0;

227

}

228

229

230

void Time::inc_year()

231

{

232

if( ++_year >= YEAR_MAX )

233

_year = YEAR_MIN;

234

}

235

236

237

void Time::inc_month()

238

{

239

if( ++_month > 12 )

240

_month = 1;

241

}

242

243

244

void Time::inc_day()

245

{

246

if( ++_day > days_in_month( _month, _year ) )

247

_day = 1;

248

}

249

Time::Time()

_last_millis( millis() ),

_carry( 0 )

{