Refactoring debug adapter

Author: mikaelpatel

examples/Benchmark/Benchmark.ino

@@ -1,7 +1,7 @@
 #include "GPIO.h"
 #include "TWI.h"
-#include "Hardware/TWI.h"
 #include "Software/TWI.h"
+#include "Hardware/TWI.h"
 #include "LCD.h"
 #include "Driver/PCD8544.h"
 #include "Driver/HD44780.h"
@@ -14,23 +14,24 @@
 #include "Shield/LCD4884.h"
 #include "Shield/LCD_Keypad.h"
 
+
 // Configure: HD44780 Adapter; PP7W, SR3W, SR4W or TWI PCF8574
 // LCD::PP7W<BOARD::D4, BOARD::D5, BOARD::D6, BOARD::D7, BOARD::D8, BOARD::D9, BOARD::D10> io;
 // LCD::SR3W<BOARD::D7, BOARD::D6, BOARD::D5> io;
 // LCD::SR4W<BOARD::D7, BOARD::D6, BOARD::D5, BOARD::D4> io;
 // Software::TWI<BOARD::D8, BOARD::D9> twi;
 // Software::TWI<BOARD::D18, BOARD::D19> twi;
-Hardware::TWI twi(100000UL);
+// Hardware::TWI twi(100000UL);
 // Hardware::TWI twi(400000UL);
 // LCD::MJKDZ io(twi);
-LCD::GY_IICLCD io(twi);
+// LCD::GY_IICLCD io(twi);
 // LCD::DFRobot_IIC io(twi);
 
 // Configure: HD44780, PCD8544, LCD4884 or LCD Keypad
-HD44780 lcd(io);
+// HD44780 lcd(io);
 // PCD8544<BOARD::D5, BOARD::D4, BOARD::D3, BOARD::D2> lcd;
 // LCD4884 lcd;
-// LCD_Keypad lcd;
+LCD_Keypad lcd;
 
 #define MEASURE(expr)				\
   do {						\

examples/Clock/Clock.ino

@@ -5,8 +5,8 @@
 #include "Driver/DS1307.h"
 
 #include "TWI.h"
-#include "Hardware/TWI.h"
 #include "Software/TWI.h"
+#include "Hardware/TWI.h"
 
 #include "LCD.h"
 #include "Driver/MAX72XX.h"
@@ -23,12 +23,13 @@
 #include "Shield/LCD_Keypad.h"
 
 // Configure: HD44780 Adapter; Debug, PP7W, SR3W or TWI PCF8574
-// LCD::Debug io;
+// LCD::Debug io(Serial);
 // LCD::PP7W<BOARD::D4, BOARD::D5, BOARD::D6, BOARD::D7, BOARD::D8, BOARD::D9, BOARD::D10> io;
 // LCD::SR3W<BOARD::D7, BOARD::D6, BOARD::D5> io;
 // LCD::SR4W<BOARD::D7, BOARD::D6, BOARD::D5, BOARD::D4> io;
+Software::TWI<BOARD::D1, BOARD::D2> twi;
 // Software::TWI<BOARD::D8, BOARD::D9> twi;
-Software::TWI<BOARD::D18, BOARD::D19> twi;
+// Software::TWI<BOARD::D18, BOARD::D19> twi;
 // Hardware::TWI twi(100000UL);
 // Hardware::TWI twi(400000UL);
 // LCD::MJKDZ io(twi);
@@ -52,8 +53,10 @@ void setup()
   lcd.begin();
 
   // Set the real-time clock
+#if defined(AVR)
   struct tm now(SUNDAY, 2017, DECEMBER, 31, 23, 59, 00);
   rtc.set_time(now);
+#endif
 }
 
 void loop()

examples/Demo/Demo.ino

@@ -17,6 +17,7 @@
 #include "Shield/LCD_Keypad.h"
 
 // Configure: HD44780 Adapter; Debug, PP7W, SR3W or TWI PCF8574
