/elec/propeller-clock : revision 53

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-23 00:26:32 UTC
Revision ID: edam@waxworlds.org-20120223002632-kkwrdwijfmv45f0j

conrtol segment number from one place and reverse the order the segments are drawn (backwards clock!)

files added:
src/util/Bounce.cpp

src/util/Bounce.h

files removed:
src/analogue_clock.cc

src/analogue_clock.h

src/button.cc

src/button.h

src/common.cc

src/common.h

src/config.h

src/digital_clock.cc

src/digital_clock.h

src/test_pattern.cc

src/test_pattern.h

src/text.cc

src/text.h

src/text_renderer.cc

src/text_renderer.h

src/time.cc

src/time.h

src/util/PString.cpp

src/util/PString.h

files renamed:
src/propeller-clock.cc => src/propeller-clock.ino

files modified:
.bzrignore

arduino.mk

src/Makefile

Show diffs side-by-side

added added

removed removed

src/propeller-clock.ino

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

#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 <Bounce.h>

#include <DS1307.h>

#include <Wire.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

static unsigned long segment_step_sub_step = 0;

100

static unsigned long segment_step_sub = 0;

101

102

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

103

static bool inc_draw_mode = false;

104

105

// a bounce-managed button

106

static Bounce button( 3, 50 );

107

108

// the time

109

static int time_hours = 0;

110

static int time_minutes = 0;

111

static int time_seconds = 0;

112

113

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

114

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

115

#define NUM_SECOND_SEGMENTS 5

116

#define NUM_SEGMENTS ( 60 * NUM_SECOND_SEGMENTS )

117

118

// clock direction

119

#define CLOCK_FORWARD 0

116

120

117

121

//_____________________________________________________________________________

118

122

// code

119

123

120

124

121

// activate the current minor mode

122

void activate_minor_mode()

125

// check for button presses

126

void checkButtons()

123

127

{

124

switch( _minor_mode ) {

125

case DIGITAL_CLOCK_IDX: digital_clock_activate(); break;

126

}

128

// update buttons

129

button.update();

130

131

// notice button presses

132

if( button.risingEdge() )

133

inc_draw_mode = true;

127

134

}

128

135

129

// perform button events

130

void do_button_events()

136

137

// keep track of time

138

void trackTime()

131

139

{

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;

140

// previous time and any carried-over milliseconds

141

static unsigned long last_time = millis();

142

static unsigned long carry = 0;

143

144

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

145

unsigned long next_time = millis();

146

unsigned long delta = next_time - last_time + carry;

147

148

// update the previous time and carried-over milliseconds

149

last_time = next_time;

150

carry = delta % 1000;

151

152

// add the seconds that have passed to the time

153

time_seconds += delta / 1000;

154

while( time_seconds >= 60 ) {

155

time_seconds -= 60;

156

time_minutes++;

157

if( time_minutes >= 60 ) {

158

time_minutes -= 60;

159

time_hours++;

160

if( time_hours >= 24 )

161

time_hours -= 24;

171

162

}

172

163

}

173

164

}

174

165

175

166

167

// turn an led on/off

168

void ledOn( int num, bool on )

169

{

170

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

171

172

// convert to pin no.

173

num += 4;

174

175

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

176

// NOTE: PIN 4 TEMPORARILY DISABLED

177

// if( num == 4 ) on = true;

178

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

179

180

digitalWrite( num, on? HIGH : LOW );

181

}

182

183

184

// draw a segment for the test display

185

void drawNextSegment_test( int segment )

186

{

187

// turn on inside and outside LEDs

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 < 9; a++ )

193

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

194

}

195

196

197

// draw a segment for the time display

198

void drawNextSegment_time( int segment )

199

{

200

int second = segment / NUM_SECOND_SEGMENTS;

201

int second_segment = segment % NUM_SECOND_SEGMENTS;

202

203

// what needs to be drawn?

204

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

205

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

206

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

207

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

208

209

// set the LEDs

210

ledOn( 9, true );

211

ledOn( 8, draw_tick || draw_minute );

212

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

213

ledOn( a, draw_minute || draw_second );

214

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

215

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

216

}

217

218

176

219

// draw a display segment

177

void draw_next_segment( bool reset )

220

void drawNextSegment( bool reset )

178

221

