Skip to content

Commit 12bb41b

Browse files
salkiniumsalkinium
committed
[cmsis] Update CMSIS-DSP to v5.8.0
Introduces <arm_math_local.h> config file.
1 parent dad9799 commit 12bb41b

File tree

12 files changed

+276
-78
lines changed

12 files changed

+276
-78
lines changed

‎examples/nucleo_f429zi/cmsis_dsp/bayes/main.cpp‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Copyright (c) 2019, Niklas Hauser
3+
*
4+
* This file is part of the modm project.
5+
*
6+
* This Source Code Form is subject to the terms of the Mozilla Public
7+
* License, v. 2.0. If a copy of the MPL was not distributed with this
8+
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
9+
*/
10+
// ----------------------------------------------------------------------------
11+
12+
#include <modm/board.hpp>
13+
#include <arm_math.h>
14+
15+
#define main arm_cmsis_dsp_example
16+
#define while return index; void
17+
#include "../../../../ext/arm/cmsis/CMSIS/DSP/Examples/ARM/arm_bayes_example/arm_bayes_example_f32.c"
18+
#undef while
19+
#undef main
20+
21+
#define example_name "bayes"
22+
#include "../runner.cpp"

‎examples/nucleo_f429zi/cmsis_dsp/bayes/project.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<library>
2+
<extends>modm:nucleo-f429zi</extends>
3+
<options>
4+
<option name="modm:build:build.path">../../../../build/nucleo_f429zi/cmsis_dsp/bayes</option>
5+
</options>
6+
<modules>
7+
<module>modm:build:scons</module>
8+
<module>modm:cmsis:dsp:bayes</module>
9+
</modules>
10+
</library>

‎examples/nucleo_f429zi/cmsis_dsp/linear_interp/main.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#define while return status; void
2222
#include "../../../../ext/arm/cmsis/CMSIS/DSP/Examples/ARM/arm_linear_interp_example/arm_linear_interp_example_f32.c"
2323
#undef while
24-
#undef float
2524
#undef main
2625
#pragma GCC diagnostic pop
2726

‎examples/nucleo_f429zi/cmsis_dsp/linear_interp/project.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,10 @@
33
<options>
44
<option name="modm:build:build.path">../../../../build/nucleo_f429zi/cmsis_dsp/linear_interp</option>
55
</options>
6-
<collectors>
7-
<!-- We need to cast `&arm_linear_interep_table[0]` to (float*), but cannot change the example... -->
8-
<collect name="modm:build:cxxflags">-fpermissive</collect>
9-
</collectors>
106
<modules>
117
<module>modm:build:scons</module>
128
<module>modm:build:make</module>
139
<module>modm:cmsis:dsp:fast_math</module>
10+
<module>modm:cmsis:dsp:interpolation</module>
1411
</modules>
1512
</library>

‎examples/nucleo_f429zi/cmsis_dsp/svm/main.cpp‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Copyright (c) 2019, Niklas Hauser
3+
*
4+
* This file is part of the modm project.
5+
*
6+
* This Source Code Form is subject to the terms of the Mozilla Public
7+
* License, v. 2.0. If a copy of the MPL was not distributed with this
8+
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
9+
*/
10+
// ----------------------------------------------------------------------------
11+
12+
#include <modm/board.hpp>
13+
#include <arm_math.h>
14+
15+
#define main arm_cmsis_dsp_example
16+
#define while return result; void
17+
#include "../../../../ext/arm/cmsis/CMSIS/DSP/Examples/ARM/arm_svm_example/arm_svm_example_f32.c"
18+
#undef while
19+
#undef main
20+
21+
#define example_name "svm"
22+
#include "../runner.cpp"

‎examples/nucleo_f429zi/cmsis_dsp/svm/project.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<library>
2+
<extends>modm:nucleo-f429zi</extends>
3+
<options>
4+
<option name="modm:build:build.path">../../../../build/nucleo_f429zi/cmsis_dsp/svm</option>
5+
</options>
6+
<modules>
7+
<module>modm:build:scons</module>
8+
<module>modm:cmsis:dsp:svm</module>
9+
</modules>
10+
</library>

