From 7031f346fb09d32ebd4b0a88356568fb64ec7b06 Mon Sep 17 00:00:00 2001
From: whowechina <whowechina@gmail.com>
Date: Fri, 17 Apr 2026 10:42:25 +0800
Subject: [PATCH] Minor style change

---
 firmware/src/main.c   | 9 ++++++---
 firmware/src/ps4key.c | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/firmware/src/main.c b/firmware/src/main.c
index 80e015f..8179ae8 100644
--- a/firmware/src/main.c
+++ b/firmware/src/main.c
@@ -54,7 +54,8 @@ struct __attribute__((packed)) {
     uint8_t hat : 4;
     uint8_t buttons_0_3 : 4;
     uint8_t buttons_11_4;
-    uint8_t buttons_counter;
+    uint8_t buttons_12_15 : 4;
+    uint8_t counter : 4;
     uint8_t trigger_l;
     uint8_t trigger_r;
     uint8_t vendor[54];
@@ -156,16 +157,18 @@ static void gen_ns_report()
 static void gen_ps4_report()
 {
     uint16_t ps4_buttons = mapped_buttons;
+
     hid_ps4.left_y = 0x80;
     hid_ps4.right_y = 0x80;
     hid_ps4.buttons_0_3 = ps4_buttons;
     hid_ps4.buttons_11_4 = ps4_buttons >> 4;
-    hid_ps4.buttons_counter = ps4_buttons >> 12;
+    hid_ps4.buttons_12_15 = (ps4_buttons >> 12) & 0x0F;
+    hid_ps4.counter = 0;
     hid_ps4.trigger_l = 0;
     hid_ps4.trigger_r = 0;
 
     uint8_t side_buttons = (raw_buttons >> 5) & 0x03;
-    // HAT: 0-UP, 4-DOWN, 0x0F-CENTER (aligned with GP2040 PS4 mapping)
+    // HAT: 0-UP, 4-DOWN, 0x0F-CENTER
     hid_ps4.hat = side_buttons == 0x01 ? 0 : (side_buttons == 0x02 ? 4 : 0x0F);
 
     gesture_process(touch_mask_raw(), &hid_ps4.left_x, &hid_ps4.right_x);
diff --git a/firmware/src/ps4key.c b/firmware/src/ps4key.c
index d207e98..a4c3ae3 100644
--- a/firmware/src/ps4key.c
+++ b/firmware/src/ps4key.c
@@ -605,7 +605,7 @@ static void f0_set_nonce(uint8_t report_id, uint8_t const *buffer, uint16_t bufs
     if (frame.nonce_page == 4) {
         memcpy(&auth_ctx.auth_buffer[frame.nonce_page * 56], frame.data, 32);
         auth_ctx.request_sign = true;
-        savedata_logf("ps4 nonce complete id=%u queued=1", frame.nonce_id);
+        savedata_logf("ps4 nonce complete id=%u", frame.nonce_id);
     } else {
         memcpy(&auth_ctx.auth_buffer[frame.nonce_page * 56], frame.data, 56);
     }