/elec/propeller-clock : revision 58

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-02-25 14:54:33 UTC
Revision ID: edam@waxworlds.org-20120225145433-kih8qs45x05cum46

removed Bounce library and updated/fixed new code

files added:
src/drawer.cc

src/drawer.h

src/major_mode.h

src/minor_mode.cc

src/minor_mode.h

src/mode_switcher.cc

src/mode_switcher.h

src/utility

src/utility/Jamfile

src/utility/Makefile

src/utility/README.md

src/utility/StandardCplusplus.h

src/utility/algorithm

src/utility/algorithm.cpp

src/utility/associative_base

src/utility/associative_base.cpp

src/utility/basic_definitions

src/utility/bitset

src/utility/bitset.cpp

src/utility/cassert

src/utility/cctype

src/utility/cerrno

src/utility/cfloat

src/utility/char_traits

src/utility/char_traits.cpp

src/utility/climits

src/utility/clocale

src/utility/cmath

src/utility/complex

src/utility/complex.cpp

src/utility/csetjmp

src/utility/csignal

src/utility/cstdarg

src/utility/cstddef

src/utility/cstdio

src/utility/cstdlib

src/utility/cstring

src/utility/ctime

src/utility/cwchar

src/utility/cwctype

src/utility/del_op.cpp

src/utility/del_opnt.cpp

src/utility/del_opv.cpp

src/utility/del_opvnt.cpp

src/utility/deque

src/utility/deque.cpp

src/utility/eh_alloc.cpp

src/utility/eh_globals.cpp

src/utility/exception

src/utility/exception.cpp

src/utility/fstream

src/utility/fstream.cpp

src/utility/func_exception

src/utility/func_exception.cpp

src/utility/functional

src/utility/iomanip

src/utility/iomanip.cpp

src/utility/ios

src/utility/ios.cpp

src/utility/iosfwd

src/utility/iostream

src/utility/iostream.cpp

src/utility/istream

src/utility/istream.cpp

src/utility/istream_helpers

src/utility/iterator

src/utility/iterator.cpp

src/utility/iterator_base

src/utility/limits

src/utility/limits.cpp

src/utility/list

src/utility/list.cpp

src/utility/locale

src/utility/locale.cpp

src/utility/map

src/utility/map.cpp

src/utility/memory

src/utility/new

src/utility/new_handler.cpp

src/utility/new_op.cpp

src/utility/new_opnt.cpp

src/utility/new_opv.cpp

src/utility/new_opvnt.cpp

src/utility/numeric

src/utility/numeric.cpp

src/utility/ostream

src/utility/ostream.cpp

src/utility/ostream_helpers

src/utility/queue

src/utility/queue.cpp

src/utility/serstream

src/utility/set

src/utility/set.cpp

src/utility/sstream

src/utility/sstream.cpp

src/utility/stack

src/utility/stack.cpp

src/utility/stdexcept

src/utility/stdexcept.cpp

src/utility/streambuf

src/utility/streambuf.cpp

src/utility/string

src/utility/string.cpp

src/utility/string_iostream

src/utility/support

src/utility/support.cpp

src/utility/system_configuration.h

src/utility/type_traits

src/utility/typeinfo

src/utility/typeinfo.cpp

src/utility/uartbuf

src/utility/unwind-cxx.h

src/utility/utility.cpp

src/utility/utility.h

src/utility/valarray

src/utility/valarray.cpp

src/utility/vector

src/utility/vector.cpp

files removed:
src/common.cc

src/common.h

src/digital_clock.cc

src/digital_clock.h

src/settings_mode.cc

src/settings_mode.h

src/text.cc

src/text.h

src/text_renderer.cc

src/text_renderer.h

src/util/PString.cpp

src/util/PString.h

test/rtc-test

test/rtc-test/Makefile

test/rtc-test/rtc-ds1307.ino

test/rtc-test/util

test/rtc-test/util/DS1307.cpp

test/rtc-test/util/DS1307.h

files renamed:
src/analogue_clock.cc => src/analogue_clock_mode.cc

src/analogue_clock.h => src/analogue_clock_mode.h

src/propeller-clock.cc => src/propeller-clock.ino

src/test_pattern.cc => src/test_mode.cc

src/test_pattern.h => src/test_mode.h

files modified:
.bzrignore

arduino.mk

electronics-information

notes

src/Makefile

src/button.cc

src/button.h

src/config.h

src/time.cc

src/time.h

Show diffs side-by-side

added added

removed removed

