@@ -22,31 +22,31 @@ static uint16_t magnet_threshold = MAGNET_THRESHOLD_DEFAULT;
2222/* matrix state(1:on, 0:off) */
2323static matrix_row_t matrix [MATRIX_ROWS ];
2424
25- // NRF_SAADC_INPUT_AIN0 has been used to detect battery voltage
26- #define ADC_COL_PIN3 NRF_SAADC_INPUT_AIN1
27- #define ADC_COL_PIN4 NRF_SAADC_INPUT_AIN2
28- #define ADC_COL_PIN5 NRF_SAADC_INPUT_AIN3
29- #define ADC_COL_PIN28 NRF_SAADC_INPUT_AIN4
30- #define ADC_COL_PIN29 NRF_SAADC_INPUT_AIN5
31- #define ADC_COL_PIN30 NRF_SAADC_INPUT_AIN6
32- #define ADC_COL_PIN31 NRF_SAADC_INPUT_AIN7
33- #define ADC_COL_PIN (NUM ) ADC_COL_PIN ##NUM
25+ // NRF_SAADC_INPUT_AIN0 (P0.02) has been used to detect battery voltage
26+ #define ADC_PIN_NAME_3 NRF_SAADC_INPUT_AIN1
27+ #define ADC_PIN_NAME_4 NRF_SAADC_INPUT_AIN2
28+ #define ADC_PIN_NAME_5 NRF_SAADC_INPUT_AIN3
29+ #define ADC_PIN_NAME_28 NRF_SAADC_INPUT_AIN4
30+ #define ADC_PIN_NAME_29 NRF_SAADC_INPUT_AIN5
31+ #define ADC_PIN_NAME_30 NRF_SAADC_INPUT_AIN6
32+ #define ADC_PIN_NAME_31 NRF_SAADC_INPUT_AIN7
33+ #define ADC_PIN_NAME (NUM ) ADC_PIN_NAME_ ##NUM
3434
3535// TODO pin_channel->period 多少合适? 10以内?
3636void init_adc_col_pin (uint8_t pin ) {
37- static nrf_saadc_channel_config_t channel_config = {
37+ nrf_saadc_channel_config_t channel_config = {
3838 .resistor_p = NRF_SAADC_RESISTOR_DISABLED ,
3939 .resistor_n = NRF_SAADC_RESISTOR_DISABLED ,
4040 .gain = NRF_SAADC_GAIN1_2 ,
4141 .reference = NRF_SAADC_REFERENCE_INTERNAL ,
4242 .acq_time = NRF_SAADC_ACQTIME_10US ,
4343 .mode = NRF_SAADC_MODE_SINGLE_ENDED ,
4444 .burst = NRF_SAADC_BURST_DISABLED ,
45- .pin_p = (nrf_saadc_input_t )(ADC_COL_PIN (pin )),
45+ .pin_p = (nrf_saadc_input_t )(ADC_PIN_NAME (pin )),
4646 .pin_n = NRF_SAADC_INPUT_DISABLED
4747 };
4848
49- static struct adc_channel_config pin_channel = {
49+ struct adc_channel_config pin_channel = {
5050 .adc_start = 0 ,
5151 .adc_finish = 0 ,
5252 .period = DEBOUNCE ,
0 commit comments