buildable with cmake

Firmware/.vscode/settings.json

@@ -3,7 +3,14 @@
     "cdc_device.h": "c",
     "tusb_option.h": "c",
     "tusb.h": "c",
-        "stdbool.h": "c"
+    "stdbool.h": "c",
+    "usbh_classdriver.h": "c",
+    "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"
 }

Firmware/Core/Src/main.c

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

Firmware/Core/Src/stm32l4xx_it.c

@@ -250,8 +250,8 @@ void USB_IRQHandler(void)
 {
   /* USER CODE BEGIN USB_IRQn 0 */
 
-  tud_int_handler(0);
+  // tud_int_handler(0);
-  return;
+  // return;
   /* USER CODE END USB_IRQn 0 */
   HAL_PCD_IRQHandler(&hpcd_USB_FS);
   /* USER CODE BEGIN USB_IRQn 1 */

Firmware/Core/tinyusb/src/device/usbd.h

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

Firmware/Makefile

@@ -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
-######################################
-TARGET = Probe
-
-
-######################################
-# building variables
-######################################
-# debug build?
-DEBUG = 1
-# optimization
-OPT = -Og
-
-
-#######################################
-# paths
-#######################################
-# Build path
-BUILD_DIR = build
-
-######################################
-# source
-######################################
-# C sources
-C_SOURCES =  \
-Core/Src/main.c \
-Core/Src/stm32l4xx_it.c \
-Core/Src/stm32l4xx_hal_msp.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c_ex.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc_ex.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ex.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ramfunc.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_gpio.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma_ex.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr_ex.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_cortex.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_exti.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi_ex.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim_ex.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart_ex.c \
-Core/Src/system_stm32l4xx.c \
-Core/Cam/Cam.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pcd.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pcd_ex.c \
-Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_ll_usb.c \
-Core/src/tusb.c \
-Core/src/common/tusb_fifo.c \
-Core/src/device/usbd.c \
-Core/src/device/usbd_control.c \
-Core/src/class/audio/audio_device.c \
-Core/src/class/cdc/cdc_device.c \
-Core/src/class/dfu/dfu_device.c \
-Core/src/class/dfu/dfu_rt_device.c \
-Core/src/class/hid/hid_device.c \
-Core/src/class/midi/midi_device.c \
-Core/src/class/msc/msc_device.c \
-Core/src/class/net/ecm_rndis_device.c \
-Core/src/class/net/ncm_device.c \
-Core/src/class/usbtmc/usbtmc_device.c \
-Core/src/class/video/video_device.c \
-Core/src/class/vendor/vendor_device.c
-
-# ASM sources
-ASM_SOURCES =  \
-startup_stm32l432xx.s
-
-
-#######################################
-# binaries
-#######################################
-PREFIX = arm-none-eabi-
-# The gcc compiler bin path can be either defined in make command via GCC_PATH variable (> make GCC_PATH=xxx)
-# either it can be added to the PATH environment variable.
-ifdef GCC_PATH
-CC = $(GCC_PATH)/$(PREFIX)gcc
-AS = $(GCC_PATH)/$(PREFIX)gcc -x assembler-with-cpp
-CP = $(GCC_PATH)/$(PREFIX)objcopy
-SZ = $(GCC_PATH)/$(PREFIX)size
     else
-CC = $(PREFIX)gcc
+        @echo "Unsuported platform"
-AS = $(PREFIX)gcc -x assembler-with-cpp
+        exit 1
-CP = $(PREFIX)objcopy
-SZ = $(PREFIX)size
     endif
-HEX = $(CP) -O ihex
-BIN = $(CP) -O binary -S
- 
-#######################################
-# CFLAGS
-#######################################
-# cpu
-CPU = -mcpu=cortex-m4
-
-# fpu
-FPU = -mfpu=fpv4-sp-d16
-
-# float-abi
-FLOAT-ABI = -mfloat-abi=hard
-
-# mcu
-MCU = $(CPU) -mthumb $(FPU) $(FLOAT-ABI)
-
-# macros for gcc
-# AS defines
-AS_DEFS = 
-
-# C defines
-C_DEFS =  \
--DUSE_HAL_DRIVER \
--DSTM32L432xx
-
-
-# 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
 
+all: build
 
-# Generate dependency information
+build: cmake
-CFLAGS += -MMD -MP -MF"$(@:%.o=%.d)"
+	$(MAKE) -C $(BUILD_DIR) --no-print-directory
-
-
-#######################################
-# 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
+cmake: $(BUILD_DIR)/Makefile
-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_DIR)/Makefile: CMakeLists.txt
+	cmake \
+		-G "$(BUILD_SYSTEM)" \
+		-B$(BUILD_DIR) \
+		-DPROJECT_NAME=$(PROJECT_NAME) \
+		-DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \
+		-DDUMP_ASM=OFF
 
