mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

upm: Update recipe to use v1.6.0

Browse Source 
ads1x15 patch is no longer required as it has been merged upstream

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Brendan Le Foll
2018-02-21 14:50:42 +01:00
committed by Armin Kuster
parent efc2e0837e
commit f988ce34a8
2 changed files with 2 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/upm/files/ads1x15-fixed-case-logic-in-getThresh-function.patch
-54
View File
@@ -1,54 +0,0 @@
From c64d04d084f47b4cb3e1cdee6e96348fcc6a756e Mon Sep 17 00:00:00 2001
From: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
Date: Tue, 30 May 2017 15:14:09 -0700
Subject: [PATCH 1/1] ads1x15: fixed case logic in getThresh() function
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
Upstream-Status: Backported [c64d04d084f47b4cb3e1cdee6e96348fcc6a756e]
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---
src/ads1x15/ads1x15.cxx | 4 ++--
src/ads1x15/ads1x15.hpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/ads1x15/ads1x15.cxx b/src/ads1x15/ads1x15.cxx
index 35782709..47701b2a 100644
--- a/src/ads1x15/ads1x15.cxx
+++ b/src/ads1x15/ads1x15.cxx
@@ -116,7 +116,7 @@ ADS1X15::setContinuous(bool mode){
float
ADS1X15::getThresh(ADSTHRESH reg){
- if( THRESH_HIGH && THRESH_LOW) return getLastSample(reg);
+ if(reg == THRESH_HIGH || reg == THRESH_LOW) return getLastSample(reg);
else return 0.0;
}
@@ -137,7 +137,7 @@ ADS1X15::setThresh(ADSTHRESH reg, float value){
case 2:
case 3:
set_value = value / getMultiplier();
- set_value = set_value << m_bitShift;
+ set_value = set_value << m_bitShift;
if(i2c->writeWordReg(reg, swapWord(set_value)) != mraa::SUCCESS){
throw std::runtime_error(std::string(__FUNCTION__) + ": I2c.write() failed");
return;
diff --git a/src/ads1x15/ads1x15.hpp b/src/ads1x15/ads1x15.hpp
index 7524572d..efd8c8ec 100644
--- a/src/ads1x15/ads1x15.hpp
+++ b/src/ads1x15/ads1x15.hpp
@@ -390,7 +390,7 @@ namespace upm {
* @param reg ADSTHRES enum value.
* Returns 0.0 unless THRESH_HIGH or THRESH_LOW requested.
*/
- float getThresh(ADSTHRESH reg = THRESH_LOW);
+ float getThresh(ADSTHRESH reg = THRESH_DEFAULT);
/**
* Sets threshold levels or configures for conversion ready
--
2.11.0
meta-oe/recipes-extended/upm/upm_git.bb
+2 -3
View File
@@ -7,12 +7,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=66493d54e65bfc12c7983ff2e884f37f"
DEPENDS = "libjpeg-turbo mraa"
SRCREV = "106b6c706268522ab0168a4ddb19e89ce832e084"
PV = "1.3.0-git${SRCPV}"
SRCREV = "cc7fec9ae0228add9011bf1c2cd5e0ca2ba0d4f0"
PV = "1.6.0-git${SRCPV}"
SRC_URI = " \
git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \
file://ads1x15-fixed-case-logic-in-getThresh-function.patch \
"
S = "${WORKDIR}/git"