MakerBot plugin

.github/workflows/conan-package.yml

@@ -43,6 +43,7 @@ on:
       - 'test_package/**'
       - 'conanfile.py'
       - 'CMakeLists.txt'
+      - 'pyDulcificum/**'
       - '.github/workflows/conan-package.yml'
       - '.github/worflows/requirements-conan-package.txt'
     branches:

CMakeLists.txt

@@ -22,18 +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
-        PRIVATE
+        ctre::ctre
         range-v3::range-v3
         spdlog::spdlog)
 

apps/cmdline.h

@@ -20,7 +20,7 @@ constexpr std::string_view USAGE = R"({0}.
 Dulcificum changes the flavor, or dialect, of 3d printer commands
 
 Usage:
-  translator [--quiet | --verbose] --input=FLAVOR INPUT --output=FLAVOR OUPUT
+  translator [--quiet | --verbose] --input=FLAVOR INPUT --output=FLAVOR OUTPUT
   translator (-h | --help)
   translator --version
 

apps/translator_main.cpp

@@ -3,19 +3,34 @@
 #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 <dulcificum.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 +39,8 @@ 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 translated = dulcificum::GCode2Miracle_JTP(input);
+    dulcificum::utils::writeFile(args.at("OUTPUT").asString(), translated);
 }

conanfile.py

@@ -35,7 +35,7 @@ class DulcificumConan(ConanFile):
         "shared": False,
         "fPIC": True,
         "enable_extensive_warnings": False,
-        "with_apps": True,
+        "with_apps": False,
         "with_python_bindings": True,
     }
 
@@ -57,6 +57,12 @@ def _compilers_minimum_version(self):
             "visual_studio": "17",
         }
 
+    @property
+    def _run_tests(self):
+        if self.settings.compiler == "apple-clang" and Version(self.settings.compiler.version) <= Version("14"):
+            return False
+        return not self.conf.get("tools.build:skip_test", False, check_type = bool)
+
     def export_sources(self):
         copy(self, "CMakeLists.txt", self.recipe_folder, self.export_sources_folder)
         copy(self, "*", os.path.join(self.recipe_folder, "src"), os.path.join(self.export_sources_folder, "src"))
@@ -72,15 +78,25 @@ def config_options(self):
     def configure(self):
         if self.options.shared:
             self.options.rm_safe("fPIC")
+        if self.options.with_python_bindings:
+            self.options["cpython"].shared = True
 
     def layout(self):
         cmake_layout(self)
-        self.cpp.package.libs = ["dulcificum"]
+
+        self.cpp.build.bin = ["translator"]
+        self.cpp.build.bindirs = ["apps"]
+
+        self.cpp.package.lib = ["dulcificum", "pyDulcificum"]
+        self.cpp.package.libdirs = ["lib"]
+        self.cpp.package.bindirs = ["bin"]
 
     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:
@@ -89,7 +105,7 @@ def requirements(self):
 
     def build_requirements(self):
         self.test_requires("standardprojectsettings/[>=0.1.0]@ultimaker/stable")
-        if not self.conf.get("tools.build:skip_test", False, check_type = bool):
+        if self._run_tests:
             self.test_requires("gtest/[>=1.12.1]")
 
     def validate(self):
@@ -107,7 +123,7 @@ def validate(self):
 
     def generate(self):
         tc = CMakeToolchain(self)
-        tc.variables["ENABLE_TESTS"] = not self.conf.get("tools.build:skip_test", False, check_type = bool)
+        tc.variables["ENABLE_TESTS"] = self._run_tests
         tc.variables["EXTENSIVE_WARNINGS"] = self.options.enable_extensive_warnings
         tc.variables["DULCIFICUM_VERSION"] = self.version
 
@@ -117,7 +133,7 @@ def generate(self):
 
         tc.variables["WITH_PYTHON_BINDINGS"] = self.options.with_python_bindings
         if self.options.with_python_bindings:
