/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/button.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/button.cc

Button::Button( int pin )

_pin( pin ),

_state( false ),

_millis_state( 0 ),

_millis_done( 0 ),

_pending_event( 0 ),

_last_real_state( false ),

_millis_real_state( 0 )

{

}

void Button::set_event_times( int event_times[] )

{

_event_times = event_times;

}

void Button::update()

{

_state( digitalRead( pin )? false : true ),

_state_millis( ::millis() ),

_state_duration( 0 )

{

}

void Button::add_event_at( int duration, int event_id )

{

_press_events[ duration ] = event_id;

}

int Button::update()

{

// reset event

_event_id = 0;

// get time

unsigned long millis = ::millis();

// get button state

bool real_state = digitalRead( _pin )? false : true;

// if real state has changed, reset the timer

if( real_state != _last_real_state ) {

_last_real_state = real_state;

_millis_real_state = millis;

// get state and check for change

bool state = digitalRead( _pin )? false : true;

if( state != _state )

{

_state = state;

_state_millis = millis;

_state_duration = 0;

}

// work out current state; if the real state timer has elapsed, set our

// state to real state

bool state = _state;

if( _last_real_state != state && millis - _millis_real_state > 15 )

state = _last_real_state;

// if the button is pressed

if( state )

// if button has been pressed for any amount of time

if( state && _state_millis < millis )

{

// if it has just been pressed, record the time now and reset how much

// of the press we have already generated events for

if( !_state ) {

_millis_state = millis;

_millis_done = 0;

}

// calculate time that has elapsed in total this press

unsigned long elapsed = millis - _millis_state;

// look through the events to see if any need to be triggered

for( int a = 0; _event_times[ a ]; a++ )

// calculate new duration for this state

unsigned long duration = millis - _state_millis;

// check through events to see if the button has been

// pressed long enough to trigger one

for( std::map< int, int >::iterator i = _press_events.begin();

i != _press_events.end(); i++ )

{

// if this event is in the future, stop

if( (unsigned)_event_times[ a ] > elapsed ) break;

// if this event has already been triggered, skip

if( (unsigned)_event_times[ a ] <= _millis_done ) continue;

// trigger event

_pending_event = a + 1;

// if this event is in the future, we can stop looking

if( duration < (unsigned long)i->first )

break;

// if this event happened since the previous update, we

// can trigger it

if( _state_duration < (unsigned long)i->first )

_event_id = i->second;

}

// update the amount of press we have processed

_millis_done = elapsed;

// update the duration we've accounted for

_state_duration = duration;

}

// update our state

_state = state;

}

100

101

102

int Button::get_event()

103

{

104

int event = _pending_event;

105

_pending_event = 0;

106

return event;

107

}

108

109

110

bool Button::get_state()

111

{

112

return _state;

return _event_id;

}

int Button::get_triggered_event()

{

return _event_id;

113

}

Older »