Fixed BUG: Any button that pops up will cause all buttons to pop up

ChnMasterOG · Mar 6, 2024 · a42b726 · a42b726
1 parent b055eca
commit a42b726
Show file tree

Hide file tree

Showing 8 changed files with 94,130 additions and 94,113 deletions.
diff --git a/README-EN.md b/README-EN.md
@@ -190,3 +190,5 @@ You can submit you code [here](https://github.com/ChnMasterOG/tp78_v2/issues). T
         1. Fixed the problem that some hardware OLEDs do not works when powered on.
 
         2. Add release firmwares with start address 0x0.
+
+        3. Fixed BUG: Any button that pops up will cause all buttons to pop up.
diff --git a/README.md b/README.md
@@ -192,3 +192,5 @@ C(mounriver_project - wch软件工程) --> J(VLD_CH582M - 主控板测试工程)
         1. 修复部分硬件OLED上电不亮的问题
 
         2. Relase版本增加起始0x0地址的固件版本
+
+        3. 修复多按键按下弹起任意一个按键导致所有按键被弹起的问题
diff --git a/mounriver_project/KEYBOARD_CH582M/HAL/KEYBOARD.c b/mounriver_project/KEYBOARD_CH582M/HAL/KEYBOARD.c
@@ -708,8 +708,9 @@ void KEYBOARD_Detection( void )
  KeyboardDat->data[key_idx] != Extra_CustomKey[current_row][current_colum])) { // 弹起按键2层都清除
  KeyboardDat->data[p] = KeyboardDat->data[key_idx];
  p++;
+ } else {
+ KeyboardDat->data[key_idx] = KEY_None;
  }
- KeyboardDat->data[key_idx] = KEY_None;
  }
  }
  KEYBOARD_data_index = p;

diff --git a/mounriver_project/KEYBOARD_CH582M/obj/BLE_CH582M.bin b/mounriver_project/KEYBOARD_CH582M/obj/BLE_CH582M.bin
diff --git a/mounriver_project/KEYBOARD_CH582M/obj/BLE_CH582M.elf b/mounriver_project/KEYBOARD_CH582M/obj/BLE_CH582M.elf
diff --git a/mounriver_project/KEYBOARD_CH582M/obj/BLE_CH582M.hex b/mounriver_project/KEYBOARD_CH582M/obj/BLE_CH582M.hex
diff --git a/mounriver_project/KEYBOARD_CH582M/obj/BLE_CH582M.lst b/mounriver_project/KEYBOARD_CH582M/obj/BLE_CH582M.lst
diff --git a/mounriver_project/KEYBOARD_CH582M/obj/BLE_CH582M.map b/mounriver_project/KEYBOARD_CH582M/obj/BLE_CH582M.map