MakerBot plugin #5

casperlamboo · 2023-10-23T09:39:30Z

CURA-10561

Contribute to CURA-10561

Included a new io.cpp within the DULCIFICUM_SRC in CMakeLists.txt. Implemented functionality to read files from disk, specifically focused on Gcode files for now. This utility will aid in processing Gcode commands for the Dulcificum project. Future enhancements will include the ability to read other file formats. Contributes to CURA-10561

Contribute to CURA-10561

Added multiple headers to include/dulcificum/gcode/ast for AST handling using variants and templates. Also added function to parse gcode into AST. These changes allow transforming gcode to AST which can be used for further analysis or translation to other formats. Added example usage to the main translator application. Contribute to CURA-10561

This commit refactors the Gcode Abstract Syntax Tree (AST) classes to include translation functionality. It introduces a map of creator functions that allows for dynamic creation of different types of nodes, improving code reusability and maintainability. This change is necessary to ensure that each different Gcode command could be parsed and handled independently, promoting code flexibility and easier debugging. Now each node can execute its own logic when the operator() is called. The capability of line translation is demonstrated using G0 command as an example. In addition, the uncommented code in apps/translator_main.cpp has been commented out. Overall, this commit aims to provide a more structured and flexible approach to parsing and handling different Gcode commands. Contribute to CURA-010561

The AST structure has been fundamentally changed from a standard vector to a multimap to support a tree-like structure, which is more representative of the GCode's structure and improves its traversal. A DFS function has been added to traverse the modified AST. A root node is returned from the parser and is used as the starting point for the DFS. This root node and visited nodes are managed by shared pointers for memory safety. The G0 operator overload has now been finalized. Changes in code also necessitated changes in the creators - they now return shared pointers. Lastly, the BaseEntry class has been introduced as parent of Entry class for polymorphism. Contributes to CURA-10561

This reverts commit 98e0afd.

This reverts commit a8e0443.

Which will act mediator language between the different languages. Add new files and refactor code to implement AST-based parsing and translation of GCode New source and header files added for Abstract Syntax Tree (AST) based system to handle GCode translation. This change helps improve code maintainability by unifying parsing and translation functionality. The changes also include modification of existing files, classes, and function signatures to accommodate and support the new system. Notably, new classes for AST nodes, such as Translate, ast_t and node_t have been designed. For parsing GCode, a factory class is created that maps GCode instructions to corresponding AST nodes. For translating GCode to Proto Path, a translate function is added. Also, to make it more readable and aligned, the code has been refactored, primarily renaming and relocating components for better structure. Furthermore, file and class headers were renamed to match current usage. Contribute to CURA-10561

A StringViewToDouble conversion function is added. With help of this function, improved the Gcode parsing to extract more data for each Gcode command. Now it correctly identifies and extracts all relevant command data for each command line, including optional parameters, and stores them in corresponding classes' member variables. More specifically, the changes were made in classes representing G0, G1, m104, and other Gcode commands. Additionally, for each updated class a std::optional field was added for each optional command parameter which can appear in actual Gcode command, allowing to check if certain parameter was set in the given Gcode command. Contribute to CURA-10561

Renamed file src/gcode/ast/operators.cpp to src/gcode/ast/entries.cpp to better reflect its contents and role. Also, modified parse error messages to include the line that failed to parse. This change is meant to improve debugging capabilities. All instances of the filename in other scripts, like CMakeLists.txt, have been updated accordingly. Contributes to CURA-10561

github-actions · 2023-10-23T09:45:01Z

Unit Test Results

0 tests ±0 0 ✔️ ±0 0s ⏱️ ±0s
0 suites - 1 0 💤 ±0
0 files - 1 0 ❌ ±0

Results for commit d755576. ± Comparison against base commit a806ed4.

♻️ This comment has been updated with latest results.

github-actions

⚠️ clang-tidy found issue(s) with the introduced code (1/2)

github-actions · 2023-10-23T09:54:26Z

include/dulcificum/gcode/ast/acceleration.h

+ * 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+)?)))*$)">


⚠️ cppcoreguidelines-virtual-class-destructor ⚠️
destructor of M204 is public and non-virtual

github-actions · 2023-10-23T09:54:26Z

include/dulcificum/gcode/ast/acceleration.h

+ * 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+)?)))*$)">


⚠️ cppcoreguidelines-virtual-class-destructor ⚠️
destructor of M205 is public and non-virtual

