alex/GY-63_MS5611
1
0
Fork 0
mirror of https://github.com/RobTillaart/Arduino.git synced 2024-10-03 18:09:02 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

+ version 0.1.11

Browse Source 
+ undo fix clear.
This commit is contained in:
rob tillaart 2015-03-29 18:35:38 +02:00
parent 503c409485
commit 3dbd52fd43
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/RunningMedian/RunningMedian.cpp
View File

@ -1,7 +1,7 @@
// //
// FILE: RunningMedian.cpp // FILE: RunningMedian.cpp
// AUTHOR: Rob dot Tillaart at gmail dot com // AUTHOR: Rob dot Tillaart at gmail dot com
// VERSION: 0.1.10 // VERSION: 0.1.11
// PURPOSE: RunningMedian library for Arduino // PURPOSE: RunningMedian library for Arduino
// //
// HISTORY: // HISTORY:
@ -16,6 +16,7 @@
// 0.1.08 - 2013-10-20 add getElement(), add getSottedElement() add predict() // 0.1.08 - 2013-10-20 add getElement(), add getSottedElement() add predict()
// 0.1.09 - 2014-11-25 float to double (support ARM) // 0.1.09 - 2014-11-25 float to double (support ARM)
// 0.1.10 - 2015-03-07 fix clear // 0.1.10 - 2015-03-07 fix clear
// 0.1.11 - 2015-03-29 undo 0.1.10 fix clear
// //
// Released to the public domain // Released to the public domain
// //
@ -48,8 +49,7 @@ void RunningMedian::clear()
_cnt = 0; _cnt = 0;
_idx = 0; _idx = 0;
_sorted = false; _sorted = false;
for (uint8_t i = 0; i< _size; i++) _p[i] = i;
for (uint8_t i=0; i< _size; i++) _p[i] = 0;
} }
// adds a new value to the data-set // adds a new value to the data-set
@ -148,10 +148,10 @@ double RunningMedian::predict(uint8_t n)
void RunningMedian::sort() void RunningMedian::sort()
{ {
// bubble sort with flag // bubble sort with flag
for (uint8_t i=0; i< _cnt-1; i++) for (uint8_t i = 0; i < _cnt-1; i++)
{ {
bool flag = true; bool flag = true;
for (uint8_t j=1; j< _cnt-i; j++) for (uint8_t j = 1; j < _cnt-i; j++)
{ {
if (_ar[_p[j-1]] > _ar[_p[j]]) if (_ar[_p[j-1]] > _ar[_p[j]])
{ {
@ -163,7 +163,6 @@ void RunningMedian::sort()
} }
if (flag) break; if (flag) break;
} }
_sorted = true; _sorted = true;
} }

4
libraries/RunningMedian/RunningMedian.h
View File

@ -2,7 +2,7 @@
// FILE: RunningMedian.h // FILE: RunningMedian.h
// AUTHOR: Rob dot Tillaart at gmail dot com // AUTHOR: Rob dot Tillaart at gmail dot com
// PURPOSE: RunningMedian library for Arduino // PURPOSE: RunningMedian library for Arduino
// VERSION: 0.1.10 // VERSION: 0.1.11
// URL: http://arduino.cc/playground/Main/RunningMedian // URL: http://arduino.cc/playground/Main/RunningMedian
// HISTORY: See RunningMedian.cpp // HISTORY: See RunningMedian.cpp
// //
@ -20,7 +20,7 @@
#include <inttypes.h> #include <inttypes.h>
#define RUNNING_MEDIAN_VERSION "0.1.10" #define RUNNING_MEDIAN_VERSION "0.1.11"
// prepare for dynamic version // prepare for dynamic version
// not tested use at own risk :) // not tested use at own risk :)