Commit 1e2904c

committed

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

1 parent c9b9dd1 commit 1e2904cCopy full SHA for 1e2904c

File tree

10 files changed

+281

-183

lines changed

MicroPython_BUILD
- .gitignore
- BUILD.sh
- components/micropython
  - Kconfig.projbuild
  - esp32
    - libs/eve
    - moddisplay_eve.c
    - mpversion.h
- updates.txt
- ver20180827.id

10 files changed

+281

-183

lines changed

`‎MicroPython_BUILD/.gitignore‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ build/`
`22`	`22`
`23`	`23`	`patches/`
`24`	`24`
	`25`	`+*.id`
`25`	`26`	`qstrdefs.generated.h`
`26`	`27`	`/partitions_mpy.csv`
`27`	`28`	`/sdkconfig`

`‎MicroPython_BUILD/BUILD.sh‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@`
`53`	`53`
`54`	`54`	`#=======================`
`55`	`55`	`TOOLS_VER=ver20180827.id`
`56`		`-BUILD_VER=ver20180827.id`
	`56`	`+BUILD_VER=ver20180904.id`
`57`	`57`	`#=======================`
`58`	`58`
`59`	`59`	`# -----------------------------`

`‎MicroPython_BUILD/components/micropython/Kconfig.projbuild‎`

Lines changed: 52 additions & 41 deletions

Original file line number	Diff line number	Diff line change
`@@ -342,53 +342,64 @@ menu "MicroPython"`
`342`	`342`	`bool "Enable support for EVE (FT8xx) displays"`
`343`	`343`	`default n`
`344`	`344`	`help`
`345`		`- Includes support for EVE displays (FT80x, FT81x)`
	`345`	`+ Include support for EVE displays (FT80x, FT81x)`
`346`	`346`
`347`		`- menu "EVE Configuration"`
	`347`	`+ config MICROPY_EVE_IC_TYPE`
	`348`	`+ int`
`348`	`349`	`depends on MICROPY_USE_EVE`
`349`		`- config MICROPY_EVE_FT81X`
`350`		`- bool "EVE FT81X type"`
	`350`	`+ default 0 if EVE_CHIP_TYPE0`
	`351`	`+ default 1 if EVE_CHIP_TYPE1`
	`352`	`+`
	`353`	`+ choice`
	`354`	`+ prompt "Select EVE IC type"`
`351`	`355`	`depends on MICROPY_USE_EVE`
`352`		`- default y`
	`356`	`+ default EVE_CHIP_TYPE1`
`353`	`357`	`help`
`354`		`- Used FT8xx chip is FT81x`
`355`		`- If not set, the code for FT80x will be compiled`
	`358`	`+ Select the EVE IC type, FT80x or FT81x`
`356`	`359`
`357`		`- config EVE_MODE_TYPE`
`358`		`- int`
`359`		`- default 0 if FT8_USER_TYPE`
`360`		`- default 1 if FT8_FT810CB_HY50HD`
`361`		`- default 2 if FT8_FT811CB_HY50HD`
`362`		`- default 3 if FT8_VM800B35A`
`363`		`- default 4 if FT8_VM800B43A`
`364`		`- default 5 if FT8_VM800B50A`
`365`		`- default 6 if FT8_EVE2_50G`
`366`		`- default 6 if FT8_EVE2_TEST`
	`360`	`+ config EVE_CHIP_TYPE0`
	`361`	`+ bool "FT80x"`
	`362`	`+ config EVE_CHIP_TYPE1`
	`363`	`+ bool "FT81x"`
	`364`	`+ endchoice`
