-#define _ACM1602_LONG_WAIT() delay1ktcy(40)
-// Wait 50ms
-#define _ACM1602_LONG_LONG_WAIT() delay10ktcy(40)
-// Wait 0.2ms
-#define _ACM1602_I2C_WAIT() delay100tcy(16)
-
+#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() idle_time_ms(6)
+#else
+//#define _ACM1602_TC_WAIT() __delay_us(5)
+// Wait 50us
+#define _ACM1602_SHORT_WAIT() __delay_us(50)
+// Wait 5ms
+#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() idle_time_ms(6)
+#endif