Commit59dda5c

authored

Merge pull request#1142 from fpistm/Update_L1

Update STM32L1 HAL and CMSIS drivers

2 parents5cd6cbb +5529c93 commit59dda5cCopy full SHA for 59dda5c

File tree

+4847

-15211

lines changed

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

+4847

-15211

lines changed

Lines changed: 0 additions & 146 deletions

This file was deleted.

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,8 @@ void HardwareTimer::pause()`
`115`	`115`	`/* Starting from G4, new Channel state implementation prevents to restart a channel,`
`116`	`116`	`if the channel has not been explicitly be stopped with HAL interface*/`
`117`	`117`	`TIM_CHANNEL_STATE_SET_ALL(&(_timerObj.handle), HAL_TIM_CHANNEL_STATE_READY);`
	`118`	`+#endif`
	`119`	`+#if defined(TIM_CHANNEL_N_STATE_SET_ALL)`
`118`	`120`	`TIM_CHANNEL_N_STATE_SET_ALL(&(_timerObj.handle), HAL_TIM_CHANNEL_STATE_READY);`
`119`	`121`	`#endif`
`120`	`122`	`}`
`@@ -144,9 +146,12 @@ void HardwareTimer::pauseChannel(uint32_t channel)`
`144`	`146`	`#if defined(TIM_CHANNEL_STATE_SET)`
`145`	`147`	`/* Starting from G4, new Channel state implementation prevents to restart a channel,`
`146`	`148`	`if the channel has not been explicitly be stopped with HAL interface*/`
	`149`	`+#if defined(TIM_CHANNEL_N_STATE_SET)`
`147`	`150`	`if (isComplementaryChannel[channel -1]) {`
`148`	`151`	`TIM_CHANNEL_N_STATE_SET(&(_timerObj.handle),getChannel(channel), HAL_TIM_CHANNEL_STATE_READY);`
`149`		`- }else {`
	`152`	`+ }else`
	`153`	`+#endif`
	`154`	`+ {`
`150`	`155`	`TIM_CHANNEL_STATE_SET(&(_timerObj.handle),getChannel(channel), HAL_TIM_CHANNEL_STATE_READY);`
`151`	`156`	`}`
`152`	`157`	`#endif`

Lines changed: 3 additions & 0 deletions

Comments

(0)