MakerBot plugin

CMakeLists.txt

@@ -22,17 +22,28 @@ message(STATUS "Configuring Dulcificum version: ${DULCIFICUM_VERSION}")
 find_package(nlohmann_json REQUIRED)
 find_package(spdlog REQUIRED)
 find_package(range-v3 REQUIRED)
+find_package(ctre REQUIRED)
 
 # --- Setup the shared C++ mgjtp library ---
 set(DULCIFICUM_SRC
-        src/command_types.cpp
+        src/gcode/ast/ast.cpp
+        src/gcode/ast/entries.cpp
+        src/gcode/parse.cpp
+
         src/miracle_jtp/mgjtp_command_to_json.cpp
         src/miracle_jtp/mgjtp_json_to_command.cpp
+
+        src/gcode/gcode_to_command.cpp
+
+        src/utils/io.cpp
+        src/utils/svtod.cpp
+        src/command_types.cpp
 )
 add_library(dulcificum ${DULCIFICUM_SRC})
 target_link_libraries(dulcificum
         PUBLIC
         nlohmann_json::nlohmann_json
+        ctre::ctre
         PRIVATE
         range-v3::range-v3
         spdlog::spdlog)

apps/translator_main.cpp

@@ -3,19 +3,33 @@
 #include <spdlog/spdlog.h>
 
 #include <docopt/docopt.h>
+#include <dulcificum/gcode/parse.h>
+#include <dulcificum/miracle_jtp/mgjtp_command_to_json.h>
+#include <dulcificum/gcode/gcode_to_command.h>
+#include <dulcificum/utils/io.h>
 #include <map>
 
+#include <nlohmann/json.hpp>
+
+template<typename... Ts>
+struct Overload : Ts...
+{
+    using Ts::operator()...;
+};
+template<class... Ts>
+Overload(Ts...) -> Overload<Ts...>;
+
 int main(int argc, const char** argv)
 {
     constexpr bool show_help = true;
     const std::map<std::string, docopt::value> args
         = docopt::docopt(fmt::format(apps::cmdline::USAGE, apps::cmdline::NAME), { argv + 1, argv + argc }, show_help, apps::cmdline::VERSION_ID);
 
-    if (args.contains("--quiet"))
+    if (args.at("--quiet").asBool())
     {
         spdlog::set_level(spdlog::level::err);
     }
-    else if (args.contains("--verbose"))
+    else if (args.at("--verbose").asBool())
     {
         spdlog::set_level(spdlog::level::debug);
     }
@@ -24,4 +38,16 @@ int main(int argc, const char** argv)
         spdlog::set_level(spdlog::level::info);
     }
     spdlog::info("Tasting the menu");
+
+    auto input{ dulcificum::utils::readFile(args.at("INPUT").asString()).value() };
+    auto gcode_ast = dulcificum::gcode::parse(input);
+    auto command_list = dulcificum::gcode::toCommand(gcode_ast);
+
+    auto json_commands = nlohmann::json::array();
+    for (const auto& command: command_list)
+    {
+        json_commands.emplace_back(dulcificum::miracle_jtp::toJson(*command));
+    }
+
+    auto x = 1;
 }

conanfile.py

@@ -81,6 +81,8 @@ def requirements(self):
         self.requires("nlohmann_json/3.11.2", transitive_headers = True)
         self.requires("range-v3/0.12.0")
         self.requires("spdlog/1.10.0")
+        self.requires("ctre/3.7.2")
+        self.requires("range-v3/0.12.0")
         if self.options.with_apps:
             self.requires("docopt.cpp/0.6.3")
         if self.options.with_python_bindings:

include/dulcificum/command_types.h

@@ -1,5 +1,5 @@
-#ifndef DULCIFICUM_COMMAND_TYPES_H
-#define DULCIFICUM_COMMAND_TYPES_H
+#ifndef INCLUDE_DULCIFICUM_COMMAND_TYPES_H
+#define INCLUDE_DULCIFICUM_COMMAND_TYPES_H
 
 #include <cmath>
 #include <memory>
@@ -153,4 +153,4 @@ CommandPtr spawnCommandPtr(const CommandType& type) noexcept;
 } // namespace botcmd
 } // namespace dulcificum
 
-#endif // DULCIFICUM_COMMAND_TYPES_H
+#endif // INCLUDE_DULCIFICUM_COMMAND_TYPES_H

include/dulcificum/gcode/ast/acceleration.h