github-actions · 2023-10-23T09:54:26Z

include/dulcificum/gcode/ast/bed_temperature.h

+ * /brief Set a new target bed temperature (non-blocking).
+ * S = Target temperature
+ */
+class M140 : public Entry<R"(M140((?:\sS(?<S>\d+(?:\.\d+)?)))*$)">


⚠️ cppcoreguidelines-virtual-class-destructor ⚠️
destructor of M140 is public and non-virtual

github-actions · 2023-10-23T09:54:26Z

include/dulcificum/gcode/ast/bed_temperature.h

+ * 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+)?)))*$)">


⚠️ cppcoreguidelines-virtual-class-destructor ⚠️
destructor of M190 is public and non-virtual

github-actions · 2023-10-23T09:54:26Z

include/dulcificum/gcode/ast/comment_commands.h

+ * /brief The layer index
+ * L = index
+ */
+class Layer : public Entry<R"(;LAYER:(?<L>-?\d+))">


⚠️ cppcoreguidelines-virtual-class-destructor ⚠️
destructor of Layer is public and non-virtual

github-actions · 2023-10-23T09:54:28Z

include/dulcificum/gcode/ast/translate.h

+ * E = An absolute or relative coordinate on the E axis (in current units).
+ * F = The maximum movement rate of the move between the start and end point.
+ */
+class G1 : public Entry<R"(G1((?:\sX(?<X>-?\d+(?:\.\d+)?))|(?:\sY(?<Y>-?\d+(?:\.\d+)?))|(?:\sZ(?<Z>-?\d+(?:\.\d+)?))|(?:\sE(?<E>-?\d+(?:\.\d+)?))|(?:\sF(?<F>-?\d+(?:\.\d+)?)))*$)">


⚠️ cppcoreguidelines-virtual-class-destructor ⚠️
destructor of G1 is public and non-virtual

github-actions · 2023-10-23T09:54:28Z

include/dulcificum/proto_path/ast/ast.h

+using node_t = std::variant<Translate>;
+using ast_t = std::vector<node_t>;
+
+node_t factory(const auto& ast)


⚠️ misc-unused-parameters ⚠️
parameter ast is unused

Suggested change

node_t factory(const auto& ast)

node_t factory(const auto& /*ast*/)

github-actions · 2023-10-23T09:54:28Z

include/dulcificum/proto_path/ast/translate.h

