fix: box display error

Author: L-jasmine

components/hal_driver/lcd.c

@@ -125,8 +125,8 @@ void lcd_color_fill(uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey, uint16_t
     }
 
     /* 计算填充区域的宽度 */
-    uint16_t width = ex - sx + 1;
-    uint16_t height = ey - sy + 1;
+    uint16_t width = ex - sx;
+    uint16_t height = ey - sy;
     uint32_t buf_index = 0;
 
     uint16_t *buffer = heap_caps_malloc(width * sizeof(uint16_t), MALLOC_CAP_INTERNAL);

src/app.rs

@@ -65,7 +65,7 @@ async fn select_evt(
 
     tokio::select! {
         _ = timeout_f => {
-            log::info!("Event select timeout");
+            // log::info!("Event select timeout");
             timeout_event
         }
         Some(evt) = evt_rx.recv() => {
@@ -154,7 +154,7 @@ impl DownloadMetrics {
 
 const SPEED_LIMIT: f64 = 1.0;
 const INTERNAL_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(1);
-const NORMAL_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(60);
+const NORMAL_TIMEOUT: std::time::Duration = std::time::Duration::from_millis(500);
 
 pub async fn main_work<'d>(
     mut server: Server,
@@ -196,9 +196,16 @@ pub async fn main_work<'d>(
     let mut init_hello = false;
     let mut allow_interrupt = false;
     let mut timeout = NORMAL_TIMEOUT;
+    let mut idle_counter = 0u32;
 
     while let Some(evt) = select_evt(&mut evt_rx, &mut server, &notify, wait_notify, timeout).await
     {
+        if let Event::Event(Event::IDLE) = &evt {
+            idle_counter += 1;
+        } else {
+            idle_counter = 0;
+        }
+
         match evt {
             Event::Event(Event::GAIA | Event::K0) => {
                 log::info!("Received event: k0");
@@ -261,11 +268,18 @@ pub async fn main_work<'d>(
             }
             Event::Event(Event::YES | Event::K1) => {}
             Event::Event(Event::IDLE) => {
-                if state == State::Listening {
-                    state = State::Idle;
-                    gui.state = "Idle".to_string();
-                    gui.display_flush().unwrap();
-                    server.close().await?;
+                if NORMAL_TIMEOUT * idle_counter >= std::time::Duration::from_secs(300) {
+                    idle_counter = 0;
+                    log::info!("Idle for 5 minutes, going to Idle state");
+                    if state == State::Listening {
+                        state = State::Idle;
+                        gui.state = "Idle".to_string();
+                        gui.display_flush().unwrap();
+                        server.close().await?;
+                    }
+                } else {
+                    #[cfg(feature = "box")]
+                    let _ = gui.display_flush();
                 }
             }
             Event::Event(Event::NOTIFY) => {

src/audio.rs

@@ -26,12 +26,12 @@ unsafe fn afe_init() -> (
     afe_config.vad_min_noise_ms = 500;
     // afe_config.vad_min_speech_ms = 300;
     afe_config.vad_mode = esp_sr::vad_mode_t_VAD_MODE_3;
-    afe_config.agc_init = true;
+    afe_config.agc_init = false;
     // afe_config.afe_linear_gain = 2.0;
     afe_config.aec_init = true;
     afe_config.aec_mode = esp_sr::aec_mode_t_AEC_MODE_VOIP_HIGH_PERF;
     // afe_config.aec_filter_length = 5;
-    afe_config.ns_init = true;
+    afe_config.ns_init = false;
     afe_config.wakenet_init = false;
     afe_config.memory_alloc_mode = esp_sr::afe_memory_alloc_mode_t_AFE_MEMORY_ALLOC_MORE_PSRAM;
 

src/boards/atom_box.rs

@@ -143,20 +143,15 @@ pub fn lcd_init(
 }
 
 pub fn flush_display(color_data: &[u8], x_start: i32, y_start: i32, x_end: i32, y_end: i32) -> i32 {
-    let panel = unsafe { std::mem::transmute(esp_idf_svc::sys::hal_driver::panel_handle) };
     unsafe {
-        let e = esp_idf_svc::sys::esp_lcd_panel_draw_bitmap(
-            panel,
-            x_start,
-            y_start,
-            x_end,
-            y_end,
-            color_data.as_ptr().cast(),
+        esp_idf_svc::sys::hal_driver::lcd_color_fill(
+            x_start as u16,
+            y_start as u16,
+            x_end as u16,
+            y_end as u16,
+            color_data.as_ptr() as _,
         );
-        if e != 0 {
-            log::warn!("flush_display error: {}", e);
-        }
-        e
+        0
     }
 }