From: Martin P. <pi...@us...> - 2012-04-21 11:58:14
|
Update of /cvsroot/embeddedloconet/apps/Fredi In directory vz-cvs-4.sog:/tmp/cvs-serv13478/apps/Fredi Modified Files: makefile Log Message: added SkipIfPortPinIsClear, SkipIfPortPinIsSet in LnRxOnlySwAsm.inc fixed samples: BootLoader/Assember/makefile and BootLoader/TestApplication/makefile Index: makefile =================================================================== RCS file: /cvsroot/embeddedloconet/apps/Fredi/makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** makefile 19 Apr 2012 17:32:07 -0000 1.12 --- makefile 21 Apr 2012 11:58:12 -0000 1.13 *************** *** 104,116 **** ifeq ($(MCU),atmega8) HARDWARE_VERSION = 1 ! endif ! ifeq ($(MCU),atmega88) HARDWARE_VERSION = 2 ! endif ! ifeq ($(MCU),atmega168) HARDWARE_VERSION = 3 ! endif ! ifeq ($(MCU),atmega328p) HARDWARE_VERSION = 4 endif --- 104,115 ---- ifeq ($(MCU),atmega8) HARDWARE_VERSION = 1 ! else ifeq ($(MCU),atmega88) HARDWARE_VERSION = 2 ! else ifeq ($(MCU),atmega168) HARDWARE_VERSION = 3 ! else ifeq ($(MCU),atmega328p) HARDWARE_VERSION = 4 + else + $(error MCU=$(MCU) is unknown, could not define HARDWARE_VERSION) endif *************** *** 421,425 **** # make bootloader ! $(BOOTLOADER_HEX) : BL/BootLoader.asm makefile make -C BL \ MANUFACTURER_ID=$(MANUFACTURER_ID) \ --- 420,424 ---- # make bootloader ! $(BOOTLOADER_HEX) : BL/BootLoader.asm BL/makefile makefile make -C BL \ MANUFACTURER_ID=$(MANUFACTURER_ID) \ |