summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libraries/usart.c134
-rw-r--r--libraries/usart.h6
-rw-r--r--usart_irq/main.c39
3 files changed, 81 insertions, 98 deletions
diff --git a/libraries/usart.c b/libraries/usart.c
index 67dd30a..16f151b 100644
--- a/libraries/usart.c
+++ b/libraries/usart.c
@@ -10,71 +10,75 @@ extern USART usart3;
void usart_init(USART *usart, uint8_t *rx_buffer, uint16_t rx_buffersize, uint8_t *tx_buffer, uint16_t tx_buffersize)
{
- // clock config
- rcc_periph_clock_enable(RCC_GPIOB); // for USART3
- rcc_periph_clock_enable(RCC_USART3); // for USART3
-
- // gpio config
- gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_50_MHZ, GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART3_TX); // TX setup
- gpio_set_mode(GPIOB, GPIO_MODE_INPUT, GPIO_CNF_INPUT_FLOAT, GPIO_USART3_RX); // RX setup
-
- // nvic config
- nvic_enable_irq(NVIC_USART3_IRQ);
- usart_enable_rx_interrupt(USART3);
-
- // usart config
- usart_set_baudrate(USART3, 9600);
- usart_set_databits(USART3, 8);
- usart_set_flow_control(USART3, USART_FLOWCONTROL_NONE);
- usart_set_mode(USART3, USART_MODE_TX_RX);
- usart_set_parity(USART3, USART_PARITY_NONE);
- usart_set_stopbits(USART3, USART_STOPBITS_1);
- usart_enable(USART3);
-
- // fifo init
- fifo_init(&usart->rx_fifo, rx_buffer, rx_buffersize);
- fifo_init(&usart->tx_fifo, tx_buffer, tx_buffersize);
+ // clock config
+ rcc_periph_clock_enable(RCC_GPIOB); // for USART3
+ rcc_periph_clock_enable(RCC_USART3); // for USART3
+
+ // gpio config
+ gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_50_MHZ, GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART3_TX); // TX setup
+ gpio_set_mode(GPIOB, GPIO_MODE_INPUT, GPIO_CNF_INPUT_FLOAT, GPIO_USART3_RX); // RX setup
+
+ // nvic config
+ nvic_enable_irq(NVIC_USART3_IRQ);
+ usart_enable_rx_interrupt(USART3);
+
+ // usart config
+ usart_set_baudrate(USART3, 9600);
+ usart_set_databits(USART3, 8);
+ usart_set_flow_control(USART3, USART_FLOWCONTROL_NONE);
+ usart_set_mode(USART3, USART_MODE_TX_RX);
+ usart_set_parity(USART3, USART_PARITY_NONE);
+ usart_set_stopbits(USART3, USART_STOPBITS_1);
+ usart_enable(USART3);
+
+ // fifo init
+ fifo_init(&usart->rx_fifo, rx_buffer, rx_buffersize);
+ fifo_init(&usart->tx_fifo, tx_buffer, tx_buffersize);
}
// write functions
uint16_t usart_write_bytes(USART *usart, uint8_t *data_source, uint16_t data_length){
- if ((data_length + fifo_bytes_available(&usart->tx_fifo)) <= fifo_get_buffersize(&usart->tx_fifo)){
- for (int i=0; i<data_length; i++){
- fifo_put_byte(&usart->tx_fifo, &data_source[i]);
- }
- usart_enable_tx_interrupt(USART3);
- return data_length;
- }
- else{
- return 0;
- }
+ if ((data_length + fifo_bytes_available(&usart->tx_fifo)) <= fifo_get_buffersize(&usart->tx_fifo)){
+ for (int i=0; i<data_length; i++){
+ fifo_put_byte(&usart->tx_fifo, &data_source[i]);
+ }
+ usart_enable_tx_interrupt(USART3);
+ return data_length;
+ }
+ else{
+ return 0;
+ }
}
uint16_t usart_write(USART *usart, char *str)
{
- for (uint16_t i=0; i<(uint16_t)strlen(str); i++){
- usart_write_bytes(usart, (uint8_t *)&str[i], 1);
- }
- return (uint16_t)strlen(str);
+ return usart_write_bytes(usart, (uint8_t *)str, (uint16_t)strlen(str));
+}
+
+uint16_t usart_writeln(USART *usart, char *str)
+{
+ char buffer[(uint16_t)strlen(str)+2]; // space for str, \r and \0
+ strcat(buffer, str);
+ strcat(buffer, "\r");
+ return usart_write(usart, buffer);
}
-//uint16_t usart_writeln(USART *usart, char *str);
// read functions
uint16_t usart_read_bytes(USART *usart, uint8_t *data_sink, uint16_t data_length)
{
- if (data_length <= fifo_bytes_available(&usart->rx_fifo)){
- for (int i=0; i<data_length; i++){
- fifo_get_byte(&usart->rx_fifo, &data_sink[i]);
- }
- return data_length;
- }
- else{
- return 0;
- }
+ if (data_length <= fifo_bytes_available(&usart->rx_fifo)){
+ for (int i=0; i<data_length; i++){
+ fifo_get_byte(&usart->rx_fifo, &data_sink[i]);
+ }
+ return data_length;
+ }
+ else{
+ return 0;
+ }
}
//uint16_t usart_read(USART *usart, char *data_sink, uint16_t data_length);
//uint16_t usart_readln(USART *usart, char *data_sink);
@@ -91,7 +95,7 @@ void usart3_isr(void)
/* Retrieve the data from the peripheral. */
uint8_t data = usart_recv(USART3);
- fifo_put_byte(&usart3.rx_fifo, &data);
+ fifo_put_byte(&usart3.rx_fifo, &data);
/* Enable transmit interrupt so it sends back the data. */
//USART_CR1(USART3) |= USART_CR1_TXEIE;
@@ -102,20 +106,20 @@ void usart3_isr(void)
((USART_SR(USART3) & USART_SR_TXE) != 0)) {
/* Put data into the transmit register. */
- if (fifo_bytes_available(&usart3.tx_fifo)){
- uint8_t data;
- fifo_get_byte(&usart3.tx_fifo, &data);
- usart_send(USART3, data);
- if(data == '\r'){
- uint8_t nl = (uint8_t)'\n';
- usart_write_bytes(&usart3, &nl, 1);
- }
- if (fifo_bytes_available(&usart3.tx_fifo)){
- usart_enable_tx_interrupt(USART3);
- }
- else{
- usart_disable_tx_interrupt(USART3);
- }
- }
- }
+ if (fifo_bytes_available(&usart3.tx_fifo)){
+ uint8_t data;
+ fifo_get_byte(&usart3.tx_fifo, &data);
+ usart_send(USART3, data);
+ if(data == '\r'){
+ uint8_t nl = (uint8_t)'\n';
+ usart_write_bytes(&usart3, &nl, 1);
+ }
+ if (fifo_bytes_available(&usart3.tx_fifo)){
+ usart_enable_tx_interrupt(USART3);
+ }
+ else{
+ usart_disable_tx_interrupt(USART3);
+ }
+ }
+ }
}
diff --git a/libraries/usart.h b/libraries/usart.h
index 8e0d98c..4cc9712 100644
--- a/libraries/usart.h
+++ b/libraries/usart.h
@@ -16,8 +16,8 @@
typedef struct USART{
- FIFO rx_fifo;
- FIFO tx_fifo;
+ FIFO rx_fifo;
+ FIFO tx_fifo;
} USART;
@@ -31,7 +31,7 @@ void usart_init(USART *usart, uint8_t *rx_buffer, uint16_t rx_buffersize, uint8_
uint16_t usart_write_bytes(USART *usart, uint8_t *data_source, uint16_t data_length);
uint16_t usart_write(USART *usart, char *str);
-//uint16_t usart_writeln(USART *usart, char *str);
+uint16_t usart_writeln(USART *usart, char *str);
// read functions
diff --git a/usart_irq/main.c b/usart_irq/main.c
index 8c79471..48ce18b 100644
--- a/usart_irq/main.c
+++ b/usart_irq/main.c
@@ -11,14 +11,13 @@
#define DELAY 1000000
-#define RX_BUFFER_SIZE 50
-#define TX_BUFFER_SIZE 50
+#define RX_BUFFER_SIZE 1000
+#define TX_BUFFER_SIZE 1000
void clock_init(void);
void gpio_init(void);
void delay(void);
-int _write(int file, char *ptr, int len);
USART usart3;
@@ -26,20 +25,18 @@ USART usart3;
int main(void)
{
- uint8_t rx_buffer[RX_BUFFER_SIZE];
- uint8_t tx_buffer[TX_BUFFER_SIZE];
-
+ // setup
clock_init();
gpio_init();
+ uint8_t rx_buffer[RX_BUFFER_SIZE];
+ uint8_t tx_buffer[TX_BUFFER_SIZE];
usart_init(&usart3, rx_buffer, RX_BUFFER_SIZE, tx_buffer, TX_BUFFER_SIZE);
- gpio_set(GPIOC, GPIO13);
-
- char welcome[] = "Hello world!\r";
- usart_write(&usart3, welcome);
+ // welcome message
+ usart_writeln(&usart3, "This is a demo of USART via IRQ. Just type something!");
+ // return any input
uint8_t buff;
-
while(1){
if (usart_read_bytes(&usart3, &buff, 1)){
usart_write_bytes(&usart3, &buff, 1);
@@ -60,6 +57,7 @@ void gpio_init(void)
{
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_50_MHZ, GPIO_CNF_OUTPUT_PUSHPULL, GPIO13);
gpio_clear(GPIOC, GPIO13);
+ gpio_set(GPIOC, GPIO13);
}
@@ -69,22 +67,3 @@ void delay(void)
__asm__("nop");
}
}
-
-
-int _write(int file, char *ptr, int len)
-{
- int i;
-
- if (file == STDOUT_FILENO || file == STDERR_FILENO) {
- for (i = 0; i < len; i++) {
- if (ptr[i] == '\n') {
- uint8_t cr = (uint8_t)'\r';
- usart_write_bytes(&usart3, &cr, 1);
- }
- usart_write_bytes(&usart3, (uint8_t *)&ptr[i], 1);
- }
- return i;
- }
- errno = EIO;
- return -1;
-}
generated by cgit v1.2.3-70-g09d2 (git 2.47.1) at 2025-01-04 10:20:06 +0000