adam_prochazka/ProfilometerProbe
1
0
Fork 0
mirror of https://github.com/aprochazka/ProfilometerProbe.git synced 2025-07-05 20:17:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

buildable with cmake

Browse Source
This commit is contained in:
aprochazka
2023-02-28 20:33:38 +01:00
parent 8e1e540410
commit 7cc332c6cd
5 changed files with 179 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Firmware/.vscode/settings.json vendored
View File

@ -1,9 +1,16 @@
{ {
"files.associations": { "files.associations": {
"cdc_device.h": "c", "cdc_device.h": "c",
"tusb_option.h": "c", "tusb_option.h": "c",
"tusb.h": "c", "tusb.h": "c",
"stdbool.h": "c" "stdbool.h": "c",
}, "usbh_classdriver.h": "c",
"C_Cpp.errorSquiggles": "disabled" "tusb_common.h": "c",
} "tusb_types.h": "c",
"tusb_compiler.h": "c",
"tusb_verify.h": "c",
"tusb_debug.h": "c",
"tusb_timeout.h": "c"
},
"C_Cpp.errorSquiggles": "disabled"
}

4
Firmware/Core/Src/main.c
View File

@ -86,7 +86,7 @@ int main(void)
HAL_Init(); HAL_Init();
/* USER CODE BEGIN Init */ /* USER CODE BEGIN Init */
tusb_init(); // tusb_init();
/* USER CODE END Init */ /* USER CODE END Init */
@ -119,7 +119,7 @@ int main(void)
/* USER CODE BEGIN WHILE */ /* USER CODE BEGIN WHILE */
while (1) while (1)
{ {
tud_task(); // tud_task();
/* /*
Cam_Capture(&hspi1); Cam_Capture(&hspi1);

56
Firmware/Core/Src/stm32l4xx_it.c
View File

@ -67,8 +67,8 @@ extern PCD_HandleTypeDef hpcd_USB_FS;
/* Cortex-M4 Processor Interruption and Exception Handlers */ /* Cortex-M4 Processor Interruption and Exception Handlers */
/******************************************************************************/ /******************************************************************************/
/** /**
* @brief This function handles Non maskable interrupt. * @brief This function handles Non maskable interrupt.
*/ */
void NMI_Handler(void) void NMI_Handler(void)
{ {
/* USER CODE BEGIN NonMaskableInt_IRQn 0 */ /* USER CODE BEGIN NonMaskableInt_IRQn 0 */
@ -82,8 +82,8 @@ void NMI_Handler(void)
} }
/** /**
* @brief This function handles Hard fault interrupt. * @brief This function handles Hard fault interrupt.
*/ */
void HardFault_Handler(void) void HardFault_Handler(void)
{ {
/* USER CODE BEGIN HardFault_IRQn 0 */ /* USER CODE BEGIN HardFault_IRQn 0 */
@ -97,8 +97,8 @@ void HardFault_Handler(void)
} }
/** /**
* @brief This function handles Memory management fault. * @brief This function handles Memory management fault.
*/ */
void MemManage_Handler(void) void MemManage_Handler(void)
{ {
/* USER CODE BEGIN MemoryManagement_IRQn 0 */ /* USER CODE BEGIN MemoryManagement_IRQn 0 */
@ -112,8 +112,8 @@ void MemManage_Handler(void)
} }
/** /**
* @brief This function handles Prefetch fault, memory access fault. * @brief This function handles Prefetch fault, memory access fault.
*/ */
void BusFault_Handler(void) void BusFault_Handler(void)
{ {
/* USER CODE BEGIN BusFault_IRQn 0 */ /* USER CODE BEGIN BusFault_IRQn 0 */
@ -127,8 +127,8 @@ void BusFault_Handler(void)
} }
/** /**
* @brief This function handles Undefined instruction or illegal state. * @brief This function handles Undefined instruction or illegal state.
*/ */
void UsageFault_Handler(void) void UsageFault_Handler(void)
{ {
/* USER CODE BEGIN UsageFault_IRQn 0 */ /* USER CODE BEGIN UsageFault_IRQn 0 */
@ -142,8 +142,8 @@ void UsageFault_Handler(void)
} }
/** /**
* @brief This function handles System service call via SWI instruction. * @brief This function handles System service call via SWI instruction.
*/ */
void SVC_Handler(void) void SVC_Handler(void)
{ {
/* USER CODE BEGIN SVCall_IRQn 0 */ /* USER CODE BEGIN SVCall_IRQn 0 */
@ -155,8 +155,8 @@ void SVC_Handler(void)
} }
/** /**
* @brief This function handles Debug monitor. * @brief This function handles Debug monitor.
*/ */
void DebugMon_Handler(void) void DebugMon_Handler(void)
{ {
/* USER CODE BEGIN DebugMonitor_IRQn 0 */ /* USER CODE BEGIN DebugMonitor_IRQn 0 */
@ -168,8 +168,8 @@ void DebugMon_Handler(void)
} }
/** /**
* @brief This function handles Pendable request for system service. * @brief This function handles Pendable request for system service.
*/ */
void PendSV_Handler(void) void PendSV_Handler(void)
{ {
/* USER CODE BEGIN PendSV_IRQn 0 */ /* USER CODE BEGIN PendSV_IRQn 0 */
@ -181,8 +181,8 @@ void PendSV_Handler(void)
} }
/** /**
* @brief This function handles System tick timer. * @brief This function handles System tick timer.
*/ */
void SysTick_Handler(void) void SysTick_Handler(void)
{ {
/* USER CODE BEGIN SysTick_IRQn 0 */ /* USER CODE BEGIN SysTick_IRQn 0 */
@ -202,8 +202,8 @@ void SysTick_Handler(void)
/******************************************************************************/ /******************************************************************************/
/** /**
* @brief This function handles DMA1 channel2 global interrupt. * @brief This function handles DMA1 channel2 global interrupt.
*/ */
void DMA1_Channel2_IRQHandler(void) void DMA1_Channel2_IRQHandler(void)
{ {
/* USER CODE BEGIN DMA1_Channel2_IRQn 0 */ /* USER CODE BEGIN DMA1_Channel2_IRQn 0 */
@ -216,8 +216,8 @@ void DMA1_Channel2_IRQHandler(void)
} }
/** /**
* @brief This function handles DMA1 channel3 global interrupt. * @brief This function handles DMA1 channel3 global interrupt.
*/ */
void DMA1_Channel3_IRQHandler(void) void DMA1_Channel3_IRQHandler(void)
{ {
/* USER CODE BEGIN DMA1_Channel3_IRQn 0 */ /* USER CODE BEGIN DMA1_Channel3_IRQn 0 */
@ -230,8 +230,8 @@ void DMA1_Channel3_IRQHandler(void)
} }
/** /**
* @brief This function handles USART2 global interrupt. * @brief This function handles USART2 global interrupt.
*/ */
void USART2_IRQHandler(void) void USART2_IRQHandler(void)
{ {
/* USER CODE BEGIN USART2_IRQn 0 */ /* USER CODE BEGIN USART2_IRQn 0 */
@ -244,14 +244,14 @@ void USART2_IRQHandler(void)
} }
/** /**
* @brief This function handles USB event interrupt through EXTI line 17. * @brief This function handles USB event interrupt through EXTI line 17.
*/ */
void USB_IRQHandler(void) void USB_IRQHandler(void)
{ {
/* USER CODE BEGIN USB_IRQn 0 */ /* USER CODE BEGIN USB_IRQn 0 */
tud_int_handler(0); // tud_int_handler(0);
return; // return;
/* USER CODE END USB_IRQn 0 */ /* USER CODE END USB_IRQn 0 */
HAL_PCD_IRQHandler(&hpcd_USB_FS); HAL_PCD_IRQHandler(&hpcd_USB_FS);
/* USER CODE BEGIN USB_IRQn 1 */ /* USER CODE BEGIN USB_IRQn 1 */

1
Firmware/Core/tinyusb/src/device/usbd.h
View File

@ -28,6 +28,7 @@
#define _TUSB_USBD_H_ #define _TUSB_USBD_H_
#include "common/tusb_common.h" #include "common/tusb_common.h"
#include "msc.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"

368
Firmware/Makefile
View File

@ -1,235 +1,133 @@
########################################################################################################################## .PHONY: all build build-container cmake format format-linux flash-stlink flash-jlink format-container shell image build-container clean clean-image clean-all
# File automatically-generated by tool: [projectgenerator] version: [3.18.0-B7] date: [Thu Feb 23 10:07:32 CET 2023] ############################### Native Makefile ###############################
##########################################################################################################################
PROJECT_NAME ?= Probe
# ------------------------------------------------ BUILD_DIR ?= build
# Generic Makefile (based on gcc) FIRMWARE := $(BUILD_DIR)/$(PROJECT_NAME).bin
# BUILD_TYPE ?= Debug
# ChangeLog : PLATFORM = $(if $(OS),$(OS),$(shell uname -s))
# 2017-02-10 - Several enhancements + project update mode
# 2015-07-22 - first version ifeq ($(PLATFORM),Windows_NT)
# ------------------------------------------------ BUILD_SYSTEM ?= MinGW Makefiles
else
###################################### ifeq ($(PLATFORM),Linux)
# target BUILD_SYSTEM ?= Unix Makefiles
###################################### else
TARGET = Probe @echo "Unsuported platform"
exit 1
endif
###################################### endif
# building variables
###################################### all: build
# debug build?
DEBUG = 1 build: cmake
# optimization $(MAKE) -C $(BUILD_DIR) --no-print-directory
OPT = -Og
cmake: $(BUILD_DIR)/Makefile
####################################### $(BUILD_DIR)/Makefile: CMakeLists.txt
# paths cmake \
####################################### -G "$(BUILD_SYSTEM)" \
# Build path -B$(BUILD_DIR) \
BUILD_DIR = build -DPROJECT_NAME=$(PROJECT_NAME) \
-DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \
###################################### -DDUMP_ASM=OFF
# source
###################################### # Formats all user modified source files (add ones that are missing)
# C sources SRCS := $(shell find Project -name '*.[ch]' -or -name '*.[ch]pp') Core/Src/main.c
C_SOURCES = \ format: $(addsuffix .format,$(SRCS))
Core/Src/main.c \ %.format: %
Core/Src/stm32l4xx_it.c \ clang-format -i $<
Core/Src/stm32l4xx_hal_msp.c \
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c.c \ # Formats all CubeMX generated sources to unix style - removes \r from line endings
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c_ex.c \ # Add any new directories, like Middlewares and hidden files
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal.c \ HIDDEN_FILES := .mxproject .project .cproject
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc.c \ FOUND_HIDDEN_FILES := $(shell for f in $(HIDDEN_FILES);do if [[ -e $$f ]]; then echo $$f;fi; done)
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc_ex.c \ FORMAT_LINUX := $(shell find Core Drivers -name '*' -type f; find . -name '*.ioc') $(FOUND_HIDDEN_FILES)
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash.c \
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ex.c \ format-linux: $(addsuffix .format-linux,$(FORMAT_LINUX))
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ramfunc.c \ %.format-linux: %
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_gpio.c \ $(if $(filter $(PLATFORM),Linux),dos2unix -q $<,)
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma.c \
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma_ex.c \ # Device specific!
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr.c \ DEVICE ?= STM32F407VG
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr_ex.c \
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_cortex.c \ flash-st: build
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_exti.c \ st-flash --reset write $(FIRMWARE) 0x08000000
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi.c \
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi_ex.c \ $(BUILD_DIR)/jlink-script:
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim.c \ touch $@
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim_ex.c \ @echo device $(DEVICE) > $@
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart.c \ @echo si 1 >> $@
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart_ex.c \ @echo speed 4000 >> $@
Core/Src/system_stm32l4xx.c \ @echo loadfile $(FIRMWARE),0x08000000 >> $@
Core/Cam/Cam.c \ @echo -e "r\ng\nqc" >> $@
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pcd.c \
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pcd_ex.c \ flash-jlink: build | $(BUILD_DIR)/jlink-script
Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_ll_usb.c \ JLinkExe -commanderScript $(BUILD_DIR)/jlink-script
Core/src/tusb.c \
Core/src/common/tusb_fifo.c \ clean:
Core/src/device/usbd.c \ rm -rf $(BUILD_DIR)
Core/src/device/usbd_control.c \
Core/src/class/audio/audio_device.c \ ################################## Container ##################################
Core/src/class/cdc/cdc_device.c \
Core/src/class/dfu/dfu_device.c \ UID ?= $(shell id -u)
Core/src/class/dfu/dfu_rt_device.c \ GID ?= $(shell id -g)
Core/src/class/hid/hid_device.c \ USER ?= $(shell id -un)
Core/src/class/midi/midi_device.c \ GROUP ?= $(if $(filter $(PLATFORM), Windows_NT),$(shell id -un),$(shell id -gn))
Core/src/class/msc/msc_device.c \
Core/src/class/net/ecm_rndis_device.c \ ifeq ($(PLATFORM),Windows_NT)
Core/src/class/net/ncm_device.c \ WIN_PREFIX = winpty
Core/src/class/usbtmc/usbtmc_device.c \ WORKDIR_PATH = "//workdir"
Core/src/class/video/video_device.c \ WORKDIR_VOLUME = "/$$(pwd -W):/workdir"
Core/src/class/vendor/vendor_device.c else
WORKDIR_PATH = /workdir
# ASM sources WORKDIR_VOLUME = "$$(pwd):/workdir"
ASM_SOURCES = \ endif
startup_stm32l432xx.s
CONTAINER_TOOL ?= docker
CONTAINER_FILE := Dockerfile
####################################### IMAGE_NAME := fedora-arm-embedded-dev
# binaries CONTAINER_NAME := fedora-arm-embedded-dev
#######################################
PREFIX = arm-none-eabi- NEED_IMAGE = $(shell $(CONTAINER_TOOL) image inspect $(IMAGE_NAME) 2> /dev/null > /dev/null || echo image)
# The gcc compiler bin path can be either defined in make command via GCC_PATH variable (> make GCC_PATH=xxx) # usefull if you have a always running container in the background: NEED_CONTAINER = $(shell $(CONTAINER_TOOL) container inspect $(CONTAINER_NAME) 2> /dev/null > /dev/null || echo container)
# either it can be added to the PATH environment variable. PODMAN_ARG = $(if $(filter $(CONTAINER_TOOL), podman),--userns=keep-id,)
ifdef GCC_PATH CONTAINER_RUN = $(WIN_PREFIX) $(CONTAINER_TOOL) run \
CC = $(GCC_PATH)/$(PREFIX)gcc --name $(CONTAINER_NAME) \
AS = $(GCC_PATH)/$(PREFIX)gcc -x assembler-with-cpp --rm \
CP = $(GCC_PATH)/$(PREFIX)objcopy -it \
SZ = $(GCC_PATH)/$(PREFIX)size $(PODMAN_ARG) \
else -v $(WORKDIR_VOLUME) \
CC = $(PREFIX)gcc -w $(WORKDIR_PATH) \
AS = $(PREFIX)gcc -x assembler-with-cpp --security-opt label=disable \
CP = $(PREFIX)objcopy --hostname $(CONTAINER_NAME) \
SZ = $(PREFIX)size $(IMAGE_NAME)
endif
HEX = $(CP) -O ihex build-container: $(NEED_IMAGE)
BIN = $(CP) -O binary -S $(CONTAINER_RUN) bash -lc 'make -j$(shell nproc)'
####################################### format-container:
# CFLAGS $(CONTAINER_RUN) bash -lc 'make format -j$(shell nproc)'
#######################################
# cpu format-linux-container:
CPU = -mcpu=cortex-m4 $(CONTAINER_RUN) bash -lc 'make format-linux'
# fpu shell:
FPU = -mfpu=fpv4-sp-d16 $(CONTAINER_RUN) bash -l
# float-abi image: $(CONTAINER_FILE)
FLOAT-ABI = -mfloat-abi=hard $(CONTAINER_TOOL) build \
-t $(IMAGE_NAME) \
# mcu -f=$(CONTAINER_FILE) \
MCU = $(CPU) -mthumb $(FPU) $(FLOAT-ABI) --build-arg UID=$(UID) \
--build-arg GID=$(GID) \
# macros for gcc --build-arg USERNAME=$(USER) \
# AS defines --build-arg GROUPNAME=$(GROUP) \
AS_DEFS = .
# C defines clean-image:
C_DEFS = \ $(CONTAINER_TOOL) container rm -f $(CONTAINER_NAME) 2> /dev/null > /dev/null || true
-DUSE_HAL_DRIVER \ $(CONTAINER_TOOL) image rmi -f $(IMAGE_NAME) 2> /dev/null > /dev/null || true
-DSTM32L432xx
clean-all: clean clean-image
# AS includes
AS_INCLUDES =
# C includes
C_INCLUDES = \
-ICore/Inc \
-IDrivers/STM32L4xx_HAL_Driver/Inc \
-IDrivers/STM32L4xx_HAL_Driver/Inc/Legacy \
-IDrivers/CMSIS/Device/ST/STM32L4xx/Include \
-IDrivers/CMSIS/Include \
-ICore/Cam \
-ICore/tinyusb \
-ICore/tinyusb/src \
-ICore/tinyusb/src/common \
-ICore/tinyusb/src/class \
-ICore/tinyusb/src/device
# compile gcc flags
ASFLAGS = $(MCU) $(AS_DEFS) $(AS_INCLUDES) $(OPT) -Wall -fdata-sections -ffunction-sections -ggdb -fsingle-precision-constant -fno-strict-aliasing
CFLAGS += $(MCU) $(C_DEFS) $(C_INCLUDES) $(OPT) -Wall -fdata-sections -ffunction-sections -ggdb -fsingle-precision-constant -fno-strict-aliasing
ifeq ($(DEBUG), 1)
CFLAGS += -g -gdwarf-2
endif
# Generate dependency information
CFLAGS += -MMD -MP -MF"$(@:%.o=%.d)"
#######################################
# LDFLAGS
#######################################
# link script
LDSCRIPT = STM32L432KCUx_FLASH.ld
# libraries
LIBS = -lc -lm -lnosys
LIBDIR =
LDFLAGS = $(MCU) -specs=nano.specs -T$(LDSCRIPT) $(LIBDIR) $(LIBS) -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref -Wl,--gc-sections
# default action: build all
all: $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).bin
flash_build: $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).bin
#######################################
# build the application
#######################################
# list of objects
OBJECTS = $(addprefix $(BUILD_DIR)/,$(notdir $(C_SOURCES:.c=.o)))
vpath %.c $(sort $(dir $(C_SOURCES)))
# list of ASM program objects
OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASM_SOURCES:.s=.o)))
vpath %.s $(sort $(dir $(ASM_SOURCES)))
$(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR)
$(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:.c=.lst)) $< -o $@
$(BUILD_DIR)/%.o: %.s Makefile | $(BUILD_DIR)
$(AS) -c $(CFLAGS) $< -o $@
$(BUILD_DIR)/$(TARGET).elf: $(OBJECTS) Makefile
$(CC) $(OBJECTS) $(LDFLAGS) -o $@
$(SZ) $@
$(BUILD_DIR)/%.hex: $(BUILD_DIR)/%.elf | $(BUILD_DIR)
$(HEX) $< $@
$(BUILD_DIR)/%.bin: $(BUILD_DIR)/%.elf | $(BUILD_DIR)
$(BIN) $< $@
$(BUILD_DIR):
mkdir $@
#######################################
# clean up
#######################################
clean:
-rm -fR $(BUILD_DIR)
#######################################
# dependencies
#######################################
-include $(wildcard $(BUILD_DIR)/*.d)
DEPENDENCIES := $(OBJECTS:.o=.d)
-include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)
-include $(DEPENDENCIES)
# Flash
flash: flash_build
openocd -f interface/stlink.cfg -f target/stm32l4x.cfg -c "program build/$(TARGET).bin verify reset exit 0x08000000"
reset:
openocd -f interface/stlink.cfg -f target/stm32l4x.cfg -c init -c "reset halt"
# *** EOF ***