/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
/*
87 by edam
switched back to using classes for modes
2
 * analogue_clock_mode.cc
58 by edam
removed Bounce library and updated/fixed new code
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
 */
87 by edam
switched back to using classes for modes
23
#include "analogue_clock_mode.h"
56 by edam
updated software to include drawing abstraction infrastructure
24
#include "config.h"
59 by edam
removed ulibc, fixed button, added text rendering
25
#include "Arduino.h"
56 by edam
updated software to include drawing abstraction infrastructure
26
#include "time.h"
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
27
#include "common.h"
90 by Tim Marston
text messages are now individually enabled and draw()n automatically
28
#include "text.h"
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
29
30
87 by edam
switched back to using classes for modes
31
void AnalogueClockMode::draw( int segment )
56 by edam
updated software to include drawing abstraction infrastructure
32
{
58 by edam
removed Bounce library and updated/fixed new code
33
	bool draw_tick = segment && ( segment % ( NUM_SECOND_SEGMENTS * 5 ) == 0 ||
34
		segment == 1 || segment == NUM_SEGMENTS - 1 );
35
	bool draw_hour = segment == _hour_segment;
63 by edam
widenned clock hands, tweaked scales, got top & bottom text modes working
36
	bool draw_hour_side = 2 >=
59 by edam
removed ulibc, fixed button, added text rendering
37
		( abs( _hour_segment - segment ) + NUM_SEGMENTS ) % NUM_SEGMENTS;
58 by edam
removed Bounce library and updated/fixed new code
38
	bool draw_minute = segment == _minute_segment;
63 by edam
widenned clock hands, tweaked scales, got top & bottom text modes working
39
	bool draw_minute_side = 1 >=
40
		( abs( _minute_segment - segment ) + NUM_SEGMENTS ) % NUM_SEGMENTS;
41
58 by edam
removed Bounce library and updated/fixed new code
42
	bool draw_second = segment == _second_segment;
56 by edam
updated software to include drawing abstraction infrastructure
43
44
	// set the LEDs
91 by Tim Marston
fixed text glitch; extended all modes; added screen flip super-long press;
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
	}
58 by edam
removed Bounce library and updated/fixed new code
92
}
93
94
87 by edam
switched back to using classes for modes
95
void AnalogueClockMode::draw_reset()
58 by edam
removed Bounce library and updated/fixed new code
96
{
91 by Tim Marston
fixed text glitch; extended all modes; added screen flip super-long press;
97
	int old_second_segment = _second_segment;
98
58 by edam
removed Bounce library and updated/fixed new code
99
	// calculate hand locations
66 by Tim Marston
removed time singleton, not cause it saved much space, but cause i don't want singletons in this project!
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;
91 by Tim Marston
fixed text glitch; extended all modes; added screen flip super-long press;
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
	}
56 by edam
updated software to include drawing abstraction infrastructure
115
}
68 by Tim Marston
added frame reset code and inited minor mode flavours on mode activation
116
117
87 by edam
switched back to using classes for modes
118
void AnalogueClockMode::activate()
68 by Tim Marston
added frame reset code and inited minor mode flavours on mode activation
119
{
120
	_flavour = 0;
91 by Tim Marston
fixed text glitch; extended all modes; added screen flip super-long press;
121
	_second_millis = ::millis();
90 by Tim Marston
text messages are now individually enabled and draw()n automatically
122
123
	Text::reset();
68 by Tim Marston
added frame reset code and inited minor mode flavours on mode activation
124
}
87 by edam
switched back to using classes for modes
125
126
127
void AnalogueClockMode::press()
128
{
91 by Tim Marston
fixed text glitch; extended all modes; added screen flip super-long press;
129
	if( ++_flavour >= 4 )
87 by edam
switched back to using classes for modes
130
		_flavour = 0;
131
}