Merge pull request #24 from strange-v/dev

Disable touch and proper WebSocket reconnect

Author: strange-v

README.md

@@ -35,8 +35,6 @@ esp32:
     components:
       - name: "espressif/esp_websocket_client"
         ref: 1.5.0
-      - name: "espressif/esp-dsp"
-        ref: 1.7.0
       - name: "bitbank2/jpegdec"
         source: https://github.com/strange-v/jpegdec-esphome
 

components/remote_webview/remote_webview.cpp

@@ -19,6 +19,12 @@ namespace remote_webview {
 static const char *const TAG = "Remote_WebView";
 RemoteWebView *RemoteWebView::self_ = nullptr;
 
+static inline void websocket_force_reconnect(esp_websocket_client_handle_t client) {
+  if (!client) return;
+  esp_websocket_client_stop(client);
+  esp_websocket_client_start(client);
+}
+
 void RemoteWebView::setup() {
   self_ = this;
 
@@ -156,7 +162,12 @@ void RemoteWebView::ws_task_tramp_(void *arg) {
   ESP_ERROR_CHECK(esp_websocket_client_start(client));
 
   for (;;) {
-    vTaskDelay(pdMS_TO_TICKS(1000));
+    vTaskDelay(pdMS_TO_TICKS(5000));
+
+    if (!esp_websocket_client_is_connected(client)) {
+      websocket_force_reconnect(client);
+      continue;
+    }
 
     if (self && self->ws_client_ && esp_websocket_client_is_connected(self->ws_client_)) {
       const uint64_t now = esp_timer_get_time();
@@ -195,8 +206,19 @@ void RemoteWebView::ws_event_handler_(void *handler_arg, esp_event_base_t, int32
       ESP_LOGI(TAG, "[ws] disconnected");
       if (self_) self_->last_keepalive_us_ = 0; 
       reasm_reset_(*r);
+      websocket_force_reconnect(e->client);
       break;
 
+#ifdef WEBSOCKET_EVENT_CLOSED
+    case WEBSOCKET_EVENT_CLOSED:
+      if (self_) self_->ws_client_ = nullptr;
+      ESP_LOGI(TAG, "[ws] closed");
+      if (self_) self_->last_keepalive_us_ = 0; 
+      reasm_reset_(*r);
+      websocket_force_reconnect(e->client);
+      break;
+#endif
+
     case WEBSOCKET_EVENT_DATA: {
       if (!self_) break;
 
@@ -444,6 +466,9 @@ int RemoteWebView::jpeg_draw_cb_(JPEGDRAW *p) {
 }
 
 bool RemoteWebView::ws_send_touch_event_(proto::TouchType type, int x, int y, uint8_t pid) {
+  if (touch_disabled_)
+    return false;
+
   if (!ws_client_ || !ws_send_mtx_ || !esp_websocket_client_is_connected(ws_client_))
     return false;
 
@@ -462,11 +487,6 @@ bool RemoteWebView::ws_send_touch_event_(proto::TouchType type, int x, int y, ui
   return r == (int)n;
 }
 
-void RemoteWebViewTouchListener::touch(touchscreen::TouchPoint tp) {
-  if (!parent_) return;
-  parent_->ws_send_touch_event_(proto::TouchType::Down, tp.x, tp.y, tp.id);
-}
-
 bool RemoteWebView::ws_send_open_url_(const char *url, uint16_t flags) {
   if (!ws_client_ || !ws_send_mtx_ ||  !url || !esp_websocket_client_is_connected(ws_client_))
     return false;
@@ -510,10 +530,9 @@ bool RemoteWebView::ws_send_keepalive_() {
   return r == (int)n;
 }
 
-
-
 void RemoteWebViewTouchListener::update(const touchscreen::TouchPoints_t &pts) {
   if (!parent_) return;
+
   const uint64_t now = esp_timer_get_time();
   for (auto &p : pts) {
     switch (p.state) {
@@ -542,6 +561,17 @@ void RemoteWebViewTouchListener::release() {
   parent_->ws_send_touch_event_(proto::TouchType::Up, 0, 0, 0);
 }
 
+void RemoteWebViewTouchListener::touch(touchscreen::TouchPoint tp) {
+  if (!parent_) return;
+  
+  parent_->ws_send_touch_event_(proto::TouchType::Down, tp.x, tp.y, tp.id);
+}
+
+void RemoteWebView::disable_touch(bool disable) {
+  touch_disabled_ = disable;
+  ESP_LOGD(TAG, "touch %s", disable ? "disabled" : "enabled");
+}
+
 void RemoteWebView::set_server(const std::string &s) {
   auto pos = s.rfind(':');
   if (pos == std::string::npos || pos == s.size() - 1) {

components/remote_webview/remote_webview.h

@@ -45,6 +45,7 @@ class RemoteWebView : public Component {
   void set_max_bytes_per_msg(int v) { max_bytes_per_msg_ = v; }
   void set_big_endian(bool v) { rgb565_big_endian_ = v; }
   void set_rotation(int v) { rotation_ = v; }
+  void disable_touch(bool disable);
   bool open_url(const std::string &s);
 
   void setup() override;
@@ -87,6 +88,7 @@ class RemoteWebView : public Component {
   int max_bytes_per_msg_{-1};
   bool rgb565_big_endian_{true};
   int rotation_{0};
+  bool touch_disabled_{false};
 
 #if REMOTE_WEBVIEW_HW_JPEG
   jpeg_decoder_handle_t hw_dec_{nullptr};

examples/inactivity.yaml

@@ -0,0 +1,179 @@
+esphome:
+  name: esp32-4848s040-t1
+  friendly_name: ESP32-4848S040-T1
+  platformio_options:
+    board_build.flash_mode: dio
+  on_boot:
+    priority: -100
+    then:
+      - script.execute: inactivity_timer
+
+esp32:
+  board: esp32-s3-devkitc-1
+  variant: esp32s3
+  flash_size: 16MB
+  framework:
+    type: esp-idf
+    sdkconfig_options:
+      COMPILER_OPTIMIZATION_SIZE: y
+      CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240: "y"
+      CONFIG_ESP32S3_DATA_CACHE_64KB: "y"
+      CONFIG_ESP32S3_DATA_CACHE_LINE_64B: "y"
+      CONFIG_SPIRAM_FETCH_INSTRUCTIONS: y
+      CONFIG_SPIRAM_RODATA: y
+    components:
+      - name: "espressif/esp_websocket_client"
+        ref: 1.5.0
+      - name: "bitbank2/jpegdec"
+        source: https://github.com/strange-v/jpegdec-esphome
+psram:
+  mode: octal
+  speed: 80MHz
+
+external_components:
+  - source: github://strange-v/RemoteWebViewClient@main
+    refresh: 0s
+    components: [ remote_webview ]
+
+logger:
+  hardware_uart: UART0
+
+api:
+  encryption:
+    key: "XXXXXXXXXXXXXXXXXXX"
+
+ota:
+  - platform: esphome
+    password: "XXXXXXXXXXXXXXXXXXX"
+
+wifi:
+  ssid: !secret wifi_ssid
+  password: !secret wifi_password
+
+  ap:
+    ssid: "Esp32-4848S040-T1"
+    password: "XXXXXXXXXXXXXXXXXXX"
+
+captive_portal:
+    
+spi:
+  clk_pin: GPIO48
+  mosi_pin: GPIO47
+
+i2c:
+  - id: bus_a
+    sda: GPIO19
+    scl: GPIO45
+
+display:
+  - platform: st7701s
+    show_test_card: False
+    update_interval: never
+    auto_clear_enabled: False
+    spi_mode: MODE3
+    data_rate: 2MHz
+    color_order: RGB
+    invert_colors: False
+    dimensions:
+      width: 480
+      height: 480
+    cs_pin: 39
+    de_pin: 18
+    hsync_pin: 16
+    vsync_pin: 17
+    pclk_pin: 21
+    pclk_frequency: 12MHz
+    pclk_inverted: False
+    hsync_pulse_width: 8
+    hsync_front_porch: 10
+    hsync_back_porch: 20
+    vsync_pulse_width: 8
+    vsync_front_porch: 10
+    vsync_back_porch: 10
+    init_sequence:
+      - 1
+      - [0xFF, 0x77, 0x01, 0x00, 0x00, 0x10]
+      - [0xCD, 0x00]
+    data_pins:
+      red:
+        - GPIO11
+        - GPIO12
+        - GPIO13
+        - GPIO14
+        - GPIO0
+      green:
+        - GPIO8
+        - GPIO20
+        - GPIO3
+        - GPIO46
+        - GPIO9
+        - GPIO10
+      blue:
+        - GPIO4
+        - GPIO5
+        - GPIO6
+        - GPIO7
+        - GPIO15
+
+touchscreen:
+  platform: gt911
+  transform:
+    mirror_x: false
+    mirror_y: false
+  on_touch:
+    then:
+      - script.execute: inactivity_timer
+
+output:
+  - platform: ledc
+    pin: GPIO38
+    id: backlight_pwm
+
+light:
+  - platform: monochromatic
+    output: backlight_pwm
+    name: "Display Backlight"
+    id: back_light
+    restore_mode: ALWAYS_ON
+
+remote_webview:
+  id: rwv
+  server: 172.16.0.252:8081
+  url: http://172.16.0.252:8123/dashboard-mobile/0
+  full_frame_tile_count: 1
+  max_bytes_per_msg: 61440
+  jpeg_quality: 85
+
+text:
+  - platform: template
+    id: rwv_url
+    name: "URL"
+    optimistic: true
+    restore_value: false
+    mode: TEXT
+    min_length: 1
+    set_action:
+      - lambda: |-
+          if (!id(rwv).open_url(std::string(x.c_str()))) {
+            id(rwv).set_url(std::string(x.c_str()));
+            ESP_LOGI("remote_webview", "URL queued (not connected): %s", x.c_str());
+          }
+
+script:
+  - id: inactivity_timer
+    mode: restart
+    then:
+      - if:
+          condition:
+            light.is_off: back_light
+          then:
+            - light.turn_on:
+                id: back_light
+            - delay: 0.5s
+            - lambda: |-
+                id(rwv).disable_touch(false);
+      - delay: 15s
+      - light.turn_off:
+          id: back_light
+      - lambda: |-
+          id(rwv).disable_touch(true);