From fb768dfc14ab3b98905927f984a080e551513ea8 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sat, 17 Oct 2020 19:08:32 -0500
Subject: [PATCH] samd: AnalogOut: Better handle boards which IGNOREd analog
 pins

---
 .../common-hal/analogio/AnalogOut.c           | 45 ++++++++++++-------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/ports/atmel-samd/common-hal/analogio/AnalogOut.c b/ports/atmel-samd/common-hal/analogio/AnalogOut.c
index fac4c6bfcb..1565b0a8f4 100644
--- a/ports/atmel-samd/common-hal/analogio/AnalogOut.c
+++ b/ports/atmel-samd/common-hal/analogio/AnalogOut.c
@@ -44,26 +44,36 @@
 #include "hpl/pm/hpl_pm_base.h"
 #endif
 
+#define HAVE_ANALOGOUT ( \
+    (defined(PIN_PA02) && !defined(IGNORE_PA02)) || \
+    (defined(SAM_D5X_E5X) && defined(PIN_PA05) && !defined(IGNORE_PA05)) \
+)
+
 void common_hal_analogio_analogout_construct(analogio_analogout_obj_t* self,
         const mcu_pin_obj_t *pin) {
-    #if defined(SAMD21) && !defined(PIN_PA02)
+    #if !HAVE_ANALOGOUT
     mp_raise_NotImplementedError(translate("No DAC on chip"));
     #else
-    if (pin->number != PIN_PA02
-    #ifdef SAM_D5X_E5X
-        && pin->number != PIN_PA05
+
+    int channel = -1;
+
+    #if defined(PIN_PA02) && !defined(IGNORE_PIN_PA02)
+    if (pin->number != PIN_PA02) {
+        channel = 0;
+    }
     #endif
-    ) {
+    #if defined(PIN_PA05) && defined(PIN_PA05) && !defined(IGNORE_PIN_PA05)
+    if (pin->number != PIN_PA05) {
+        channel = 1;
+    }
+    #endif
+
+    if(channel == -1) {
         mp_raise_ValueError(translate("AnalogOut not supported on given pin"));
         return;
     }
 
-    self->channel = 0;
-    #ifdef SAM_D5X_E5X
-    if (pin->number == PIN_PA05) {
-        self->channel = 1;
-    }
-    #endif
+    self->channel = channel;
 
     #ifdef SAM_D5X_E5X
     hri_mclk_set_APBDMASK_DAC_bit(MCLK);
@@ -105,11 +115,15 @@ void common_hal_analogio_analogout_construct(analogio_analogout_obj_t* self,
 }
 
 bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) {
+    #if !HAVE_ANALOGOUT
+    return false;
+    #else
     return self->deinited;
+    #endif
 }
 
 void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) {
-    #if (defined(SAMD21) && defined(PIN_PA02)) || defined(SAM_D5X_E5X)
+    #if HAVE_ANALOGOUT
     if (common_hal_analogio_analogout_deinited(self)) {
         return;
     }
@@ -130,12 +144,11 @@ void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) {
 
 void common_hal_analogio_analogout_set_value(analogio_analogout_obj_t *self,
         uint16_t value) {
-    #if defined(SAMD21) && !defined(PIN_PA02)
-    return;
-    #endif
+    #if HAVE_ANALOGOUT
     // 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.
     dac_sync_write(&self->descriptor, self->channel, &value, 1);
+    #endif
 }
 
 void analogout_reset(void) {
@@ -143,7 +156,7 @@ void analogout_reset(void) {
     // if it was enabled, so do that instead if AudioOut is enabled.
 #if CIRCUITPY_AUDIOIO
     audioout_reset();
-#else
+#elif HAVE_ANALOGOUT
     #ifdef SAMD21
     while (DAC->STATUS.reg & DAC_STATUS_SYNCBUSY) {}
     #endif