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

Reduce code size by trusting the compiler

Browse Source
This commit is contained in:
Scott Lahteine 2016-07-09 16:25:48 -07:00
parent a8538bd7ce
commit 4cd045791c
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Marlin/Marlin_main.cpp
View File

@ -1338,16 +1338,15 @@ bool code_seen(char code) {
*/ */
bool get_target_extruder_from_command(int code) { bool get_target_extruder_from_command(int code) {
if (code_seen('T')) { if (code_seen('T')) {
uint8_t t = code_value_byte(); if (code_value_byte() >= EXTRUDERS) {
if (t >= EXTRUDERS) {
SERIAL_ECHO_START; SERIAL_ECHO_START;
SERIAL_CHAR('M'); SERIAL_CHAR('M');
SERIAL_ECHO(code); SERIAL_ECHO(code);
SERIAL_ECHOPAIR(" " MSG_INVALID_EXTRUDER " ", t); SERIAL_ECHOPAIR(" " MSG_INVALID_EXTRUDER " ", code_value_byte());
SERIAL_EOL; SERIAL_EOL;
return true; return true;
} }
target_extruder = t; target_extruder = code_value_byte();
} }
else else
target_extruder = active_extruder; target_extruder = active_extruder;
@ -2576,10 +2575,8 @@ void gcode_get_destination() {
else else
destination[i] = current_position[i]; destination[i] = current_position[i];
} }
if (code_seen('F')) { if (code_seen('F') && code_value_linear_units() > 0.0)
float next_feedrate = code_value_linear_units(); feedrate = code_value_linear_units();
if (next_feedrate > 0.0) feedrate = next_feedrate;
}
} }
void unknown_command_error() { void unknown_command_error() {
@ -4387,11 +4384,10 @@ inline void gcode_M104() {
#endif #endif
if (code_seen('S')) { if (code_seen('S')) {
float temp = code_value_temp_abs(); thermalManager.setTargetHotend(code_value_temp_abs(), target_extruder);
thermalManager.setTargetHotend(temp, target_extruder);
#if ENABLED(DUAL_X_CARRIAGE) #if ENABLED(DUAL_X_CARRIAGE)
if (dual_x_carriage_mode == DXC_DUPLICATION_MODE && target_extruder == 0) if (dual_x_carriage_mode == DXC_DUPLICATION_MODE && target_extruder == 0)
thermalManager.setTargetHotend(temp == 0.0 ? 0.0 : temp + duplicate_extruder_temp_offset, 1); thermalManager.setTargetHotend(code_value_temp_abs() == 0.0 ? 0.0 : code_value_temp_abs() + duplicate_extruder_temp_offset, 1);
#endif #endif
#if ENABLED(PRINTJOB_TIMER_AUTOSTART) #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
@ -4402,13 +4398,13 @@ inline void gcode_M104() {
* stand by mode, for instance in a dual extruder setup, without affecting * stand by mode, for instance in a dual extruder setup, without affecting
* the running print timer. * the running print timer.
*/ */
if (temp <= (EXTRUDE_MINTEMP)/2) { if (code_value_temp_abs() <= (EXTRUDE_MINTEMP)/2) {
print_job_timer.stop(); print_job_timer.stop();
LCD_MESSAGEPGM(WELCOME_MSG); LCD_MESSAGEPGM(WELCOME_MSG);
} }
#endif #endif
if (temp > thermalManager.degHotend(target_extruder)) LCD_MESSAGEPGM(MSG_HEATING); if (code_value_temp_abs() > thermalManager.degHotend(target_extruder)) LCD_MESSAGEPGM(MSG_HEATING);
} }
} }
@ -4566,11 +4562,10 @@ inline void gcode_M109() {
bool no_wait_for_cooling = code_seen('S'); bool no_wait_for_cooling = code_seen('S');
if (no_wait_for_cooling || code_seen('R')) { if (no_wait_for_cooling || code_seen('R')) {
float temp = code_value_temp_abs(); thermalManager.setTargetHotend(code_value_temp_abs(), target_extruder);
thermalManager.setTargetHotend(temp, target_extruder);
#if ENABLED(DUAL_X_CARRIAGE) #if ENABLED(DUAL_X_CARRIAGE)
if (dual_x_carriage_mode == DXC_DUPLICATION_MODE && target_extruder == 0) if (dual_x_carriage_mode == DXC_DUPLICATION_MODE && target_extruder == 0)
thermalManager.setTargetHotend(temp == 0.0 ? 0.0 : temp + duplicate_extruder_temp_offset, 1); thermalManager.setTargetHotend(code_value_temp_abs() == 0.0 ? 0.0 : code_value_temp_abs() + duplicate_extruder_temp_offset, 1);
#endif #endif
#if ENABLED(PRINTJOB_TIMER_AUTOSTART) #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
@ -4579,7 +4574,7 @@ inline void gcode_M109() {
* stand by mode, for instance in a dual extruder setup, without affecting * stand by mode, for instance in a dual extruder setup, without affecting
* the running print timer. * the running print timer.
*/ */
if (temp <= (EXTRUDE_MINTEMP)/2) { if (code_value_temp_abs() <= (EXTRUDE_MINTEMP)/2) {
print_job_timer.stop(); print_job_timer.stop();
LCD_MESSAGEPGM(WELCOME_MSG); LCD_MESSAGEPGM(WELCOME_MSG);
} }
@ -4693,7 +4688,7 @@ inline void gcode_M109() {
if (no_wait_for_cooling || code_seen('R')) { if (no_wait_for_cooling || code_seen('R')) {
thermalManager.setTargetBed(code_value_temp_abs()); thermalManager.setTargetBed(code_value_temp_abs());
#if ENABLED(PRINTJOB_TIMER_AUTOSTART) #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
if(code_value_temp_abs() > BED_MINTEMP) { if (code_value_temp_abs() > BED_MINTEMP) {
/** /**
* We start the timer when 'heating and waiting' command arrives, LCD * We start the timer when 'heating and waiting' command arrives, LCD
* functions never wait. Cooling down managed by extruders. * functions never wait. Cooling down managed by extruders.
@ -5241,13 +5236,12 @@ inline void gcode_M200() {
if (get_target_extruder_from_command(200)) return; if (get_target_extruder_from_command(200)) return;
if (code_seen('D')) { if (code_seen('D')) {
float diameter = code_value_linear_units();
// setting any extruder filament size disables volumetric on the assumption that // setting any extruder filament size disables volumetric on the assumption that
// slicers either generate in extruder values as cubic mm or as as filament feeds // slicers either generate in extruder values as cubic mm or as as filament feeds
// for all extruders // for all extruders
volumetric_enabled = (diameter != 0.0); volumetric_enabled = (code_value_linear_units() != 0.0);
if (volumetric_enabled) { if (volumetric_enabled) {
filament_size[target_extruder] = diameter; filament_size[target_extruder] = code_value_linear_units();
// make sure all extruders have some sane value for the filament size // make sure all extruders have some sane value for the filament size
for (int i = 0; i < EXTRUDERS; i++) for (int i = 0; i < EXTRUDERS; i++)
if (! filament_size[i]) filament_size[i] = DEFAULT_NOMINAL_FILAMENT_DIA; if (! filament_size[i]) filament_size[i] = DEFAULT_NOMINAL_FILAMENT_DIA;