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

Merge pull request #4994 from bobthechemist/atmel-samd-analogio-deinit

Browse Source 
added pin object to analogout
This commit is contained in:
Scott Shawcroft 2021-07-13 18:13:11 -07:00 committed by GitHub
commit e7c5165ff6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ports/atmel-samd/common-hal/analogio/AnalogOut.c
View File

@ -75,6 +75,7 @@ void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self,
}
self->channel = channel;
self->pin = pin;
#ifdef SAM_D5X_E5X
hri_mclk_set_APBDMASK_DAC_bit(MCLK);
@ -129,7 +130,9 @@ void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) {
return;
}
dac_sync_disable_channel(&self->descriptor, self->channel);
reset_pin_number(PIN_PA02);
reset_pin_number(self->pin->number);
self->pin = NULL;
// Only deinit the DAC on the SAMD51 if both outputs are free.
#ifdef SAM_D5X_E5X
if (common_hal_mcu_pin_is_free(&pin_PA02) && common_hal_mcu_pin_is_free(&pin_PA05)) {

1
ports/atmel-samd/common-hal/analogio/AnalogOut.h
View File

@ -35,6 +35,7 @@
typedef struct {
mp_obj_base_t base;
const mcu_pin_obj_t *pin;
struct dac_sync_descriptor descriptor;
uint8_t channel;
bool deinited;