From 4f52da6f9eb45fdecd8d7ef861de72b49b5a5477 Mon Sep 17 00:00:00 2001 From: Rick Companje Date: Thu, 12 May 2016 08:34:04 +0200 Subject: [PATCH 1/5] test --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index b9efbc2..e748055 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,15 @@ +TEST + + + + + + + + + + + # UP3D UP 3D Printer Tools From c4d0acda75af96eadd8d662bc3e1e9d4060b2e2e Mon Sep 17 00:00:00 2001 From: Rick Companje Date: Thu, 12 May 2016 09:12:43 +0200 Subject: [PATCH 2/5] update readme --- README.md | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/README.md b/README.md index e748055..b9efbc2 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,3 @@ -TEST - - - - - - - - - - - # UP3D UP 3D Printer Tools From ca1965710bdc0f1a50124af3434b538dee8f24b5 Mon Sep 17 00:00:00 2001 From: Rick Companje Date: Thu, 12 May 2016 14:31:47 +0200 Subject: [PATCH 3/5] added Makefile to UP3DTOOLS (working on osx) --- UP3DTOOLS/Makefile | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 UP3DTOOLS/Makefile diff --git a/UP3DTOOLS/Makefile b/UP3DTOOLS/Makefile new file mode 100644 index 0000000..eb7d08c --- /dev/null +++ b/UP3DTOOLS/Makefile @@ -0,0 +1,36 @@ +CC ?= gcc +RM ?= rm -rf + +CFLAGS += -Os -std=c99 -D_BSD_SOURCE +# CFLAGS += -D_DEBUG_IN_OUT_ +CFLAGS += -I../UP3DCOMMON/ +CFLAGS += -Wall $(shell pkg-config --cflags libusb-1.0)/.. + +LDFLAGS += $(shell pkg-config --libs-only-other --libs-only-L libusb-1.0) +LIBS += $(shell pkg-config --libs-only-l libusb-1.0) -lpthread -lm + +SRC_COMMON= ../UP3DCOMMON/up3d.c +SRC_COMMON+=../UP3DCOMMON/up3dcomm.c +SRC_COMMON+=../UP3DCOMMON/up3ddata.c + +SRC_UPLOAD=upload.c $(SRC_COMMON) +OBJ_UPLOAD=$(subst .c,.o,$(SRC_UPLOAD)) + +SRC_SHELL=upshell.c $(SRC_COMMON) +OBJ_SHELL=$(subst .c,.o,$(SRC_SHELL)) + +all: up3dload up3dshell + +up3dload: $(OBJ_UPLOAD) + $(CC) $(CFLAGS) $(LDFLAGS) -o up3dload $(OBJ_UPLOAD) $(LIBS) + +up3dshell: $(OBJ_SHELL) + $(CC) $(CFLAGS) $(LDFLAGS) -o up3dshell $(OBJ_SHELL) $(LIBS) -lncurses + +clean: + $(RM) $(OBJ_UPLOAD) + $(RM) $(OBJ_SHELL) + $(RM) up3dload + $(RM) up3dshell + +dist-clean: clean From 297c4b807c7862c216a1da73bec9ac83d1e5ed8d Mon Sep 17 00:00:00 2001 From: Rick Companje Date: Sun, 15 May 2016 00:26:44 +0200 Subject: [PATCH 4/5] added up3dinfo --- UP3DTOOLS/Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/UP3DTOOLS/Makefile b/UP3DTOOLS/Makefile index eb7d08c..4b6f072 100644 --- a/UP3DTOOLS/Makefile +++ b/UP3DTOOLS/Makefile @@ -19,7 +19,10 @@ OBJ_UPLOAD=$(subst .c,.o,$(SRC_UPLOAD)) SRC_SHELL=upshell.c $(SRC_COMMON) OBJ_SHELL=$(subst .c,.o,$(SRC_SHELL)) -all: up3dload up3dshell +SRC_INFO=upinfo.c $(SRC_COMMON) +OBJ_INFO=$(subst .c,.o,$(SRC_INFO)) + +all: up3dload up3dshell up3dinfo up3dload: $(OBJ_UPLOAD) $(CC) $(CFLAGS) $(LDFLAGS) -o up3dload $(OBJ_UPLOAD) $(LIBS) @@ -27,10 +30,15 @@ up3dload: $(OBJ_UPLOAD) up3dshell: $(OBJ_SHELL) $(CC) $(CFLAGS) $(LDFLAGS) -o up3dshell $(OBJ_SHELL) $(LIBS) -lncurses +up3dinfo: $(OBJ_INFO) + $(CC) $(CFLAGS) $(LDFLAGS) -o up3dinfo $(OBJ_INFO) $(LIBS) + clean: $(RM) $(OBJ_UPLOAD) $(RM) $(OBJ_SHELL) + $(RM) $(OBJ_INFO) $(RM) up3dload $(RM) up3dshell + $(RM) up3dinfo dist-clean: clean From 6d8c84cccf95eea8d16d18293ad26e7ef88c9e43 Mon Sep 17 00:00:00 2001 From: Rick Companje Date: Sun, 15 May 2016 01:04:17 +0200 Subject: [PATCH 5/5] add fixme warning in makefile --- UP3DTOOLS/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/UP3DTOOLS/Makefile b/UP3DTOOLS/Makefile index 4b6f072..a649827 100644 --- a/UP3DTOOLS/Makefile +++ b/UP3DTOOLS/Makefile @@ -28,6 +28,10 @@ up3dload: $(OBJ_UPLOAD) $(CC) $(CFLAGS) $(LDFLAGS) -o up3dload $(OBJ_UPLOAD) $(LIBS) up3dshell: $(OBJ_SHELL) + @echo "--------------- FIXME: -lncurses should be in CFLAGS / LDFLAGS / LIBS ??" + @echo "--------------- FIXME: -lncurses should be in CFLAGS / LDFLAGS / LIBS ??" + @echo "--------------- FIXME: -lncurses should be in CFLAGS / LDFLAGS / LIBS ??" + @echo "--------------- FIXME: -lncurses should be in CFLAGS / LDFLAGS / LIBS ??" $(CC) $(CFLAGS) $(LDFLAGS) -o up3dshell $(OBJ_SHELL) $(LIBS) -lncurses up3dinfo: $(OBJ_INFO)