From 921b0357c50ad659e363d80b2bb69dc8d816c6dc Mon Sep 17 00:00:00 2001 From: AlviseDeFaveri <elvisilde@gmail.com> Date: Tue, 13 Nov 2018 18:22:25 +0100 Subject: [PATCH] [homeone] Commented-out canbus from bsp Canbus pins are already handled by the CanManager class --- .../interfaces-impl/bsp.cpp | 14 +++++++------- .../interfaces-impl/hwmapping.h | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_homeone/interfaces-impl/bsp.cpp b/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_homeone/interfaces-impl/bsp.cpp index 2cde336c..925a7564 100644 --- a/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_homeone/interfaces-impl/bsp.cpp +++ b/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_homeone/interfaces-impl/bsp.cpp @@ -217,10 +217,10 @@ void IRQbspInit() uart4::tx::mode(Mode::ALTERNATE); uart4::tx::alternateFunction(8); - can::rx::mode(Mode::ALTERNATE); - can::rx::alternateFunction(9); - can::tx::mode(Mode::ALTERNATE); - can::tx::alternateFunction(9); + // can::rx::mode(Mode::ALTERNATE); + // can::rx::alternateFunction(9); + // can::tx::mode(Mode::ALTERNATE); + // can::tx::alternateFunction(9); using namespace sensors; adis16405::cs::mode(Mode::OUTPUT); @@ -273,15 +273,15 @@ void IRQbspInit() ledOff(); DefaultConsole::instance().IRQset(intrusive_ref_ptr<Device>( new STM32Serial(defaultSerial,defaultSerialSpeed, - defaultSerialFlowctrl ? STM32Serial::RTSCTS : STM32Serial::NOFLOWCTRL))); + defaultSerialFlowctrl ? STM32Serial::RTSCTS : STM32Serial::NOFLOWCTRL))); // PA9,PA10 } void bspInit2() { #ifdef WITH_FILESYSTEM intrusive_ref_ptr<DevFs> devFs = basicFilesystemSetup(SDIODriver::instance()); - devFs->addDevice("gps", intrusive_ref_ptr<Device>(new STM32Serial(2,115200))); - devFs->addDevice("radio", intrusive_ref_ptr<Device>(new STM32Serial(3,57600))); + devFs->addDevice("gps", intrusive_ref_ptr<Device>(new STM32Serial(2,115200))); // PA2,PA3 + devFs->addDevice("radio", intrusive_ref_ptr<Device>(new STM32Serial(3,57600))); // PB10,PB11 #endif //WITH_FILESYSTEM } diff --git a/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_homeone/interfaces-impl/hwmapping.h b/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_homeone/interfaces-impl/hwmapping.h index 5852688b..d81aba14 100644 --- a/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_homeone/interfaces-impl/hwmapping.h +++ b/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_homeone/interfaces-impl/hwmapping.h @@ -56,10 +56,10 @@ using tx = Gpio<GPIOA_BASE, 0>; using rx = Gpio<GPIOA_BASE, 1>; } //namespace uart4 -namespace can { -using rx = Gpio<GPIOA_BASE, 11>; -using tx = Gpio<GPIOA_BASE, 12>; -} // namespace can +// namespace can { +// using rx = Gpio<GPIOA_BASE, 11>; +// using tx = Gpio<GPIOA_BASE, 12>; +// } // namespace can } //namespace interfaces namespace sensors { -- GitLab