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

  • Committer: edam
  • Date: 2012-03-03 10:06:31 UTC
  • Revision ID: edam@waxworlds.org-20120303100631-ae3idks1703vdm05
widenned clock hands, tweaked scales, got top & bottom text modes working

Show diffs side-by-side

added added

removed removed

Lines of Context:
24
24
#include "config.h"
25
25
#include "Arduino.h"
26
26
#include "time.h"
27
 
#include "common.h"
28
 
#include "text.h"
 
27
#include "display.h"
 
28
 
 
29
 
 
30
AnalogueClockMode::AnalogueClockMode()
 
31
        :
 
32
    MinorMode( 2 )
 
33
{
 
34
}
29
35
 
30
36
 
31
37
void AnalogueClockMode::draw( int segment )
35
41
        bool draw_hour = segment == _hour_segment;
36
42
        bool draw_hour_side = 2 >=
37
43
                ( abs( _hour_segment - segment ) + NUM_SEGMENTS ) % NUM_SEGMENTS;
 
44
                
 
45
//              ( segment == ( _hour_segment + 1 ) % NUM_SEGMENTS ) ||
 
46
//              ( segment == ( _hour_segment + NUM_SEGMENTS - 1 ) % NUM_SEGMENTS );
38
47
        bool draw_minute = segment == _minute_segment;
39
48
        bool draw_minute_side = 1 >=
40
49
                ( abs( _minute_segment - segment ) + NUM_SEGMENTS ) % NUM_SEGMENTS;
42
51
        bool draw_second = segment == _second_segment;
43
52
 
44
53
        // set the LEDs
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
        Display::led( 9, get_flavour() == 0 );
 
55
        Display::led( 8, draw_tick || draw_second );
 
56
        Display::led( 7, draw_minute || draw_second );
 
57
        Display::led( 6, draw_minute || draw_minute_side || draw_second );
 
58
        Display::led( 5, draw_minute || draw_minute_side ||
 
59
                                  draw_second || draw_hour );
 
60
        for( int a = 0; a <= 4; a++ )
 
61
                Display::led( a, draw_minute || draw_minute_side ||
 
62
                                          draw_second || draw_hour || draw_hour_side );
92
63
}
93
64
 
94
65
 
95
66
void AnalogueClockMode::draw_reset()
96
67
{
97
 
        int old_second_segment = _second_segment;
 
68
        Time &time = Time::get_instance();
98
69
 
99
70
        // calculate hand locations
100
 
        _hour_segment = ( Time::get_hours() % 12 ) * 5 * NUM_SECOND_SEGMENTS +
101
 
                ( 5 * NUM_SECOND_SEGMENTS * Time::get_minutes() / 60 );
102
 
        _minute_segment = Time::get_minutes() * NUM_SECOND_SEGMENTS +
103
 
                ( NUM_SECOND_SEGMENTS * Time::get_seconds() / 60 );
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
 
        }
115
 
}
116
 
 
117
 
 
118
 
void AnalogueClockMode::activate()
119
 
{
120
 
        _flavour = 0;
121
 
        _second_millis = ::millis();
122
 
 
123
 
        Text::reset();
124
 
}
125
 
 
126
 
 
127
 
void AnalogueClockMode::press()
128
 
{
129
 
        if( ++_flavour >= 4 )
130
 
                _flavour = 0;
 
71
        _hour_segment = ( time.get_hours() % 12 ) * 5 * NUM_SECOND_SEGMENTS +
 
72
                ( 5 * NUM_SECOND_SEGMENTS * time.get_minutes() / 60 );
 
73
        _minute_segment = time.get_minutes() * NUM_SECOND_SEGMENTS +
 
74
                ( NUM_SECOND_SEGMENTS * time.get_seconds() / 60 );
 
75
        _second_segment = time.get_seconds() * NUM_SECOND_SEGMENTS;
131
76
}