mirror of
https://github.com/meshtastic/firmware.git
synced 2025-04-26 18:09:04 +00:00
ditch that no-good m5 dependancy and do it ourself
This commit is contained in:
parent
13ebda6b2f
commit
402b0d7e0b
@ -133,4 +133,3 @@ lib_deps =
|
|||||||
adafruit/Adafruit LIS3DH@^1.2.4
|
adafruit/Adafruit LIS3DH@^1.2.4
|
||||||
https://github.com/lewisxhe/SensorLib#27fd0f721e20cd09e1f81383f0ba58a54fe84a17
|
https://github.com/lewisxhe/SensorLib#27fd0f721e20cd09e1f81383f0ba58a54fe84a17
|
||||||
adafruit/Adafruit LSM6DS@^4.7.2
|
adafruit/Adafruit LSM6DS@^4.7.2
|
||||||
m5stack/M5Unit-Sonic@^0.0.2
|
|
||||||
|
@ -11,8 +11,7 @@ int32_t RCWL9620Sensor::runOnce()
|
|||||||
if (!hasSensor()) {
|
if (!hasSensor()) {
|
||||||
return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
|
return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
|
||||||
}
|
}
|
||||||
status = 1;
|
status = begin(nodeTelemetrySensorsMap[sensorType].first, nodeTelemetrySensorsMap[sensorType].second);
|
||||||
rcwl9620.begin(nodeTelemetrySensorsMap[sensorType].second, nodeTelemetrySensorsMap[sensorType].first, -1, -1);
|
|
||||||
return initI2CSensor();
|
return initI2CSensor();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -21,6 +20,42 @@ void RCWL9620Sensor::setup() {}
|
|||||||
bool RCWL9620Sensor::getMetrics(meshtastic_Telemetry *measurement)
|
bool RCWL9620Sensor::getMetrics(meshtastic_Telemetry *measurement)
|
||||||
{
|
{
|
||||||
LOG_DEBUG("RCWL9620Sensor::getMetrics\n");
|
LOG_DEBUG("RCWL9620Sensor::getMetrics\n");
|
||||||
measurement->variant.environment_metrics.distance = rcwl9620.getDistance();
|
measurement->variant.environment_metrics.distance = getDistance();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool RCWL9620Sensor::begin(uint8_t addr, TwoWire *wire)
|
||||||
|
{
|
||||||
|
_wire = wire;
|
||||||
|
_addr = addr;
|
||||||
|
if (i2c_dev)
|
||||||
|
delete i2c_dev;
|
||||||
|
i2c_dev = new Adafruit_I2CDevice(_addr, _wire);
|
||||||
|
if (!i2c_dev->begin())
|
||||||
|
return false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
float RCWL9620Sensor::getDistance()
|
||||||
|
{
|
||||||
|
uint32_t data;
|
||||||
|
_wire->beginTransmission(_addr); // Transfer data to addr.
|
||||||
|
_wire->write(0x01);
|
||||||
|
_wire->endTransmission(); // Stop data transmission with the Ultrasonic
|
||||||
|
// Unit.
|
||||||
|
|
||||||
|
_wire->requestFrom(_addr,
|
||||||
|
(uint8_t)3); // Request 3 bytes from Ultrasonic Unit.
|
||||||
|
|
||||||
|
data = _wire->read();
|
||||||
|
data <<= 8;
|
||||||
|
data |= _wire->read();
|
||||||
|
data <<= 8;
|
||||||
|
data |= _wire->read();
|
||||||
|
float Distance = float(data) / 1000;
|
||||||
|
if (Distance > 4500.00) {
|
||||||
|
return 4500.00;
|
||||||
|
} else {
|
||||||
|
return Distance;
|
||||||
|
}
|
||||||
|
}
|
@ -1,14 +1,18 @@
|
|||||||
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
||||||
#include "TelemetrySensor.h"
|
#include "TelemetrySensor.h"
|
||||||
#include <Unit_Sonic.h>
|
#include <Adafruit_I2CDevice.h>
|
||||||
|
|
||||||
class RCWL9620Sensor : public TelemetrySensor
|
class RCWL9620Sensor : public TelemetrySensor
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
SONIC_I2C rcwl9620;
|
uint8_t _addr;
|
||||||
|
TwoWire *_wire;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void setup() override;
|
virtual void setup() override;
|
||||||
|
bool begin(uint8_t addr = 0x57, TwoWire *wire = &Wire);
|
||||||
|
Adafruit_I2CDevice *i2c_dev = NULL;
|
||||||
|
float getDistance();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
RCWL9620Sensor();
|
RCWL9620Sensor();
|
||||||
|
Loading…
Reference in New Issue
Block a user