Revision 3:233295bc63af, committed 2016-09-02

Comitter:

og

Date:

Fri Sep 02 00:45:38 2016 +0000

Parent:

2:11512f68bcc8

Commit message:

??????

Changed in this revision

diff -r 11512f68bcc8 -r 233295bc63af HX8347D.cpp
--- a/HX8347D.cpp	Wed Aug 31 11:53:57 2016 +0000
+++ b/HX8347D.cpp	Fri Sep 02 00:45:38 2016 +0000
@@ -633,8 +633,8 @@
     for (uint8_t i = 0; i < sizeof(_regValues) / 4; i++) {
         a = _regValues[i*2];
         d = _regValues[i*2 + 1];
-        if (a == 0xF0) { // delay
-            HX8347D_WAIT(d);
+        if (a == 0xF0) { // _delay
+            _delay(d);
         } else if (a== 0xF1) { // write command
             writeCommand(d);
         } else
@@ -688,9 +688,9 @@
 void HX8347D::reset(void)
 {
     _rst=0;
-    HX8347D_WAIT(1000);
+    _delay(1000);
     _rst=1;
-    HX8347D_WAIT(1000);
+    _delay(1000);
  }
  
  void HX8347D::setWriteDir(void) {
@@ -716,12 +716,12 @@
     _d.output();
     _d=d>>8; 
     _wr=0;
-    HX8347D_WAIT(1);
+    _delay(1);
     _wr=1;
 
     _d=d;
     _wr=0;
-    HX8347D_WAIT(1);
+    _delay(1);
     _wr=1;
 
     _cs=1; 
@@ -733,13 +733,13 @@
     _d = d >> 8;
 
     _wr = 0;
-    HX8347D_WAIT(1);
+    _delay(1);
     _wr = 1;
     
     _d = d;
 
     _wr = 0;
-    HX8347D_WAIT(1);
+    _delay(1);
     _wr = 1;
 }
 
@@ -758,16 +758,16 @@
     //d <<= 8;
     //_rd = 1;
 
-    HX8347D_WAIT(1);
+    _delay(1);
     _rd = 0;
-    HX8347D_WAIT(10);
+    _delay(10);
     d = _d;
     d <<= 8;
     _rd = 1;
 
-    HX8347D_WAIT(1);
+    _delay(1);
     _rd = 0;
-    HX8347D_WAIT(10);
+    _delay(10);
     d |= _d;
     _rd = 1;
     _cs = 1;
@@ -878,5 +878,7 @@
   *posy = y;
 }
 
-
+void HX8347D::_delay(uint16_t t)
+{
+}
  
\ No newline at end of file

diff -r 11512f68bcc8 -r 233295bc63af HX8347D.h
--- a/HX8347D.h	Wed Aug 31 11:53:57 2016 +0000
+++ b/HX8347D.h	Fri Sep 02 00:45:38 2016 +0000
@@ -25,14 +25,6 @@
 
 #define swap(a, b) { int16_t t = a; a = b; b = t; }
 
-#if defined(TARGET_ARCH_PRO)
-#define HX8347D_WAIT(t)    wait_us(t)
-#elif defined TARGET_NUCLEO_F446RE
-#define HX8347D_WAIT(t)    wait_us(t)
-#elif defined TARGET_NUCLEO_F103RB
-#define HX8347D_WAIT(t)
-#endif
-
 class HX8347D
 {
 public:
@@ -132,6 +124,7 @@
     uint16_t cursor_x, cursor_y;
     uint16_t textcolor;
     uint8_t rotation;
+    void _delay(uint16_t t);
     
 };
 #endif
\ No newline at end of file