refs #17 Add thermistor as optional peripheral.

OSURoboticsClub · Feb 10, 2015 · 56b0e9d · 56b0e9d
1 parent 4861c21
commit 56b0e9d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/src/estimator/world_estimator.cpp b/src/estimator/world_estimator.cpp
@@ -9,7 +9,7 @@ WorldEstimator::WorldEstimator(Communicator& communicator)
   : worldMessageStream(communicator, 10) {
 }
 
-WorldEstimate WorldEstimator::update(GPSReading& gpsReading) {
+WorldEstimate WorldEstimator::update(const SensorReadingGroup& readings) {
   // TODO: get GPS data
 
   WorldEstimate estimate {

diff --git a/src/estimator/world_estimator.hpp b/src/estimator/world_estimator.hpp
@@ -3,10 +3,11 @@
 
 #include "communication/communicator.hpp"
 #include "communication/rate_limited_stream.hpp"
-#include "sensor/gps.hpp"
+#include "estimator/attitude_estimator.hpp"
 
 struct WorldEstimate {
   float globe_loc[3];
+  float therm;
 };
 
 class WorldEstimator {
@@ -19,7 +20,7 @@ class WorldEstimator {
    *
    * TODO(yoos): Consolidate with attitude estimator.
    */
-  virtual WorldEstimate update(GPSReading& gpsReading);
+  virtual WorldEstimate update(const SensorReadingGroup& readings);
 
 private:
   RateLimitedStream worldMessageStream;

diff --git a/src/system/multirotor_vehicle_system.cpp b/src/system/multirotor_vehicle_system.cpp
@@ -45,7 +45,7 @@ void MultirotorVehicleSystem::update() {
   if (i++ % 100 == 0) {
     gpsReading = gps.readGPS();
     if (thermistor) {
-      thermReading = (*therm)->readTherm();
+      thermReading = (*thermistor)->readTherm();
     }
   }
 

diff --git a/src/system/multirotor_vehicle_system.hpp b/src/system/multirotor_vehicle_system.hpp
@@ -36,6 +36,7 @@ class MultirotorVehicleSystem : public VehicleSystem, public MessageListener {
       Accelerometer& accelerometer,
       GPS& gps,
       optional<Magnetometer *> magnetometer, // TODO: Use reference_wrapper?
+      optional<Thermistor *> thermistor,
       WorldEstimator& world,
       AttitudeEstimator& attitude,
       InputSource& inputSource,
@@ -51,6 +52,7 @@ class MultirotorVehicleSystem : public VehicleSystem, public MessageListener {
   Accelerometer& accelerometer;
   GPS& gps;
   optional<Magnetometer *> magnetometer;
+  optional<Thermistor *> thermistor;
 
   WorldEstimator& world;
   AttitudeEstimator& attitude;

diff --git a/variants/units/helios/unit_data.hpp b/variants/units/helios/unit_data.hpp
@@ -38,7 +38,7 @@ struct UnitData {
       world(communicator),
       attitude(communicator),
       inputSource(communicator),
-      system(platform.get<Gyroscope>(), platform.get<Accelerometer>(), platform.get<GPS>(), std::experimental::nullopt, world, attitude, inputSource, motorMapper, communicator) {
+      system(platform.get<Gyroscope>(), platform.get<Accelerometer>(), platform.get<GPS>(), std::experimental::nullopt, std::experimental::nullopt, world, attitude, inputSource, motorMapper, communicator) {
   }
 };