From 5f33c542b41405b5114ef64be5d1833a698cd533 Mon Sep 17 00:00:00 2001
From: Hierophect <hierophect@gmail.com>
Date: Wed, 9 Oct 2019 14:52:30 -0400
Subject: [PATCH] Fix include issues

---
 ports/stm32f4/common-hal/analogio/AnalogOut.c | 11 ++++++++++-
 ports/stm32f4/common-hal/analogio/AnalogOut.h |  2 ++
 ports/stm32f4/mpconfigport.mk                 |  7 +++++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ports/stm32f4/common-hal/analogio/AnalogOut.c b/ports/stm32f4/common-hal/analogio/AnalogOut.c
index 75592b30ef..3043893566 100644
--- a/ports/stm32f4/common-hal/analogio/AnalogOut.c
+++ b/ports/stm32f4/common-hal/analogio/AnalogOut.c
@@ -42,13 +42,15 @@
 //DAC is shared between both channels. 
 //TODO: store as struct with channel info, automatically turn it off if unused 
 //on both channels for power save?
+#if defined(HAS_DAC)
 DAC_HandleTypeDef handle;
+#endif
 
 void common_hal_analogio_analogout_construct(analogio_analogout_obj_t* self,
         const mcu_pin_obj_t *pin) {
     #if !defined(HAS_DAC)
     mp_raise_ValueError(translate("No DAC on chip"));
-    #endif 
+    #else
     if (pin == &pin_PA04) {
         self->channel = DAC_CHANNEL_1;
     } else if (pin == &pin_PA05) {
@@ -83,6 +85,7 @@ void common_hal_analogio_analogout_construct(analogio_analogout_obj_t* self,
     self->pin = pin;
     self->deinited = false;
     claim_pin(pin);
+    #endif
 }
 
 bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) {
@@ -90,19 +93,25 @@ bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) {
 }
 
 void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) {
+    #if defined(HAS_DAC)
     reset_pin_number(self->pin->port,self->pin->number);
     self->pin = mp_const_none;
     self->deinited = true;
     //TODO: if both are de-inited, should we turn off the DAC? 
+    #endif
 }
 
 void common_hal_analogio_analogout_set_value(analogio_analogout_obj_t *self,
         uint16_t value) {
+    #if defined(HAS_DAC)
     HAL_DAC_SetValue(&handle, self->channel, DAC_ALIGN_12B_R, value >> 4);
     HAL_DAC_Start(&handle, self->channel);
+    #endif
 }
 
 void analogout_reset(void) {
+    #if defined(HAS_DAC)
     __HAL_RCC_DAC_CLK_DISABLE();
     HAL_DAC_DeInit(&handle);
+    #endif
 }
diff --git a/ports/stm32f4/common-hal/analogio/AnalogOut.h b/ports/stm32f4/common-hal/analogio/AnalogOut.h
index 40d748f08d..49ab647330 100644
--- a/ports/stm32f4/common-hal/analogio/AnalogOut.h
+++ b/ports/stm32f4/common-hal/analogio/AnalogOut.h
@@ -36,7 +36,9 @@
 
 typedef struct {
     mp_obj_base_t base;
+#if defined(HAS_DAC)
     DAC_ChannelConfTypeDef ch_handle;
+#endif
     const mcu_pin_obj_t * pin;
     uint8_t channel;
     bool deinited;
diff --git a/ports/stm32f4/mpconfigport.mk b/ports/stm32f4/mpconfigport.mk
index 0dd4862ec5..7044b97235 100644
--- a/ports/stm32f4/mpconfigport.mk
+++ b/ports/stm32f4/mpconfigport.mk
@@ -22,8 +22,11 @@ CIRCUITPY_MICROCONTROLLER = 1
 CIRCUITPY_BUSIO = 1
 CIRCUITPY_TIME = 1
 CIRCUITPY_OS = 1
-CIRCUITPY_STRUCT = 1
-CIRCUITPY_MATH = 1
+CIRCUITPY_STORAGE = 1
+CIRCUITPY_RANDOM = 1
+CIRCUITPY_USB_HID = 1
+CIRCUITPY_USB_MIDI = 1
+
 
 #ifeq ($(MCU_SUB_VARIANT), stm32f412zx)
 #endif