Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0b05ea3

Browse files
authored
Merge pull request#378 from fpistm/Cube_update
Update STM32F1xx and STM32L0xx
2 parents1961382 +3e9f02c commit0b05ea3

File tree

236 files changed

+121527
-82444
lines changed

Some content is hidden

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

236 files changed

+121527
-82444
lines changed

‎cores/arduino/stm32/LL/stm32yyxx_ll_usb.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
#ifdefSTM32F7xx
1111
#include"stm32f7xx_ll_usb.c"
1212
#endif
13+
#ifdefSTM32L0xx
14+
#include"stm32l0xx_ll_usb.c"
15+
#endif
1316
#ifdefSTM32L4xx
1417
#include"stm32l4xx_ll_usb.c"
1518
#endif

‎cores/arduino/stm32/LL/stm32yyxx_ll_usb.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
#ifdefSTM32F7xx
1414
#include"stm32f7xx_ll_usb.h"
1515
#endif
16+
#ifdefSTM32L0xx
17+
#include"stm32l0xx_ll_usb.h"
18+
#endif
1619
#ifdefSTM32L4xx
1720
#include"stm32l4xx_ll_usb.h"
1821
#endif

‎cores/arduino/stm32/stm32_def_build.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,14 @@
172172
#defineCMSIS_STARTUP_FILE "startup_stm32f777xx.s"
173173
#elif defined(STM32F779xx)
174174
#defineCMSIS_STARTUP_FILE "startup_stm32f779xx.s"
175+
#elif defined(STM32L010x4)
176+
#defineCMSIS_STARTUP_FILE "startup_stm32l010x4.s"
177+
#elif defined(STM32L010x6)
178+
#defineCMSIS_STARTUP_FILE "startup_stm32l010x6.s"
179+
#elif defined(STM32L010x8)
180+
#defineCMSIS_STARTUP_FILE "startup_stm32l010x8.s"
181+
#elif defined(STM32L010xB)
182+
#defineCMSIS_STARTUP_FILE "startup_stm32l010xb.s"
175183
#elif defined(STM32L011xx)
176184
#defineCMSIS_STARTUP_FILE "startup_stm32l011xx.s"
177185
#elif defined(STM32L021xx)

‎cores/arduino/stm32/twi.c‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,15 +524,25 @@ void HAL_I2C_AddrCallback(I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, ui
524524
if(obj->i2c_onSlaveTransmit!=NULL) {
525525
obj->i2c_onSlaveTransmit();
526526
}
527+
#if defined(STM32L0xx)
528+
HAL_I2C_Slave_Seq_Transmit_IT(hi2c, (uint8_t*)obj->i2cTxRxBuffer,
529+
obj->i2cTxRxBufferSize,I2C_LAST_FRAME);
530+
#else
527531
HAL_I2C_Slave_Sequential_Transmit_IT(hi2c, (uint8_t*)obj->i2cTxRxBuffer,
528532
obj->i2cTxRxBufferSize,I2C_LAST_FRAME);
533+
#endif
529534
}else {
530535
obj->slaveRxNbData=0;
531536
obj->slaveMode=SLAVE_MODE_RECEIVE;
532537
/* We don't know in advance how many bytes will be sent by master so
533538
* we'll fetch one by one until master ends the sequence */
539+
#if defined(STM32L0xx)
540+
HAL_I2C_Slave_Seq_Receive_IT(hi2c, (uint8_t*)&(obj->i2cTxRxBuffer[obj->slaveRxNbData]),
541+
1,I2C_NEXT_FRAME);
542+
#else
534543
HAL_I2C_Slave_Sequential_Receive_IT(hi2c, (uint8_t*)&(obj->i2cTxRxBuffer[obj->slaveRxNbData]),
535544
1,I2C_NEXT_FRAME);
545+
#endif
536546
}
537547
}
538548
}
@@ -577,8 +587,13 @@ void HAL_I2C_SlaveRxCpltCallback(I2C_HandleTypeDef *hi2c)
577587
}
578588
/* Restart interrupt mode for next Byte */
579589
if(obj->slaveMode==SLAVE_MODE_RECEIVE) {
590+
#if defined(STM32L0xx)
591+
HAL_I2C_Slave_Seq_Receive_IT(hi2c, (uint8_t*)&(obj->i2cTxRxBuffer[obj->slaveRxNbData]),
592+
1,I2C_NEXT_FRAME);
593+
#else
580594
HAL_I2C_Slave_Sequential_Receive_IT(hi2c, (uint8_t*)&(obj->i2cTxRxBuffer[obj->slaveRxNbData]),
581595
1,I2C_NEXT_FRAME);
596+
#endif
582597
}
583598
}
584599

‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f100xb.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6124,6 +6124,8 @@ typedef struct
61246124
((INSTANCE) == TIM4) || \
61256125
((INSTANCE) == TIM15))
61266126

6127+
#defineIS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
6128+
61276129
#defineIS_TIM_DMABURST_INSTANCE(INSTANCE)\
61286130
(((INSTANCE) == TIM1) || \
61296131
((INSTANCE) == TIM2) || \

‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f100xe.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6689,6 +6689,8 @@ typedef struct
66896689
((INSTANCE) == TIM12) || \
66906690
((INSTANCE) == TIM15))
66916691

6692+
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
6693+
66926694
#define IS_TIM_DMABURST_INSTANCE(INSTANCE)\
66936695
(((INSTANCE) == TIM1) || \
66946696
((INSTANCE) == TIM2) || \

‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f101x6.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5576,6 +5576,8 @@ typedef struct
55765576
(((INSTANCE) == TIM2) || \
55775577
((INSTANCE) == TIM3))
55785578

5579+
#defineIS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
5580+
55795581
#defineIS_TIM_DMABURST_INSTANCE(INSTANCE)\
55805582
(((INSTANCE) == TIM2) || \
55815583
((INSTANCE) == TIM3))

‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xb.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5685,6 +5685,8 @@ typedef struct
56855685
((INSTANCE) == TIM3) || \
56865686
((INSTANCE) == TIM4))
56875687

5688+
#defineIS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
5689+
56885690
#defineIS_TIM_DMABURST_INSTANCE(INSTANCE)\
56895691
(((INSTANCE) == TIM2) || \
56905692
((INSTANCE) == TIM3) || \

‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xe.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6658,6 +6658,8 @@ typedef struct
66586658
((INSTANCE) == TIM4) || \
66596659
((INSTANCE) == TIM5))
66606660

6661+
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
6662+
66616663
#define IS_TIM_DMABURST_INSTANCE(INSTANCE)\
66626664
(((INSTANCE) == TIM2) || \
66636665
((INSTANCE) == TIM3) || \

‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xg.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6812,6 +6812,8 @@ typedef struct
68126812
((INSTANCE) == TIM5) || \
68136813
((INSTANCE) == TIM12))
68146814

6815+
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
6816+
68156817
#define IS_TIM_DMABURST_INSTANCE(INSTANCE)\
68166818
(((INSTANCE) == TIM2) || \
68176819
((INSTANCE) == TIM3) || \

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp