Merge branch 'MergeMasterToBlockly' into BlocklyProp

Author: PropGit

Learn/Simple Libraries/TextDevices/libsimpletext/cmm/libsimpletext.a

@@ -5,7 +5,12 @@
  *
  * Copyright (c) 2013, Parallax Inc.
  * Written by Steve Denson
+ * 
+ * Modified by Andy Lindsay to correct bug in terminal cursor control
+ * with 2, 14, and 15.
  */
+
+/*
 #include "simpletext.h"
 
 void putChar(char c)
@@ -15,6 +20,33 @@ void putChar(char c)
     dport_ptr->txChar(dport_ptr, '\r');
   dport_ptr->txChar(dport_ptr, c);
 }
+*/
+
+#include "simpletext.h"
+
+volatile char st_cursorPosition = 0;
+
+void putChar(char c)
+{
+  extern text_t *dport_ptr;
+  if((c == '\n') && (st_cursorPosition == 0))
+  {
+    dport_ptr->txChar(dport_ptr, '\r');
+  }
+  else
+  {
+    st_cursorPosition--;
+  }        
+  dport_ptr->txChar(dport_ptr, c);
+
+  if(c == 2 || c == 14 || c == 15)
+  {
+    if(c > 2)
+      st_cursorPosition = 1;
+    else
+      st_cursorPosition = 2;
+  }            
+}
 
 /*
 +--------------------------------------------------------------------