From: Thomas Pietrzak Date: Tue, 23 May 2017 18:55:08 +0000 (+0200) Subject: fixed pure function and cpp flags X-Git-Url: https://git.thomaspietrzak.com/?a=commitdiff_plain;h=e3abce317a78f7fd41d4a8d5af632de770305caa;p=forcefader.git fixed pure function and cpp flags --- diff --git a/ForceModel.cpp b/ForceModel.cpp index 4a96f5e..d41c918 100644 --- a/ForceModel.cpp +++ b/ForceModel.cpp @@ -4,8 +4,3 @@ ForceModel::ForceModel() : _lastpos(0.0), _lastforce(0.0)//, _lastspeed(0.0) { } - -float ForceModel::computeForce(float pos) -{ - return 0.0; -} \ No newline at end of file diff --git a/ForceModel.h b/ForceModel.h index 86f1e9d..ea01cf4 100644 --- a/ForceModel.h +++ b/ForceModel.h @@ -4,7 +4,7 @@ class ForceModel { public: virtual ~ForceModel() {} - virtual float computeForce(float pos); + virtual float computeForce(float pos) = 0; protected: ForceModel(); diff --git a/Makefile b/Makefile index 87287d5..c599275 100644 --- a/Makefile +++ b/Makefile @@ -26,9 +26,6 @@ TARGET_INCLUDES = include include $(ROOTDIR)/common.mk -TARGET_CXX += -std=c++11 -#TARGET_LD = $(TOOLCHAIN)-g++ - all: uC-sdk $(TARGET) clean: clean-generic