zephyrSerial: print versus println

Implement versions with and without linefeed
Return the char count

Signed-off-by: Mike Szczys <mike@golioth.io>

Author: szczys

cores/arduino/zephyrSerial.cpp

@@ -6,23 +6,35 @@ size_t arduino::ZephyrSerial::begin(unsigned long int baudrate){
     return 0;
 }
 
+size_t arduino::ZephyrSerial::print_char(char ch, bool lf){
+    printk(lf ? "%c\n" : "%c", ch);
+    return lf ? 2 : 1;
+}
+
+size_t arduino::ZephyrSerial::print_str(const char* ptr, bool lf) {
+    printf(lf ? "%s\n" : "%s", ptr);
+    return lf ? strlen(ptr)+1 : strlen(ptr);
+}
+
 size_t arduino::ZephyrSerial::print(char ch){
-    printk("%c",ch);
-    return 0;
+    return print_char(ch, false);
 }
-size_t arduino::ZephyrSerial::println(const char* ptr) {
-    printf("\n%s\n", ptr);
-    return 0;
+
+size_t arduino::ZephyrSerial::println(char ch){
+    return print_char(ch, true);
 }
-size_t arduino::ZephyrSerial::println(char c){
-    // pvt_c = c;
-    printf("\n%c\n",c);
-    return 0;
+
+size_t arduino::ZephyrSerial::print(const char* ptr) {
+    return print_str(ptr, false);
+}
+
+size_t arduino::ZephyrSerial::println(const char* ptr){
+    return print_str(ptr, true);
 }
 
 size_t arduino::ZephyrSerial::println(void){
     printf("\n");
     return 0;
 }
 
-arduino::ZephyrSerial Serial;
+arduino::ZephyrSerial Serial;

cores/arduino/zephyrSerial.h

@@ -7,11 +7,16 @@ namespace arduino {
 
 class ZephyrSerial {
     char pvt_c;
+
+private:
+    size_t print_char(const char c, bool lf);
+    size_t print_str(const char * ptr, bool lf);
+
 public:
     size_t begin(unsigned long int baudrate);  //TODO
 
     size_t print(const char c);
-
+    size_t print(const char * ptr);
     size_t println(const char c);
     size_t println(const char* ptr);
     size_t println(void);
@@ -20,4 +25,4 @@ class ZephyrSerial {
 
 }   // namespace arduino
 
-extern arduino::ZephyrSerial Serial;
+extern arduino::ZephyrSerial Serial;

samples/hello_arduino/src/app.cpp

@@ -12,7 +12,18 @@ void setup() {
 }
 void loop() {
   char c = 'D';
-  Serial.print(c);
-  Serial.println("Hello, World!");
+  size_t ret1;
+  size_t ret2;
+  ret1 = Serial.print(c);
+  ret2 = Serial.println("Hello, World!");
+  printk("Sizes: %d %d\n", ret1, ret2);
+  Serial.println();
+  ret1 = Serial.print("My letter is: ");
+  ret2 = Serial.println(c);
+  printk("Sizes: %d %d\n", ret1, ret2);
+  Serial.println();
+  char myString[] = "Will it print?";
+  ret1 = Serial.println(myString);
+  printk("Size: %d \n\n\n", ret1);
   delay(1000); // 1 second delay
 }