MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fix DIRECT_MIXING_IN_G1 to preserve the previous mix

Browse Source
This commit is contained in:
Scott Lahteine 2016-11-15 15:50:54 -06:00
parent 665b7f3893
commit 99b0c1fe56
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Marlin/Marlin_main.cpp
View File

@ -2672,17 +2672,27 @@ static void homeaxis(AxisEnum axis) {
#if ENABLED(DIRECT_MIXING_IN_G1) #if ENABLED(DIRECT_MIXING_IN_G1)
// Get mixing parameters from the GCode // Get mixing parameters from the GCode
// Factors that are left out are set to 0
// The total "must" be 1.0 (but it will be normalized) // The total "must" be 1.0 (but it will be normalized)
// If no mix factors are given, the old mix is preserved
void gcode_get_mix() { void gcode_get_mix() {
const char* mixing_codes = "ABCDHI"; const char* mixing_codes = "ABCDHI";
for (int i = 0; i < MIXING_STEPPERS; i++) { byte mix_bits = 0;
float v = code_seen(mixing_codes[i]) ? code_value_float() : 0.0; for (uint8_t i = 0; i < MIXING_STEPPERS; i++) {
if (code_seen(mixing_codes[i])) {
SBI(mix_bits, i);
float v = code_value_float();
NOLESS(v, 0.0); NOLESS(v, 0.0);
mixing_factor[i] = RECIPROCAL(v); mixing_factor[i] = RECIPROCAL(v);
} }
}
// If any mixing factors were included, clear the rest
// If none were included, preserve the last mix
if (mix_bits) {
for (uint8_t i = 0; i < MIXING_STEPPERS; i++)
if (!TEST(mix_bits, i)) mixing_factor[i] = 0.0;
normalize_mix(); normalize_mix();
} }
}
#endif #endif
#endif #endif