‎ext/arm/arm_math.h.in‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/******************************************************************************
2+
* @file arm_math.h
3+
* @brief Public header file for CMSIS DSP Library
4+
* @version V1.9.0
5+
* @date 23 April 2021
6+
* Target Processor: Cortex-M and Cortex-A cores
7+
******************************************************************************/
8+
/*
9+
* Copyright (c) 2010-2021 Arm Limited or its affiliates. All rights reserved.
10+
*
11+
* SPDX-License-Identifier: Apache-2.0
12+
*
13+
* Licensed under the Apache License, Version 2.0 (the License); you may
14+
* not use this file except in compliance with the License.
15+
* You may obtain a copy of the License at
16+
*
17+
* www.apache.org/licenses/LICENSE-2.0
18+
*
19+
* Unless required by applicable law or agreed to in writing, software
20+
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
21+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
22+
* See the License for the specific language governing permissions and
23+
* limitations under the License.
24+
*/
25+
26+
#ifndef _ARM_MATH_H
27+
#define _ARM_MATH_H
28+
29+
#ifdef __cplusplus
30+
extern "C"
31+
{
32+
#endif
33+
34+
#include "arm_math_types.h"
35+
#include "arm_math_memory.h"
36+
37+
#include "dsp/none.h"
38+
#include "dsp/utils.h"
39+
40+
%% for include in includes | sort
41+
#include "dsp/{{include}}_functions.h"
42+
%% endfor
43+
44+
#ifdef __cplusplus
45+
}
46+
#endif
47+
48+
#endif /* _ARM_MATH_H */

‎ext/arm/arm_math_f16.h.in‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
/******************************************************************************
2+
* @file arm_math_f16.h
3+
* @brief Public header file for f16 function of the CMSIS DSP Library
4+
* @version V1.9.0
5+
* @date 23 April 2021
6+
* Target Processor: Cortex-M and Cortex-A cores
7+
******************************************************************************/
8+
/*
9+
* Copyright (c) 2010-2021 Arm Limited or its affiliates. All rights reserved.
10+
*
11+
* SPDX-License-Identifier: Apache-2.0
12+
*
13+
* Licensed under the Apache License, Version 2.0 (the License); you may
14+
* not use this file except in compliance with the License.
15+
* You may obtain a copy of the License at
16+
*
17+
* www.apache.org/licenses/LICENSE-2.0
18+
*
19+
* Unless required by applicable law or agreed to in writing, software
20+
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
21+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
22+
* See the License for the specific language governing permissions and
23+
* limitations under the License.
24+
*/
25+
26+
#ifndef _ARM_MATH_F16_H
27+
#define _ARM_MATH_F16_H
28+
29+
#include "arm_math.h"
30+
31+
#ifdef __cplusplus
32+
extern "C"
33+
{
34+
#endif
35+
36+
#include "arm_math_types_f16.h"
37+
38+
#include "dsp/none.h"
39+
#include "dsp/utils.h"
40+
41+
%% for include in includes | sort
42+
#include "dsp/{{include}}_functions_f16.h"
43+
%% endfor
44+
45+
#ifdef __cplusplus
46+
}
47+
#endif
48+
49+
#endif /* _ARM_MATH_F16_H */
50+
51+

‎ext/arm/arm_math_types.h.in‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
* Copyright (c) 2021, Niklas Hauser
3+
*
4+
* This file is part of the modm project.
5+
*
6+
* This Source Code Form is subject to the terms of the Mozilla Public
7+
* License, v. 2.0. If a copy of the MPL was not distributed with this
8+
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
9+
*/
10+
11+
#ifndef _ARM_MATH_TYPES_WRAPPER_H_
12+
#define _ARM_MATH_TYPES_WRAPPER_H_
13+
14+
#define ARM_MATH_CM{{core}}
15+
#define __ARM_FEATURE_MVE 0
16+
17+
%% if with_fpu
18+
#ifndef __FPU_PRESENT
19+
#define __FPU_PRESENT 1
20+
#endif
21+
%% endif
22+
23+
/* Local configuration file */
24+
#if __has_include(<arm_math_local.h>)
25+
# include <arm_math_local.h>
26+
#endif
27+
28+
#include "arm_math_types_internal.h"
29+
30+
#endif /* ifndef _ARM_MATH_TYPES_WRAPPER_H_ */

‎ext/arm/cmsis‎

Submodule cmsis updated from 177c5e4 to aa99c5b

0 commit comments

Comments
 (0)