Refactor mcu_pwr.c

Taken from @adi4086
jincao1 · Mar 4, 2024 · 4c44f8d · 4c44f8d
1 parent 778fb02
commit 4c44f8d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 69 deletions.
diff --git a/keyboards/nuphy/air75_v2/ansi/mcu_pwr.c b/keyboards/nuphy/air75_v2/ansi/mcu_pwr.c
@@ -18,6 +18,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "mcu_stm32f0xx.h"
 #include "mcu_pwr.h"
 
+// from @adi4086
+static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+
 //------------------------------------------------
 // 外部变量
 extern DEV_INFO_STRUCT dev_info;
@@ -97,48 +101,15 @@ void enter_deep_sleep(void) {
     // 关闭定时器
     if (tim6_enabled) TIM_Cmd(TIM6, DISABLE);
 
-    //------------------------ 配置按键唤醒
-    gpio_set_pin_output(KCOL_0);
-    gpio_write_pin_high(KCOL_0);
-    gpio_set_pin_output(KCOL_1);
-    gpio_write_pin_high(KCOL_1);
-    gpio_set_pin_output(KCOL_2);
-    gpio_write_pin_high(KCOL_2);
-    gpio_set_pin_output(KCOL_3);
-    gpio_write_pin_high(KCOL_3);
-    gpio_set_pin_output(KCOL_4);
-    gpio_write_pin_high(KCOL_4);
-    gpio_set_pin_output(KCOL_5);
-    gpio_write_pin_high(KCOL_5);
-    gpio_set_pin_output(KCOL_6);
-    gpio_write_pin_high(KCOL_6);
-    gpio_set_pin_output(KCOL_7);
-    gpio_write_pin_high(KCOL_7);
-    gpio_set_pin_output(KCOL_8);
-    gpio_write_pin_high(KCOL_8);
-    gpio_set_pin_output(KCOL_9);
-    gpio_write_pin_high(KCOL_9);
-    gpio_set_pin_output(KCOL_10);
-    gpio_write_pin_high(KCOL_10);
-    gpio_set_pin_output(KCOL_11);
-    gpio_write_pin_high(KCOL_11);
-    gpio_set_pin_output(KCOL_12);
-    gpio_write_pin_high(KCOL_12);
-    gpio_set_pin_output(KCOL_13);
-    gpio_write_pin_high(KCOL_13);
-    gpio_set_pin_output(KCOL_14);
-    gpio_write_pin_high(KCOL_14);
-    gpio_set_pin_output(KCOL_15);
-    gpio_write_pin_high(KCOL_15);
-    gpio_set_pin_output(KCOL_16);
-    gpio_write_pin_high(KCOL_16);
-
-    gpio_set_pin_input_low(KROW_0);
-    gpio_set_pin_input_low(KROW_1);
-    gpio_set_pin_input_low(KROW_2);
-    gpio_set_pin_input_low(KROW_3);
-    gpio_set_pin_input_low(KROW_4);
-    gpio_set_pin_input_low(KROW_5);
+    // from @adi4086
+    for (int i = 0; i < ARRAY_SIZE(col_pins); i++) {
+        gpio_set_pin_output(col_pins[i]);
+        gpio_write_pin_high(col_pins[i]);
+    }
+
+    for (int i = 0; i < ARRAY_SIZE(row_pins); i++) {
+        gpio_set_pin_input_low(row_pins[i]);
+    }
 
     // Configure interrupt source - all 5 rows of the keyboard.
     SYSCFG_EXTILineConfig(EXTI_PORT_R0, EXTI_PIN_R0);

diff --git a/keyboards/nuphy/air75_v2/ansi/mcu_pwr.h b/keyboards/nuphy/air75_v2/ansi/mcu_pwr.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// key matrix pins
-#define KROW_0                   C14
-#define KROW_1                   C15
-#define KROW_2                   A0
-#define KROW_3                   A1
-#define KROW_4                   A2
-#define KROW_5                   A3
-
 #define EXTI_PORT_R0             EXTI_PortSourceGPIOC
 #define EXTI_PORT_R1             EXTI_PortSourceGPIOC
 #define EXTI_PORT_R2             EXTI_PortSourceGPIOA
@@ -39,25 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EXTI_PIN_R4              2   // A2
 #define EXTI_PIN_R5              3   // A3
 
-//------------------------
-#define KCOL_0                   A4
-#define KCOL_1                   A5
-#define KCOL_2                   A6
-#define KCOL_3                   B9
-#define KCOL_4                   B0
-#define KCOL_5                   B1
-#define KCOL_6                   B10
-#define KCOL_7                   B11
-#define KCOL_8                   B12
-#define KCOL_9                   B13
-#define KCOL_10                  B14
-#define KCOL_11                  B15
-#define KCOL_12                  A8
-#define KCOL_13                  A9
-#define KCOL_14                  A10
-#define KCOL_15                  A15
-#define KCOL_16                  B3
-
 #define EXTI_PORT_C0             EXTI_PortSourceGPIOA  // A4
 #define EXTI_PORT_C1             EXTI_PortSourceGPIOA  // A5
 #define EXTI_PORT_C2             EXTI_PortSourceGPIOA  // A6