From cd598dba7fe54e95d75140ff9670f4ddb0f4d52b Mon Sep 17 00:00:00 2001 From: Stepan Usatiuk Date: Thu, 19 Mar 2020 14:05:38 +0300 Subject: [PATCH] add ignoreRpm option, because gcodetools default is 400 --- Firmware/EggbotWireless/src/ConfigManager.cpp | 3 ++- Firmware/EggbotWireless/src/GCodeParser.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Firmware/EggbotWireless/src/ConfigManager.cpp b/Firmware/EggbotWireless/src/ConfigManager.cpp index dd81038..ef54033 100644 --- a/Firmware/EggbotWireless/src/ConfigManager.cpp +++ b/Firmware/EggbotWireless/src/ConfigManager.cpp @@ -8,7 +8,8 @@ const std::unordered_map defaults{ {"wifiMode", "ap"}, {"wifiSSID", defSSID}, {"wifiPass", defPass}, - {"defRpm", "2"}}}; + {"defRpm", "2"}, + {"ignoreRpm", "yes"}}}; /* Max string length is 25 diff --git a/Firmware/EggbotWireless/src/GCodeParser.cpp b/Firmware/EggbotWireless/src/GCodeParser.cpp index 8bc2417..72ff5ff 100644 --- a/Firmware/EggbotWireless/src/GCodeParser.cpp +++ b/Firmware/EggbotWireless/src/GCodeParser.cpp @@ -68,7 +68,7 @@ Command parseGCode(std::string gcode) { if (zIter != endIter) { bufcmd.arg3 = zIter->second; } - if (fIter != endIter) { + if (fIter != endIter && configManager.get("ignoreRpm") != "yes") { bufcmd.arg4 = fIter->second; } else { bufcmd.arg4 = atof(configManager.get("defRpm").c_str());