Skip to content

Update STM32F1xx and STM32L0xx #378

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.

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 10 commits into from
Nov 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions cores/arduino/stm32/LL/stm32yyxx_ll_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
#ifdef STM32F7xx
#include "stm32f7xx_ll_usb.c"
#endif
#ifdef STM32L0xx
#include "stm32l0xx_ll_usb.c"
#endif
#ifdef STM32L4xx
#include "stm32l4xx_ll_usb.c"
#endif
3 changes: 3 additions & 0 deletions cores/arduino/stm32/LL/stm32yyxx_ll_usb.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
#ifdef STM32F7xx
#include "stm32f7xx_ll_usb.h"
#endif
#ifdef STM32L0xx
#include "stm32l0xx_ll_usb.h"
#endif
#ifdef STM32L4xx
#include "stm32l4xx_ll_usb.h"
#endif
Expand Down
8 changes: 8 additions & 0 deletions cores/arduino/stm32/stm32_def_build.h
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,14 @@
#define CMSIS_STARTUP_FILE "startup_stm32f777xx.s"
#elif defined(STM32F779xx)
#define CMSIS_STARTUP_FILE "startup_stm32f779xx.s"
#elif defined(STM32L010x4)
#define CMSIS_STARTUP_FILE "startup_stm32l010x4.s"
#elif defined(STM32L010x6)
#define CMSIS_STARTUP_FILE "startup_stm32l010x6.s"
#elif defined(STM32L010x8)
#define CMSIS_STARTUP_FILE "startup_stm32l010x8.s"
#elif defined(STM32L010xB)
#define CMSIS_STARTUP_FILE "startup_stm32l010xb.s"
#elif defined(STM32L011xx)
#define CMSIS_STARTUP_FILE "startup_stm32l011xx.s"
#elif defined(STM32L021xx)
Expand Down
15 changes: 15 additions & 0 deletions cores/arduino/stm32/twi.c
Original file line number Diff line number Diff line change
Expand Up @@ -524,15 +524,25 @@ void HAL_I2C_AddrCallback(I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, ui
if(obj->i2c_onSlaveTransmit != NULL) {
obj->i2c_onSlaveTransmit();
}
#if defined(STM32L0xx)
HAL_I2C_Slave_Seq_Transmit_IT(hi2c, (uint8_t *) obj->i2cTxRxBuffer,
obj->i2cTxRxBufferSize, I2C_LAST_FRAME);
#else
HAL_I2C_Slave_Sequential_Transmit_IT(hi2c, (uint8_t *) obj->i2cTxRxBuffer,
obj->i2cTxRxBufferSize, I2C_LAST_FRAME);
#endif
} else {
obj->slaveRxNbData = 0;
obj->slaveMode = SLAVE_MODE_RECEIVE;
/* We don't know in advance how many bytes will be sent by master so
* we'll fetch one by one until master ends the sequence */
#if defined(STM32L0xx)
HAL_I2C_Slave_Seq_Receive_IT(hi2c, (uint8_t *) &(obj->i2cTxRxBuffer[obj->slaveRxNbData]),
1, I2C_NEXT_FRAME);
#else
HAL_I2C_Slave_Sequential_Receive_IT(hi2c, (uint8_t *) &(obj->i2cTxRxBuffer[obj->slaveRxNbData]),
1, I2C_NEXT_FRAME);
#endif
}
}
}
Expand Down Expand Up @@ -577,8 +587,13 @@ void HAL_I2C_SlaveRxCpltCallback(I2C_HandleTypeDef *hi2c)
}
/* Restart interrupt mode for next Byte */
if(obj->slaveMode == SLAVE_MODE_RECEIVE) {
#if defined(STM32L0xx)
HAL_I2C_Slave_Seq_Receive_IT(hi2c, (uint8_t *) &(obj->i2cTxRxBuffer[obj->slaveRxNbData]),
1, I2C_NEXT_FRAME);
#else
HAL_I2C_Slave_Sequential_Receive_IT(hi2c, (uint8_t *) &(obj->i2cTxRxBuffer[obj->slaveRxNbData]),
1, I2C_NEXT_FRAME);
#endif
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6124,6 +6124,8 @@ typedef struct
((INSTANCE) == TIM4) || \
((INSTANCE) == TIM15))

#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)

#define IS_TIM_DMABURST_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM1) || \
((INSTANCE) == TIM2) || \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6689,6 +6689,8 @@ typedef struct
((INSTANCE) == TIM12) || \
((INSTANCE) == TIM15))

#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)

#define IS_TIM_DMABURST_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM1) || \
((INSTANCE) == TIM2) || \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5576,6 +5576,8 @@ typedef struct
(((INSTANCE) == TIM2) || \
((INSTANCE) == TIM3))

