Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added XPT2046 touch screen digitizer for ILI9341 display #11159

Merged
merged 7 commits into from
Mar 1, 2021

Conversation

nonix
Copy link

@nonix nonix commented Feb 28, 2021

Description:

Related issue (if applicable): fixes #

Checklist:

  • [ x] The pull request is done against the latest development branch
  • [ x] Only relevant files were touched
  • [ x] Only one feature/fix was added per PR and the code change compiles without warnings
  • [ x] The code change is tested and works on Tasmota core ESP8266 V.2.7.4.9
  • The code change is tested and works on Tasmota core ESP32 V.1.0.5-rc6
  • [x ] I accept the CLA.

NOTE: The code change must pass CI tests. Your PR cannot be merged unless tests pass

@nonix
Copy link
Author

nonix commented Feb 28, 2021

This change extends Tasmota functionality with LoLin TFT 2.4" touch screen display. The LoLin TFT 2.4" is Wemos D1 R2 mini add-on hat with TFT driver ILI9341 and restive touch screen driver XPT2046.

Note: this is my first contribution, please accept my apology if not all code is as expected.

@ascillato
Copy link
Contributor

What is the use for the file xpt.patch?

@nonix
Copy link
Author

nonix commented Feb 28, 2021

That's my mistake, the file should not have been committed. I can try to remove ... Sorry.

@nonix
Copy link
Author

nonix commented Feb 28, 2021

I have removed the unnecessary xpt.patch (my temp) file.

@@ -152,6 +152,9 @@ enum UserSelectablePins {
GPIO_TM1637CLK, GPIO_TM1637DIO, // TM1637 interface
GPIO_PROJECTOR_CTRL_TX, GPIO_PROJECTOR_CTRL_RX, // LCD/DLP Projector Serial Control
GPIO_SSD1351_DC,
#ifdef USE_XPT2046
GPIO_XPT2046_CS, // XPT2046 SPI Chip Select
#endif
GPIO_SENSOR_END };
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do not use #ifdef USE_XPT2046 here as it needs to be compiled in always to keep the list complete.

So pls remove these (only here).

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, ifdefs removed and committed

@arendst arendst merged commit 1dbdf6d into arendst:development Mar 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants