diff --git a/Software/main/main.cpp b/Software/main/main.cpp index ba9027c..e783426 100644 --- a/Software/main/main.cpp +++ b/Software/main/main.cpp @@ -14,10 +14,11 @@ int main() { std::array dataPackets; - std::array sensors; + std::array sensors; // TODO: Initialize Sensors sensors[0] = new spartan::LSM6DS33(1, 0); + sensors[1] = new spartan::ADS1115(1, 1); // TODO: Initialize DataPackets spartan::MasterDataPacket mdp; diff --git a/Software/spartan/src/sensors/ads1115.cpp b/Software/spartan/src/sensors/ads1115.cpp index e71aad4..38c2753 100644 --- a/Software/spartan/src/sensors/ads1115.cpp +++ b/Software/spartan/src/sensors/ads1115.cpp @@ -1,8 +1,21 @@ #include "ads1115.h" -/* -spartan::ADS1115::ADS1115(int bus, uint8_t address) {} -int spartan::ADS1115::pollData(spartan::DataPacket &dp) { return 0; } +spartan::ADS1115::ADS1115(int bus, uint8_t address) + : Sensor(bus, address), m_i2c(bus, true) +{} -void spartan::ADS1115::printValues() const {} -*/ +const char* spartan::ADS1115::name() const +{ + const char * str = "ADS1115"; + return str; +}; + +void spartan::ADS1115::printSensorInfo() {} + +int spartan::ADS1115::powerOn() { return 0; } + +int spartan::ADS1115::powerOff() { return 0; } + +int spartan::ADS1115::pollData(MasterDataPacket &dp) { return 0; } + +int spartan::ADS1115::printValues() const {} diff --git a/Software/spartan/src/sensors/ads1115.h b/Software/spartan/src/sensors/ads1115.h index 001f83d..9b52bbb 100644 --- a/Software/spartan/src/sensors/ads1115.h +++ b/Software/spartan/src/sensors/ads1115.h @@ -16,8 +16,18 @@ namespace spartan class ADS1115 : public Sensor { public: ADS1115(int bus, uint8_t address); - virtual int pollData(spartan::MasterDataPacket &dp); + + virtual const char * name() const; + virtual void printSensorInfo(); + + virtual int powerOn(); + virtual int powerOff(); + virtual int pollData(MasterDataPacket &dp); + virtual int printValues() const; + + private: + mraa::I2c m_i2c; }; } // namespace spartan