diff --git a/old_examples/shared/drivers/ISB_protocol/IsbProtocol_serial2.cpp b/old_examples/shared/drivers/ISB_protocol/IsbProtocol_serial2.cpp index c1c685d00c626d98004d1791ac54f7ebb8660f4d..1554a2c73985b42e113ea6cdfb67173f6df0a765 100644 --- a/old_examples/shared/drivers/ISB_protocol/IsbProtocol_serial2.cpp +++ b/old_examples/shared/drivers/ISB_protocol/IsbProtocol_serial2.cpp @@ -52,7 +52,7 @@ IsbProtocol_serial2::IsbProtocol_serial2() u2tx::mode(Mode::ALTERNATE); u2tx::alternateFunction(7); -#ifdef _ARCH_CORTEXM3_STM32 +#ifdef _ARCH_CORTEXM3_STM32F1 u2rx::mode(Mode::INPUT); #else u2rx::mode(Mode::ALTERNATE); @@ -206,7 +206,7 @@ void IsbProtocol_serial2::setBaud(uint32_t baud) { uint32_t busFreq = SystemCoreClock; -#ifdef _ARCH_CORTEXM3_STM32 +#ifdef _ARCH_CORTEXM3_STM32F1 if (RCC->CFGR & RCC_CFGR_PPRE1_2) { busFreq /= 1 << (((RCC->CFGR >> 8) & 0x3) + 1); diff --git a/old_examples/shared/drivers/ISB_protocol/IsbProtocol_serial3.cpp b/old_examples/shared/drivers/ISB_protocol/IsbProtocol_serial3.cpp index 9bd1719af815e609cf4de526dc473f2043d8f0f0..68bb3f7905c9876a424a7cc38a1d13a0d52f66dc 100644 --- a/old_examples/shared/drivers/ISB_protocol/IsbProtocol_serial3.cpp +++ b/old_examples/shared/drivers/ISB_protocol/IsbProtocol_serial3.cpp @@ -74,7 +74,7 @@ IsbProtocol_serial3::IsbProtocol_serial3() u3tx::mode(Mode::ALTERNATE); u3tx::alternateFunction(7); -#ifdef _ARCH_CORTEXM3_STM32 +#ifdef _ARCH_CORTEXM3_STM32F1 u3rx::mode(Mode::INPUT); #else u3rx::mode(Mode::ALTERNATE); @@ -228,7 +228,7 @@ void IsbProtocol_serial3::setBaud(uint32_t baud) { uint32_t busFreq = SystemCoreClock; -#ifdef _ARCH_CORTEXM3_STM32 +#ifdef _ARCH_CORTEXM3_STM32F1 if (RCC->CFGR & RCC_CFGR_PPRE1_2) { busFreq /= 1 << (((RCC->CFGR >> 8) & 0x3) + 1); diff --git a/src/shared/utils/ClockUtils.h b/src/shared/utils/ClockUtils.h index e7fca74c522c2768560135baef07c337f469490c..11f827d796963ff56def0dbd7b94b8ed116bce57 100644 --- a/src/shared/utils/ClockUtils.h +++ b/src/shared/utils/ClockUtils.h @@ -82,7 +82,7 @@ inline uint32_t ClockUtils::getAPBPeripheralsClock(APB bus) if (bus == APB::APB1) { // The position of the PPRE1 bit in RCC->CFGR is different in some stm32 -#ifdef _ARCH_CORTEXM3_STM32 +#ifdef _ARCH_CORTEXM3_STM32F1 const uint32_t ppre1 = 8; #elif _ARCH_CORTEXM4_STM32F4 | _ARCH_CORTEXM3_STM32F2 const uint32_t ppre1 = 10; @@ -98,7 +98,7 @@ inline uint32_t ClockUtils::getAPBPeripheralsClock(APB bus) else { // The position of the PPRE2 bit in RCC->CFGR is different in some stm32 -#ifdef _ARCH_CORTEXM3_STM32 +#ifdef _ARCH_CORTEXM3_STM32F1 const uint32_t ppre2 = 11; #elif _ARCH_CORTEXM4_STM32F4 | _ARCH_CORTEXM3_STM32F2 const uint32_t ppre2 = 13; @@ -127,7 +127,7 @@ inline uint32_t ClockUtils::getAPBTimersClock(APB bus) if (bus == APB::APB1) { // The position of the PPRE1 bit in RCC->CFGR is different in some stm32 -#ifdef _ARCH_CORTEXM3_STM32 +#ifdef _ARCH_CORTEXM3_STM32F1 const uint32_t ppre1 = 8; #elif _ARCH_CORTEXM4_STM32F4 | _ARCH_CORTEXM3_STM32F2 const uint32_t ppre1 = 10; @@ -143,7 +143,7 @@ inline uint32_t ClockUtils::getAPBTimersClock(APB bus) else { // The position of the PPRE2 bit in RCC->CFGR is different in some stm32 -#ifdef _ARCH_CORTEXM3_STM32 +#ifdef _ARCH_CORTEXM3_STM32F1 const uint32_t ppre2 = 11; #elif _ARCH_CORTEXM4_STM32F4 | _ARCH_CORTEXM3_STM32F2 const uint32_t ppre2 = 13; diff --git a/src/tests/drivers/canbus/CanDriver/test-can-2way.cpp b/src/tests/drivers/canbus/CanDriver/test-can-2way.cpp index 1a22bdfc874f306cfa4222838a19cd6b7ac02628..3fd1440dd945e7d2fb69dda142fe5972884fcad6 100644 --- a/src/tests/drivers/canbus/CanDriver/test-can-2way.cpp +++ b/src/tests/drivers/canbus/CanDriver/test-can-2way.cpp @@ -47,7 +47,7 @@ using namespace Boardcore; using namespace Boardcore::Canbus; using namespace miosix; -#ifdef _ARCH_CORTEXM3_STM32 +#ifdef _ARCH_CORTEXM3_STM32F1 using CanRX = Gpio<GPIOA_BASE, 11>; using CanTX = Gpio<GPIOA_BASE, 12>; #else @@ -205,7 +205,7 @@ int main() { miosix::FastInterruptDisableLock dLock; -#ifdef _ARCH_CORTEXM3_STM32 +#ifdef _ARCH_CORTEXM3_STM32F1 CanRX::mode(Mode::ALTERNATE); CanTX::mode(Mode::ALTERNATE); #else