Revision 42:c21b3e729cb3, committed 2016-01-08

Comitter:

Wiciu

Date:

Fri Jan 08 20:46:03 2016 +0000

Parent:

37:ce348c002929

Commit message:

oo;

Changed in this revision

--- a/TextLCD.cpp	Sun Mar 29 13:08:03 2015 +0000
+++ b/TextLCD.cpp	Fri Jan 08 20:46:03 2016 +0000
@@ -2754,11 +2754,11 @@
 
 
 //--------- Start TextLCD_I2C -----------
-#if(LCD_I2C == 1) /* I2C Expander PCF8574/MCP23008 */
-/** Create a TextLCD interface using an I2C PC8574 (or PCF8574A) or MCP23008 portexpander
+#if(LCD_I2C == 1) /* I2C Expander F8574/MCP23008 */
+/** Create a TextLCD interface using an I2C PC8574 (orA) or MCP23008 portexpander
   *
   * @param i2c             I2C Bus
-  * @param deviceAddress   I2C slave address (PCF8574, PCF8574A or MCP23008, default = 0x40)
+  * @param deviceAddress   I2C slave address (PCF8574,A or MCP23008, default = 0x40)
   * @param type            Sets the panel size/addressing mode (default = LCD16x2)
   * @param ctrl            LCD controller (default = HD44780)    
   */
@@ -2769,7 +2769,7 @@
   _slaveAddress = deviceAddress & 0xFE;
 
   // Setup the I2C bus
-  // The max bitrate for PCF8574 is 100kbit, the max bitrate for MCP23008 is 400kbit, 
+  // The max bitrate for is 100kbit, the max bitrate for MCP23008 is 400kbit, 
   _i2c->frequency(100000);
   
 #if (MCP23008==1)
@@ -2796,7 +2796,7 @@
   // write the new data to the portexpander
   _writeRegister(GPIO, _lcd_bus);      
 #else
-  // PCF8574 of PCF8574A portexpander
+  // ofA portexpander
 
   // Init the portexpander bus
   _lcd_bus = D_LCD_BUS_DEF;
@@ -2843,7 +2843,7 @@
   // write the new data to the portexpander
   _writeRegister(GPIO, _lcd_bus);      
 #else
-  // PCF8574 of PCF8574A portexpander
+  // ofA portexpander
 
   // write the new data to the I2C portexpander
   _i2c->write(_slaveAddress, &_lcd_bus, 1);    
@@ -2868,7 +2868,7 @@
   // write the new data to the portexpander
   _writeRegister(GPIO, _lcd_bus);      
 #else
-  // PCF8574 of PCF8574A portexpander
+  // ofA portexpander
 
   // write the new data to the I2C portexpander
   _i2c->write(_slaveAddress, &_lcd_bus, 1);    
@@ -2892,7 +2892,7 @@
   // write the new data to the portexpander
   _writeRegister(GPIO, _lcd_bus);      
 #else
-  // PCF8574 of PCF8574A portexpander
+  // ofA portexpander
 
   // write the new data to the I2C portexpander
   _i2c->write(_slaveAddress, &_lcd_bus, 1);    
@@ -2948,7 +2948,7 @@
   // write the new data to the portexpander
   _writeRegister(GPIO, _lcd_bus);      
 #else
-  // PCF8574 of PCF8574A portexpander
+  // ofA portexpander
 
   // write the new data to the I2C portexpander
   _i2c->write(_slaveAddress, &_lcd_bus, 1);    
@@ -2994,7 +2994,7 @@
   // write the packed data to the I2C portexpander
   _i2c->write(_slaveAddress, data, 5);    
 #else
-  // PCF8574 of PCF8574A portexpander
+  // ofA portexpander
   
   _setEnableBit(true);            // set E 
   _setDataBits(value >> 4);       // set data high  

--- a/TextLCD.h	Sun Mar 29 13:08:03 2015 +0000
+++ b/TextLCD.h	Fri Jan 08 20:46:03 2016 +0000
@@ -647,7 +647,7 @@
 /** Create a TextLCD interface using an I2C PCF8574 (or PCF8574A) or MCP23008 portexpander
   *
   */
-class TextLCD_I2C : public TextLCD_Base {    
+class TextLCD_I2C : public TextLCD_Base {     
 public:
    /** Create a TextLCD interface using an I2C PCF8574 (or PCF8574A) or MCP23008 portexpander
      *

--- a/TextLCD_Config.h	Sun Mar 29 13:08:03 2015 +0000
+++ b/TextLCD_Config.h	Fri Jan 08 20:46:03 2016 +0000
@@ -50,10 +50,10 @@
 //LCD and serial portexpanders should be wired according to the tables below.
 //
 //Select Serial Port Expander Hardware module (one option only)
-#define DEFAULT        1
+#define DEFAULT        0
 #define ADAFRUIT       0
 #define DFROBOT        0
-#define YWROBOT        0
+#define YWROBOT        1
 #define GYLCD          0
 #define SYDZ           0