Skip to content
This repository was archived by the owner on May 26, 2024. It is now read-only.

Fix: Allow multiple inheritance (one physical sensor has multiple logical sensors) #5

Merged
aentinger merged 3 commits into from
Sep 2, 2021
Merged

Fix: Allow multiple inheritance (one physical sensor has multiple logical sensors) #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c251fa
Fix: Remove namespace 'arduino'
aentinger Sep 2, 2021
1b62c14
Fix README and examples after change to base class API.
aentinger Sep 2, 2021
7c593b9
Prevent ambigious base class problems due to inheritance down the roa…
aentinger Sep 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public:
{ }
virtual ~DummyPressureSensor() { }

virtual drone::unit::Pressure get() const override { return drone::unit::Pressure(1023.0 * drone::unit::pascal); }
virtual void get(drone::unit::Pressure & val) const override { val = drone::unit::Pressure(1023.0 * drone::unit::pascal); }
void onExternalEvent() { onSensorValueUpdate(drone::unit::Pressure(65.8 * drone::unit::pascal)); }
};
/* ... */
Expand All @@ -55,11 +55,13 @@ void setup()

Serial.println(pressure_sensor);

drone::unit::Pressure pressure_val = 0.0 * drone::unit::pascal;
Serial.print("[SYNC] p = ");
Serial.print(pressure_sensor.get().value());
Serial.print(pressure_val.value());
Serial.println(" Pascal");
Serial.println();


pressure_sensor.onExternalEvent();
}

Expand Down
5 changes: 3 additions & 2 deletions examples/DummyPressureSensor/DummyPressureSensor.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public:
virtual ~DummyPressureSensor() { }


virtual drone::unit::Pressure get() const override { return drone::unit::Pressure(1023.0 * drone::unit::pascal); }
virtual void get(drone::unit::Pressure & val) const override { val = drone::unit::Pressure(1023.0 * drone::unit::pascal); }

void onExternalEvent()
{
Expand Down Expand Up @@ -62,8 +62,9 @@ void setup()

Serial.println(pressure_sensor);

drone::unit::Pressure pressure_val = 0.0 * drone::unit::pascal;
Serial.print("[SYNC] p = ");
Serial.print(pressure_sensor.get().value());
Serial.print(pressure_val.value());
Serial.println(" Pascal");
Serial.println();

Expand Down
7 changes: 4 additions & 3 deletions src/107-Arduino-Sensor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include <107-Arduino-BoostUnits.h>

#include <Printable.h>
#include <Arduino.h>

/**************************************************************************************
* NAMESPACE
Expand All @@ -31,7 +31,7 @@ namespace drone
**************************************************************************************/

template<typename T>
class ArduinoSensorBase : public arduino::Printable
class ArduinoSensorBase : public virtual Printable
{

public:
Expand Down Expand Up @@ -61,7 +61,7 @@ class ArduinoSensorBase : public arduino::Printable
inline unit::Frequency updateRate() const { return _update_rate; }


virtual T get() const = 0;
virtual void get(T & val) const = 0;


virtual size_t printTo(Print & p) const override
Expand Down Expand Up @@ -108,6 +108,7 @@ class ArduinoSensorBase : public arduino::Printable

typedef ArduinoSensorBase<unit::Length> LengthSensorBase;
typedef ArduinoSensorBase<unit::Pressure> PressureSensorBase;
typedef ArduinoSensorBase<unit::Temperature> TemperatureSensorBase;

/**************************************************************************************
* NAMESPACE
Expand Down