CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't include STM32 Core code when compiling STM32 Generic (#12575)

Browse Source
This commit is contained in:
mr-miky 2018-12-03 13:55:49 +01:00 committed by Scott Lahteine
parent 64389acdf1
commit 11c7945365
15 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/src/HAL/HAL_STM32/HAL.cpp
View File

@ -21,7 +21,8 @@
* *
*/ */
#ifdef ARDUINO_ARCH_STM32 #if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// Includes // Includes

3
Marlin/src/HAL/HAL_STM32/HAL_Servo_STM32.cpp
View File

@ -20,7 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * 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" #include "../../inc/MarlinConfig.h"

3
Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp
View File

@ -20,7 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef ARDUINO_ARCH_STM32 #if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// Includes // Includes

3
Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.cpp
View File

@ -19,7 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef ARDUINO_ARCH_STM32 #if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// Includes // Includes

2
Marlin/src/HAL/HAL_STM32/fastio_STM32.cpp
View File

@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * 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" #include "../../inc/MarlinConfig.h"

2
Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp
View File

@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * 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" #include "../../inc/MarlinConfig.h"

2
Marlin/src/HAL/HAL_STM32/watchdog_STM32.cpp
View File

@ -20,7 +20,7 @@
* *
*/ */
#ifdef ARDUINO_ARCH_STM32 #if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"

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

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

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

@ -17,7 +17,7 @@
* *
*/ */
#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F4xx)) #if defined(STM32GENERIC) && (defined(STM32F4))
/** /**
* Description: functions for I2C connected external EEPROM. * Description: functions for I2C connected external EEPROM.
@ -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 // ENABLED(EEPROM_SETTINGS) && DISABLED(I2C_EEPROM) && DISABLED(SPI_EEPROM)
#endif // STM32F4 || STM32F4xx #endif // STM32GENERIC && STM32F4

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

@ -21,7 +21,7 @@
* *
*/ */
#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F4xx)) #if defined(STM32GENERIC) && defined(STM32F4)
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// Includes // Includes
@ -130,4 +130,4 @@ uint16_t HAL_adc_get_result(void) {
return HAL_adc_result; return HAL_adc_result;
} }
#endif // STM32F4 || STM32F4xx #endif // // STM32GENERIC && STM32F4

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

@ -21,7 +21,7 @@
* *
*/ */
#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F4xx)) #if defined(STM32GENERIC) && defined(STM32F4)
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"
@ -50,4 +50,4 @@ void libServo::move(const int value) {
} }
#endif // HAS_SERVOS #endif // HAS_SERVOS
#endif // STM32F4 || STM32F4xx #endif // STM32GENERIC && STM32F4

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

@ -30,7 +30,7 @@
* Adapted to the STM32F4 HAL * Adapted to the STM32F4 HAL
*/ */
#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F4xx)) #if defined(STM32GENERIC) && defined(STM32F4)
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// Includes // Includes
@ -173,4 +173,4 @@ void spiSendBlock(uint8_t token, const uint8_t* buf) {
#endif // SOFTWARE_SPI #endif // SOFTWARE_SPI
#endif // STM32F4 || STM32F4xx #endif // STM32GENERIC && STM32F4

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

@ -20,7 +20,7 @@
* *
*/ */
#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F4xx)) #if defined(STM32GENERIC) && defined(STM32F4)
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// Includes // Includes
@ -156,4 +156,4 @@ bool HAL_timer_interrupt_enabled(const uint8_t timer_num) {
return false; return false;
} }
#endif // STM32F4 || STM32F4xx #endif // STM32GENERIC && STM32F4

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

@ -21,7 +21,7 @@
* *
*/ */
#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F4xx)) #if defined(STM32GENERIC) && defined(STM32F4)
#include "../shared/persistent_store_api.h" #include "../shared/persistent_store_api.h"
@ -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; } size_t PersistentStore::capacity() { return E2END + 1; }
#endif // EEPROM_SETTINGS #endif // EEPROM_SETTINGS
#endif // STM32F4 || STM32F4xx #endif // STM32GENERIC && STM32F4

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

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