From 377aa5a8f03aa941f8293650991a639c9664055f Mon Sep 17 00:00:00 2001 From: Tristan Krause Date: Tue, 18 Jun 2019 09:54:23 +0200 Subject: [PATCH] save --- firmware/.getMCU.swp | Bin 0 -> 1024 bytes firmware/Makefile | 5 ++++- firmware/getMCU | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 firmware/.getMCU.swp create mode 100755 firmware/getMCU diff --git a/firmware/.getMCU.swp b/firmware/.getMCU.swp new file mode 100644 index 0000000000000000000000000000000000000000..4a594433a72ee16238bfd6c4719b637bb62fe83b GIT binary patch literal 1024 zcmYc?$V<%2S1{7E)H7y40`6iA3~7nEr8%X=NTS%8i7AN|*kw>f^)vEwQ}v;y>bvA; um*%GCm89w?8Jec)r)3u9mM0da>Zhlc_&SH8>Kx^bhQMeDP$2{`@)ZEbj~Idg literal 0 HcmV?d00001 diff --git a/firmware/Makefile b/firmware/Makefile index b4a8479..689212e 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -18,11 +18,12 @@ OBJCOPY_PATH = avr-objcopy PROGRAMMER = avrispmkII OUTPUT = b15f.elf HEX = b15f.hex -MCU = atmega1284p +MCU = m1284p CFLAGS = -Wall -Wextra -std=c++14 -O3 -mmcu=$(MCU) -DF_CPU=$(F_CPU) $(DEBUG) LDFLAGS = OBJECTS = main.o spi.o mcp23s17.o tlc5615.o adu.o selftest.o global_vars.o usart.o requests.o interrupts.o pwm.o + COMPILE = $(COMPILER_PATH) $(CFLAGS) FUSES = (E:$(EFUSE), H:$(HFUSE), L:$(LFUSE)) @@ -34,6 +35,8 @@ b15f: $(OBJECTS) $(OBJCOPY_PATH) -O ihex -R .eeprom -R .fuse -R .lock -R .signature $(OUTPUT) $(HEX) help: + $(eval MCU = $(shell bash -c "avrdude -c $(PROGRAMMER) -Pusb -p m16 2>&1 | grep 'Device signature =' | awk -F 'probably ' '{print $2}' | head -c-2")) + @echo $(MCU) @echo "This Makefile has the following rules:" @echo "make b15f .... to compile (default)" @echo "make clean ... to delete objects, elf and hex file" diff --git a/firmware/getMCU b/firmware/getMCU new file mode 100755 index 0000000..a89b1b2 --- /dev/null +++ b/firmware/getMCU @@ -0,0 +1 @@ +avrdude -c $(PROGRAMMER) -Pusb -p m16 2>&1 | grep 'Device signature =' | awk -F 'probably ' '{print $2}' | head -c-2