josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish default_conf.

This commit is contained in:
Marek Bel 2018-09-23 23:36:01 +02:00
parent d9e2dcc736
commit 991db0e71d
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Firmware/ConfigurationStore.cpp
View File

@ -274,7 +274,7 @@ typedef struct
float retract_recover_length; float retract_recover_length;
float retract_recover_feedrate; float retract_recover_feedrate;
bool volumetric_enabled; bool volumetric_enabled;
float filament_size; float filament_size[1];
float max_feedrate_silent[4]; float max_feedrate_silent[4];
unsigned long max_acceleration_units_per_sq_second_silent[4]; unsigned long max_acceleration_units_per_sq_second_silent[4];
} __attribute__ ((packed)) M500_conf; } __attribute__ ((packed)) M500_conf;
@ -288,8 +288,8 @@ static const M500_conf default_conf PROGMEM =
DEFAULT_ACCELERATION, DEFAULT_ACCELERATION,
DEFAULT_RETRACT_ACCELERATION, DEFAULT_RETRACT_ACCELERATION,
DEFAULT_MINIMUMFEEDRATE, DEFAULT_MINIMUMFEEDRATE,
DEFAULT_MINSEGMENTTIME,
DEFAULT_MINTRAVELFEEDRATE, DEFAULT_MINTRAVELFEEDRATE,
DEFAULT_MINSEGMENTTIME,
{DEFAULT_XJERK, DEFAULT_YJERK, DEFAULT_ZJERK, DEFAULT_EJERK}, {DEFAULT_XJERK, DEFAULT_YJERK, DEFAULT_ZJERK, DEFAULT_EJERK},
{0,0,0}, {0,0,0},
-(Z_PROBE_OFFSET_FROM_EXTRUDER), -(Z_PROBE_OFFSET_FROM_EXTRUDER),
@ -303,8 +303,13 @@ static const M500_conf default_conf PROGMEM =
false, false,
RETRACT_LENGTH, RETRACT_LENGTH,
RETRACT_FEEDRATE, RETRACT_FEEDRATE,
RETRACT_ZLIFT,
RETRACT_RECOVER_LENGTH,
RETRACT_RECOVER_FEEDRATE,
false,
{DEFAULT_NOMINAL_FILAMENT_DIA},
DEFAULT_MAX_FEEDRATE_SILENT,
DEFAULT_MAX_ACCELERATION_SILENT,
}; };
static_assert (sizeof(M500_conf) == 188, "sizeof(M500_conf) has changed, ensure that version has been incremented, " static_assert (sizeof(M500_conf) == 188, "sizeof(M500_conf) has changed, ensure that version has been incremented, "