Skip to content

Commit cf95cd6

Browse files
Sadik.Ozermathias-arm
authored andcommitted
MAX78000 delta
Fix typo Signed-off-by: Sadik.Ozer <[email protected]>
1 parent 7ebb737 commit cf95cd6

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

records/board/max78000fthr.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ common:
55
family:
66
- source/family/maxim/max78000/target.c
77
- source/family/maxim/target_reset_max32xxx.c
8+
macros:
9+
- MAX32625_GPIO_USE_VDDIO
10+
- MAX32625_FORCE_IO_SWD_EXT

source/family/maxim/target_reset_max32xxx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434

3535
#define INCREASE_DELAY 10
36-
#define MAX_DELAY 30000
36+
#define MAX_DELAY 30000 // ~2.82ms
3737

3838

3939
/* RESET_PROGRAM state halts the processor on reset by default but the SWD
@@ -53,7 +53,7 @@ static uint8_t target_set_state_max326xx(target_state_t state, uint32_t reg_flc_
5353
/* Reset the target and halt it when SWD is available */
5454
while (halt_retries--) {
5555
halt_timeout = 10;
56-
lockout_delay = 0;
56+
lockout_delay = 7450; // ~700.6us
5757

5858
/* Wait for SWD lockout period after reset */
5959
do {

source/hic_hal/maxim/max32625/gpio.c

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ static inline void use_vddioh(int port, int pin)
5757
}
5858

5959
/******************************************************************************/
60-
#if !defined(MAX3625_FORCE_IO_SWD_EXT) && !defined(MAX3625_FORCE_IO_DIP_EXT)
60+
#if !defined(MAX32625_FORCE_IO_SWD_EXT) && !defined(MAX32625_FORCE_IO_DIP_EXT)
6161
static uint16_t readADC(uint8_t ch)
6262
{
6363
uint32_t ctrl_tmp;
@@ -182,6 +182,12 @@ void gpio_init(void)
182182
// 1V8 VDDIO is not high enough to turn off the FET if VDDIOH is 3V3
183183
MXC_IOMAN->use_vddioh_1 |= (1U << (((OWM_PORT - 4) * 8) + OWM_SUP_PIN));
184184

185+
#if defined(MAX32625_GPIO_USE_VDDIO)
186+
// Use VDDIO
187+
MXC_IOMAN->use_vddioh_0 = 0;
188+
MXC_IOMAN->use_vddioh_1 = 0;
189+
#else
190+
// Use VDDIOH
185191
use_vddioh(PIN_nRESET_PORT, PIN_nRESET_PIN);
186192
use_vddioh(PIN_DIP_nRESET_PORT, PIN_DIP_nRESET_PIN);
187193
use_vddioh(PIN_SWCLK_PORT, PIN_SWCLK_PIN);
@@ -192,14 +198,19 @@ void gpio_init(void)
192198
use_vddioh(PIN_RX_PORT, PIN_RX_PIN);
193199
use_vddioh(PIN_DIP_TX_PORT, PIN_DIP_TX_PIN);
194200
use_vddioh(PIN_DIP_RX_PORT, PIN_DIP_RX_PIN);
195-
201+
#endif
202+
// LEDs use VDDIOH
203+
use_vddioh(PIN_DAP_LED_PORT, PIN_DAP_LED_PIN);
204+
use_vddioh(PIN_MSD_LED_PORT, PIN_MSD_LED_PIN);
205+
use_vddioh(PIN_CDC_LED_PORT, PIN_CDC_LED_PIN);
206+
196207
// Setup the ADC; read the ADC to set IO interface
197208
MXC_PWRMAN->pwr_rst_ctrl |= MXC_F_PWRMAN_PWR_RST_CTRL_AFE_POWERED;
198209
MXC_CLKMAN->clk_ctrl |= MXC_F_CLKMAN_CLK_CTRL_ADC_CLOCK_ENABLE;
199210

200-
#if defined(MAX3625_FORCE_IO_SWD_EXT)
211+
#if defined(MAX32625_FORCE_IO_SWD_EXT)
201212
target_set_interface(IO_SWD_EXT);
202-
#elif defined(MAX3625_FORCE_IO_DIP_EXT)
213+
#elif defined(MAX32625_FORCE_IO_DIP_EXT)
203214
target_set_interface(IO_DIP_EXT);
204215
#else
205216
MXC_ADC->ctrl = (MXC_F_ADC_CTRL_ADC_PU |

0 commit comments

Comments
 (0)