/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/propeller-clock.ino

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:
arduino.mk

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/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/Makefile

test/phantom-button-presses

test/phantom-button-presses/Makefile

test/phantom-button-presses/main.ino

files removed:
src/util/Bounce.cpp

src/util/Bounce.h

files modified:
electronics-information

project/propeller-clock.sch

src/Makefile

src/propeller-clock.ino

test/led-test/Makefile

Show diffs side-by-side

added added

removed removed

src/propeller-clock.ino

/* -*- mode: c++; compile-command: "BOARD=pro5v make"; -*- */

* propeller-clock.ino

******************************************************************************/

#include <Bounce.h>

#include <DS1307.h>

#include <Wire.h>

#include "button.h"

#include "config.h"

#include "time.h"

#include "mode_switcher.h"

#include "drawer.h"

//_____________________________________________________________________________

// data

100

static unsigned long segment_step_sub_step = 0;

101

static unsigned long segment_step_sub = 0;

100

102

101

// flag to indicate that the drawing mode should be cycled to the next one

102

static bool inc_draw_mode = false;

103

104

// a bounce-managed button

105

static Bounce button( 3, 5 );

106

107

// the time

108

static int time_hours = 0;

109

static int time_minutes = 0;

110

static int time_seconds = 0;

111

112

// number of segments in a full display (rotation) is 60 (one per

113

// second) times the desired number of sub-divisions of a second

114

#define NUM_SECOND_SEGMENTS 5

115

#define NUM_SEGMENTS ( 60 * NUM_SECOND_SEGMENTS )

103

// the button

104

static Button button( 3 );

105

106

// major mode

107

static int major_mode = 0;

108

109

// major modes

110

static std::vector< MajorMode * > major_modes;

116

111

117

112

//_____________________________________________________________________________

118

113

// code

122

117

void checkButtons()

123

118

{

124

119

// update buttons

125

button.update();

126

127

// notice button presses

128

if( button.risingEdge() )

129

inc_draw_mode = true;

130

}

131

132

133

// keep track of time

134

void trackTime()

135

{

136

// previous time and any carried-over milliseconds

137

static unsigned long last_time = millis();

138

static unsigned long carry = 0;

139

140

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

141

unsigned long next_time = millis();

142

unsigned long delta = next_time - last_time + carry;

143

144

// update the previous time and carried-over milliseconds

145

last_time = next_time;

146

carry = delta % 1000;

147

148

// add the seconds that have passed to the time

149

time_seconds += delta / 1000;

150

while( time_seconds >= 60 ) {

151

time_seconds -= 60;

152

time_minutes++;

153

if( time_minutes >= 60 ) {

154

time_minutes -= 60;

155

time_hours++;

156

if( time_hours >= 24 )

157

time_hours -= 24;

158

}

159

}

160

}

161

162

163

// turn an led on/off

164

void ledOn( int num, bool on )

165

{

166

if( num < 0 || num > 9 ) return;

167

168

// convert to pin no.

169

num += 4;

170

171

// pin 4 needs to be inverted (it's driving a PNP)

172

if( num == 4 ) on = !on;

173

174

digitalWrite( num, on? HIGH : LOW );

175

}

176

177

178

// draw a segment for the test display

179

void drawNextSegment_test( bool reset )

180

{

181

// keep track of segment

182

static unsigned int segment = 0;

183

if( reset ) segment = 0;

184

segment++;

185

186

// turn on inside and outside LEDs

187

ledOn( 0, true );

188

ledOn( 9, true );

189

190

// display segment number in binary across in the inside LEDs,

191

// with the LED on pin 12 showing the least-significant bit

192

for( int a = 0; a < 8; a++ )

193

ledOn( 8 - a, ( segment >> a ) & 1 );

194

}

195

196

197

// draw a segment for the time display

198

void drawNextSegment_time( bool reset )

199

