From 55769015f0d4ca6e47200e514b35f13fd77d53a9 Mon Sep 17 00:00:00 2001 From: Leon Lindenfelser Date: Thu, 3 Dec 2015 16:52:15 -0600 Subject: Moved SensorHandler out of the lib directory and into the root directory of the project. --- SensorHandler/SensorHandler.cpp | 118 +++++++++++++++++++++++++++++++++++ SensorHandler/SensorHandler.h | 48 ++++++++++++++ libs/SensorHandler/SensorHandler.cpp | 118 ----------------------------------- libs/SensorHandler/SensorHandler.h | 48 -------------- 4 files changed, 166 insertions(+), 166 deletions(-) create mode 100644 SensorHandler/SensorHandler.cpp create mode 100644 SensorHandler/SensorHandler.h delete mode 100644 libs/SensorHandler/SensorHandler.cpp delete mode 100644 libs/SensorHandler/SensorHandler.h diff --git a/SensorHandler/SensorHandler.cpp b/SensorHandler/SensorHandler.cpp new file mode 100644 index 0000000..6b25f7e --- /dev/null +++ b/SensorHandler/SensorHandler.cpp @@ -0,0 +1,118 @@ +/** + * @file SensorHandler.cpp + * @brief Reads on board sensors... acceleration, pressure, light and temperture. + * @author Leon Lindenfelser + * @version 1.0 + * + */ + +#include "SensorHandler.h" + +SensorHandler::SensorHandler() + : _getSensorThread(&SensorHandler::startSensorThread,this), + _mDoti2c(PC_9,PA_8), + _accelerometer(_mDoti2c,MMA845x::SA0_VSS), + _barometricSensor(_mDoti2c), + _lightSensor(_mDoti2c) +{ + _getSensorThread.signal_set(START_THREAD); + return; +} + +SensorHandler::~SensorHandler(void) +{ + _getSensorThread.terminate(); +} + +void SensorHandler::initSensors(){ + // Setup the Accelerometer for 8g range, 14 bit resolution, Noise reduction off, sample rate 1.56 Hz + // normal oversample mode, High pass filter off + _accelerometer.setCommonParameters(MMA845x::RANGE_8g,MMA845x::RES_MAX,MMA845x::LN_OFF, + MMA845x::DR_1_56,MMA845x::OS_NORMAL,MMA845x::HPF_OFF ); + + // Setup the Barometric sensor for post processed Ambient pressure, 4 samples per data acquisition. + //and a sample taken every second when in active mode + _barometricSensor.setParameters(MPL3115A2::DATA_NORMAL, MPL3115A2::DM_BAROMETER, MPL3115A2::OR_16, + MPL3115A2::AT_1); + // Setup the Ambient Light Sensor for continuous Ambient Light Sensing, 16 bit resolution, + // and 16000 lux range + _lightSensor.setMode(ISL29011::ALS_CONT); + _lightSensor.setResolution(ISL29011::ADC_16BIT); + _lightSensor.setRange(ISL29011::RNG_16000); + + // Set the accelerometer for active mode + _accelerometer.activeMode(); + + // Clear the min-max registers in the Barometric Sensor + _barometricSensor.clearMinMaxRegs(); +} + +void SensorHandler::startSensorThread(void const *p) +{ + SensorHandler *instance = (SensorHandler*)p; + instance->readSensors(); +} + +void SensorHandler::readSensors() +{ + uint8_t result; + _getSensorThread.signal_wait(START_THREAD); + while(1){ + // Test Accelerometer XYZ data ready bit to see if acquisition complete + do { + osDelay(100); // allows other threads to process + result = _accelerometer.getStatus(); + } while ((result & MMA845x::XYZDR) == 0 ); + + // Retrieve accelerometer data + _accelerometerData = _accelerometer.getXYZ(); + + // Trigger a Pressure reading + _barometricSensor.setParameters(MPL3115A2::DATA_NORMAL, MPL3115A2::DM_BAROMETER, MPL3115A2::OR_16, + MPL3115A2::AT_1); + _barometricSensor.triggerOneShot(); + + // Test barometer device status to see if acquisition is complete + do { + osDelay(100); // allows other threads to process + result = _barometricSensor.getStatus(); + } while ((result & MPL3115A2::PTDR) == 0 ); + + // Retrieve barometric pressure + _pressure = _barometricSensor.getBaroData() >> 12; // convert 32 bit signed to 20 bit unsigned value + + // Trigger a Altitude reading + _barometricSensor.setParameters(MPL3115A2::DATA_NORMAL, MPL3115A2::DM_ALTIMETER, MPL3115A2::OR_16, + MPL3115A2::AT_1); + _barometricSensor.triggerOneShot(); + + // Test barometer device status to see if acquisition is complete + do { + osDelay(100); // allows other threads to process + result = _barometricSensor.getStatus(); + } while ((result & MPL3115A2::PTDR) == 0 ); + + // Retrieve temperature + _barometerData = _barometricSensor.getAllData(false); + + // Retrieve light level + _light = _lightSensor.getData(); + } +} + +MMA845x_DATA SensorHandler::getAcceleration(){ + return _accelerometerData; +} + +uint16_t SensorHandler::getLight(){ + return _light; +} + +uint32_t SensorHandler::getPressure(){ + return _pressure; +} + +MPL3115A2_DATA SensorHandler::getBarometer(){ + return _barometerData; +} + diff --git a/SensorHandler/SensorHandler.h b/SensorHandler/SensorHandler.h new file mode 100644 index 0000000..73f9c0f --- /dev/null +++ b/SensorHandler/SensorHandler.h @@ -0,0 +1,48 @@ +/** + * @file SensorHandler.h + * @brief Reads on board sensors... acceleration, pressure, light and temperture. + * @author Leon Lindenfelser + * @version 1.0 + * + */ + +#ifndef SENSORHANDLER_H +#define SENSORHANDLER_H + +#include "mbed.h" +#include "MMA845x.h" +#include "MPL3115A2.h" +#include "ISL29011.h" +#include "DOGS102.h" +#include "rtos.h" +#include +#include +#define START_THREAD 1 + +class SensorHandler +{ +public: + SensorHandler(void); + ~SensorHandler(void); + MMA845x_DATA getAcceleration(void); + uint16_t getLight(void); + uint32_t getPressure(void); + MPL3115A2_DATA getBarometer(void); + + +private: + Thread _getSensorThread; + static void startSensorThread (void const *p); + void readSensors(void); + void initSensors(void); + I2C _mDoti2c; + MMA845x _accelerometer; + MPL3115A2 _barometricSensor; + ISL29011 _lightSensor; + MMA845x_DATA _accelerometerData; + MPL3115A2_DATA _barometerData; + uint16_t _light; + uint32_t _pressure; +}; + +#endif //SENSORHANDLER_H diff --git a/libs/SensorHandler/SensorHandler.cpp b/libs/SensorHandler/SensorHandler.cpp deleted file mode 100644 index 6b25f7e..0000000 --- a/libs/SensorHandler/SensorHandler.cpp +++ /dev/null @@ -1,118 +0,0 @@ -/** - * @file SensorHandler.cpp - * @brief Reads on board sensors... acceleration, pressure, light and temperture. - * @author Leon Lindenfelser - * @version 1.0 - * - */ - -#include "SensorHandler.h" - -SensorHandler::SensorHandler() - : _getSensorThread(&SensorHandler::startSensorThread,this), - _mDoti2c(PC_9,PA_8), - _accelerometer(_mDoti2c,MMA845x::SA0_VSS), - _barometricSensor(_mDoti2c), - _lightSensor(_mDoti2c) -{ - _getSensorThread.signal_set(START_THREAD); - return; -} - -SensorHandler::~SensorHandler(void) -{ - _getSensorThread.terminate(); -} - -void SensorHandler::initSensors(){ - // Setup the Accelerometer for 8g range, 14 bit resolution, Noise reduction off, sample rate 1.56 Hz - // normal oversample mode, High pass filter off - _accelerometer.setCommonParameters(MMA845x::RANGE_8g,MMA845x::RES_MAX,MMA845x::LN_OFF, - MMA845x::DR_1_56,MMA845x::OS_NORMAL,MMA845x::HPF_OFF ); - - // Setup the Barometric sensor for post processed Ambient pressure, 4 samples per data acquisition. - //and a sample taken every second when in active mode - _barometricSensor.setParameters(MPL3115A2::DATA_NORMAL, MPL3115A2::DM_BAROMETER, MPL3115A2::OR_16, - MPL3115A2::AT_1); - // Setup the Ambient Light Sensor for continuous Ambient Light Sensing, 16 bit resolution, - // and 16000 lux range - _lightSensor.setMode(ISL29011::ALS_CONT); - _lightSensor.setResolution(ISL29011::ADC_16BIT); - _lightSensor.setRange(ISL29011::RNG_16000); - - // Set the accelerometer for active mode - _accelerometer.activeMode(); - - // Clear the min-max registers in the Barometric Sensor - _barometricSensor.clearMinMaxRegs(); -} - -void SensorHandler::startSensorThread(void const *p) -{ - SensorHandler *instance = (SensorHandler*)p; - instance->readSensors(); -} - -void SensorHandler::readSensors() -{ - uint8_t result; - _getSensorThread.signal_wait(START_THREAD); - while(1){ - // Test Accelerometer XYZ data ready bit to see if acquisition complete - do { - osDelay(100); // allows other threads to process - result = _accelerometer.getStatus(); - } while ((result & MMA845x::XYZDR) == 0 ); - - // Retrieve accelerometer data - _accelerometerData = _accelerometer.getXYZ(); - - // Trigger a Pressure reading - _barometricSensor.setParameters(MPL3115A2::DATA_NORMAL, MPL3115A2::DM_BAROMETER, MPL3115A2::OR_16, - MPL3115A2::AT_1); - _barometricSensor.triggerOneShot(); - - // Test barometer device status to see if acquisition is complete - do { - osDelay(100); // allows other threads to process - result = _barometricSensor.getStatus(); - } while ((result & MPL3115A2::PTDR) == 0 ); - - // Retrieve barometric pressure - _pressure = _barometricSensor.getBaroData() >> 12; // convert 32 bit signed to 20 bit unsigned value - - // Trigger a Altitude reading - _barometricSensor.setParameters(MPL3115A2::DATA_NORMAL, MPL3115A2::DM_ALTIMETER, MPL3115A2::OR_16, - MPL3115A2::AT_1); - _barometricSensor.triggerOneShot(); - - // Test barometer device status to see if acquisition is complete - do { - osDelay(100); // allows other threads to process - result = _barometricSensor.getStatus(); - } while ((result & MPL3115A2::PTDR) == 0 ); - - // Retrieve temperature - _barometerData = _barometricSensor.getAllData(false); - - // Retrieve light level - _light = _lightSensor.getData(); - } -} - -MMA845x_DATA SensorHandler::getAcceleration(){ - return _accelerometerData; -} - -uint16_t SensorHandler::getLight(){ - return _light; -} - -uint32_t SensorHandler::getPressure(){ - return _pressure; -} - -MPL3115A2_DATA SensorHandler::getBarometer(){ - return _barometerData; -} - diff --git a/libs/SensorHandler/SensorHandler.h b/libs/SensorHandler/SensorHandler.h deleted file mode 100644 index 73f9c0f..0000000 --- a/libs/SensorHandler/SensorHandler.h +++ /dev/null @@ -1,48 +0,0 @@ -/** - * @file SensorHandler.h - * @brief Reads on board sensors... acceleration, pressure, light and temperture. - * @author Leon Lindenfelser - * @version 1.0 - * - */ - -#ifndef SENSORHANDLER_H -#define SENSORHANDLER_H - -#include "mbed.h" -#include "MMA845x.h" -#include "MPL3115A2.h" -#include "ISL29011.h" -#include "DOGS102.h" -#include "rtos.h" -#include -#include -#define START_THREAD 1 - -class SensorHandler -{ -public: - SensorHandler(void); - ~SensorHandler(void); - MMA845x_DATA getAcceleration(void); - uint16_t getLight(void); - uint32_t getPressure(void); - MPL3115A2_DATA getBarometer(void); - - -private: - Thread _getSensorThread; - static void startSensorThread (void const *p); - void readSensors(void); - void initSensors(void); - I2C _mDoti2c; - MMA845x _accelerometer; - MPL3115A2 _barometricSensor; - ISL29011 _lightSensor; - MMA845x_DATA _accelerometerData; - MPL3115A2_DATA _barometerData; - uint16_t _light; - uint32_t _pressure; -}; - -#endif //SENSORHANDLER_H -- cgit v1.2.3