Skip to content

Commit 2b178a5

Browse files
author
Laurent MEUNIER
committed
[STM32F3] 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 f6164f3 commit 2b178a5

File tree

7 files changed

+65
-60
lines changed

7 files changed

+65
-60
lines changed

hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_DISCO_F303VC/objects.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,7 @@ struct i2c_s {
9696
uint32_t slave;
9797
};
9898

99-
struct pwmout_s {
100-
PWMName pwm;
101-
PinName pin;
102-
uint32_t prescaler;
103-
uint32_t period;
104-
uint32_t pulse;
105-
uint32_t channel;
106-
uint32_t inverted;
107-
};
108-
99+
#include "common_objects.h"
109100
#include "gpio_object.h"
110101

111102
#ifdef __cplusplus

hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_DISCO_F334C8/objects.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,7 @@ struct i2c_s {
9696
uint32_t slave;
9797
};
9898

99-
struct pwmout_s {
100-
PWMName pwm;
101-
PinName pin;
102-
uint32_t prescaler;
103-
uint32_t period;
104-
uint32_t pulse;
105-
uint32_t channel;
106-
uint32_t inverted;
107-
};
108-
99+
#include "common_objects.h"
109100
#include "gpio_object.h"
110101

111102
#ifdef __cplusplus

hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F302R8/objects.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,21 +96,12 @@ struct i2c_s {
9696
uint32_t slave;
9797
};
9898

99-
struct pwmout_s {
100-
PWMName pwm;
101-
PinName pin;
102-
uint32_t prescaler;
103-
uint32_t period;
104-
uint32_t pulse;
105-
uint32_t channel;
106-
uint32_t inverted;
107-
};
108-
10999
struct can_s {
110100
CANName can;
111101
int index;
112102
};
113103

104+
#include "common_objects.h"
114105
#include "gpio_object.h"
115106

116107
#ifdef __cplusplus

hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F303K8/objects.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,21 +96,12 @@ struct i2c_s {
9696
uint32_t slave;
9797
};
9898

99-
struct pwmout_s {
100-
PWMName pwm;
101-
PinName pin;
102-
uint32_t prescaler;
103-
uint32_t period;
104-
uint32_t pulse;
105-
uint32_t channel;
106-
uint32_t inverted;
107-
};
108-
10999
struct can_s {
110100
CANName can;
111101
int index;
112102
};
113103

104+
#include "common_objects.h"
114105
#include "gpio_object.h"
115106

116107
#ifdef __cplusplus

hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F303RE/objects.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,21 +96,12 @@ struct i2c_s {
9696
uint32_t slave;
9797
};
9898

99-
struct pwmout_s {
100-
PWMName pwm;
101-
PinName pin;
102-
uint32_t prescaler;
103-
uint32_t period;
104-
uint32_t pulse;
105-
uint32_t channel;
106-
uint32_t inverted;
107-
};
108-
10999
struct can_s {
110100
CANName can;
111101
int index;
112102
};
113103

104+
#include "common_objects.h"
114105
#include "gpio_object.h"
115106

116107
#ifdef __cplusplus

hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F334R8/objects.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,21 +96,12 @@ struct i2c_s {
9696
uint32_t slave;
9797
};
9898

99-
struct pwmout_s {
100-
PWMName pwm;
101-
PinName pin;
102-
uint32_t prescaler;
103-
uint32_t period;
104-
uint32_t pulse;
105-
uint32_t channel;
106-
uint32_t inverted;
107-
};
108-
10999
struct can_s {
110100
CANName can;
111101
int index;
112102
};
113103

104+
#include "common_objects.h"
114105
#include "gpio_object.h"
115106

116107
#ifdef __cplusplus
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
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 prescaler;
46+
uint32_t period;
47+
uint32_t pulse;
48+
uint8_t channel;
49+
uint8_t inverted;
50+
};
51+
52+
#include "gpio_object.h"
53+
54+
#ifdef __cplusplus
55+
}
56+
#endif
57+
58+
#endif
59+

0 commit comments

Comments
 (0)