From 7964b4631a1982e051dc2fb348830b4c63b6e3a7 Mon Sep 17 00:00:00 2001 From: bernd Date: Sun, 24 Jul 2011 22:37:33 +0200 Subject: [PATCH 1/4] Added clean targets --- simulat0r/simcore/Makefile | 17 ++++++----------- simulat0r/tui/Makefile | 2 ++ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/simulat0r/simcore/Makefile b/simulat0r/simcore/Makefile index 3fc4357..1bd0cb5 100644 --- a/simulat0r/simcore/Makefile +++ b/simulat0r/simcore/Makefile @@ -5,15 +5,10 @@ CFLAGS += -I../firmware CFLAGS += -I../firmware/core # for gpio.h including projectconfig.h without path CFLAGS += -I../simcore -OBJS+= ../firmware/basic/*.o -OBJS+= ../firmware/core/*.o -OBJS+= ../firmware/core/*/*.o -LDFLAGS+= -L../firmware/applications -LIBS+= ../firmware/applications/libapp.a -LDFLAGS+= -L../firmware/lcd -LIBS+= ../firmware/lcd/liblcd.a -LDFLAGS+= -L../firmware/usb -LIBS+= ../firmware/usb/libusb.a +OBJS = simcore.o misc.o -.PHONY : all -all : simcore.o misc.o #$(OBJS) $(LIBS) +.PHONY : all clean +all : $(OBJS) + +clean: + $(RM) $(OBJS) diff --git a/simulat0r/tui/Makefile b/simulat0r/tui/Makefile index 194bae0..3f9aed0 100644 --- a/simulat0r/tui/Makefile +++ b/simulat0r/tui/Makefile @@ -28,3 +28,5 @@ all : simulat0r simulat0r : simulat0r.o $(OBJS) $(LIBS) +clean: + $(RM) simulat0r.o From 603ba7049c9b920a9cfe49960d3e6e9212192dd0 Mon Sep 17 00:00:00 2001 From: roy rocket Date: Sun, 24 Jul 2011 23:23:02 +0200 Subject: [PATCH 2/4] New wrapper includes --- simulat0r/firmware/applications/wrapper.c | 11 +++++++++++ simulat0r/firmware/basic/idle.c | 2 ++ simulat0r/firmware/basic/idle.h | 2 ++ simulat0r/firmware/lcd/allfonts.h | 7 +++++++ 4 files changed, 22 insertions(+) create mode 100644 simulat0r/firmware/applications/wrapper.c create mode 100644 simulat0r/firmware/basic/idle.c create mode 100644 simulat0r/firmware/basic/idle.h create mode 100644 simulat0r/firmware/lcd/allfonts.h diff --git a/simulat0r/firmware/applications/wrapper.c b/simulat0r/firmware/applications/wrapper.c new file mode 100644 index 0000000..d076c58 --- /dev/null +++ b/simulat0r/firmware/applications/wrapper.c @@ -0,0 +1,11 @@ +void main_default(void); +void tick_default(void); +void main_life(void); +void tick_life(void); + +void wrapper(void){ +main_default(); +main_life(); +} +void tick_wrapper(void){ +} diff --git a/simulat0r/firmware/basic/idle.c b/simulat0r/firmware/basic/idle.c new file mode 100644 index 0000000..bd8078b --- /dev/null +++ b/simulat0r/firmware/basic/idle.c @@ -0,0 +1,2 @@ +/* AUTOGENERATED SOURCE FILE */ +#include "../../../firmware/basic/idle.c" diff --git a/simulat0r/firmware/basic/idle.h b/simulat0r/firmware/basic/idle.h new file mode 100644 index 0000000..a230196 --- /dev/null +++ b/simulat0r/firmware/basic/idle.h @@ -0,0 +1,2 @@ +/* AUTOGENERATED SOURCE FILE */ +#include "../../../firmware/basic/idle.h" diff --git a/simulat0r/firmware/lcd/allfonts.h b/simulat0r/firmware/lcd/allfonts.h new file mode 100644 index 0000000..af9623e --- /dev/null +++ b/simulat0r/firmware/lcd/allfonts.h @@ -0,0 +1,7 @@ +#include +#include +#include +#include +#include +#include +#include From 009e235af095171c790a5e17ea08049332bdf0dc Mon Sep 17 00:00:00 2001 From: roy rocket Date: Sun, 24 Jul 2011 23:32:08 +0200 Subject: [PATCH 3/4] oops, added real generated files, undone... --- simulat0r/firmware/applications/wrapper.c | 11 ----------- simulat0r/firmware/lcd/allfonts.h | 7 ------- 2 files changed, 18 deletions(-) delete mode 100644 simulat0r/firmware/applications/wrapper.c delete mode 100644 simulat0r/firmware/lcd/allfonts.h diff --git a/simulat0r/firmware/applications/wrapper.c b/simulat0r/firmware/applications/wrapper.c deleted file mode 100644 index d076c58..0000000 --- a/simulat0r/firmware/applications/wrapper.c +++ /dev/null @@ -1,11 +0,0 @@ -void main_default(void); -void tick_default(void); -void main_life(void); -void tick_life(void); - -void wrapper(void){ -main_default(); -main_life(); -} -void tick_wrapper(void){ -} diff --git a/simulat0r/firmware/lcd/allfonts.h b/simulat0r/firmware/lcd/allfonts.h deleted file mode 100644 index af9623e..0000000 --- a/simulat0r/firmware/lcd/allfonts.h +++ /dev/null @@ -1,7 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include From 36b67aad7459e452600d7a3242025b11baeae58f Mon Sep 17 00:00:00 2001 From: bernd Date: Sun, 24 Jul 2011 23:58:26 +0200 Subject: [PATCH 4/4] Added .gitignore to simulator/firmware --- simulat0r/bin/update-bridge-files.sh | 8 ++++++++ simulat0r/firmware/.gitignore | 6 ++++++ 2 files changed, 14 insertions(+) create mode 100644 simulat0r/firmware/.gitignore diff --git a/simulat0r/bin/update-bridge-files.sh b/simulat0r/bin/update-bridge-files.sh index f278dc5..3d801a2 100755 --- a/simulat0r/bin/update-bridge-files.sh +++ b/simulat0r/bin/update-bridge-files.sh @@ -44,3 +44,11 @@ do (printf "# GENERATED INCLUDE BRIDGE/\n"; echo include `dirname $i | sed "s#[^/]*#..#g" `/../$i) >simulat0r/$i fi done + +if cmp firmware/.gitignore simulat0r/firmware/.gitignore; +then + echo OK .gitignore is the same in firmware/ and simulat0r/firmware +else + echo WARNING: .gitignore mismatch in firmware/ and simulat0r/firmware + diff -y firmware/.gitignore simulat0r/firmware/.gitignore +fi diff --git a/simulat0r/firmware/.gitignore b/simulat0r/firmware/.gitignore new file mode 100644 index 0000000..ca10624 --- /dev/null +++ b/simulat0r/firmware/.gitignore @@ -0,0 +1,6 @@ +firmware.bin +firmware.elf +lpc1xxx/memory.ld +applications/wrapper.c +lcd/allfonts.h +Makefile.dep