Skip to content

Commit baa95ec

Browse files
author
Laurent MEUNIER
committed
[STM32F0] place holder for common object definition
Some of the objects in object.h are the same for all targets. Create a place where to define those common definitions, and start using it for pwm object.
1 parent 24ac9fd commit baa95ec

File tree

8 files changed

+63
-49
lines changed

8 files changed

+63
-49
lines changed

hal/targets/hal/TARGET_STM/TARGET_STM32F0/TARGET_DISCO_F051R8/objects.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,7 @@ struct i2c_s {
9393
I2CName i2c;
9494
};
9595

96-
struct pwmout_s {
97-
PWMName pwm;
98-
PinName pin;
99-
uint32_t period;
100-
uint32_t pulse;
101-
};
102-
96+
#include "common_objects.h"
10397
#include "gpio_object.h"
10498

10599
#ifdef __cplusplus

hal/targets/hal/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F030R8/objects.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,7 @@ struct i2c_s {
8888
I2CName i2c;
8989
};
9090

91-
struct pwmout_s {
92-
PWMName pwm;
93-
PinName pin;
94-
uint32_t period;
95-
uint32_t pulse;
96-
};
97-
91+
#include "common_objects.h"
9892
#include "gpio_object.h"
9993

10094
#ifdef __cplusplus

hal/targets/hal/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F031K6/objects.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,7 @@ struct i2c_s {
8888
I2CName i2c;
8989
};
9090

91-
struct pwmout_s {
92-
PWMName pwm;
93-
PinName pin;
94-
uint32_t period;
95-
uint32_t pulse;
96-
};
97-
91+
#include "common_objects.h"
9892
#include "gpio_object.h"
9993

10094
#ifdef __cplusplus

hal/targets/hal/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F042K6/objects.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,12 @@ struct i2c_s {
8888
I2CName i2c;
8989
};
9090

91-
struct pwmout_s {
92-
PWMName pwm;
93-
PinName pin;
94-
uint32_t period;
95-
uint32_t pulse;
96-
};
97-
9891
struct can_s {
9992
CANName can;
10093
int index;
10194
};
10295

96+
#include "common_objects.h"
10397
#include "gpio_object.h"
10498

10599
#ifdef __cplusplus

hal/targets/hal/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F070RB/objects.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,7 @@ struct i2c_s {
8888
I2CName i2c;
8989
};
9090

91-
struct pwmout_s {
92-
PWMName pwm;
93-
PinName pin;
94-
uint32_t period;
95-
uint32_t pulse;
96-
};
97-
91+
#include "common_objects.h"
9892
#include "gpio_object.h"
9993

10094
#ifdef __cplusplus

hal/targets/hal/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F072RB/objects.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,18 +93,12 @@ struct i2c_s {
9393
I2CName i2c;
9494
};
9595

96-
struct pwmout_s {
97-
PWMName pwm;
98-
PinName pin;
99-
uint32_t period;
100-
uint32_t pulse;
101-
};
102-
10396
struct can_s {
10497
CANName can;
10598
int index;
10699
};
107100

101+
#include "common_objects.h"
108102
#include "gpio_object.h"
109103

110104
#ifdef __cplusplus

hal/targets/hal/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F091RC/objects.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,18 +93,12 @@ struct i2c_s {
9393
I2CName i2c;
9494
};
9595

96-
struct pwmout_s {
97-
PWMName pwm;
98-
PinName pin;
99-
uint32_t period;
100-
uint32_t pulse;
101-
};
102-
10396
struct can_s {
10497
CANName can;
10598
int index;
10699
};
107100

101+
#include "common_objects.h"
108102
#include "gpio_object.h"
109103

110104
#ifdef __cplusplus
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
/* mbed Microcontroller Library
2+
*******************************************************************************
3+
* Copyright (c) 2016, STMicroelectronics
4+
* All rights reserved.
5+
*
6+
* Redistribution and use in source and binary forms, with or without
7+
* modification, are permitted provided that the following conditions are met:
8+
*
9+
* 1. Redistributions of source code must retain the above copyright notice,
10+
* this list of conditions and the following disclaimer.
11+
* 2. Redistributions in binary form must reproduce the above copyright notice,
12+
* this list of conditions and the following disclaimer in the documentation
13+
* and/or other materials provided with the distribution.
14+
* 3. Neither the name of STMicroelectronics nor the names of its contributors
15+
* may be used to endorse or promote products derived from this software
16+
* without specific prior written permission.
17+
*
18+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21+
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
22+
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23+
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
24+
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
25+
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
26+
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27+
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28+
*******************************************************************************
29+
*/
30+
#ifndef MBED_COMMON_OBJECTS_H
31+
#define MBED_COMMON_OBJECTS_H
32+
33+
#include "cmsis.h"
34+
#include "PortNames.h"
35+
#include "PeripheralNames.h"
36+
#include "PinNames.h"
37+
38+
#ifdef __cplusplus
39+
extern "C" {
40+
#endif
41+
42+
struct pwmout_s {
43+
PWMName pwm;
44+
PinName pin;
45+
uint32_t period;
46+
uint32_t pulse;
47+
};
48+
49+
#include "gpio_object.h"
50+
51+
#ifdef __cplusplus
52+
}
53+
#endif
54+
55+
#endif
56+

0 commit comments

Comments
 (0)