#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)

#define IS_TIM_DMABURST_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM2) || \
((INSTANCE) == TIM3))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5685,6 +5685,8 @@ typedef struct
((INSTANCE) == TIM3) || \
((INSTANCE) == TIM4))

#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)

#define IS_TIM_DMABURST_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM2) || \
((INSTANCE) == TIM3) || \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6658,6 +6658,8 @@ typedef struct
((INSTANCE) == TIM4) || \
((INSTANCE) == TIM5))

#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)

#define IS_TIM_DMABURST_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM2) || \
((INSTANCE) == TIM3) || \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6812,6 +6812,8 @@ typedef struct
((INSTANCE) == TIM5) || \
((INSTANCE) == TIM12))

#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)

#define IS_TIM_DMABURST_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM2) || \
((INSTANCE) == TIM3) || \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6695,6 +6695,8 @@ typedef struct
(((INSTANCE) == TIM2) || \
((INSTANCE) == TIM3))

#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)

#define IS_TIM_DMABURST_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM2) || \
((INSTANCE) == TIM3))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6795,6 +6795,8 @@ typedef struct
((INSTANCE) == TIM3) || \
((INSTANCE) == TIM4))

#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)

#define IS_TIM_DMABURST_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM2) || \
((INSTANCE) == TIM3) || \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10318,6 +10318,8 @@ typedef struct
((INSTANCE) == TIM2) || \
((INSTANCE) == TIM3))

#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)

#define IS_TIM_DMABURST_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM1) || \
((INSTANCE) == TIM2) || \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10427,6 +10427,8 @@ typedef struct
((INSTANCE) == TIM3) || \
((INSTANCE) == TIM4))

#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)

#define IS_TIM_DMABURST_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM1) || \
((INSTANCE) == TIM2) || \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11500,6 +11500,8 @@ typedef struct
((INSTANCE) == TIM4) || \
((INSTANCE) == TIM5))

#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)

#define IS_TIM_DMABURST_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM1) || \
((INSTANCE) == TIM8) || \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11658,6 +11658,8 @@ typedef struct
((INSTANCE) == TIM5) || \
((INSTANCE) == TIM12))

#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)

#define IS_TIM_DMABURST_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM1) || \
((INSTANCE) == TIM8) || \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14505,6 +14505,8 @@ typedef struct
((INSTANCE) == TIM4) || \
((INSTANCE) == TIM5))

#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)

#define IS_TIM_DMABURST_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM1) || \
((INSTANCE) == TIM2) || \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15416,6 +15416,8 @@ typedef struct
((INSTANCE) == TIM4) || \
((INSTANCE) == TIM5))

#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)

#define IS_TIM_DMABURST_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM1) || \
((INSTANCE) == TIM2) || \
Expand Down
26 changes: 24 additions & 2 deletions system/Drivers/CMSIS/Device/ST/STM32F1xx/Release_Notes.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>


Expand Down Expand Up @@ -294,7 +294,29 @@ <h1 style="margin-bottom: 18pt; text-align: center;" align="center"><span style=
<tr>
<td style="padding: 0cm;" valign="top">
<span style="font-family: &quot;Times New Roman&quot;;"></span>
<h2 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;"><a name="History"></a><span style="font-size: 12pt; color: white;">Update History</span></h2><h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 500pt; width: 180px;"><span style="font-size: 10pt; font-family: Arial; color: white;">V4.2.0 / 31-March-2017 <o:p></o:p></span></h3>
<h2 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;"><a name="History"></a><span style="font-size: 12pt; color: white;">Update History</span></h2><h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 500pt; width: 180px;"><span style="font-size: 10pt; font-family: Arial; color: white;">V4.3.0 / 09-October-2018 <o:p></o:p></span></h3>




















<p class="MsoNormal" style="margin: 4.5pt 0cm 4.5pt 18pt;"><b style=""><u><span style="font-size: 10pt; font-family: Verdana; color: black;">Main
Changes</span></u></b></p><ul><li class="MsoNormal" style="margin-top: 4.5pt; margin-bottom: 4.5pt; color: black;"><span style="font-family: Verdana,sans-serif; font-size: 10pt;">Add missing IS_TIM_SYNCHRO_INSTANCE macro definition&nbsp;</span><span style="font-family: Verdana,sans-serif; font-size: 10pt;">to check TIM SYNCHRO feature instance support.</span></li></ul><h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 500pt; width: 180px;"><span style="font-size: 10pt; font-family: Arial; color: white;">V4.2.0 / 31-March-2017 <o:p></o:p></span></h3>



Expand Down
Loading