mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-14 15:31:31 +10:00
Jorropo
beb268ff25
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
30 lines
980 B
C++
30 lines
980 B
C++
#include "MeshModule.h"
|
|
#include "configuration.h"
|
|
|
|
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<SparkFun_Qwiic_Scale_NAU7802_Arduino_Library.h>)
|
|
|
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
|
#include "TelemetrySensor.h"
|
|
#include <SparkFun_Qwiic_Scale_NAU7802_Arduino_Library.h>
|
|
|
|
class NAU7802Sensor : public TelemetrySensor
|
|
{
|
|
private:
|
|
NAU7802 nau7802;
|
|
|
|
protected:
|
|
const char *nau7802ConfigFileName = "/prefs/nau7802.dat";
|
|
bool saveCalibrationData();
|
|
bool loadCalibrationData();
|
|
|
|
public:
|
|
NAU7802Sensor();
|
|
virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
|
|
virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
|
|
void tare();
|
|
void calibrate(float weight);
|
|
AdminMessageHandleResult handleAdminMessage(const meshtastic_MeshPacket &mp, meshtastic_AdminMessage *request,
|
|
meshtastic_AdminMessage *response) override;
|
|
};
|
|
|
|
#endif |