{

222

static int draw_mode = 0;

223

179

224

// keep track of segment

180

225

#if CLOCK_FORWARD

181

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

182

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

226

static int segment = 0;

227

if( reset ) segment = 0;

183

228

#else

184

static int segment = NUM_SEGMENTS - 1 - CLOCK_SHIFT;

185

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

229

static int segment = NUM_SEGMENTS - 1;

230

if( reset ) segment = NUM_SEGMENTS - 1;

186

231

#endif

187

232

188

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

233

// handle mode switch requests

234

if( reset && inc_draw_mode ) {

235

inc_draw_mode = false;

236

draw_mode++;

237

if( draw_mode >= 2 )

238

draw_mode = 0;

239

}

240

241

// draw the segment

242

switch( draw_mode ) {

243

case 0: drawNextSegment_test( segment ); break;

244

case 1: drawNextSegment_time( segment ); break;

197

245

}

198

246

199

247

#if CLOCK_FORWARD

200

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

248

segment++;

201

249

#else

202

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

250

segment--;

203

251

#endif

204

252

}

205

253

206

254

207

255

// calculate time constants when a new pulse has occurred

208

void calculate_segment_times()

256

void calculateSegmentTimes()

209

257

{

210

258

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

211

259

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

212

if( _new_pulse_at > _last_pulse_at )

260

if( new_pulse_at > last_pulse_at )

213

261

{

214

262

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

263

unsigned long delta = new_pulse_at - last_pulse_at;

264

segment_step = delta / NUM_SEGMENTS;

265

segment_step_sub = 0;

266

segment_step_sub_step = delta % NUM_SEGMENTS;

219

267

}

220

268

221

269

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

222

270

// clear new_pulse_at, ready for the next pulse

223

_last_pulse_at = _new_pulse_at;

224

_new_pulse_at = 0;

271

last_pulse_at = new_pulse_at;

272

new_pulse_at = 0;

225

273

}

226

274

227

275

228

276

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

229

277

// occurred

230

void wait_till_end_of_segment( bool reset )

278

void waitTillNextSegment( bool reset )

231

279

{

232

280

static unsigned long end_time = 0;

233

281

234

282

// handle reset

235

283

if( reset )

236

end_time = _last_pulse_at;

284

end_time = last_pulse_at;

237

285

238

286

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

287

end_time += segment_step;

288

segment_step_sub += segment_step_sub_step;

289

if( segment_step_sub >= NUM_SEGMENTS ) {

290

segment_step_sub -= NUM_SEGMENTS;

243

291

end_time++;

244

292

}

245

293

246

294

// wait

247

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

295

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

248

296

}

249

297

250

298

251

299

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

252

void fan_pulse_handler()

300

void fanPulseHandler()

253

301

{

254

302

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

255

303

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

260

308

if( !ignore )

261

309

{

262

310

// set a new pulse time

263

_new_pulse_at = micros();

311

new_pulse_at = micros();

264

312

}

265

313

}

266

314

269

317

void setup()

270

318

{

271

319

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

272

attachInterrupt( 0, fan_pulse_handler, RISING );

320

attachInterrupt( 0, fanPulseHandler, RISING );

273

321

digitalWrite( 2, HIGH );

274

322

275

323

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

279

327

// set up mode-switch button on pin 3

280

328

pinMode( 3, INPUT );

281

329

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

}

330

331

// get the time from the real-time clock

332

int rtc_data[ 7 ];

333

RTC.get( rtc_data, true );

334

time_hours = rtc_data[ DS1307_HR ];

335

time_minutes = rtc_data[ DS1307_MIN ];

336

time_seconds = rtc_data[ DS1307_SEC ];

337

338

// serial comms

339

Serial.begin( 9600 );

292

340

}

293

341

294

342

296

344

void loop()

297

345

{

298

346

// 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();

347

bool reset = new_pulse_at? true : false;

303

348

304

349

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

305

350

// that no state changes mid-display

306

351

if( reset )

307

352

{

308

// calculate segment times

309

calculate_segment_times();

353

// check buttons

354

checkButtons();

310

355

311

356

// keep track of time

312

Time::update();

313

314

// perform button events

315

do_button_events();

357

trackTime();

316

358

}

317

359

318

360

// draw this segment

319

draw_next_segment( reset );

361

drawNextSegment( reset );

362

363

// do we need to recalculate segment times?

364

if( reset )

365

calculateSegmentTimes();

320

366

321

367

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

322

wait_till_end_of_segment( reset );

368

waitTillNextSegment( reset );

323

369

}