Skip to content

Commit a261846

Browse files
thinkyheadthinkyhead
committed
⏪️ Revert proposed angular feed-rate
1 parent d2c9ede commit a261846

750 files changed

Lines changed: 1896 additions & 6019 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎config/default/Configuration.h‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1293,16 +1293,10 @@
12931293
* M204 P Acceleration
12941294
* M204 R Retract Acceleration
12951295
* M204 T Travel Acceleration
1296-
* M204 I Angular Acceleration
1297-
* M204 J Angular Travel Acceleration
12981296
*/
1299-
#define DEFAULT_ACCELERATION 3000 // X, Y, Z ... and E acceleration for printing moves
1300-
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
1301-
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z ... acceleration for travel (non printing) moves
1302-
#if ENABLED(AXIS4_ROTATES)
1303-
#define DEFAULT_ANGULAR_ACCELERATION 3000 // I, J, K acceleration for rotational-only printing moves
1304-
#define DEFAULT_ANGULAR_TRAVEL_ACCELERATION 3000 // I, J, K acceleration for rotational-only travel (non printing) moves
1305-
#endif
1297+
#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration for printing moves
1298+
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
1299+
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
13061300

13071301
/**
13081302
* Default Jerk limits (mm/s)

‎config/default/Configuration_adv.h‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1258,12 +1258,8 @@
12581258
#define DISABLE_IDLE_E // Shut down all idle extruders
12591259

12601260
// Default Minimum Feedrates for printing and travel moves
1261-
#define DEFAULT_MINIMUMFEEDRATE 0.0 // (mm/s) Minimum feedrate. Set with M205 S.
1262-
#define DEFAULT_MINTRAVELFEEDRATE 0.0 // (mm/s) Minimum travel feedrate. Set with M205 T.
1263-
#if HAS_ROTATIONAL_AXES
1264-
#define DEFAULT_ANGULAR_MINIMUMFEEDRATE 0.0 // (°/s) Minimum feedrate for rotational-only moves. Set with M205 P.
1265-
#define DEFAULT_ANGULAR_MINTRAVELFEEDRATE 0.0 // (°/s) Minimum travel feedrate for rotational-only moves. Set with M205 Q.
1266-
#endif
1261+
#define DEFAULT_MINIMUMFEEDRATE 0.0 // (mm/s. °/s for rotational-only moves) Minimum feedrate. Set with M205 S.
1262+
#define DEFAULT_MINTRAVELFEEDRATE 0.0 // (mm/s. °/s for rotational-only moves) Minimum travel feedrate. Set with M205 T.
12671263

12681264
// Minimum time that a segment needs to take as the buffer gets emptied
12691265
#define DEFAULT_MINSEGMENTTIME 20000 // (µs) Set with M205 B.
@@ -4026,7 +4022,6 @@
40264022
#ifdef G0_FEEDRATE
40274023
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
40284024
#endif
4029-
//#define G0_ANGULAR_FEEDRATE 2700 // (°/min)
40304025

40314026
/**
40324027
* Startup commands

‎config/examples/3DFabXYZ/Migbot/Configuration.h‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,16 +1295,10 @@
12951295
* M204 P Acceleration
12961296
* M204 R Retract Acceleration
12971297
* M204 T Travel Acceleration
1298-
* M204 I Angular Acceleration
1299-
* M204 J Angular Travel Acceleration
13001298
*/
1301-
#define DEFAULT_ACCELERATION 1590 // X, Y, Z ... and E acceleration for printing moves
1302-
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
1303-
#define DEFAULT_TRAVEL_ACCELERATION 1590 // X, Y, Z ... acceleration for travel (non printing) moves
1304-
#if ENABLED(AXIS4_ROTATES)
1305-
#define DEFAULT_ANGULAR_ACCELERATION 3000 // I, J, K acceleration for rotational-only printing moves
1306-
#define DEFAULT_ANGULAR_TRAVEL_ACCELERATION 3000 // I, J, K acceleration for rotational-only travel (non printing) moves
1307-
#endif
1299+
#define DEFAULT_ACCELERATION 1590 // X, Y, Z and E acceleration for printing moves
1300+
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
1301+
#define DEFAULT_TRAVEL_ACCELERATION 1590 // X, Y, Z acceleration for travel (non printing) moves
13081302

