diff options
author | daid <daid303@gmail.com> | 2015-10-08 12:44:54 +0300 |
---|---|---|
committer | daid <daid303@gmail.com> | 2015-10-08 12:44:54 +0300 |
commit | 22b0d0fe6a65bb445f8ff2cf3f62a87c7db58e74 (patch) | |
tree | 10c31df0e7f8e3ec08fc34f915ace96545ed73f4 | |
parent | 7b2b9630c7b5ec5e4534de94b46bb37004cccb88 (diff) |
Add nozzle diameter parameter for UltiGCode in preperation for some things.15.04.5-RC515.04.5-RC415.04.5-RC315.04.5-RC215.04.5-RC115.04.515.04.415.04.3-RC315.04.3-RC215.04.3-RC115.04.3
-rw-r--r-- | src/fffProcessor.h | 2 | ||||
-rw-r--r-- | src/settings.cpp | 1 | ||||
-rw-r--r-- | src/settings.h | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/fffProcessor.h b/src/fffProcessor.h index 1b7e05a669..8f6855c293 100644 --- a/src/fffProcessor.h +++ b/src/fffProcessor.h @@ -344,6 +344,8 @@ private: gcode.writeComment("TIME:<__TIME__>"); gcode.writeComment("MATERIAL:<FILAMENT>"); gcode.writeComment("MATERIAL2:<FILAMEN2>"); + gcode.writeComment("NOZZLE_DIAMETER:%f", float(config.nozzleSize) / 1000); + gcode.writeComment("NOZZLE_DIAMETER2:%f", float(config.nozzleSize) / 1000); } gcode.writeCode(config.startCode.c_str()); if (gcode.getFlavor() == GCODE_FLAVOR_BFB) diff --git a/src/settings.cpp b/src/settings.cpp index 2952f714a4..1f8975fe9d 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -18,6 +18,7 @@ ConfigSettings *ConfigSettings::config = NULL; ConfigSettings::ConfigSettings() { config = this; + SETTING(nozzleSize, 400); SETTING(layerThickness, 100); SETTING(initialLayerThickness, 300); SETTING(filamentDiameter, 2890); diff --git a/src/settings.h b/src/settings.h index 7ffa05e359..bd48ddadc1 100644 --- a/src/settings.h +++ b/src/settings.h @@ -126,6 +126,7 @@ private: std::vector<_ConfigSettingIndex> _index; public: static ConfigSettings *config; // allow access to config settings from everywhere + int nozzleSize; int layerThickness; int initialLayerThickness; int filamentDiameter; |