/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/modes/analogue_clock_mode.cc

  • Committer: Tim Marston
  • Date: 2012-05-23 23:02:50 UTC
  • Revision ID: tim@ed.am-20120523230250-3pls2u6zt3av0uam
fixed text glitch; extended all modes; added screen flip super-long press;
added button unpress debounde; moved interim button press ignoration to
settings mode; fixed left-over led issue; finished for demo!

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modes/analogue_clock_mode.cc
42
42
        bool draw_second = segment == _second_segment;
43
43
 
44
44
        // set the LEDs
45
 
        led( 9, _flavour == 0 );
46
 
        led( 8, draw_tick || draw_second );
47
 
        led( 7, draw_minute || draw_second );
48
 
        led( 6, draw_minute || draw_minute_side || draw_second );
49
 
        led( 5, draw_minute || draw_minute_side ||
50
 
                                  draw_second || draw_hour );
51
 
        for( int a = 0; a <= 4; a++ )
52
 
                led( a, draw_minute || draw_minute_side ||
53
 
                                          draw_second || draw_hour || draw_hour_side );
 
45
        switch( _flavour )
 
46
        {
 
47
        case 0:
 
48
                led( 9, true );
 
49
                led( 8, draw_tick || draw_second );
 
50
                led( 7, draw_minute || draw_second );
 
51
                led( 6, draw_minute || draw_minute_side || draw_second );
 
52
                led( 5, draw_minute || draw_minute_side ||
 
53
                                          draw_second || draw_hour );
 
54
                for( int a = 0; a <= 4; a++ )
 
55
                        led( a, draw_minute || draw_minute_side ||
 
56
                                                  draw_second || draw_hour || draw_hour_side );
 
57
                break;
 
58
        case 1:
 
59
                led( 9, draw_tick );
 
60
                led( 8, draw_second );
 
61
                led( 7, draw_minute || draw_second );
 
62
                led( 6, draw_minute || draw_minute_side || draw_second );
 
63
                led( 5, draw_minute || draw_minute_side ||
 
64
                                          draw_second || draw_hour );
 
65
                for( int a = 0; a <= 4; a++ )
 
66
                        led( a, draw_minute || draw_minute_side ||
 
67
                                                  draw_second || draw_hour || draw_hour_side );
 
68
                break;
 
69
        case 2:
 
70
                led( 9, segment <= _subsecond_segment );
 
71
                led( 8, draw_tick || draw_second );
 
72
                led( 7, draw_minute || draw_second );
 
73
                led( 6, draw_minute || draw_minute_side || draw_second );
 
74
                led( 5, draw_minute || draw_minute_side ||
 
75
                                          draw_second || draw_hour );
 
76
                for( int a = 0; a <= 4; a++ )
 
77
                        led( a, draw_minute || draw_minute_side ||
 
78
                                                  draw_second || draw_hour || draw_hour_side );
 
79
                break;
 
80
        case 3:
 
81
                led( 9, segment <= ( _second_segment +
 
82
                                NUM_SECOND_SEGMENTS * _subsecond_segment / NUM_SEGMENTS ) );
 
83
                led( 8, draw_tick );
 
84
                led( 7, draw_minute );
 
85
                led( 6, draw_minute || draw_minute_side );
 
86
                led( 5, draw_minute || draw_minute_side || draw_hour );
 
87
                for( int a = 0; a <= 4; a++ )
 
88
                        led( a, draw_minute || draw_minute_side ||
 
89
                                        draw_hour || draw_hour_side );
 
90
                break;
 
91
        }
54
92
}
55
93
 
56
94
 
57
95
void AnalogueClockMode::draw_reset()
58
96
{
 
97
        int old_second_segment = _second_segment;
 
98
 
59
99
        // calculate hand locations
60
100
        _hour_segment = ( Time::get_hours() % 12 ) * 5 * NUM_SECOND_SEGMENTS +
61
101
                ( 5 * NUM_SECOND_SEGMENTS * Time::get_minutes() / 60 );
62
102
        _minute_segment = Time::get_minutes() * NUM_SECOND_SEGMENTS +
63
103
                ( NUM_SECOND_SEGMENTS * Time::get_seconds() / 60 );
64
104
        _second_segment = Time::get_seconds() * NUM_SECOND_SEGMENTS;
 
105
 
 
106
        // calculate the subsecond segment
 
107
        if( old_second_segment != _second_segment ) {
 
108
                _second_millis = millis();
 
109
                _subsecond_segment = 0;
 
110
        }
 
111
        else {
 
112
                unsigned long elapsed = ::millis() - _second_millis;
 
113
                _subsecond_segment = elapsed * NUM_SEGMENTS / 1000;
 
114
        }
65
115
}
66
116
 
67
117
 
68
118
void AnalogueClockMode::activate()
69
119
{
70
120
        _flavour = 0;
 
121
        _second_millis = ::millis();
71
122
 
72
123
        Text::reset();
73
124
}
75
126
 
76
127
void AnalogueClockMode::press()
77
128
{
78
 
        if( ++_flavour >= 2 )
 
129
        if( ++_flavour >= 4 )
79
130
                _flavour = 0;
80
131
}