From 6338820c52559a192d2633b479ee61c0dae5ed53 Mon Sep 17 00:00:00 2001 From: allosaurus7000 <59909007+allosaurus7000@users.noreply.github.com> Date: Sun, 22 Nov 2020 00:50:45 -0800 Subject: [PATCH 1/4] Update sensor.cpp --- Software/spartan/src/sensors/sensor.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Software/spartan/src/sensors/sensor.cpp b/Software/spartan/src/sensors/sensor.cpp index cd27985..060ecd2 100644 --- a/Software/spartan/src/sensors/sensor.cpp +++ b/Software/spartan/src/sensors/sensor.cpp @@ -1,8 +1,13 @@ #include "sensor.h" - +#include "utilis.h" // Constructor spartan::Sensor::Sensor(int busID, int instance) : m_busID(busID), m_status(STATUS_OFF), m_instance(instance) {} +unsigned long spartan::Sensor::poll_correct_frequency() { + if (getTimeMillis() > last_polled + frequency) { + last_polled = getTimeMillis(); + } +} // Debug output void spartan::Sensor::printEscapedValues(bool normalize) const { From 7ff2a80c8a9a743aacc9a3380c3e08c49ae070da Mon Sep 17 00:00:00 2001 From: allosaurus7000 <59909007+allosaurus7000@users.noreply.github.com> Date: Sun, 22 Nov 2020 00:51:54 -0800 Subject: [PATCH 2/4] Update sensor.h --- Software/spartan/src/sensors/sensor.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Software/spartan/src/sensors/sensor.h b/Software/spartan/src/sensors/sensor.h index 53179ab..ae551f3 100644 --- a/Software/spartan/src/sensors/sensor.h +++ b/Software/spartan/src/sensors/sensor.h @@ -20,6 +20,8 @@ namespace spartan { // Standard sensor implementation virtual int powerOn() = 0; virtual int powerOff() = 0; + virtual long last_polled() = 0; + virtual unsigned long poll_correct_frequency(); virtual int poll(MasterDataPacket &dp) = 0; // Debug options @@ -29,6 +31,7 @@ namespace spartan { // Data getters int getBusID() const; int getInstance() const; + const long frequency = 1000; // Return status (operate with interfaced constants described in globals.h) virtual int getStatus() const; @@ -40,3 +43,4 @@ namespace spartan { } // namespace spartan #endif // SENSOR_H_INCLUDED + From f5a1f70846eb5a5d3f293769fcced043bc44675f Mon Sep 17 00:00:00 2001 From: allosaurus7000 <59909007+allosaurus7000@users.noreply.github.com> Date: Sun, 22 Nov 2020 00:52:27 -0800 Subject: [PATCH 3/4] Update sensor.h --- Software/spartan/src/sensors/sensor.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Software/spartan/src/sensors/sensor.h b/Software/spartan/src/sensors/sensor.h index ae551f3..ea9786d 100644 --- a/Software/spartan/src/sensors/sensor.h +++ b/Software/spartan/src/sensors/sensor.h @@ -20,8 +20,8 @@ namespace spartan { // Standard sensor implementation virtual int powerOn() = 0; virtual int powerOff() = 0; - virtual long last_polled() = 0; - virtual unsigned long poll_correct_frequency(); + virtual long last_polled() = 0; + virtual unsigned long poll_correct_frequency(); virtual int poll(MasterDataPacket &dp) = 0; // Debug options From 5d8b11cc0046ddb4cc1a572d432e5c7032d8f4dc Mon Sep 17 00:00:00 2001 From: allosaurus7000 <59909007+allosaurus7000@users.noreply.github.com> Date: Sun, 22 Nov 2020 00:53:08 -0800 Subject: [PATCH 4/4] Update sensor.cpp --- Software/spartan/src/sensors/sensor.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Software/spartan/src/sensors/sensor.cpp b/Software/spartan/src/sensors/sensor.cpp index 060ecd2..3ecac1a 100644 --- a/Software/spartan/src/sensors/sensor.cpp +++ b/Software/spartan/src/sensors/sensor.cpp @@ -3,6 +3,7 @@ // Constructor spartan::Sensor::Sensor(int busID, int instance) : m_busID(busID), m_status(STATUS_OFF), m_instance(instance) {} + unsigned long spartan::Sensor::poll_correct_frequency() { if (getTimeMillis() > last_polled + frequency) { last_polled = getTimeMillis();