From 51886eb39cf3f867a0202c9dc7ac2c8fe7ecf8f1 Mon Sep 17 00:00:00 2001
From: whowechina <whowechina@gmail.com>
Date: Sat, 9 Mar 2024 18:46:21 +0800
Subject: [PATCH] Fix air tower switch order

---
 firmware/src/air.c        | 5 ++---
 firmware/src/board_defs.h | 2 +-
 firmware/src/main.c       | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/firmware/src/air.c b/firmware/src/air.c
index 7d7009f..56fe3be 100644
--- a/firmware/src/air.c
+++ b/firmware/src/air.c
@@ -64,10 +64,9 @@ static inline uint8_t air_bits(int dist)
 {
     int offset= chu_cfg->tof.offset * 10;
     int pitch = chu_cfg->tof.pitch * 10;
-    int bit1 = (dist - offset) / pitch;
-    int bit2 = (dist - offset + pitch / 2) / pitch;
+    int bit = (dist - offset) / pitch;
     
-    return ((1 << bit1) | (1 << bit2)) & 0x3f;
+    return (1 << bit) & 0x3f;
 }
 
 static inline bool dist_valid(int dist)
diff --git a/firmware/src/board_defs.h b/firmware/src/board_defs.h
index 8a37e94..2af068f 100644
--- a/firmware/src/board_defs.h
+++ b/firmware/src/board_defs.h
@@ -8,7 +8,7 @@
 #define I2C_PORT i2c1
 #define I2C_SDA 26
 #define I2C_SCL 27
-#define I2C_FREQ 1333*1000
+#define I2C_FREQ 1367*1000
 
 #define TOF_MUX_LIST { 3, 4, 5, 2, 1, 0, 11, 12, 13, 10, 9, 8}
 
diff --git a/firmware/src/main.c b/firmware/src/main.c
index 279054b..806225e 100644
--- a/firmware/src/main.c
+++ b/firmware/src/main.c
@@ -83,12 +83,12 @@ static void gen_joy_report()
     last_coin_pressed = coin_pressed;
 
     uint16_t air[6][2] = {
-        { 0, 1 << 13 },
         { 1 << 13, 0 },
-        { 0, 1 << 12 },
+        { 0, 1 << 13 },
         { 1 << 12, 0 },
-        { 0, 1 << 11 },
+        { 0, 1 << 12 },
         { 1 << 11, 0 },
+        { 0, 1 << 11 },
     };
 
     uint8_t airkey = air_bitmap();