/elec/propeller-clock : revision 65

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

Committer: Tim Marston
Date: 2012-03-10 01:01:54 UTC
Revision ID: tim@ed.am-20120310010154-lv041mt4275k5jxo

removed most OOP/inheritance crap, saved loads of space!

files added:
src/common.cc

src/common.h

src/digital_clock.cc

src/digital_clock.h

src/text.cc

src/text.h

src/text_renderer.cc

src/text_renderer.h

src/util/PString.cpp

src/util/PString.h

files removed:
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/util/Bounce.cpp

src/util/Bounce.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 renamed:
src/analogue_clock_mode.cc => src/analogue_clock.cc

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

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

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

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

files modified:
.bzrignore

arduino.mk

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

* digital_clock.cc

* This file is part of propeller-clock (hereafter referred to as "this

* program"). See http://ed.am/dev/software/arduino/propeller-clock for more

* information.

* This program is free software: you can redistribute it and/or modify

* it under the terms of the GNU Lesser General Public License as published

* by the Free Software Foundation, either version 3 of the License, or

* (at your option) any later version.

* This program is distributed in the hope that it will be useful,

* but WITHOUT ANY WARRANTY; without even the implied warranty of

* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

* GNU Lesser General Public License for more details.

* 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 "digital_clock.h"

#include "common.h"

#include "text.h"

#include "text_renderer.h"

#include "time.h"

// font flavour

static int _flavour = 0;

static void set_message( bool update )

{

Time &time = Time::get_instance();

PString str0( Text::_messages[ 0 ], MESSAGE_LEN );

// PString str1( Text::_messages[ 1 ], MESSAGE_LEN );

str0.begin();

// str1.begin();

// switch( get_flavour() )

// {

// case 0:

// str0.format( "%d:%02d:%02 %s", time.get_hours() % 12,

// time.get_minutes(), time.get_seconds(),

// time.get_hours() / 12 > 0? "pm" : "am" );

// Text::set_message( 0, str0 );

// str1.print( "-" );

// Text::set_message( 1, str1 );

// if( update ) {

// Text::reset_message( 0, Text::MODE_TOP +

// Text::MODE_ALL );

// Text::reset_message( 1, Text::MODE_BOTTOM +

// Text::MODE_ONEQUARTER );

// }

// break;

// case 1:

str0.format( "%d%s %s, %d", time.get_day(),

time.get_day_suffix(),

time.get_month_name(), time.get_year() );

Text::set_message( 0, str0 );

// Text::set_message( 1, str1 );

if( !update ) {

Text::reset_message( 0, Text::MODE_HSCROLL | Text::MODE_TOP |

Text::MODE_THREEQUARTERS );

// Text::reset_message( 1, Text::MODE_BOTTOM +

// Text::MODE_ONEQUARTER );

}

// break;

// }

TextRenderer::select_font( _flavour );

}

void digital_clock_press()

{

if( ++_flavour >= 4 )

_flavour = 0;

}

void digital_clock_draw( int segment )

{

Text::draw( 0, segment );

// Text::draw( 1, segment );

TextRenderer::output_buffer();

}

void digital_clock_draw_reset()

{

// gotta update message, the time might have changed!

set_message( true );

Text::draw_reset();

}

100

101

void digital_clock_activate()

102

{

103

leds_off();

104

105

Text::reset();

106

set_message( false );

107

}

Older »