Skip to content

modified #ifdef so that STM32 Core code is not included when compilin… #12575

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

Merged
thinkyhead merged 1 commit into from
Dec 3, 2018
Merged

modified #ifdef so that STM32 Core code is not included when compilin… #12575

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
3 changes: 2 additions & 1 deletion Marlin/src/HAL/HAL_STM32/HAL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
*
*/

#ifdef ARDUINO_ARCH_STM32
#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)


// --------------------------------------------------------------------------
// Includes
Expand Down
3 changes: 2 additions & 1 deletion Marlin/src/HAL/HAL_STM32/HAL_Servo_STM32.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#ifdef ARDUINO_ARCH_STM32
#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)


#include "../../inc/MarlinConfig.h"

Expand Down
3 changes: 2 additions & 1 deletion Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#ifdef ARDUINO_ARCH_STM32
#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)


// --------------------------------------------------------------------------
// Includes
Expand Down
3 changes: 2 additions & 1 deletion Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#ifdef ARDUINO_ARCH_STM32
#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)


// --------------------------------------------------------------------------
// Includes
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HAL_STM32/fastio_STM32.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#ifdef ARDUINO_ARCH_STM32
#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)

#include "../../inc/MarlinConfig.h"

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#ifdef ARDUINO_ARCH_STM32
#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)

#include "../../inc/MarlinConfig.h"

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HAL_STM32/watchdog_STM32.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
*/

#ifdef ARDUINO_ARCH_STM32
#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)

#include "../../inc/MarlinConfig.h"

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HAL_STM32F4/EEPROM_Emul/eeprom_emul.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
/** @addtogroup EEPROM_Emulation
* @{
*/
#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F4xx))
#if defined(STM32GENERIC) && (defined(STM32F4))

/* Includes ------------------------------------------------------------------*/
#include "eeprom_emul.h"
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/HAL/HAL_STM32F4/EmulatedEeprom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
*/

#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F4xx))
#if defined(STM32GENERIC) && (defined(STM32F4))

/**
* Description: functions for I2C connected external EEPROM.
Expand Down Expand Up @@ -139,4 +139,4 @@ void eeprom_update_block(const void *__src, void *__dst, size_t __n) {
}

#endif // ENABLED(EEPROM_SETTINGS) && DISABLED(I2C_EEPROM) && DISABLED(SPI_EEPROM)
#endif // STM32F4 || STM32F4xx
#endif // STM32GENERIC && STM32F4
4 changes: 2 additions & 2 deletions Marlin/src/HAL/HAL_STM32F4/HAL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*
*/

#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F4xx))
#if defined(STM32GENERIC) && defined(STM32F4)

// --------------------------------------------------------------------------
// Includes
Expand Down Expand Up @@ -130,4 +130,4 @@ uint16_t HAL_adc_get_result(void) {
return HAL_adc_result;
}

#endif // STM32F4 || STM32F4xx
#endif // // STM32GENERIC && STM32F4
4 changes: 2 additions & 2 deletions Marlin/src/HAL/HAL_STM32F4/HAL_Servo_STM32F4.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*
*/

#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F4xx))
#if defined(STM32GENERIC) && defined(STM32F4)

#include "../../inc/MarlinConfig.h"

Expand Down Expand Up @@ -50,4 +50,4 @@ void libServo::move(const int value) {
}
#endif // HAS_SERVOS

#endif // STM32F4 || STM32F4xx
#endif // STM32GENERIC && STM32F4
4 changes: 2 additions & 2 deletions Marlin/src/HAL/HAL_STM32F4/HAL_spi_STM32F4.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* Adapted to the STM32F4 HAL
*/

#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F4xx))
#if defined(STM32GENERIC) && defined(STM32F4)

// --------------------------------------------------------------------------
// Includes
Expand Down Expand Up @@ -173,4 +173,4 @@ void spiSendBlock(uint8_t token, const uint8_t* buf) {

#endif // SOFTWARE_SPI

#endif // STM32F4 || STM32F4xx
#endif // STM32GENERIC && STM32F4
4 changes: 2 additions & 2 deletions Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
*/

#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F4xx))
#if defined(STM32GENERIC) && defined(STM32F4)

// --------------------------------------------------------------------------
// Includes
Expand Down Expand Up @@ -156,4 +156,4 @@ bool HAL_timer_interrupt_enabled(const uint8_t timer_num) {
return false;
}

#endif // STM32F4 || STM32F4xx
#endif // STM32GENERIC && STM32F4
4 changes: 2 additions & 2 deletions Marlin/src/HAL/HAL_STM32F4/persistent_store_eeprom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*
*/

#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F4xx))
#if defined(STM32GENERIC) && defined(STM32F4)

#include "../shared/persistent_store_api.h"

Expand Down Expand Up @@ -66,4 +66,4 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
size_t PersistentStore::capacity() { return E2END + 1; }

#endif // EEPROM_SETTINGS
#endif // STM32F4 || STM32F4xx
#endif // STM32GENERIC && STM32F4
4 changes: 2 additions & 2 deletions Marlin/src/HAL/HAL_STM32F4/watchdog_STM32F4.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
*/

#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F4xx))
#if defined(STM32GENERIC) && defined(STM32F4)

#include "../../inc/MarlinConfig.h"

Expand Down Expand Up @@ -54,4 +54,4 @@

#endif // USE_WATCHDOG

#endif // STM32F4 || STM32F4xx
#endif // STM32GENERIC && STM32F4