rekahsoft
/
qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

format code according to conventions [skip ci]

This commit is contained in:
QMK Bot 2020-03-11 05:11:02 +00:00
parent 5ac6fe1888
commit 2b66acf04a
2 changed files with 28 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/arm/analog.c
View File

@ -17,35 +17,32 @@
#include "analog.h" #include "analog.h"
#include "quantum.h" #include "quantum.h"
/* User configurable ADC options */ /* User configurable ADC options */
#ifndef ADC_CIRCULAR_BUFFER #ifndef ADC_CIRCULAR_BUFFER
#define ADC_CIRCULAR_BUFFER FALSE # define ADC_CIRCULAR_BUFFER FALSE
#endif #endif
#ifndef ADC_NUM_CHANNELS #ifndef ADC_NUM_CHANNELS
#define ADC_NUM_CHANNELS 1 # define ADC_NUM_CHANNELS 1
#elif ADC_NUM_CHANNELS != 1 #elif ADC_NUM_CHANNELS != 1
#error "The ARM ADC implementation currently only supports reading one channel at a time." # error "The ARM ADC implementation currently only supports reading one channel at a time."
#endif #endif
#ifndef ADC_BUFFER_DEPTH #ifndef ADC_BUFFER_DEPTH
#define ADC_BUFFER_DEPTH 2 # define ADC_BUFFER_DEPTH 2
#endif #endif
// For more sampling rate options, look at hal_adc_lld.h in ChibiOS // For more sampling rate options, look at hal_adc_lld.h in ChibiOS
#ifndef ADC_SAMPLING_RATE #ifndef ADC_SAMPLING_RATE
#define ADC_SAMPLING_RATE ADC_SMPR_SMP_1P5 # define ADC_SAMPLING_RATE ADC_SMPR_SMP_1P5
#endif #endif
// Options are 12, 10, 8, and 6 bit. // Options are 12, 10, 8, and 6 bit.
#ifndef ADC_RESOLUTION #ifndef ADC_RESOLUTION
#define ADC_RESOLUTION ADC_CFGR1_RES_12BIT # define ADC_RESOLUTION ADC_CFGR1_RES_12BIT
#endif #endif
static ADCConfig adcCfg = {};
static ADCConfig adcCfg = {};
static adcsample_t sampleBuffer[ADC_NUM_CHANNELS * ADC_BUFFER_DEPTH]; static adcsample_t sampleBuffer[ADC_NUM_CHANNELS * ADC_BUFFER_DEPTH];
// Initialize to max number of ADCs, set to empty object to initialize all to false. // Initialize to max number of ADCs, set to empty object to initialize all to false.
@ -54,21 +51,18 @@ static bool adcInitialized[1] = {};
#elif defined(STM32F3XX) #elif defined(STM32F3XX)
static bool adcInitialized[4] = {}; static bool adcInitialized[4] = {};
#else #else
#error "adcInitialized has not been implemented for this ARM microcontroller." # error "adcInitialized has not been implemented for this ARM microcontroller."
#endif #endif
static ADCConversionGroup adcConversionGroup = { static ADCConversionGroup adcConversionGroup = {
ADC_CIRCULAR_BUFFER, ADC_CIRCULAR_BUFFER,
(uint16_t)(ADC_NUM_CHANNELS), (uint16_t)(ADC_NUM_CHANNELS),
NULL, // No end callback NULL, // No end callback
NULL, // No error callback NULL, // No error callback
#if defined(STM32F0XX) #if defined(STM32F0XX)
ADC_CFGR1_CONT | ADC_RESOLUTION, ADC_CFGR1_CONT | ADC_RESOLUTION,
ADC_TR(0, 0). ADC_TR(0, 0).ADC_SAMPLING_RATE,
ADC_SAMPLING_RATE, NULL, // Doesn't specify a default channel
NULL, // Doesn't specify a default channel
#elif defined(STM32F3XX) #elif defined(STM32F3XX)
ADC_CFGR_CONT | ADC_RESOLUTION, ADC_CFGR_CONT | ADC_RESOLUTION,
ADC_TR(0, 4095), ADC_TR(0, 4095),
@ -77,7 +71,7 @@ static ADCConversionGroup adcConversionGroup = {
ADC_SAMPLING_RATE, ADC_SAMPLING_RATE,
}, },
{ {
0, // Doesn't specify a default channel 0, // Doesn't specify a default channel
0, 0,
0, 0,
0, 0,
@ -85,10 +79,7 @@ static ADCConversionGroup adcConversionGroup = {
#endif #endif
}; };
static inline ADCDriver* intToADCDriver(uint8_t adcInt) { static inline ADCDriver* intToADCDriver(uint8_t adcInt) {
ADCDriver* target; ADCDriver* target;
switch (adcInt) { switch (adcInt) {
@ -106,7 +97,7 @@ static inline ADCDriver* intToADCDriver(uint8_t adcInt) {
case 3: target = &ADCD4; break; case 3: target = &ADCD4; break;
#endif #endif
default: target = NULL; break; default: target = NULL; break;
// clang-format on // clang-format on
} }
return target; return target;
@ -119,12 +110,10 @@ static inline void manageAdcInitializationDriver(uint8_t adc, ADCDriver* adcDriv
} }
} }
static inline void manageAdcInitialization(uint8_t adc) { static inline void manageAdcInitialization(uint8_t adc) { manageAdcInitializationDriver(adc, intToADCDriver(adc)); }
manageAdcInitializationDriver(adc, intToADCDriver(adc));
}
pin_and_adc pinToMux(pin_t pin) { pin_and_adc pinToMux(pin_t pin) {
switch(pin) { switch (pin) {
// clang-format off // clang-format off
#if defined(STM32F0XX) #if defined(STM32F0XX)
case A0: return (pin_and_adc){ ADC_CHANNEL_IN0, 0 }; case A0: return (pin_and_adc){ ADC_CHANNEL_IN0, 0 };
@ -187,17 +176,15 @@ pin_and_adc pinToMux(pin_t pin) {
#error "An ADC pin-to-mux configuration has not been specified for this microcontroller." #error "An ADC pin-to-mux configuration has not been specified for this microcontroller."
#endif #endif
default: return (pin_and_adc){ 0, 0 }; default: return (pin_and_adc){ 0, 0 };
// clang-format on // clang-format on
} }
} }
adcsample_t analogReadPin(pin_t pin) { adcsample_t analogReadPin(pin_t pin) { return adc_read(pinToMux(pin)); }
return adc_read(pinToMux(pin));
}
adcsample_t analogReadPinAdc(pin_t pin, uint8_t adc) { adcsample_t analogReadPinAdc(pin_t pin, uint8_t adc) {
pin_and_adc target = pinToMux(pin); pin_and_adc target = pinToMux(pin);
target.adc = adc; target.adc = adc;
return adc_read(target); return adc_read(target);
} }
@ -207,7 +194,7 @@ adcsample_t adc_read(pin_and_adc mux) {
#elif defined(STM32F3XX) #elif defined(STM32F3XX)
adcConversionGroup.sqr[0] = ADC_SQR1_SQ1_N(mux.pin); adcConversionGroup.sqr[0] = ADC_SQR1_SQ1_N(mux.pin);
#else #else
#error "adc_read has not been updated to support this ARM microcontroller." # error "adc_read has not been updated to support this ARM microcontroller."
#endif #endif
ADCDriver* targetDriver = intToADCDriver(mux.adc); ADCDriver* targetDriver = intToADCDriver(mux.adc);

19
drivers/arm/analog.h
View File

@ -20,35 +20,32 @@
#include "ch.h" #include "ch.h"
#include <hal.h> #include <hal.h>
#if !defined(STM32F0XX) && !defined(STM32F3XX) #if !defined(STM32F0XX) && !defined(STM32F3XX)
#error "Only STM23F0 and STM32F3 devices have ADC support in QMK at this time." # error "Only STM23F0 and STM32F3 devices have ADC support in QMK at this time."
#endif #endif
#if !HAL_USE_ADC #if !HAL_USE_ADC
#error "You need to set HAL_USE_ADC to TRUE in your halconf.h to use the ADC." # error "You need to set HAL_USE_ADC to TRUE in your halconf.h to use the ADC."
#endif #endif
#if !STM32_ADC_USE_ADC1 && !STM32_ADC_USE_ADC2 && !STM32_ADC_USE_ADC3 && !STM32_ADC_USE_ADC4 #if !STM32_ADC_USE_ADC1 && !STM32_ADC_USE_ADC2 && !STM32_ADC_USE_ADC3 && !STM32_ADC_USE_ADC4
#error "You need to set one of the 'STM32_ADC_USE_ADCx' settings to TRUE in your mcuconf.h to use the ADC." # error "You need to set one of the 'STM32_ADC_USE_ADCx' settings to TRUE in your mcuconf.h to use the ADC."
#endif #endif
#if STM32_ADC_DUAL_MODE #if STM32_ADC_DUAL_MODE
#error "STM32 ADC Dual Mode is not supported at this time." # error "STM32 ADC Dual Mode is not supported at this time."
#endif #endif
#if STM32_ADCV3_OVERSAMPLING #if STM32_ADCV3_OVERSAMPLING
#error "STM32 ADCV3 Oversampling is not supported at this time." # error "STM32 ADCV3 Oversampling is not supported at this time."
#endif #endif
typedef struct { typedef struct {
pin_t pin; pin_t pin;
uint8_t adc; uint8_t adc;
} pin_and_adc; } pin_and_adc;
#define PIN_AND_ADC(p,a) (pin_and_adc){p,a} #define PIN_AND_ADC(p, a) \
(pin_and_adc) { p, a }
// analogReference has been left un-defined for ARM devices. // analogReference has been left un-defined for ARM devices.
// void analogReference(uint8_t mode); // void analogReference(uint8_t mode);