13091303
/**
13101304
* Default Jerk limits (mm/s)

‎config/examples/3DFabXYZ/Migbot/Configuration_adv.h‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1258,12 +1258,8 @@
12581258
#define DISABLE_IDLE_E // Shut down all idle extruders
12591259

12601260
// Default Minimum Feedrates for printing and travel moves
1261-
#define DEFAULT_MINIMUMFEEDRATE 0.0 // (mm/s) Minimum feedrate. Set with M205 S.
1262-
#define DEFAULT_MINTRAVELFEEDRATE 0.0 // (mm/s) Minimum travel feedrate. Set with M205 T.
1263-
#if HAS_ROTATIONAL_AXES
1264-
#define DEFAULT_ANGULAR_MINIMUMFEEDRATE 0.0 // (°/s) Minimum feedrate for rotational-only moves. Set with M205 P.
1265-
#define DEFAULT_ANGULAR_MINTRAVELFEEDRATE 0.0 // (°/s) Minimum travel feedrate for rotational-only moves. Set with M205 Q.
1266-
#endif
1261+
#define DEFAULT_MINIMUMFEEDRATE 0.0 // (mm/s) Minimum feedrate. Set with M205 S.
1262+
#define DEFAULT_MINTRAVELFEEDRATE 0.0 // (mm/s) Minimum travel feedrate. Set with M205 T.
12671263

12681264
// Minimum time that a segment needs to take as the buffer gets emptied
12691265
#define DEFAULT_MINSEGMENTTIME 20000 // (µs) Set with M205 B.
@@ -4026,7 +4022,6 @@
40264022
#ifdef G0_FEEDRATE
40274023
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
40284024
#endif
4029-
//#define G0_ANGULAR_FEEDRATE 2700 // (°/min)
40304025

40314026
/**
40324027
* Startup commands

‎config/examples/3DMatik/XL/Configuration.h‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1293,16 +1293,10 @@
12931293
* M204 P Acceleration
12941294
* M204 R Retract Acceleration
12951295
* M204 T Travel Acceleration
1296-
* M204 I Angular Acceleration
1297-
* M204 J Angular Travel Acceleration
12981296
*/
1299-
#define DEFAULT_ACCELERATION 3000 // X, Y, Z ... and E acceleration for printing moves
1300-
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
1301-
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z ... acceleration for travel (non printing) moves
1302-
#if ENABLED(AXIS4_ROTATES)
1303-
#define DEFAULT_ANGULAR_ACCELERATION 3000 // I, J, K acceleration for rotational-only printing moves
1304-
#define DEFAULT_ANGULAR_TRAVEL_ACCELERATION 3000 // I, J, K acceleration for rotational-only travel (non printing) moves
1305-
#endif
1297+
#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration for printing moves
1298+
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
1299+
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
13061300

13071301
/**
13081302
* Default Jerk limits (mm/s)

‎config/examples/3DMatik/XL/Configuration_adv.h‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1258,12 +1258,8 @@
12581258
#define DISABLE_IDLE_E // Shut down all idle extruders
12591259

12601260
// Default Minimum Feedrates for printing and travel moves
1261-
#define DEFAULT_MINIMUMFEEDRATE 0.0 // (mm/s) Minimum feedrate. Set with M205 S.
1262-
#define DEFAULT_MINTRAVELFEEDRATE 0.0 // (mm/s) Minimum travel feedrate. Set with M205 T.
1263-
#if HAS_ROTATIONAL_AXES
1264-
#define DEFAULT_ANGULAR_MINIMUMFEEDRATE 0.0 // (°/s) Minimum feedrate for rotational-only moves. Set with M205 P.
1265-
#define DEFAULT_ANGULAR_MINTRAVELFEEDRATE 0.0 // (°/s) Minimum travel feedrate for rotational-only moves. Set with M205 Q.
1266-
#endif
1261+
#define DEFAULT_MINIMUMFEEDRATE 0.0 // (mm/s) Minimum feedrate. Set with M205 S.
1262+
#define DEFAULT_MINTRAVELFEEDRATE 0.0 // (mm/s) Minimum travel feedrate. Set with M205 T.
12671263

12681264
// Minimum time that a segment needs to take as the buffer gets emptied
12691265
#define DEFAULT_MINSEGMENTTIME 20000 // (µs) Set with M205 B.
@@ -4026,7 +4022,6 @@
40264022
#ifdef G0_FEEDRATE
40274023
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
40284024
#endif
4029-
//#define G0_ANGULAR_FEEDRATE 2700 // (°/min)
40304025

40314026
/**
40324027
* Startup commands

‎config/examples/ADIMLab/Gantry v1/Configuration.h‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1293,16 +1293,10 @@
12931293
* M204 P Acceleration
12941294
* M204 R Retract Acceleration
12951295
* M204 T Travel Acceleration
1296-
* M204 I Angular Acceleration
1297-
* M204 J Angular Travel Acceleration
12981296
*/
1299-
#define DEFAULT_ACCELERATION 1000 // X, Y, Z ... and E acceleration for printing moves
1300-
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts
1301-
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z ... acceleration for travel (non printing) moves
1302-
#if ENABLED(AXIS4_ROTATES)
1303-
#define DEFAULT_ANGULAR_ACCELERATION 3000 // I, J, K acceleration for rotational-only printing moves
1304-
#define DEFAULT_ANGULAR_TRAVEL_ACCELERATION 3000 // I, J, K acceleration for rotational-only travel (non printing) moves
1305-
#endif
1297+
#define DEFAULT_ACCELERATION 1000 // X, Y, Z and E acceleration for printing moves
1298+
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts
1299+
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
13061300

