From c4a42d127959c05d5d6d85a6ec8e7c982a495c20 Mon Sep 17 00:00:00 2001
From: Tony Corbett G0WFV <tonyc.uk@gmail.com>
Date: Mon, 27 Jun 2016 19:18:17 +0100
Subject: [PATCH] Fix typo and remove unwanted code

---
 HD44780.cpp | 21 +++++++--------------
 HD44780.h   |  2 +-
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/HD44780.cpp b/HD44780.cpp
index 41abac3..7ac16c9 100644
--- a/HD44780.cpp
+++ b/HD44780.cpp
@@ -306,20 +306,6 @@ void CHD44780::pcf8574LCDSetup()
 	// Initalize PFC8574
 	::pcf8574Setup(AF_BASE, PCF8574);
 
-	// Initialise LCD
-	m_fd = ::lcdInit(m_rows, m_cols, 4, AF_RS, AF_E, AF_D1, AF_D2, AF_D3, AF_D4, 0, 0, 0, 0);
-	if (m_fd == -1) {
-		LogError("Unable to open the HD44780 via I2C");
-		return false;
-	}
-
-	m_rb   = AF_RS;
-	m_strb = AF_E;
-	m_d0   = AF_D1;
-	m_d1   = AF_D2;
-	m_d2   = AF_D3;
-	m_d3   = AF_D4;
-
 	// Turn on backlight
 	::pinMode (AF_BL, OUTPUT);
 	::digitalWrite (AF_BL, 1);
@@ -327,6 +313,13 @@ void CHD44780::pcf8574LCDSetup()
 	// Set LCD to write mode.
 	::pinMode (AF_RW, OUTPUT);
 	::digitalWrite (AF_RW, 0);
+
+	m_rb   = AF_RS;
+	m_strb = AF_E;
+	m_d0   = AF_D1;
+	m_d1   = AF_D2;
+	m_d2   = AF_D3;
+	m_d3   = AF_D4;
 }
 #endif
 
diff --git a/HD44780.h b/HD44780.h
index d9cf276..95b818e 100644
--- a/HD44780.h
+++ b/HD44780.h
@@ -62,7 +62,7 @@ enum ADAFRUIT_COLOUR {
 #define AF_D2     (AF_BASE + 5)
 #define AF_D3     (AF_BASE + 6)
 #define AF_D4     (AF_BASE + 7)
-#define PCF8547		0x27
+#define PCF8574		0x27
 #endif
 
 class CHD44780 : public CDisplay