mhu/reflow-oven-control-sw
2
0
Fork 0
Code Issues 4 Pull Requests Releases 4 Wiki Activity

* Improve uart dma ring buffer. Sending dma still missing

Browse Source 
* Add digio module for controlling LEDs, Loudspeaker, and the Digital IOs
* General code improvements
This commit is contained in:
Mario Hüttel
2020-02-10 22:38:24 +01:00
parent 48fea3d36e
commit 69c00ff3d3
14 changed files with 340 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
stm-firmware/include/uart/dma-ring-buffer.h
View File

@@ -5,19 +5,18 @@
#include <stm32f4xx.h>
#include <stddef.h>
struct dma_ring_buffer {
char *data_ptr;
struct dma_ring_buffer_to_mem {
void *data_ptr;
size_t buffer_count;
DMA_Stream_TypeDef *dma;
size_t get_idx;
uint8_t base_dma_id;
size_t element_size;
};
int dma_ring_buffer_initialize(struct dma_ring_buffer *dma_buffer, uint8_t base_dma_id, DMA_Stream_TypeDef *dma_stream, size_t buffer_element_count, char *data_buffer, void *src_reg, uint8_t dma_trigger_channel);
int dma_ring_buffer_get_data(struct dma_ring_buffer *buff, const char **data_buff, size_t *len);
void dma_ring_buffer_stop(struct dma_ring_buffer *buff);
int dma_ring_buffer_periph_to_mem_initialize(struct dma_ring_buffer_to_mem *dma_buffer, uint8_t base_dma_id, DMA_Stream_TypeDef *dma_stream, size_t buffer_element_count, size_t element_size, void *data_buffer, void *src_reg, uint8_t dma_trigger_channel);
int dma_ring_buffer_periph_to_mem_get_data(struct dma_ring_buffer_to_mem *buff, const void **data_buff, size_t *len);
void dma_ring_buffer_periph_to_mem_stop(struct dma_ring_buffer_to_mem *buff);
#endif /* __DMA_RING_BUFFER_H__ */

13
stm-firmware/include/uart/uart.h
View File

@@ -4,21 +4,24 @@
#ifndef UART_UART_H_
#define UART_UART_H_
#define UART_RECEIVE_DMA_STREAM
#define UART_RECEIVE_DMA_STREAM DMA2_Stream5
#define UART_SEND_DMA_STREAM
#define UART_PORT_RCC_MASK RCC_AHB1ENR_GPIOAEN
#define UART_PORT GPIOA
#define UART_PERIPH USART1
#define UART_RCC_MASK RCC_APB2ENR_USART1EN
#ifdef DEBUGBUILD
#define UART_PORT GPIOA
#define UART_PORT_RCC_MASK RCC_AHB1ENR_GPIOAEN
#define UART_RX_PIN 10
#define UART_TX_PIN 9
#define UART_RX_PIN_ALTFUNC 7
#define UART_TX_PIN_ALTFUNC 7
#else
#endif
/* UART_DIV is 45.5625 => 115200 @ 84 MHz */
#define UART_DIV_FRACTION 9U /* Equals 9/16 = 0.5625 */