From 76fb5c8128994ce9812a10e4f79e7b237d511453 Mon Sep 17 00:00:00 2001 From: philsson Date: Tue, 25 Oct 2016 10:13:21 +0200 Subject: [PATCH] Motormixer fixed now! The mid mixer does not max out motors anymore (probably not) --- UAV-ControlSystem/inc/utilities.h | 2 +- UAV-ControlSystem/src/utilities.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/UAV-ControlSystem/inc/utilities.h b/UAV-ControlSystem/inc/utilities.h index 26fdf58..446ddea 100644 --- a/UAV-ControlSystem/inc/utilities.h +++ b/UAV-ControlSystem/inc/utilities.h @@ -83,6 +83,6 @@ void Error_Handler(void); uint8_t reverse(uint8_t byte); -uint16_t constrain(uint16_t value, uint16_t min, uint16_t max); +int16_t constrain(int16_t value, int16_t min, int16_t max); #endif /* UTILITIES_H_ */ diff --git a/UAV-ControlSystem/src/utilities.c b/UAV-ControlSystem/src/utilities.c index 2e22185..7c2192c 100644 --- a/UAV-ControlSystem/src/utilities.c +++ b/UAV-ControlSystem/src/utilities.c @@ -219,7 +219,7 @@ uint8_t reverse(uint8_t byte) return byte; } -uint16_t constrain(uint16_t value, uint16_t min, uint16_t max) +int16_t constrain(int16_t value, int16_t min, int16_t max) { if (value < min) return min;