Fixes for 4bit 16x2 LCD

Author: jenkie

Arduino_Pedelec_Controller/LiquidCrystalDogm.cpp

@@ -73,7 +73,11 @@ void LiquidCrystal::init(uint8_t fourbitmode, uint8_t rs, uint8_t rw, uint8_t en
     {
         pinMode(_rw_pin, OUTPUT);
     }
+    #if HARDWARE_REV < 20
     pinMode(_enable_pin, OUTPUT);
+    #else
+    DDRH = DDRH | B00000100;
+    #endif
 
     if (fourbitmode)
         _displayfunction = LCD_4BITMODE | LCD_1LINE | LCD_5x8DOTS;
@@ -104,7 +108,12 @@ void LiquidCrystal::begin(uint8_t cols, uint8_t lines, uint8_t dotsize)
     delayMicroseconds(50000);
     // Now we pull both RS and R/W low to begin commands
     digitalWrite(_rs_pin, LOW);
+    #if HARDWARE_REV < 20
     digitalWrite(_enable_pin, LOW);
+    #else
+    PORTH = PORTH & B11011011;
+    #endif
+
     if (_rw_pin != 255)
     {
         digitalWrite(_rw_pin, LOW);
@@ -314,11 +323,23 @@ void LiquidCrystal::send(uint8_t value, uint8_t mode)
 
 void LiquidCrystal::pulseEnable(void)
 {
+    #if HARDWARE_REV < 20
     digitalWrite(_enable_pin, LOW);
+    #else
+    PORTH = PORTH & B11011011;
+    #endif
     delayMicroseconds(1);
+    #if HARDWARE_REV < 20
     digitalWrite(_enable_pin, HIGH);
+    #else
+    PORTH = PORTH | B00000100;
+    #endif
     delayMicroseconds(1);    // enable pulse must be >450ns
+    #if HARDWARE_REV < 20
     digitalWrite(_enable_pin, LOW);
+    #else
+    PORTH = PORTH & B11011011;
+    #endif
     delayMicroseconds(100);   // commands need > 37us to settle
 }
 
@@ -342,4 +363,4 @@ void LiquidCrystal::write8bits(uint8_t value)
     }
 
     pulseEnable();
-}
+}

Arduino_Pedelec_Controller/display.cpp

@@ -52,7 +52,11 @@ static PCD8544 lcd;                          //for Nokia Display
 
 #if (DISPLAY_TYPE & DISPLAY_TYPE_16X2_LCD_4BIT)
 #include "LiquidCrystalDogm.h"             //for 4bit (e.g. EA-DOGM) Display
+#if HARDWARE_REV < 20
 static LiquidCrystal lcd(13, 12, 11, 10, 9, 8);   //for 4bit (e.g. EA-DOGM) Display
+#else
+static LiquidCrystal lcd(6,PH2,  16, 17,7,37);    //for 4bit (e.g. EA-DOGM) Display
+#endif
 #endif
 
 #if (DISPLAY_TYPE & DISPLAY_TYPE_16X2_SERIAL)
@@ -119,7 +123,11 @@ static void prepare_important_info(int duration_secs)
 #endif
 
     lcd.clear();
+    #if (DISPLAY_TYPE & DISPLAY_TYPE_NOKIA)
     lcd.setCursor(0, 2);
+    #elif (DISPLAY_TYPE & DISPLAY_TYPE_16X2)
+    lcd.setCursor(0, 0);
+    #endif
 }
 #endif
 
@@ -274,7 +282,7 @@ static void display_16x2_setup()
     lcd.init();
 #endif
 
-#if (DISPLAY_TYPE & DISPLAY_TYPE_16X2)
+#if (DISPLAY_TYPE & DISPLAY_TYPE_16X2_SERIAL)
     // Online editor for custom chars (5x8 pixels):
     // http://www.quinapalus.com/hd44780udg.html
     lcd.createChar(0x01, serial_break_symbol);
@@ -346,7 +354,7 @@ static void display_16x2_view_main()
     lcd.setCursor(0,0);
     if (spd<10)
     {lcd.print(MY_F(" "));}
-    lcd.print(round(spd),0);
+    lcd.print(spd,0);
     lcd.print(MY_F(" km/h  "));
 
     double power_display = power;
@@ -367,15 +375,25 @@ static void display_16x2_view_main()
 
     // Break status
     if(brake_stat==0)
+    #if DISPAY_TYPE==DISPLAY_TYPE_16X2_SERIAL
         lcd.write(0x01);
+    #else
+        lcd.print(MY_F("B"));
+    #endif
     else if (current_profile)           // second profile active?
+    #if DISPAY_TYPE==DISPLAY_TYPE_16X2_SERIAL
         lcd.write(0x03);
+    #else
+        lcd.print(MY_F("2"));
+    #endif
     else
         lcd.print(MY_F(" "));
 
     lcd.setCursor(0,1);
     // Custom battery symbol
+    #if DISPAY_TYPE==DISPLAY_TYPE_16X2_SERIAL
     lcd.write(0x02);
+    #endif
     lcd.print(battery_percent_fromcapacity);
     // Note: two extra spaces to clear chars when the capacity gets lower
     lcd.print(MY_F("%  "));
@@ -1365,4 +1383,4 @@ void display_debug(HardwareSerial* localSerial)
     #endif
 
 #endif
-}
+}