diff --git a/src/common/base_classes/Sensor.cpp b/src/common/base_classes/Sensor.cpp
index cd7bb170..3ed32b7e 100644
--- a/src/common/base_classes/Sensor.cpp
+++ b/src/common/base_classes/Sensor.cpp
@@ -6,12 +6,22 @@
 
 void Sensor::update() {
     float val = getSensorAngle();
-    if (val<0) // sensor angles are strictly non-negative. Negative values are used to signal errors.
+
+    // sensor angles are strictly non-negative. Negative values are used to signal errors.
+    if (val < 0) {
         return; // TODO signal error, e.g. via a flag and counter
+    }
+
     angle_prev_ts = _micros();
     float d_angle = val - angle_prev;
-    // if overflow happened track it as full rotation
-    if(abs(d_angle) > (0.8f*_2PI) ) full_rotations += ( d_angle > 0 ) ? -1 : 1; 
+
+    // if wrap-around happened. track full rotation
+    if (d_angle > (0.5f *_2PI)) {
+        full_rotations--;
+    } else if (d_angle < -(0.5f *_2PI)) {
+        full_rotations++;
+    }
+
     angle_prev = val;
 }
 
diff --git a/src/common/base_classes/Sensor.h b/src/common/base_classes/Sensor.h
index c77eb911..7140fd25 100644
--- a/src/common/base_classes/Sensor.h
+++ b/src/common/base_classes/Sensor.h
@@ -109,15 +109,14 @@ class Sensor{
         float min_elapsed_time = 0.000100; // default is 100 microseconds, or 10kHz
 
     protected:
-        /** 
-         * Get current shaft angle from the sensor hardware, and 
+        /** Get current shaft angle from the sensor hardware, and
          * return it as a float in radians, in the range 0 to 2PI.
-         * 
+         *
          * This method is pure virtual and must be implemented in subclasses.
          * Calling this method directly does not update the base-class internal fields.
          * Use update() when calling from outside code.
          */
-        virtual float getSensorAngle()=0;
+        virtual float getSensorAngle() = 0;
         /**
          * Call Sensor::init() from your sensor subclass's init method if you want smoother startup
          * The base class init() method calls getSensorAngle() several times to initialize the internal fields
@@ -126,14 +125,37 @@ class Sensor{
          */
         virtual void init();
 
-        // velocity calculation variables
-        float velocity=0.0f;
-        float angle_prev=0.0f; // result of last call to getSensorAngle(), used for full rotations and velocity
-        long angle_prev_ts=0; // timestamp of last call to getAngle, used for velocity
-        float vel_angle_prev=0.0f; // angle at last call to getVelocity, used for velocity
-        long vel_angle_prev_ts=0; // last velocity calculation timestamp
-        int32_t full_rotations=0; // full rotation tracking
-        int32_t vel_full_rotations=0; // previous full rotation value for velocity calculation
+        /** Last calculated velocity in rad/s */
+        float velocity = 0.0f;
+
+        /** Previously determined angle from getSensorAngle()
+         *
+         *  Always in the range of 0 to 2PI
+         */
+        float angle_prev = 0.0f;
+
+        /** Timestamp of last call to update() in micro seconds.
+         */
+        long angle_prev_ts = 0;
+
+        /** Angle at last call to getVelocity 0 to 2PI.
+         *
+         *  Used for velocity
+         */
+        float vel_angle_prev = 0.0f;
+
+        /** Timestamp of last call to getVelocity() in micro seconds.
+         */
+        long vel_angle_prev_ts = 0; // last velocity calculation timestamp
+
+        /** Previously determined number of full rotations.
+         *
+         *  Updated in update()
+         */
+        int32_t full_rotations = 0;
+
+        /** Velocity in 2PI/sec */
+        int32_t vel_full_rotations = 0;
 };
 
 #endif