Updated 'EVE' module to build correctly for both FT80x and FT81x

Author: loboris

MicroPython_BUILD/.gitignore

@@ -22,6 +22,7 @@ build/
 
 patches/
 
+*.id
 qstrdefs.generated.h
 /partitions_mpy.csv
 /sdkconfig

MicroPython_BUILD/BUILD.sh

@@ -53,7 +53,7 @@
 
 #=======================
 TOOLS_VER=ver20180827.id
-BUILD_VER=ver20180827.id
+BUILD_VER=ver20180904.id
 #=======================
 
 # -----------------------------

MicroPython_BUILD/components/micropython/Kconfig.projbuild

@@ -342,53 +342,64 @@ menu "MicroPython"
             bool "Enable support for EVE (FT8xx) displays"
             default n
             help
-                Includes support for EVE displays (FT80x, FT81x)
+                Include support for EVE displays (FT80x, FT81x)
 
-        menu "EVE Configuration"
+        config MICROPY_EVE_IC_TYPE
+            int
             depends on MICROPY_USE_EVE
-            config MICROPY_EVE_FT81X
-                bool "EVE FT81X type"
+            default 0 if EVE_CHIP_TYPE0
+            default 1 if EVE_CHIP_TYPE1
+
+            choice
+                prompt "Select EVE IC type"
                 depends on MICROPY_USE_EVE
-                default y
+                default EVE_CHIP_TYPE1
                 help
-                    Used FT8xx chip is FT81x
-                    If not set, the code for FT80x will be compiled
+                    Select the EVE IC type, FT80x or FT81x
 
-            config EVE_MODE_TYPE
-                int
-                default 0 if FT8_USER_TYPE
-                default 1 if FT8_FT810CB_HY50HD
-                default 2 if FT8_FT811CB_HY50HD
-                default 3 if FT8_VM800B35A
-                default 4 if FT8_VM800B43A
-                default 5 if FT8_VM800B50A
-                default 6 if FT8_EVE2_50G
-                default 6 if FT8_EVE2_TEST
+                config EVE_CHIP_TYPE0
+                    bool "FT80x"
+                config EVE_CHIP_TYPE1
+                    bool "FT81x"
+            endchoice
 
-                choice
-                    prompt "Select predefined EVE display type"
-                    default EVE_MODE_TYPE1
-                    help
-                        Select predefined EVE display type
-
-                    config FT8_USER_TYPE
-                        bool "User defined"
-                    config FT8_FT810CB_HY50HD
-                        bool "FT810CB-HY50HD: FT810 800x480 5\", HAOYU"
-                    config FT8_FT811CB_HY50HD
-                        bool "FT811CB-HY50HD: FT810 800x480 5\", HAOYU"
-                    config FT8_VM800B35A
-                        bool "VM800B35A: FT800 320x240 3.5\", FTDI"
-                    config FT8_VM800B43A
-                        bool "VM800B43A: FT800 480x272 4.4\", FTDI/BRT"
-                    config FT8_VM800B50A
-                        bool "VM800B50A: FT800 480x272 5\", FTDI/BRT"
-                    config FT8_EVE2_50G
-                        bool "800x480 5.0\" capacitive touch, FT813"
-                    config FT8_EVE2_TEST
-                        bool "TEST display"
-                endchoice
-        endmenu
+        config EVE_MODE_TYPE
+            int
+            depends on MICROPY_USE_EVE
+            default 0 if FT8_USER_TYPE
+            default 1 if FT8_FT810CB_HY50HD
+            default 2 if FT8_FT811CB_HY50HD
+            default 3 if FT8_VM800B35A
+            default 4 if FT8_VM800B43A
+            default 5 if FT8_VM800B50A
+            default 6 if FT8_EVE2_50G
+            default 6 if FT8_EVE2_TEST
+
+            choice
+                prompt "Select EVE display type"
+                depends on MICROPY_USE_EVE
+                default EVE_MODE_TYPE1
+                help
+                    Select predefined EVE display type or user type
+                    If user type is selected, display configuration must be set using 'config' method
+
+                config FT8_USER_TYPE
+                    bool "User defined"
+                config FT8_FT810CB_HY50HD
+                    bool "FT810CB-HY50HD: FT810 800x480 5\", HAOYU"
+                config FT8_FT811CB_HY50HD
+                    bool "FT811CB-HY50HD: FT810 800x480 5\", HAOYU"
+                config FT8_VM800B35A
+                    bool "VM800B35A: FT800 320x240 3.5\", FTDI"
+                config FT8_VM800B43A
+                    bool "VM800B43A: FT800 480x272 4.4\", FTDI/BRT"
+                config FT8_VM800B50A
+                    bool "VM800B50A: FT800 480x272 5\", FTDI/BRT"
+                config FT8_EVE2_50G
+                    bool "800x480 5.0\" capacitive touch, FT813"
+                config FT8_EVE2_TEST
+                    bool "TEST display"
+            endchoice
 
         config MICROPY_USE_GSM
             bool "Use GSM module"

MicroPython_BUILD/components/micropython/esp32/libs/eve/FT8.h

@@ -421,8 +421,11 @@
 #define VERTEX2II(x,y,handle,cell) ((2UL<<30)|(((x)&511UL)<<21)|(((y)&511UL)<<12)|(((handle)&31UL)<<7)|(((cell)&127UL)<<0))
 
 
+#define REG_ID_FT81X    0x302000UL
+#define REG_ID_FT80X    0x102400UL
+
 /* specific for FT80x */
-#ifndef FT8_81X_ENABLE
+#ifdef CONFIG_EVE_CHIP_TYPE0
 
 #define FT8_CHIPID		0x00010008UL