-            tc.variables["Python_EXECUTABLE"] = self.deps_user_info["cpython"].python.replace("\\", "/")
+            tc.variables["PYTHON_EXECUTABLE"] = self.deps_user_info["cpython"].python.replace("\\", "/")
             tc.variables["Python_USE_STATIC_LIBS"] = not self.options["cpython"].shared
             tc.variables["Python_ROOT_DIR"] = self.deps_cpp_info["cpython"].rootpath.replace("\\", "/")
             tc.variables["Python_FIND_FRAMEWORK"] = "NEVER"
@@ -143,7 +159,7 @@ def generate(self):
                 copy(self, "*.dll", dep.cpp_info.libdirs[0], self.build_folder)
             if len(dep.cpp_info.bindirs) > 0:
                 copy(self, "*.dll", dep.cpp_info.bindirs[0], self.build_folder)
-            if not self.conf.get("tools.build:skip_test", False, check_type = bool):
+            if self._run_tests:
                 test_path = os.path.join(self.build_folder,  "tests")
                 if not os.path.exists(test_path):
                     mkdir(self, test_path)
@@ -160,5 +176,13 @@ def build(self):
 
     def package(self):
         copy(self, pattern="LICENSE", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder)
+        copy(self, "translator*", src = os.path.join(self.build_folder, "apps"), dst = os.path.join(self.package_folder, "bin"), keep_path = False)
+        copy(self, "*.pyd", src = os.path.join(self.build_folder, "pyDulcificum"), dst = os.path.join(self.package_folder, "lib", "pyDulcificum"), keep_path = False)
         packager = AutoPackager(self)
         packager.run()
+
+    def package_info(self):
+        if self.in_local_cache:
+            self.runenv_info.append_path("PYTHONPATH", os.path.join(self.package_folder, "lib", "pyDulcificum"))
+        else:
+            self.runenv_info.append_path("PYTHONPATH", os.path.join(self.build_folder, "pyDulcificum"))

include/dulcificum.h

@@ -1,10 +1,41 @@
 #ifndef DULCIFICUM_INCLUDE_DULCIFICUM_H
 #define DULCIFICUM_INCLUDE_DULCIFICUM_H
 
+#include <nlohmann/json_fwd.hpp>
+#include <string>
 #ifndef DULCIFICUM_VERSION
 #define DULCIFICUM_VERSION "0.1.0"
 #endif
 
-// TODO: this will be the main API
+#include <fmt/format.h>
+#include <fmt/ranges.h>
+#include <range/v3/to_container.hpp>
+#include <range/v3/view/c_str.hpp>
+#include <range/v3/view/join.hpp>
+#include <range/v3/view/transform.hpp>
+
+#include <dulcificum/gcode/gcode_to_command.h>
+#include <dulcificum/gcode/parse.h>
+#include <dulcificum/miracle_jtp/mgjtp_command_to_json.h>
+
+namespace dulcificum
+{
+
+[[nodiscard]] std::string GCode2Miracle_JTP(const std::string& content)
+{
+    auto gcode_ast = dulcificum::gcode::parse(content);
+    auto command_list = dulcificum::gcode::toCommand(gcode_ast);
+    auto commands = command_list
+                  | ranges::views::transform(
+                        [](const auto& command)
+                        {
+                            return dulcificum::miracle_jtp::toJson(*command).dump();
+                        })
+                  | ranges::views::join(ranges::views::c_str(",\n")) | ranges::to<std::string>();
+    return fmt::format("[\n{}\n]", commands);
+}
+
+
+} // namespace dulcificum
 
 #endif // DULCIFICUM_INCLUDE_DULCIFICUM_H

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>
@@ -17,16 +17,17 @@ namespace botcmd
 
 enum class CommandType
 {
-    kInvalid,
-    kMove, // most commands are move commands
-    kActiveFanEnable, // look at m_fan_state
-    kActiveFanDuty, // look at m_fan_speed
-    kSetTemperature, // change temperature for active tool
-    kChangeTool, // change active tool
-    kComment, // do nothing, only emit comments
-    kDelay, // delay - command to wait for event
-    kWaitForTemperature, // firmware delays until temp reached
-    kPause, // Command to allow for user defined pause.
+    Invalid,
+    Move, // most commands are move commands
+    ActiveFanEnable, // look at m_fan_state
+    ActiveFanDuty, // look at m_fan_speed
+    SetTemperature, // change temperature for active tool
+    ChangeTool, // change active tool
+    Comment, // do nothing, only emit comments
+    Delay, // delay - command to wait for event
+    LayerChange, // layer - denoting a layer is changed
+    WaitForTemperature, // firmware delays until temp reached
+    Pause, // Command to allow for user defined pause.
 };
 
 enum class Tag
