Merge branch 'm0110a'

[max/tmk_keyboard.git] / print.c

diff --git a/print.c b/print.c
index 8e46decac4304f70a876fe018ce346faf129e312..558181ea728f98e60b80ce9f43526854ae517aef 100644 (file)
--- a/print.c
+++ b/print.c
@@ -21,38 +21,56 @@
  * THE SOFTWARE.
  */
 
-// Version 1.0: Initial Release
-
 #include <avr/io.h>
 #include <avr/pgmspace.h>
-
 #include "print.h"
+#include "sendchar.h"
+
+
+bool print_enable = false;
+
+void print_S(const char *s)
+{
+       if (!print_enable) return;
+       char c;
+
+       while (1) {
+               c = *s++;
+               if (!c) break;
+               if (c == '\n') sendchar('\r');
+               sendchar(c);
+       }
+}
 
 void print_P(const char *s)
 {
+       if (!print_enable) return;
        char c;
 
        while (1) {
                c = pgm_read_byte(s++);
                if (!c) break;
-               if (c == '\n') usb_debug_putchar('\r');
-               usb_debug_putchar(c);
+               if (c == '\n') sendchar('\r');
+               sendchar(c);
        }
 }
 
 void phex1(unsigned char c)
 {
-       usb_debug_putchar(c + ((c < 10) ? '0' : 'A' - 10));
+       if (!print_enable) return;
+       sendchar(c + ((c < 10) ? '0' : 'A' - 10));
 }
 
 void phex(unsigned char c)
 {
+       if (!print_enable) return;
        phex1(c >> 4);
        phex1(c & 15);
 }
 
 void phex16(unsigned int i)
 {
+       if (!print_enable) return;
        phex(i >> 8);
        phex(i);
 }
@@ -60,14 +78,16 @@ void phex16(unsigned int i)
 
 void pbin(unsigned char c)
 {
+    if (!print_enable) return;
     for (int i = 7; i >= 0; i--) {
-        usb_debug_putchar((c & (1<<i)) ? '1' : '0');
+        sendchar((c & (1<<i)) ? '1' : '0');
     }
 }
 
 void pbin_reverse(unsigned char c)
 {
+    if (!print_enable) return;
     for (int i = 0; i < 8; i++) {
-        usb_debug_putchar((c & (1<<i)) ? '1' : '0');
+        sendchar((c & (1<<i)) ? '1' : '0');
     }
 }