Skip to content

Add support for hal overloading on stm32g4, cleanup index to injected rank util #528

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

Open
Moddingear wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Add support for hal overloading on stm32g4, cleanup index to injected rank util #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 1 addition & 6 deletions src/current_sense/hardware_specific/stm32/stm32_adc_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,29 +417,24 @@ uint32_t _getADCChannel(PinName pin, ADC_TypeDef *AdcHandle )

uint32_t _getADCInjectedRank(uint8_t ind){
switch (ind) {
#ifdef ADC_INJECTED_RANK_1
#ifdef ADC_INJECTED_RANK_1
case 0:
return ADC_INJECTED_RANK_1;
break;
#endif
#ifdef ADC_INJECTED_RANK_2
case 1:
return ADC_INJECTED_RANK_2;
break;
#endif
#ifdef ADC_INJECTED_RANK_3
case 2:
return ADC_INJECTED_RANK_3;
break;
#endif
#ifdef ADC_INJECTED_RANK_4
case 3:
return ADC_INJECTED_RANK_4;
break;
#endif
default:
return 0;
break;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/current_sense/hardware_specific/stm32/stm32_mcu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

#include "../../hardware_api.h"

#if defined(_STM32_DEF_) and !defined(ARDUINO_B_G431B_ESC1)
#if defined(_STM32_DEF_) and !defined(ARDUINO_B_G431B_ESC1) && !defined(SIMPLEFOC_HAL_OVERRIDE)

#include "stm32_mcu.h"

Expand Down
2 changes: 1 addition & 1 deletion src/current_sense/hardware_specific/stm32/stm32g4/stm32g4_hal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "stm32g4_hal.h"

#if defined(STM32G4xx) && !defined(ARDUINO_B_G431B_ESC1)
#if defined(STM32G4xx) && !defined(ARDUINO_B_G431B_ESC1) && !defined(SIMPLEFOC_HAL_OVERRIDE)

#include "../../../../communication/SimpleFOCDebug.h"

Expand Down
2 changes: 1 addition & 1 deletion src/current_sense/hardware_specific/stm32/stm32g4/stm32g4_hal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "Arduino.h"

#if defined(STM32G4xx) && !defined(ARDUINO_B_G431B_ESC1)
#if defined(STM32G4xx) && !defined(ARDUINO_B_G431B_ESC1) && !defined(SIMPLEFOC_HAL_OVERRIDE)

#include "stm32g4xx_hal.h"
#include "../stm32_mcu.h"
Expand Down
2 changes: 1 addition & 1 deletion src/current_sense/hardware_specific/stm32/stm32g4/stm32g4_mcu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "../../../hardware_api.h"

#if defined(STM32G4xx) && !defined(ARDUINO_B_G431B_ESC1)
#if defined(STM32G4xx) && !defined(ARDUINO_B_G431B_ESC1) && !defined(SIMPLEFOC_HAL_OVERRIDE)

#include "../../../../common/foc_utils.h"
#include "../../../../drivers/hardware_api.h"
Expand Down
Loading