Revision 16:c22621bd7dea, committed 2014-08-27

Comitter:

embeddedartists

Date:

Wed Aug 27 14:22:41 2014 +0000

Parent:

15:529fb3f8f88b

Child:

17:b3a179cc3d88

Commit message:

Fixed bug in MCIFileSystem that occurred when CardDetect pin was not used.; Removed initialization of the LCD_LE pin as it is not used and it interfered with other uses of that pin.; Made some of EaLcdBoard's functions virtual to be able to inherit the

Changed in this revision

--- a/EaLcdBoard.h	Mon Aug 25 13:14:34 2014 +0000
+++ b/EaLcdBoard.h	Wed Aug 27 14:22:41 2014 +0000
@@ -212,11 +212,11 @@
     void pca9532_setBlink0Duty(uint8_t duty);
     void pca9532_setBlink0Leds(uint16_t ledMask);
 
-    void setWriteProtect(bool enable);
-    void set3V3Signal(bool enabled);
-    void set5VSignal(bool enabled);
-    void setDisplayEnableSignal(bool enabled);
-    void setBacklightContrast(uint32_t value);
+    virtual void setWriteProtect(bool enable);
+    virtual void set3V3Signal(bool enabled);
+    virtual void set5VSignal(bool enabled);
+    virtual void setDisplayEnableSignal(bool enabled);
+    virtual void setBacklightContrast(uint32_t value);
 
     I2C _i2c;
     LcdController::Config _cfg;

--- a/LcdController.cpp	Mon Aug 25 13:14:34 2014 +0000
+++ b/LcdController.cpp	Wed Aug 27 14:22:41 2014 +0000
@@ -411,7 +411,7 @@
 
     // pwr always controlled by gpio
 //    LPC_IOCON->P2_0 |= 7; /* LCD_PWR @ P2.0 */
-    LPC_IOCON->P2_1 |= 7; /* LCD_LE  @ P2.1 */
+//    LPC_IOCON->P2_1 |= 7; /* LCD_LE  @ P2.1 */  /* Never Used */
     LPC_IOCON->P2_2 |= 7; /* LCD_DCLK @ P2.2 */
     LPC_IOCON->P2_3 |= 7; /* LCD_FP @ P2.3 */
     LPC_IOCON->P2_4 |= 7; /* LCD_ENAB_M @ P2.4 */

--- a/MCIFileSystem.cpp	Mon Aug 25 13:14:34 2014 +0000
+++ b/MCIFileSystem.cpp	Wed Aug 27 14:22:41 2014 +0000
@@ -608,7 +608,11 @@
 
     initMCI();
 
-    if (cd != NC)
+    if (cd == NC)
+    {
+        _cardDetect = NULL;
+    }
+    else
     {
       _cardDetect = new DigitalIn(cd);
       _cardDetect->mode(PullUp);