ps2pico-2.2

Author: No0ne

.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
-/build/
+/build/
+/.idea/

CMakeLists.txt

@@ -39,7 +39,7 @@ pico_generate_pio_header(ps2pico ${CMAKE_CURRENT_LIST_DIR}/src/xtphy.pio)
 pico_generate_pio_header(ps2pico ${CMAKE_CURRENT_LIST_DIR}/src/xtalt.pio)
 
 pico_set_program_name(ps2pico "ps2pico")
-pico_set_program_version(ps2pico "2.1")
+pico_set_program_version(ps2pico "2.2")
 
 pico_enable_stdio_uart(ps2pico 1)
 pico_enable_stdio_usb(ps2pico 0)

src/atphy.c

@@ -51,6 +51,7 @@ u16 const delays[] = { 250, 500, 750, 1000 };
 queue_t qbytes;
 queue_t qpacks;
 
+u8 locked = 0;
 u8 busy = 0;
 u8 sent = 0;
 u8 last_tx = 0;
@@ -251,11 +252,13 @@ void kb_task() {
   }
 
   if(pio_interrupt_get(pio0, 1)) {
-    sent--;
+    if(sent > 0) sent--;
     pio_interrupt_clear(pio0, 1);
   }
+
+  if(locked && !busy) locked--;
 
-  if(!queue_is_empty(&qpacks) && pio_sm_is_tx_fifo_empty(pio0, 0) && !busy) {
+  if(!queue_is_empty(&qpacks) && !locked && !busy) {
     if(queue_try_peek(&qpacks, &pack)) {
       if(sent == pack[0]) {
         sent = 0;
@@ -264,6 +267,7 @@ void kb_task() {
         sent++;
         last_tx = pack[sent];
         busy |= 2;
+        locked = 160;
         pio_sm_put(pio0, 0, at_frame(last_tx));
       }
     }
@@ -301,5 +305,5 @@ void kb_task() {
 void kb_init() {
   atphy_program_init(pio0, 0, pio_add_program(pio0, &atphy_program));
   queue_init(&qbytes, sizeof(u8), 9);
-  queue_init(&qpacks, sizeof(u8) * 9, 16);
+  queue_init(&qpacks, sizeof(u8) * 18, 16);
 }

src/ps2pico.c

@@ -24,7 +24,7 @@
  */
 
 #include "ps2pico.h"
-#include "bsp/board.h"
+#include "bsp/board_api.h"
 #include "tusb.h"
 
 u8 kb_addr = 0;