/elec/propeller-clock : revision 56

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:17 UTC
Revision ID: tim@ed.am-20120225013117-53ed8yahoreoms76

updated software to include drawing abstraction infrastructure

files added:
src/util/Bounce.cpp

src/util/Bounce.h

files removed:
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 modified:
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/propeller-clock.ino

src/test_mode.cc

src/test_mode.h

src/time.cc

src/time.h

Show diffs side-by-side

added added

removed removed

src/propeller-clock.ino

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

#include "button.h"

#include <button.h>

#include "config.h"

#include "time.h"

#include "mode_switcher.h"

100

101

static unsigned long segment_step_sub_step = 0;

101

102

static unsigned long segment_step_sub = 0;

102

103

// the button

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

104

108

static Button button( 3 );

105

109

106

// major mode

107

static int major_mode = 0;

108

109

// major modes

110

static std::vector< MajorMode * > major_modes;

111

112

110

//_____________________________________________________________________________

113

111

// code

114

112

122

120

// handle any events

123

121

switch( event ) {

124

122

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

123

inc_draw_mode = true;

134

124

break;

135

125

}

136

126

}

137

127

138

128

129

// turn an led on/off

130

void ledOn( int num, bool on )

131

{

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

141

}

142

143

139

144

// draw a display segment

140

145

void drawNextSegment( bool reset )

141

146

{

147

static ModeSwitcher mode_switcher;

148

static bool init = false;

149

150

if( !init ) {

151

init = true;

152

mode_switcher.activate();

153

}

154

142

155

// keep track of segment

143

156

#if CLOCK_FORWARD

144

157

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

149

162

#endif

150

163

151

164

// draw

152

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

165

Drawer &drawer = mode_switcher.get_drawer();

153

166

if( reset ) drawer.draw_reset();

154

167

drawer.draw( segment );

155

168

242

255

243

256

// serial comms

244

257

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

250

258

}

251

259

252

260

Older »