From ddbb807e54245bd5b6686096827f4124ef196957 Mon Sep 17 00:00:00 2001
From: jaseg <git@jaseg.net>
Date: Tue, 17 Apr 2018 11:56:09 +0200
Subject: Move to new serial protocol.

This code is tested.
---
 firmware/Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'firmware/Makefile')

diff --git a/firmware/Makefile b/firmware/Makefile
index 909cf8d..1e668e1 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -3,12 +3,14 @@ CMSIS_PATH 		?= STM32Cube/Drivers/CMSIS
 CMSIS_DEV_PATH  ?= $(CMSIS_PATH)/Device/ST/STM32F0xx
 HAL_PATH   		?= STM32Cube/Drivers/STM32F0xx_HAL_Driver
 
+MAC_ADDR ?= 0xDEBE10BB
+
 CC      := arm-none-eabi-gcc
 OBJCOPY := arm-none-eabi-objcopy
 OBJDUMP := arm-none-eabi-objdump
 SIZE    := arm-none-eabi-size
 
-CFLAGS  = -Wall -g -std=gnu11 -Os  
+CFLAGS  = -Wall -Wpedantic -Wstrict-aliasing -g -std=gnu11 -Os  
 CFLAGS += -mlittle-endian -mcpu=cortex-m0 -march=armv6-m -mthumb
 #CFLAGS += -ffunction-sections -fdata-sections -Wl,--gc-sections 
 CFLAGS += -Wl,-Map=main.map
@@ -16,7 +18,7 @@ CFLAGS += -Wl,-Map=main.map
 # Technically we're using an STM32F030F4, but apart from the TSSOP20 package that one is largely identical to the
 # STM32F030*6 and there is no separate device header provided for it, so we're faking a *6 device here. This is
 # even documented in stm32f0xx.h. Thanks ST!
-CFLAGS += -DSTM32F030x6 -DHSE_VALUE=25000000
+CFLAGS += -DSTM32F030x6 -DHSE_VALUE=25000000 -DMAC_ADDR=$(MAC_ADDR)
 
 CFLAGS += -Tstm32_flash.ld
 CFLAGS += -I$(CMSIS_DEV_PATH)/Include -I$(CMSIS_PATH)/Include -I$(HAL_PATH)/Inc -Iconfig
@@ -31,7 +33,7 @@ all: main.elf
 cmsis_exports.c: $(CMSIS_DEV_PATH)/Include/stm32f030x6.h $(CMSIS_PATH)/Include/core_cm0.h
 	python3 gen_cmsis_exports.py $^ > $@
 
-sources.tar.xz: main.c Makefile
+sources.tar.xz: main.c serial.h global.h serial.c adc.h adc.c Makefile
 	tar -cf $@ $^
 
 # don't ask...
@@ -41,7 +43,7 @@ sources.tar.xz.zip: sources.tar.xz
 sources.c: sources.tar.xz.zip
 	xxd -i $< | head -n -1 | sed 's/=/__attribute__((section(".source_tarball"))) =/' > $@
 
-main.elf: main.c startup_stm32f030x6.s system_stm32f0xx.c $(HAL_PATH)/Src/stm32f0xx_ll_utils.c cmsis_exports.c sources.o
+main.elf: main.c mac.c adc.c serial.c startup_stm32f030x6.s system_stm32f0xx.c $(HAL_PATH)/Src/stm32f0xx_ll_utils.c cmsis_exports.c
 	$(CC) $(CFLAGS) -o $@ $^
 	$(OBJCOPY) -O ihex $@ $(@:.elf=.hex)
 	$(OBJCOPY) -O binary $@ $(@:.elf=.bin)
-- 
cgit