浏览代码

Ensure language.h include order

See #17604
Scott Lahteine 5 年前
父节点
当前提交
000ec9fc13

+ 2
- 2
Marlin/Configuration_adv.h 查看文件

936
 
936
 
937
   // Actual motor currents in Amps. The number of entries must match DIGIPOT_I2C_NUM_CHANNELS.
937
   // Actual motor currents in Amps. The number of entries must match DIGIPOT_I2C_NUM_CHANNELS.
938
   // These correspond to the physical drivers, so be mindful if the order is changed.
938
   // These correspond to the physical drivers, so be mindful if the order is changed.
939
-  #define DIGIPOT_I2C_MOTOR_CURRENTS { 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 }  //  AZTEEG_X3_PRO
939
+  #define DIGIPOT_I2C_MOTOR_CURRENTS { 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 } // AZTEEG_X3_PRO
940
 
940
 
941
   //#define DIGIPOT_USE_RAW_VALUES    // Use DIGIPOT_MOTOR_CURRENT raw wiper values (instead of A4988 motor currents)
941
   //#define DIGIPOT_USE_RAW_VALUES    // Use DIGIPOT_MOTOR_CURRENT raw wiper values (instead of A4988 motor currents)
942
 
942
 
2358
    * phase position. Trinamic drivers use a stepper phase table with 1024 values
2358
    * phase position. Trinamic drivers use a stepper phase table with 1024 values
2359
    * spanning 4 full steps with 256 positions each (ergo, 1024 positions).
2359
    * spanning 4 full steps with 256 positions each (ergo, 1024 positions).
2360
    * Full step positions (128, 384, 640, 896) have the highest holding torque.
2360
    * Full step positions (128, 384, 640, 896) have the highest holding torque.
2361
-   *  
2361
+   *
2362
    * Values from 0..1023, -1 to disable homing phase for that axis.
2362
    * Values from 0..1023, -1 to disable homing phase for that axis.
2363
    */
2363
    */
2364
    //#define TMC_HOME_PHASE { 896, 896, 896 }
2364
    //#define TMC_HOME_PHASE { 896, 896, 896 }

+ 3
- 5
Marlin/src/core/language.h 查看文件

81
 #ifdef CUSTOM_MACHINE_NAME
81
 #ifdef CUSTOM_MACHINE_NAME
82
   #undef  MACHINE_NAME
82
   #undef  MACHINE_NAME
83
   #define MACHINE_NAME CUSTOM_MACHINE_NAME
83
   #define MACHINE_NAME CUSTOM_MACHINE_NAME
84
-#else
85
-  #ifdef DEFAULT_MACHINE_NAME
86
-    #undef  MACHINE_NAME
87
-    #define MACHINE_NAME DEFAULT_MACHINE_NAME
88
-  #endif
84
+#elif defined(DEFAULT_MACHINE_NAME)
85
+  #undef  MACHINE_NAME
86
+  #define MACHINE_NAME DEFAULT_MACHINE_NAME
89
 #endif
87
 #endif
90
 
88
 
91
 #ifndef MACHINE_UUID
89
 #ifndef MACHINE_UUID

+ 1
- 1
Marlin/src/core/serial.cpp 查看文件

21
  */
21
  */
22
 
22
 
23
 #include "serial.h"
23
 #include "serial.h"
24
-#include "language.h"
24
+#include "../inc/MarlinConfig.h"
25
 
25
 
26
 uint8_t marlin_debug_flags = MARLIN_DEBUG_NONE;
26
 uint8_t marlin_debug_flags = MARLIN_DEBUG_NONE;
27
 
27
 

+ 0
- 1
Marlin/src/feature/pause.cpp 查看文件

53
   #include "../lcd/extui/ui_api.h"
53
   #include "../lcd/extui/ui_api.h"
54
 #endif
54
 #endif
55
 
55
 
56
-#include "../core/language.h"
57
 #include "../lcd/ultralcd.h"
56
 #include "../lcd/ultralcd.h"
58
 
57
 
59
 #if HAS_BUZZER
58
 #if HAS_BUZZER

+ 0
- 1
Marlin/src/gcode/feature/pause/G60.cpp 查看文件

24
 
24
 
25
 #if SAVED_POSITIONS
25
 #if SAVED_POSITIONS
26
 
26
 
27
-#include "../../../core/language.h"
28
 #include "../../gcode.h"
27
 #include "../../gcode.h"
29
 #include "../../../module/motion.h"
28
 #include "../../../module/motion.h"
30
 
29
 

+ 0
- 1
Marlin/src/gcode/feature/pause/G61.cpp 查看文件

