/elec/propeller-clock

To get this branch, use:
bzr branch http://bzr.ed.am/elec/propeller-clock
58 by edam
removed Bounce library and updated/fixed new code
1
/*
2
 * button.cc
3
 *
4
 * Copyright (C) 2011 Tim Marston <tim@ed.am> and Dan Marston.
5
 *
6
 * This file is part of propeller-clock (hereafter referred to as "this
7
 * program"). See http://ed.am/dev/software/arduino/propeller-clock for more
8
 * information.
9
 *
10
 * This program is free software: you can redistribute it and/or modify
11
 * it under the terms of the GNU Lesser General Public License as published
12
 * by the Free Software Foundation, either version 3 of the License, or
13
 * (at your option) any later version.
14
 *
15
 * This program is distributed in the hope that it will be useful,
16
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
17
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18
 * GNU Lesser General Public License for more details.
19
 *
20
 * You should have received a copy of the GNU Lesser General Public License
21
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
22
 */
56 by edam
updated software to include drawing abstraction infrastructure
23
#include <Arduino.h>
24
#include <button.h>
25
26
27
Button::Button( int pin )
28
	:
29
	_pin( pin ),
58 by edam
removed Bounce library and updated/fixed new code
30
	_state( digitalRead( pin )? false : true ),
31
	_state_millis( ::millis() ),
32
	_state_duration( 0 )
56 by edam
updated software to include drawing abstraction infrastructure
33
{
34
}
35
36
37
void Button::add_event_at( int duration, int event_id )
38
{
39
	_press_events[ duration ] = event_id;
40
}
41
42
43
int Button::update()
44
{
45
	// reset event
46
	_event_id = 0;
47
48
	// get time
58 by edam
removed Bounce library and updated/fixed new code
49
	unsigned long millis = ::millis();
56 by edam
updated software to include drawing abstraction infrastructure
50
51
	// get state and check for change
58 by edam
removed Bounce library and updated/fixed new code
52
	bool state = digitalRead( _pin )? false : true;
53
	if( state != _state )
54
	{
55
		_state = state;
56
		_state_millis = millis;
57
		_state_duration = 0;
58
	}
59
60
	// if button has been pressed for any amount of time
61
	if( state && _state_millis < millis )
62
	{
63
		// calculate new duration for this state
64
		unsigned long duration = millis - _state_millis;
65
66
		// check through events to see if the button has been
67
		// pressed long enough to trigger one
68
		for( std::map< int, int >::iterator i = _press_events.begin();
69
			 i != _press_events.end(); i++ )
56 by edam
updated software to include drawing abstraction infrastructure
70
		{
58 by edam
removed Bounce library and updated/fixed new code
71
			// if this event is in the future, we can stop looking
72
			if( duration < (unsigned long)i->first )
73
				break;
74
75
			// if this event happened since the previous update, we
76
			// can trigger it
77
			if( _state_duration < (unsigned long)i->first )
78
				_event_id = i->second;
56 by edam
updated software to include drawing abstraction infrastructure
79
		}
80
58 by edam
removed Bounce library and updated/fixed new code
81
		// update the duration we've accounted for
82
		_state_duration = duration;
56 by edam
updated software to include drawing abstraction infrastructure
83
	}
84
85
	return _event_id;
86
}
87
88
89
int Button::get_triggered_event()
90
{
91
	return _event_id;
92
}