Main release preparation for version 1.2.0.

Tested with 4BIT, I2C and 2 WIRE SR.
This commit is contained in:
FMC
2012-02-28 19:45:04 +01:00
parent dca5a87ac9
commit b29cb7f787
3 changed files with 16 additions and 6 deletions
+1 -1
View File
@@ -289,7 +289,7 @@ void LCD::createChar(uint8_t location, uint8_t charmap[])
for (int i=0; i<8; i++)
{
write(charmap[i]); // call the virtual write method
delayMicroseconds(30);
delayMicroseconds(40);
}
}
+2 -3
View File
@@ -146,11 +146,10 @@ void LiquidCrystal_SR::shiftIt(uint8_t val)
// latch. The shiftregister latch pin (STR, RCL or similar) is then
// connected to the LCD enable pin. The LCD is (very likely) slower
// to read the Enable pulse, and then reads the new contents of the SR.
fio_digitalWrite_HIGH(_srEnableRegister, _srEnableBit);
waitUsec(1); // enable pulse must be >450ns
waitUsec (1); // enable pulse must be >450ns
fio_digitalWrite_SWITCHTO(_srEnableRegister, _srEnableBit, LOW);
waitUsec(40); // commands need > 37us to settle
waitUsec ( 37 ); // commands need > 37us to settle
}
// PUBLIC METHODS
@@ -34,6 +34,10 @@
#include <LiquidCrystal.h>
#endif
#ifdef _LCD_SR_
#include <LiquidCrystal_SR.h>
#endif
/*!
@defined CHAR_WIDTH
@@ -111,6 +115,13 @@ const int CONTRAST_PIN = 9;
const int CONTRAST = 65;
#endif
#ifdef _LCD_SR_
LiquidCrystal_SR lcd(3,2,TWO_WIRE);
// | |
// | \-- Clock Pin
// \---- Data/Enable Pin
#endif
// LCD reference variable
LCD *myLCD = &lcd;
@@ -255,7 +266,7 @@ static void initHW ( void )
pinMode ( STATUS_PIN, OUTPUT );
myLCD->begin ( 16, 2 );
myLCD->begin ( 20, 4 );
// Load custom character set into CGRAM
// --------------------------------------------------------------------
for ( i = 0; i < charBitmapSize; i++ )
@@ -304,4 +315,4 @@ void loop ()
drawBars ( tempFilter, 1, 14, '-', '+' );
delay (LOOP_DELAY);
}
}