melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add VOLUMETRIC capability item

Browse Source
This commit is contained in:
Scott Lahteine 2017-12-19 20:08:24 -06:00
parent af1d6acb7e
commit 93a6a4e1a8
1 changed files with 72 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
Marlin/src/gcode/host/M115.cpp
View File

@ -23,6 +23,14 @@
#include "../gcode.h" #include "../gcode.h"
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"
#if ENABLED(EXTENDED_CAPABILITIES_REPORT)
static void cap_line(const char * const name, bool ena=false) {
SERIAL_PROTOCOLPGM("Cap:");
serialprintPGM(name);
SERIAL_PROTOCOLLN(int(ena ? 1 : 0));
}
#endif
/** /**
* M115: Capabilities string * M115: Capabilities string
*/ */
@ -32,86 +40,92 @@ void GcodeSuite::M115() {
#if ENABLED(EXTENDED_CAPABILITIES_REPORT) #if ENABLED(EXTENDED_CAPABILITIES_REPORT)
// SERIAL_XON_XOFF // SERIAL_XON_XOFF
cap_line(PSTR("SERIAL_XON_XOFF")
#if ENABLED(SERIAL_XON_XOFF) #if ENABLED(SERIAL_XON_XOFF)
SERIAL_PROTOCOLLNPGM("Cap:SERIAL_XON_XOFF:1"); , true
#else
SERIAL_PROTOCOLLNPGM("Cap:SERIAL_XON_XOFF:0");
#endif #endif
);
// EEPROM (M500, M501) // EEPROM (M500, M501)
cap_line(PSTR("EEPROM")
#if ENABLED(EEPROM_SETTINGS) #if ENABLED(EEPROM_SETTINGS)
SERIAL_PROTOCOLLNPGM("Cap:EEPROM:1"); , true
#else
SERIAL_PROTOCOLLNPGM("Cap:EEPROM:0");
#endif #endif
);
// Volumetric Extrusion (M200)
cap_line(PSTR("VOLUMETRIC")
#if DISABLED(NO_VOLUMETRICS)
, true
#endif
);
// AUTOREPORT_TEMP (M155) // AUTOREPORT_TEMP (M155)
cap_line(PSTR("AUTOREPORT_TEMP")
#if ENABLED(AUTO_REPORT_TEMPERATURES) #if ENABLED(AUTO_REPORT_TEMPERATURES)
SERIAL_PROTOCOLLNPGM("Cap:AUTOREPORT_TEMP:1"); , true
#else
SERIAL_PROTOCOLLNPGM("Cap:AUTOREPORT_TEMP:0");
#endif #endif
);
// PROGRESS (M530 S L, M531 <file>, M532 X L) // PROGRESS (M530 S L, M531 <file>, M532 X L)
SERIAL_PROTOCOLLNPGM("Cap:PROGRESS:0"); cap_line(PSTR("PROGRESS"));
// Print Job timer M75, M76, M77 // Print Job timer M75, M76, M77
SERIAL_PROTOCOLLNPGM("Cap:PRINT_JOB:1"); cap_line(PSTR("PRINT_JOB"), true);
// AUTOLEVEL (G29) // AUTOLEVEL (G29)
cap_line(PSTR("AUTOLEVEL")
#if HAS_AUTOLEVEL #if HAS_AUTOLEVEL
SERIAL_PROTOCOLLNPGM("Cap:AUTOLEVEL:1"); , true
#else
SERIAL_PROTOCOLLNPGM("Cap:AUTOLEVEL:0");
#endif #endif
);
// Z_PROBE (G30) // Z_PROBE (G30)
cap_line(PSTR("Z_PROBE")
#if HAS_BED_PROBE #if HAS_BED_PROBE
SERIAL_PROTOCOLLNPGM("Cap:Z_PROBE:1"); , true
#else
SERIAL_PROTOCOLLNPGM("Cap:Z_PROBE:0");
#endif #endif
);
// MESH_REPORT (M420 V) // MESH_REPORT (M420 V)
cap_line(PSTR("LEVELING_DATA")
#if HAS_LEVELING #if HAS_LEVELING
SERIAL_PROTOCOLLNPGM("Cap:LEVELING_DATA:1"); , true
#else
SERIAL_PROTOCOLLNPGM("Cap:LEVELING_DATA:0");
#endif #endif
);
// BUILD_PERCENT (M73) // BUILD_PERCENT (M73)
cap_line(PSTR("BUILD_PERCENT")
#if ENABLED(LCD_SET_PROGRESS_MANUALLY) #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
SERIAL_PROTOCOLLNPGM("Cap:BUILD_PERCENT:1"); , true
#else
SERIAL_PROTOCOLLNPGM("Cap:BUILD_PERCENT:0");
#endif #endif
);
// SOFTWARE_POWER (M80, M81) // SOFTWARE_POWER (M80, M81)
cap_line(PSTR("SOFTWARE_POWER")
#if HAS_POWER_SWITCH #if HAS_POWER_SWITCH
SERIAL_PROTOCOLLNPGM("Cap:SOFTWARE_POWER:1"); , true
#else
SERIAL_PROTOCOLLNPGM("Cap:SOFTWARE_POWER:0");
#endif #endif
);
// CASE LIGHTS (M355) // CASE LIGHTS (M355)
cap_line(PSTR("TOGGLE_LIGHTS")
#if HAS_CASE_LIGHT #if HAS_CASE_LIGHT
SERIAL_PROTOCOLLNPGM("Cap:TOGGLE_LIGHTS:1"); , true
if (USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) {
SERIAL_PROTOCOLLNPGM("Cap:CASE_LIGHT_BRIGHTNESS:1");
}
else
SERIAL_PROTOCOLLNPGM("Cap:CASE_LIGHT_BRIGHTNESS:0");
#else
SERIAL_PROTOCOLLNPGM("Cap:TOGGLE_LIGHTS:0");
SERIAL_PROTOCOLLNPGM("Cap:CASE_LIGHT_BRIGHTNESS:0");
#endif #endif
);
cap_line(PSTR("CASE_LIGHT_BRIGHTNESS")
#if HAS_CASE_LIGHT
, USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)
#endif
);
// EMERGENCY_PARSER (M108, M112, M410) // EMERGENCY_PARSER (M108, M112, M410)
cap_line(PSTR("EMERGENCY_PARSER")
#if ENABLED(EMERGENCY_PARSER) #if ENABLED(EMERGENCY_PARSER)
SERIAL_PROTOCOLLNPGM("Cap:EMERGENCY_PARSER:1"); , true
#else
SERIAL_PROTOCOLLNPGM("Cap:EMERGENCY_PARSER:0");
#endif #endif
);
#endif // EXTENDED_CAPABILITIES_REPORT #endif // EXTENDED_CAPABILITIES_REPORT
} }