|
@@ -3548,7 +3548,6 @@ inline void gcode_M200() {
|
3548
|
3548
|
}
|
3549
|
3549
|
}
|
3550
|
3550
|
|
3551
|
|
- float area = .0;
|
3552
|
3551
|
if (code_seen('D')) {
|
3553
|
3552
|
float diameter = code_value();
|
3554
|
3553
|
// setting any extruder filament size disables volumetric on the assumption that
|
|
@@ -4286,7 +4285,7 @@ inline void gcode_M502() {
|
4286
|
4285
|
* M503: print settings currently in memory
|
4287
|
4286
|
*/
|
4288
|
4287
|
inline void gcode_M503() {
|
4289
|
|
- Config_PrintSettings(code_seen('S') && code_value == 0);
|
|
4288
|
+ Config_PrintSettings(code_seen('S') && code_value() == 0);
|
4290
|
4289
|
}
|
4291
|
4290
|
|
4292
|
4291
|
#ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
|
|
@@ -4583,9 +4582,14 @@ inline void gcode_T() {
|
4583
|
4582
|
SERIAL_ECHOLN(MSG_INVALID_EXTRUDER);
|
4584
|
4583
|
}
|
4585
|
4584
|
else {
|
4586
|
|
- boolean make_move = false;
|
|
4585
|
+ #if EXTRUDERS > 1
|
|
4586
|
+ bool make_move = false;
|
|
4587
|
+ #endif
|
|
4588
|
+
|
4587
|
4589
|
if (code_seen('F')) {
|
4588
|
|
- make_move = true;
|
|
4590
|
+ #if EXTRUDERS > 1
|
|
4591
|
+ make_move = true;
|
|
4592
|
+ #endif
|
4589
|
4593
|
next_feedrate = code_value();
|
4590
|
4594
|
if (next_feedrate > 0.0) feedrate = next_feedrate;
|
4591
|
4595
|
}
|
|
@@ -5182,20 +5186,22 @@ void ClearToSend()
|
5182
|
5186
|
SERIAL_PROTOCOLLNPGM(MSG_OK);
|
5183
|
5187
|
}
|
5184
|
5188
|
|
5185
|
|
-void get_coordinates()
|
5186
|
|
-{
|
5187
|
|
- bool seen[4]={false,false,false,false};
|
5188
|
|
- for(int8_t i=0; i < NUM_AXIS; i++) {
|
5189
|
|
- if(code_seen(axis_codes[i]))
|
5190
|
|
- {
|
5191
|
|
- destination[i] = (float)code_value() + (axis_relative_modes[i] || relative_mode)*current_position[i];
|
5192
|
|
- seen[i]=true;
|
|
5189
|
+void get_coordinates() {
|
|
5190
|
+ for (int i = 0; i < NUM_AXIS; i++) {
|
|
5191
|
+ float dest;
|
|
5192
|
+ if (code_seen(axis_codes[i])) {
|
|
5193
|
+ dest = code_value();
|
|
5194
|
+ if (axis_relative_modes[i] || relative_mode)
|
|
5195
|
+ dest += current_position[i];
|
5193
|
5196
|
}
|
5194
|
|
- else destination[i] = current_position[i]; //Are these else lines really needed?
|
|
5197
|
+ else
|
|
5198
|
+ dest = current_position[i];
|
|
5199
|
+
|
|
5200
|
+ destination[i] = dest;
|
5195
|
5201
|
}
|
5196
|
|
- if(code_seen('F')) {
|
|
5202
|
+ if (code_seen('F')) {
|
5197
|
5203
|
next_feedrate = code_value();
|
5198
|
|
- if(next_feedrate > 0.0) feedrate = next_feedrate;
|
|
5204
|
+ if (next_feedrate > 0.0) feedrate = next_feedrate;
|
5199
|
5205
|
}
|
5200
|
5206
|
}
|
5201
|
5207
|
|