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

Merge pull request #5212 from thinkyhead/rc_mixing_faster

Browse Source 
Store mix factors as reciprocals and multiply
This commit is contained in:
Scott Lahteine 2016-11-12 18:47:11 -06:00 committed by GitHub
commit 665b7f3893
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Marlin/Marlin_main.cpp
View File

@ -593,7 +593,7 @@ float cartes[XYZ] = { 0 };
#endif #endif
#if ENABLED(MIXING_EXTRUDER) #if ENABLED(MIXING_EXTRUDER)
float mixing_factor[MIXING_STEPPERS]; float mixing_factor[MIXING_STEPPERS]; // Reciprocal of mix proportion. 0.0 = off, otherwise >= 1.0.
#if MIXING_VIRTUAL_TOOLS > 1 #if MIXING_VIRTUAL_TOOLS > 1
float mixing_virtual_tool_mix[MIXING_VIRTUAL_TOOLS][MIXING_STEPPERS]; float mixing_virtual_tool_mix[MIXING_VIRTUAL_TOOLS][MIXING_STEPPERS];
#endif #endif
@ -2662,17 +2662,11 @@ static void homeaxis(AxisEnum axis) {
void normalize_mix() { void normalize_mix() {
float mix_total = 0.0; float mix_total = 0.0;
for (int i = 0; i < MIXING_STEPPERS; i++) { for (int i = 0; i < MIXING_STEPPERS; i++) mix_total += RECIPROCAL(mixing_factor[i]);
float v = mixing_factor[i];
if (v < 0) v = mixing_factor[i] = 0;
mix_total += v;
}
// Scale all values if they don't add up to ~1.0 // Scale all values if they don't add up to ~1.0
if (mix_total < 0.9999 || mix_total > 1.0001) { if (!NEAR(mix_total, 1.0)) {
SERIAL_PROTOCOLLNPGM("Warning: Mix factors must add up to 1.0. Scaling."); SERIAL_PROTOCOLLNPGM("Warning: Mix factors must add up to 1.0. Scaling.");
float mix_scale = 1.0 / mix_total; for (int i = 0; i < MIXING_STEPPERS; i++) mixing_factor[i] *= mix_total;
for (int i = 0; i < MIXING_STEPPERS; i++)
mixing_factor[i] *= mix_scale;
} }
} }
@ -2682,9 +2676,11 @@ static void homeaxis(AxisEnum axis) {
// The total "must" be 1.0 (but it will be normalized) // The total "must" be 1.0 (but it will be normalized)
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++) for (int i = 0; i < MIXING_STEPPERS; i++) {
mixing_factor[i] = code_seen(mixing_codes[i]) ? code_value_float() : 0; float v = code_seen(mixing_codes[i]) ? code_value_float() : 0.0;
NOLESS(v, 0.0);
mixing_factor[i] = RECIPROCAL(v);
}
normalize_mix(); normalize_mix();
} }
#endif #endif
@ -7240,8 +7236,11 @@ inline void gcode_M907() {
*/ */
inline void gcode_M163() { inline void gcode_M163() {
int mix_index = code_seen('S') ? code_value_int() : 0; int mix_index = code_seen('S') ? code_value_int() : 0;
if (mix_index < MIXING_STEPPERS) {
float mix_value = code_seen('P') ? code_value_float() : 0.0; float mix_value = code_seen('P') ? code_value_float() : 0.0;
if (mix_index < MIXING_STEPPERS) mixing_factor[mix_index] = mix_value; NOLESS(mix_value, 0.0);
mixing_factor[mix_index] = RECIPROCAL(mix_value);
}
} }
#if MIXING_VIRTUAL_TOOLS > 1 #if MIXING_VIRTUAL_TOOLS > 1
@ -9991,7 +9990,7 @@ void setup() {
#if ENABLED(MIXING_EXTRUDER) && MIXING_VIRTUAL_TOOLS > 1 #if ENABLED(MIXING_EXTRUDER) && MIXING_VIRTUAL_TOOLS > 1
// Initialize mixing to 100% color 1 // Initialize mixing to 100% color 1
for (uint8_t i = 0; i < MIXING_STEPPERS; i++) for (uint8_t i = 0; i < MIXING_STEPPERS; i++)
mixing_factor[i] = (i == 0) ? 1 : 0; mixing_factor[i] = (i == 0) ? 1.0 : 0.0;
for (uint8_t t = 0; t < MIXING_VIRTUAL_TOOLS; t++) for (uint8_t t = 0; t < MIXING_VIRTUAL_TOOLS; t++)
for (uint8_t i = 0; i < MIXING_STEPPERS; i++) for (uint8_t i = 0; i < MIXING_STEPPERS; i++)
mixing_virtual_tool_mix[t][i] = mixing_factor[i]; mixing_virtual_tool_mix[t][i] = mixing_factor[i];

2
Marlin/macros.h
View File

@ -133,4 +133,6 @@
#define NEAR_ZERO(x) ((x) > -0.000001 && (x) < 0.000001) #define NEAR_ZERO(x) ((x) > -0.000001 && (x) < 0.000001)
#define NEAR(x,y) NEAR_ZERO((x)-(y)) #define NEAR(x,y) NEAR_ZERO((x)-(y))
#define RECIPROCAL(x) (NEAR_ZERO(x) ? 0.0 : 1.0 / (x))
#endif //__MACROS_H #endif //__MACROS_H

2
Marlin/planner.cpp
View File

@ -750,7 +750,7 @@ void Planner::_buffer_line(const float &a, const float &b, const float &c, const
// For a mixing extruder, get a magnified step_event_count for each // For a mixing extruder, get a magnified step_event_count for each
#if ENABLED(MIXING_EXTRUDER) #if ENABLED(MIXING_EXTRUDER)
for (uint8_t i = 0; i < MIXING_STEPPERS; i++) for (uint8_t i = 0; i < MIXING_STEPPERS; i++)
block->mix_event_count[i] = UNEAR_ZERO(mixing_factor[i]) ? 0 : block->step_event_count / mixing_factor[i]; block->mix_event_count[i] = mixing_factor[i] * block->step_event_count;
#endif #endif
#if FAN_COUNT > 0 #if FAN_COUNT > 0