diff options
author | Constantin Musca <constantin.musca@intel.com> | 2016-01-08 11:44:51 +0200 |
---|---|---|
committer | Mihai Serban <mihai.serban@intel.com> | 2016-01-11 11:38:03 +0000 |
commit | 2a67f2c7bad3e2a1fa11679c19d0d71c301fe6c1 (patch) | |
tree | 6f2acfbed7f426333733249775e265d579b78b7b | |
parent | ff4b53d72766ac6a0d38acbe114ebc5170324c3e (diff) | |
download | intel-2a67f2c7bad3e2a1fa11679c19d0d71c301fe6c1.tar.gz |
sensors: cleanup mraa sensor code
Rename sensors/edison_arduino to sensors/mraa given that sensors HAL
is not platform specific. It depends on the mraa hardware support.
Move the Android.mk file to be hal.mk (requires recent change in
device/generic/google).
Change the LOCAL_MODULE use $(TARGET_DEVICE)
BUG=none
Change-Id: I2be3ac69ffa107e9787c163bf45010e5048f08ea
Tracked-On: https://jira01.devtools.intel.com/browse/BP-121
Signed-off-by: Constantin Musca <constantin.musca@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
-rw-r--r-- | peripheral/sensors/mraa/AcquisitionThread.cpp (renamed from peripheral/sensors/edison_arduino/AcquisitionThread.cpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/AcquisitionThread.hpp (renamed from peripheral/sensors/edison_arduino/AcquisitionThread.hpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/Sensor.cpp (renamed from peripheral/sensors/edison_arduino/Sensor.cpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/Sensor.hpp (renamed from peripheral/sensors/edison_arduino/Sensor.hpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/SensorUtils.cpp (renamed from peripheral/sensors/edison_arduino/SensorUtils.cpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/SensorUtils.hpp (renamed from peripheral/sensors/edison_arduino/SensorUtils.hpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/SensorsHAL.cpp (renamed from peripheral/sensors/edison_arduino/SensorsHAL.cpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/SensorsHAL.hpp (renamed from peripheral/sensors/edison_arduino/SensorsHAL.hpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/Utils.cpp (renamed from peripheral/sensors/edison_arduino/Utils.cpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/Utils.hpp (renamed from peripheral/sensors/edison_arduino/Utils.hpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/doc/Doxyfile (renamed from peripheral/sensors/edison_arduino/doc/Doxyfile) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/hal.mk (renamed from peripheral/sensors/edison_arduino/Android.mk) | 2 | ||||
-rw-r--r-- | peripheral/sensors/mraa/peripheral.mk (renamed from peripheral/sensors/edison_arduino/peripheral.mk) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/sensors/GroveLight.cpp (renamed from peripheral/sensors/edison_arduino/sensors/GroveLight.cpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/sensors/GroveLight.hpp (renamed from peripheral/sensors/edison_arduino/sensors/GroveLight.hpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/sensors/GroveTemperature.cpp (renamed from peripheral/sensors/edison_arduino/sensors/GroveTemperature.cpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/sensors/GroveTemperature.hpp (renamed from peripheral/sensors/edison_arduino/sensors/GroveTemperature.hpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/sensors/LSM303dAccelerometer.cpp (renamed from peripheral/sensors/edison_arduino/sensors/LSM303dAccelerometer.cpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/sensors/LSM303dAccelerometer.hpp (renamed from peripheral/sensors/edison_arduino/sensors/LSM303dAccelerometer.hpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/sensors/LSM303dOrientation.cpp (renamed from peripheral/sensors/edison_arduino/sensors/LSM303dOrientation.cpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/sensors/LSM303dOrientation.hpp (renamed from peripheral/sensors/edison_arduino/sensors/LSM303dOrientation.hpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/sensors/LSM9DS0Accelerometer.cpp (renamed from peripheral/sensors/edison_arduino/sensors/LSM9DS0Accelerometer.cpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/sensors/LSM9DS0Accelerometer.hpp (renamed from peripheral/sensors/edison_arduino/sensors/LSM9DS0Accelerometer.hpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/sensors/MMA7660Accelerometer.cpp (renamed from peripheral/sensors/edison_arduino/sensors/MMA7660Accelerometer.cpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/sensors/MMA7660Accelerometer.hpp (renamed from peripheral/sensors/edison_arduino/sensors/MMA7660Accelerometer.hpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/sensors/MPU9150Accelerometer.cpp (renamed from peripheral/sensors/edison_arduino/sensors/MPU9150Accelerometer.cpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/sensors/MPU9150Accelerometer.hpp (renamed from peripheral/sensors/edison_arduino/sensors/MPU9150Accelerometer.hpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/sensors/ProximityGPIO.cpp (renamed from peripheral/sensors/edison_arduino/sensors/ProximityGPIO.cpp) | 0 | ||||
-rw-r--r-- | peripheral/sensors/mraa/sensors/ProximityGPIO.hpp (renamed from peripheral/sensors/edison_arduino/sensors/ProximityGPIO.hpp) | 0 |
29 files changed, 1 insertions, 1 deletions
diff --git a/peripheral/sensors/edison_arduino/AcquisitionThread.cpp b/peripheral/sensors/mraa/AcquisitionThread.cpp index 8adc9da..8adc9da 100644 --- a/peripheral/sensors/edison_arduino/AcquisitionThread.cpp +++ b/peripheral/sensors/mraa/AcquisitionThread.cpp diff --git a/peripheral/sensors/edison_arduino/AcquisitionThread.hpp b/peripheral/sensors/mraa/AcquisitionThread.hpp index 46e39c5..46e39c5 100644 --- a/peripheral/sensors/edison_arduino/AcquisitionThread.hpp +++ b/peripheral/sensors/mraa/AcquisitionThread.hpp diff --git a/peripheral/sensors/edison_arduino/Sensor.cpp b/peripheral/sensors/mraa/Sensor.cpp index db76bda..db76bda 100644 --- a/peripheral/sensors/edison_arduino/Sensor.cpp +++ b/peripheral/sensors/mraa/Sensor.cpp diff --git a/peripheral/sensors/edison_arduino/Sensor.hpp b/peripheral/sensors/mraa/Sensor.hpp index f3a9d95..f3a9d95 100644 --- a/peripheral/sensors/edison_arduino/Sensor.hpp +++ b/peripheral/sensors/mraa/Sensor.hpp diff --git a/peripheral/sensors/edison_arduino/SensorUtils.cpp b/peripheral/sensors/mraa/SensorUtils.cpp index 662321e..662321e 100644 --- a/peripheral/sensors/edison_arduino/SensorUtils.cpp +++ b/peripheral/sensors/mraa/SensorUtils.cpp diff --git a/peripheral/sensors/edison_arduino/SensorUtils.hpp b/peripheral/sensors/mraa/SensorUtils.hpp index dcd48bb..dcd48bb 100644 --- a/peripheral/sensors/edison_arduino/SensorUtils.hpp +++ b/peripheral/sensors/mraa/SensorUtils.hpp diff --git a/peripheral/sensors/edison_arduino/SensorsHAL.cpp b/peripheral/sensors/mraa/SensorsHAL.cpp index 10348a9..10348a9 100644 --- a/peripheral/sensors/edison_arduino/SensorsHAL.cpp +++ b/peripheral/sensors/mraa/SensorsHAL.cpp diff --git a/peripheral/sensors/edison_arduino/SensorsHAL.hpp b/peripheral/sensors/mraa/SensorsHAL.hpp index 74bc8a4..74bc8a4 100644 --- a/peripheral/sensors/edison_arduino/SensorsHAL.hpp +++ b/peripheral/sensors/mraa/SensorsHAL.hpp diff --git a/peripheral/sensors/edison_arduino/Utils.cpp b/peripheral/sensors/mraa/Utils.cpp index 1796ef6..1796ef6 100644 --- a/peripheral/sensors/edison_arduino/Utils.cpp +++ b/peripheral/sensors/mraa/Utils.cpp diff --git a/peripheral/sensors/edison_arduino/Utils.hpp b/peripheral/sensors/mraa/Utils.hpp index 4732d10..4732d10 100644 --- a/peripheral/sensors/edison_arduino/Utils.hpp +++ b/peripheral/sensors/mraa/Utils.hpp diff --git a/peripheral/sensors/edison_arduino/doc/Doxyfile b/peripheral/sensors/mraa/doc/Doxyfile index e132c18..e132c18 100644 --- a/peripheral/sensors/edison_arduino/doc/Doxyfile +++ b/peripheral/sensors/mraa/doc/Doxyfile diff --git a/peripheral/sensors/edison_arduino/Android.mk b/peripheral/sensors/mraa/hal.mk index 7b2ae83..fafe90d 100644 --- a/peripheral/sensors/edison_arduino/Android.mk +++ b/peripheral/sensors/mraa/hal.mk @@ -21,7 +21,7 @@ LOCAL_CFLAGS += -DLOG_TAG=\"Sensors\" -Wno-unused-parameter LOCAL_SHARED_LIBRARIES := libcutils libupm libmraa LOCAL_C_INCLUDES := $(LOCAL_PATH)/../libupm/src/mpu9150/ LOCAL_SRC_FILES := SensorsHAL.cpp Sensor.cpp AcquisitionThread.cpp Utils.cpp SensorUtils.cpp -LOCAL_MODULE := sensors.edison +LOCAL_MODULE := sensors.$(TARGET_DEVICE) LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional diff --git a/peripheral/sensors/edison_arduino/peripheral.mk b/peripheral/sensors/mraa/peripheral.mk index deabf5d..deabf5d 100644 --- a/peripheral/sensors/edison_arduino/peripheral.mk +++ b/peripheral/sensors/mraa/peripheral.mk diff --git a/peripheral/sensors/edison_arduino/sensors/GroveLight.cpp b/peripheral/sensors/mraa/sensors/GroveLight.cpp index 68c7abc..68c7abc 100644 --- a/peripheral/sensors/edison_arduino/sensors/GroveLight.cpp +++ b/peripheral/sensors/mraa/sensors/GroveLight.cpp diff --git a/peripheral/sensors/edison_arduino/sensors/GroveLight.hpp b/peripheral/sensors/mraa/sensors/GroveLight.hpp index 8843058..8843058 100644 --- a/peripheral/sensors/edison_arduino/sensors/GroveLight.hpp +++ b/peripheral/sensors/mraa/sensors/GroveLight.hpp diff --git a/peripheral/sensors/edison_arduino/sensors/GroveTemperature.cpp b/peripheral/sensors/mraa/sensors/GroveTemperature.cpp index 6886df8..6886df8 100644 --- a/peripheral/sensors/edison_arduino/sensors/GroveTemperature.cpp +++ b/peripheral/sensors/mraa/sensors/GroveTemperature.cpp diff --git a/peripheral/sensors/edison_arduino/sensors/GroveTemperature.hpp b/peripheral/sensors/mraa/sensors/GroveTemperature.hpp index 50f296b..50f296b 100644 --- a/peripheral/sensors/edison_arduino/sensors/GroveTemperature.hpp +++ b/peripheral/sensors/mraa/sensors/GroveTemperature.hpp diff --git a/peripheral/sensors/edison_arduino/sensors/LSM303dAccelerometer.cpp b/peripheral/sensors/mraa/sensors/LSM303dAccelerometer.cpp index dc6cd1c..dc6cd1c 100644 --- a/peripheral/sensors/edison_arduino/sensors/LSM303dAccelerometer.cpp +++ b/peripheral/sensors/mraa/sensors/LSM303dAccelerometer.cpp diff --git a/peripheral/sensors/edison_arduino/sensors/LSM303dAccelerometer.hpp b/peripheral/sensors/mraa/sensors/LSM303dAccelerometer.hpp index 9171799..9171799 100644 --- a/peripheral/sensors/edison_arduino/sensors/LSM303dAccelerometer.hpp +++ b/peripheral/sensors/mraa/sensors/LSM303dAccelerometer.hpp diff --git a/peripheral/sensors/edison_arduino/sensors/LSM303dOrientation.cpp b/peripheral/sensors/mraa/sensors/LSM303dOrientation.cpp index f766dfb..f766dfb 100644 --- a/peripheral/sensors/edison_arduino/sensors/LSM303dOrientation.cpp +++ b/peripheral/sensors/mraa/sensors/LSM303dOrientation.cpp diff --git a/peripheral/sensors/edison_arduino/sensors/LSM303dOrientation.hpp b/peripheral/sensors/mraa/sensors/LSM303dOrientation.hpp index 99ba077..99ba077 100644 --- a/peripheral/sensors/edison_arduino/sensors/LSM303dOrientation.hpp +++ b/peripheral/sensors/mraa/sensors/LSM303dOrientation.hpp diff --git a/peripheral/sensors/edison_arduino/sensors/LSM9DS0Accelerometer.cpp b/peripheral/sensors/mraa/sensors/LSM9DS0Accelerometer.cpp index 2c79850..2c79850 100644 --- a/peripheral/sensors/edison_arduino/sensors/LSM9DS0Accelerometer.cpp +++ b/peripheral/sensors/mraa/sensors/LSM9DS0Accelerometer.cpp diff --git a/peripheral/sensors/edison_arduino/sensors/LSM9DS0Accelerometer.hpp b/peripheral/sensors/mraa/sensors/LSM9DS0Accelerometer.hpp index 31aaf10..31aaf10 100644 --- a/peripheral/sensors/edison_arduino/sensors/LSM9DS0Accelerometer.hpp +++ b/peripheral/sensors/mraa/sensors/LSM9DS0Accelerometer.hpp diff --git a/peripheral/sensors/edison_arduino/sensors/MMA7660Accelerometer.cpp b/peripheral/sensors/mraa/sensors/MMA7660Accelerometer.cpp index 0aee293..0aee293 100644 --- a/peripheral/sensors/edison_arduino/sensors/MMA7660Accelerometer.cpp +++ b/peripheral/sensors/mraa/sensors/MMA7660Accelerometer.cpp diff --git a/peripheral/sensors/edison_arduino/sensors/MMA7660Accelerometer.hpp b/peripheral/sensors/mraa/sensors/MMA7660Accelerometer.hpp index bfa3c27..bfa3c27 100644 --- a/peripheral/sensors/edison_arduino/sensors/MMA7660Accelerometer.hpp +++ b/peripheral/sensors/mraa/sensors/MMA7660Accelerometer.hpp diff --git a/peripheral/sensors/edison_arduino/sensors/MPU9150Accelerometer.cpp b/peripheral/sensors/mraa/sensors/MPU9150Accelerometer.cpp index a03ad23..a03ad23 100644 --- a/peripheral/sensors/edison_arduino/sensors/MPU9150Accelerometer.cpp +++ b/peripheral/sensors/mraa/sensors/MPU9150Accelerometer.cpp diff --git a/peripheral/sensors/edison_arduino/sensors/MPU9150Accelerometer.hpp b/peripheral/sensors/mraa/sensors/MPU9150Accelerometer.hpp index c1cc432..c1cc432 100644 --- a/peripheral/sensors/edison_arduino/sensors/MPU9150Accelerometer.hpp +++ b/peripheral/sensors/mraa/sensors/MPU9150Accelerometer.hpp diff --git a/peripheral/sensors/edison_arduino/sensors/ProximityGPIO.cpp b/peripheral/sensors/mraa/sensors/ProximityGPIO.cpp index 2fe0aaa..2fe0aaa 100644 --- a/peripheral/sensors/edison_arduino/sensors/ProximityGPIO.cpp +++ b/peripheral/sensors/mraa/sensors/ProximityGPIO.cpp diff --git a/peripheral/sensors/edison_arduino/sensors/ProximityGPIO.hpp b/peripheral/sensors/mraa/sensors/ProximityGPIO.hpp index 1ee0547..1ee0547 100644 --- a/peripheral/sensors/edison_arduino/sensors/ProximityGPIO.hpp +++ b/peripheral/sensors/mraa/sensors/ProximityGPIO.hpp |