@@ -38,6 +39,7 @@ enum class Tag
     QuickToggle,
     Raft,
     Restart,
+    Retract,
     Roof,
     Support,
     Sparse,
@@ -50,7 +52,7 @@ struct Command
 {
     Command() = delete;
 
-    constexpr explicit Command(CommandType type) noexcept
+    explicit Command(CommandType type) noexcept
         : type{ type }
     {
     }
@@ -65,7 +67,7 @@ using CommandList = std::vector<CommandPtr>;
 struct Comment : public Command
 {
     Comment() noexcept
-        : Command(CommandType::kComment)
+        : Command(CommandType::Comment)
     {
     }
 
@@ -74,8 +76,8 @@ struct Comment : public Command
 
 struct Move : public Command
 {
-    constexpr Move() noexcept
-        : Command(CommandType::kMove)
+    Move() noexcept
+        : Command(CommandType::Move)
     {
     }
 
@@ -86,8 +88,8 @@ struct Move : public Command
 
 struct FanDuty : public Command
 {
-    constexpr FanDuty() noexcept
-        : Command(CommandType::kActiveFanDuty)
+    FanDuty() noexcept
+        : Command(CommandType::ActiveFanDuty)
     {
     }
 
@@ -97,8 +99,8 @@ struct FanDuty : public Command
 
 struct FanToggle : public Command
 {
-    constexpr FanToggle() noexcept
-        : Command(CommandType::kActiveFanEnable)
+    FanToggle() noexcept
+        : Command(CommandType::ActiveFanEnable)
     {
     }
 
@@ -108,8 +110,8 @@ struct FanToggle : public Command
 
 struct SetTemperature : public Command
 {
-    constexpr SetTemperature() noexcept
-        : Command(CommandType::kSetTemperature)
+    SetTemperature() noexcept
+        : Command(CommandType::SetTemperature)
     {
     }
 
@@ -119,8 +121,8 @@ struct SetTemperature : public Command
 
 struct WaitForTemperature : public Command
 {
-    constexpr WaitForTemperature() noexcept
-        : Command(CommandType::kWaitForTemperature)
+    WaitForTemperature() noexcept
+        : Command(CommandType::WaitForTemperature)
     {
     }
 
@@ -129,28 +131,38 @@ struct WaitForTemperature : public Command
 
 struct ChangeTool : public Command
 {
-    constexpr ChangeTool() noexcept
-        : Command(CommandType::kChangeTool)
+    ChangeTool() noexcept
+        : Command(CommandType::ChangeTool)
     {
     }
 
     ExtruderIndex index{ 0 };
-    ParamPoint position{ NAN, NAN, NAN, NAN, NAN };
+    ParamPoint position{ NAN, NAN, NAN, NAN, NAN }; // Badman
 };
 
 struct Delay : public Command
 {
-    constexpr Delay() noexcept
-        : Command(CommandType::kDelay)
+    Delay() noexcept
+        : Command(CommandType::Delay)
     {
     }
 
     double seconds{ 0.0 };
 };
 
+struct LayerChange : public Command
+{
+    LayerChange() noexcept
+        : Command(CommandType::LayerChange)
+    {
+    }
+
+    int64_t layer{ 0 };
+};
+
 CommandPtr spawnCommandPtr(const CommandType& type) noexcept;
 
 } // namespace botcmd
 } // namespace dulcificum
 
-#endif // DULCIFICUM_COMMAND_TYPES_H
+#endif // INCLUDE_DULCIFICUM_COMMAND_TYPES_H