Skip to content

Fixing the send break for the MAXWSNENV and MAX32600MBED. #1684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 26, 2016
Merged

Fixing the send break for the MAXWSNENV and MAX32600MBED. #1684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 61 additions & 6 deletions libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32600/serial_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@
#include "mbed_assert.h"
#include "cmsis.h"
#include "serial_api.h"
#include "gpio_api.h"
#include "uart_regs.h"
#include "ioman_regs.h"
#include "PeripheralPins.h"

#define UART_NUM 2
Expand Down Expand Up @@ -290,23 +292,76 @@ void serial_clear(serial_t *obj)
obj->uart->ctrl |= (MXC_F_UART_CTRL_TX_FIFO_FLUSH | MXC_F_UART_CTRL_RX_FIFO_FLUSH );
}


//******************************************************************************
void serial_break_set(serial_t *obj)
{
// Make sure that nothing is being sent
while(obj->uart->status & MXC_F_UART_STATUS_RX_BUSY) {}
while (!(obj->uart->status & MXC_F_UART_STATUS_TX_FIFO_EMPTY));
while (obj->uart->status & MXC_F_UART_STATUS_TX_BUSY);

// Configure the GPIO to outpu 0
gpio_t tx_gpio;
switch (((UARTName)(obj->uart))) {
case UART_0:
gpio_init_out(&tx_gpio, UART0_TX);
break;
case UART_1:
gpio_init_out(&tx_gpio, UART1_TX);
break;
default:
gpio_init_out(&tx_gpio, (PinName)NC);
break;
}

gpio_write(&tx_gpio, 0);

// Disable the clock to pause any transmission
obj->uart->ctrl &= ~MXC_F_UART_CTRL_BAUD_CLK_EN ;
// GPIO is setup now, but we need to maps gpio to the pin
switch (((UARTName)(obj->uart))) {
case UART_0:
MXC_IOMAN->uart0_req &= ~MXC_F_IOMAN_UART_CORE_IO;
MBED_ASSERT((MXC_IOMAN->uart0_ack & (MXC_F_IOMAN_UART_CORE_IO | MXC_F_IOMAN_UART_CORE_IO)) == 0);
break;
case UART_1:
MXC_IOMAN->uart1_req &= ~MXC_F_IOMAN_UART_CORE_IO;
MBED_ASSERT((MXC_IOMAN->uart1_ack & (MXC_F_IOMAN_UART_CORE_IO | MXC_F_IOMAN_UART_CORE_IO)) == 0);
break;
default:
break;
}
}

//******************************************************************************
void serial_break_clear(serial_t *obj)
{
obj->uart->ctrl |= MXC_F_UART_CTRL_BAUD_CLK_EN;
}
// Configure the GPIO to output 1
gpio_t tx_gpio;
switch (((UARTName)(obj->uart))) {
case UART_0:
gpio_init_out(&tx_gpio, UART0_TX);
break;
case UART_1:
gpio_init_out(&tx_gpio, UART1_TX);
break;
default:
gpio_init_out(&tx_gpio, (PinName)NC);
break;
}

gpio_write(&tx_gpio, 1);

// Renable UART
switch (((UARTName)(obj->uart))) {
case UART_0:
serial_pinout_tx(UART0_TX);
break;
case UART_1:
serial_pinout_tx(UART1_TX);
break;
default:
serial_pinout_tx((PinName)NC);
break;
}
}

//******************************************************************************
void serial_pinout_tx(PinName tx)
Expand Down
9 changes: 7 additions & 2 deletions libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/TARGET_MAXWSNENV/PinNames.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,16 @@ typedef enum {
SW1 = P1_5,

// UART Pins
USBTX = P1_3,
USBRX = P1_2,
UART0_RX = P1_0,
UART0_TX = P1_1,
UART1_RX = P1_2,
UART1_TX = P1_3,
USBTX = UART1_TX,
USBRX = UART1_RX,
STDIO_UART_TX = USBTX,
STDIO_UART_RX = USBRX,

// I2C Pins
I2C_SCL = P0_5,
I2C_SDA = P0_4,

Expand Down
67 changes: 61 additions & 6 deletions libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/serial_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@
#include "mbed_assert.h"
#include "cmsis.h"
#include "serial_api.h"
#include "gpio_api.h"
#include "uart_regs.h"
#include "ioman_regs.h"
#include "PeripheralPins.h"

#define UART_NUM 2
Expand Down Expand Up @@ -290,23 +292,76 @@ void serial_clear(serial_t *obj)
obj->uart->ctrl |= (MXC_F_UART_CTRL_TX_FIFO_FLUSH | MXC_F_UART_CTRL_RX_FIFO_FLUSH );
}


//******************************************************************************
void serial_break_set(serial_t *obj)
{
// Make sure that nothing is being sent
while(obj->uart->status & MXC_F_UART_STATUS_RX_BUSY) {}
while (!(obj->uart->status & MXC_F_UART_STATUS_TX_FIFO_EMPTY));
while (obj->uart->status & MXC_F_UART_STATUS_TX_BUSY);

// Configure the GPIO to outpu 0
gpio_t tx_gpio;
switch (((UARTName)(obj->uart))) {
case UART_0:
gpio_init_out(&tx_gpio, UART0_TX);
break;
case UART_1:
gpio_init_out(&tx_gpio, UART1_TX);
break;
default:
gpio_init_out(&tx_gpio, (PinName)NC);
break;
}

gpio_write(&tx_gpio, 0);

// Disable the clock to pause any transmission
obj->uart->ctrl &= ~MXC_F_UART_CTRL_BAUD_CLK_EN ;
// GPIO is setup now, but we need to maps gpio to the pin
switch (((UARTName)(obj->uart))) {
case UART_0:
MXC_IOMAN->uart0_req &= ~MXC_F_IOMAN_UART_CORE_IO;
MBED_ASSERT((MXC_IOMAN->uart0_ack & (MXC_F_IOMAN_UART_CORE_IO | MXC_F_IOMAN_UART_CORE_IO)) == 0);
break;
case UART_1:
MXC_IOMAN->uart1_req &= ~MXC_F_IOMAN_UART_CORE_IO;
MBED_ASSERT((MXC_IOMAN->uart1_ack & (MXC_F_IOMAN_UART_CORE_IO | MXC_F_IOMAN_UART_CORE_IO)) == 0);
break;
default:
break;
}
}

//******************************************************************************
void serial_break_clear(serial_t *obj)
{
obj->uart->ctrl |= MXC_F_UART_CTRL_BAUD_CLK_EN;
}
// Configure the GPIO to output 1
gpio_t tx_gpio;
switch (((UARTName)(obj->uart))) {
case UART_0:
gpio_init_out(&tx_gpio, UART0_TX);
break;
case UART_1:
gpio_init_out(&tx_gpio, UART1_TX);
break;
default:
gpio_init_out(&tx_gpio, (PinName)NC);
break;
}

gpio_write(&tx_gpio, 1);

// Renable UART
switch (((UARTName)(obj->uart))) {
case UART_0:
serial_pinout_tx(UART0_TX);
break;
case UART_1:
serial_pinout_tx(UART1_TX);
break;
default:
serial_pinout_tx((PinName)NC);
break;
}
}

//******************************************************************************
void serial_pinout_tx(PinName tx)
Expand Down