-#######################################
+# Formats all user modified source files (add ones that are missing)
-# build the application
+SRCS := $(shell find Project -name '*.[ch]' -or -name '*.[ch]pp') Core/Src/main.c
-#######################################
+format: $(addsuffix .format,$(SRCS))
-# list of objects
+%.format: %
-OBJECTS = $(addprefix $(BUILD_DIR)/,$(notdir $(C_SOURCES:.c=.o)))
+	clang-format -i $<
-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) 
+# Formats all CubeMX generated sources to unix style - removes \r from line endings
-	$(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:.c=.lst)) $< -o $@
+# Add any new directories, like Middlewares and hidden files
+HIDDEN_FILES := .mxproject .project .cproject
+FOUND_HIDDEN_FILES := $(shell for f in $(HIDDEN_FILES);do if [[ -e $$f ]]; then echo $$f;fi; done)
+FORMAT_LINUX := $(shell find Core Drivers -name '*' -type f; find . -name '*.ioc') $(FOUND_HIDDEN_FILES)
 
-$(BUILD_DIR)/%.o: %.s Makefile | $(BUILD_DIR)
+format-linux: $(addsuffix .format-linux,$(FORMAT_LINUX))
-	$(AS) -c $(CFLAGS) $< -o $@
+%.format-linux: %
+	$(if $(filter $(PLATFORM),Linux),dos2unix -q $<,)
 
-$(BUILD_DIR)/$(TARGET).elf: $(OBJECTS) Makefile
+# Device specific!
-	$(CC) $(OBJECTS) $(LDFLAGS) -o $@
+DEVICE ?= STM32F407VG
-	$(SZ) $@
 
-$(BUILD_DIR)/%.hex: $(BUILD_DIR)/%.elf | $(BUILD_DIR)
+flash-st: build
-	$(HEX) $< $@
+	st-flash --reset write $(FIRMWARE) 0x08000000
 
-$(BUILD_DIR)/%.bin: $(BUILD_DIR)/%.elf | $(BUILD_DIR)
+$(BUILD_DIR)/jlink-script:
-	$(BIN) $< $@	
+	touch $@
+	@echo device $(DEVICE) > $@
+	@echo si 1 >> $@
+	@echo speed 4000 >> $@
+	@echo loadfile $(FIRMWARE),0x08000000 >> $@
+	@echo -e "r\ng\nqc" >> $@
 
-$(BUILD_DIR):
+flash-jlink: build | $(BUILD_DIR)/jlink-script
-	mkdir $@		
+	JLinkExe -commanderScript $(BUILD_DIR)/jlink-script
 
-#######################################
-# clean up
-#######################################
 clean:
-	-rm -fR $(BUILD_DIR)
+	rm -rf $(BUILD_DIR)
 
-#######################################
+################################## Container ##################################
-# 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"
 
+UID ?= $(shell id -u)
+GID ?= $(shell id -g)
+USER ?= $(shell id -un)
+GROUP ?= $(if $(filter $(PLATFORM), Windows_NT),$(shell id -un),$(shell id -gn))
 
+ifeq ($(PLATFORM),Windows_NT)
+    WIN_PREFIX = winpty
+    WORKDIR_PATH = "//workdir"
+    WORKDIR_VOLUME = "/$$(pwd -W):/workdir"
+else
+    WORKDIR_PATH = /workdir
+    WORKDIR_VOLUME = "$$(pwd):/workdir"
+endif
 
-# *** EOF ***
+CONTAINER_TOOL ?= docker
+CONTAINER_FILE := Dockerfile
+IMAGE_NAME := fedora-arm-embedded-dev
+CONTAINER_NAME := fedora-arm-embedded-dev
+
+NEED_IMAGE = $(shell $(CONTAINER_TOOL) image inspect $(IMAGE_NAME) 2> /dev/null > /dev/null || echo image)
+# 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)
+PODMAN_ARG = $(if $(filter $(CONTAINER_TOOL), podman),--userns=keep-id,)
+CONTAINER_RUN = $(WIN_PREFIX) $(CONTAINER_TOOL) run \
+				--name $(CONTAINER_NAME) \
+				--rm \
+				-it \
+				$(PODMAN_ARG) \
+				-v $(WORKDIR_VOLUME) \
+				-w $(WORKDIR_PATH) \
+				--security-opt label=disable \
+				--hostname $(CONTAINER_NAME) \
+				$(IMAGE_NAME)
+
+build-container: $(NEED_IMAGE)
+	$(CONTAINER_RUN) bash -lc 'make -j$(shell nproc)'
+
+format-container:
+	$(CONTAINER_RUN) bash -lc 'make format -j$(shell nproc)'
+
+format-linux-container:
+	$(CONTAINER_RUN) bash -lc 'make format-linux'
+
+shell:
+	$(CONTAINER_RUN) bash -l
+
+image: $(CONTAINER_FILE)
+	$(CONTAINER_TOOL) build \
+		-t $(IMAGE_NAME) \
+		-f=$(CONTAINER_FILE) \
+		--build-arg UID=$(UID) \
+		--build-arg GID=$(GID) \
+		--build-arg USERNAME=$(USER) \
+		--build-arg GROUPNAME=$(GROUP) \
+		.
+
+clean-image:
+	$(CONTAINER_TOOL) container rm -f $(CONTAINER_NAME) 2> /dev/null > /dev/null || true
+	$(CONTAINER_TOOL) image rmi -f $(IMAGE_NAME) 2> /dev/null > /dev/null || true
+
+clean-all: clean clean-image