/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() ),
59 by edam
removed ulibc, fixed button, added text rendering
32
	_state_duration( 0 ),
33
	_pending_event( 0 )
34
{
35
}
36
37
38
void Button::set_event_times( int event_times[] )
39
{
40
	_event_times = event_times;
41
}
42
43
44
void Button::update()
45
{
56 by edam
updated software to include drawing abstraction infrastructure
46
	// get time
58 by edam
removed Bounce library and updated/fixed new code
47
	unsigned long millis = ::millis();
56 by edam
updated software to include drawing abstraction infrastructure
48
49
	// get state and check for change
58 by edam
removed Bounce library and updated/fixed new code
50
	bool state = digitalRead( _pin )? false : true;
51
	if( state != _state )
52
	{
53
		_state = state;
54
		_state_millis = millis;
55
		_state_duration = 0;
56
	}
57
58
	// if button has been pressed for any amount of time
59 by edam
removed ulibc, fixed button, added text rendering
59
	if( state && millis > _state_millis )
58 by edam
removed Bounce library and updated/fixed new code
60
	{
61
		// calculate new duration for this state
62
		unsigned long duration = millis - _state_millis;
63
64
		// check through events to see if the button has been
65
		// pressed long enough to trigger one
59 by edam
removed ulibc, fixed button, added text rendering
66
		for( int a = 0; _event_times[ a ]; a++ )
56 by edam
updated software to include drawing abstraction infrastructure
67
		{
58 by edam
removed Bounce library and updated/fixed new code
68
			// if this event is in the future, we can stop looking
59 by edam
removed ulibc, fixed button, added text rendering
69
			if( duration < (unsigned long)_event_times[ a ] )
58 by edam
removed Bounce library and updated/fixed new code
70
				break;
71
72
			// if this event happened since the previous update, we
73
			// can trigger it
59 by edam
removed ulibc, fixed button, added text rendering
74
			if( _state_duration < (unsigned long)_event_times[ a ] )
75
				_pending_event = a + 1;
56 by edam
updated software to include drawing abstraction infrastructure
76
		}
77
58 by edam
removed Bounce library and updated/fixed new code
78
		// update the duration we've accounted for
79
		_state_duration = duration;
56 by edam
updated software to include drawing abstraction infrastructure
80
	}
81
}
82
83
59 by edam
removed ulibc, fixed button, added text rendering
84
int Button::get_event()
56 by edam
updated software to include drawing abstraction infrastructure
85
{
59 by edam
removed ulibc, fixed button, added text rendering
86
	int event = _pending_event;
87
	_pending_event = 0;
88
	return event;
56 by edam
updated software to include drawing abstraction infrastructure
89
}