+// LCD::Debug io(Serial);
 // LCD::PP7W<BOARD::D4, BOARD::D5, BOARD::D6, BOARD::D7, BOARD::D8, BOARD::D9, BOARD::D10> io;
 // LCD::SR3W<BOARD::D7, BOARD::D6, BOARD::D5> io;
 // LCD::SR4W<BOARD::D7, BOARD::D6, BOARD::D5, BOARD::D4> io;

examples/Thermometer/Thermometer.ino

@@ -23,14 +23,15 @@
 #include "Shield/LCD_Keypad.h"
 
 // Configure: HD44780 Adapter; Debug, PP7W, SR3W or TWI PCF8574
-// LCD::Debug io;
+// LCD::Debug io(Serial);
 // LCD::PP7W<BOARD::D4, BOARD::D5, BOARD::D6, BOARD::D7, BOARD::D8, BOARD::D9, BOARD::D10> io;
 // LCD::SR3W<BOARD::D7, BOARD::D6, BOARD::D5> io;
 // LCD::SR4W<BOARD::D7, BOARD::D6, BOARD::D5, BOARD::D4> io;
+// Software::TWI<BOARD::D1, BOARD::D2> twi;
 // Software::TWI<BOARD::D8, BOARD::D9> twi;
 // Software::TWI<BOARD::D18, BOARD::D19> twi;
-// Hardware::TWI twi(100000UL);
-Hardware::TWI twi(400000UL);
+Hardware::TWI twi(100000UL);
+// Hardware::TWI twi(400000UL);
 // LCD::MJKDZ io(twi);
 LCD::GY_IICLCD io(twi);
 // LCD::DFRobot_IIC io(twi);
@@ -42,6 +43,7 @@ HD44780 lcd(io);
 // LCD4884 lcd;
 // LCD_Keypad lcd;
 
+// Software::OWI<BOARD::D0> owi;
 Software::OWI<BOARD::D7> owi;
 DS18B20 sensor(owi);
 
@@ -52,7 +54,7 @@ void setup()
 
 void loop()
 {
-  uint8_t rom[owi.ROM_MAX] = { 0 };
+  uint8_t* rom = sensor.rom();
   int8_t last = owi.FIRST;
   int id = 0;
 

src/Adapter/Debug.h

@@ -28,43 +28,48 @@
 namespace LCD {
 class Debug : public HD44780::Adapter {
 public:
+  Debug(Print& os) :  m_os(os) {}
+
   virtual bool setup()
   {
-    Serial.print(millis());
-    Serial.println(F(":setup:"));
+    m_os.print(millis());
+    m_os.println(F(":setup:"));
     return (false);
   }
 
   virtual void write4b(uint8_t data)
   {
-    Serial.print(millis());
-    Serial.print(F(":write4b:"));
-    Serial.println(data & 0xf, HEX);
+    m_os.print(millis());
+    m_os.print(F(":write4b:"));
+    m_os.println(data & 0xf, HEX);
   }
 
   virtual void write8b(uint8_t data)
   {
-    Serial.print(millis());
-    Serial.print(F(":write8b:"));
-    if (data < 0x10) Serial.print('0');
-    Serial.println(data, HEX);
+    m_os.print(millis());
+    m_os.print(F(":write8b:"));
+    if (data < 0x10) m_os.print('0');
+    m_os.println(data, HEX);
   }
 
   virtual void set_mode(uint8_t flag)
   {
-    Serial.print(millis());
-    Serial.print(F(":set_mode:"));
-    if (flag < 0x10) Serial.print('0');
-    Serial.println(flag, HEX);
+    m_os.print(millis());
+    m_os.print(F(":set_mode:"));
+    if (flag < 0x10) m_os.print('0');
+    m_os.println(flag, HEX);
   }
 
   virtual void set_backlight(uint8_t flag)
   {
-    Serial.print(millis());
-    Serial.print(F(":set_backlight:"));
-    if (flag < 0x10) Serial.print('0');
-    Serial.println(flag, HEX);
+    m_os.print(millis());
+    m_os.print(F(":set_backlight:"));
+    if (flag < 0x10) m_os.print('0');
+    m_os.println(flag, HEX);
   }
+
+protected:
+  Print& m_os;
 };
 };
 #endif