/elec/propeller-clock : revision 57

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 01:31:43 UTC
Revision ID: tim@ed.am-20120225013143-9fet2y2d3fjlrwez

added ulibc

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/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 removed:
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

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

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

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

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

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

files modified:
.bzrignore

arduino.mk

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

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

#include <button.h>

#include "config.h"

#include "button.h"

#include "time.h"

#include "Arduino.h"

#include "analogue_clock.h"

#include "digital_clock.h"

#include "test_pattern.h"

#include "mode_switcher.h"

#include "drawer.h"

//_____________________________________________________________________________

// data

// when non-zero, the time (in microseconds) of a new fan pulse that

// has just occurred, which means that segment drawing needs to be

// restarted

static unsigned long _new_pulse_at = 0;

static unsigned long new_pulse_at = 0;

// the time (in microseconds) when the last fan pulse occurred

static unsigned long _last_pulse_at = 0;

static unsigned long last_pulse_at = 0;

// duration (in microseconds) that a segment should be displayed

static unsigned long _segment_step = 0;

static unsigned long segment_step = 0;

100

// remainder after divisor and a tally of the remainders for each segment

101

static unsigned long _segment_step_sub_step = 0;

102

static unsigned long _segment_step_sub = 0;

103

104

// the button

105

static Button _button( 3 );

106

107

// modes

108

static int _major_mode = 0;

109

static int _minor_mode = 0;

110

111

#define MAIN_MODE_IDX 0

112

113

#define ANALOGUE_CLOCK_IDX 0

114

#define DIGITAL_CLOCK_IDX 1

115

#define TEST_PATTERN_IDX 2

101

static unsigned long segment_step_sub_step = 0;

102

static unsigned long segment_step_sub = 0;

103

104

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

105

static bool inc_draw_mode = false;

106

107

// a bounce-managed button

108

static Button button( 3 );

116

109

117

110

//_____________________________________________________________________________

118

111

// code

119

112

120

113

121

// activate the current minor mode

122

void activate_minor_mode()

114

// check for button presses

115

void checkButtons()

123

116

