39
33
bool draw_tick = segment && ( segment % ( NUM_SECOND_SEGMENTS * 5 ) == 0 ||
40
34
segment == 1 || segment == NUM_SEGMENTS - 1 );
41
35
bool draw_hour = segment == _hour_segment;
42
bool draw_hour_side = 1 >=
36
bool draw_hour_side = 2 >=
43
37
( abs( _hour_segment - segment ) + NUM_SEGMENTS ) % NUM_SEGMENTS;
45
// ( segment == ( _hour_segment + 1 ) % NUM_SEGMENTS ) ||
46
// ( segment == ( _hour_segment + NUM_SEGMENTS - 1 ) % NUM_SEGMENTS );
47
38
bool draw_minute = segment == _minute_segment;
39
bool draw_minute_side = 1 >=
40
( abs( _minute_segment - segment ) + NUM_SEGMENTS ) % NUM_SEGMENTS;
48
42
bool draw_second = segment == _second_segment;
51
Display::led( 9, get_flavour() == 0 );
52
Display::led( 8, draw_tick || draw_second );
53
for( int a = 6; a <= 7; a++ )
54
Display::led( a, draw_minute || draw_second );
55
Display::led( 5, draw_minute || draw_second || draw_hour );
56
for( int a = 0; a <= 4; a++ )
57
Display::led( a, draw_minute || draw_second || draw_hour || draw_hour_side );
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 );
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 );
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 );
81
led( 9, segment <= ( _second_segment +
82
NUM_SECOND_SEGMENTS * _subsecond_segment / NUM_SEGMENTS ) );
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 );
61
95
void AnalogueClockMode::draw_reset()
63
Time &time = Time::get_instance();
97
int old_second_segment = _second_segment;
65
99
// calculate hand locations
66
_hour_segment = ( time.get_hours() % 12 ) * 5 * NUM_SECOND_SEGMENTS +
67
( 5 * NUM_SECOND_SEGMENTS * time.get_minutes() / 60 );
68
_minute_segment = time.get_minutes() * NUM_SECOND_SEGMENTS +
69
( NUM_SECOND_SEGMENTS * time.get_seconds() / 60 );
70
_second_segment = time.get_seconds() * NUM_SECOND_SEGMENTS;
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;
106
// calculate the subsecond segment
107
if( old_second_segment != _second_segment ) {
108
_second_millis = millis();
109
_subsecond_segment = 0;
112
unsigned long elapsed = ::millis() - _second_millis;
113
_subsecond_segment = elapsed * NUM_SEGMENTS / 1000;
118
void AnalogueClockMode::activate()
121
_second_millis = ::millis();
127
void AnalogueClockMode::press()
129
if( ++_flavour >= 4 )