Remove obsolete template code from fw

1 files changed, 187 insertions, 203 deletions

diff --git a/fw/hid-dials/Makefile b/fw/hid-dials/Makefile
index 36eca30..06e7d76 100644
--- a/fw/hid-dials/Makefile
+++ b/fw/hid-dials/Makefile
@@ -1,203 +1,187 @@
-##########################################################################################################################

-# File automatically-generated by tool: [projectgenerator] version: [3.6.0] date: [Tue Mar 31 02:31:49 CEST 2020]

-##########################################################################################################################

-

-# ------------------------------------------------

-# Generic Makefile (based on gcc)

-#

-# ChangeLog :

-#	2017-02-10 - Several enhancements + project update mode

-#   2015-07-22 - first version

-# ------------------------------------------------

-

-######################################

-# target

-######################################

-TARGET = hid-dials

-

-

-######################################

-# building variables

-######################################

-# debug build?

-DEBUG = 1

-# optimization

-OPT = -Og

-

-

-#######################################

-# paths

-#######################################

-# Build path

-BUILD_DIR = build

-

-######################################

-# source

-######################################

-# C sources

-C_SOURCES =  \
-Src/main.c \
-Src/stm32f0xx_it.c \
-Src/stm32f0xx_hal_msp.c \
-Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_usb.c \
-Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_adc.c \
-Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_adc_ex.c \
-Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_rcc.c \
-Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_rcc_ex.c \
-Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal.c \
-Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_i2c.c \
-Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_i2c_ex.c \
-Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_gpio.c \
-Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_dma.c \
-Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_cortex.c \
-Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_pwr.c \
-Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_pwr_ex.c \
-Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_flash.c \
-Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_flash_ex.c \
-Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_exti.c \
-Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_tim.c \
-Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_tim_ex.c \
-Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_pcd.c \
-Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_pcd_ex.c \
-Src/usb_device.c \
-Src/usbd_conf.c \
-Src/usbd_desc.c \
-Src/usbd_hid.c \
-Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c \

-Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c \

-Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c \

-Src/system_stm32f0xx.c

-

-# ASM sources

-ASM_SOURCES =  \
-startup_stm32f072xb.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

-AS = $(PREFIX)gcc -x assembler-with-cpp

-CP = $(PREFIX)objcopy

-SZ = $(PREFIX)size

-endif

-HEX = $(CP) -O ihex

-BIN = $(CP) -O binary -S

-

-#######################################

-# CFLAGS

-#######################################

-# cpu

-CPU = -mcpu=cortex-m0

-

-# fpu

-# NONE for Cortex-M0/M0+/M3

-

-# float-abi

-

-

-# mcu

-MCU = $(CPU) -mthumb $(FPU) $(FLOAT-ABI)

-

-# macros for gcc

-# AS defines

-AS_DEFS =

-

-# C defines

-C_DEFS =  \
--DUSE_HAL_DRIVER \
--DSTM32F072xB

-

-

-# AS includes

-AS_INCLUDES =

-

-# C includes

-C_INCLUDES =  \
--IInc \
--IMiddlewares/ST/STM32_USB_Device_Library/Core/Inc \
--IDrivers/STM32F0xx_HAL_Driver/Inc \
--IDrivers/STM32F0xx_HAL_Driver/Inc/Legacy \
--IDrivers/CMSIS/Device/ST/STM32F0xx/Include \
--IDrivers/CMSIS/Include

-

-

-# compile gcc flags

-ASFLAGS = $(MCU) $(AS_DEFS) $(AS_INCLUDES) $(OPT) -Wall -fdata-sections -ffunction-sections

-

-CFLAGS = $(MCU) $(C_DEFS) $(C_INCLUDES) $(OPT) -Wall -fdata-sections -ffunction-sections

-

-ifeq ($(DEBUG), 1)

-CFLAGS += -g -gdwarf-2

-endif

-

-

-# Generate dependency information

-CFLAGS += -MMD -MP -MF"$(@:%.o=%.d)"

-

-

-#######################################

-# LDFLAGS

-#######################################

-# link script

-LDSCRIPT = STM32F072CBUx_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

-

-

-#######################################

-# 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)

-

-# *** EOF ***

