Skip to content

Commit 63931d7

Browse files
Merge branch 'main' into feature/actuallytaylor/timer_refactor
2 parents 2b7e571 + 2a4abc3 commit 63931d7

3 files changed

Lines changed: 3 additions & 4 deletions

File tree

include/core/manager.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ GPIO& getGPIO(GPIO::Direction direction = GPIO::Direction::OUTPUT, GPIO::Pull pu
223223
return gpioPin;
224224
#endif
225225
#ifdef STM32F4xx
226-
static GPIOf4xx gpioPin(pin, direction);
226+
static GPIOf4xx gpioPin(pin, direction, pull);
227227
return gpioPin;
228228
#endif
229229
}

src/core/io/platform/f3xx/GPIOf3xx.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ void GPIOf3xx::registerIRQ(TriggerEdge edge, void (*irqHandler)(GPIO* pin, void*
118118
myPins,
119119
numOfPins,
120120
GPIOf3xx::GPIO_TRIGGER_INTERRUPT_BASE | (static_cast<uint32_t>(edge) << GPIO_MODE_IT_SHIFT),
121-
GPIO_PULLDOWN,
121+
static_cast<uint32_t>(pull),
122122
GPIO_SPEED_FREQ_HIGH);
123123

124124
auto pin_index = static_cast<uint8_t>(this->pin) & 0x0F;

src/core/io/platform/f4xx/GPIOf4xx.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ GPIOf4xx::GPIOf4xx(Pin pin, GPIO::Direction direction, Pull pull) : GPIO(pin, di
6969
numOfPins,
7070
static_cast<uint32_t>(direction),
7171
static_cast<uint32_t>(pull),
72-
GPIO_PULLDOWN,
7372
GPIO_SPEED_FREQ_HIGH);
7473

7574
// TODO: double check that this actually applies to F4xx the same way it does to F3xx
@@ -118,7 +117,7 @@ void GPIOf4xx::registerIRQ(TriggerEdge edge, void (*irqHandler)(GPIO* pin, void*
118117
myPins,
119118
numOfPins,
120119
GPIOf4xx::GPIO_TRIGGER_INTERRUPT_BASE | (static_cast<uint32_t>(edge) << GPIO_MODE_IT_SHIFT),
121-
GPIO_PULLDOWN,
120+
static_cast<uint32_t>(pull),
122121
GPIO_SPEED_FREQ_HIGH);
123122

124123
auto pin_index = static_cast<uint8_t>(this->pin) & 0x0F;

0 commit comments

Comments
 (0)