{

124

switch( _minor_mode ) {

125

case DIGITAL_CLOCK_IDX: digital_clock_activate(); break;

117

// update buttons

118

int event = button.update();

119

120

// handle any events

121

switch( event ) {

122

case 1:

123

inc_draw_mode = true;

124

break;

126

125

}

127

126

}

128

127

129

// perform button events

130

void do_button_events()

128

129

// turn an led on/off

130

void ledOn( int num, bool on )

131

{

132

// loop through pending events

133

while( int event = _button.get_event() )

134

{

135

switch( event )

136

{

137

case 1:

138

// short press

139

switch( _major_mode ) {

140

case MAIN_MODE_IDX:

141

switch( _minor_mode ) {

142

case ANALOGUE_CLOCK_IDX: analogue_clock_press(); break;

143

case DIGITAL_CLOCK_IDX: digital_clock_press(); break;

144

}

145

break;

146

}

147

break;

148

149

case 2:

150

// long press

151

switch( _major_mode ) {

152

case MAIN_MODE_IDX:

153

if( ++_minor_mode >= 3 )

154

_minor_mode = 0;

155

switch( _minor_mode ) {

156

case DIGITAL_CLOCK_IDX: digital_clock_activate(); break;

157

}

158

break;

159

}

160

break;

161

162

case 3:

163

// looooong press (change major mode)

164

if( ++_major_mode > 0 )

165

_major_mode = 0;

166

switch( _major_mode ) {

167

case MAIN_MODE_IDX: _minor_mode = 0; break;

168

}

169

activate_minor_mode();

170

break;

171

}

172

}

132

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

133

134

// convert to pin no.

135

num += 4;

136

137

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

138

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

139

140

digitalWrite( num, on? HIGH : LOW );

173

141

}

174

142

175

143

176

144

// draw a display segment

177

void draw_next_segment( bool reset )

145

void drawNextSegment( bool reset )

178

146

{

147

static ModeSwitcher mode_switcher;

148

static bool init = false;

149

150

if( !init ) {

151

init = true;

152

mode_switcher.activate();

153

}

154

179

155

// keep track of segment

180

156

#if CLOCK_FORWARD

181

157

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

186

162

#endif

187

163

188

164

// draw

189

switch( _major_mode ) {

190

case MAIN_MODE_IDX:

191

switch( _minor_mode ) {

192

case ANALOGUE_CLOCK_IDX: analogue_clock_draw( segment ); break;

193

case DIGITAL_CLOCK_IDX: digital_clock_draw( segment ); break;

194

case TEST_PATTERN_IDX: test_pattern_draw( segment ); break;

195

}

196

break;

197

}

165

Drawer &drawer = mode_switcher.get_drawer();

166

if( reset ) drawer.draw_reset();

167

drawer.draw( segment );

198

168

199

169

#if CLOCK_FORWARD

200

170

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

205

175

206

176

207

177

// calculate time constants when a new pulse has occurred

208

void calculate_segment_times()

178

void calculateSegmentTimes()

209

179

{

210

180

// check for overflows, and only recalculate times if there isn't

211

181

// one (if there is, we'll just go with the last pulse's times)

212

if( _new_pulse_at > _last_pulse_at )

182

if( new_pulse_at > last_pulse_at )

213

183

{

214

184

// new segment stepping times

215

unsigned long delta = _new_pulse_at - _last_pulse_at;

216

_segment_step = delta / NUM_SEGMENTS;

217

_segment_step_sub = 0;

218

_segment_step_sub_step = delta % NUM_SEGMENTS;

185

unsigned long delta = new_pulse_at - last_pulse_at;

186

segment_step = delta / NUM_SEGMENTS;

187

segment_step_sub = 0;

188

segment_step_sub_step = delta % NUM_SEGMENTS;

219

189

}

220

190

221

191

// now we have dealt with this pulse, save the pulse time and

222

192

// clear new_pulse_at, ready for the next pulse

223

_last_pulse_at = _new_pulse_at;

224

_new_pulse_at = 0;

193

last_pulse_at = new_pulse_at;

194

new_pulse_at = 0;

225

195

}

226

196

227

197

228

198

// wait until it is time to draw the next segment or a new pulse has

229

199

// occurred

230

void wait_till_end_of_segment( bool reset )

200

void waitTillNextSegment( bool reset )

231

201

{

232

202

static unsigned long end_time = 0;

233

203

234

204

// handle reset

235

205

if( reset )

236

end_time = _last_pulse_at;

206

end_time = last_pulse_at;

237

207

238

208

// work out the time that this segment should be displayed until

239

end_time += _segment_step;

240

_segment_step_sub += _segment_step_sub_step;

241

if( _segment_step_sub >= NUM_SEGMENTS ) {

242

_segment_step_sub -= NUM_SEGMENTS;

209

end_time += segment_step;

210

segment_step_sub += segment_step_sub_step;

211

if( segment_step_sub >= NUM_SEGMENTS ) {

212

segment_step_sub -= NUM_SEGMENTS;

243

213

end_time++;

244

214

}

245

215

246

216

// wait

247

while( micros() < end_time && !_new_pulse_at );

217

while( micros() < end_time && !new_pulse_at );

248

218

}

249

219

250

220

251

221

// ISR to handle the pulses from the fan's tachiometer

252

void fan_pulse_handler()

222

void fanPulseHandler()

253

223

{

254

224

// the fan actually sends two pulses per revolution. These pulses

255

225

// may not be exactly evenly distributed around the rotation, so

260

230

if( !ignore )

261

231

{

262

232

// set a new pulse time

263

_new_pulse_at = micros();

233

new_pulse_at = micros();

264

234

}

265

235

}

266

236

269

239

void setup()

270

240

{

271

241

// set up an interrupt handler on pin 2 to nitice fan pulses

272

attachInterrupt( 0, fan_pulse_handler, RISING );

242

attachInterrupt( 0, fanPulseHandler, RISING );

273

243

digitalWrite( 2, HIGH );

274

244

275

245

// set up output pins (4 to 13) for the led array

279

249

// set up mode-switch button on pin 3

280

250

pinMode( 3, INPUT );

281

251

digitalWrite( 3, HIGH );

282

static int event_times[] = { 5, 500, 4000, 0 };

283

_button.set_event_times( event_times );

284

285

// get time from RTC

286

Time::init();

287

288

// activate the minor mode

289

switch( _major_mode ) {

290

case MAIN_MODE_IDX: activate_minor_mode(); break;

291

}

252

button.add_event_at( 5, 1 );

253

button.add_event_at( 1000, 2 );

254

button.add_event_at( 4000, 3 );

255

256

// serial comms

257

Serial.begin( 9600 );

292

258

}

293

259

294

260

296

262

void loop()

297

263

{

298

264

// if there has been a new pulse, we'll be resetting the display

299

bool reset = _new_pulse_at? true : false;

300

301

// update button

302

_button.update();

265

bool reset = new_pulse_at? true : false;

303

266

304

267

// only do this stuff at the start of a display cycle, to ensure

305

268

// that no state changes mid-display

306

269

if( reset )

307

270

{

308

// calculate segment times

309

calculate_segment_times();

271

// check buttons

272

checkButtons();

310

273

311

274

// keep track of time

312

Time::update();

313

314

// perform button events

315

do_button_events();

275

Time &time = Time::get_instance();

276

time.update();

316

277

}

317

278

318

279

// draw this segment

319

draw_next_segment( reset );

280

drawNextSegment( reset );

281

282

// do we need to recalculate segment times?

283

if( reset )

284

calculateSegmentTimes();

320

285

321

286

// wait till it's time to draw the next segment

322

wait_till_end_of_segment( reset );

287

waitTillNextSegment( reset );

323

288

}