Compare commits
No commits in common. "f8076920fe15a63faf961f78e1849c464d6ebe36" and "a35f66f2cd98d6e6eaa0ea179bee245a46b3c0ab" have entirely different histories.
f8076920fe
...
a35f66f2cd
@ -15,7 +15,7 @@ LIBRARIES = -larm_cortexM4lf_math -lm
|
|||||||
DEFINES = -DSTM32F407xx -DSTM32F4XX -DARM_MATH_CM4 -DHSE_VALUE=8000000UL
|
DEFINES = -DSTM32F407xx -DSTM32F4XX -DARM_MATH_CM4 -DHSE_VALUE=8000000UL
|
||||||
mapfile = memory-mapping
|
mapfile = memory-mapping
|
||||||
|
|
||||||
export GIT_VER = $(shell git describe --always --dirty --tags)
|
GIT_VER := $(shell git describe --always --dirty --tags)
|
||||||
DEFINES += -DGIT_VER=$(GIT_VER)
|
DEFINES += -DGIT_VER=$(GIT_VER)
|
||||||
|
|
||||||
ifneq ($(VERBOSE),true)
|
ifneq ($(VERBOSE),true)
|
||||||
@ -81,7 +81,6 @@ $(target).elf: $(OBJ) $(ASOBJ)
|
|||||||
@echo [LD] $@
|
@echo [LD] $@
|
||||||
$(QUIET)$(CC) $(LFLAGS) $(LIBRARYPATH) -o $@ $^ $(LIBRARIES)
|
$(QUIET)$(CC) $(LFLAGS) $(LIBRARYPATH) -o $@ $^ $(LIBRARIES)
|
||||||
$(QUIET)$(SIZE) $@
|
$(QUIET)$(SIZE) $@
|
||||||
@echo "Built Version $(GIT_VER)"
|
|
||||||
|
|
||||||
#Compiling
|
#Compiling
|
||||||
$(OBJ):
|
$(OBJ):
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1,20 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
SOURCE="${BASH_SOURCE[0]}"
|
|
||||||
while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
|
|
||||||
DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null && pwd )"
|
|
||||||
SOURCE="$(readlink "$SOURCE")"
|
|
||||||
[[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
|
|
||||||
done
|
|
||||||
DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null && pwd )"
|
|
||||||
cd "$DIR"
|
|
||||||
|
|
||||||
export PROJECT_NUMBER=`git describe --always --tags --dirty`
|
|
||||||
|
|
||||||
if [ $# != 1 ]; then
|
|
||||||
export OUTPUT_DIRECTORY="./output"
|
|
||||||
else
|
|
||||||
export OUTPUT_DIRECTORY="$1"
|
|
||||||
fi
|
|
||||||
|
|
||||||
doxygen Doxyconfig
|
|
3
stm-firmware/doxygen/output/.gitignore
vendored
3
stm-firmware/doxygen/output/.gitignore
vendored
@ -1,3 +0,0 @@
|
|||||||
*
|
|
||||||
*/
|
|
||||||
!.gitignore
|
|
@ -18,10 +18,6 @@
|
|||||||
* If not, see <http://www.gnu.org/licenses/>.
|
* If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
|
||||||
* @file systick.h
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __SYSTICK_H__
|
#ifndef __SYSTICK_H__
|
||||||
#define __SYSTICK_H__
|
#define __SYSTICK_H__
|
||||||
|
|
||||||
|
@ -18,15 +18,6 @@
|
|||||||
* If not, see <http://www.gnu.org/licenses/>.
|
* If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
|
||||||
* @file dma-ring-buffer.h
|
|
||||||
* @brief Header for DMA Ring buffer implemenation
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @defgroup dma-ring-buffer DMA Ring Buffers from and to Peripherals
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __DMA_RING_BUFFER_H__
|
#ifndef __DMA_RING_BUFFER_H__
|
||||||
#define __DMA_RING_BUFFER_H__
|
#define __DMA_RING_BUFFER_H__
|
||||||
|
|
||||||
@ -34,11 +25,6 @@
|
|||||||
#include <stm32/stm32f4xx.h>
|
#include <stm32/stm32f4xx.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
|
||||||
/**
|
|
||||||
* @addtogroup dma-ring-buffer
|
|
||||||
* @{
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief DMA ring buffer for data transfer from peripheral to memory
|
* @brief DMA ring buffer for data transfer from peripheral to memory
|
||||||
*/
|
*/
|
||||||
@ -138,8 +124,6 @@ void dma_ring_buffer_mem_to_periph_int_callback(struct dma_ring_buffer_to_periph
|
|||||||
*/
|
*/
|
||||||
void dma_ring_buffer_mem_to_periph_stop(struct dma_ring_buffer_to_periph *buff);
|
void dma_ring_buffer_mem_to_periph_stop(struct dma_ring_buffer_to_periph *buff);
|
||||||
|
|
||||||
/** @} */
|
|
||||||
|
|
||||||
#endif /* __DMA_RING_BUFFER_H__ */
|
#endif /* __DMA_RING_BUFFER_H__ */
|
||||||
|
|
||||||
|
|
||||||
|
@ -18,11 +18,6 @@
|
|||||||
* If not, see <http://www.gnu.org/licenses/>.
|
* If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
|
||||||
* @file main.c
|
|
||||||
* @brief Main file for firmware
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
/* #include <arm_math.h> */
|
/* #include <arm_math.h> */
|
||||||
|
@ -18,16 +18,6 @@
|
|||||||
* If not, see <http://www.gnu.org/licenses/>.
|
* If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
|
||||||
* @file dma-ring-buffer.c
|
|
||||||
* @brief DMA Ring buffer implemenation
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @addtogroup dma-ring-buffer
|
|
||||||
* @{
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <stm-periph/dma-ring-buffer.h>
|
#include <stm-periph/dma-ring-buffer.h>
|
||||||
#include <stm-periph/clock-enable-manager.h>
|
#include <stm-periph/clock-enable-manager.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
@ -288,5 +278,3 @@ void dma_ring_buffer_mem_to_periph_stop(struct dma_ring_buffer_to_periph *buff)
|
|||||||
/* Reset the structure */
|
/* Reset the structure */
|
||||||
memset(buff, 0, sizeof(struct dma_ring_buffer_to_periph));
|
memset(buff, 0, sizeof(struct dma_ring_buffer_to_periph));
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @} */
|
|
||||||
|
@ -18,10 +18,6 @@
|
|||||||
* If not, see <http://www.gnu.org/licenses/>.
|
* If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
|
||||||
* @file systick.c
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <reflow-controller/systick.h>
|
#include <reflow-controller/systick.h>
|
||||||
#include <stm32/stm32f4xx.h>
|
#include <stm32/stm32f4xx.h>
|
||||||
#include <cmsis/core_cm4.h>
|
#include <cmsis/core_cm4.h>
|
||||||
@ -35,6 +31,14 @@ void systick_setup(void)
|
|||||||
SysTick_Config(SYSTICK_RELOAD);
|
SysTick_Config(SYSTICK_RELOAD);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Wait for x milliseconds
|
||||||
|
*
|
||||||
|
* This function is not reentrant and must not be called from an interrupt
|
||||||
|
*
|
||||||
|
* @warning Do not use in interrupt context
|
||||||
|
* @param ms wait time in ms
|
||||||
|
*/
|
||||||
void systick_wait_ms(uint32_t ms)
|
void systick_wait_ms(uint32_t ms)
|
||||||
{
|
{
|
||||||
wait_tick_ms = 0UL;
|
wait_tick_ms = 0UL;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user