Browse Source

configuration_store => settings

vanilla_fb_2.0.x
Scott Lahteine 4 years ago
committed by Scott Lahteine
parent
commit
3dc0f9c0b4
  1. 2
      Marlin/src/MarlinCore.cpp
  2. 2
      Marlin/src/feature/bedlevel/ubl/ubl.cpp
  3. 2
      Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
  4. 2
      Marlin/src/gcode/bedlevel/M420.cpp
  5. 2
      Marlin/src/gcode/eeprom/M500-M504.cpp
  6. 2
      Marlin/src/lcd/dwin/dwin.cpp
  7. 2
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
  8. 2
      Marlin/src/lcd/menu/menu_advanced.cpp
  9. 2
      Marlin/src/lcd/menu/menu_ubl.cpp
  10. 2
      Marlin/src/lcd/ultralcd.cpp
  11. 2
      Marlin/src/module/settings.cpp
  12. 0
      Marlin/src/module/settings.h
  13. 2
      Marlin/src/sd/cardreader.cpp

2
Marlin/src/MarlinCore.cpp

@ -43,7 +43,7 @@
#include "module/planner.h" #include "module/planner.h"
#include "module/endstops.h" #include "module/endstops.h"
#include "module/temperature.h" #include "module/temperature.h"
#include "module/configuration_store.h" #include "module/settings.h"
#include "module/printcounter.h" // PrintCounter or Stopwatch #include "module/printcounter.h" // PrintCounter or Stopwatch
#include "module/stepper.h" #include "module/stepper.h"

2
Marlin/src/feature/bedlevel/ubl/ubl.cpp

@ -31,7 +31,7 @@
#include "../../../MarlinCore.h" #include "../../../MarlinCore.h"
#include "../../../gcode/gcode.h" #include "../../../gcode/gcode.h"
#include "../../../module/configuration_store.h" #include "../../../module/settings.h"
#include "../../../module/planner.h" #include "../../../module/planner.h"
#include "../../../module/motion.h" #include "../../../module/motion.h"
#include "../../../module/probe.h" #include "../../../module/probe.h"

2
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp

@ -29,7 +29,7 @@
#include "../../../MarlinCore.h" #include "../../../MarlinCore.h"
#include "../../../HAL/shared/eeprom_api.h" #include "../../../HAL/shared/eeprom_api.h"
#include "../../../libs/hex_print.h" #include "../../../libs/hex_print.h"
#include "../../../module/configuration_store.h" #include "../../../module/settings.h"
#include "../../../lcd/ultralcd.h" #include "../../../lcd/ultralcd.h"
#include "../../../module/stepper.h" #include "../../../module/stepper.h"
#include "../../../module/planner.h" #include "../../../module/planner.h"

2
Marlin/src/gcode/bedlevel/M420.cpp

@ -30,7 +30,7 @@
#include "../../module/probe.h" #include "../../module/probe.h"
#if ENABLED(EEPROM_SETTINGS) #if ENABLED(EEPROM_SETTINGS)
#include "../../module/configuration_store.h" #include "../../module/settings.h"
#endif #endif
#if ENABLED(EXTENSIBLE_UI) #if ENABLED(EXTENSIBLE_UI)

2
Marlin/src/gcode/eeprom/M500-M504.cpp

@ -21,7 +21,7 @@
*/ */
#include "../gcode.h" #include "../gcode.h"
#include "../../module/configuration_store.h" #include "../../module/settings.h"
#include "../../core/serial.h" #include "../../core/serial.h"
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"

2
Marlin/src/lcd/dwin/dwin.cpp

@ -47,7 +47,7 @@
#include "../../feature/powerloss.h" #include "../../feature/powerloss.h"
#include "../../feature/babystep.h" #include "../../feature/babystep.h"
#include "../../module/configuration_store.h" #include "../../module/settings.h"
#include "../../module/temperature.h" #include "../../module/temperature.h"
#include "../../module/printcounter.h" #include "../../module/printcounter.h"
#include "../../module/motion.h" #include "../../module/motion.h"

2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp

@ -29,7 +29,7 @@
#include "../archim2-flash/flash_storage.h" #include "../archim2-flash/flash_storage.h"
#include "../../../../../module/configuration_store.h" #include "../../../../../module/settings.h"
#if ENABLED(LULZBOT_PRINTCOUNTER) #if ENABLED(LULZBOT_PRINTCOUNTER)
#include "../../../../../module/printcounter.h" #include "../../../../../module/printcounter.h"

2
Marlin/src/lcd/menu/menu_advanced.cpp

@ -48,7 +48,7 @@
#endif #endif
#if ENABLED(SD_FIRMWARE_UPDATE) #if ENABLED(SD_FIRMWARE_UPDATE)
#include "../../module/configuration_store.h" #include "../../module/settings.h"
#endif #endif
void menu_tmc(); void menu_tmc();

2
Marlin/src/lcd/menu/menu_ubl.cpp

@ -33,7 +33,7 @@
#include "../../gcode/queue.h" #include "../../gcode/queue.h"
#include "../../module/motion.h" #include "../../module/motion.h"
#include "../../module/planner.h" #include "../../module/planner.h"
#include "../../module/configuration_store.h" #include "../../module/settings.h"
#include "../../feature/bedlevel/bedlevel.h" #include "../../feature/bedlevel/bedlevel.h"
static int16_t ubl_storage_slot = 0, static int16_t ubl_storage_slot = 0,

2
Marlin/src/lcd/ultralcd.cpp

@ -123,7 +123,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
#include "lcdprint.h" #include "lcdprint.h"
#include "../sd/cardreader.h" #include "../sd/cardreader.h"
#include "../module/configuration_store.h" #include "../module/settings.h"
#include "../module/temperature.h" #include "../module/temperature.h"
#include "../module/planner.h" #include "../module/planner.h"
#include "../module/motion.h" #include "../module/motion.h"

2
Marlin/src/module/configuration_store.cpp → Marlin/src/module/settings.cpp

@ -44,7 +44,7 @@
// Can be disabled for production build. // Can be disabled for production build.
//#define DEBUG_EEPROM_READWRITE //#define DEBUG_EEPROM_READWRITE
#include "configuration_store.h" #include "settings.h"
#include "endstops.h" #include "endstops.h"
#include "planner.h" #include "planner.h"

0
Marlin/src/module/configuration_store.h → Marlin/src/module/settings.h

2
Marlin/src/sd/cardreader.cpp

@ -36,7 +36,7 @@
#include "../module/planner.h" // for synchronize #include "../module/planner.h" // for synchronize
#include "../module/printcounter.h" #include "../module/printcounter.h"
#include "../gcode/queue.h" #include "../gcode/queue.h"
#include "../module/configuration_store.h" #include "../module/settings.h"
#include "../module/stepper/indirection.h" #include "../module/stepper/indirection.h"
#if ENABLED(EMERGENCY_PARSER) #if ENABLED(EMERGENCY_PARSER)

Loading…
Cancel
Save