Fixed button edge var init

OkapiLib · Oct 21, 2017 · e4e1070 · e4e1070
1 parent febd2ed
commit e4e1070
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/include/device/button.h b/include/device/button.h
@@ -11,21 +11,24 @@ namespace okapi {
       buttonGroup(8),
       port(0),
       inverted(false),
-      isJoystick(false) {}
+      isJoystick(false),
+      wasPressedLast(false) {}
 
     explicit constexpr Button(const unsigned long long int iport, const bool iinverted = false):
       joystick(1),
       buttonGroup(8),
       port(iport),
       inverted(iinverted),
-      isJoystick(false) {}
+      isJoystick(false),
+      wasPressedLast(iinverted) {}
 
     explicit constexpr Button(const unsigned char ijoystick, const unsigned char ibuttonGroup, const unsigned char ibutton, const bool iinverted = false):
       joystick(ijoystick),
       buttonGroup(ibuttonGroup),
       port(ibutton),
       inverted(iinverted),
-      isJoystick(true) {}
+      isJoystick(true),
+      wasPressedLast(iinverted) {}
 
 
     bool isPressed() const {
@@ -44,7 +47,7 @@ namespace okapi {
   private:
     const unsigned char joystick, buttonGroup, port;
     const bool inverted, isJoystick;
-    bool wasPressedLast = false;
+    bool wasPressedLast;
   };
 
   inline namespace literals {

diff --git a/okapilib-template/firmware/okapilib.a b/okapilib-template/firmware/okapilib.a
diff --git a/okapilib-template/include/device/button.h b/okapilib-template/include/device/button.h
@@ -11,21 +11,24 @@ namespace okapi {
       buttonGroup(8),
       port(0),
       inverted(false),
-      isJoystick(false) {}
+      isJoystick(false),
+      wasPressedLast(false) {}
 
     explicit constexpr Button(const unsigned long long int iport, const bool iinverted = false):
       joystick(1),
       buttonGroup(8),
       port(iport),
       inverted(iinverted),
-      isJoystick(false) {}
+      isJoystick(false),
+      wasPressedLast(iinverted) {}
 
     explicit constexpr Button(const unsigned char ijoystick, const unsigned char ibuttonGroup, const unsigned char ibutton, const bool iinverted = false):
       joystick(ijoystick),
       buttonGroup(ibuttonGroup),
       port(ibutton),
       inverted(iinverted),
-      isJoystick(true) {}
+      isJoystick(true),
+      wasPressedLast(iinverted) {}
 
 
     bool isPressed() const {
@@ -44,7 +47,7 @@ namespace okapi {
   private:
     const unsigned char joystick, buttonGroup, port;
     const bool inverted, isJoystick;
-    bool wasPressedLast = false;
+    bool wasPressedLast;
   };
 
   inline namespace literals {

diff --git a/okapilib-template/template.pros b/okapilib-template/template.pros
@@ -1 +1 @@
-{"py/object": "prosconductor.providers.TemplateConfig", "py/state": {"depot": null, "name": "okapilib", "remove_paths": [], "template_ignore": ["template.pros"], "upgrade_paths": ["firmware/okapilib.a", "include/main.h", "include/device/motor.h", "include/device/button.h", "include/device/potentiometer.h", "include/device/quadEncoder.h", "include/device/rangeFinder.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"], "version": "0.2.4"}}
+{"py/object": "prosconductor.providers.TemplateConfig", "py/state": {"depot": null, "name": "okapilib", "remove_paths": [], "template_ignore": ["template.pros"], "upgrade_paths": ["firmware/okapilib.a", "include/main.h", "include/device/motor.h", "include/device/button.h", "include/device/potentiometer.h", "include/device/quadEncoder.h", "include/device/rangeFinder.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"], "version": "0.2.5"}}
diff --git a/template.mk b/template.mk
@@ -1,5 +1,5 @@
 LIBNAME=okapilib
-VERSION=0.2.4
+VERSION=0.2.5
 
 # extra files (like header files)
 TEMPLATEFILES = include/main.h include/device/motor.h include/device/button.h include/device/potentiometer.h include/device/quadEncoder.h include/device/rangeFinder.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