add println_ub and println_ib, Serial now reports its initialization state

tenbaht · tenbaht · commit 429b22cb6cf6 · 2017-02-28T11:33:01.000+01:00
diff --git a/sduino/hardware/sduino/stm8/cores/sduino/Arduino.h b/sduino/hardware/sduino/stm8/cores/sduino/Arduino.h
@@ -263,7 +263,7 @@ void alternateFunction(uint8_t val);
 
 //FIXME#include "WCharacter.h"
 //FIXME#include "WString.h"
-//FIXME#include "HardwareSerial.h"
+#include "HardwareSerial.h"
 
 //uint16_t makeWord(uint16_t w);
 //uint16_t makeWord(byte h, byte l);
diff --git a/sduino/hardware/sduino/stm8/cores/sduino/HardwareSerial.c b/sduino/hardware/sduino/stm8/cores/sduino/HardwareSerial.c
@@ -43,6 +43,7 @@ static ring_buffer rx_buffer;// = { { 0 }, 0, 0};
 static ring_buffer tx_buffer;// = { { 0 }, 0, 0};
 
 static volatile char	transmitting;//=0;
+static unsigned char initialized;//=0 internal status. Returned on HardwareSerial()
 
 // device dependent definitions ////////////////////////////////////////////
 
@@ -190,6 +191,12 @@ void UARTx_TX_IRQHandler(void) __interrupt(ITC_IRQ_UARTx_TX) /* UART1/2 TX */
 
 // Public Methods //////////////////////////////////////////////////////////////
 
+uint8_t HardwareSerial(void)
+{
+    return initialized;
+}
+
+
 void HardwareSerial_begin(unsigned long baud)
 {
 #ifdef USE_SPL
@@ -216,6 +223,7 @@ void HardwareSerial_begin(unsigned long baud)
 	// enable RXNE interrupt, enable transmitter, enable receiver
 	UARTx->CR2 = UARTx_CR2_RIEN | UARTx_CR2_TEN | UARTx_CR2_REN;
 #endif
+  initialized = 1;
 }
 
 
@@ -255,6 +263,7 @@ void HardwareSerial_begin_config(unsigned long baud, uint8_t config)
 	// enable RXNE interrupt, enable transmitter, enable receiver
 	UARTx->CR2 = UARTx_CR2_RIEN | UARTx_CR2_TEN | UARTx_CR2_REN;
 #endif
+  initialized = 1;
 }
 
 
@@ -268,6 +277,7 @@ void HardwareSerial_end(void)
   
   // clear any received data
   rx_buffer.head = rx_buffer.tail;
+  initialized = 0;
 }
 
 int HardwareSerial_available(void)
diff --git a/sduino/hardware/sduino/stm8/cores/sduino/HardwareSerial.h b/sduino/hardware/sduino/stm8/cores/sduino/HardwareSerial.h
@@ -29,7 +29,7 @@
 #define _HARDWARE_SERIAL_H_
 
 #include <stdlib.h>
-
+#include <Print.h>
 
 // Define config for Serial.begin(baud, config);
 /* coding of the bit field: 00sw .pp.
@@ -59,6 +59,7 @@
 
 // Public Methods //////////////////////////////////////////////////////////////
 
+uint8_t HardwareSerial(void);
 void HardwareSerial_begin(unsigned long baud);
 void HardwareSerial_begin_config(unsigned long baud, uint8_t config);
 
@@ -72,6 +73,7 @@ void HardwareSerial_end(void);
 
 // Alias Definitions for a more Arduino-like look ////////////////////////////
 
+#define Serial			HardwareSerial()
 #define Serial_begin		HardwareSerial_begin
 #define Serial_begin_config	HardwareSerial_begin_config
 #define Serial_available	HardwareSerial_available
@@ -102,6 +104,8 @@ void HardwareSerial_end(void);
 #define Serial_println_s(S)	Print_println_s(HardwareSerial_write,S)
 #define Serial_println_u(U)	Print_println_u(HardwareSerial_write,U)
 #define Serial_println_i(I)	Print_println_i(HardwareSerial_write,I)
+#define Serial_println_ib(I,B)	Print_println_ib(HardwareSerial_write,I,B)
+#define Serial_println_ub(U,B)	Print_println_ub(HardwareSerial_write,U,B)
 #define Serial_println_f(F)	 Print_printlnFloat(HardwareSerial_write,F,2)
 #define Serial_printlnFloat(F,D) Print_printlnFloat(HardwareSerial_write,F,D)
 
diff --git a/sduino/hardware/sduino/stm8/cores/sduino/Print.c b/sduino/hardware/sduino/stm8/cores/sduino/Print.c
@@ -110,6 +110,22 @@ size_t Print_println_i(writefunc_p writefunc, long n)
 	return r + Print_println(writefunc);
 }
 
+size_t Print_println_ub(writefunc_p writefunc, unsigned long n, uint8_t base)
+{
+	size_t r;
+
+	r = printNumber(writefunc, n,base);
+	return r + Print_println(writefunc);
+}
+
+size_t Print_println_ib(writefunc_p writefunc, long n, uint8_t base)
+{
+	size_t r;
+
+	r = printInt(writefunc, n,base);
+	return r + Print_println(writefunc);
+}
+
 
 // (not so) Private Methods /////////////////////////////////////////////////////////////
 
diff --git a/sduino/hardware/sduino/stm8/cores/sduino/Print.h b/sduino/hardware/sduino/stm8/cores/sduino/Print.h
@@ -69,6 +69,8 @@ size_t Print_println(writefunc_p writefunc);
 size_t Print_println_s(writefunc_p writefunc, const char *str);
 size_t Print_println_u(writefunc_p writefunc, unsigned long n);
 size_t Print_println_i(writefunc_p writefunc, long n);
+size_t Print_println_ub(writefunc_p writefunc, unsigned long n, uint8_t base);
+size_t Print_println_ib(writefunc_p writefunc, long n, uint8_t base);
 size_t Print_printlnFloat(writefunc_p writefunc, double number, uint8_t digits);
 
 
