/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
/*
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
2
 * analogue_clock.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
 */
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
23
#include "analogue_clock.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"
28
29
30
// the segment that the hour hand should be at
31
static int _hour_segment;
32
33
// the segment that the minute hand should be at
34
static int _minute_segment;
35
36
// the segment that the second hand should be at
37
static int _second_segment;
38
39
// the flavour
40
int _flavour = 0;
41
42
43
void analogue_clock_press()
56 by edam
updated software to include drawing abstraction infrastructure
44
{
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
45
	if( ++_flavour >= 2 )
46
		_flavour = 0;
56 by edam
updated software to include drawing abstraction infrastructure
47
}
48
49
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
50
void analogue_clock_draw( int segment )
56 by edam
updated software to include drawing abstraction infrastructure
51
{
58 by edam
removed Bounce library and updated/fixed new code
52
	bool draw_tick = segment && ( segment % ( NUM_SECOND_SEGMENTS * 5 ) == 0 ||
53
		segment == 1 || segment == NUM_SEGMENTS - 1 );
54
	bool draw_hour = segment == _hour_segment;
63 by edam
widenned clock hands, tweaked scales, got top & bottom text modes working
55
	bool draw_hour_side = 2 >=
59 by edam
removed ulibc, fixed button, added text rendering
56
		( abs( _hour_segment - segment ) + NUM_SEGMENTS ) % NUM_SEGMENTS;
58 by edam
removed Bounce library and updated/fixed new code
57
		
58
//		( segment == ( _hour_segment + 1 ) % NUM_SEGMENTS ) ||
59
//		( segment == ( _hour_segment + NUM_SEGMENTS - 1 ) % NUM_SEGMENTS );
60
	bool draw_minute = segment == _minute_segment;
63 by edam
widenned clock hands, tweaked scales, got top & bottom text modes working
61
	bool draw_minute_side = 1 >=
62
		( abs( _minute_segment - segment ) + NUM_SEGMENTS ) % NUM_SEGMENTS;
63
58 by edam
removed Bounce library and updated/fixed new code
64
	bool draw_second = segment == _second_segment;
56 by edam
updated software to include drawing abstraction infrastructure
65
66
	// set the LEDs
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
67
	led( 9, _flavour == 0 );
68
	led( 8, draw_tick || draw_second );
69
	led( 7, draw_minute || draw_second );
70
	led( 6, draw_minute || draw_minute_side || draw_second );
71
	led( 5, draw_minute || draw_minute_side ||
63 by edam
widenned clock hands, tweaked scales, got top & bottom text modes working
72
				  draw_second || draw_hour );
58 by edam
removed Bounce library and updated/fixed new code
73
	for( int a = 0; a <= 4; a++ )
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
74
		led( a, draw_minute || draw_minute_side ||
63 by edam
widenned clock hands, tweaked scales, got top & bottom text modes working
75
					  draw_second || draw_hour || draw_hour_side );
58 by edam
removed Bounce library and updated/fixed new code
76
}
77
78
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
79
void analogue_clock_draw_reset()
58 by edam
removed Bounce library and updated/fixed new code
80
{
81
	Time &time = Time::get_instance();
82
83
	// calculate hand locations
84
	_hour_segment = ( time.get_hours() % 12 ) * 5 * NUM_SECOND_SEGMENTS +
85
		( 5 * NUM_SECOND_SEGMENTS * time.get_minutes() / 60 );
86
	_minute_segment = time.get_minutes() * NUM_SECOND_SEGMENTS +
87
		( NUM_SECOND_SEGMENTS * time.get_seconds() / 60 );
88
	_second_segment = time.get_seconds() * NUM_SECOND_SEGMENTS;
56 by edam
updated software to include drawing abstraction infrastructure
89
}