X-Git-Url: https://git.karo-electronics.de/?p=oswald.git;a=blobdiff_plain;f=metawatch%2FMakefile;h=583ccb13520091de31996481b21f244f6623f845;hp=64ef09f1973ce9082812ac5eeb3470ef433d849e;hb=a9be019ac653badc27a55c94b8d50122eadf8c5f;hpb=1553c23cf33de5d8a193ffc8c7014cf826fc9fd3

diff --git a/metawatch/Makefile b/metawatch/Makefile
index 64ef09f..583ccb1 100644
--- a/metawatch/Makefile
+++ b/metawatch/Makefile
@@ -17,20 +17,25 @@ MEMMODEL   = -mmemory-model=huge -fdata-sections -ffunction-sections # -mdata-re
 # MEMMODEL   = -mmemory-model=medium -misr20
 #MEMMODEL   = -mmemory-model=medium
 
-APPCONFIG = -DDIGITAL -DMW_DEVBOARD_V2
+#APPCONFIG = -DDIGITAL -DMW_DEVBOARD_V2
 #APPCONFIG = -DDIGITAL -DMW_DEVBOARD_V2 -DWITH_BTSTACK
 #APPCONFIG = -DDIGITAL -DMW_DEVBOARD_V2 -DCC256x_TRANSP
-#APPCONFIG = -DDIGITAL -DMW_DIGITAL_V2
+APPCONFIG = -DDIGITAL -DMW_DIGITAL_V2
+
+BTCC256x_SCRIPT = bluetooth_init_cc2560_2.44.c
+#BTCC256x_SCRIPT = bluetooth_init_cc2564_2.8.c
 
 # List all the source files here
 # eg if you have a source file foo.c then list it here
+
 OSWALD_SRC = ../ui/oswald_main.c ../ui/oswald_screens.c \
-	../ui/oswald_watch_faces.c ../ui/Fonts.c ../ui/LcdDisplay.c \
+	../ui/oswald_watch_faces.c \
 	../ui/oswald_strings.c ../ui/calendar.c \
+	../ui/oswald_graphics.c ../ui/oswald_fonts.c \
 	../ui/embedvm.c
 
 SOURCES = mw_main.c mw_uart.c mw_lcd.c mw_adc.c mw_bt.c \
-	bluetooth_init_cc2560_2.44.c \
+	mw_acc.c $(BTCC256x_SCRIPT) \
 	bt_hci.c bt_l2cap.c \
 	oswald_hal.c $(OSWALD_SRC)
 #	$(BT_SMALLTOOTH_SRC)
@@ -41,11 +46,14 @@ SOURCES = mw_main.c mw_uart.c mw_lcd.c mw_adc.c mw_bt.c \
 # Include are located in the Include directory
 #INCLUDES = $(BT_STACK_INC)
 #INCLUDES = $(BT_SMALLTOOTH_INV)
-INCLUDES = -I../ui/ -I../ui/bitmaps/
+INCLUDES = -I../ui/
+
+# BUILDNO = \"\#$(shell cat .buildno)-$(shell date +%y%m%d)\"
+BUILDNO = \"$(shell date +%y%m%d)-\#$(shell cat .buildno)\"
 
 # Add or subtract whatever MSPGCC flags you want. There are plenty more
 #######################################################################################
-CFLAGS   = -mmcu=$(MCU) $(MEMMODEL) -g -Os -Wall -Wunused $(INCLUDES) $(APPCONFIG)
+CFLAGS   = -mmcu=$(MCU) $(MEMMODEL) -g -Os -Wall -Wunused $(INCLUDES) $(APPCONFIG) -DBUILDNO=$(BUILDNO)
 ASFLAGS  = -mmcu=$(MCU) $(MEMMODEL) -x assembler-with-cpp -Wa,-gstabs
 LDFLAGS  = -mmcu=$(MCU) $(MEMMODEL) -Wl,-gc-sections -Wl,-Map=$(TARGET).map
 ########################################################################################
@@ -71,7 +79,7 @@ DEPEND = $(SOURCES:.c=.d)
 # all the object files
 OBJECTS = $(SOURCES:.c=.o)
 
-all: $(TARGET).elf $(TARGET).hex $(TARGET).txt 
+all: .buildno $(TARGET).elf $(TARGET).hex $(TARGET).txt
 
 prog: $(TARGET).hex
 	mspdebug tilib -d /dev/ttyACM3 -v 2500 "prog $(TARGET).hex"
@@ -121,3 +129,7 @@ clean:
 	-$(RM) $(TARGET).*
 	-$(RM) $(SOURCES:.c=.lst)
 	-$(RM) $(DEPEND)
+
+.buildno: $(OBJECTS)
+	@if ! test -f .buildno; then echo 0 > .buildno; fi
+	@echo $$(($$(cat .buildno) + 1)) > .buildno