djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

First pass at full LL implementation

Browse Source
This commit is contained in:
Hierophect 2019-09-10 19:48:24 -04:00
parent 0d2e9c3762
commit 500b21c236
4 changed files with 93 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ports/stm32f4/common-hal/analogio/AnalogIn.c
View File

@ -33,6 +33,7 @@
#include "stm32f4xx_hal.h" #include "stm32f4xx_hal.h"
#include "stm32f4xx_ll_gpio.h" #include "stm32f4xx_ll_gpio.h"
#include "stm32f4xx_ll_adc.h" #include "stm32f4xx_ll_adc.h"
#include "stm32f4xx_ll_bus.h"
//mp_raise_ValueError(translate("U dun goofed")); //mp_raise_ValueError(translate("U dun goofed"));
@ -45,7 +46,6 @@ void common_hal_analogio_analogin_construct(analogio_analogin_obj_t* self,
} }
//TODO: add ADC traits to structure? //TODO: add ADC traits to structure?
//LL_AHB1_GRP1_EnableClock(LL_AHB1_GRP1_PERIPH_GPIOA); //required?
LL_GPIO_SetPinMode(pin_port(pin->number), pin_mask(pin->number), LL_GPIO_MODE_ANALOG); LL_GPIO_SetPinMode(pin_port(pin->number), pin_mask(pin->number), LL_GPIO_MODE_ANALOG);
LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_ADC1); //TODO: conditional on ADC unit LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_ADC1); //TODO: conditional on ADC unit
claim_pin(pin); claim_pin(pin);
@ -68,32 +68,28 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
// Something else might have used the ADC in a different way, // Something else might have used the ADC in a different way,
// so we completely re-initialize it. // so we completely re-initialize it.
//LL Implementation
if (LL_ADC_IsEnabled(ADC1) == 0) if (LL_ADC_IsEnabled(ADC1) == 0)
{ {
LL_ADC_REG_SetTriggerSource(ADC1, LL_ADC_REG_TRIG_SOFTWARE); LL_ADC_REG_SetTriggerSource(ADC1, LL_ADC_REG_TRIG_SOFTWARE);
LL_ADC_REG_SetContinuousMode(ADC1, LL_ADC_REG_CONV_SINGLE); LL_ADC_REG_SetContinuousMode(ADC1, LL_ADC_REG_CONV_SINGLE);
LL_ADC_REG_SetSequencerLength(ADC1, LL_ADC_REG_SEQ_SCAN_DISABLE); LL_ADC_REG_SetSequencerLength(ADC1, LL_ADC_REG_SEQ_SCAN_DISABLE);
LL_ADC_REG_SetSequencerRanks(ADC1, LL_ADC_REG_RANK_1, LL_ADC_CHANNEL_4); LL_ADC_REG_SetSequencerRanks(ADC1, LL_ADC_REG_RANK_1, stm32_adc_channel(self->pin->adc));
//LL_ADC_REG_SetSequencerRanks(ADC1, LL_ADC_REG_RANK_1, LL_ADC_CHANNEL_4);
LL_ADC_SetChannelSamplingTime(ADC1, LL_ADC_CHANNEL_4, LL_ADC_SAMPLINGTIME_56CYCLES); LL_ADC_SetChannelSamplingTime(ADC1, stm32_adc_channel(self->pin->adc), LL_ADC_SAMPLINGTIME_56CYCLES);
LL_ADC_EnableIT_OVR(ADC1); LL_ADC_EnableIT_OVR(ADC1);
} }
LL_ADC_Enable(ADC1); LL_ADC_Enable(ADC1);
uint16_t uhADCxConvertedData = (__LL_ADC_DIGITAL_SCALE(LL_ADC_RESOLUTION_12B) + 1);
LL_ADC_REG_StartConversionSWStart(ADC1);
struct adc_sync_descriptor adc; while (LL_ADC_IsActiveFlag_EOCS(ADC1) == 0) {}
samd_peripherals_adc_setup(&adc, self->instance);
ConversionStartPoll_ADC_GrpRegular();
/* Retrieve ADC conversion data */ /* Retrieve ADC conversion data */
/* (data scale corresponds to ADC resolution: 12 bits) */ /* (data scale corresponds to ADC resolution: 12 bits) */
uhADCxConvertedData = LL_ADC_REG_ReadConversionData12(ADC1); uhADCxConvertedData = LL_ADC_REG_ReadConversionData12(ADC1);
// Shift the value to be 16 bit. // Shift the value to be 16 bit.
return value << 4; return uhADCxConvertedData << 4;
} }
float common_hal_analogio_analogin_get_reference_voltage(analogio_analogin_obj_t *self) { float common_hal_analogio_analogin_get_reference_voltage(analogio_analogin_obj_t *self) {

176
ports/stm32f4/common-hal/analogio/AnalogOut.c
View File

@ -31,77 +31,67 @@
#include "py/runtime.h" #include "py/runtime.h"
#include "shared-bindings/analogio/AnalogOut.h" #include "shared-bindings/analogio/AnalogOut.h"
#include "shared-bindings/audioio/AudioOut.h"
#include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/microcontroller/Pin.h"
#include "supervisor/shared/translate.h" #include "supervisor/shared/translate.h"
#include "atmel_start_pins.h"
#include "hal/include/hal_dac_sync.h"
#include "hpl/gclk/hpl_gclk_base.h"
#include "peripheral_clk_config.h"
#ifdef SAMD21
#include "hpl/pm/hpl_pm_base.h"
#endif
void common_hal_analogio_analogout_construct(analogio_analogout_obj_t* self, void common_hal_analogio_analogout_construct(analogio_analogout_obj_t* self,
const mcu_pin_obj_t *pin) { const mcu_pin_obj_t *pin) {
#if defined(SAMD21) && !defined(PIN_PA02) // #if defined(SAMD21) && !defined(PIN_PA02)
mp_raise_NotImplementedError(translate("No DAC on chip")); // mp_raise_NotImplementedError(translate("No DAC on chip"));
#else // #else
if (pin->number != PIN_PA02 // if (pin->number != PIN_PA02
#ifdef SAMD51 // #ifdef SAMD51
&& pin->number != PIN_PA05 // && pin->number != PIN_PA05
#endif // #endif
) { // ) {
mp_raise_ValueError(translate("AnalogOut not supported on given pin")); // mp_raise_ValueError(translate("AnalogOut not supported on given pin"));
return; // return;
} // }
self->channel = 0; // self->channel = 0;
#ifdef SAMD51 // #ifdef SAMD51
if (pin->number == PIN_PA05) { // if (pin->number == PIN_PA05) {
self->channel = 1; // self->channel = 1;
} // }
#endif // #endif
#ifdef SAMD51 // #ifdef SAMD51
hri_mclk_set_APBDMASK_DAC_bit(MCLK); // hri_mclk_set_APBDMASK_DAC_bit(MCLK);
#endif // #endif
#ifdef SAMD21 // #ifdef SAMD21
_pm_enable_bus_clock(PM_BUS_APBC, DAC); // _pm_enable_bus_clock(PM_BUS_APBC, DAC);
#endif // #endif
// SAMD21: This clock should be <= 12 MHz, per datasheet section 47.6.3. // // SAMD21: This clock should be <= 12 MHz, per datasheet section 47.6.3.
// SAMD51: This clock should be <= 350kHz, per datasheet table 37-6. // // SAMD51: This clock should be <= 350kHz, per datasheet table 37-6.
_gclk_enable_channel(DAC_GCLK_ID, CONF_GCLK_DAC_SRC); // _gclk_enable_channel(DAC_GCLK_ID, CONF_GCLK_DAC_SRC);
// Don't double init the DAC on the SAMD51 when both outputs are in use. We use the free state // // Don't double init the DAC on the SAMD51 when both outputs are in use. We use the free state
// of each output pin to determine DAC state. // // of each output pin to determine DAC state.
int32_t result = ERR_NONE; // int32_t result = ERR_NONE;
#ifdef SAMD51 // #ifdef SAMD51
if (!common_hal_mcu_pin_is_free(&pin_PA02) || !common_hal_mcu_pin_is_free(&pin_PA05)) { // if (!common_hal_mcu_pin_is_free(&pin_PA02) || !common_hal_mcu_pin_is_free(&pin_PA05)) {
#endif // #endif
// Fake the descriptor if the DAC is already initialized. // // Fake the descriptor if the DAC is already initialized.
self->descriptor.device.hw = DAC; // self->descriptor.device.hw = DAC;
#ifdef SAMD51 // #ifdef SAMD51
} else { // } else {
#endif // #endif
result = dac_sync_init(&self->descriptor, DAC); // result = dac_sync_init(&self->descriptor, DAC);
#ifdef SAMD51 // #ifdef SAMD51
} // }
#endif // #endif
if (result != ERR_NONE) { // if (result != ERR_NONE) {
mp_raise_OSError(MP_EIO); // mp_raise_OSError(MP_EIO);
return; // return;
} // }
claim_pin(pin); // claim_pin(pin);
gpio_set_pin_function(pin->number, GPIO_PIN_FUNCTION_B); // gpio_set_pin_function(pin->number, GPIO_PIN_FUNCTION_B);
dac_sync_enable_channel(&self->descriptor, self->channel); // dac_sync_enable_channel(&self->descriptor, self->channel);
#endif // #endif
} }
bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) { bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) {
@ -109,47 +99,47 @@ bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) {
} }
void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) { void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) {
#if (defined(SAMD21) && defined(PIN_PA02)) || defined(SAMD51) // #if (defined(SAMD21) && defined(PIN_PA02)) || defined(SAMD51)
if (common_hal_analogio_analogout_deinited(self)) { // if (common_hal_analogio_analogout_deinited(self)) {
return; // return;
} // }
dac_sync_disable_channel(&self->descriptor, self->channel); // dac_sync_disable_channel(&self->descriptor, self->channel);
reset_pin_number(PIN_PA02); // reset_pin_number(PIN_PA02);
// Only deinit the DAC on the SAMD51 if both outputs are free. // // Only deinit the DAC on the SAMD51 if both outputs are free.
#ifdef SAMD51 // #ifdef SAMD51
if (common_hal_mcu_pin_is_free(&pin_PA02) && common_hal_mcu_pin_is_free(&pin_PA05)) { // if (common_hal_mcu_pin_is_free(&pin_PA02) && common_hal_mcu_pin_is_free(&pin_PA05)) {
#endif // #endif
dac_sync_deinit(&self->descriptor); // dac_sync_deinit(&self->descriptor);
#ifdef SAMD51 // #ifdef SAMD51
} // }
#endif // #endif
self->deinited = true; // self->deinited = true;
// TODO(tannewt): Turn off the DAC clocks to save power. // // TODO(tannewt): Turn off the DAC clocks to save power.
#endif // #endif
} }
void common_hal_analogio_analogout_set_value(analogio_analogout_obj_t *self, void common_hal_analogio_analogout_set_value(analogio_analogout_obj_t *self,
uint16_t value) { uint16_t value) {
#if defined(SAMD21) && !defined(PIN_PA02) // #if defined(SAMD21) && !defined(PIN_PA02)
return; // return;
#endif // #endif
// Input is 16 bit so make sure and set LEFTADJ to 1 so it takes the top // // Input is 16 bit so make sure and set LEFTADJ to 1 so it takes the top
// bits. This is currently done in asf4_conf/*/hpl_dac_config.h. // // bits. This is currently done in asf4_conf/*/hpl_dac_config.h.
dac_sync_write(&self->descriptor, self->channel, &value, 1); // dac_sync_write(&self->descriptor, self->channel, &value, 1);
} }
void analogout_reset(void) { void analogout_reset(void) {
// audioout_reset also resets the DAC, and does a smooth ramp down to avoid clicks // audioout_reset also resets the DAC, and does a smooth ramp down to avoid clicks
// if it was enabled, so do that instead if AudioOut is enabled. // if it was enabled, so do that instead if AudioOut is enabled.
#if CIRCUITPY_AUDIOIO // #if CIRCUITPY_AUDIOIO
audioout_reset(); // audioout_reset();
#else // #else
#ifdef SAMD21 // #ifdef SAMD21
while (DAC->STATUS.reg & DAC_STATUS_SYNCBUSY) {} // while (DAC->STATUS.reg & DAC_STATUS_SYNCBUSY) {}
#endif // #endif
#ifdef SAMD51 // #ifdef SAMD51
while (DAC->SYNCBUSY.reg & DAC_SYNCBUSY_SWRST) {} // while (DAC->SYNCBUSY.reg & DAC_SYNCBUSY_SWRST) {}
#endif // #endif
DAC->CTRLA.reg |= DAC_CTRLA_SWRST; // DAC->CTRLA.reg |= DAC_CTRLA_SWRST;
#endif // #endif
} }