src/analogue_clock_mode.cc

* analogue_clock.cc

* analogue_clock_mode.cc

* You should have received a copy of the GNU Lesser General Public License

* along with this program. If not, see <http://www.gnu.org/licenses/>.

#include "analogue_clock.h"

#include "analogue_clock_mode.h"

#include "config.h"

#include "Arduino.h"

#include "time.h"

#include "common.h"

// the segment that the hour hand should be at

static int _hour_segment;

// the segment that the minute hand should be at

static int _minute_segment;

// the segment that the second hand should be at

static int _second_segment;

// the flavour

int _flavour = 0;

void analogue_clock_press()

#include <cstdlib>

AnalogueClockMode::AnalogueClockMode()

MinorMode( 2 )

{

if( ++_flavour >= 2 )

_flavour = 0;

}

void analogue_clock_draw( int segment )

void AnalogueClockMode::draw( int segment )

{

int second = segment / NUM_SECOND_SEGMENTS;

int second_segment = segment % NUM_SECOND_SEGMENTS;

// what needs to be drawn?

bool draw_tick = ( !second_segment && second % 5 == 0 && second ) ||

( second == 0 && second_segment == 1 ) ||

( second == 59 && second_segment == NUM_SECOND_SEGMENTS - 1 );

bool draw_second = !second_segment && second == time.get_seconds();

bool draw_minute = !second_segment && second == time.get_minutes();

bool draw_hour = segment == time.get_hours() * 5 * NUM_SECOND_SEGMENTS +

( 5 * NUM_SECOND_SEGMENTS * time.get_minutes() / 60 );

bool draw_tick = segment && ( segment % ( NUM_SECOND_SEGMENTS * 5 ) == 0 ||

segment == 1 || segment == NUM_SEGMENTS - 1 );

bool draw_hour = segment == _hour_segment;

bool draw_hour_side = 2 >=

( abs( _hour_segment - segment ) + NUM_SEGMENTS ) % NUM_SEGMENTS;

bool draw_hour_side = 1 >=

( std::abs( _hour_segment - segment ) + NUM_SEGMENTS ) % NUM_SEGMENTS;

// ( segment == ( _hour_segment + 1 ) % NUM_SEGMENTS ) ||

// ( segment == ( _hour_segment + NUM_SEGMENTS - 1 ) % NUM_SEGMENTS );

bool draw_minute = segment == _minute_segment;

bool draw_minute_side = 1 >=

( abs( _minute_segment - segment ) + NUM_SEGMENTS ) % NUM_SEGMENTS;

bool draw_second = segment == _second_segment;

// set the LEDs

led( 9, _flavour == 0 );

led( 8, draw_tick || draw_second );

led( 7, draw_minute || draw_second );

led( 6, draw_minute || draw_minute_side || draw_second );

led( 5, draw_minute || draw_minute_side ||

draw_second || draw_hour );

led_on( 9, get_flavour() == 0 );

led_on( 8, draw_tick || draw_second );

for( int a = 6; a <= 7; a++ )

led_on( a, draw_minute || draw_second );

led_on( 5, draw_minute || draw_second || draw_hour );

for( int a = 0; a <= 4; a++ )

led( a, draw_minute || draw_minute_side ||

draw_second || draw_hour || draw_hour_side );

led_on( a, draw_minute || draw_second || draw_hour || draw_hour_side );

}

void analogue_clock_draw_reset()

void AnalogueClockMode::draw_reset()

{

Time &time = Time::get_instance();

// calculate hand locations

_hour_segment = ( Time::get_hours() % 12 ) * 5 * NUM_SECOND_SEGMENTS +

( 5 * NUM_SECOND_SEGMENTS * Time::get_minutes() / 60 );

_minute_segment = Time::get_minutes() * NUM_SECOND_SEGMENTS +

( NUM_SECOND_SEGMENTS * Time::get_seconds() / 60 );

_second_segment = Time::get_seconds() * NUM_SECOND_SEGMENTS;

}

void analogue_clock_activate()

{

_flavour = 0;

_hour_segment = ( time.get_hours() % 12 ) * 5 * NUM_SECOND_SEGMENTS +

( 5 * NUM_SECOND_SEGMENTS * time.get_minutes() / 60 );

_minute_segment = time.get_minutes() * NUM_SECOND_SEGMENTS +

( NUM_SECOND_SEGMENTS * time.get_seconds() / 60 );

_second_segment = time.get_seconds() * NUM_SECOND_SEGMENTS;

}

Older »