{

200

static int second = 0;

201

static int segment = 0;

202

203

// handle display reset

204

if( reset ) {

205

second = 0;

206

segment = 0;

207

}

208

209

// what needs to be drawn?

210

bool draw_tick = !segment && second % 5 == 0;

211

bool draw_second = !segment && second == time_seconds;

212

bool draw_minute = !segment && second == time_minutes;

213

bool draw_hour = !segment && second == time_hours;

214

215

// set the LEDs

216

ledOn( 9, true );

217

ledOn( 8, draw_tick || draw_minute );

218

for( int a = 6; a <= 7; a++ )

219

ledOn( a, draw_minute || draw_second );

220

for( int a = 0; a <= 5; a++ )

221

ledOn( a, draw_minute || draw_second || draw_hour );

222

223

// inc position

224

if( ++segment >= NUM_SECOND_SEGMENTS ) {

225

segment = 0;

226

second++;

120

int event = button.update();

121

122

// handle any events

123

switch( event ) {

124

case 1:

125

major_modes[ major_mode ]->short_press();

126

break;

127

case 2:

128

major_modes[ major_mode ]->long_press();

129

break;

130

case 3:

131

if( ++major_mode >= major_modes.size() )

132

major_mode = 0;

133

major_modes[ major_mode ]->activate();

134

break;

227

135

}

228

136

}

229

137

231

139

// draw a display segment

232

140

void drawNextSegment( bool reset )

233

141

{

234

static int draw_mode = 0;

235

236

// handle mode switch requests

237

if( reset && inc_draw_mode ) {

238

inc_draw_mode = false;

239

draw_mode++;

240

if( draw_mode >= 2 )

241

draw_mode = 0;

242

}

243

244

// draw the segment

245

switch( draw_mode ) {

246

case 0: drawNextSegment_test( reset ); break;

247

case 1: drawNextSegment_time( reset ); break;

248

}

142

// keep track of segment

143

#if CLOCK_FORWARD

144

static int segment = ( NUM_SEGMENTS - CLOCK_SHIFT ) % NUM_SEGMENTS;

145

if( reset ) segment = ( NUM_SEGMENTS - CLOCK_SHIFT ) % NUM_SEGMENTS;

146

#else

147

static int segment = NUM_SEGMENTS - 1 - CLOCK_SHIFT;

148

if( reset ) segment = NUM_SEGMENTS - 1 - CLOCK_SHIFT;

149

#endif

150

151

// draw

152

Drawer &drawer = major_modes[ major_mode ]->get_drawer();

153

if( reset ) drawer.draw_reset();

154

drawer.draw( segment );

155

156

#if CLOCK_FORWARD

157

if( ++segment >= NUM_SEGMENTS ) segment = 0;

158

#else

159

if( --segment < 0 ) segment = NUM_SEGMENTS - 1;

160

#endif

249

161

}

250

162

251

163

323

235

324

236

// set up mode-switch button on pin 3

325

237

pinMode( 3, INPUT );

326

327

// get the time from the real-time clock

328

int rtc_data[ 7 ];

329

RTC.get( rtc_data, true );

330

time_hours = rtc_data[ DS1307_HR ];

331

time_minutes = rtc_data[ DS1307_MIN ];

332

time_seconds = rtc_data[ DS1307_SEC ];

238

digitalWrite( 3, HIGH );

239

button.add_event_at( 5, 1 );

240

button.add_event_at( 1000, 2 );

241

button.add_event_at( 4000, 3 );

333

242

334

243

// serial comms

335

244

Serial.begin( 9600 );

245

246

// set up major modes

247

static ModeSwitcher mode_switcher;

248

major_modes.push_back( &mode_switcher );

249

major_modes[ 0 ]->activate();

336

250

}

337

251

338

252

350

264

checkButtons();

351

265

352

266

// keep track of time

353

trackTime();

267

Time &time = Time::get_instance();

268

time.update();

354

269

}

355

270

356

271

// draw this segment

Older »