diff options
| author | QMK Bot <hello@qmk.fm> | 2020-03-17 01:02:01 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-03-17 01:02:01 +0000 |
| commit | ece14278efe5168ef20298984bff4b1d5eb43e4b (patch) | |
| tree | 6c89528762e06a1e7d34c7c16658d3abaa41a1d9 | |
| parent | 567bfc97ac4f5066e8a2302c46e3b375efe59792 (diff) | |
| download | qmk_firmware-ece14278efe5168ef20298984bff4b1d5eb43e4b.tar.gz qmk_firmware-ece14278efe5168ef20298984bff4b1d5eb43e4b.zip | |
format code according to conventions [skip ci]
| -rw-r--r-- | drivers/arm/analog.c | 2 | ||||
| -rw-r--r-- | drivers/arm/analog.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/arm/analog.c b/drivers/arm/analog.c index a7e6d2525..6f6db6401 100644 --- a/drivers/arm/analog.c +++ b/drivers/arm/analog.c | |||
| @@ -119,7 +119,7 @@ static ADCConversionGroup adcConversionGroup = { | |||
| 119 | .smpr = ADC_SAMPLING_RATE, | 119 | .smpr = ADC_SAMPLING_RATE, |
| 120 | #elif defined(USE_ADCV2) | 120 | #elif defined(USE_ADCV2) |
| 121 | # if !defined(STM32F1XX) | 121 | # if !defined(STM32F1XX) |
| 122 | .cr2 = ADC_CR2_SWSTART, // F103 seem very unhappy with, F401 seems very unhappy without... | 122 | .cr2 = ADC_CR2_SWSTART, // F103 seem very unhappy with, F401 seems very unhappy without... |
| 123 | # endif | 123 | # endif |
| 124 | .smpr2 = ADC_SMPR2_SMP_AN0(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN1(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN2(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN3(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN4(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN5(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN6(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN7(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN8(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN9(ADC_SAMPLING_RATE), | 124 | .smpr2 = ADC_SMPR2_SMP_AN0(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN1(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN2(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN3(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN4(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN5(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN6(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN7(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN8(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN9(ADC_SAMPLING_RATE), |
| 125 | .smpr1 = ADC_SMPR1_SMP_AN10(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN11(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN12(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN13(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN14(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN15(ADC_SAMPLING_RATE), | 125 | .smpr1 = ADC_SMPR1_SMP_AN10(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN11(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN12(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN13(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN14(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN15(ADC_SAMPLING_RATE), |
diff --git a/drivers/arm/analog.h b/drivers/arm/analog.h index 2818e9dcb..e61c39426 100644 --- a/drivers/arm/analog.h +++ b/drivers/arm/analog.h | |||
| @@ -25,7 +25,7 @@ extern "C" { | |||
| 25 | 25 | ||
| 26 | typedef struct { | 26 | typedef struct { |
| 27 | uint16_t input; | 27 | uint16_t input; |
| 28 | uint8_t adc; | 28 | uint8_t adc; |
| 29 | } adc_mux; | 29 | } adc_mux; |
| 30 | #define TO_MUX(i, a) \ | 30 | #define TO_MUX(i, a) \ |
| 31 | (adc_mux) { i, a } | 31 | (adc_mux) { i, a } |