/elec/propeller-clock

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: Tim Marston
  • Date: 2012-03-21 21:24:17 UTC
  • Revision ID: tim@ed.am-20120321212417-dnba5l1oheddeyxw
fixed time centring and display in settings mode

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/button.cc
27
27
Button::Button( int pin )
28
28
        :
29
29
        _pin( pin ),
30
 
        _state( false ),
31
 
        _state_millis( 0 ),
32
 
        _state_duration_done( 0 ),
33
 
        _pending_event( 0 ),
34
 
        _send_interim( false ),
35
 
        _ignore_next_unpress( false )
 
30
        _state( digitalRead( pin )? false : true ),
 
31
        _state_millis( ::millis() ),
 
32
        _state_duration( 0 ),
 
33
        _pending_event( 0 )
36
34
{
37
35
}
38
36
 
43
41
}
44
42
 
45
43
 
46
 
void Button::set_press_mode( bool send_interim )
47
 
{
48
 
        // if the button is down and we're switching from sending interim presses
49
 
        // to not sending interim presses, we need to ignore the next unpress, or
50
 
        // this button press may trigger events while being presses *and* events
51
 
        // when it is unpressed.
52
 
        if( _state && _send_interim && !send_interim )
53
 
                _ignore_next_unpress = true;
54
 
 
55
 
        // set mode
56
 
        _send_interim = send_interim;
57
 
}
58
 
 
59
 
 
60
44
void Button::update()
61
45
{
62
46
        // get time
66
50
        bool state = digitalRead( _pin )? false : true;
67
51
        if( state != _state )
68
52
        {
69
 
                // if we're not sending interim presses, we care about when the button
70
 
                // is being unpressed
71
 
                if( !_send_interim && !state )
72
 
                {
73
 
                        // are we being told to ignore the next unpress?
74
 
                        if( _ignore_next_unpress )
75
 
                                _ignore_next_unpress = false;
76
 
                        else
77
 
                        {
78
 
                                // check through events to see if the button was pressed long
79
 
                                // enough to trigger one
80
 
                                for( int a = 0; _event_times[ a ]; a++ )
81
 
                                {
82
 
                                        // if this event is in the future, we can stop looking
83
 
                                        if( _state_millis < (unsigned long)_event_times[ a ] )
84
 
                                                break;
85
 
                                        
86
 
                                        // trigger it
87
 
                                        _pending_event = a + 1;
88
 
                                }
89
 
                        }
90
 
                }
91
 
                
92
 
                // reset state
93
53
                _state = state;
94
54
                _state_millis = millis;
95
 
                _state_duration_done = 0;
 
55
                _state_duration = 0;
96
56
        }
97
57
 
98
 
        // if we are sending interim presses, we care about all the time that the
99
 
        // button is being pressed
100
 
        if( _send_interim && state )
 
58
        // if button has been pressed for any amount of time
 
59
        if( state && millis > _state_millis )
101
60
        {
102
61
                // calculate new duration for this state
103
62
                unsigned long duration = millis - _state_millis;
104
63
 
105
 
                // check through events to see if the button has been pressed long
106
 
                // enough to trigger one
 
64
                // check through events to see if the button has been
 
65
                // pressed long enough to trigger one
107
66
                for( int a = 0; _event_times[ a ]; a++ )
108
67
                {
109
68
                        // if this event is in the future, we can stop looking
110
69
                        if( duration < (unsigned long)_event_times[ a ] )
111
70
                                break;
112
71
 
113
 
                        // if this event happened since the previous update, trigger it
114
 
                        if( _state_duration_done < (unsigned long)_event_times[ a ] )
 
72
                        // if this event happened since the previous update, we
 
73
                        // can trigger it
 
74
                        if( _state_duration < (unsigned long)_event_times[ a ] )
115
75
                                _pending_event = a + 1;
116
76
                }
117
77
 
118
78
                // update the duration we've accounted for
119
 
                _state_duration_done = duration;
 
79
                _state_duration = duration;
120
80
        }
121
81
}
122
82