Merge branch 'master' of https://github.com/mathertel/LiquidCrystal_PCF8574

Author: mathertel

src/LiquidCrystal_PCF8574.cpp

@@ -56,12 +56,12 @@ void LiquidCrystal_PCF8574::init(uint8_t i2cAddr, uint8_t rs, uint8_t rw, uint8_
 } // init()
 
 
-void LiquidCrystal_PCF8574::begin(int cols, int lines)
+void LiquidCrystal_PCF8574::begin(uint8_t cols, uint8_t lines)
 {
   _cols = min(cols, 80);
   _lines = min(lines, 4);
 
-  int functionFlags = 0;
+  uint8_t functionFlags = 0;
 
   _row_offsets[0] = 0x00;
   _row_offsets[1] = 0x40;
@@ -116,10 +116,10 @@ void LiquidCrystal_PCF8574::home()
 
 
 /// Set the cursor to a new position.
-void LiquidCrystal_PCF8574::setCursor(int col, int row)
+void LiquidCrystal_PCF8574::setCursor(uint8_t col, uint8_t row)
 {
   // check boundaries
-  if ((col >= 0) && (col < _cols) && (row >= 0) && (row < _lines)) {
+  if ((col < _cols) && (row < _lines)) {
     // Instruction: Set DDRAM address = 0x80
     _send(0x80 | (_row_offsets[row] + col));
   }
@@ -235,7 +235,7 @@ void LiquidCrystal_PCF8574::noAutoscroll(void)
 /// Setting the brightness of the background display light.
 /// The backlight can be switched on and off.
 /// The current brightness is stored in the private _backlight variable to have it available for further data transfers.
-void LiquidCrystal_PCF8574::setBacklight(int brightness)
+void LiquidCrystal_PCF8574::setBacklight(uint8_t brightness)
 {
   _backlight = brightness;
   // send no data but set the background-pin right;
@@ -245,12 +245,12 @@ void LiquidCrystal_PCF8574::setBacklight(int brightness)
 
 // Allows us to fill the first 8 CGRAM locations
 // with custom characters
-void LiquidCrystal_PCF8574::createChar(int location, byte charmap[])
+void LiquidCrystal_PCF8574::createChar(uint8_t location, byte charmap[])
 {
   location &= 0x7; // we only have 8 locations 0-7
   // Set CGRAM address
   _send(0x40 | (location << 3));
-  for (int i = 0; i < 8; i++) {
+  for (uint8_t i = 0; i < 8; i++) {
     write(charmap[i]);
   }
 } // createChar()
@@ -290,7 +290,7 @@ void LiquidCrystal_PCF8574::_send(uint8_t value, bool isData)
 
 
 // write a nibble / halfByte with handshake
-void LiquidCrystal_PCF8574::_sendNibble(int halfByte, bool isData)
+void LiquidCrystal_PCF8574::_sendNibble(uint8_t halfByte, bool isData)
 {
   // map the data to the given pin connections
   uint8_t data = 0;

src/LiquidCrystal_PCF8574.h

@@ -40,18 +40,19 @@ class LiquidCrystal_PCF8574 : public Print
   // There is no sda and scl parameter for i2c in any api.
   // The Wire library has standard settings that can be overwritten by using Wire.begin(int sda, int scl) before calling LiquidCrystal_PCF8574::begin();
 
-  // constructors, which allows to redefine bit assignments in case your adapter is wired differently
+  // constructors, which allow to redefine bit assignments in case your adapter is wired differently
   LiquidCrystal_PCF8574(uint8_t i2cAddr, uint8_t rs, uint8_t enable,
     uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7, uint8_t backlight=255);
   LiquidCrystal_PCF8574(uint8_t i2cAddr, uint8_t rs, uint8_t rw, uint8_t enable,
     uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7, uint8_t backlight=255);
 
-  // Funtions from reference:
+  // Functions from reference:
 
-  void begin(int cols, int rows);
+  void begin(uint8_t cols, uint8_t rows);
 
+  void clear();
   void home();
-  void setCursor(int col, int row);
+  void setCursor(uint8_t col, uint8_t row);
   void cursor();
   void noCursor();
   void blink();
@@ -64,7 +65,7 @@ class LiquidCrystal_PCF8574 : public Print
   void noAutoscroll();
   void leftToRight();
   void rightToLeft();
-  void createChar(int, byte[]);
+  void createChar(uint8_t, byte[]);
 #ifdef __AVR__
   void createChar_P(uint8_t, const byte *);
   inline void createChar(uint8_t n, const byte *data) {
@@ -73,23 +74,22 @@ class LiquidCrystal_PCF8574 : public Print
 #endif
 
   // plus functions from LCDAPI:
-  void clear();
-  void setBacklight(int brightness);
+  void setBacklight(uint8_t brightness);
   inline void command(uint8_t value) { _send(value); }
 
   // support of Print class
   virtual size_t write(uint8_t ch);
 
 private:
   // instance variables
-  int _i2cAddr; ///< Wire Address of the LCD
-  int _backlight; ///< the backlight intensity
-  int _cols; ///< number of cols of the display
-  int _lines; ///< number of lines of the display
-  int _entrymode; ///<flags from entrymode
-  int _displaycontrol; ///<flags from displaycontrol
-  int _row_offsets[4];
-  
+  uint8_t _i2cAddr; ///< Wire Address of the LCD
+  uint8_t _backlight; ///< the backlight intensity
+  uint8_t _cols; ///< number of cols of the display
+  uint8_t _lines; ///< number of lines of the display
+  uint8_t _entrymode; ///<flags from entrymode
+  uint8_t _displaycontrol; ///<flags from displaycontrol
+  uint8_t _row_offsets[4];
+
   // variables describing how the PCF8574 is connected to the LCD
   uint8_t _rs_mask;
   uint8_t _rw_mask;
@@ -100,7 +100,7 @@ class LiquidCrystal_PCF8574 : public Print
 
   // low level functions
   void _send(uint8_t value, bool isData = false);
-  void _sendNibble(int halfByte, bool isData = false);
+  void _sendNibble(uint8_t halfByte, bool isData = false);
   void _write2Wire(uint8_t data, bool isData, bool enable);
 
   void init(uint8_t i2cAddr, uint8_t rs, uint8_t rw, uint8_t enable,