bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

STM32F4xx modifications for HAL_STM32 (#12080)

Browse Source
This commit is contained in:
Karl Andersson
2018-10-16 13:42:41 +02:00
committed by Scott Lahteine
parent bf0c809ff2
commit 8b5e51c9aa
15 changed files with 97 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/HAL/HAL_STM32F4/EEPROM_Emul/eeprom_emul.cpp
View File

@ -47,7 +47,7 @@
/** @addtogroup EEPROM_Emulation
* @{
*/
#if defined(STM32F4) || defined(STM32F4xx)
#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F4xx))
/* Includes ------------------------------------------------------------------*/
#include "eeprom_emul.h"

2
Marlin/src/HAL/HAL_STM32F4/EmulatedEeprom.cpp
View File

@ -17,7 +17,7 @@
*
*/
#if defined(STM32F4) || defined(STM32F4xx)
#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F4xx))
/**
* Description: functions for I2C connected external EEPROM.

2
Marlin/src/HAL/HAL_STM32F4/HAL.cpp
View File

@ -21,7 +21,7 @@
*
*/
#if defined(STM32F4) || defined(STM32F4xx)
#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F4xx))
// --------------------------------------------------------------------------
// Includes

2
Marlin/src/HAL/HAL_STM32F4/HAL_Servo_STM32F4.cpp
View File

@ -21,7 +21,7 @@
*
*/
#if defined(STM32F4) || defined(STM32F4xx)
#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F4xx))
#include "../../inc/MarlinConfig.h"

2
Marlin/src/HAL/HAL_STM32F4/HAL_spi_STM32F4.cpp
View File

@ -30,7 +30,7 @@
* Adapted to the STM32F4 HAL
*/
#if defined(STM32F4) || defined(STM32F4xx)
#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F4xx))
// --------------------------------------------------------------------------
// Includes

4
Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.cpp
View File

@ -20,7 +20,7 @@
*
*/
#if defined(STM32F4) || defined(STM32F4xx)
#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F4xx))
// --------------------------------------------------------------------------
// Includes
@ -91,7 +91,7 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
TimerHandle[timer_num].irqHandle = TC5_Handler;
TimerHandleInit(&TimerHandle[timer_num], (((HAL_TIMER_RATE) / step_prescaler) / frequency) - 1, step_prescaler);
#endif
HAL_NVIC_SetPriority(STEP_TIMER_IRQ_ID, 6, 0);
HAL_NVIC_SetPriority(STEP_TIMER_IRQ_ID, 1, 0);
break;
case TEMP_TIMER_NUM:

2
Marlin/src/HAL/HAL_STM32F4/persistent_store_eeprom.cpp
View File

@ -21,7 +21,7 @@
*
*/
#if defined(STM32F4) || defined(STM32F4xx)
#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F4xx))
#include "../shared/persistent_store_api.h"

2
Marlin/src/HAL/HAL_STM32F4/watchdog_STM32F4.cpp
View File

@ -20,7 +20,7 @@
*
*/
#if defined(STM32F4) || defined(STM32F4xx)
#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F4xx))
#include "../../inc/MarlinConfig.h"