`367`	`365`
`368`		`- choice`
`369`		`- prompt "Select predefined EVE display type"`
`370`		`- default EVE_MODE_TYPE1`
`371`		`- help`
`372`		`- Select predefined EVE display type`
`373`		`-`
`374`		`- config FT8_USER_TYPE`
`375`		`- bool "User defined"`
`376`		`- config FT8_FT810CB_HY50HD`
`377`		`- bool "FT810CB-HY50HD: FT810 800x480 5\", HAOYU"`
`378`		`- config FT8_FT811CB_HY50HD`
`379`		`- bool "FT811CB-HY50HD: FT810 800x480 5\", HAOYU"`
`380`		`- config FT8_VM800B35A`
`381`		`- bool "VM800B35A: FT800 320x240 3.5\", FTDI"`
`382`		`- config FT8_VM800B43A`
`383`		`- bool "VM800B43A: FT800 480x272 4.4\", FTDI/BRT"`
`384`		`- config FT8_VM800B50A`
`385`		`- bool "VM800B50A: FT800 480x272 5\", FTDI/BRT"`
`386`		`- config FT8_EVE2_50G`
`387`		`- bool "800x480 5.0\" capacitive touch, FT813"`
`388`		`- config FT8_EVE2_TEST`
`389`		`- bool "TEST display"`
`390`		`- endchoice`
`391`		`- endmenu`
	`366`	`+ config EVE_MODE_TYPE`
	`367`	`+ int`
	`368`	`+ depends on MICROPY_USE_EVE`
	`369`	`+ default 0 if FT8_USER_TYPE`
	`370`	`+ default 1 if FT8_FT810CB_HY50HD`
	`371`	`+ default 2 if FT8_FT811CB_HY50HD`
	`372`	`+ default 3 if FT8_VM800B35A`
	`373`	`+ default 4 if FT8_VM800B43A`
	`374`	`+ default 5 if FT8_VM800B50A`
	`375`	`+ default 6 if FT8_EVE2_50G`
	`376`	`+ default 6 if FT8_EVE2_TEST`
	`377`	`+`
	`378`	`+ choice`
	`379`	`+ prompt "Select EVE display type"`
	`380`	`+ depends on MICROPY_USE_EVE`
	`381`	`+ default EVE_MODE_TYPE1`
	`382`	`+ help`
	`383`	`+ Select predefined EVE display type or user type`
	`384`	`+ If user type is selected, display configuration must be set using 'config' method`
	`385`	`+`
	`386`	`+ config FT8_USER_TYPE`
	`387`	`+ bool "User defined"`
	`388`	`+ config FT8_FT810CB_HY50HD`
	`389`	`+ bool "FT810CB-HY50HD: FT810 800x480 5\", HAOYU"`
	`390`	`+ config FT8_FT811CB_HY50HD`
	`391`	`+ bool "FT811CB-HY50HD: FT810 800x480 5\", HAOYU"`
	`392`	`+ config FT8_VM800B35A`
	`393`	`+ bool "VM800B35A: FT800 320x240 3.5\", FTDI"`
	`394`	`+ config FT8_VM800B43A`
	`395`	`+ bool "VM800B43A: FT800 480x272 4.4\", FTDI/BRT"`
	`396`	`+ config FT8_VM800B50A`
	`397`	`+ bool "VM800B50A: FT800 480x272 5\", FTDI/BRT"`
	`398`	`+ config FT8_EVE2_50G`
	`399`	`+ bool "800x480 5.0\" capacitive touch, FT813"`
	`400`	`+ config FT8_EVE2_TEST`
	`401`	`+ bool "TEST display"`
	`402`	`+ endchoice`
`392`	`403`
`393`	`404`	`config MICROPY_USE_GSM`
`394`	`405`	`bool "Use GSM module"`

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

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -421,8 +421,11 @@`
`421`	`421`	`#define VERTEX2II(x,y,handle,cell) ((2UL<<30)\|(((x)&511UL)<<21)\|(((y)&511UL)<<12)\|(((handle)&31UL)<<7)\|(((cell)&127UL)<<0))`
`422`	`422`
`423`	`423`
	`424`	`+#define REG_ID_FT81X 0x302000UL`
	`425`	`+#define REG_ID_FT80X 0x102400UL`
	`426`	`+`
`424`	`427`	`/* specific for FT80x */`
`425`		`-#ifndefFT8_81X_ENABLE`
	`428`	`+#ifdefCONFIG_EVE_CHIP_TYPE0`
`426`	`429`
`427`	`430`	`#define FT8_CHIPID 0x00010008UL`
`428`	`431`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 1e2904c

File tree

10 files changed

10 files changed

`‎MicroPython_BUILD/.gitignore‎`

`‎MicroPython_BUILD/BUILD.sh‎`

`‎MicroPython_BUILD/components/micropython/Kconfig.projbuild‎`

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

0 commit comments