Просмотр исходного кода

configuration_store => settings

Scott Lahteine 4 лет назад
Родитель
Сommit
18adfe87bc

+ 1
- 1
Marlin/src/MarlinCore.cpp Просмотреть файл

43
 #include "module/planner.h"
43
 #include "module/planner.h"
44
 #include "module/endstops.h"
44
 #include "module/endstops.h"
45
 #include "module/temperature.h"
45
 #include "module/temperature.h"
46
-#include "module/configuration_store.h"
46
+#include "module/settings.h"
47
 #include "module/printcounter.h" // PrintCounter or Stopwatch
47
 #include "module/printcounter.h" // PrintCounter or Stopwatch
48
 
48
 
49
 #include "module/stepper.h"
49
 #include "module/stepper.h"

+ 1
- 1
Marlin/src/feature/bedlevel/ubl/ubl.cpp Просмотреть файл

31
   #include "../../../MarlinCore.h"
31
   #include "../../../MarlinCore.h"
32
   #include "../../../gcode/gcode.h"
32
   #include "../../../gcode/gcode.h"
33
 
33
 
34
-  #include "../../../module/configuration_store.h"
34
+  #include "../../../module/settings.h"
35
   #include "../../../module/planner.h"
35
   #include "../../../module/planner.h"
36
   #include "../../../module/motion.h"
36
   #include "../../../module/motion.h"
37
   #include "../../../module/probe.h"
37
   #include "../../../module/probe.h"

+ 1
- 1
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp Просмотреть файл

29
   #include "../../../MarlinCore.h"
29
   #include "../../../MarlinCore.h"
30
   #include "../../../HAL/shared/eeprom_api.h"
30
   #include "../../../HAL/shared/eeprom_api.h"
31
   #include "../../../libs/hex_print.h"
31
   #include "../../../libs/hex_print.h"
32
-  #include "../../../module/configuration_store.h"
32
+  #include "../../../module/settings.h"
33
   #include "../../../lcd/ultralcd.h"
33
   #include "../../../lcd/ultralcd.h"
34
   #include "../../../module/stepper.h"
34
   #include "../../../module/stepper.h"
35
   #include "../../../module/planner.h"
35
   #include "../../../module/planner.h"

+ 1
- 1
Marlin/src/gcode/bedlevel/M420.cpp Просмотреть файл

30
 #include "../../module/probe.h"
30
 #include "../../module/probe.h"
31
 
31
 
32
 #if ENABLED(EEPROM_SETTINGS)
32
 #if ENABLED(EEPROM_SETTINGS)
33
-  #include "../../module/configuration_store.h"
33
+  #include "../../module/settings.h"
34
 #endif
34
 #endif
35
 
35
 
36
 #if ENABLED(EXTENSIBLE_UI)
36
 #if ENABLED(EXTENSIBLE_UI)

+ 1
- 1
Marlin/src/gcode/eeprom/M500-M504.cpp Просмотреть файл

21
  */
21
  */
22
 
22
 
23
 #include "../gcode.h"
23
 #include "../gcode.h"
24
-#include "../../module/configuration_store.h"
24
+#include "../../module/settings.h"
25
 #include "../../core/serial.h"
25
 #include "../../core/serial.h"
26
 #include "../../inc/MarlinConfig.h"
26
 #include "../../inc/MarlinConfig.h"
27
 
27
 

+ 1
- 1
Marlin/src/lcd/dwin/dwin.cpp Просмотреть файл

47
 #include "../../feature/powerloss.h"
47
 #include "../../feature/powerloss.h"
48
 #include "../../feature/babystep.h"
48
 #include "../../feature/babystep.h"
49
 
49
 
50
-#include "../../module/configuration_store.h"
50
+#include "../../module/settings.h"
51
 #include "../../module/temperature.h"
51
 #include "../../module/temperature.h"
52
 #include "../../module/printcounter.h"
