From 9630135b4c255011385ec142b93135259a830a47 Mon Sep 17 00:00:00 2001 From: Slavey Karadzhov Date: Sun, 5 Nov 2017 20:53:28 +0100 Subject: [PATCH] Reverted changes related to wrong est_delay_us definition in the latest SDK. (See: https://github.com/esp8266/Arduino/issues/3782 ) --- Sming/Libraries/Adafruit_ILI9341/Adafruit_ILI9341.cpp | 3 +-- Sming/SmingCore/Clock.cpp | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Sming/Libraries/Adafruit_ILI9341/Adafruit_ILI9341.cpp b/Sming/Libraries/Adafruit_ILI9341/Adafruit_ILI9341.cpp index 8dc3004bcc..05a69695da 100644 --- a/Sming/Libraries/Adafruit_ILI9341/Adafruit_ILI9341.cpp +++ b/Sming/Libraries/Adafruit_ILI9341/Adafruit_ILI9341.cpp @@ -157,8 +157,7 @@ void Adafruit_ILI9341::begin(void) { transmitCmdData(0xE1, data, 15); //Set Gamma transmitCmd(0x11); //Exit Sleep - os_delay_us(60000); - os_delay_us(60000); + os_delay_us(120000); transmitCmd(0x29); //Display on transmitCmd(0x2c); diff --git a/Sming/SmingCore/Clock.cpp b/Sming/SmingCore/Clock.cpp index 6b0205ae19..d9af135bc2 100644 --- a/Sming/SmingCore/Clock.cpp +++ b/Sming/SmingCore/Clock.cpp @@ -26,10 +26,10 @@ void delay(uint32_t time) int remainder = time % MAX_SAFE_DELAY; for(int i=0, max = quotient + 1; i < max ; i++) { if(i == quotient) { - os_delay_us((uint16_t)(remainder * 1000)); + os_delay_us(remainder * 1000); } else { - os_delay_us((uint16_t)(MAX_SAFE_DELAY * 1000)); + os_delay_us(MAX_SAFE_DELAY * 1000); } system_soft_wdt_feed ();