Config cleanup

- dropped esp8266 compatibility
This commit is contained in:
Martin Bauer
2020-06-21 13:50:02 +02:00
parent f3f378a54a
commit 4fd7d8cf33
5 changed files with 52 additions and 58 deletions

View File

@@ -1,17 +1,17 @@
#include "HX711.h"
#include "ConfigHardware.h"
#include "SwimTrackerConfig.h"
#include <cstdint>
template<int DIVIDER=128>
template <int DIVIDER = 128>
class Scale
{
public:
bool measure(uint16_t & measurementOut) {
bool measure(uint16_t &measurementOut)
{
if (hx711_.is_ready())
{
long value = hx711_.read_average(CONFIG_MEASUREMENT_AVG_COUNT) - offset_;
if(value < 0)
if (value < 0)
measurementOut = (int16_t)(-value / DIVIDER);
else
measurementOut = 0;
@@ -21,13 +21,17 @@ public:
return false;
}
void begin(uint32_t pinDOUT, uint32_t pinSCK) {
void begin(uint32_t pinDOUT, uint32_t pinSCK)
{
hx711_.begin(pinDOUT, pinSCK);
};
void tare(uint32_t numMeasurementsToAverage=50) {
void tare(uint32_t numMeasurementsToAverage = 50)
{
offset_ = hx711_.read_average(numMeasurementsToAverage);
}
long &offset() const { return offset_; }
private:
HX711 hx711_;