clyne
/
stmdsp
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

fix trig funcs; idle sleep w/ button to wake for debug

Browse Source
pull/3/head
Clyne 4 years ago
parent e132d52adf
commit 1a14ef827e
3 changed files with 236 additions and 214 deletions
Show Stats Download Patch File Download Diff File

374
Makefile
Unescape Escape View File

@ -1,187 +1,187 @@
############################################################################## ##############################################################################
# Build global options # Build global options
# NOTE: Can be overridden externally. # NOTE: Can be overridden externally.
# #
# Compiler options here. # Compiler options here.
ifeq ($(USE_OPT),) ifeq ($(USE_OPT),)
USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16 --specs=nosys.specs USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16 --specs=nosys.specs
endif endif
# C specific options here (added to USE_OPT). # C specific options here (added to USE_OPT).
ifeq ($(USE_COPT),) ifeq ($(USE_COPT),)
USE_COPT = USE_COPT =
endif endif
# C++ specific options here (added to USE_OPT). # C++ specific options here (added to USE_OPT).
ifeq ($(USE_CPPOPT),) ifeq ($(USE_CPPOPT),)
USE_CPPOPT = -std=c++17 -fno-rtti USE_CPPOPT = -std=c++17 -fno-rtti
endif endif
# Enable this if you want the linker to remove unused code and data. # Enable this if you want the linker to remove unused code and data.
ifeq ($(USE_LINK_GC),) ifeq ($(USE_LINK_GC),)
USE_LINK_GC = yes USE_LINK_GC = yes
endif endif
# Linker extra options here. # Linker extra options here.
ifeq ($(USE_LDOPT),) ifeq ($(USE_LDOPT),)
USE_LDOPT = USE_LDOPT =
endif endif
# Enable this if you want link time optimizations (LTO). # Enable this if you want link time optimizations (LTO).
ifeq ($(USE_LTO),) ifeq ($(USE_LTO),)
USE_LTO = yes USE_LTO = yes
endif endif
# Enable this if you want to see the full log while compiling. # Enable this if you want to see the full log while compiling.
ifeq ($(USE_VERBOSE_COMPILE),) ifeq ($(USE_VERBOSE_COMPILE),)
USE_VERBOSE_COMPILE = no USE_VERBOSE_COMPILE = no
endif endif
# If enabled, this option makes the build process faster by not compiling # If enabled, this option makes the build process faster by not compiling
# modules not used in the current configuration. # modules not used in the current configuration.
ifeq ($(USE_SMART_BUILD),) ifeq ($(USE_SMART_BUILD),)
USE_SMART_BUILD = yes USE_SMART_BUILD = yes
endif endif
# #
# Build global options # Build global options
############################################################################## ##############################################################################
############################################################################## ##############################################################################
# Architecture or project specific options # Architecture or project specific options
# #
# Stack size to be allocated to the Cortex-M process stack. This stack is # Stack size to be allocated to the Cortex-M process stack. This stack is
# the stack used by the main() thread. # the stack used by the main() thread.
ifeq ($(USE_PROCESS_STACKSIZE),) ifeq ($(USE_PROCESS_STACKSIZE),)
USE_PROCESS_STACKSIZE = 0x400 USE_PROCESS_STACKSIZE = 0x400
endif endif
# Stack size to the allocated to the Cortex-M main/exceptions stack. This # Stack size to the allocated to the Cortex-M main/exceptions stack. This
# stack is used for processing interrupts and exceptions. # stack is used for processing interrupts and exceptions.
ifeq ($(USE_EXCEPTIONS_STACKSIZE),) ifeq ($(USE_EXCEPTIONS_STACKSIZE),)
USE_EXCEPTIONS_STACKSIZE = 0x400 USE_EXCEPTIONS_STACKSIZE = 0x400
endif endif
# Enables the use of FPU (no, softfp, hard). # Enables the use of FPU (no, softfp, hard).
ifeq ($(USE_FPU),) ifeq ($(USE_FPU),)
USE_FPU = hard USE_FPU = hard
endif endif
# FPU-related options. # FPU-related options.
ifeq ($(USE_FPU_OPT),) ifeq ($(USE_FPU_OPT),)
USE_FPU_OPT = -mfloat-abi=$(USE_FPU) -mfpu=fpv5-d16 USE_FPU_OPT = -mfloat-abi=$(USE_FPU) -mfpu=fpv5-d16
endif endif
# #
# Architecture or project specific options # Architecture or project specific options
############################################################################## ##############################################################################
############################################################################## ##############################################################################
# Project, target, sources and paths # Project, target, sources and paths
# #
# Define project name here # Define project name here
PROJECT = ch PROJECT = ch
# Target settings. # Target settings.
MCU = cortex-m7 MCU = cortex-m7
# Imported source files and paths. # Imported source files and paths.
CHIBIOS := ./ChibiOS_20.3.2 CHIBIOS := ./ChibiOS_20.3.2
CONFDIR := ./cfg CONFDIR := ./cfg
BUILDDIR := ./build BUILDDIR := ./build
DEPDIR := ./.dep DEPDIR := ./.dep
# Licensing files. # Licensing files.
include $(CHIBIOS)/os/license/license.mk include $(CHIBIOS)/os/license/license.mk
# Startup files. # Startup files.
include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32h7xx.mk include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32h7xx.mk
# HAL-OSAL files (optional). # HAL-OSAL files (optional).
include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/ports/STM32/STM32H7xx/platform.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32H7xx/platform.mk
include ./board/board.mk include ./board/board.mk
include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk
# RTOS files (optional). # RTOS files (optional).
include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Auto-build files in ./source recursively. # Auto-build files in ./source recursively.
include $(CHIBIOS)/tools/mk/autobuild.mk include $(CHIBIOS)/tools/mk/autobuild.mk
# Other files (optional). # Other files (optional).
#include $(CHIBIOS)/test/lib/test.mk #include $(CHIBIOS)/test/lib/test.mk
#include $(CHIBIOS)/test/rt/rt_test.mk #include $(CHIBIOS)/test/rt/rt_test.mk
#include $(CHIBIOS)/test/oslib/oslib_test.mk #include $(CHIBIOS)/test/oslib/oslib_test.mk
# Define linker script file here # Define linker script file here
LDSCRIPT= STM32H723xG.ld LDSCRIPT= STM32H723xG.ld
# C sources that can be compiled in ARM or THUMB mode depending on the global # C sources that can be compiled in ARM or THUMB mode depending on the global
# setting. # setting.
CSRC = $(ALLCSRC) CSRC = $(ALLCSRC)
# C++ sources that can be compiled in ARM or THUMB mode depending on the global # C++ sources that can be compiled in ARM or THUMB mode depending on the global
# setting. # setting.
CPPSRC = $(ALLCPPSRC) CPPSRC = $(ALLCPPSRC)
# List ASM source files here. # List ASM source files here.
ASMSRC = $(ALLASMSRC) ASMSRC = $(ALLASMSRC)
# List ASM with preprocessor source files here. # List ASM with preprocessor source files here.
ASMXSRC = $(ALLXASMSRC) ASMXSRC = $(ALLXASMSRC)
# Inclusion directories. # Inclusion directories.
INCDIR = $(CONFDIR) $(ALLINC) $(TESTINC) INCDIR = $(CONFDIR) $(ALLINC) $(TESTINC)
# Define C warning options here. # Define C warning options here.
CWARN = -Wall -Wextra -Wundef -Wstrict-prototypes CWARN = -Wall -Wextra -Wundef -Wstrict-prototypes
# Define C++ warning options here. # Define C++ warning options here.
CPPWARN = -Wall -Wextra -Wundef CPPWARN = -Wall -Wextra -Wundef
# #
# Project, target, sources and paths # Project, target, sources and paths
############################################################################## ##############################################################################
############################################################################## ##############################################################################
# Start of user section # Start of user section
# #
# List all user C define here, like -D_DEBUG=1 # List all user C define here, like -D_DEBUG=1
UDEFS = -DCORTEX_ENABLE_WFI_IDLE=FALSE -DPORT_USE_SYSCALL=TRUE UDEFS = -DCORTEX_ENABLE_WFI_IDLE=TRUE -DPORT_USE_SYSCALL=TRUE
# Define ASM defines here # Define ASM defines here
UADEFS = UADEFS =
# List all user directories here # List all user directories here
UINCDIR = UINCDIR =
# List the user directory to look for the libraries here # List the user directory to look for the libraries here
ULIBDIR = ULIBDIR =
# List all user libraries here # List all user libraries here
ULIBS = ULIBS =
# #
# End of user section # End of user section
############################################################################## ##############################################################################
############################################################################## ##############################################################################
# Common rules # Common rules
# #
RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/arm-none-eabi.mk include $(RULESPATH)/arm-none-eabi.mk
include $(RULESPATH)/rules.mk include $(RULESPATH)/rules.mk
# #
# Common rules # Common rules
############################################################################## ##############################################################################
############################################################################## ##############################################################################
# Custom rules # Custom rules
# #
# #
# Custom rules # Custom rules
############################################################################## ##############################################################################

