/elec/propeller-clock : revision 59

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

Committer: edam
Date: 2012-02-28 16:50:26 UTC
Revision ID: edam@waxworlds.org-20120228165026-pwnwo300xx2e2kg6

removed ulibc, fixed button, added text rendering

files added:
src/digital_clock_mode.cc

src/digital_clock_mode.h

src/display.cc

src/display.h

src/mode_base.h

src/text_renderer.cc

src/text_renderer.h

src/util/PString.cpp

src/util/PString.h

files removed:
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/mode_switcher.cc => src/switcher_major_mode.cc

src/mode_switcher.h => src/switcher_major_mode.h

files modified:
arduino.mk

src/analogue_clock_mode.cc

src/button.cc

src/button.h

src/config.h

src/drawer.cc

src/drawer.h

src/major_mode.h

src/minor_mode.cc

src/minor_mode.h

src/propeller-clock.ino

src/test_mode.cc

Show diffs side-by-side

added added

removed removed

src/switcher_major_mode.cc

* mode_switcher.cc

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

#include "switcher_major_mode.h"

#include "test_mode.h"

#include "analogue_clock_mode.h"

ModeSwitcher::ModeSwitcher()

#include "digital_clock_mode.h"

#include "Arduino.h"

SwitcherMajorMode::SwitcherMajorMode()

{

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

_modes[ a ] = NULL;

static TestMode test_mode;

static AnalogueClockMode analogue_clock_mode;

_modes.push_back( &test_mode );

_modes.push_back( &analogue_clock_mode );

}

void ModeSwitcher::short_press()

{

_modes[ _mode ]->next_flavour();

}

void ModeSwitcher::long_press()

{

if( ++_mode >= (signed)_modes.size() )

_mode = 0;

static DigitalClockMode digital_clock_mode;

int mode = 0;

_modes[ mode++ ] = &digital_clock_mode;

_modes[ mode++ ] = &test_mode;

_modes[ mode++ ] = &analogue_clock_mode;

}

void SwitcherMajorMode::press()

{

_modes[ _mode ]->press();

}

void SwitcherMajorMode::long_press()

{

do {

if( ++_mode >= MAX_MINOR_MODES )

_mode = 0;

} while( _modes[ _mode ] == NULL );

_modes[ _mode ]->activate();

}

void ModeSwitcher::activate()

void SwitcherMajorMode::activate()

{

_mode = 0;

_modes[ _mode ]->activate();

}

Drawer &ModeSwitcher::get_drawer()

Drawer &SwitcherMajorMode::get_drawer()

{

return *_modes[ _mode ];

}