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.

Sign up for GitHub

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

Fixed paths and added switch to free up MISO pin for other uses #5

Closed
wants to merge 2 commits into from
Closed

Fixed paths and added switch to free up MISO pin for other uses #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a18c7a3
Add files via upload
MarcFinns Mar 27, 2017
8a2e205
Add files via upload
MarcFinns Mar 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions TFT_eSPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,10 @@ void TFT_eSPI::init(void)
#endif

SPI.begin(); // This will set MISO to input

#ifdef D6_NOT_USED_FOR_MISO
pinMode(D6, OUTPUT);
#endif

#ifndef SUPPORT_TRANSACTIONS
#ifdef SET_SPI_TO_LSB_FIRST
Expand Down Expand Up @@ -203,19 +207,19 @@ void TFT_eSPI::init(void)

// This loads the driver specific initialisation code <<<<<<<<<<<<<<<<<<<<< ADD NEW DRIVERS TO THE LIST HERE <<<<<<<<<<<<<<<<<<<<<<<
#if defined (ILI9341_DRIVER)
#include "TFT_Drivers\ILI9341_Init.h"
#include "TFT_Drivers/ILI9341_Init.h"

#elif defined (ST7735_DRIVER)
#include "TFT_Drivers\ST7735_Init.h"
#include "TFT_Drivers/ST7735_Init.h"

#elif defined (ILI9163_DRIVER)
#include "TFT_Drivers\ILI9163_Init.h"
#include "TFT_Drivers/ILI9163_Init.h"

#elif defined (S6D02A1_DRIVER)
#include "TFT_Drivers\S6D02A1_Init.h"
#include "TFT_Drivers/S6D02A1_Init.h"

#elif defined (RPI_ILI9486_DRIVER)
#include "TFT_Drivers\RPI_ILI9486_Init.h"
#include "TFT_Drivers/RPI_ILI9486_Init.h"
#endif

spi_end();
Expand All @@ -234,19 +238,19 @@ void TFT_eSPI::setRotation(uint8_t m)

// This loads the driver specific rotation code <<<<<<<<<<<<<<<<<<<<< ADD NEW DRIVERS TO THE LIST HERE <<<<<<<<<<<<<<<<<<<<<<<
#if defined (ILI9341_DRIVER)
#include "TFT_Drivers\ILI9341_Rotation.h"
#include "TFT_Drivers/ILI9341_Rotation.h"

#elif defined (ST7735_DRIVER)
#include "TFT_Drivers\ST7735_Rotation.h"
#include "TFT_Drivers/ST7735_Rotation.h"

#elif defined (ILI9163_DRIVER)
#include "TFT_Drivers\ILI9163_Rotation.h"
#include "TFT_Drivers/ILI9163_Rotation.h"

#elif defined (S6D02A1_DRIVER)
#include "TFT_Drivers\S6D02A1_Rotation.h"
#include "TFT_Drivers/S6D02A1_Rotation.h"

#elif defined (RPI_ILI9486_DRIVER)
#include "TFT_Drivers\RPI_ILI9486_Rotation.h"
#include "TFT_Drivers/RPI_ILI9486_Rotation.h"

#endif

Expand Down
12 changes: 9 additions & 3 deletions User_Setup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,16 @@

// ##################################################################################
//
// Section 4. Not used section
// Section 4. Define whether D6 is used for MISO
//
// ##################################################################################

// Comment out the #define below to free up pin D6 for uses other than MISO
// Specifically, this way it can be used for DC / CS
// May be useful for pin-constrained applications
// WARNING: this only works if the display is used write-only
//
// #define D6_NOT_USED_FOR_MISO

// ##################################################################################
//
Expand All @@ -145,8 +151,8 @@
// #define SPI_FREQUENCY 5000000
// #define SPI_FREQUENCY 10000000
// #define SPI_FREQUENCY 20000000
#define SPI_FREQUENCY 27000000 // Actually sets it to 26.67MHz = 80/3
// #define SPI_FREQUENCY 40000000 // Maximum to use SPIFFS
// #define SPI_FREQUENCY 27000000 // Actually sets it to 26.67MHz = 80/3
#define SPI_FREQUENCY 40000000 // Maximum to use SPIFFS
// #define SPI_FREQUENCY 80000000


Expand Down