62
source/cordic.cpp
Unescape Escape View File

@ -12,71 +12,79 @@ static void prepare() {
while (CORDIC->CSR & CORDIC_CSR_RRDY) while (CORDIC->CSR & CORDIC_CSR_RRDY)
asm("mov r0, %0" :: "r" (CORDIC->RDATA)); asm("mov r0, %0" :: "r" (CORDIC->RDATA));
} }
static uint32_t dtoq(double in) {
double res = in * 0x7FFFFFFF; static uint32_t dtoq(double) {
int32_t resi = res; uint32_t res;
return resi; asm("vcvt.s32.f64 d0, d0, #31;"
"vmov %0, r5, d0"
: "=r" (res));
return res;
} }
static double qtod(uint32_t in) { __attribute__((naked))
int32_t ini = in; static double qtod(uint32_t) {
double res = ini; asm("eor r1, r1;"
return res / 0x7FFFFFFF; "vmov d0, r0, r1;"
"vcvt.f64.s32 d0, d0, #31;"
"bx lr");
return 0;
} }
__attribute__((naked)) __attribute__((naked))
double mod(double n, double) { double mod(double, double) {
asm("vdiv.f64 d2, d0, d1;" asm("vdiv.f64 d2, d0, d1;"
"vrintz.f64 d2;" "vrintz.f64 d2;"
"vmul.f64 d1, d1, d2;" "vmul.f64 d1, d1, d2;"
"vsub.f64 d0, d0, d1;" "vsub.f64 d0, d0, d1;"
"bx lr"); "bx lr");
return n; return 0;
} }
double cos(double x) { double cos(double x) {
x = (mod(x, 2 * math::PI) - math::PI) / math::PI; x = mod(x, 2 * math::PI) / math::PI;
auto input = dtoq(x > 1. ? x - 2 : x);
prepare(); prepare();
CORDIC->CSR = CORDIC_CSR_NARGS | CORDIC_CSR_NRES | CORDIC->CSR = CORDIC_CSR_NARGS | CORDIC_CSR_NRES |
(6 << CORDIC_CSR_PRECISION_Pos) | (6 << CORDIC_CSR_PRECISION_Pos) |
(0 << CORDIC_CSR_FUNC_Pos); (0 << CORDIC_CSR_FUNC_Pos);
auto in = dtoq(x); CORDIC->WDATA = input;
CORDIC->WDATA = in; CORDIC->WDATA = input;
CORDIC->WDATA = in & 0x7FFFFFFF;
while (!(CORDIC->CSR & CORDIC_CSR_RRDY)); while (!(CORDIC->CSR & CORDIC_CSR_RRDY));
double cosx = qtod(CORDIC->RDATA) / x; double cosx = qtod(CORDIC->RDATA) / x;
in = CORDIC->RDATA; [[maybe_unused]] auto sinx = CORDIC->RDATA;
return cosx; return cosx;
} }
double sin(double x) { double sin(double x) {
x = (mod(x, 2 * math::PI) - math::PI) / math::PI; x = mod(x, 2 * math::PI) / math::PI;
auto input = dtoq(x > 1. ? x - 2 : x);
prepare(); prepare();
CORDIC->CSR = CORDIC_CSR_NARGS | CORDIC_CSR_NRES | CORDIC->CSR = CORDIC_CSR_NARGS | CORDIC_CSR_NRES |
(6 << CORDIC_CSR_PRECISION_Pos) | (6 << CORDIC_CSR_PRECISION_Pos) |
(1 << CORDIC_CSR_FUNC_Pos); (1 << CORDIC_CSR_FUNC_Pos);
auto in = dtoq(x); CORDIC->WDATA = input;
CORDIC->WDATA = in; CORDIC->WDATA = input;
CORDIC->WDATA = in & 0x7FFFFFFF;
while (!(CORDIC->CSR & CORDIC_CSR_RRDY)); while (!(CORDIC->CSR & CORDIC_CSR_RRDY));
double sinx = qtod(CORDIC->RDATA) / x; double sinx = qtod(CORDIC->RDATA) / x;
in = CORDIC->RDATA; [[maybe_unused]] auto cosx = CORDIC->RDATA;
return sinx; return sinx;
} }
double tan(double x) { double tan(double x) {
x = (mod(x, 2 * math::PI) - math::PI) / math::PI; x = mod(x, 2 * math::PI) / math::PI;
auto input = dtoq(x > 1. ? x - 2 : x);
prepare(); prepare();
CORDIC->CSR = CORDIC_CSR_NARGS | CORDIC_CSR_NRES | CORDIC->CSR = CORDIC_CSR_NARGS | CORDIC_CSR_NRES |
(6 << CORDIC_CSR_PRECISION_Pos) | (6 << CORDIC_CSR_PRECISION_Pos) |
(1 << CORDIC_CSR_FUNC_Pos); (1 << CORDIC_CSR_FUNC_Pos);
auto in = dtoq(x); CORDIC->WDATA = input;
CORDIC->WDATA = in; CORDIC->WDATA = input;
CORDIC->WDATA = in & 0x7FFFFFFF;
while (!(CORDIC->CSR & CORDIC_CSR_RRDY)); while (!(CORDIC->CSR & CORDIC_CSR_RRDY));
double sinx = qtod(CORDIC->RDATA) / x; double sinx = qtod(CORDIC->RDATA) / x;
@ -85,9 +93,9 @@ double tan(double x) {
} }
__attribute__((naked)) __attribute__((naked))
double sqrt(double x) { double sqrt(double) {
asm("vsqrt.f64 d0, d0; bx lr"); asm("vsqrt.f64 d0, d0; bx lr");
return x; return 0.;
} }
} }

14
source/main.cpp
Unescape Escape View File

@ -75,6 +75,8 @@ int main()
halInit(); halInit();
chSysInit(); chSysInit();
palSetLineMode(LINE_BUTTON, PAL_MODE_INPUT);
// Enable FPU // Enable FPU
SCB->CPACR |= 0xF << 20; SCB->CPACR |= 0xF << 20;
@ -353,6 +355,18 @@ THD_FUNCTION(Thread1, arg)
palClearLine(led); palClearLine(led);
chThdSleepMilliseconds(delay); chThdSleepMilliseconds(delay);
if (run_status == RunStatus::Idle && palReadLine(LINE_BUTTON)) {
palSetLine(LINE_LED_RED);
palSetLine(LINE_LED_YELLOW);
asm("cpsid i");
while (!palReadLine(LINE_BUTTON))
asm("nop");
asm("cpsie i");
palClearLine(LINE_LED_RED);
palClearLine(LINE_LED_YELLOW);
chThdSleepMilliseconds(500);
}
if (auto err = EM.hasError(); err ^ erroron) { if (auto err = EM.hasError(); err ^ erroron) {
erroron = err; erroron = err;
if (err) if (err)

Write Preview
Loading…
Cancel
Save