Skip to content

Commit

Permalink
⛙ Merge w/Marlin
Browse files Browse the repository at this point in the history
  • Loading branch information
classicrocker883 committed Aug 13, 2024
2 parents de9be52 + ed7f3b2 commit e29579e
Show file tree
Hide file tree
Showing 40 changed files with 729 additions and 370 deletions.
9 changes: 9 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@ contact_links:
- name: 👤 Professional Firmware Facebook group
url: https://www.facebook.com/groups/513889302986197
about: Please ask and answer questions here.
- name: 🕹 Marlin on Discord
url: https://discord.com/servers/marlin-firmware-461605380783472640
about: Join the Discord server for support and discussion.
- name: 🔗 Marlin Discussion Forum
url: https://reprap.org/forum/list.php?415
about: A searchable web forum hosted by RepRap dot org.
- name: 📺 Marlin Videos on YouTube
url: https://www.youtube.com/results?search_query=marlin+firmware
about: Tutorials and more from Marlin users all around the world. Great for new users!
- name: 💸 Want to donate?
url: https://www.paypal.com/paypalme/andrewleduc
about: Your contribution to this project is always welcome!
2 changes: 1 addition & 1 deletion .github/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ We have a Message Board and a Facebook group where our knowledgable user communi

If chat is more your speed, you can join the MarlinFirmware Discord server:

* Use the link https://discord.gg/n5NJ59y to join up as a General User.
* Use the link https://discord.com/servers/marlin-firmware-461605380783472640 to join up as a General User.
* Even though our Discord is pretty active, it may take a while for community members to respond — please be patient!
* Use the `#general` channel for general questions or discussion about Marlin.
* Other channels exist for certain topics or are limited to Patrons. Check the channel list.
Expand Down
2 changes: 1 addition & 1 deletion Marlin/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
//#define STRING_DISTRIBUTION_DATE "2024-08-07"
//#define STRING_DISTRIBUTION_DATE "2024-08-13"