@@ -0,0 +1,45 @@
+#ifndef INCLUDE_DULCIFICUM_GCODE_AST_ACCELERATION_H
+#define INCLUDE_DULCIFICUM_GCODE_AST_ACCELERATION_H
+
+#include "dulcificum/gcode/ast/entry.h"
+
+#include <optional>
+
+namespace dulcificum::gcode::ast
+{
+/*!
+ * /brief Set the starting acceleration for moves by type.
+ * P = Printing acceleration. Used for moves that include extrusion
+ * T = Travel acceleration. Used for moves that include no extrusion
+ */
+class M204 : public Entry<R"(M204((?:\sP(?<P>\d+(?:\.\d+)?))|(?:\sT(?<T>\d+(?:\.\d+)?))|(?:\sS(?<S>\d+(?:\.\d+)?)))*$)">
+{
+public:
+    M204() = delete;
+    M204(size_t index, std::string line);
+    std::optional<double> P;
+    std::optional<double> T;
+    std::optional<double> S;
+};
+
+/*!
+ * /brief Set various motion settings.
+ * X = X max jerk (units/s)
+ * Y = Y max jerk (units/s)
+ * Z = Z max jerk (units/s)
+ * E = E max jerk (units/s)
+ */
+class M205 : public Entry<R"(M205((?:\sX(?<X>-?\d+(?:\.\d+)?))|(?:\sY(?<Y>-?\d+(?:\.\d+)?))|(?:\sZ(?<Z>-?\d+(?:\.\d+)?))|(?:\sE(?<E>-?\d+(?:\.\d+)?)))*$)">
+{
+public:
+    M205() = delete;
+    M205(size_t index, std::string line);
+    std::optional<double> X;
+    std::optional<double> Y;
+    std::optional<double> Z;
+    std::optional<double> E;
+};
+
+} // namespace dulcificum::gcode::ast
+
+#endif // INCLUDE_DULCIFICUM_GCODE_AST_ACCELERATION_H

include/dulcificum/gcode/ast/ast.h

@@ -0,0 +1,59 @@
+#ifndef INCLUDE_DULCIFICUM_GCODE_AST_AST_H
+#define INCLUDE_DULCIFICUM_GCODE_AST_AST_H
+
+#include "dulcificum/gcode/ast/acceleration.h"
+#include "dulcificum/gcode/ast/bed_temperature.h"
+#include "dulcificum/gcode/ast/comment_commands.h"
+#include "dulcificum/gcode/ast/delay.h"
+#include "dulcificum/gcode/ast/entry.h"
+#include "dulcificum/gcode/ast/extruder_temperature.h"
+#include "dulcificum/gcode/ast/fan.h"
+#include "dulcificum/gcode/ast/position.h"
+#include "dulcificum/gcode/ast/positioning_mode.h"
+#include "dulcificum/gcode/ast/purge.h"
+#include "dulcificum/gcode/ast/toolchange.h"
+#include "dulcificum/gcode/ast/translate.h"
+
+#include <cstddef>
+#include <string>
+#include <variant>
+#include <vector>
+
+namespace dulcificum::gcode::ast
+{
+
+using Unknown = Entry<R"((.*))">;
+
+using node_t = std::variant<
+    G0_G1,
+    G4,
+    G90,
+    G91,
+    G92,
+    G280,
+    M82,
+    M83,
+    M104,
+    M106,
+    M107,
+    M109,
+    M140,
+    M190,
+    M204,
+    M205,
+    Layer,
+    Mesh,
+    FeatureType,
+    InitialTemperatureExtruder,
+    InitialTemperatureBuildPlate,
+    BuildVolumeTemperature,
+    Comment,
+    T,
+    Unknown>;
+using ast_t = std::vector<node_t>;
+
+node_t factory(size_t index, const std::string& line);
+
+} // namespace dulcificum::gcode::ast
+
+#endif // INCLUDE_DULCIFICUM_GCODE_AST_AST_H

include/dulcificum/gcode/ast/bed_temperature.h

@@ -0,0 +1,37 @@
+#ifndef INCLUDE_DULCIFICUM_GCODE_AST_BED_TEMPERATURE_H
+#define INCLUDE_DULCIFICUM_GCODE_AST_BED_TEMPERATURE_H
+
+#include "dulcificum/gcode/ast/entry.h"
+
+#include <optional>
+
+namespace dulcificum::gcode::ast
+{
+/*!
+ * /brief Set a new target bed temperature (non-blocking).
+ * S = Target temperature
+ */
+class M140 : public Entry<R"(M140((?:\sS(?<S>\d+(?:\.\d+)?)))*$)">
+{
+public:
+    M140() = delete;
+    M140(size_t index, std::string line);
+    std::optional<double> S;
+};
+
+/*!
+ * /brief Wait for the bed to reach target temperature (blocking).
+ * R = Target temperature (wait for cooling or heating).
+ * S = Target temperature (wait only when heating)
+ */
+class M190 : public Entry<R"(M190((?:\sS(?<S>\d+(?:\.\d+)?))|(?:\sR(?<R>\d+(?:\.\d+)?)))*$)">
+{
+public:
+    M190() = delete;
+    M190(size_t index, std::string line);
+    std::optional<double> S;
+    std::optional<double> R;
+};
+} // namespace dulcificum::gcode::ast
+
+#endif // INCLUDE_DULCIFICUM_GCODE_AST_BED_TEMPERATURE_H

