/elec/propeller-clock

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/text.h

Committer: Tim Marston
Date: 2012-05-23 23:02:50 UTC
Revision ID: tim@ed.am-20120523230250-3pls2u6zt3av0uam

fixed text glitch; extended all modes; added screen flip super-long press;
added button unpress debounde; moved interim button press ignoration to
settings mode; fixed left-over led issue; finished for demo!

files added:
src/TODO

src/common.cc

src/common.h

src/modes

src/modes/digital_clock_mode.cc

src/modes/digital_clock_mode.h

src/modes/info_mode.cc

src/modes/info_mode.h

src/modes/major_mode.cc

src/modes/major_mode.h

src/modes/mode.cc

src/modes/mode.h

src/modes/settings_major_mode.cc

src/modes/settings_major_mode.h

src/modes/switcher_major_mode.cc

src/modes/switcher_major_mode.h

src/nvram.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 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/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/modes/analogue_clock_mode.cc

src/analogue_clock_mode.h => src/modes/analogue_clock_mode.h

src/test_mode.cc => src/modes/test_pattern_mode.cc

src/test_mode.h => src/modes/test_pattern_mode.h

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

files modified:
.bzrignore

arduino.mk

electronics-information

notes

project/propeller-clock.sch

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

1

/*

2

* text.h

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

*/

23

#ifndef _TEXT_H_

24

#define _TEXT_H_

25

26

27

#include <PString.h>

28

29

30

#define NUM_MESSAGE_BUFFERS 4

31

#define MESSAGE_LEN 32

32

33

34

namespace Text

35

{

36

enum {

37

// one of these to select face

38

MODE_TOP = 0,

39

MODE_BOTTOM = 64,

40

41

// one of these to select size

42

MODE_ONEQUARTER = 1,

43

MODE_ONETHIRD = 2,

44

MODE_HALF = 3,

45

MODE_TWOTHIRDS = 4,

46

MODE_THREEQUARTERS = 5,

47

MODE_ALL = 6,

48

49

// flag to turn on horizontal scrolling

50

MODE_HSCROLL = 32,

51

52

// text scale constants

53

SCALE_VSMALL = 1,

54

SCALE_SMALL = 2,

55

SCALE_NORMAL = 3,

56

SCALE_FAT = 4,

57

SCALE_VFAT = 5,

58

};

59

60

/**

61

* Reset internal state, for a new text display. This deactivates all

62

* messages and they will need to be enabled again with set_up_message().

63

*/

64

void reset();

65

66

/**

67

* Activate the display of a message and specify its display parameters.

68

*

69

* @param message_num the message to reset

70

* @param mode the new mode for this message

71

* @param scale text

72

*/

73

void set_up_message( int message_num, char mode, char scale = SCALE_NORMAL );

74

75

/**

76

* After modifying a message buffer, call this to reset the internal state

77

* of the text renderer with regard to this message.

78

*

79

* @param message_num the buffer number

80

* @param pstring the PString that represents this message's buffer

81

*/

82

void set_message_text( int message_num, PString &pstring );

83

84

/**

85

* Call at the start of each frame.

86

*/

87

void draw_reset();

88

89

/**

90

* Call after drawing each frame

91

*/

92

void post_draw();

93

94

/**

95

* Draw segment for the specified message number using whatever mode that

96

* message is set to.

97

*

98

* @param segment to draw

99

*/

100

void draw( int segment );

101

102

/** internal message buffers */

103

extern char _messages[ NUM_MESSAGE_BUFFERS ][ MESSAGE_LEN ];

104

};

105

106

107

#endif //_TEXT_H_

Older »