#define STRING_DISTRIBUTION_DATE __DATE__
#define STRING_DISTRIBUTION_TIME __TIME__
Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/core/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ enum AxisEnum : uint8_t {
#endif

// Distinct axes, including all E and Core
NUM_AXIS_ENUMS,
NUM_AXIS_HEADS,

// Most of the time we refer only to the single E_AXIS
#if HAS_EXTRUDERS
Expand Down Expand Up @@ -995,7 +995,7 @@ class AxisBits;

class AxisBits {
public:
typedef bits_t(NUM_AXIS_ENUMS) el;
typedef bits_t(NUM_AXIS_HEADS) el;
union {
el bits;
// Axes x, y, z ... e0, e1, e2 ... hx, hy, hz
Expand Down Expand Up @@ -1056,7 +1056,7 @@ class AxisBits {
FI AxisBits& operator=(const el p) { set(p); return *this; }

FI void reset() { set(0); }
FI void fill() { set(_BV(NUM_AXIS_ENUMS) - 1); }
FI void fill() { set(_BV(NUM_AXIS_HEADS) - 1); }

#define MSET(pE,pX,pY,pZ,pI,pJ,pK,pU,pV,pW) LOGICAL_AXIS_CODE(e=pE, x=pX, y=pY, z=pZ, i=pI, j=pJ, k=pK, u=pU, v=pV, w=pW)

Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/gcode/bedlevel/G26.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,11 @@
#endif

#ifndef G26_XY_FEEDRATE
#define G26_XY_FEEDRATE (PLANNER_XY_FEEDRATE() / 3.0)
#define G26_XY_FEEDRATE (PLANNER_XY_FEEDRATE_MM_S / 3.0)
#endif

#ifndef G26_XY_FEEDRATE_TRAVEL
#define G26_XY_FEEDRATE_TRAVEL (PLANNER_XY_FEEDRATE() / 1.5)
#define G26_XY_FEEDRATE_TRAVEL (PLANNER_XY_FEEDRATE_MM_S / 1.5)
#endif

#if CROSSHAIRS_SIZE >= INTERSECTION_CIRCLE_RADIUS
Expand Down Expand Up @@ -783,7 +783,7 @@ void GcodeSuite::G26() {

g26.recover_filament(destination);

{ REMEMBER(fr, feedrate_mm_s, PLANNER_XY_FEEDRATE() * 0.1f);
{ REMEMBER(fr, feedrate_mm_s, PLANNER_XY_FEEDRATE_MM_S * 0.1f);
plan_arc(endpoint, arc_offset, false, 0); // Draw a counter-clockwise arc
destination = current_position;
}
Expand Down
5 changes: 4 additions & 1 deletion Marlin/src/gcode/bedlevel/G42.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,12 @@
#include "../gcode.h"
#include "../../MarlinCore.h" // for IsRunning()
#include "../../module/motion.h"
#include "../../module/probe.h" // for probe.offset
#include "../../feature/bedlevel/bedlevel.h"

#if HAS_PROBE_XY_OFFSET
#include "../../module/probe.h" // for probe.offset
#endif

/**
* G42: Move X & Y axes to mesh coordinates (I & J)
*
Expand Down
5 changes: 4 additions & 1 deletion Marlin/src/gcode/bedlevel/M420.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@
#include "../gcode.h"
#include "../../feature/bedlevel/bedlevel.h"
#include "../../module/planner.h"
#include "../../module/probe.h"

#if ENABLED(MARLIN_DEV_MODE)
#include "../../module/probe.h"
#endif

#if ENABLED(EEPROM_SETTINGS)
#include "../../module/settings.h"
Expand Down
4 changes: 3 additions & 1 deletion Marlin/src/gcode/calibrate/G28.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@
#include "../../feature/tmc_util.h"
#endif

#include "../../module/probe.h"
#if HAS_BED_PROBE
#include "../../module/probe.h"
#endif

#if ENABLED(BLTOUCH)
#include "../../feature/bltouch.h"
Expand Down
27 changes: 15 additions & 12 deletions Marlin/src/gcode/feature/ft_motion/M493.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ void say_shaping() {

// FT Shaping
#if HAS_X_AXIS
if (CMPNSTR_HAS_SHAPER(X_AXIS)) {
if (AXIS_HAS_SHAPER(X)) {
SERIAL_ECHOPGM(" with " AXIS_0_NAME);
say_shaper_type(X_AXIS);
}
#endif
#if HAS_Y_AXIS
if (CMPNSTR_HAS_SHAPER(Y_AXIS)) {
if (AXIS_HAS_SHAPER(Y)) {
SERIAL_ECHOPGM(" and with " AXIS_1_NAME);
say_shaper_type(Y_AXIS);
}
Expand All @@ -80,7 +80,7 @@ void say_shaping() {
dynamic = z_based || g_based;

// FT Dynamic Frequency Mode
if (CMPNSTR_HAS_SHAPER(X_AXIS) || CMPNSTR_HAS_SHAPER(Y_AXIS)) {
if (AXIS_HAS_SHAPER(X) || AXIS_HAS_SHAPER(Y)) {
#if HAS_DYNAMIC_FREQ
SERIAL_ECHOPGM("Dynamic Frequency Mode ");
switch (ftMotion.cfg.dynFreqMode) {
Expand Down Expand Up @@ -201,8 +201,11 @@ void GcodeSuite::M493() {

if (active != ftMotion.cfg.active) {
switch (active) {
case false: flag.reset_ft = true;
case true: flag.report_h = true;
case false:
flag.reset_ft = true;
// fall-thru
case true:
flag.report_h = true;
ftMotion.cfg.active = active;
break;
}
Expand Down Expand Up @@ -267,7 +270,7 @@ void GcodeSuite::M493() {

// Dynamic frequency mode parameter.
if (parser.seenval('D')) {
if (CMPNSTR_HAS_SHAPER(X_AXIS) || CMPNSTR_HAS_SHAPER(Y_AXIS)) {
if (AXIS_HAS_SHAPER(X) || AXIS_HAS_SHAPER(Y)) {
const dynFreqMode_t val = dynFreqMode_t(parser.value_byte());
switch (val) {
#if HAS_DYNAMIC_FREQ_MM
Expand Down Expand Up @@ -301,7 +304,7 @@ void GcodeSuite::M493() {

// Parse frequency parameter (X axis).
if (parser.seenval('A')) {
if (CMPNSTR_HAS_SHAPER(X_AXIS)) {
if (AXIS_HAS_SHAPER(X)) {
const float val = parser.value_float();
/// TODO: Frequency minimum is dependent on the shaper used; the above check isn't always correct.
if (WITHIN(val, FTM_MIN_SHAPE_FREQ, (FTM_FS) / 2)) {
Expand Down Expand Up @@ -330,7 +333,7 @@ void GcodeSuite::M493() {
// Parse zeta parameter (X axis).
if (parser.seenval('I')) {
const float val = parser.value_float();
if (CMPNSTR_HAS_SHAPER(X_AXIS)) {
if (AXIS_HAS_SHAPER(X)) {
if (WITHIN(val, 0.01f, 1.0f)) {
ftMotion.cfg.zeta[0] = val;
flag.update = true;
Expand All @@ -345,7 +348,7 @@ void GcodeSuite::M493() {
// Parse vtol parameter (X axis).
if (parser.seenval('Q')) {
const float val = parser.value_float();
if (CMPNSTR_IS_EISHAPER(X_AXIS)) {
if (AXIS_HAS_EISHAPER(X)) {
if (WITHIN(val, 0.00f, 1.0f)) {
ftMotion.cfg.vtol[0] = val;
flag.update = true;
Expand All @@ -363,7 +366,7 @@ void GcodeSuite::M493() {

// Parse frequency parameter (Y axis).
if (parser.seenval('B')) {
if (CMPNSTR_HAS_SHAPER(Y_AXIS)) {
if (AXIS_HAS_SHAPER(Y)) {
const float val = parser.value_float();
if (WITHIN(val, FTM_MIN_SHAPE_FREQ, (FTM_FS) / 2)) {
ftMotion.cfg.baseFreq[Y_AXIS] = val;
Expand Down Expand Up @@ -391,7 +394,7 @@ void GcodeSuite::M493() {
// Parse zeta parameter (Y axis).
if (parser.seenval('J')) {
const float val = parser.value_float();
if (CMPNSTR_HAS_SHAPER(Y_AXIS)) {
if (AXIS_HAS_SHAPER(Y)) {
if (WITHIN(val, 0.01f, 1.0f)) {
ftMotion.cfg.zeta[1] = val;
flag.update = true;
Expand All @@ -406,7 +409,7 @@ void GcodeSuite::M493() {
// Parse vtol parameter (Y axis).
if (parser.seenval('R')) {
const float val = parser.value_float();
if (CMPNSTR_IS_EISHAPER(Y_AXIS)) {
if (AXIS_HAS_EISHAPER(Y)) {
if (WITHIN(val, 0.00f, 1.0f)) {
ftMotion.cfg.vtol[1] = val;
flag.update = true;
Expand Down
Loading

0 comments on commit e29579e

Please sign in to comment.