From 2fb904f25cbe30ad84480014b4cdb4060719d3ab Mon Sep 17 00:00:00 2001 From: Jeremy Brodt Date: Tue, 16 Aug 2016 09:18:50 -0500 Subject: [PATCH] [MAX326xx] Fixed analogout bugs. --- hal/targets/cmsis/TARGET_Maxim/TARGET_MAX32600/dac_regs.h | 2 +- hal/targets/cmsis/TARGET_Maxim/TARGET_MAX32610/dac_regs.h | 2 +- hal/targets/hal/TARGET_Maxim/TARGET_MAX32600/analogout_api.c | 4 ++-- hal/targets/hal/TARGET_Maxim/TARGET_MAX32600/objects.h | 2 +- hal/targets/hal/TARGET_Maxim/TARGET_MAX32610/analogout_api.c | 4 ++-- hal/targets/hal/TARGET_Maxim/TARGET_MAX32610/objects.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hal/targets/cmsis/TARGET_Maxim/TARGET_MAX32600/dac_regs.h b/hal/targets/cmsis/TARGET_Maxim/TARGET_MAX32600/dac_regs.h index 2f0f4bd8c5..467d83436e 100644 --- a/hal/targets/cmsis/TARGET_Maxim/TARGET_MAX32600/dac_regs.h +++ b/hal/targets/cmsis/TARGET_Maxim/TARGET_MAX32600/dac_regs.h @@ -103,7 +103,7 @@ typedef struct { __IO uint8_t output_8; /* 0x0000 Write to push values to DAC output FIFO */ __IO uint16_t output_16; /* 0x0000 Write to push values to DAC output FIFO */ }; -} mxc_dac_fifo_t; +} mxc_dac_fifo_regs_t; /* Register offsets for module DAC12. diff --git a/hal/targets/cmsis/TARGET_Maxim/TARGET_MAX32610/dac_regs.h b/hal/targets/cmsis/TARGET_Maxim/TARGET_MAX32610/dac_regs.h index 2f0f4bd8c5..467d83436e 100644 --- a/hal/targets/cmsis/TARGET_Maxim/TARGET_MAX32610/dac_regs.h +++ b/hal/targets/cmsis/TARGET_Maxim/TARGET_MAX32610/dac_regs.h @@ -103,7 +103,7 @@ typedef struct { __IO uint8_t output_8; /* 0x0000 Write to push values to DAC output FIFO */ __IO uint16_t output_16; /* 0x0000 Write to push values to DAC output FIFO */ }; -} mxc_dac_fifo_t; +} mxc_dac_fifo_regs_t; /* Register offsets for module DAC12. diff --git a/hal/targets/hal/TARGET_Maxim/TARGET_MAX32600/analogout_api.c b/hal/targets/hal/TARGET_Maxim/TARGET_MAX32600/analogout_api.c index c17b06e8b5..daae6af2b2 100644 --- a/hal/targets/hal/TARGET_Maxim/TARGET_MAX32600/analogout_api.c +++ b/hal/targets/hal/TARGET_Maxim/TARGET_MAX32600/analogout_api.c @@ -47,7 +47,7 @@ void analogout_init(dac_t *obj, PinName pin) // Set the object pointer obj->dac = ((mxc_dac_regs_t*)MXC_DAC_GET_DAC((pin & 0x3))); - obj->dac_fifo = ((mxc_dac_fifo_t*)MXC_DAC_GET_FIFO((pin & 0x3))); + obj->dac_fifo = ((mxc_dac_fifo_regs_t*)MXC_DAC_GET_FIFO((pin & 0x3))); obj->index = (pin & 0x3); // Set the ADC clock to the system clock frequency @@ -142,7 +142,7 @@ void analogout_init(dac_t *obj, PinName pin) (MXC_E_AFE_REF_VOLT_SEL_1500 << MXC_F_AFE_CTRL1_REF_ADC_VOLT_SEL_POS))); // Disable interpolation - obj->dac->ctrl0 &= MXC_F_DAC_CTRL0_INTERP_MODE; + obj->dac->ctrl0 &= ~MXC_F_DAC_CTRL0_INTERP_MODE; } //****************************************************************************** diff --git a/hal/targets/hal/TARGET_Maxim/TARGET_MAX32600/objects.h b/hal/targets/hal/TARGET_Maxim/TARGET_MAX32600/objects.h index 442ab5e248..0275092c72 100644 --- a/hal/targets/hal/TARGET_Maxim/TARGET_MAX32600/objects.h +++ b/hal/targets/hal/TARGET_Maxim/TARGET_MAX32600/objects.h @@ -101,7 +101,7 @@ struct dac_s { int index; uint16_t out; mxc_dac_regs_t *dac; - mxc_dac_fifo_t * dac_fifo; + mxc_dac_fifo_regs_t * dac_fifo; }; typedef struct { diff --git a/hal/targets/hal/TARGET_Maxim/TARGET_MAX32610/analogout_api.c b/hal/targets/hal/TARGET_Maxim/TARGET_MAX32610/analogout_api.c index c17b06e8b5..daae6af2b2 100644 --- a/hal/targets/hal/TARGET_Maxim/TARGET_MAX32610/analogout_api.c +++ b/hal/targets/hal/TARGET_Maxim/TARGET_MAX32610/analogout_api.c @@ -47,7 +47,7 @@ void analogout_init(dac_t *obj, PinName pin) // Set the object pointer obj->dac = ((mxc_dac_regs_t*)MXC_DAC_GET_DAC((pin & 0x3))); - obj->dac_fifo = ((mxc_dac_fifo_t*)MXC_DAC_GET_FIFO((pin & 0x3))); + obj->dac_fifo = ((mxc_dac_fifo_regs_t*)MXC_DAC_GET_FIFO((pin & 0x3))); obj->index = (pin & 0x3); // Set the ADC clock to the system clock frequency @@ -142,7 +142,7 @@ void analogout_init(dac_t *obj, PinName pin) (MXC_E_AFE_REF_VOLT_SEL_1500 << MXC_F_AFE_CTRL1_REF_ADC_VOLT_SEL_POS))); // Disable interpolation - obj->dac->ctrl0 &= MXC_F_DAC_CTRL0_INTERP_MODE; + obj->dac->ctrl0 &= ~MXC_F_DAC_CTRL0_INTERP_MODE; } //****************************************************************************** diff --git a/hal/targets/hal/TARGET_Maxim/TARGET_MAX32610/objects.h b/hal/targets/hal/TARGET_Maxim/TARGET_MAX32610/objects.h index 442ab5e248..0275092c72 100644 --- a/hal/targets/hal/TARGET_Maxim/TARGET_MAX32610/objects.h +++ b/hal/targets/hal/TARGET_Maxim/TARGET_MAX32610/objects.h @@ -101,7 +101,7 @@ struct dac_s { int index; uint16_t out; mxc_dac_regs_t *dac; - mxc_dac_fifo_t * dac_fifo; + mxc_dac_fifo_regs_t * dac_fifo; }; typedef struct {