52
 #include "../../module/printcounter.h"
53
 #include "../../module/motion.h"
53
 #include "../../module/motion.h"

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp Просмотреть файл

29
 
29
 
30
 #include "../archim2-flash/flash_storage.h"
30
 #include "../archim2-flash/flash_storage.h"
31
 
31
 
32
-#include "../../../../../module/configuration_store.h"
32
+#include "../../../../../module/settings.h"
33
 
33
 
34
 #if ENABLED(LULZBOT_PRINTCOUNTER)
34
 #if ENABLED(LULZBOT_PRINTCOUNTER)
35
   #include "../../../../../module/printcounter.h"
35
   #include "../../../../../module/printcounter.h"

+ 1
- 1
Marlin/src/lcd/menu/menu_advanced.cpp Просмотреть файл

48
 #endif
48
 #endif
49
 
49
 
50
 #if ENABLED(SD_FIRMWARE_UPDATE)
50
 #if ENABLED(SD_FIRMWARE_UPDATE)
51
-  #include "../../module/configuration_store.h"
51
+  #include "../../module/settings.h"
52
 #endif
52
 #endif
53
 
53
 
54
 void menu_tmc();
54
 void menu_tmc();

+ 1
- 1
Marlin/src/lcd/menu/menu_ubl.cpp Просмотреть файл

33
 #include "../../gcode/queue.h"
33
 #include "../../gcode/queue.h"
34
 #include "../../module/motion.h"
34
 #include "../../module/motion.h"
35
 #include "../../module/planner.h"
35
 #include "../../module/planner.h"
36
-#include "../../module/configuration_store.h"
36
+#include "../../module/settings.h"
37
 #include "../../feature/bedlevel/bedlevel.h"
37
 #include "../../feature/bedlevel/bedlevel.h"
38
 
38
 
39
 static int16_t ubl_storage_slot = 0,
39
 static int16_t ubl_storage_slot = 0,

+ 1
- 1
Marlin/src/lcd/ultralcd.cpp Просмотреть файл

123
 #include "lcdprint.h"
123
 #include "lcdprint.h"
124
 
124
 
125
 #include "../sd/cardreader.h"
125
 #include "../sd/cardreader.h"
126
-#include "../module/configuration_store.h"
126
+#include "../module/settings.h"
127
 #include "../module/temperature.h"
127
 #include "../module/temperature.h"
128
 #include "../module/planner.h"
128
 #include "../module/planner.h"
129
 #include "../module/motion.h"
129
 #include "../module/motion.h"

Marlin/src/module/configuration_store.cpp → Marlin/src/module/settings.cpp Просмотреть файл

44
 // Can be disabled for production build.
44
 // Can be disabled for production build.
45
 //#define DEBUG_EEPROM_READWRITE
45
 //#define DEBUG_EEPROM_READWRITE
46
 
46
 
47
-#include "configuration_store.h"
47
+#include "settings.h"
48
 
48
 
49
 #include "endstops.h"
49
 #include "endstops.h"
50
 #include "planner.h"
50
 #include "planner.h"

Marlin/src/module/configuration_store.h → Marlin/src/module/settings.h Просмотреть файл


+ 1
- 1
Marlin/src/sd/cardreader.cpp Просмотреть файл

36
 #include "../module/planner.h"        // for synchronize
36
 #include "../module/planner.h"        // for synchronize
37
 #include "../module/printcounter.h"
37
 #include "../module/printcounter.h"
38
 #include "../gcode/queue.h"
38
 #include "../gcode/queue.h"
39
-#include "../module/configuration_store.h"
39
+#include "../module/settings.h"
40
 #include "../module/stepper/indirection.h"
40
 #include "../module/stepper/indirection.h"
41
 
41
 
42
 #if ENABLED(EMERGENCY_PARSER)
42
 #if ENABLED(EMERGENCY_PARSER)

Загрузка…
Отмена
Сохранить