13071301
/**
13081302
* Default Jerk limits (mm/s)

‎config/examples/ADIMLab/Gantry v1/Configuration_adv.h‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1258,12 +1258,8 @@
12581258
#define DISABLE_IDLE_E // Shut down all idle extruders
12591259

12601260
// Default Minimum Feedrates for printing and travel moves
1261-
#define DEFAULT_MINIMUMFEEDRATE 0.0 // (mm/s) Minimum feedrate. Set with M205 S.
1262-
#define DEFAULT_MINTRAVELFEEDRATE 0.0 // (mm/s) Minimum travel feedrate. Set with M205 T.
1263-
#if HAS_ROTATIONAL_AXES
1264-
#define DEFAULT_ANGULAR_MINIMUMFEEDRATE 0.0 // (°/s) Minimum feedrate for rotational-only moves. Set with M205 P.
1265-
#define DEFAULT_ANGULAR_MINTRAVELFEEDRATE 0.0 // (°/s) Minimum travel feedrate for rotational-only moves. Set with M205 Q.
1266-
#endif
1261+
#define DEFAULT_MINIMUMFEEDRATE 0.0 // (mm/s) Minimum feedrate. Set with M205 S.
1262+
#define DEFAULT_MINTRAVELFEEDRATE 0.0 // (mm/s) Minimum travel feedrate. Set with M205 T.
12671263

12681264
// Minimum time that a segment needs to take as the buffer gets emptied
12691265
#define DEFAULT_MINSEGMENTTIME 20000 // (µs) Set with M205 B.
@@ -4026,7 +4022,6 @@
40264022
#ifdef G0_FEEDRATE
40274023
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
40284024
#endif
4029-
//#define G0_ANGULAR_FEEDRATE 2700 // (°/min)
40304025

40314026
/**
40324027
* Startup commands

‎config/examples/ADIMLab/Gantry v2/Configuration.h‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1293,16 +1293,10 @@
12931293
* M204 P Acceleration
12941294
* M204 R Retract Acceleration
12951295
* M204 T Travel Acceleration
1296-
* M204 I Angular Acceleration
1297-
* M204 J Angular Travel Acceleration
12981296
*/
1299-
#define DEFAULT_ACCELERATION 3000 // X, Y, Z ... and E acceleration for printing moves
1300-
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
1301-
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z ... acceleration for travel (non printing) moves
1302-
#if ENABLED(AXIS4_ROTATES)
1303-
#define DEFAULT_ANGULAR_ACCELERATION 3000 // I, J, K acceleration for rotational-only printing moves
1304-
#define DEFAULT_ANGULAR_TRAVEL_ACCELERATION 3000 // I, J, K acceleration for rotational-only travel (non printing) moves
1305-
#endif
1297+
#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration for printing moves
1298+
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
1299+
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
13061300

13071301
/**
13081302
* Default Jerk limits (mm/s)

‎config/examples/ADIMLab/Gantry v2/Configuration_adv.h‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1258,12 +1258,8 @@
12581258
#define DISABLE_IDLE_E // Shut down all idle extruders
12591259

12601260
// Default Minimum Feedrates for printing and travel moves
1261-
#define DEFAULT_MINIMUMFEEDRATE 0.0 // (mm/s) Minimum feedrate. Set with M205 S.
1262-
#define DEFAULT_MINTRAVELFEEDRATE 0.0 // (mm/s) Minimum travel feedrate. Set with M205 T.
1263-
#if HAS_ROTATIONAL_AXES
1264-
#define DEFAULT_ANGULAR_MINIMUMFEEDRATE 0.0 // (°/s) Minimum feedrate for rotational-only moves. Set with M205 P.
1265-
#define DEFAULT_ANGULAR_MINTRAVELFEEDRATE 0.0 // (°/s) Minimum travel feedrate for rotational-only moves. Set with M205 Q.
1266-
#endif
1261+
#define DEFAULT_MINIMUMFEEDRATE 0.0 // (mm/s) Minimum feedrate. Set with M205 S.
1262+
#define DEFAULT_MINTRAVELFEEDRATE 0.0 // (mm/s) Minimum travel feedrate. Set with M205 T.
12671263

12681264
// Minimum time that a segment needs to take as the buffer gets emptied
12691265
#define DEFAULT_MINSEGMENTTIME 20000 // (µs) Set with M205 B.
@@ -4026,7 +4022,6 @@
40264022
#ifdef G0_FEEDRATE
40274023
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
40284024
#endif
4029-
//#define G0_ANGULAR_FEEDRATE 2700 // (°/min)
40304025

40314026
/**
40324027
* Startup commands

0 commit comments

Comments
 (0)