Revision 1:4f46d81502aa, committed 2012-09-05

Comitter:

GuiTwo

Date:

Wed Sep 05 07:22:44 2012 +0000

Parent:

0:936f1c020120

Child:

2:66e4ebaba5df

Commit message:

Original

Changed in this revision

--- a/main.cpp	Wed Sep 05 07:21:59 2012 +0000
+++ b/main.cpp	Wed Sep 05 07:22:44 2012 +0000
@@ -1,8 +1,5 @@
 #include "mbed.h"
 #include "menbed.h"
-//#include "PCF8574_DataBus.h"
-//#include "KS0108.h"
-
 
 AnalogIn photocell(p15);
 PwmOut led1(LED1);
@@ -10,15 +7,6 @@
 DigitalOut led3(LED3);
 DigitalOut led4(LED4);
 
-//I2C Bus
-//I2C i2c(p9, p10);
-
-//PCF8574_DataBus    DB = PCF8574_DataBus(i2c, 0x40);  //Copy constructors..
-
-
-
-
-
 float photocellVoltage(void) {return 3.3 * photocell;}
 void setLed1Pwm (float d) {led1 = d / 100.0;}
 float getLed1Pwm (void) {return led1 * 100.0;}
@@ -125,18 +113,6 @@
     // specify the physical interface connection to the LCD.
     MenbedDisplayHD44780 *hd44780Lcd = new MenbedDisplayHD44780 
         (p25, p26, p27, p28, p29, p30, MenbedDisplayHD44780::LCD20x4);
-        
-  /*  KS0108 *LCD = new KS0108(
-    p21,//_RST
-    p5,//_DI
-    p30,//_RW
-    p29,//_E
-    p25,//_CS2
-    p6,//_CS1
-    DB
-);    
-    */    
-        
 
     // Now, we have the menu objects and the display object.  All we have to do
     // is create the menbed menu system.  The number of buttons used by the
@@ -146,15 +122,17 @@
     // buttons.
 
     /* Four buttons (select, down, up, cancel ) */    
-    //Menbed menbed(p8, p11, p12, p13,&rootMenu,hd44780Lcd);
+    Menbed menbed(p22, p24, p23, p21,
+        rootMenu,
+        hd44780Lcd);
     
 
     /* Three buttons (select, down, up) */
-    
+    /*
     Menbed menbed(p22, p24, p23,
         &rootMenu,
         hd44780Lcd);
-    
+    */
     
     /* Two buttons (select, down) */
     /*