Skip to content

Fix STM32 CAN reset to not lose context #4932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 20, 2017
Merged

Fix STM32 CAN reset to not lose context #4932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
66162c6
STM32: move can_s definition to common_objects.h
LMESTM Aug 17, 2017
759642a
STM32: Define CAN handle as part of can object
LMESTM Aug 17, 2017
57222b6
STM32: CAN: do not overwite BTR register when setting frequency
LMESTM Aug 17, 2017
8357f6f
STM32: CAN: store the mode in object context
LMESTM Aug 18, 2017
04ac65a
STM32: CAN: restore registers after can_reset
LMESTM Aug 17, 2017
5997811
STM32: F2: put can_s struct under DEVICE_CAN option
LMESTM Aug 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F042K6/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

#include "common_objects.h"

#ifdef __cplusplus
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F072RB/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

#include "common_objects.h"

#ifdef __cplusplus
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F091RC/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

#include "common_objects.h"

#ifdef __cplusplus
Expand Down
8 changes: 8 additions & 0 deletions targets/TARGET_STM/TARGET_STM32F0/common_objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,14 @@ struct dac_s {
};
#endif

#if DEVICE_CAN
struct can_s {
CAN_HandleTypeDef CanHandle;
int index;
int hz;
};
#endif

#ifdef __cplusplus
}
#endif
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32F1/TARGET_BLUEPILL_F103C8/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

#include "common_objects.h"

#ifdef __cplusplus
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32F1/TARGET_NUCLEO_F103RB/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

#include "common_objects.h"

#ifdef __cplusplus
Expand Down
8 changes: 8 additions & 0 deletions targets/TARGET_STM/TARGET_STM32F1/common_objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,14 @@ struct analogin_s {
uint8_t channel;
};

#if DEVICE_CAN
struct can_s {
CAN_HandleTypeDef CanHandle;
int index;
int hz;
};
#endif

#include "gpio_object.h"

#ifdef __cplusplus
Expand Down
5 changes: 4 additions & 1 deletion targets/TARGET_STM/TARGET_STM32F2/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,13 @@ struct pwmout_s {
uint8_t inverted;
};

#ifdef DEVICE_CAN
struct can_s {
CANName can;
CAN_HandleTypeDef CanHandle;
int index;
int hz;
};
#endif

#define GPIO_IP_WITHOUT_BRR
#include "gpio_object.h"
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

#include "common_objects.h"

#ifdef __cplusplus
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

#include "common_objects.h"

#ifdef __cplusplus
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

#include "common_objects.h"

#ifdef __cplusplus
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

#include "common_objects.h"

#ifdef __cplusplus
Expand Down
7 changes: 0 additions & 7 deletions targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

#if defined (DEVICE_CAN)
struct can_s {
CANName can;
int index;
};
#endif

#include "common_objects.h"

#ifdef __cplusplus
Expand Down
8 changes: 8 additions & 0 deletions targets/TARGET_STM/TARGET_STM32F3/common_objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,14 @@ struct analogin_s {
uint8_t channel;
};

#if DEVICE_CAN
struct can_s {
CAN_HandleTypeDef CanHandle;
int index;
int hz;
};
#endif

#include "gpio_object.h"

#ifdef __cplusplus
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F412xG/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

struct trng_s {
RNG_HandleTypeDef handle;
};
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F413xH/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

struct trng_s {
RNG_HandleTypeDef handle;
};
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F429xI/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

struct trng_s {
RNG_HandleTypeDef handle;
};
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F437xG/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,6 @@ struct trng_s {
};

#include "common_objects.h"
struct can_s {
CANName can;
int index;
};

#include "gpio_object.h"

#ifdef __cplusplus
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

struct trng_s {
RNG_HandleTypeDef handle;
};
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F446xE/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

#include "common_objects.h"

#ifdef __cplusplus
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F469xI/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

struct trng_s {
RNG_HandleTypeDef handle;
};
Expand Down
8 changes: 8 additions & 0 deletions targets/TARGET_STM/TARGET_STM32F4/common_objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,14 @@ struct dac_s {
};
#endif

#if DEVICE_CAN
struct can_s {
CAN_HandleTypeDef CanHandle;
int index;
int hz;
};
#endif

#ifdef __cplusplus
}
#endif
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F746xG/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

struct trng_s {
RNG_HandleTypeDef handle;
};
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F756xG/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

struct trng_s {
RNG_HandleTypeDef handle;
};
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F767xI/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

struct trng_s {
RNG_HandleTypeDef handle;
};
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F769xI/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

struct trng_s {
RNG_HandleTypeDef handle;
};
Expand Down
8 changes: 8 additions & 0 deletions targets/TARGET_STM/TARGET_STM32F7/common_objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,14 @@ struct flash_s {
uint32_t dummy;
};

#if DEVICE_CAN
struct can_s {
CAN_HandleTypeDef CanHandle;
int index;
int hz;
};
#endif

#ifdef __cplusplus
}
#endif
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L432xC/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

struct trng_s {
RNG_HandleTypeDef handle;
};
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

struct trng_s {
RNG_HandleTypeDef handle;
};
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

struct trng_s {
RNG_HandleTypeDef handle;
};
Expand Down
5 changes: 0 additions & 5 deletions targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct can_s {
CANName can;
int index;
};

struct trng_s {
RNG_HandleTypeDef handle;
};
Expand Down
Loading