ajout de hardware

Author: paxo-rch

lib/graphics/src/graphics.cpp

@@ -123,7 +123,7 @@ void graphics::SDLInit(void (*appMain)())
 // You should only use this function with a "Canvas" (Surface that is the size of the screen)
 void graphics::showSurface(const Surface* surface, int x, int y)
 {
-    if (x != 0 || y != 0)
+    /*if (x != 0 || y != 0)
     {
         std::cerr << "---------------------------------------------------------------------------------------------------------------------" << std::endl;
         std::cerr << "                                                 Warning !                                                           " << std::endl;
@@ -133,7 +133,7 @@ void graphics::showSurface(const Surface* surface, int x, int y)
         std::cerr << ">>> Please push to a 'graphics::Surface' before pushing to the screen.                                            <<<" << std::endl;
         std::cerr << ">>> By using a 'graphics::Surface' before pusing to the screen, you are also enabling double buffering rendering. <<<" << std::endl;
         std::cerr << "---------------------------------------------------------------------------------------------------------------------" << std::endl;
-    }
+    }*/
 
     lgfx::LGFX_Sprite sprite = surface->m_sprite; // we are friends !
 
@@ -151,9 +151,9 @@ void graphics::getTouchPos(int16_t* x, int16_t* y)
     int16_t ty;
 
     lcd->getTouch(&tx, &ty);
-    ty = ty * 480 / 700;
-
-    std::cout << tx << " " << ty << std::endl;
+    #ifdef ESP_PLATFORM // with capacitive touch?
+        ty = ty * 480 / 700;
+    #endif
 
     if (tx <= 0 || ty <= 0 || tx > graphics::getScreenWidth() || ty > graphics::getScreenHeight())
     {

lib/gui/src/ElementBase.cpp

@@ -133,8 +133,8 @@ bool gui::ElementBase::update()
     // check if the finger is currently on the widget
     if (touchX != -1 && touchY != -1)
     {
-        if (getAbsoluteX() < touchX && touchX < getAbsoluteX() + getWidth() && // l'objet est touché
-            getAbsoluteY() < touchY && touchY < getAbsoluteY() + getHeight())
+        if (getAbsoluteX()-10 < touchX && touchX < getAbsoluteX() + getWidth() +10 && // l'objet est touché
+            getAbsoluteY()-10 < touchY && touchY < getAbsoluteY() + getHeight() +10)
         {
             if (m_widgetPressed == nullptr && m_pressedState == PressedState::NOT_PRESSED) // l'objet est touché pour la première fois
             {
@@ -165,6 +165,12 @@ bool gui::ElementBase::update()
             return true;
         }
     }
+    else
+    {
+        originTouchX = -1;
+        originTouchY = -1;
+    }
+
     if (touchX == -1 && touchY == -1 && m_widgetPressed == this && m_pressedState != PressedState::RELEASED)
     {
         if (m_pressedState == PressedState::PRESSED)

lib/hardware/gpio.hpp

@@ -1,3 +1,4 @@
 #define PIN_SD_CS 4
 #define PIN_HOME_BUTTON -1
+#define PIN_SCREEN_POWER 14
 /* ... */

lib/hardware/hardware.cpp

@@ -0,0 +1,25 @@
+#include "hardware.hpp"
+#include "gpio.hpp"
+
+#ifdef ESP_PLATFORM
+    #include <Arduino.h>
+#endif
+
+void hardware::init()
+{
+    #ifdef ESP_PLATFORM
+
+    psramInit();
+    pinMode(PIN_SCREEN_POWER, OUTPUT);
+
+    #endif
+}
+
+void hardware::setScreenPower(bool power)
+{
+    #ifdef ESP_PLATFORM
+
+    digitalWrite(PIN_SCREEN_POWER, power);
+
+    #endif
+}

lib/hardware/hardware.hpp

@@ -0,0 +1,11 @@
+#ifndef HARDWARE_HPP
+#define HARDWARE_HPP
+
+namespace hardware
+{
+    void init();
+
+    void setScreenPower(bool power);
+};
+
+#endif

src/main.cpp

@@ -8,6 +8,7 @@
 #endif
 
 #include "graphics.hpp"
+#include "hardware.hpp"
 #include "gui.hpp"
 #include "path.hpp"
 #include "filestream.hpp"
@@ -19,10 +20,9 @@ void loop(){}
 
 void setup()
 {
-    psramInit();
-    pinMode(14, OUTPUT);
-    digitalWrite(14, 1);
-
+    hardware::init();
+    hardware::setScreenPower(true);
+    
     graphics::init();
 
     Window win;
@@ -85,7 +85,7 @@ void setup()
 // Native main
 int main(int argc, char **argv)
 {
-    graphics::SDLInit(app_main);
+    graphics::SDLInit(setup);
 }
 
 #endif