소스 검색

Declare extruder_duplication_enabled in Marlin.h

Scott Lahteine 8 년 전
부모
커밋
516e79bbda
3개의 변경된 파일4개의 추가작업 그리고 5개의 파일을 삭제
  1. 4
    0
      Marlin/Marlin.h
  2. 0
    4
      Marlin/planner.h
  3. 0
    1
      Marlin/stepper_indirection.h

+ 4
- 0
Marlin/Marlin.h 파일 보기

129
 
129
 
130
 void manage_inactivity(bool ignore_stepper_queue = false);
130
 void manage_inactivity(bool ignore_stepper_queue = false);
131
 
131
 
132
+#if ENABLED(DUAL_X_CARRIAGE)
133
+  extern bool extruder_duplication_enabled;
134
+#endif
135
+
132
 #if ENABLED(DUAL_X_CARRIAGE) && HAS_X_ENABLE && HAS_X2_ENABLE
136
 #if ENABLED(DUAL_X_CARRIAGE) && HAS_X_ENABLE && HAS_X2_ENABLE
133
   #define  enable_x() do { X_ENABLE_WRITE( X_ENABLE_ON); X2_ENABLE_WRITE( X_ENABLE_ON); } while (0)
137
   #define  enable_x() do { X_ENABLE_WRITE( X_ENABLE_ON); X2_ENABLE_WRITE( X_ENABLE_ON); } while (0)
134
   #define disable_x() do { X_ENABLE_WRITE(!X_ENABLE_ON); X2_ENABLE_WRITE(!X_ENABLE_ON); axis_known_position[X_AXIS] = false; } while (0)
138
   #define disable_x() do { X_ENABLE_WRITE(!X_ENABLE_ON); X2_ENABLE_WRITE(!X_ENABLE_ON); axis_known_position[X_AXIS] = false; } while (0)

+ 0
- 4
Marlin/planner.h 파일 보기

165
       static long axis_segment_time[2][3] = { {MAX_FREQ_TIME + 1, 0, 0}, {MAX_FREQ_TIME + 1, 0, 0} };
165
       static long axis_segment_time[2][3] = { {MAX_FREQ_TIME + 1, 0, 0}, {MAX_FREQ_TIME + 1, 0, 0} };
166
     #endif
166
     #endif
167
 
167
 
168
-    #if ENABLED(DUAL_X_CARRIAGE)
169
-      extern bool extruder_duplication_enabled;
170
-    #endif
171
-
172
   public:
168
   public:
173
 
169
 
174
     Planner();
170
     Planner();

+ 0
- 1
Marlin/stepper_indirection.h 파일 보기

193
     #define NORM_E_DIR() _NORM_E_DIR()
193
     #define NORM_E_DIR() _NORM_E_DIR()
194
     #define REV_E_DIR() _REV_E_DIR()
194
     #define REV_E_DIR() _REV_E_DIR()
195
   #else
195
   #else
196
-    extern bool extruder_duplication_enabled;
197
     #define E_STEP_WRITE(v) {if(extruder_duplication_enabled){E0_STEP_WRITE(v);E1_STEP_WRITE(v);}else _E_STEP_WRITE(v);}
196
     #define E_STEP_WRITE(v) {if(extruder_duplication_enabled){E0_STEP_WRITE(v);E1_STEP_WRITE(v);}else _E_STEP_WRITE(v);}
198
     #define NORM_E_DIR() {if(extruder_duplication_enabled){E0_DIR_WRITE(!INVERT_E0_DIR);E1_DIR_WRITE(!INVERT_E1_DIR);}else _NORM_E_DIR();}
197
     #define NORM_E_DIR() {if(extruder_duplication_enabled){E0_DIR_WRITE(!INVERT_E0_DIR);E1_DIR_WRITE(!INVERT_E1_DIR);}else _NORM_E_DIR();}
199
     #define REV_E_DIR() {if(extruder_duplication_enabled){E0_DIR_WRITE(INVERT_E0_DIR);E1_DIR_WRITE(INVERT_E1_DIR);}else _REV_E_DIR();}
198
     #define REV_E_DIR() {if(extruder_duplication_enabled){E0_DIR_WRITE(INVERT_E0_DIR);E1_DIR_WRITE(INVERT_E1_DIR);}else _REV_E_DIR();}

Loading…
취소
저장