+template<utils::CharRangeLiteral Axis>
+struct Coordinate : Magnitude
+{
+    static constexpr std::string_view axis{ Axis.value };


⚠️ readability-identifier-naming ⚠️
invalid case style for class constant axis

Suggested change

static constexpr std::string_view axis{ Axis.value };

static constexpr std::string_view AXIS{ Axis.value };

github-actions · 2023-10-23T09:54:28Z

include/dulcificum/utils/svtod.h

+namespace dulcificum::utils
+{
+
+double StringViewToDouble(std::string_view sv);


⚠️ readability-identifier-naming ⚠️
invalid case style for function StringViewToDouble

Suggested change

double StringViewToDouble(std::string_view sv);

double stringViewToDouble(std::string_view sv);

github-actions · 2023-10-23T09:54:29Z

include/dulcificum/utils/svtod.h

+namespace dulcificum::utils
+{
+
+double StringViewToDouble(std::string_view sv);


⚠️ readability-identifier-length ⚠️
parameter name sv is too short, expected at least 3 characters

github-actions

⚠️ clang-tidy found issue(s) with the introduced code (2/2)

github-actions · 2023-10-23T09:54:41Z

src/gcode/parse.cpp

+    gcode::ast::ast_t ast;
+
+    size_t index{ 0 };
+    while (std::getline(stream, line))


⚠️ altera-id-dependent-backward-branch ⚠️
backward branch (while loop) is ID-dependent due to variable reference to stream and may cause performance degradation

github-actions · 2023-10-23T09:54:41Z

src/proto_path/translate.cpp

+    for (auto& node : gcode)
+    {
+        std::visit(
+            [](auto& n)


⚠️ readability-identifier-length ⚠️
parameter name n is too short, expected at least 3 characters

github-actions · 2023-10-23T09:54:42Z

src/utils/svtod.cpp

+
+namespace dulcificum::utils
+{
+double StringViewToDouble(std::string_view sv)


⚠️ readability-identifier-length ⚠️
parameter name sv is too short, expected at least 3 characters

scottsha · 2023-10-23T14:39:27Z

include/dulcificum/gcode/ast/acceleration.h

@@ -0,0 +1,45 @@
+#ifndef INCLUDE_DULCIFICUM_GCODE_AST_ACCELERATION_H
+#define INCLUDE_DULCIFICUM_GCODE_AST_ACCELERATION_H


Abstract Syntax Tree, Although this tree basically consist of a single trunk

Oh ahahaha that wouldn't have occured to me. TAC (Threeletter Acronyms Confuse) :P

CURA-10561

G92 changes the origin, and thus only changes the state since no concept of a changing origin is known to the internal command list CURA-10561

CURA-10561

gave run time errors CURA-10561

github-actions

⚠️ clang-tidy found issue(s) with the introduced code (1/1)

github-actions · 2023-10-29T14:29:17Z

src/miracle_jtp/mgjtp_command_to_json.cpp

@@ -82,7 +83,8 @@ nlohmann::json getCommandParameters(const botcmd::Command& cmd)
    {
        const auto dcmd = static_cast<const botcmd::SetTemperature&>(cmd);
        jparams[k_key_str::index] = dcmd.index;


⚠️ cppcoreguidelines-pro-type-static-cast-downcast ⚠️
do not use static_cast to downcast from a base to a derived class

github-actions · 2023-10-29T14:29:17Z

src/miracle_jtp/mgjtp_command_to_json.cpp

@@ -104,6 +106,16 @@ nlohmann::json getCommandParameters(const botcmd::Command& cmd)
        jparams[k_key_str::seconds] = dcmd.seconds;


⚠️ cppcoreguidelines-pro-type-static-cast-downcast ⚠️
do not use static_cast to downcast from a base to a derived class

github-actions · 2023-10-29T14:29:17Z

src/miracle_jtp/mgjtp_command_to_json.cpp

+    if (cmd.type == botcmd::CommandType::kLayerChange)
+    {
+        const auto dcmd = static_cast<const botcmd::LayerChange&>(cmd);
+        auto comment = botcmd::Comment{};


⚠️ cppcoreguidelines-pro-type-static-cast-downcast ⚠️
do not use static_cast to downcast from a base to a derived class

Contributes to CURA-10561

CURA-10561

Replace pointer dereferencing with std::optional::value() for safer code. Previously code used pointer dereferencing to access optional command parameters which can lead to undefined behavior when the optional is not set, now it uses std::optional::value() which throws a defined exception (`bad_optional_access`) in that case. Contributes to CURA-10561

CURA-10561

…nto CURA-10561_regex_gcode_parser

github-actions

⚠️ clang-tidy found issue(s) with the introduced code (1/1)

github-actions · 2023-10-29T15:15:32Z

include/dulcificum/gcode/gcode_to_command.h

+        // TODO: Unknown
+    };
+    void to_proto_path(const ast::G0_G1& command);
+    void to_proto_path(const ast::G4& command);


⚠️ readability-identifier-naming ⚠️
invalid case style for method to_proto_path

Suggested change

void to_proto_path(const ast::G4& command);

void toProtoPath(const ast::G0_G1& command);

github-actions · 2023-10-29T15:15:32Z

include/dulcificum/gcode/gcode_to_command.h

+    };
+    void to_proto_path(const ast::G0_G1& command);
+    void to_proto_path(const ast::G4& command);
+    void to_proto_path(const ast::M104& command);


⚠️ readability-identifier-naming ⚠️
invalid case style for method to_proto_path

Suggested change

void to_proto_path(const ast::M104& command);

void toProtoPath(const ast::G4& command);

github-actions · 2023-10-29T15:15:32Z

include/dulcificum/gcode/gcode_to_command.h

+    void to_proto_path(const ast::G0_G1& command);
+    void to_proto_path(const ast::G4& command);
+    void to_proto_path(const ast::M104& command);
+    void to_proto_path(const ast::M106& command);


⚠️ readability-identifier-naming ⚠️
invalid case style for method to_proto_path

Suggested change

void to_proto_path(const ast::M106& command);

void toProtoPath(const ast::M104& command);

github-actions · 2023-10-29T15:15:32Z

include/dulcificum/gcode/gcode_to_command.h

+    void to_proto_path(const ast::G4& command);
+    void to_proto_path(const ast::M104& command);
+    void to_proto_path(const ast::M106& command);
+    void to_proto_path(const ast::M107& command);


⚠️ readability-identifier-naming ⚠️
invalid case style for method to_proto_path

Suggested change

void to_proto_path(const ast::M107& command);

void toProtoPath(const ast::M106& command);

github-actions · 2023-10-29T15:15:32Z

include/dulcificum/gcode/gcode_to_command.h

+    void to_proto_path(const ast::M104& command);
+    void to_proto_path(const ast::M106& command);
+    void to_proto_path(const ast::M107& command);
+    void to_proto_path(const ast::M109& command);


⚠️ readability-identifier-naming ⚠️
invalid case style for method to_proto_path

Suggested change

void to_proto_path(const ast::M109& command);

void toProtoPath(const ast::M107& command);

include/dulcificum/state.h

github-actions · 2023-10-29T15:15:33Z

include/dulcificum/state.h

+    bool is_retracted{ false };
+
+    int64_t layer{ 0 };
+    std::optional<int64_t> layer_index_offset{ std::nullopt };


⚠️ clang-diagnostic-error ⚠️
no template named optional in namespace std

github-actions · 2023-10-29T15:15:33Z

include/dulcificum/state.h

+    bool is_retracted{ false };
+
+    int64_t layer{ 0 };
+    std::optional<int64_t> layer_index_offset{ std::nullopt };


⚠️ clang-diagnostic-error ⚠️
no member named nullopt in namespace std

github-actions · 2023-10-29T15:15:33Z

src/gcode/gcode_to_command.cpp

+    }
+    else if (command.P)
+    {
+        delay->seconds = command.P.value() * 1000.0;


⚠️ cppcoreguidelines-avoid-magic-numbers ⚠️
1000.0 is a magic number; consider replacing it with a named constant

github-actions · 2023-10-29T15:15:33Z

src/miracle_jtp/mgjtp_command_to_json.cpp

@@ -82,7 +84,8 @@ nlohmann::json getCommandParameters(const botcmd::Command& cmd)
    {
        const auto dcmd = static_cast<const botcmd::SetTemperature&>(cmd);


⚠️ cppcoreguidelines-pro-type-static-cast-downcast ⚠️
do not use static_cast to downcast from a base to a derived class

github-actions

⚠️ clang-tidy found issue(s) with the introduced code (1/1)

github-actions · 2023-10-29T15:16:18Z

src/miracle_jtp/mgjtp_command_to_json.cpp

@@ -2,8 +2,10 @@

 #include "dulcificum/miracle_jtp/mgjtp_mappings_json_key_to_str.h"

+#include <fmt/format.h>


⚠️ llvm-include-order ⚠️
#includes are not sorted properly

Suggested change

#include <fmt/format.h>

#include <fmt/format.h>

github-actions · 2023-10-29T15:16:18Z

src/miracle_jtp/mgjtp_command_to_json.cpp

@@ -2,8 +2,10 @@

 #include "dulcificum/miracle_jtp/mgjtp_mappings_json_key_to_str.h"

+#include <fmt/format.h>
 #include <range/v3/view/remove_if.hpp>


⚠️ llvm-include-order ⚠️
#includes are not sorted properly

Suggested change

#include <range/v3/view/remove_if.hpp>

#include <range/v3/view/remove_if.hpp>

github-actions · 2023-10-29T15:16:18Z

src/miracle_jtp/mgjtp_command_to_json.cpp

@@ -2,8 +2,10 @@

 #include "dulcificum/miracle_jtp/mgjtp_mappings_json_key_to_str.h"

+#include <fmt/format.h>
 #include <range/v3/view/remove_if.hpp>
 #include <range/v3/view/zip.hpp>


⚠️ llvm-include-order ⚠️
#includes are not sorted properly

Suggested change

#include <range/v3/view/zip.hpp>

#include <range/v3/view/zip.hpp>

github-actions

⚠️ clang-tidy found issue(s) with the introduced code (1/1)

github-actions · 2023-10-29T15:23:35Z

include/dulcificum/gcode/gcode_to_command.h

+    void to_proto_path(const ast::Layer& command);
+    void to_proto_path(const ast::Comment& command);
+    void to_proto_path(const ast::T& command);
+    void to_proto_path(const ast::InitialTemperatureExtruder& command);


⚠️ readability-identifier-naming ⚠️
invalid case style for method to_proto_path

Suggested change

void to_proto_path(const ast::InitialTemperatureExtruder& command);

void toProtoPath(const ast::InitialTemperatureExtruder& command);

Changed the naming convention of CommandType enum items from `kItem` to `Item` in both `mgjtp_mappings_json_key_to_str.h` and `command_types.h`. Also updated all usage of these enums in various files. The change was made to improve the code readability, as the "k" prefix was considered redundant and potentially confusing for some developers. Contributes to CURA-10561

CURA-10561

github-actions

⚠️ clang-tidy found issue(s) with the introduced code (1/1)

github-actions · 2023-10-29T16:11:19Z

include/dulcificum/gcode/gcode_to_command.h

+        // TODO: InitialTemperatureBuildPlate
+        // TODO: BuildVolumeTemperature
+        // TODO: Unknown
+    };


⚠️ readability-identifier-naming ⚠️
invalid case style for method to_proto_path

Suggested change

};

void toProtoPath(const ast::G0_G1& command);

github-actions · 2023-10-29T16:11:19Z

include/dulcificum/gcode/gcode_to_command.h

+        // TODO: BuildVolumeTemperature
+        // TODO: Unknown
+    };
+    void to_proto_path(const ast::G0_G1& command);


⚠️ readability-identifier-naming ⚠️
invalid case style for method to_proto_path

Suggested change

void to_proto_path(const ast::G0_G1& command);

void toProtoPath(const ast::G4& command);

github-actions · 2023-10-29T16:11:19Z

include/dulcificum/gcode/gcode_to_command.h

+        // TODO: Unknown
+    };
+    void to_proto_path(const ast::G0_G1& command);
+    void to_proto_path(const ast::G4& command);


⚠️ readability-identifier-naming ⚠️
invalid case style for method to_proto_path

Suggested change

void to_proto_path(const ast::G4& command);

void toProtoPath(const ast::M104& command);

github-actions · 2023-10-29T16:11:19Z

include/dulcificum/gcode/gcode_to_command.h

+    };
+    void to_proto_path(const ast::G0_G1& command);
+    void to_proto_path(const ast::G4& command);
+    void to_proto_path(const ast::M104& command);


⚠️ readability-identifier-naming ⚠️
invalid case style for method to_proto_path

Suggested change

void to_proto_path(const ast::M104& command);

void toProtoPath(const ast::M106& command);

github-actions · 2023-10-29T16:11:19Z

include/dulcificum/gcode/gcode_to_command.h

+    void to_proto_path(const ast::G0_G1& command);
+    void to_proto_path(const ast::G4& command);
+    void to_proto_path(const ast::M104& command);
+    void to_proto_path(const ast::M106& command);


⚠️ readability-identifier-naming ⚠️
invalid case style for method to_proto_path

Suggested change

void to_proto_path(const ast::M106& command);

void toProtoPath(const ast::M107& command);

github-actions · 2023-10-29T16:11:20Z

src/miracle_jtp/mgjtp_command_to_json.cpp

    {
        const auto com = static_cast<const botcmd::Comment&>(cmd);
        jparams[k_key_str::comment] = com.comment;
        return jparams;
    }
-    if (cmd.type == botcmd::CommandType::kActiveFanDuty)
+    if (cmd.type == botcmd::CommandType::ActiveFanDuty)
    {
        const auto dut = static_cast<const botcmd::FanDuty&>(cmd);


⚠️ cppcoreguidelines-pro-type-static-cast-downcast ⚠️
do not use static_cast to downcast from a base to a derived class

github-actions · 2023-10-29T16:11:20Z

src/miracle_jtp/mgjtp_command_to_json.cpp

    {
        const auto dut = static_cast<const botcmd::FanDuty&>(cmd);
        jparams[k_key_str::index] = dut.index;
        jparams[k_key_str::value] = dut.duty;
        return jparams;
    }
-    if (cmd.type == botcmd::CommandType::kActiveFanEnable)
+    if (cmd.type == botcmd::CommandType::ActiveFanEnable)
    {
        const auto fan = static_cast<const botcmd::FanToggle&>(cmd);


⚠️ cppcoreguidelines-pro-type-static-cast-downcast ⚠️
do not use static_cast to downcast from a base to a derived class

github-actions · 2023-10-29T16:11:20Z

src/miracle_jtp/mgjtp_command_to_json.cpp

        return jparams;
    }
-    if (cmd.type == botcmd::CommandType::kWaitForTemperature)
+    if (cmd.type == botcmd::CommandType::WaitForTemperature)
    {
        const auto dcmd = static_cast<const botcmd::WaitForTemperature&>(cmd);


⚠️ cppcoreguidelines-pro-type-static-cast-downcast ⚠️
do not use static_cast to downcast from a base to a derived class

github-actions · 2023-10-29T16:11:20Z

src/miracle_jtp/mgjtp_command_to_json.cpp

    {
        const auto dcmd = static_cast<const botcmd::WaitForTemperature&>(cmd);
        jparams[k_key_str::index] = dcmd.index;
        return jparams;
    }
-    if (cmd.type == botcmd::CommandType::kChangeTool)
+    if (cmd.type == botcmd::CommandType::ChangeTool)
    {
        const auto dcmd = static_cast<const botcmd::ChangeTool&>(cmd);


⚠️ cppcoreguidelines-pro-type-static-cast-downcast ⚠️
do not use static_cast to downcast from a base to a derived class

github-actions · 2023-10-29T16:11:20Z

src/miracle_jtp/mgjtp_command_to_json.cpp

    {
        const auto dcmd = static_cast<const botcmd::ChangeTool&>(cmd);
        jparams = zipListsIgnoreNan(k_key_str::k_param_point_names, dcmd.position);
        jparams[k_key_str::index] = dcmd.index;
        return jparams;
    }
-    if (cmd.type == botcmd::CommandType::kDelay)
+    if (cmd.type == botcmd::CommandType::Delay)
    {
        const auto dcmd = static_cast<const botcmd::Delay&>(cmd);


⚠️ cppcoreguidelines-pro-type-static-cast-downcast ⚠️
do not use static_cast to downcast from a base to a derived class

CURA-10561

Contributes to CURA-10561

If no P index is given 0 is assumed Contributes to CURA-10561

github-actions

⚠️ clang-tidy found issue(s) with the introduced code (1/1)

github-actions · 2023-10-30T10:14:58Z

src/gcode/gcode_to_command.cpp

+
+    // set fan speed
+    const auto set_fan_speed = std::make_shared<botcmd::FanDuty>();
+    set_fan_speed->duty = command.S.has_value() ? command.S.value() : 255;


⚠️ cppcoreguidelines-avoid-magic-numbers ⚠️
255 is a magic number; consider replacing it with a named constant

Contributes to CURA-10561 Co-authored-by: c.lamboo <[email protected]>

github-actions

⚠️ clang-tidy found issue(s) with the introduced code (1/1)

github-actions · 2023-10-31T13:13:04Z

src/gcode/gcode_to_command.cpp

+    }
+}
+
+void VisitCommand::to_proto_path(const gcode::ast::G0_G1& command)


⚠️ readability-function-cognitive-complexity ⚠️
function to_proto_path has cognitive complexity of 34 (threshold 25)

github-actions · 2023-10-31T13:13:05Z

src/gcode/gcode_to_command.cpp

+        state.active_tool == 1 && command.E.has_value() ? delta_e : 0.0,
+    };
+    // gcode is in mm / min, bot cmd uses mm / sec
+    move->feedrate = state.F[state.active_tool] / 60.0;


⚠️ cppcoreguidelines-avoid-magic-numbers ⚠️
60.0 is a magic number; consider replacing it with a named constant

wawanbreton

A lot of code-style remarks
Some optimization proposals
A few possible bugs
Hope this helps !

apps/translator_main.cpp

conanfile.py

wawanbreton · 2023-10-31T10:18:35Z

include/dulcificum/gcode/ast/ast.h

What does AST stand for ?

Abstract Syntax Tree

wawanbreton · 2023-10-31T10:20:18Z

include/dulcificum.h

+
+[[nodiscard]] std::string GCode2Miracle_JTP(const std::string& content)
+{
+    auto gcode_ast = dulcificum::gcode::parse(content);


How are errors/warnings reported ?

wawanbreton · 2023-10-31T10:21:41Z

include/dulcificum.h

+
+[[nodiscard]] std::string GCode2Miracle_JTP(const std::string& content)
+{
+    auto gcode_ast = dulcificum::gcode::parse(content);


Please do not use auto when the type is not explicit

src/gcode/gcode_to_command.cpp

wawanbreton · 2023-10-31T14:35:20Z

src/gcode/gcode_to_command.cpp

+        state.active_tool == 0 && command.E.has_value() ? delta_e : 0.0,
+        state.active_tool == 1 && command.E.has_value() ? delta_e : 0.0,
+    };
+    // gcode is in mm / min, bot cmd uses mm / sec


bot cmd should use standard units as much as possible.. Technically, seconds is the standard unit time and mm/s is widely used for 3D printing so that should be used instead.

src/gcode/gcode_to_command.cpp

wawanbreton · 2023-10-31T14:40:12Z

src/gcode/gcode_to_command.cpp

+    else if (delta_e == 0)
+    {
+        move->tags.emplace_back(botcmd::Tag::TravelMove);
+    }


Please add an empty line here as these are big if/else if

src/gcode/gcode_to_command.cpp

CURA-10561 Co-authored-by: Erwan MATHIEU <[email protected]>

CURA-10561

…nto CURA-10561_regex_gcode_parser

CURA-10561

jellespijker and others added 15 commits October 16, 2023 10:28

Add CTRE as dep

df9b0b5

Contribute to CURA-10561

fix incorrect path io header

0a546e7

Contribute to CURA-10561

Applied clang-format.

cc1eba9

Applied clang-format.

3e43412

Applied clang-format.

98e0afd

Revert "Applied clang-format."

2d9dc21

This reverts commit 98e0afd.

Revert "Modify code for better traversal of GCode AST"

01c2c33

This reverts commit a8e0443.

Applied clang-format.

d021414

github-actions bot requested changes Oct 23, 2023

View reviewed changes

scottsha reviewed Oct 23, 2023

View reviewed changes

casperlamboo and others added 11 commits October 24, 2023 15:13

Combine g1 and g2 into one command

94eb3f1

CURA-10561

Add delay and comment commands

2ddc6c4

CURA-10561

Add ranges dependency

3681de5

CURA-10561

Implement basic translation from gcode ast to command list

13dda18

CURA-10561

Applied clang-format.

6ebc114

Fix G92 command

2e8244e

G92 changes the origin, and thus only changes the state since no concept of a changing origin is known to the internal command list CURA-10561

Allow for relative positioning in move command

93a2660

CURA-10561

Use string to locally copy string views

19ab560

CURA-10561

Fix parsing floats on mac

446baef

CURA-10561

Applied clang-format.

04b9cc6

Disable comments

8dc6295

gave run time errors CURA-10561

github-actions bot requested changes Oct 29, 2023

View reviewed changes

jellespijker and others added 6 commits October 29, 2023 16:02

Offset negative raft layer index

8b0921a

Contributes to CURA-10561

Applied clang-format.

01648f8

Set temperature of correct target

d7182d8

CURA-10561

Add initial temperature to protopath

45001ab

CURA-10561

Merge remote-tracking branch 'origin/CURA-10561_regex_gcode_parser' i…

1ff1164

…nto CURA-10561_regex_gcode_parser

github-actions bot requested changes Oct 29, 2023

View reviewed changes

jellespijker and others added 2 commits October 29, 2023 16:57

Set temperature of correct tool

048b151

CURA-10561

github-actions bot requested changes Oct 29, 2023

View reviewed changes

casperlamboo and others added 2 commits October 29, 2023 17:20

Wait for temperature

ed12e00

CURA-10561

Parsing the P index for Fan

3c9e886

Contributes to CURA-10561

casperlamboo changed the title ~~Gcode parser~~ MakerBot plugin Oct 30, 2023

jellespijker and others added 2 commits October 30, 2023 11:00

Allow for P parameter for M106 and M107

a830455

If no P index is given 0 is assumed Contributes to CURA-10561

Applied clang-format.

76c942c

github-actions bot requested changes Oct 30, 2023

View reviewed changes

jellespijker mentioned this pull request Oct 30, 2023

MakerBot plugin Ultimaker/Cura#17147

Merged

jellespijker marked this pull request as ready for review October 30, 2023 11:25

jellespijker and others added 2 commits October 31, 2023 13:58

Use rel E and store origins

99b1842

Contributes to CURA-10561 Co-authored-by: c.lamboo <[email protected]>

Applied clang-format.

480a555

github-actions bot requested changes Oct 31, 2023

View reviewed changes

wawanbreton reviewed Oct 31, 2023

View reviewed changes

casperlamboo and others added 4 commits October 31, 2023 16:45

Fix bug where temp was updating wrong extruder

3f55bf0

CURA-10561 Co-authored-by: Erwan MATHIEU <[email protected]>

Get tool from command

8ddd06f

CURA-10561

Merge remote-tracking branch 'origin/CURA-10561_regex_gcode_parser' i…

d755576

…nto CURA-10561_regex_gcode_parser

Fix error

46917cf

CURA-10561

casperlamboo merged commit 5da7dd6 into main Oct 31, 2023
12 checks passed

	node_t factory(const auto& ast)
	node_t factory(const auto& /ast/)

	static constexpr std::string_view axis{ Axis.value };
	static constexpr std::string_view AXIS{ Axis.value };

	double StringViewToDouble(std::string_view sv);
	double stringViewToDouble(std::string_view sv);

		@@ -0,0 +1,45 @@
		#ifndef INCLUDE_DULCIFICUM_GCODE_AST_ACCELERATION_H
		#define INCLUDE_DULCIFICUM_GCODE_AST_ACCELERATION_H

		@@ -104,6 +106,16 @@ nlohmann::json getCommandParameters(const botcmd::Command& cmd)
		jparams[k_key_str::seconds] = dcmd.seconds;

	void to_proto_path(const ast::G4& command);
	void toProtoPath(const ast::G0_G1& command);

	void to_proto_path(const ast::M104& command);
	void toProtoPath(const ast::G4& command);

	void to_proto_path(const ast::M106& command);
	void toProtoPath(const ast::M104& command);

	void to_proto_path(const ast::M107& command);
	void toProtoPath(const ast::M106& command);

	void to_proto_path(const ast::M109& command);
	void toProtoPath(const ast::M107& command);

		@@ -82,7 +84,8 @@ nlohmann::json getCommandParameters(const botcmd::Command& cmd)
		{
		const auto dcmd = static_cast<const botcmd::SetTemperature&>(cmd);

		@@ -2,8 +2,10 @@

		#include "dulcificum/miracle_jtp/mgjtp_mappings_json_key_to_str.h"

		#include <fmt/format.h>

	#include <range/v3/view/remove_if.hpp>
	#include <range/v3/view/remove_if.hpp>

	#include <range/v3/view/zip.hpp>
	#include <range/v3/view/zip.hpp>

	void to_proto_path(const ast::InitialTemperatureExtruder& command);
	void toProtoPath(const ast::InitialTemperatureExtruder& command);

	void to_proto_path(const ast::G0_G1& command);
	void toProtoPath(const ast::G4& command);

MakerBot plugin #5

MakerBot plugin #5

Conversation

casperlamboo commented Oct 23, 2023

github-actions bot commented Oct 23, 2023 • edited Loading

Unit Test Results

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot Oct 23, 2023

Choose a reason for hiding this comment

github-actions bot Oct 23, 2023

Choose a reason for hiding this comment

github-actions bot Oct 23, 2023

Choose a reason for hiding this comment

github-actions bot Oct 23, 2023

Choose a reason for hiding this comment

github-actions bot Oct 23, 2023

Choose a reason for hiding this comment

github-actions bot Oct 23, 2023

Choose a reason for hiding this comment

github-actions bot Oct 23, 2023

Choose a reason for hiding this comment

github-actions bot Oct 23, 2023

Choose a reason for hiding this comment

github-actions bot Oct 23, 2023

Choose a reason for hiding this comment

github-actions bot Oct 23, 2023

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot Oct 23, 2023

Choose a reason for hiding this comment

github-actions bot Oct 23, 2023

Choose a reason for hiding this comment

github-actions bot Oct 23, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot Oct 29, 2023

Choose a reason for hiding this comment

github-actions bot Oct 29, 2023

Choose a reason for hiding this comment

github-actions bot Oct 29, 2023

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot Oct 29, 2023

Choose a reason for hiding this comment

github-actions bot Oct 29, 2023

Choose a reason for hiding this comment

github-actions bot Oct 29, 2023

Choose a reason for hiding this comment

github-actions bot Oct 29, 2023

Choose a reason for hiding this comment

github-actions bot Oct 29, 2023

Choose a reason for hiding this comment

github-actions bot Oct 29, 2023

Choose a reason for hiding this comment

github-actions bot Oct 29, 2023

Choose a reason for hiding this comment

github-actions bot Oct 29, 2023

Choose a reason for hiding this comment

github-actions bot Oct 29, 2023

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot Oct 29, 2023

Choose a reason for hiding this comment

github-actions bot Oct 29, 2023

Choose a reason for hiding this comment

github-actions bot Oct 29, 2023

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot Oct 29, 2023

Choose a reason for hiding this comment

github-actions bot left a comment

github-actions bot commented Oct 23, 2023 •

edited

Loading