Skip to content

Commit

Permalink
Merge branch 'main' into CURA-12096_move_gradual_flow_plugin_back_int…
Browse files Browse the repository at this point in the history
…o_the_engine_core
  • Loading branch information
HellAholic authored Aug 21, 2024
2 parents ef4426e + f05cf24 commit 6f30175
Show file tree
Hide file tree
Showing 9 changed files with 1,877 additions and 0 deletions.
1 change: 1 addition & 0 deletions include/ExtruderPlan.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class ExtruderPlan
FRIEND_TEST(ExtruderPlanPathsParameterizedTest, BackPressureCompensationFull);
FRIEND_TEST(ExtruderPlanPathsParameterizedTest, BackPressureCompensationHalf);
FRIEND_TEST(ExtruderPlanTest, BackPressureCompensationEmptyPlan);
friend class FffGcodeWriterTest_SurfaceGetsExtraInfillLinesUnderIt_Test;
#endif
public:
size_t extruder_nr_{ 0 }; //!< The extruder used for this paths in the current plan.
Expand Down
2 changes: 2 additions & 0 deletions include/FffGcodeWriter.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ struct MeshPathConfigs;
class FffGcodeWriter : public NoCopy
{
friend class FffProcessor; // Because FffProcessor exposes finalize (TODO)
friend class FffGcodeWriterTest_SurfaceGetsExtraInfillLinesUnderIt_Test;

private:
coord_t max_object_height; //!< The maximal height of all previously sliced meshgroups, used to avoid collision when moving to the next meshgroup to print.

Expand Down
1 change: 1 addition & 0 deletions include/LayerPlan.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ class LayerPlan : public NoCopy
friend class LayerPlanBuffer;
#ifdef BUILD_TESTS
friend class AddTravelTest;
friend class FffGcodeWriterTest_SurfaceGetsExtraInfillLinesUnderIt_Test;
#endif

public:
Expand Down
13 changes: 13 additions & 0 deletions include/settings/EnumSettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,19 @@ enum class EFillMethod
PLUGIN, // Place plugin after none to prevent it from being tested in the gtest suite.
};


/*!
* Enum for the value of extra_infill_lines_to_support_skins
* This enum defines what extra lines should be added to infill to support
* skins above.
*/
enum class EExtraInfillLinesToSupportSkins
{
WALLS_AND_LINES,
WALLS,
NONE,
};

/*!
* Type of platform adhesion.
*/
Expand Down
Loading

0 comments on commit 6f30175

Please sign in to comment.