Skip to content

Commit e47ab30

Browse files
authored
Merge branch 'simplefoc:dev' into dev
2 parents d4b86b9 + e72db3f commit e47ab30

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

.github/workflows/ccpp.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
- STMicroelectronics:stm32:GenF1:pnum=BLUEPILL_F103C8 # stm32 bluepill
2121
- STMicroelectronics:stm32:Nucleo_64:pnum=NUCLEO_F411RE # stm32 nucleo
2222
- STMicroelectronics:stm32:GenF4:pnum=GENERIC_F405RGTX # stm32f405 - odrive
23+
- STMicroelectronics:stm32:GenL4:pnum=GENERIC_L475RGTX # stm32l475
2324
- STMicroelectronics:stm32:Disco:pnum=B_G431B_ESC1 # B-G431-ESC1
2425
- arduino:mbed_rp2040:pico # rpi pico
2526

@@ -75,6 +76,10 @@ jobs:
7576
platform-url: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json
7677
sketch-names: odrive_example_encoder.ino, odrive_example_spi.ino, stm32_current_control_low_side.ino
7778

79+
- arduino-boards-fqbn: STMicroelectronics:stm32:GenL4:pnum=GENERIC_L475RGTX # stm32l475
80+
platform-url: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json
81+
sketch-names: single_full_control_example.ino, stm32_spi_alt_example.ino, double_full_control_example.ino, stm32_current_control_low_side.ino
82+
7883
- arduino-boards-fqbn: STMicroelectronics:stm32:Nucleo_64:pnum=NUCLEO_F411RE # nucleo one full example
7984
platform-url: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json
8085
sketch-names: single_full_control_example.ino, stm32_spi_alt_example.ino, double_full_control_example.ino, stm32_current_control_low_side.ino

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Therefore this is an attempt to:
2424
- *Medium-power* BLDC driver (<30Amps): [Arduino <span class="simple">Simple<b>FOC</b>PowerShield</span> ](https://github.com/simplefoc/Arduino-SimpleFOC-PowerShield).
2525
- See also [@byDagor](https://github.com/byDagor)'s *fully-integrated* ESP32 based board: [Dagor Brushless Controller](https://github.com/byDagor/Dagor-Brushless-Controller)
2626

27-
> NEXT RELEASE 📢 : <span class="simple">Simple<span class="foc">FOC</span>library</span> v2.3.0
27+
> NEW RELEASE 📢 : <span class="simple">Simple<span class="foc">FOC</span>library</span> v2.3.0
2828
> - Arduino Mega 6pwm more timers supported
2929
> - Arduino boards - frequency change support either 32kHz or 4kHz
3030
> - Arduino Uno - synched timers in 3pwm and 6pwm mode [#71](https://github.com/simplefoc/Arduino-FOC/issues/71)

src/current_sense/hardware_specific/rp2040/rp2040_mcu.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ void RP2040ADCEngine::start() {
241241

242242
void RP2040ADCEngine::stop() {
243243
adc_run(false);
244+
irq_set_enabled(DMA_IRQ_0, false);
244245
dma_channel_abort(readDMAChannel);
245246
// if (triggerPWMSlice>=0)
246247
// dma_channel_abort(triggerDMAChannel);

src/current_sense/hardware_specific/stm32/stm32l4/stm32l4_utils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ uint32_t _timerToRegularTRGO(HardwareTimer* timer){
187187
#endif
188188
#ifdef TIM8 // if defined timer 8
189189
else if(timer->getHandle()->Instance == TIM8)
190-
return ADC_EXTERNALTRIG_T7_TRGO;
190+
return ADC_EXTERNALTRIG_T8_TRGO;
191191
#endif
192192
#ifdef TIM15 // if defined timer 15
193193
else if(timer->getHandle()->Instance == TIM15)

0 commit comments

Comments
 (0)