diff options
| author | Mike Fiore <mfiore@multitech.com> | 2015-12-10 08:54:03 -0600 |
|---|---|---|
| committer | Mike Fiore <mfiore@multitech.com> | 2015-12-10 08:54:03 -0600 |
| commit | cef0e023623fd814f04c4fb68d7bf21d5433fb18 (patch) | |
| tree | 438b9f1631047788565d44e7705a0dc25bb66c01 /Mode/Mode.h | |
| parent | 96b7412369c44c3cc7608859c19161073cd114da (diff) | |
| download | mtdot-box-evb-factory-firmware-cef0e023623fd814f04c4fb68d7bf21d5433fb18.tar.gz mtdot-box-evb-factory-firmware-cef0e023623fd814f04c4fb68d7bf21d5433fb18.tar.bz2 mtdot-box-evb-factory-firmware-cef0e023623fd814f04c4fb68d7bf21d5433fb18.zip | |
remove extra GPS and Sensor objects from Mode class
Diffstat (limited to 'Mode/Mode.h')
| -rw-r--r-- | Mode/Mode.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Mode/Mode.h b/Mode/Mode.h index 6b4e24f..d647b88 100644 --- a/Mode/Mode.h +++ b/Mode/Mode.h @@ -6,11 +6,11 @@ #include "mDot.h" #include "LoRaHandler.h" #include "GPSPARSER.h" +#include "SensorHandler.h" #include "ISL29011.h" #include "MMA845x.h" #include "MPL3115A2.h" #include "FileName.h" -#include "SensorHandler.h" class Mode { public: @@ -45,7 +45,7 @@ class Mode { float temperature; } SensorItem; - Mode(DOGS102* lcd, ButtonHandler* buttons, mDot* dot, LoRaHandler* lora, GPSPARSER* gps); + Mode(DOGS102* lcd, ButtonHandler* buttons, mDot* dot, LoRaHandler* lora, GPSPARSER* gps, SensorHandler* sensors); ~Mode(); virtual bool start() = 0; @@ -65,6 +65,7 @@ class Mode { mDot* _dot; LoRaHandler* _lora; GPSPARSER* _gps; + SensorHandler* _sensors; osThreadId _main_id; uint32_t _index; uint8_t _band; @@ -78,9 +79,6 @@ class Mode { uint8_t _state; bool _send_data; bool _gps_available; - mts::MTSSerial _gpsUART; - GPSPARSER _mdot_gps; - SensorHandler _mdot_sensors; }; #endif |