diff options
| author | Michele Bini <michele.bini@gmail.com> | 2022-03-26 04:04:07 (GMT) |
|---|---|---|
| committer | Michele Bini <michele.bini@gmail.com> | 2022-03-26 04:06:47 (GMT) |
| commit | 5215bc45a6520258c021a6df3940de9f1f16d6ff (patch) | |
| tree | 9a990b2d1f32a51be3ed7f796ac3d33573152a07 /src/components/motion | |
| parent | 6ef420d2407a4685b56a233f6b0f849e90c6cf49 (diff) | |
sans steps
Diffstat (limited to 'src/components/motion')
| -rw-r--r-- | src/components/motion/MotionController.cpp | 7 | ||||
| -rw-r--r-- | src/components/motion/MotionController.h | 14 |
2 files changed, 2 insertions, 19 deletions
diff --git a/src/components/motion/MotionController.cpp b/src/components/motion/MotionController.cpp index 4a7a7eb..aa2f3ee 100644 --- a/src/components/motion/MotionController.cpp +++ b/src/components/motion/MotionController.cpp @@ -2,15 +2,10 @@ #include "os/os_cputime.h" using namespace Pinetime::Controllers; -void MotionController::Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps) { +void MotionController::Update(int16_t x, int16_t y, int16_t z) { this->x = x; this->y = y; this->z = z; - int32_t deltaSteps = nbSteps - this->nbSteps; - this->nbSteps = nbSteps; - if (deltaSteps > 0) { - currentTripSteps += deltaSteps; - } } bool MotionController::Should_RaiseWake(bool isSleeping) { diff --git a/src/components/motion/MotionController.h b/src/components/motion/MotionController.h index 5385658..5200b41 100644 --- a/src/components/motion/MotionController.h +++ b/src/components/motion/MotionController.h @@ -13,7 +13,7 @@ namespace Pinetime { BMA425, }; - void Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps); + void Update(int16_t x, int16_t y, int16_t z); int16_t X() const { return x; @@ -24,16 +24,6 @@ namespace Pinetime { int16_t Z() const { return z; } - uint32_t NbSteps() const { - return nbSteps; - } - - void ResetTrip() { - currentTripSteps = 0; - } - uint32_t GetTripSteps() const { - return currentTripSteps; - } bool Should_ShakeWake(uint16_t thresh); bool Should_RaiseWake(bool isSleeping); @@ -50,8 +40,6 @@ namespace Pinetime { void Init(Pinetime::Drivers::Bma421::DeviceTypes types); private: - uint32_t nbSteps; - uint32_t currentTripSteps = 0; int16_t x; int16_t y; int16_t z; |
