martin/swimtracker-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More configuration options

Browse Source 
- wifi provisioning
- auto start/stop of sessions
This commit is contained in:
Martin Bauer
2020-09-03 14:10:52 +02:00
parent 92e7399fe4
commit 041031709f
12 changed files with 547 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
firmware/lib/scale/Scale.h
View File

@@ -2,32 +2,23 @@
#include "SwimTrackerConfig.h"
#include <cstdint>
template <int DIVIDER = 128>
class Scale
{
public:
bool measure(uint16_t &measurementOut)
{
//if (hx711_.is_ready())
//{
long value = hx711_.read_average(CONFIG_MEASUREMENT_AVG_COUNT) - offset_;
if (value < 0)
measurementOut = (int16_t)(-value / DIVIDER);
else
measurementOut = 0;
return true;
//}
//else {
// long value = hx711_.read_average(CONFIG_MEASUREMENT_AVG_COUNT) - offset_;
//
// Serial.printf("Measurement failed %ld\n", value);
// return false;
//}
long value = hx711_.read_average(CONFIG_MEASUREMENT_AVG_COUNT) - offset_;
if (value < 0)
measurementOut = (int16_t)(-(value >> valueRightShift_ ));
else
measurementOut = 0;
return true;
}
void begin(uint32_t pinDOUT, uint32_t pinSCK)
void begin(uint32_t pinDOUT, uint32_t pinSCK, int valueRightShift)
{
hx711_.begin(pinDOUT, pinSCK);
valueRightShift_ = valueRightShift;
};
void tare(uint32_t numMeasurementsToAverage = 50)
@@ -36,10 +27,11 @@ public:
offset_ = hx711_.read_average(numMeasurementsToAverage);
Serial.printf("Tare offset %ld\n", offset_);
}
const long &offset() const { return offset_; }
const long &offset() const { return offset_; }
int valueRightShift() const { return valueRightShift_; }
private:
HX711 hx711_;
long offset_ = 0;
int valueRightShift_;
};