andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

LPC1768 EEPROM fallback to flash, add overrides (#17184)

vanilla_fb_2.0.x
Scott Lahteine 5 years ago
committed by GitHub
parent
2fc0df1b39
commit
b14c933171
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 168 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Marlin/src/HAL/DUE/inc/Conditionals_post.h
  2. 5
      Marlin/src/HAL/ESP32/inc/Conditionals_post.h
  3. 8
      Marlin/src/HAL/LPC1768/inc/Conditionals_post.h
  4. 3
      Marlin/src/HAL/LPC1768/persistent_store_flash.cpp
  5. 2
      Marlin/src/HAL/SAMD51/inc/Conditionals_post.h
  6. 5
      Marlin/src/HAL/STM32/inc/Conditionals_post.h
  7. 3
      Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h
  8. 5
      Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h
  9. 4
      Marlin/src/inc/Conditionals_post.h
  10. 15
      Marlin/src/inc/SanityCheck.h
  11. 6
      Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
  12. 6
      Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
  13. 6
      Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
  14. 6
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
  15. 6
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
  16. 8
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
  17. 4
      Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
  18. 6
      Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
  19. 8
      Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
  20. 6
      Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
  21. 6
      Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
  22. 6
      Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
  23. 7
      Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
  24. 8
      Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
  25. 6
      Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h
  26. 6
      Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h
  27. 6
      Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
  28. 6
      Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
  29. 8
      Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
  30. 6
      Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
  31. 6
      Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h

2
Marlin/src/HAL/DUE/inc/Conditionals_post.h
View File

@ -24,5 +24,5 @@
#if USE_EMULATED_EEPROM
#undef SRAM_EEPROM_EMULATION
#undef SDCARD_EEPROM_EMULATION
#define FLASH_EEPROM_EMULATION 1
#define FLASH_EEPROM_EMULATION
#endif

5
Marlin/src/HAL/ESP32/inc/Conditionals_post.h
View File

@ -20,3 +20,8 @@
*
*/
#pragma once
// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
#if ENABLED(EEPROM_SETTINGS) && NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
#define SDCARD_EEPROM_EMULATION
#endif

8
Marlin/src/HAL/LPC1768/inc/Conditionals_post.h
View File

@ -21,10 +21,6 @@
*/
#pragma once
#if ENABLED(EEPROM_SETTINGS)
#undef USE_REAL_EEPROM
#define USE_EMULATED_EEPROM 1
#if DISABLED(FLASH_EEPROM_EMULATION)
#define SDCARD_EEPROM_EMULATION 1
#endif
#if USE_EMULATED_EEPROM && NONE(SDCARD_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
#define FLASH_EEPROM_EMULATION
#endif

3
Marlin/src/HAL/LPC1768/persistent_store_flash.cpp
View File

@ -36,12 +36,11 @@
* 16Kb I/O buffers (intended to hold DMA USB and Ethernet data, but currently
* unused).
*/
#include "../../inc/MarlinConfigPre.h"
#include "../../inc/MarlinConfig.h"
#if ENABLED(FLASH_EEPROM_EMULATION)
#include "persistent_store_api.h"
#include "../../inc/MarlinConfig.h"
extern "C" {
#include <lpc17xx_iap.h>

2
Marlin/src/HAL/SAMD51/inc/Conditionals_post.h
View File

@ -24,5 +24,5 @@
#if USE_EMULATED_EEPROM
#undef SRAM_EEPROM_EMULATION
#undef SDCARD_EEPROM_EMULATION
#define FLASH_EEPROM_EMULATION 1
#define FLASH_EEPROM_EMULATION
#endif

5
Marlin/src/HAL/STM32/inc/Conditionals_post.h
View File

@ -20,3 +20,8 @@
*
*/
#pragma once
// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
#if ENABLED(EEPROM_SETTINGS) && NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
#define SDCARD_EEPROM_EMULATION
#endif

3
Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h
View File

@ -23,8 +23,7 @@
#if ENABLED(EEPROM_SETTINGS) && defined(STM32F7)
#undef USE_REAL_EEPROM
#define USE_EMULATED_EEPROM 1
#undef SRAM_EEPROM_EMULATION
#undef SDCARD_EEPROM_EMULATION
#define FLASH_EEPROM_EMULATION 1
#define FLASH_EEPROM_EMULATION
#endif

5
Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h
View File

@ -20,3 +20,8 @@
*
*/
#pragma once
// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
#if ENABLED(EEPROM_SETTINGS) && NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
#define SDCARD_EEPROM_EMULATION
#endif

4
Marlin/src/inc/Conditionals_post.h
View File

@ -35,15 +35,13 @@
#define HAS_LINEAR_E_JERK 1
#endif
// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
#if ENABLED(EEPROM_SETTINGS)
#if NONE(FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION) && EITHER(I2C_EEPROM, SPI_EEPROM)
#define USE_REAL_EEPROM 1
#else
#define USE_EMULATED_EEPROM 1
#endif
#if NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
#define SDCARD_EEPROM_EMULATION 1
#endif
#else
#undef I2C_EEPROM
#undef SPI_EEPROM

15
Marlin/src/inc/SanityCheck.h
View File

@ -1993,9 +1993,24 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
static_assert(PWM_PIN(E2_AUTO_FAN_PIN), "E2" AF_ERR_SUFF);
#elif HAS_AUTO_FAN_3
static_assert(PWM_PIN(E3_AUTO_FAN_PIN), "E3" AF_ERR_SUFF);
#elif HAS_AUTO_FAN_4
static_assert(PWM_PIN(E4_AUTO_FAN_PIN), "E4" AF_ERR_SUFF);
#elif HAS_AUTO_FAN_5
static_assert(PWM_PIN(E5_AUTO_FAN_PIN), "E5" AF_ERR_SUFF);
#elif HAS_AUTO_FAN_6
static_assert(PWM_PIN(E6_AUTO_FAN_PIN), "E6" AF_ERR_SUFF);
#elif HAS_AUTO_FAN_7
static_assert(PWM_PIN(E7_AUTO_FAN_PIN), "E7" AF_ERR_SUFF);
#endif
#endif
/**
* Make sure only one EEPROM type is enabled
*/
#if ENABLED(EEPROM_SETTINGS) && 1 < ENABLED(SDCARD_EEPROM_EMULATION) + ENABLED(FLASH_EEPROM_EMULATION) + ENABLED(SRAM_EEPROM_EMULATION)
#error "Please select only one of SDCARD, FLASH, or SRAM_EEPROM_EMULATION."
#endif
/**
* Make sure only one display is enabled
*/

6
Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
View File

@ -31,6 +31,12 @@
#define BOARD_INFO_NAME "AZSMZ MINI"
//
// EEPROM
//
#define FLASH_EEPROM_EMULATION
//#define SDCARD_EEPROM_EMULATION
//
// Servos
//

6
Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
View File

@ -38,6 +38,12 @@
#define BOARD_INFO_NAME "BIQU Thunder B300 V1.0"
#endif
//
// EEPROM
//
#define FLASH_EEPROM_EMULATION
//#define SDCARD_EEPROM_EMULATION
//
// Limit Switches
//

6
Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
View File

@ -36,6 +36,12 @@
#define BOARD_INFO_NAME "BIQU BQ111-A4"
//
// EEPROM
//
#define FLASH_EEPROM_EMULATION
//#define SDCARD_EEPROM_EMULATION
//
// Limit Switches
//

6
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
View File

@ -23,6 +23,12 @@
#define BOARD_INFO_NAME "BIGTREE SKR 1.1"
//
// EEPROM
//
#define FLASH_EEPROM_EMULATION
//#define SDCARD_EEPROM_EMULATION
//
// Limit Switches
//

6
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
View File

@ -23,6 +23,12 @@
#define BOARD_INFO_NAME "BIGTREE SKR 1.3"
//
// EEPROM
//
#define FLASH_EEPROM_EMULATION
//#define SDCARD_EEPROM_EMULATION
/**
* Trinamic Stallguard pins
*/

8
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
View File

@ -25,6 +25,14 @@
#define BOARD_INFO_NAME "BIGTREE SKR 1.4"
#endif
//
// EEPROM
//
#if NONE(FLASH_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION)
#define FLASH_EEPROM_EMULATION
//#define SDCARD_EEPROM_EMULATION
#endif
//
// SD Connection
//

4
Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
View File

@ -32,6 +32,10 @@
// Ignore temp readings during development.
//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
#if DISABLED(SDCARD_EEPROM_EMULATION)
#define FLASH_EEPROM_EMULATION
#endif
//
// Steppers
//

6
Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
View File

@ -30,6 +30,12 @@
// Ignore temp readings during develpment.
//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
//
// EEPROM
//
#define FLASH_EEPROM_EMULATION
//#define SDCARD_EEPROM_EMULATION
//
// Enable 12MHz clock output on P1.27 pin to sync TMC2208 chip clocks
//

8
Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
View File

@ -38,6 +38,14 @@
#define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SBASE"
#endif
//
// EEPROM
//
#if NONE(FLASH_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION)
#define FLASH_EEPROM_EMULATION
//#define SDCARD_EEPROM_EMULATION
#endif
#define LED_PIN P1_18 // Used as a status indicator
#define LED2_PIN P1_19
#define LED3_PIN P1_20

6
Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
View File

@ -32,6 +32,12 @@
#define BOARD_INFO_NAME "MKS SGen-L"
#define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SGEN_L"
//
// EEPROM
//
#define FLASH_EEPROM_EMULATION
//#define SDCARD_EEPROM_EMULATION
//
// Servos
//

6
Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
View File

@ -42,6 +42,12 @@
#define BOARD_INFO_NAME "Re-ARM RAMPS 1.4"
//
// EEPROM
//
#define FLASH_EEPROM_EMULATION
//#define SDCARD_EEPROM_EMULATION
//
// Servos
//

6
Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
View File

@ -32,6 +32,12 @@
#define BOARD_INFO_NAME "Selena Compact"
#define BOARD_WEBSITE_URL "github.com/Ales2-k/Selena"
//
// EEPROM
//
#define FLASH_EEPROM_EMULATION
//#define SDCARD_EEPROM_EMULATION
//
// Servos
//

7
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
View File

@ -32,6 +32,12 @@
#define BOARD_INFO_NAME "Azteeg X5 GT"
#define BOARD_WEBSITE_URL "tinyurl.com/yx8tdqa3"
//
// EEPROM
//
#define FLASH_EEPROM_EMULATION
//#define SDCARD_EEPROM_EMULATION
//
// Servos
//
@ -47,7 +53,6 @@
#define Z_MIN_PIN P1_26
#define Z_MAX_PIN P1_29
//
// Steppers
//

8
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
View File

@ -187,6 +187,14 @@
#endif // HAS_SPI_LCD
//
// EEPROM
//
#if NONE(FLASH_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION)
#define FLASH_EEPROM_EMULATION
//#define SDCARD_EEPROM_EMULATION
#endif
//
// SD Support
//

6
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h
View File

@ -31,6 +31,12 @@
#define BOARD_INFO_NAME "Azteeg X5 MINI WIFI"
//
// EEPROM
//
#define FLASH_EEPROM_EMULATION
//#define SDCARD_EEPROM_EMULATION
//
// DIGIPOT slave addresses
//

6
Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h
View File

@ -24,6 +24,12 @@
#define BOARD_INFO_NAME "BIGTREE SKR 1.4 TURBO"
#define SKR_HAS_LPC1769
//
// EEPROM
//
#define FLASH_EEPROM_EMULATION
//#define SDCARD_EEPROM_EMULATION
//
// Include SKR 1.4 pins
//

6
Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
View File

@ -31,6 +31,12 @@
#define BOARD_INFO_NAME "Cohesion3D Mini"
//
// EEPROM
//
#define FLASH_EEPROM_EMULATION
//#define SDCARD_EEPROM_EMULATION
//
// Servos
//

6
Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
View File

@ -31,6 +31,12 @@
#define BOARD_INFO_NAME "Cohesion3D ReMix"
//
// EEPROM
//
#define FLASH_EEPROM_EMULATION
//#define SDCARD_EEPROM_EMULATION
//
// Servos
//

8
Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
View File

@ -31,8 +31,14 @@
#define BOARD_INFO_NAME "MKS SGen"
#define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SGEN"
#define MKS_HAS_LPC1769
//
// EEPROM
//
#define FLASH_EEPROM_EMULATION
//#define SDCARD_EEPROM_EMULATION
#define MKS_HAS_LPC1769
#include "../lpc1768/pins_MKS_SBASE.h"
#undef E1_STEP_PIN

6
Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
View File

@ -32,6 +32,12 @@
#define BOARD_INFO_NAME "Smoothieboard"
#define BOARD_WEBSITE_URL "smoothieware.org/smoothieboard"
//
// EEPROM
//
#define FLASH_EEPROM_EMULATION
//#define SDCARD_EEPROM_EMULATION
//
// Servos
//

6
Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
View File

@ -32,6 +32,12 @@
#define BOARD_INFO_NAME "TH3D EZBoard"
#define BOARD_WEBSITE_URL "th3dstudio.com"
//
// EEPROM
//
#define FLASH_EEPROM_EMULATION
//#define SDCARD_EEPROM_EMULATION
//
// Servos
//

Write Preview
Loading…
Cancel
Save