include/dulcificum/gcode/ast/comment_commands.h

@@ -0,0 +1,99 @@
+#ifndef INCLUDE_DULCIFICUM_GCODE_AST_COMMENT_COMMANDS_H
+#define INCLUDE_DULCIFICUM_GCODE_AST_COMMENT_COMMANDS_H
+
+#include "dulcificum/gcode/ast/entry.h"
+
+#include <optional>
+
+namespace dulcificum::gcode::ast
+{
+/*!
+ * /brief The layer index
+ * L = index
+ */
+class Layer : public Entry<R"(;LAYER:(?<L>-?\d+))">
+{
+public:
+    Layer() = delete;
+    Layer(size_t index, std::string line);
+    std::optional<size_t> L;
+};
+
+/*!
+ * /brief The mesh name
+ * M = mesh name
+ */
+class Mesh : public Entry<R"(;MESH:(?<M>.*))">
+{
+public:
+    Mesh() = delete;
+    Mesh(size_t index, std::string line);
+    std::optional<std::string_view> M;
+};
+
+/*!
+ * /brief Feature type
+ * T = feature type (WALL-OUTER, WALL_INNER, SKIN, SUPPORT, SKIRT, FILL, SUPPORT-INTERFACE, PRIME_TOWER)
+ */
+class FeatureType : public Entry<R"(;TYPE:(?<T>.*))">
+{
+public:
+    FeatureType() = delete;
+    FeatureType(size_t index, std::string line);
+    std::optional<std::string_view> T;
+};
+
+/*!
+ * /brief Initial extruder temperature
+ * T = tool index
+ * S = Temperature
+ */
+class InitialTemperatureExtruder : public Entry<R"(;EXTRUDER_TRAIN\.(?<T>\d)\.INITIAL_TEMPERATURE:(?<S>([\d|\.]*)))">
+{
+public:
+    InitialTemperatureExtruder() = delete;
+    InitialTemperatureExtruder(size_t index, std::string line);
+    std::optional<size_t> T;
+    std::optional<double> S;
+};
+
+/*!
+ * /brief Initial build plate temperature
+ * S = Temperature
+ */
+class InitialTemperatureBuildPlate : public Entry<R"(;BUILD_PLATE.INITIAL_TEMPERATURE:(?<S>([\d|\.]*)))">
+{
+public:
+    InitialTemperatureBuildPlate() = delete;
+    InitialTemperatureBuildPlate(size_t index, std::string line);
+    std::optional<double> S;
+};
+
+/*!
+ * /brief Initial build volume temperature
+ * S = Temperature
+ */
+class BuildVolumeTemperature : public Entry<R"(;BUILD_VOLUME.TEMPERATURE:(?<S>([\d|\.]*)))">
+{
+public:
+    BuildVolumeTemperature() = delete;
+    BuildVolumeTemperature(size_t index, std::string line);
+    std::optional<double> S;
+};
+
+/*!
+ * /brief A generic comment
+ * comment = The text of the comment
+ */
+class Comment : public Entry<R"(;(?<C>\.*))">
+{
+public:
+    Comment() = delete;
+    Comment(size_t index, std::string line);
+    std::string C;
+};
+
+
+} // namespace dulcificum::gcode::ast
+
+#endif // INCLUDE_DULCIFICUM_GCODE_AST_COMMENT_COMMANDS_H

include/dulcificum/gcode/ast/delay.h

@@ -0,0 +1,22 @@
+#ifndef DULCIFICUM_DELAY_H
+#define DULCIFICUM_DELAY_H
+
+#include "dulcificum/gcode/ast/entry.h"
+
+namespace dulcificum::gcode::ast
+{
+/*!
+ * /brief Dwell, or delay, for the specified time
+ */
+class G4 : public Entry<R"(G4((?:\sS(?<S>\d+(?:\.\d+)?))|(?:\sP(?<P>\d+(?:\.\d+)?)))*$)">
+{
+public:
+    G4() = delete;
+    G4(size_t index, std::string line);
+    std::optional<double> S;
+    std::optional<double> P;
+};
+} // namespace dulcificum::gcode::ast
+
+
+#endif // DULCIFICUM_DELAY_H