3
ports/stm32f4/common-hal/analogio/AnalogOut.h
View File

@ -29,13 +29,10 @@
#include "common-hal/microcontroller/Pin.h" #include "common-hal/microcontroller/Pin.h"
#include "hal/include/hal_dac_sync.h"
#include "py/obj.h" #include "py/obj.h"
typedef struct { typedef struct {
mp_obj_base_t base; mp_obj_base_t base;
struct dac_sync_descriptor descriptor;
uint8_t channel; uint8_t channel;
bool deinited; bool deinited;
} analogio_analogout_obj_t; } analogio_analogout_obj_t;

1
ports/stm32f4/mpconfigport.mk
View File

@ -17,6 +17,7 @@ CIRCUITPY_MINIMAL_BUILD = 1
CIRCUITPY_BOARD = 1 CIRCUITPY_BOARD = 1
CIRCUITPY_DIGITALIO = 1 CIRCUITPY_DIGITALIO = 1
CIRCUITPY_ANALOGIO = 1
CIRCUITPY_MICROCONTROLLER = 1 CIRCUITPY_MICROCONTROLLER = 1
CIRCUITPY_BUSIO = 1 CIRCUITPY_BUSIO = 1
CIRCUITPY_TIME = 1 CIRCUITPY_TIME = 1