Added test for 4x16 LCD

davehylands · davehylands · commit af4ff2c9f8b8 · 2021-01-09T23:02:25.000-08:00
diff --git a/lcd/lcd_api.py b/lcd/lcd_api.py
@@ -128,10 +128,11 @@ def move_to(self, cursor_x, cursor_y):
         addr = cursor_x & 0x3f
         if cursor_y & 1:
             addr += 0x40    # Lines 1 & 3 add 0x40
-        if cursor_y & 2 and self.num_columns == 16:
-            addr += 0x10    # Lines 3 & 4 add 0x10 for 16 cols and 0x14 for 20 cols
-        if cursor_y & 2 and self.num_columns == 20:
-            addr += 0x14
+        if cursor_y & 2:
+            if self.num_columns == 16:
+                addr += 0x10    # Lines 3 & 4 add 0x10 for 16 cols and 0x14 for 20 cols
+            else:
+                addr += 0x14
         self.hal_write_command(self.LCD_DDRAM | addr)
 
     def putchar(self, char):
diff --git a/test_lcd.py b/test_lcd.py
@@ -158,6 +158,19 @@ def test_full_line2(self):
       b'Line 4 - 01234567890',
     ])
 
+  def test_simple_4x16(self):
+    lcd = LcdSim(4, 16)
+    lcd.putstr('Line 1\n')
+    lcd.putstr('Line 2\n')
+    lcd.putstr('Line 3\n')
+    lcd.putstr('Line 4\n')
+    self.assertEqual(lcd.display_lines(), [
+      b'Line 1          ',
+      b'Line 2          ',
+      b'Line 3          ',
+      b'Line 4          ',
+    ])
+
 
 if __name__ == '__main__':
     unittest.main()