24
 
24
 
25
 #if SAVED_POSITIONS
25
 #if SAVED_POSITIONS
26
 
26
 
27
-#include "../../../core/language.h"
28
 #include "../../../module/planner.h"
27
 #include "../../../module/planner.h"
29
 #include "../../gcode.h"
28
 #include "../../gcode.h"
30
 #include "../../../module/motion.h"
29
 #include "../../../module/motion.h"

+ 1
- 1
Marlin/src/lcd/lcdprint.cpp 查看文件

28
 
28
 
29
 #if HAS_SPI_LCD
29
 #if HAS_SPI_LCD
30
 
30
 
31
+#include "../inc/MarlinConfig.h"
31
 #include "lcdprint.h"
32
 #include "lcdprint.h"
32
-#include "../core/language.h"
33
 
33
 
34
 /**
34
 /**
35
  * lcd_put_u8str_ind_P
35
  * lcd_put_u8str_ind_P

+ 0
- 1
Marlin/src/module/configuration_store.cpp 查看文件

51
 #include "stepper.h"
51
 #include "stepper.h"
52
 #include "temperature.h"
52
 #include "temperature.h"
53
 #include "../lcd/ultralcd.h"
53
 #include "../lcd/ultralcd.h"
54
-#include "../core/language.h"
55
 #include "../libs/vector_3.h"   // for matrix_3x3
54
 #include "../libs/vector_3.h"   // for matrix_3x3
56
 #include "../gcode/gcode.h"
55
 #include "../gcode/gcode.h"
57
 #include "../MarlinCore.h"
56
 #include "../MarlinCore.h"

+ 0
- 1
Marlin/src/module/planner.cpp 查看文件

67
 #include "motion.h"
67
 #include "motion.h"
68
 #include "temperature.h"
68
 #include "temperature.h"
69
 #include "../lcd/ultralcd.h"
69
 #include "../lcd/ultralcd.h"
70
-#include "../core/language.h"
71
 #include "../gcode/parser.h"
70
 #include "../gcode/parser.h"
72
 
71
 
73
 #include "../MarlinCore.h"
72
 #include "../MarlinCore.h"

+ 0
- 1
Marlin/src/module/planner_bezier.cpp 查看文件

36
 #include "temperature.h"
36
 #include "temperature.h"
37
 
37
 
38
 #include "../MarlinCore.h"
38
 #include "../MarlinCore.h"
39
-#include "../core/language.h"
40
 #include "../gcode/queue.h"
39
 #include "../gcode/queue.h"
41
 
40
 
42
 // See the meaning in the documentation of cubic_b_spline().
41
 // See the meaning in the documentation of cubic_b_spline().

+ 0
- 1
Marlin/src/module/stepper.cpp 查看文件

97
 
97
 
98
 #include "temperature.h"
98
 #include "temperature.h"
99
 #include "../lcd/ultralcd.h"
99
 #include "../lcd/ultralcd.h"
100
-#include "../core/language.h"
101
 #include "../gcode/queue.h"
100
 #include "../gcode/queue.h"
102
 #include "../sd/cardreader.h"
101
 #include "../sd/cardreader.h"
103
 #include "../MarlinCore.h"
102
 #include "../MarlinCore.h"

+ 0
- 1
Marlin/src/module/temperature.cpp 查看文件

30
 #include "../MarlinCore.h"
30
 #include "../MarlinCore.h"
31
 #include "../lcd/ultralcd.h"
31
 #include "../lcd/ultralcd.h"
32
 #include "planner.h"
32
 #include "planner.h"
33
-#include "../core/language.h"
34
 #include "../HAL/shared/Delay.h"
33
 #include "../HAL/shared/Delay.h"
35
 #if ENABLED(EXTENSIBLE_UI)
34
 #if ENABLED(EXTENSIBLE_UI)
36
   #include "../lcd/extui/ui_api.h"
35
   #include "../lcd/extui/ui_api.h"

+ 0
- 1
Marlin/src/sd/cardreader.cpp 查看文件

30
 #include "../lcd/ultralcd.h"
30
 #include "../lcd/ultralcd.h"
31
 #include "../module/planner.h"        // for synchronize
31
 #include "../module/planner.h"        // for synchronize
32
 #include "../module/printcounter.h"
32
 #include "../module/printcounter.h"
33
-#include "../core/language.h"
34
 #include "../gcode/queue.h"
33
 #include "../gcode/queue.h"
35
 #include "../module/configuration_store.h"
34
 #include "../module/configuration_store.h"
36
 
35
 

正在加载...
取消
保存