X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=lcd_acm1602.h;h=1d229b926fc64a1ee39860061402600a5b817766;hb=fd6f13933258e592ba3adfc21150db615a36ccac;hp=effc371ad59e1c345232df48085133335030ec5a;hpb=a30c9653166e04b16add5aa6af109d3b42a6fd52;p=openi2cradio%2FOpenI2CRadio.git

diff --git a/lcd_acm1602.h b/lcd_acm1602.h
index effc371..1d229b9 100644
--- a/lcd_acm1602.h
+++ b/lcd_acm1602.h
@@ -53,38 +53,39 @@ extern "C" {
 // Notes: Master clock = 8MHz(0.125uS)
 // Wait 5us
 #ifdef __SDCC
-#define _ACM1602_TC_WAIT()     delay10tcy(4)
+//#define _ACM1602_TC_WAIT()     delay10tcy(4)
 // Wait 50us
 #define _ACM1602_SHORT_WAIT()     delay100tcy(4)
 // Wait 5ms
-#define _ACM1602_LONG_WAIT()     delay10ktcy(40)
+#define _ACM1602_LONG_WAIT()     idle_time_ms(50)
 // Wait 200ms
 //#define _ACM1602_LONG_LONG_WAIT()     delay100ktcy(10)
 #define _ACM1602_LONG_LONG_WAIT()     idle_time_ms(125)
 // Wait 5.5ms
-#define _ACM1602_I2C_WAIT()     delay1ktcy(44)
+#define _ACM1602_I2C_WAIT()     idle_time_ms(6)
 #else
-#define _ACM1602_TC_WAIT()     __delay_us(5)
+//#define _ACM1602_TC_WAIT()     __delay_us(5)
 // Wait 50us
 #define _ACM1602_SHORT_WAIT()     __delay_us(50)
 // Wait 5ms
-#define _ACM1602_LONG_WAIT()     __delay_ms(50)
+#define _ACM1602_LONG_WAIT()     idle_time_ms(50)
 // Wait 125ms
 #define _ACM1602_LONG_LONG_WAIT()     idle_time_ms(125)
 // Wait 5.5ms
-#define _ACM1602_I2C_WAIT()     __delay_us(5500)
+#define _ACM1602_I2C_WAIT()     idle_time_ms(6)
 #endif
 
 
 extern void acm1602_cls(unsigned char addr);
 extern void acm1602_putchar(unsigned char addr, unsigned char c);
-extern void acm1602_locate_16x2(unsigned char addr, char x, char y);
-extern void acm1602_locate_8x2(unsigned char addr, char x, char y);
+extern void acm1602_locate_16x2(unsigned char addr, unsigned char x, unsigned char y);
+extern void acm1602_locate_8x2(unsigned char addr, unsigned char x, unsigned char y);
 extern void acm1602_home(unsigned char addr);
 extern void acm1602_cursordir(unsigned char addr, unsigned char right);
 extern void acm1602_dispcursor(unsigned char addr, unsigned char flag);
 extern void acm1602_init(unsigned char addr, unsigned char cls);
 extern void acm1602_suspend(unsigned char addr);
+extern void acm1602_resume(unsigned char addr);
 
 //extern unsigned char acm1602_getchar(unsigned char addr);