Minor code improvements

OpenEarable · Dec 26, 2023 · 1dec4d2 · 1dec4d2
1 parent bd24516
commit 1dec4d2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/open_earable/lib/apps/jump_height_test/jump_height_chart.dart b/open_earable/lib/apps/jump_height_test/jump_height_chart.dart
@@ -123,14 +123,15 @@ class _JumpHeightChartState extends State<JumpHeightChart> {
   /// Calculates the height of the jump.
   DataValue _calculateHeightData(XYZValue accValue) {
     // Subtract gravity to get acceleration due to movement.
-    double currentAcc = accValue._z * cos(_pitch) + accValue._x * sin(_pitch) - _gravity;;
+    double currentAcc = accValue._z * cos(_pitch) + accValue._x * sin(_pitch) - _gravity;
 
     double threshold = 0.3;
     double accMagnitude = sqrt(accValue._x * accValue._x + accValue._y * accValue._y + accValue._z * accValue._z);
     bool isStationary = (accMagnitude > _gravity - threshold) && (accMagnitude < _gravity + threshold);
-    /// Checks if the device is stationary based on acceleration magnitude.
+    // Checks if the device is stationary based on acceleration magnitude.
     if (isStationary) {
         _velocity = 0.0;
+        _height = 0.0;
     } else {
         // Integrate acceleration to get velocity.
         _velocity += currentAcc * _timeSlice;

diff --git a/open_earable/lib/apps/jump_height_test/jump_height_test.dart b/open_earable/lib/apps/jump_height_test/jump_height_test.dart
@@ -174,6 +174,7 @@ class _JumpHeightTestState extends State<JumpHeightTest>
     setState(() {
       if (_deviceIsStationary(0.3)) {
           _velocity = 0.0;
+          _height = 0.0;
       } else {
           // Integrate acceleration to get velocity.
           _velocity += currentAcc * _timeSlice;
@@ -231,8 +232,6 @@ class _JumpHeightTestState extends State<JumpHeightTest>
           ),
           SizedBox(height: 20),  // Margin between chart and button
           _buildButtons(),
-          SizedBox(height: 20),  // Margin between button and text
-          _buildText(),
           Visibility(
               // Show error message if no OpenEarable device is connected.
               visible: !_earableConnected,
@@ -246,6 +245,8 @@ class _JumpHeightTestState extends State<JumpHeightTest>
                 ),
               ),
             ),
+          SizedBox(height: 20),  // Margin between button and text
+          _buildText()
         ],
       ),
     );