diff --git a/arch/arm/src/lm3s/lm3s_gpio.c b/arch/arm/src/lm3s/lm3s_gpio.c index 1c792e888bb624060c656d89fe31036220835249..305103143a544343cc09f764b90d19f96f947841 100644 --- a/arch/arm/src/lm3s/lm3s_gpio.c +++ b/arch/arm/src/lm3s/lm3s_gpio.c @@ -727,7 +727,7 @@ int lm3s_configgpio(uint32_t cfgset) putreg32(regval, LM3S_SYSCON_RCGC2); /* First, set the port to digital input. This is the safest state in which - * to perform reconfiguation. + * to perform reconfiguration. */ lm3s_gpiofunc(base, pinno, &g_funcbits[0]); diff --git a/configs/lm3s6965-ek/README.txt b/configs/lm3s6965-ek/README.txt index 24a9ab099ed989930f2e10354f0634d3355e4ee8..a29e27cd7faf4d45014298dbf5c069797b866800 100755 --- a/configs/lm3s6965-ek/README.txt +++ b/configs/lm3s6965-ek/README.txt @@ -97,6 +97,10 @@ OLED - PC7: OLED display data/control select (D/Cn) - PA3: OLED display chip select (CSn) + NOTE: Newer versions of the LM3S6965 Evaluation Kit has an OSAM 128x64x4 OLED + display. Some tweaks to drivers/lcd/p14201.c would be required to support that + LCD. + Development Environment ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/configs/lm3s6965-ek/src/lm3s6965ek_internal.h b/configs/lm3s6965-ek/src/lm3s6965ek_internal.h index 2b7514c21eac3ab9ad73876a66a701a57ced23c8..c0ddfa6d96d49dce8ceb60d2368f6e9eaa5ce4b3 100755 --- a/configs/lm3s6965-ek/src/lm3s6965ek_internal.h +++ b/configs/lm3s6965-ek/src/lm3s6965ek_internal.h @@ -105,7 +105,7 @@ * - PA3: OLED display chip select (CSn) */ -#define OLEDDC_GPIO (GPIO_FUNC_OUTPUT | GPIO_PADTYPE_STDWPU | GPIO_STRENGTH_4MA | \ +#define OLEDDC_GPIO (GPIO_FUNC_OUTPUT | GPIO_PADTYPE_STD | GPIO_STRENGTH_8MA | \ GPIO_VALUE_ONE | GPIO_PORTC | 7) #define OLEDCS_GPIO (GPIO_FUNC_OUTPUT | GPIO_PADTYPE_STDWPU | GPIO_STRENGTH_4MA | \ GPIO_VALUE_ONE | GPIO_PORTA | 3) diff --git a/drivers/lcd/p14201.c b/drivers/lcd/p14201.c index d3ea175761f2f8b1cfac040db47cc19ee54a2e39..a8bb347a91a2b5b470fef458688121b9e0bb22bb 100755 --- a/drivers/lcd/p14201.c +++ b/drivers/lcd/p14201.c @@ -407,14 +407,14 @@ static const uint8_t g_setallcol[] = { SSD1329_SET_COLADDR, 0, - RIT_YRES-1 + (RIT_XRES/2)-1 }; static const uint8_t g_setallrow[] = { SSD1329_SET_ROWADDR, 0, - RIT_XRES-1 + RIT_YRES-1 }; /**************************************************************************************