Merge branch 'master' into wipe_tower_improvements

This commit is contained in:
Lukas Matena 2018-05-15 11:22:58 +02:00
commit 1f62978251
121 changed files with 10404 additions and 3204 deletions

View file

@ -111,7 +111,8 @@ PrintConfigDef::PrintConfigDef()
"with cooling (use a fan) before tweaking this.");
def->cli = "bridge-flow-ratio=f";
def->min = 0;
def->default_value = new ConfigOptionFloat(1);
def->max = 2;
def->default_value = new ConfigOptionFloat(1);
def = this->add("bridge_speed", coFloat);
def->label = L("Bridges");
@ -1713,7 +1714,7 @@ PrintConfigDef::PrintConfigDef()
"temperature control commands in the output.");
def->cli = "temperature=i@";
def->full_label = L("Temperature");
def->max = 0;
def->min = 0;
def->max = max_temp;
def->default_value = new ConfigOptionInts { 200 };