Merge pull request #2 from vitasam/master

New API parameters: w(idth), h(eight), r(otation)

Author: jeffmer

README.md

@@ -1,8 +1,12 @@
 # Micropython Driver for ILI9341 display
 
-
 This has been tested on an M5Stack module using the standard esp32 micropython port. The default font is the Adafruit glcdfont and additional fonts can be generated by a very slightly modified version of Peter Hinch's font-to-py program which includes a function in font file to return the pixel width of a string of characters.
 
 ![m5stack](image/m5stack.jpg)
 
+# Rotation parameters
+
+![m5stack](image/rotations.png)
+
+
 

ili934xnew.py

@@ -1,7 +1,7 @@
 # This is an adapted version of the ILI934X driver as below.
 # It works with multiple fonts and also works with the esp32 H/W SPI implementation
 # Also includes a word wrap print function
-# Proportional fonts are generated by Peter Hinch's Font-to-py 
+# Proportional fonts are generated by Peter Hinch's Font-to-py
 # MIT License; Copyright (c) 2017 Jeffrey N. Magee
 
 # This file is part of MicroPython ILI934X driver
@@ -54,14 +54,16 @@ def color565(r, g, b):
 
 class ILI9341:
 
-    width = 320
-    height = 240
-
-    def __init__(self, spi, cs, dc, rst):
+    def __init__(self, spi, cs, dc, rst, w, h, r):
         self.spi = spi
         self.cs = cs
         self.dc = dc
         self.rst = rst
+        self._init_width = w
+        self._init_height = h
+        self.width = w
+        self.height = h
+        self.rotation = r
         self.cs.init(self.cs.OUT, value=1)
         self.dc.init(self.dc.OUT, value=0)
         self.rst.init(self.rst.OUT, value=0)
@@ -74,25 +76,25 @@ def __init__(self, spi, cs, dc, rst):
         self._y = 0
         self._font = glcdfont
         self.scrolling = False
-    
+
     def set_color(self,fg,bg):
         self._colormap[0] = bg>>8
         self._colormap[1] = bg & 255
         self._colormap[2] = fg>>8
         self._colormap[3] = fg & 255
-    
+
     def set_pos(self,x,y):
         self._x = x
         self._y = y
-    
+
     def reset_scroll(self):
         self.scrolling = False
         self._scroll = 0
         self.scroll(0)
-    
+
     def set_font(self, font):
         self._font = font
-    
+
     def init(self):
         for command, data in (
             (_RDDSDR, b"\x03\x80\x02"),
@@ -105,9 +107,45 @@ def init(self):
             (_PWCTRL1, b"\x23"),
             (_PWCTRL2, b"\x10"),
             (_VMCTRL1, b"\x3e\x28"),
-            (_VMCTRL2, b"\x86"),
-            #(_MADCTL, b"\x48"),
-            (_MADCTL, b"\x08"),
+            (_VMCTRL2, b"\x86")):
+            self._write(command, data)
+
+        if self.rotation == 0:                  # 0 deg
+            self._write(_MADCTL, b"\x48")
+            self.width = self._init_height
+            self.height = self._init_width
+        elif self.rotation == 1:                # 90 deg
+            self._write(_MADCTL, b"\x28")
+            self.width = self._init_width
+            self.height = self._init_height
+        elif self.rotation == 2:                # 180 deg
+            self._write(_MADCTL, b"\x88")
+            self.width = self._init_height
+            self.height = self._init_width
+        elif self.rotation == 3:                # 270 deg
+            self._write(_MADCTL, b"\xE8")
+            self.width = self._init_width
+            self.height = self._init_height
+        elif self.rotation == 4:                # Mirrored + 0 deg
+            self._write(_MADCTL, b"\xC8")
+            self.width = self._init_height
+            self.height = self._init_width
+        elif self.rotation == 5:                # Mirrored + 90 deg
+            self._write(_MADCTL, b"\x68")
+            self.width = self._init_width
+            self.height = self._init_height
+        elif self.rotation == 6:                # Mirrored + 180 deg
+            self._write(_MADCTL, b"\x08")
+            self.width = self._init_height
+            self.height = self._init_width
+        elif self.rotation == 7:                # Mirrored + 270 deg
+            self._write(_MADCTL, b"\xA8")
+            self.width = self._init_width
+            self.height = self._init_height
+        else:
+            self._write(_MADCTL, b"\x08")
+
+        for command, data in (
             (_PIXSET, b"\x55"),
             (_FRMCTR1, b"\x00\x18"),
             (_DISCTRL, b"\x08\x82\x27"),
@@ -189,7 +227,7 @@ def fill_rectangle(self, x, y, w, h, color=None):
 
     def erase(self):
         self.fill_rectangle(0, 0, self.width, self.height)
-        
+
     def blit(self, bitbuff, x, y, w, h):
         x = min(self.width - 1, max(0, x))
         y = min(self.height - 1, max(0, y))
@@ -212,7 +250,7 @@ def blit(self, bitbuff, x, y, w, h):
         if rest != 0:
             mv = memoryview(self._buf)
             self._data(mv[:rest*2])
-    
+
     def chars(self, str, x, y):
         str_w  = self._font.get_width(str)
         div, rem = divmod(self._font.height(),8)

image/rotations.png

@@ -0,0 +1,16 @@
+from ili934xnew import ILI9341, color565
+from machine import Pin, SPI
+import tt14
+
+text = 'F'
+spi = SPI(2, baudrate=20000000, miso=Pin(19),mosi=Pin(23), sck=Pin(18))
+display = ILI9341(spi, cs=Pin(2), dc=Pin(27), rst=Pin(33), w=320, h=240, r=0)
+display.erase()
+display.set_font(tt14)
+display.set_pos(0,0)
+display.print(text)
+display.set_pos(0,20)
+display.print(text)
+display.set_pos(40,20)
+display.print(text)
+