diff --git a/src/controller.c b/src/controller.c index 30dec7504cd53495cc617ceed975227580edd6a1..a2408c6c90576b3f36b15cad1e94033cabfa3f38 100644 --- a/src/controller.c +++ b/src/controller.c @@ -1,8 +1,3 @@ #include "controller.h" -double controller(double w, double y,double maxControl){ - return 0; -} - - - +int controller(int w, int y, int maxControl) { return 0; } diff --git a/src/controller.h b/src/controller.h index dcf9e63a55a22c6662a8e26eb2e55a47dc23d017..f85f24fdcadfb7060f2615bad2039f07e0765166 100644 --- a/src/controller.h +++ b/src/controller.h @@ -1,4 +1,4 @@ #ifndef controller_H #define controller_H -double controller(double w, double y,double maxControl); -#endif // controller_H +int controller(int w, int y, int maxControl); +#endif // controller_H diff --git a/src/controller.test.cpp b/src/controller.test.cpp index 1cd7d45c7a0782a953c2f807d857ce97d7a99a10..fbd690f9c82449c161662aca5ce119ec34776e94 100644 --- a/src/controller.test.cpp +++ b/src/controller.test.cpp @@ -3,12 +3,12 @@ extern "C" { #include "controller.h" } -TEST_CASE("PI_Regler"){ - REQUIRE(controller(8,0,500) == 16.0); - REQUIRE(controller(-2,0,500) == -4.0); +TEST_CASE("PI_Regler") { + REQUIRE(controller(8, 0, 500) == 16); + REQUIRE(controller(-2, 0, 500) == -4); } -TEST_CASE("limits"){ - REQUIRE(controller(2,0,2) == 2); - REQUIRE(controller(-2,0,2) == -2); +TEST_CASE("limits") { + REQUIRE(controller(2, 0, 2) == 2); + REQUIRE(controller(-2, 0, 2) == -2); } \ No newline at end of file diff --git a/src/main.c b/src/main.c index 13a9b70741dd57b60dfa45bcc320152211062fef..622ead5f7a82e449f93f2ddfc2a6983d2da33398 100644 --- a/src/main.c +++ b/src/main.c @@ -1,6 +1,5 @@ #include <stdio.h> + #include "controller.h" -int main() { - return 0; -} +int main() { return 0; }