Skip to content

Commit c182064

Browse files
committed
Merge branch 'MergeToBlockly' into BlocklyProp
2 parents af188aa + e04c417 commit c182064

File tree

16 files changed

+678
-445
lines changed

16 files changed

+678
-445
lines changed
-158 Bytes
Binary file not shown.

Learn/Simple Libraries/TextDevices/libsimpletext/putChar.c

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,12 @@ void putChar(char c)
2424

2525
#include "simpletext.h"
2626

27-
volatile char st_cursorPosition = 0;
28-
2927
void putChar(char c)
3028
{
3129
extern text_t *dport_ptr;
32-
if((c == '\n') && (st_cursorPosition == 0))
33-
{
30+
if(c == '\n')
3431
dport_ptr->txChar(dport_ptr, '\r');
35-
}
36-
else
37-
{
38-
st_cursorPosition--;
39-
}
4032
dport_ptr->txChar(dport_ptr, c);
41-
42-
if(c == 2 || c == 14 || c == 15)
43-
{
44-
if(c > 2)
45-
st_cursorPosition = 1;
46-
else
47-
st_cursorPosition = 2;
48-
}
4933
}
5034

5135
/*

Learn/Simple Libraries/Utility/libsimpletools/Documentation simpletools Library.html

Lines changed: 60 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Learn/Simple Libraries/Utility/libsimpletools/Doxyfile.doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ PROJECT_NAME = "simpletools library"
3232
# This could be handy for archiving the generated documentation or
3333
# if some version control system is used.
3434

35-
PROJECT_NUMBER = v0.98.1
35+
PROJECT_NUMBER = v0.98.2
3636

3737
# Using the PROJECT_BRIEF tag one can provide an optional one line description
3838
# for a project that appears at the top of each page and should give viewer
758 Bytes
Binary file not shown.

Learn/Simple Libraries/Utility/libsimpletools/html/files.html

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Learn/Simple Libraries/Utility/libsimpletools/html/globals.html

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Learn/Simple Libraries/Utility/libsimpletools/html/globals_defs.html

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Learn/Simple Libraries/Utility/libsimpletools/html/globals_func.html

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Learn/Simple Libraries/Utility/libsimpletools/html/globals_vars.html

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)