Merge branch 'master' of https://github.com/Xinyuan-LilyGO/LilyGo-AMO…

…LED-Series

keywords.txt

@@ -45,7 +45,8 @@ getBoardsConfigure	KEYWORD2
 getName	KEYWORD2
 getBoardID	KEYWORD2
 sleep	KEYWORD2
-wakeup	KEYWORD2
+disp_sleep	KEYWORD2
+disp_wakeup	KEYWORD2
 #######################################
 # Constants (LITERAL1)
 #######################################

src/LilyGo_AMOLED.cpp

@@ -43,7 +43,7 @@
 #define TFT_SPI_MODE            SPI_MODE0
 #define DEFAULT_SPI_HANDLER    (SPI3_HOST)
 
-LilyGo_AMOLED::LilyGo_AMOLED() : boards(NULL), _hasRTC(false)
+LilyGo_AMOLED::LilyGo_AMOLED() : boards(NULL), _hasRTC(false), _disableTouch(false)
 {
     spiDev = NULL;
     pBuffer = NULL;
@@ -139,6 +139,16 @@ bool LilyGo_AMOLED::isPressed()
     return false;
 }
 
+void LilyGo_AMOLED::disableTouch()
+{
+    _disableTouch = true;
+}
+
+void LilyGo_AMOLED::enableTouch()
+{
+    _disableTouch = false;
+}
+
 uint8_t LilyGo_AMOLED::getPoint(int16_t *x, int16_t *y, uint8_t get_point )
 {
     uint8_t point = 0;
@@ -147,6 +157,12 @@ uint8_t LilyGo_AMOLED::getPoint(int16_t *x, int16_t *y, uint8_t get_point )
     } else if (boards == &BOARD_AMOLED_191 || boards == &BOARD_AMOLED_241 || boards == &BOARD_AMOLED_191_SPI) {
         point =  TouchDrvCSTXXX::getPoint(x, y);
     }
+
+    // Disable touch, just return the touch press touch point Set to 0, does not actually disable touch
+    // https://github.com/Xinyuan-LilyGO/LilyGo-AMOLED-Series/issues/70
+    if (_disableTouch) {
+        return 0;
+    }
     return point;
 }
 
@@ -1047,7 +1063,13 @@ void LilyGo_AMOLED::sleep(bool touchpad_sleep_enable)
     }
 }
 
-void LilyGo_AMOLED::wakeup()
+void LilyGo_AMOLED::disp_sleep()
+{
+    lcd_cmd_t t = {LCD_CMD_SLPIN, {0x00}, 1};// Sleep in
+    writeCommand(t.addr, t.param, t.len);
+}
+
+void LilyGo_AMOLED::disp_wakeup()
 {
     lcd_cmd_t t = {0x11, {0x00}, 1};// Sleep Out
     writeCommand(t.addr, t.param, t.len);

src/LilyGo_AMOLED.h

@@ -366,6 +366,11 @@ class LilyGo_AMOLED:
     uint16_t  width();
     uint16_t  height();
 
+    // Disable touch, just return the touch press touch point Set to 0, does not actually disable touch
+    // https://github.com/Xinyuan-LilyGO/LilyGo-AMOLED-Series/issues/70
+    void disableTouch();
+    void enableTouch();
+
     // override
     uint8_t getPoint(int16_t *x_array, int16_t *y_array, uint8_t get_point = 1) override;
     bool isPressed() override;
@@ -388,7 +393,9 @@ class LilyGo_AMOLED:
     uint8_t getBoardID();
 
     void sleep(bool touchpad_sleep_enable = false);
-    void wakeup();
+
+    void disp_sleep();
+    void disp_wakeup();
     bool hasTouch();
     bool hasOTG();
 
@@ -421,6 +428,8 @@ class LilyGo_AMOLED:
 
     bool  _hasRTC;
 
+    bool _disableTouch;
+
     SPIClass *spiDev;
 };