From: Mart Lubbers Date: Mon, 10 Apr 2017 10:18:23 +0000 (+0200) Subject: Merge branch 'master' of gitlab.science.ru.nl:mlubbers/mTask X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=2ebe31dbe4aeaae68d63ccdcb9072dec8c4180f6;hp=61dffbc509a02622642a6eb7c17cb20b46b93619;p=mTask.git Merge branch 'master' of gitlab.science.ru.nl:mlubbers/mTask --- diff --git a/Makefile b/Makefile index 0978187..b81c658 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ BINARIES:= mTaskInterpret miTask # mTaskExamples all: CleanSerial/Clean\ System\ Files/TTY.o $(BINARIES) #client/mTaskSymbols.h mkdir -p miTask-www - find $(CLEAN_HOME)/lib -path '*/WebPublic/*' -not -path '*/CodeMirror/*' -execdir cp -nR {} "$$PWD"/miTask-www/ \; + find ~/projects/iTasks-SDK/Libraries -path '*/WebPublic/*' -not -path '*/CodeMirror/*' -execdir cp -nR {} "$$PWD"/miTask-www/ \; CleanSerial/Clean\ System\ Files/TTY.o: make -C CleanSerial diff --git a/client/client.c b/client/client.c index 869d026..b501e0f 100644 --- a/client/client.c +++ b/client/client.c @@ -87,8 +87,6 @@ void loop(void) } loopmillis = getmillis(); #endif - debug("Loop"); - read_message(); //Run tasks