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

fix error in M105 output -- use SERIAL_PROTOCOL for ints instead of SERIAL_PROTOCOL_F (#6584)

Browse Source 
also removed wayward 'address of' ampersand in setTargetHotend and setTargetBed parameters
This commit is contained in:
bgort 2017-05-04 17:09:45 -04:00 committed by Roxy-3D
parent 3cd9af2409
commit ae7c602031
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/Marlin_main.cpp
View File

@ -6498,9 +6498,9 @@ inline void gcode_M104() {
void print_heaterstates() { void print_heaterstates() {
#if HAS_TEMP_HOTEND #if HAS_TEMP_HOTEND
SERIAL_PROTOCOLPGM(" T:"); SERIAL_PROTOCOLPGM(" T:");
SERIAL_PROTOCOL_F(thermalManager.degHotend(target_extruder), 1); SERIAL_PROTOCOL(thermalManager.degHotend(target_extruder));
SERIAL_PROTOCOLPGM(" /"); SERIAL_PROTOCOLPGM(" /");
SERIAL_PROTOCOL_F(thermalManager.degTargetHotend(target_extruder), 1); SERIAL_PROTOCOL(thermalManager.degTargetHotend(target_extruder));
#if ENABLED(SHOW_TEMP_ADC_VALUES) #if ENABLED(SHOW_TEMP_ADC_VALUES)
SERIAL_PROTOCOLPAIR(" (", thermalManager.rawHotendTemp(target_extruder) / OVERSAMPLENR); SERIAL_PROTOCOLPAIR(" (", thermalManager.rawHotendTemp(target_extruder) / OVERSAMPLENR);
SERIAL_PROTOCOLCHAR(')'); SERIAL_PROTOCOLCHAR(')');
@ -6508,9 +6508,9 @@ inline void gcode_M104() {
#endif #endif
#if HAS_TEMP_BED #if HAS_TEMP_BED
SERIAL_PROTOCOLPGM(" B:"); SERIAL_PROTOCOLPGM(" B:");
SERIAL_PROTOCOL_F(thermalManager.degBed(), 1); SERIAL_PROTOCOL(thermalManager.degBed());
SERIAL_PROTOCOLPGM(" /"); SERIAL_PROTOCOLPGM(" /");
SERIAL_PROTOCOL_F(thermalManager.degTargetBed(), 1); SERIAL_PROTOCOL(thermalManager.degTargetBed());
#if ENABLED(SHOW_TEMP_ADC_VALUES) #if ENABLED(SHOW_TEMP_ADC_VALUES)
SERIAL_PROTOCOLPAIR(" (", thermalManager.rawBedTemp() / OVERSAMPLENR); SERIAL_PROTOCOLPAIR(" (", thermalManager.rawBedTemp() / OVERSAMPLENR);
SERIAL_PROTOCOLCHAR(')'); SERIAL_PROTOCOLCHAR(')');
@ -6520,9 +6520,9 @@ inline void gcode_M104() {
HOTEND_LOOP() { HOTEND_LOOP() {
SERIAL_PROTOCOLPAIR(" T", e); SERIAL_PROTOCOLPAIR(" T", e);
SERIAL_PROTOCOLCHAR(':'); SERIAL_PROTOCOLCHAR(':');
SERIAL_PROTOCOL_F(thermalManager.degHotend(e), 1); SERIAL_PROTOCOL(thermalManager.degHotend(e));
SERIAL_PROTOCOLPGM(" /"); SERIAL_PROTOCOLPGM(" /");
SERIAL_PROTOCOL_F(thermalManager.degTargetHotend(e), 1); SERIAL_PROTOCOL(thermalManager.degTargetHotend(e));
#if ENABLED(SHOW_TEMP_ADC_VALUES) #if ENABLED(SHOW_TEMP_ADC_VALUES)
SERIAL_PROTOCOLPAIR(" (", thermalManager.rawHotendTemp(e) / OVERSAMPLENR); SERIAL_PROTOCOLPAIR(" (", thermalManager.rawHotendTemp(e) / OVERSAMPLENR);
SERIAL_PROTOCOLCHAR(')'); SERIAL_PROTOCOLCHAR(')');

5
Marlin/temperature.h
View File

@ -346,6 +346,7 @@ class Temperature {
#endif #endif
return target_temperature[HOTEND_INDEX]; return target_temperature[HOTEND_INDEX];
} }
static int16_t degTargetBed() { return target_temperature_bed; } static int16_t degTargetBed() { return target_temperature_bed; }
#if WATCH_HOTENDS #if WATCH_HOTENDS
@ -356,7 +357,7 @@ class Temperature {
static void start_watching_bed(); static void start_watching_bed();
#endif #endif
static void setTargetHotend(const int16_t &celsius, uint8_t e) { static void setTargetHotend(const int16_t celsius, uint8_t e) {
#if HOTENDS == 1 #if HOTENDS == 1
UNUSED(e); UNUSED(e);
#endif #endif
@ -372,7 +373,7 @@ class Temperature {
#endif #endif
} }
static void setTargetBed(const int16_t &celsius) { static void setTargetBed(const int16_t celsius) {
target_temperature_bed = celsius; target_temperature_bed = celsius;
#if WATCH_THE_BED #if WATCH_THE_BED
start_watching_bed(); start_watching_bed();