Resolving conflicts, second try

Author: rondlh

Marlin/src/HAL/STM32/inc/SanityCheck.h

@@ -37,7 +37,7 @@
 #endif
 
 #if NONE(STM32F4xx, STM32H7xx) && ENABLED(FLASH_EEPROM_LEVELING)
-  #error "FLASH_EEPROM_LEVELING is currently only supported on STM32F4/H7 hardware."
+  #error "FLASH_EEPROM_LEVELING is currently only supported on STM32F4/H7 hardware." // IRON
 #endif
 
 #if ENABLED(SERIAL_STATS_MAX_RX_QUEUED)

Marlin/src/feature/runout.h

@@ -59,7 +59,6 @@
   #define FILAMENT_IS_OUT() (bool(CAN_host_get_iostate() & CAN_ID_FILAMENT_MASK) == FIL_RUNOUT_STATE)
   #define RUNOUT_STATE(N) bool(CAN_host_get_iostate() & CAN_ID_FILAMENT_MASK)  // CAN Virtual Filament Runout pin
 #else
-  #define FILAMENT_IS_OUT() (READ(FIL_RUNOUT_PIN) == FIL_RUNOUT_STATE)
   #define FILAMENT_IS_OUT(N...) (READ(FIL_RUNOUT##N##_PIN) == FIL_RUNOUT##N##_STATE)
 #endif
 

Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h

@@ -44,14 +44,8 @@
 #define I2C_EEPROM                                // Need use jumpers set i2c for EEPROM
 #define MARLIN_EEPROM_SIZE               0x1000U  // 4K
 
-#if ENALBED(CAN_HOST)                             // Onboard I2C EEPROM is disconnected by enabling CAN bus jumpers
-// NOTE: 2 Patch wires are required to reconnect the I2C EEPROM
-//#define I2C_SCL_PIN                       PA8   // BLTouch servo control pin
-//#define I2C_SDA_PIN                       PC9   // SPI3_CS TFT Card chip select pin
-#else
-  #define I2C_SCL_PIN                         PB8 // I2C_SCL and CAN_RX
-  #define I2C_SDA_PIN                         PB9 // I2C_SDA and CAN_TX
-#endif
+#define I2C_SCL_PIN                         PB8   // I2C_SCL and CAN_RX
+#define I2C_SDA_PIN                         PB9   // I2C_SDA and CAN_TX
 
 //
 // Servos