+########################################################################################################################
+# Dependency directories
+########################################################################################################################
+
+CMSIS_DEVICE_DIR 	?= upstream/st-cmsis-f0
+CMSIS_CORE_DIR 		?= upstream/cmsis-core
+HAL_DIR				?= upstream/st-hal-f0
+ST_USBD_DIR			?= upstream/st-usb-device
+
+########################################################################################################################
+# Sources
+########################################################################################################################
+
+C_SOURCES	:= 	src/main.c \
+				src/stm32f0xx_it.c \
+				src/stm32f0xx_hal_msp.c \
+				src/usb_device.c \
+				src/usbd_conf.c \
+				src/usbd_desc.c \
+				src/usbd_hid.c \
+				src/system_stm32f0xx.c
+
+C_SOURCES	+=  $(HAL_DIR)/Src/stm32f0xx_ll_usb.c \
+				$(HAL_DIR)/Src/stm32f0xx_hal_adc.c \
+				$(HAL_DIR)/Src/stm32f0xx_hal_adc_ex.c \
+				$(HAL_DIR)/Src/stm32f0xx_hal_rcc.c \
+				$(HAL_DIR)/Src/stm32f0xx_hal_rcc_ex.c \
+				$(HAL_DIR)/Src/stm32f0xx_hal.c \
+				$(HAL_DIR)/Src/stm32f0xx_hal_i2c.c \
+				$(HAL_DIR)/Src/stm32f0xx_hal_i2c_ex.c \
+				$(HAL_DIR)/Src/stm32f0xx_hal_gpio.c \
+				$(HAL_DIR)/Src/stm32f0xx_hal_dma.c \
+				$(HAL_DIR)/Src/stm32f0xx_hal_cortex.c \
+				$(HAL_DIR)/Src/stm32f0xx_hal_pwr.c \
+				$(HAL_DIR)/Src/stm32f0xx_hal_pwr_ex.c \
+				$(HAL_DIR)/Src/stm32f0xx_hal_flash.c \
+				$(HAL_DIR)/Src/stm32f0xx_hal_flash_ex.c \
+				$(HAL_DIR)/Src/stm32f0xx_hal_exti.c \
+				$(HAL_DIR)/Src/stm32f0xx_hal_tim.c \
+				$(HAL_DIR)/Src/stm32f0xx_hal_tim_ex.c \
+				$(HAL_DIR)/Src/stm32f0xx_hal_pcd.c \
+				$(HAL_DIR)/Src/stm32f0xx_hal_pcd_ex.c
+
+C_SOURCES 	+=  $(ST_USBD_DIR)/Core/Src/usbd_core.c \
+				$(ST_USBD_DIR)/Core/Src/usbd_ctlreq.c \
+				$(ST_USBD_DIR)/Core/Src/usbd_ioreq.c \
+
+CXX_SOURCES			+=
+
+########################################################################################################################
+# Build parameters
+########################################################################################################################
+
+BUILDDIR 		?= build
+BINARY 			:= minikbd.elf
+STARTUP_FILE 	:= startup_stm32f072xb.s
+LDSCRIPT 		:= STM32F072CBUx_FLASH.ld
+
+ARCH_FLAGS	    := -mthumb -mcpu=cortex-m0 -mfloat-abi=soft
+SYSTEM_FLAGS    += -nostdlib -ffreestanding -nostartfiles
+
+CFLAGS	        := -O0 -std=gnu11
+CFLAGS			+= -DUSE_HAL_DRIVER -DSTM32F072xB
+CFLAGS          += -DSTM32F0 -DDEBUG=$(DEBUG)
+# ST weirdness
+CFLAGS			+= -DUSBD_CLASS_BOS_ENABLED=0
+
+CFLAGS			+= -fno-common -ffunction-sections -fdata-sections
+
+CFLAGS  		+= -I$(BUILDDIR) \
+                   -Isrc \
+                   -I$(CMSIS_DEVICE_DIR)/Include \
+                   -I$(CMSIS_CORE_DIR) \
+                   -I$(HAL_DIR)/Inc \
+                   -I$(ST_USBD_DIR)/Core/Inc \
+                   -I$(ST_USBD_DIR)/Class/HID/Inc
+# for musl
+CFLAGS			+= -Dhidden=
+
+CFLAGS      	+= -Wall -Wextra -Wpedantic -Wshadow -Wimplicit-function-declaration -Wundef -Wno-unused-parameter
+CFLAGS      	+= -Wredundant-decls -Wmissing-prototypes -Wstrict-prototypes
+
+CFLAGS          += $(ARCH_FLAGS) $(SYSTEM_FLAGS)
+
+LDFLAGS			+= $(ARCH_FLAGS) $(SYSTEM_FLAGS)
+
+LIBS		    += -lgcc
+LDFLAGS		    += -Wl,--gc-sections
+
+LINKMEM_FLAGS ?= --trim-stubs=$(STARTUP_FILE:.s=.o) --trace-sections .isr_vector --highlight-subdirs $(BUILDDIR)
+
+OBJS := $(addprefix $(BUILDDIR)/,$(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o))
+OBJS += $(BUILDDIR)/$(STARTUP_FILE:.s=.o)
+
+########################################################################################################################
+# Build tools
+########################################################################################################################
+
+PREFIX		?= arm-none-eabi-
+
+DEBUG		?= 1
+
+CC			:= $(PREFIX)gcc
+CXX			:= $(PREFIX)g++
+LD			:= $(PREFIX)gcc
+AR			:= $(PREFIX)ar
+AS			:= $(PREFIX)as
+SIZE		:= $(PREFIX)size
+NM			:= $(PREFIX)nm
+OBJCOPY		:= $(PREFIX)objcopy
+OBJDUMP		:= $(PREFIX)objdump
+GDB			:= $(PREFIX)gdb
+
+HOST_CC				?= $(HOST_PREFIX)gcc
+HOST_CXX			?= $(HOST_PREFIX)g++
+HOST_LD				?= $(HOST_PREFIX)gcc
+HOST_AR				?= $(HOST_PREFIX)ar
+HOST_AS				?= $(HOST_PREFIX)as
+HOST_OBJCOPY		?= $(HOST_PREFIX)objcopy
+HOST_OBJDUMP		?= $(HOST_PREFIX)objdump
+
+PYTHON3 ?= python3
+DOT		?= dot
+
+########################################################################################################################
+# Rules
+########################################################################################################################
+
+all: binsize
+
+.PHONY: binsize
+binsize: $(BUILDDIR)/$(BINARY) $(BUILDDIR)/$(BINARY:.elf=-symbol-sizes.pdf)
+	$(LD) -T$(LDSCRIPT) $(LDFLAGS) -Wl,--print-memory-usage -o /dev/null $(OBJS) $(LIBS)
+	@echo
+	@echo "▐▬▬▬▌ SyMbOL sIzE HiGhScORe LiSt ▐▬▬▬▌"
+	$(NM) --print-size --size-sort --radix=d $< | tail -n 20
+
+$(BUILDDIR)/generated: ; mkdir -p $@
+
+.PRECIOUS: $(BUILDDIR)/$(BINARY) 
+$(BUILDDIR)/$(BINARY) $(BUILDDIR)/$(BINARY:.elf=.map) &: $(OBJS)
+	$(LD) -T$(LDSCRIPT) $(LDFLAGS) -o $@ -Wl,-Map=$(BUILDDIR)/$(BINARY:.elf=.map) $^ $(LIBS)
+
+build/$(BINARY:.elf=-symbol-sizes.dot): $(OBJS)
+	$(PYTHON3) tools/linkmem.py $(LINKMEM_FLAGS) $(LD) -T$(LDSCRIPT) $(LDFLAGS) $^ $(LIBS) > $@
+
+%.pdf: %.dot
+	$(DOT) -T pdf $< -o $@
+
+%.dot: %.elf
+	r2 -a arm -qc 'aa;agRd' $< 2>/dev/null >$@
+
+$(BUILDDIR)/src/%.o: src/%.s
+	mkdir -p $(@D)
+	$(CC) $(COMMON_CFLAGS) $(CFLAGS) $(INT_CFLAGS) -o $@ -c $<
+
+$(BUILDDIR)/src/%.o: src/%.c
+	mkdir -p $(@D)
+	$(CC) $(COMMON_CFLAGS) $(CFLAGS) $(INT_CFLAGS) -o $@ -c $<
+
+$(BUILDDIR)/src/%.o: src/%.cpp
+	mkdir -p $(@D)
+	$(CXX) $(CXXFLAGS) -o $@ -c $<
+
+$(BUILDDIR)/generated/%.o: $(BUILDDIR)/generated/%.c
+	mkdir -p $(@D)
+	$(CC) $(COMMON_CFLAGS) $(CFLAGS) $(INT_CFLAGS) -o $@ -c $<
+
+$(BUILDDIR)/%.o: %.c
+	mkdir -p $(@D)
+	$(CC) $(COMMON_CFLAGS) $(CFLAGS) $(EXT_CFLAGS) -o $@ -c $<
+
+clean:
+	rm -rf $(BUILDDIR)/src
+	rm -rf $(BUILDDIR)/generated
+	rm -f $(BUILDDIR)/$(BINARY)
+	rm -f $(BUILDDIR)/$(BINARY:.elf=.map)
+	rm -f $(BUILDDIR)/$(BINARY:.elf=-symbol-sizes.dot)
+	rm -f $(BUILDDIR)/$(BINARY:.elf=-symbol-sizes.pdf)
+	rm -f $(BUILDDIR)/tools/freq_meas_test
+
+mrproper: clean
+	rm -rf build
+
+.PHONY: clean mrproper
+
+-include $(OBJS:.o=.d)