diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2013-01-13 09:25:12 +0100 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-01-13 09:25:12 +0100 |
commit | a6a6d9c4578c830d048f4ebcab1cf05c9fff2997 (patch) | |
tree | f03a20b689b722d516ee3e6c5400ebe6c84b3578 /apps | |
parent | 054bb69cc7001fbfa3f8f674445ef7b4cd2decf6 (diff) | |
parent | dcb0a326481e56520d37bbcde18bb2129508d74f (diff) | |
download | px4-firmware-a6a6d9c4578c830d048f4ebcab1cf05c9fff2997.tar.gz px4-firmware-a6a6d9c4578c830d048f4ebcab1cf05c9fff2997.tar.bz2 px4-firmware-a6a6d9c4578c830d048f4ebcab1cf05c9fff2997.zip |
Merge branch 'master' of github.com:PX4/Firmware into adc_integration
Diffstat (limited to 'apps')
-rw-r--r-- | apps/mathlib/CMSIS/Include/arm_math.h | 4 | ||||
-rw-r--r-- | apps/mathlib/CMSIS/Makefile | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/apps/mathlib/CMSIS/Include/arm_math.h b/apps/mathlib/CMSIS/Include/arm_math.h index fabd98be7..f224d3eb0 100644 --- a/apps/mathlib/CMSIS/Include/arm_math.h +++ b/apps/mathlib/CMSIS/Include/arm_math.h @@ -5520,7 +5520,7 @@ extern "C" *pIa = Ialpha;
/* Calculating pIb from Ialpha and Ibeta by equation pIb = -(1/2) * Ialpha + (sqrt(3)/2) * Ibeta */
- *pIb = -0.5 * Ialpha + (float32_t) 0.8660254039 *Ibeta;
+ *pIb = -0.5f * Ialpha + (float32_t) 0.8660254039f *Ibeta;
}
@@ -5898,7 +5898,7 @@ extern "C" /* Iniatilize output for below specified range as least output value of table */
y = pYData[0];
}
- else if(i >= S->nValues)
+ else if((unsigned)i >= S->nValues)
{
/* Iniatilize output for above specified range as last output value of table */
y = pYData[S->nValues - 1];
diff --git a/apps/mathlib/CMSIS/Makefile b/apps/mathlib/CMSIS/Makefile index fa5de668a..9e28518bc 100644 --- a/apps/mathlib/CMSIS/Makefile +++ b/apps/mathlib/CMSIS/Makefile @@ -45,6 +45,13 @@ INCLUDES += $(DSPLIB_SRCDIR)/Include \ $(DSPLIB_SRCDIR)/Device/ARM/ARMCM4/Include \ $(DSPLIB_SRCDIR)/Device/ARM/ARMCM3/Include +# Suppress some warnings that ARM should fix, but haven't. +EXTRADEFINES += -Wno-unsuffixed-float-constants \ + -Wno-sign-compare \ + -Wno-shadow \ + -Wno-float-equal \ + -Wno-unused-variable + # # Override the default visibility for symbols, since the CMSIS DSPLib doesn't # have anything we can use to mark exported symbols. |