Reverted changes related to wrong est_delay_us definition in the late…

…st SDK. (See: esp8266/Arduino#3782 )
slaff · Nov 22, 2017 · 9630135 · 9630135
1 parent 86ea5a3
commit 9630135
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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 ();