fix: delegate wait timeout

fix: new pcb rev lcd pins

Author: filipton

src/buttons.rs

@@ -409,7 +409,8 @@ async fn delegate_hold(
             drop(state_val);
 
             let resp =
-                crate::ws::send_tagged_request::<DelegateResponsePacket>(69420, packet).await;
+                crate::ws::send_tagged_request::<DelegateResponsePacket>(69420, packet, false)
+                    .await;
             log::info!("{:?}", resp);
 
             if let Ok(resp) = resp {

src/lcd.rs

@@ -46,10 +46,10 @@ pub async fn lcd_task(
         let bl_pin = lcd_shifter.get_pin_mut(1, true);
         let rs_pin = lcd_shifter.get_pin_mut(2, true);
         let en_pin = lcd_shifter.get_pin_mut(3, true);
-        let d4_pin = lcd_shifter.get_pin_mut(7, false);
-        let d5_pin = lcd_shifter.get_pin_mut(6, false);
-        let d6_pin = lcd_shifter.get_pin_mut(5, false);
-        let d7_pin = lcd_shifter.get_pin_mut(4, false);
+        let d4_pin = lcd_shifter.get_pin_mut(4, false);
+        let d5_pin = lcd_shifter.get_pin_mut(5, false);
+        let d6_pin = lcd_shifter.get_pin_mut(6, false);
+        let d7_pin = lcd_shifter.get_pin_mut(7, false);
         ag_lcd::LcdDisplay::new(rs_pin, en_pin, Delay)
             .with_display(ag_lcd::Display::On)
             .with_blink(ag_lcd::Blink::Off)

src/ws.rs

@@ -442,10 +442,14 @@ where
     _ = getrandom::getrandom(&mut tag_bytes);
     let tag = u64::from_be_bytes(tag_bytes);
 
-    send_tagged_request(tag, packet).await
+    send_tagged_request(tag, packet, true).await
 }
 
-pub async fn send_tagged_request<T>(tag: u64, packet: TimerPacketInner) -> Result<T, ApiError>
+pub async fn send_tagged_request<T>(
+    tag: u64,
+    packet: TimerPacketInner,
+    timeout: bool,
+) -> Result<T, ApiError>
 where
     T: FromPacket,
 {
@@ -455,13 +459,17 @@ where
     };
     send_packet(packet).await;
 
-    let packet = wait_for_tagged_response(tag)
-        .with_timeout(Duration::from_millis(5000))
-        .await
-        .map_err(|_| ApiError {
-            should_reset_time: false,
-            error: "Communication timeout!".to_string(),
-        })?;
+    let packet = if timeout {
+        wait_for_tagged_response(tag)
+            .with_timeout(Duration::from_millis(5000))
+            .await
+            .map_err(|_| ApiError {
+                should_reset_time: false,
+                error: "Communication timeout!".to_string(),
+            })?
+    } else {
+        wait_for_tagged_response(tag).await
+    };
 
     FromPacket::from_packet(packet)
 }