Fixed ime reset

OkapiLib · Nov 7, 2017 · 119b8fd · 119b8fd
1 parent fe3401c
commit 119b8fd
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/include/device/ime.h b/include/device/ime.h
@@ -16,7 +16,7 @@ namespace okapi {
         reversed(ireversed ? -1 : 1) {}
 
     int get() override { imeGet(index, &val); return reversed * val; }
-    void reset() override { val = 0; }
+    void reset() override { imeReset(index); }
   private:
     unsigned int index;
     const int reversed;

diff --git a/okapilib-template/firmware/okapilib.a b/okapilib-template/firmware/okapilib.a
diff --git a/okapilib-template/include/device/ime.h b/okapilib-template/include/device/ime.h
@@ -16,7 +16,7 @@ namespace okapi {
         reversed(ireversed ? -1 : 1) {}
 
     int get() override { imeGet(index, &val); return reversed * val; }
-    void reset() override { val = 0; }
+    void reset() override { imeReset(index); }
   private:
     unsigned int index;
     const int reversed;

diff --git a/template.mk b/template.mk
@@ -1,5 +1,5 @@
 LIBNAME=okapilib
-VERSION=0.4.2
+VERSION=0.4.3
 
 # extra files (like header files)
 TEMPLATEFILES = include/main.h include/device/motor.h include/device/button.h include/device/ime.h include/device/potentiometer.h include/device/quadEncoder.h include/device/rangeFinder.h include/device/rotarySensor.h include/chassis/chassisModel.h include/chassis/odomChassisController.h include/chassis/chassisController.h include/API.h include/util/timer.h include/util/mathUtil.h include/odometry/odomMath.h include/odometry/odometry.h include/filter/filter.h include/filter/emaFilter.h include/filter/avgFilter.h include/filter/demaFilter.h include/motionProfile/motionProfile.h include/motionProfile/mpGenerator.h include/control/mpController.h include/control/pid.h include/control/genericController.h include/control/velMath.h include/control/mpConsumer.h include/control/nsPid.h include/control/velPid.h include/control/controlObject.h