Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix 2.0.x #1

Merged
merged 191 commits into from
May 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
191 commits
Select commit Hold shift + click to select a range
cf8c14b
ExtUI allow small JD mm
thinkyhead Apr 24, 2020
94dd9ce
[cron] Bump distribution date (2020-04-25)
thinkyhead Apr 25, 2020
e25402b
Apply TERN
thinkyhead Apr 24, 2020
75b9155
Update Italian language (#17695)
GMagician Apr 25, 2020
4af8343
ReARM SDSS pin for RRD LCDs (#17698)
sl1pkn07 Apr 25, 2020
d7f90c3
Fix SAMD51 Step Timer (#17692)
GMagician Apr 25, 2020
3a27933
Fixes for FYSETC Touch EVE 5" on AVR (#17659)
thinkyhead Apr 25, 2020
d2a5d51
Add NOZZLE_PARK_Z_RAISE_MIN (#17624)
onovy Apr 25, 2020
58ac9f2
NOZZLE_PARK_FEATURE - X/Y only axis move (#17697)
studiodyne Apr 25, 2020
be7e040
Update Italian language (#17707)
GMagician Apr 25, 2020
4d3a2bd
Clean up filament change menu (#17702)
GMagician Apr 25, 2020
307c48f
Parity between LPC176x pins
thinkyhead Apr 25, 2020
b700b3c
Fix M261, i2c EEPROM, i2c Encoder for LPC (#17678)
randellhodges Apr 25, 2020
11f7695
Touch UI FTDI EVE is now beta (#17704)
sl1pkn07 Apr 25, 2020
aa832a0
Use MCP4451 interface for MKS SBASE
thinkyhead Apr 25, 2020
28518c2
Save/Restore leveling on toolchange for singlenozzle too (#17682)
studiodyne Apr 25, 2020
75c17c7
Include echo: with M503 output (#17665)
ellensp Apr 25, 2020
f907de2
Fix mesh point sign
thinkyhead Apr 25, 2020
4895546
[cron] Bump distribution date (2020-04-26)
thinkyhead Apr 26, 2020
1752cd4
Add a Mightyboard pin (#17538)
chepo92 Apr 26, 2020
02a054c
HOME_BEFORE_FILAMENT_CHANGE on any axis unknown (#17681)
thisiskeithb Apr 26, 2020
21067ab
Add Prusa MMU2S settings - beta (#17523)
tonihoang Apr 26, 2020
4ed912e
Misc. patches
thinkyhead Apr 25, 2020
eebb68c
SPI performance tweak
thinkyhead Apr 26, 2020
ef74ca6
Fix unwarm regData index
thinkyhead Apr 26, 2020
3bee705
[cron] Bump distribution date (2020-04-27)
thinkyhead Apr 27, 2020
8f86f7c
Add Cap:SDCARD to M115 (#17208)
guruathwal Apr 27, 2020
e1ad955
Revert EEPROM tweak
thinkyhead Apr 27, 2020
011ecc3
Fix I2C_ADDRESS ambiguity
thinkyhead Apr 27, 2020
3d45a4b
Encapsulate Temperature items
thinkyhead Apr 27, 2020
8b3c7dd
Add HAS_FAN and others
thinkyhead Apr 27, 2020
33217b0
Add HOTEND_OVERSHOOT
thinkyhead Apr 27, 2020
c4d5746
Apply HAS_MULTI_HOTEND
thinkyhead Apr 27, 2020
8f7f7f7
Apply missed const& SPI optimization (#17734)
sjasonsmith Apr 27, 2020
c7f9eb7
Allow M42 M with other parameters (#17744)
ellensp Apr 27, 2020
65daf3b
Fix G12 for SINGLENOZZLE (#17540)
InsanityAutomation Apr 27, 2020
5ae45ba
Adjustable XY_FREQUENCY_LIMIT (#17583)
studiodyne Apr 27, 2020
fec416f
LCD preheat followup
thinkyhead Apr 27, 2020
fc98383
Update home bump assert
thinkyhead Apr 27, 2020
967c1d8
Do SD sort order in CardReader
thinkyhead Apr 25, 2020
c536b8d
Apply ternary macros
thinkyhead Apr 25, 2020
5507b60
Fix dummy thermistors
thinkyhead Apr 27, 2020
5d1498f
Fix SKR Pro / GTR i2c pins
thinkyhead Apr 27, 2020
0777e39
Add M115 Cap:BABYSTEPPING (#17691)
xboxpro1 Apr 27, 2020
37176ed
Apply maxtemp patch
thinkyhead Apr 27, 2020
c56b665
Permit Stall Sensitivity of 0 (#17722)
neilvangeffen Apr 27, 2020
7eac76d
Patch BLTouch Z_MAX_PIN for GT2560 Rev.A (non-plus) (#17721)
Warboy1982 Apr 27, 2020
267c25f
Remove spurious brace
thinkyhead Apr 27, 2020
9b90dfa
Fix draw_temps missing define compile (#17750)
grauerfuchs Apr 27, 2020
035d6cd
Patch i2c, info menu
thinkyhead Apr 27, 2020
0b3a964
Fixes for ExtUI / EVE (#17726)
RudolphRiedel Apr 27, 2020
66676e6
Remove extra macro
thinkyhead Apr 27, 2020
cd2652b
[cron] Bump distribution date (2020-04-28)
thinkyhead Apr 28, 2020
f6e820b
Fix buffer stuff
thinkyhead Apr 28, 2020
94291eb
Clean up old externs / includes
thinkyhead Apr 28, 2020
01c646a
Apply more HAS_HOTEND
thinkyhead Apr 28, 2020
919e53a
Fix: SD pause broken with PARK_HEAD_ON_PAUSE (#17754)
marciot Apr 28, 2020
630b4ec
Patch XY frequency menu
thinkyhead Apr 28, 2020
9fa5119
Block during move in UBL mesh edit (#17670)
filippor Apr 28, 2020
f709c56
STM32F1: SD EEPROM fallback (#17715)
sjasonsmith Apr 28, 2020
4f003fc
Streamline menu item logic (#17664)
thinkyhead Apr 28, 2020
89b17b5
Followup fixes for singlenozzle, etc. (#17712)
studiodyne Apr 28, 2020
0eeb5e2
General cleanup: pause, MarlinCore
thinkyhead Apr 25, 2020
07a6bf9
Enhance and fix FTDI EVE Touch UI (#17755)
marciot Apr 28, 2020
7c3909b
Save/Load distinct TMC SG thresholds (#17741)
neilvangeffen Apr 28, 2020
5f7a759
LPC176x SPI / I2C PersistentStore (#17651)
randellhodges Apr 28, 2020
2c95912
Clean up whitespace
thinkyhead Apr 28, 2020
56e3106
Clean up whitespace
thinkyhead Apr 28, 2020
4b35ff1
STEPPER_TIMER_RATE might call a function
thinkyhead Apr 28, 2020
bd82b8b
Suppress compile warnings
thinkyhead Apr 28, 2020
e7a6a52
Use center defines for Z Safe Homing XY (#17782)
the-real-orca Apr 28, 2020
1d71451
Fix undefined Z stall
thinkyhead Apr 28, 2020
f03f76e
Fix info menu without leveling
thinkyhead Apr 29, 2020
3d3d2a9
Cleanup with updated macros
thinkyhead Apr 29, 2020
7b0891b
[cron] Bump distribution date (2020-04-29)
thinkyhead Apr 29, 2020
2fbce22
Cleanup followup
thinkyhead Apr 29, 2020
ef43520
Disambiguate i2c calls
thinkyhead Apr 29, 2020
36adbfa
Fix MKS S-Gen standard pins (#17786)
ellensp Apr 29, 2020
2d75866
G12 E soft endstops parameter (#17788)
thinkyhead Apr 29, 2020
5e6faa9
Refine EEPROM types / flags (#17772)
thinkyhead Apr 29, 2020
c26725c
L64XX can use hardStop for M17
thinkyhead Apr 29, 2020
e8b0796
Revert menu_item_if ahead of refactor
thinkyhead Apr 29, 2020
391f7fd
[cron] Bump distribution date (2020-04-30)
thinkyhead Apr 30, 2020
b335c38
Drop extra Marduino includes
thinkyhead Apr 29, 2020
a521b0e
Strip never-used eeprom functions
thinkyhead Apr 29, 2020
3c080ee
Cleanup, comment "wired" eeproms
thinkyhead Apr 30, 2020
7f5730e
Minimal interface for F4/F7 flash
thinkyhead Apr 29, 2020
bd8436d
Fix SAMD51 i2c EEPROM (#17815)
GMagician Apr 30, 2020
9b820d7
Remove QSPI from "wired" EEPROM type
thinkyhead Apr 30, 2020
0b76218
Change RAMPS default filament runout pin (#17814)
GMagician Apr 30, 2020
3efbe9a
[cron] Bump distribution date (2020-05-01)
thinkyhead May 1, 2020
306578d
More explicit LPC timer defines
thinkyhead May 1, 2020
76bc7bf
Pre-clean DUE flash eeprom code
thinkyhead May 1, 2020
b4aebbe
Allow STM32 pins to specify timers (#17805)
xC0000005 May 1, 2020
6edc2c3
Fix eeprom init glitch
thinkyhead May 1, 2020
a226b28
UI and stall reset for extra TMC axes (#17818)
thinkyhead May 1, 2020
2107bc5
Clean up EEPROM interfaces (#17803)
thinkyhead May 1, 2020
2e21c72
Add ExtUI mesh items for Malyan LCD
thinkyhead May 1, 2020
dcd0228
[cron] Bump distribution date (2020-05-02)
thinkyhead May 2, 2020
9b7807d
Clean up M122 code
thinkyhead May 2, 2020
93946c2
Fix ExtUI compile (#17834)
mojocorp May 2, 2020
288447d
Fix XYZ types multiplication/division (#17826)
MathiasGartner May 2, 2020
9381a76
Add Cap:LONG_FILENAME (#17821)
guruathwal May 2, 2020
52f3f3b
Fix motor current array
thinkyhead May 2, 2020
208af8c
Fix STM32 + SoftwareSerial compile (#17831)
sjasonsmith May 2, 2020
db32af9
Fix ExtUI + Archim compile, typos (#17825)
marciot May 2, 2020
8d425c6
Fix missing ProbeTempComp refs (#17833)
trouch May 2, 2020
739b738
Permit more Creality pin overrides (#17820)
rubienr May 2, 2020
cba4c5a
Fix missing var for DGUS_LCD_UI_ORIGIN (#17819)
rubienr May 2, 2020
7613383
Add Rostock 301 thermistors (22, 23) (#17806)
chepo92 May 2, 2020
ef02358
[cron] Bump distribution date (2020-05-03)
thinkyhead May 3, 2020
6b3ed0f
Cleanup in language.h
thinkyhead May 3, 2020
3ea1c8a
Support for Ortur 4.3 mainboard (#17790)
animavitis May 3, 2020
120fcd1
Support GT2560 3rd extruder (#17797)
the-real-orca May 3, 2020
9a4a768
Fix frequency limit editing (#17763)
studiodyne May 3, 2020
0c68794
Improve JD acosx implementation (#17817)
daleckystepan May 3, 2020
36efe75
Followup for Tool Migration (#17800)
studiodyne May 3, 2020
9a69348
Add XYZ_NO_FRAME option
thinkyhead May 3, 2020
5e23fd6
[cron] Bump distribution date (2020-05-04)
thinkyhead May 4, 2020
2a959cd
Fix undefined/unused, Touch UI (#17874)
marciot May 4, 2020
714df30
Fix Fysetc S6 PIO env (#17865)
kunpoolsion May 4, 2020
1c32f10
Fix Malyan LCD crash bug (#17855)
mojocorp May 4, 2020
38d1587
Malyan M200 V2 (#17840)
thinkyhead May 4, 2020
ebe8f2c
Fix acosx condition (#17846)
daleckystepan May 4, 2020
4c4be32
LPC176x requires USE_SHARED_EEPROM (#17858)
randellhodges May 4, 2020
cd8e6a1
Git attributes for UNIX line endings (#17842)
sjasonsmith May 4, 2020
2efe28c
Minor conditional clean
thinkyhead May 3, 2020
b8947ac
More explicit junction/jerk math
thinkyhead May 4, 2020
9fe781c
Tweak powerloss info
thinkyhead May 4, 2020
9819667
Fix setStatusMessage calls (#17879)
marciot May 4, 2020
d571a4d
Relax bed cooling safety check (#17877)
mathiasvr May 4, 2020
c55475e
Fix and combine JD condition
thinkyhead May 5, 2020
7655620
[cron] Bump distribution date (2020-05-05)
thinkyhead May 5, 2020
0080305
Tweaks to platformio.ini
thinkyhead May 4, 2020
bab37dc
Add templated j_move_axis
thinkyhead May 4, 2020
65104b7
Whitespace, M200 test label
thinkyhead May 4, 2020
97e47b4
Wrap some macros
thinkyhead May 5, 2020
90e1035
Define max_e_jerk as array always
thinkyhead May 5, 2020
39263ef
Allow more serial parameters
thinkyhead May 5, 2020
eeabe66
Some distinct E helpers
thinkyhead May 5, 2020
d2b7671
No Z stall by default
thinkyhead May 5, 2020
ac5249a
Update README MCU/boards (#17827)
chepo92 May 5, 2020
973a699
Trailing whitespace
thinkyhead May 5, 2020
2acdd2f
Add Mightyboard Mega env (#17861)
chepo92 May 5, 2020
3fd8ef5
More FTDI EVE fixes (RAMPS, Cheetah) (#17759)
sl1pkn07 May 5, 2020
852a8d6
Configurable kill pin state
thinkyhead May 5, 2020
7a2cc78
Clean up planner modifier methods
thinkyhead May 5, 2020
39f7033
Move S_FMT to HAL, apply to mixer
thinkyhead May 5, 2020
9df7992
[cron] Bump distribution date (2020-05-06)
thinkyhead May 6, 2020
7a03c5a
Update Italian language (#17888)
GMagician May 6, 2020
9ce950e
Move M114 options down
thinkyhead May 6, 2020
a4c9814
Extended reporting options (#16741)
guruathwal May 6, 2020
544b166
Fix poll_runout_states bug
thinkyhead May 6, 2020
0332666
Fix Cheetah pins alias (#17882)
sl1pkn07 May 6, 2020
1aa9d44
Format some pins
thinkyhead May 6, 2020
7c26a54
Fix, clarify LCD_TIMEOUT_TO_STATUS
thinkyhead May 6, 2020
6947dc1
Fix M503 output formatting (#17893)
guruathwal May 6, 2020
10e875c
[cron] Bump distribution date (2020-05-07)
thinkyhead May 7, 2020
6be76af
Overrideable CASE_LIGHT_PIN
thinkyhead May 7, 2020
c262b9c
[cron] Bump distribution date (2020-05-08)
thinkyhead May 8, 2020
a2153c1
Add TMC driver HW serial defines (#17909)
sjasonsmith May 8, 2020
703e97b
Support TMCStepper with MKS Robin Pro (#17908)
sjasonsmith May 8, 2020
34a2fd7
DGUS minor fixups (#17901)
GerogeFu May 8, 2020
8fd3af0
Fix UBL mesh edit grid display (#17897)
tpruvot May 8, 2020
8f3d176
Init all ESP01 (module) WIFI pins (#17679)
Bob-the-Kuhn May 8, 2020
a95a60c
[cron] Bump distribution date (2020-05-09)
thinkyhead May 9, 2020
60be3b1
[cron] Bump distribution date (2020-05-10)
thinkyhead May 10, 2020
2af270c
Fix M115_GEOMETRY_REPORT extra commas (#17933)
sjasonsmith May 10, 2020
209fd2d
Fix SERIAL_ECHO forever bug (#17932)
sjasonsmith May 10, 2020
37f86d9
Update Galician language (#17929)
fortes23 May 10, 2020
7a9bb6b
Remove old M73 / SD comment (#17928)
Bostwickenator May 10, 2020
91fe0e1
Fix line ending in M360 (#17917)
guruathwal May 10, 2020
52aa459
Improved EEPROM boot error (#17916)
thinkyhead May 10, 2020
71b41c9
Better EEPROM alert message
thinkyhead May 10, 2020
ba9a9bb
Normalize HAL/STM32 targets (#17904)
sjasonsmith May 10, 2020
de6a725
Fix G2/G3 segment size
thinkyhead May 10, 2020
8d3caa9
Newer TMCStepper better for LPC176x (#17934)
sjasonsmith May 10, 2020
32dc874
Tempted by the const of a seg_length
thinkyhead May 10, 2020
e5b0892
Fix TERN typo, EXTRA_PROBING
thinkyhead May 10, 2020
86c1125
Sanity check 3-point defines
thinkyhead May 10, 2020
33127f4
More conservative Trinamic DIR delay
thinkyhead May 10, 2020
df7250b
[cron] Bump distribution date (2020-05-11)
thinkyhead May 11, 2020
3b87fc1
Adjust some variants spacing, comments
thinkyhead May 11, 2020
00e7599
Fix host_action_notify and string types (#17953)
Desuuuu May 11, 2020
fcd1678
Actually apply DGUS_[RT]X_BUFFER_SIZE (#17952)
Desuuuu May 11, 2020
e22e076
Reduce division in JD calc (#17945)
XDA-Bam May 11, 2020
3381a4a
Fix vector normalization in JD (#17938)
XDA-Bam May 11, 2020
9d545f1
Fysetc S6 direct DFU upload (#17943)
trouch May 11, 2020
25aade1
Improve STM32F4 Flash Behavior (#17946)
sjasonsmith May 11, 2020
4680aa6
EEPROM Flash Leveling enabled for more STM32F4 (#17948)
sjasonsmith May 11, 2020
1475fd3
M600 R<resume temperature> (#17919)
chestwood96 May 11, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 8 additions & 3 deletions .github/workflows/test-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,20 @@ jobs:
- jgaurora_a5s_a1
- STM32F103VE_longer
- STM32F407VE_black
- STM32F401VE_STEVAL
- BIGTREE_BTT002
- BIGTREE_SKR_PRO
- BIGTREE_GTR_V1_0
- mks_robin
- ARMED
- FYSETC_S6
- STM32F070RB_malyan
- malyan_M300
- mks_robin_lite
- FLYF407ZG
- rumba32_f446ve
- rumba32_mks
- mks_robin_pro

# Put lengthy tests last

Expand All @@ -70,12 +78,9 @@ jobs:
#- STM32F7

# Non-working environment tests

#- BIGTREE_BTT002
#- at90usb1286_cdc
#- at90usb1286_dfu
#- STM32F103CB_malyan
#- mks_robin_lite
#- mks_robin_mini
#- mks_robin_nano

Expand Down
20 changes: 17 additions & 3 deletions Marlin/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,13 @@
// For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE

// Save and restore temperature and fan speed on tool-change.
// Set standby for the unselected tool with M104/106/109 T...
#if ENABLED(SINGLENOZZLE)
//#define SINGLENOZZLE_STANDBY_TEMP
//#define SINGLENOZZLE_STANDBY_FAN
#endif

/**
* Průša MK2 Single Nozzle Multi-Material Multiplexer, and variants.
*
Expand Down Expand Up @@ -380,6 +387,8 @@
* 18 : ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327
* 20 : Pt100 with circuit in the Ultimainboard V2.x with 5v excitation (AVR)
* 21 : Pt100 with circuit in the Ultimainboard V2.x with 3.3v excitation (STM32 \ LPC176x....)
* 22 : 100k (hotend) with 4.7k pullup to 3.3V and 220R to analog input (as in GTM32 Pro vB)
* 23 : 100k (bed) with 4.7k pullup to 3.3v and 220R to analog input (as in GTM32 Pro vB)
* 201 : Pt100 with circuit in Overlord, similar to Ultimainboard V2.x
* 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
* 61 : 100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup
Expand Down Expand Up @@ -1361,8 +1370,8 @@
//#define Z_SAFE_HOMING

#if ENABLED(Z_SAFE_HOMING)
#define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2) // X point for Z homing when homing all axes (G28).
#define Z_SAFE_HOMING_Y_POINT ((Y_BED_SIZE) / 2) // Y point for Z homing when homing all axes (G28).
#define Z_SAFE_HOMING_X_POINT X_CENTER // X point for Z homing when homing all axes (G28).
#define Z_SAFE_HOMING_Y_POINT Y_CENTER // Y point for Z homing when homing all axes (G28).
#endif

// Homing speeds (mm/m)
Expand Down Expand Up @@ -1501,8 +1510,11 @@
#if ENABLED(NOZZLE_PARK_FEATURE)
// Specify a park position as { X, Y, Z_raise }
#define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MAX_POS - 10), 20 }
//#define NOZZLE_PARK_X_ONLY // X move only is required to park
//#define NOZZLE_PARK_Y_ONLY // Y move only is required to park
#define NOZZLE_PARK_Z_RAISE_MIN 2 // (mm) Always raise Z by at least this distance
#define NOZZLE_PARK_XY_FEEDRATE 100 // (mm/s) X and Y axes feedrate (also used for delta Z axis)
#define NOZZLE_PARK_Z_FEEDRATE 5 // (mm/s) Z axis feedrate (not used for delta printers)
#define NOZZLE_PARK_Z_FEEDRATE 5 // (mm/s) Z axis feedrate (not used for delta printers)
#endif

/**
Expand Down Expand Up @@ -2065,6 +2077,8 @@

//
// DGUS Touch Display with DWIN OS. (Choose one.)
// ORIGIN : https://www.aliexpress.com/item/32993409517.html
// FYSETC : https://www.aliexpress.com/item/32961471929.html
//
//#define DGUS_LCD_UI_ORIGIN
//#define DGUS_LCD_UI_FYSETC
Expand Down
68 changes: 53 additions & 15 deletions Marlin/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -286,11 +286,6 @@
#endif
#endif

// Extra options for the M114 "Current Position" report
//#define M114_DETAIL // Use 'M114` for details to check planner calculations
//#define M114_REALTIME // Real current position based on forward kinematics
//#define M114_LEGACY // M114 used to synchronize on every call. Enable if needed.

// Show Temperature ADC value
// Enable for M105 to include ADC values read from temperature sensors.
//#define SHOW_TEMP_ADC_VALUES
Expand Down Expand Up @@ -784,10 +779,16 @@
#define SLOWDOWN_DIVISOR 2
#endif

// Frequency limit
// See nophead's blog for more info
// Not working O
//#define XY_FREQUENCY_LIMIT 15
/**
* XY Frequency limit
* Reduce resonance by limiting the frequency of small zigzag infill moves.
* See http://hydraraptor.blogspot.com/2010/12/frequency-limit.html
* Use M201 F<freq> G<min%> to change limits at runtime.
*/
//#define XY_FREQUENCY_LIMIT 10 // (Hz) Maximum frequency of small zigzag infill moves. Set with M201 F<hertz>.
#ifdef XY_FREQUENCY_LIMIT
#define XY_FREQUENCY_MIN_PERCENT 5 // (percent) Minimum FR percentage to apply. Set with M201 G<min%>.
#endif

// Minimum planner junction speed. Sets the default minimum speed the planner plans for at the end
// of the buffer and all stops. This should not be much greater than zero and should only be changed
Expand Down Expand Up @@ -1253,7 +1254,8 @@
// Show SD percentage next to the progress bar
//#define DOGM_SD_PERCENT

// Enable to save many cycles by drawing a hollow frame on the Info Screen
// Save many cycles by drawing a hollow frame or no frame on the Info Screen
//#define XYZ_NO_FRAME
#define XYZ_HOLLOW_FRAME

// Enable to save many cycles by drawing a hollow frame on Menu Screens
Expand Down Expand Up @@ -1375,10 +1377,13 @@
//#define TOUCH_UI_800x480

// Mappings for boards with a standard RepRapDiscount Display connector
//#define AO_EXP1_PINMAP // AlephObjects CLCD UI EXP1 mapping
//#define AO_EXP2_PINMAP // AlephObjects CLCD UI EXP2 mapping
//#define CR10_TFT_PINMAP // Rudolph Riedel's CR10 pin mapping
//#define S6_TFT_PINMAP // FYSETC S6 pin mapping
//#define AO_EXP1_PINMAP // AlephObjects CLCD UI EXP1 mapping
//#define AO_EXP2_PINMAP // AlephObjects CLCD UI EXP2 mapping
//#define CR10_TFT_PINMAP // Rudolph Riedel's CR10 pin mapping
//#define S6_TFT_PINMAP // FYSETC S6 pin mapping
//#define CHEETAH_TFT_PINMAP // FYSETC Cheetah pin mapping
//#define E3_EXP1_PINMAP // E3 type boards (SKR E3/DIP, and Stock boards) EXP1 pin mapping
//#define GENERIC_EXP2_PINMAP // GENERIC EXP2 pin mapping

//#define OTHER_PIN_LAYOUT // Define pins manually below
#if ENABLED(OTHER_PIN_LAYOUT)
Expand Down Expand Up @@ -1880,7 +1885,7 @@
// (May break filament if not retracted beforehand.)
//#define TOOLCHANGE_FS_INIT_BEFORE_SWAP

// Prime on the first T command even if the same or no toolchange / swap
// Prime on the first T0 (If other, TOOLCHANGE_FS_INIT_BEFORE_SWAP applied)
// Enable it (M217 V[0/1]) before printing, to avoid unwanted priming on host connect
//#define TOOLCHANGE_FS_PRIME_FIRST_USED

Expand Down Expand Up @@ -2384,7 +2389,11 @@
#define X_STALL_SENSITIVITY 8
#define X2_STALL_SENSITIVITY X_STALL_SENSITIVITY
#define Y_STALL_SENSITIVITY 8
#define Y2_STALL_SENSITIVITY Y_STALL_SENSITIVITY
//#define Z_STALL_SENSITIVITY 8
//#define Z2_STALL_SENSITIVITY Z_STALL_SENSITIVITY
//#define Z3_STALL_SENSITIVITY Z_STALL_SENSITIVITY
//#define Z4_STALL_SENSITIVITY Z_STALL_SENSITIVITY
//#define SPI_ENDSTOPS // TMC2130 only
//#define IMPROVE_HOMING_RELIABILITY
#endif
Expand Down Expand Up @@ -2912,6 +2921,9 @@
* Include capabilities in M115 output
*/
#define EXTENDED_CAPABILITIES_REPORT
#if ENABLED(EXTENDED_CAPABILITIES_REPORT)
//#define M115_GEOMETRY_REPORT
#endif

/**
* Expected Printer Check
Expand Down Expand Up @@ -2945,6 +2957,11 @@
*/
//#define NO_WORKSPACE_OFFSETS

// Extra options for the M114 "Current Position" report
//#define M114_DETAIL // Use 'M114` for details to check planner calculations
//#define M114_REALTIME // Real current position based on forward kinematics
//#define M114_LEGACY // M114 used to synchronize on every call. Enable if needed.

/**
* Set the number of proportional font spaces required to fill up a typical character space.
* This can help to better align the output of commands like `G29 O` Mesh Output.
Expand All @@ -2965,6 +2982,8 @@

//#define GCODE_CASE_INSENSITIVE // Accept G-code sent to the firmware in lowercase

//#define REPETIER_GCODE_M360 // Add commands originally from Repetier FW

/**
* CNC G-code options
* Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
Expand Down Expand Up @@ -3265,6 +3284,25 @@
{ 10.0, 700 }, \
{ -10.0, 400 }, \
{ -50.0, 2000 }
#endif

// Using a sensor like the MMU2S
//#define PRUSA_MMU2_S_MODE
#if ENABLED(PRUSA_MMU2_S_MODE)
#define MMU2_C0_RETRY 5 // Number of retries (total time = timeout*retries)

#define MMU2_CAN_LOAD_FEEDRATE 800 // (mm/m)
#define MMU2_CAN_LOAD_SEQUENCE \
{ 0.1, MMU2_CAN_LOAD_FEEDRATE }, \
{ 60.0, MMU2_CAN_LOAD_FEEDRATE }, \
{ -52.0, MMU2_CAN_LOAD_FEEDRATE }

#define MMU2_CAN_LOAD_RETRACT 6.0 // (mm) Keep under the distance between Load Sequence values
#define MMU2_CAN_LOAD_DEVIATION 0.8 // (mm) Acceptable deviation

#define MMU2_CAN_LOAD_INCREMENT 0.2 // (mm) To reuse within MMU2 module
#define MMU2_CAN_LOAD_INCREMENT_SEQUENCE \
{ -MMU2_CAN_LOAD_INCREMENT, MMU2_CAN_LOAD_FEEDRATE }

#endif

Expand Down
1 change: 0 additions & 1 deletion Marlin/src/HAL/AVR/HAL.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

#ifdef __AVR__

#include "../../inc/MarlinConfig.h"
Expand Down
9 changes: 5 additions & 4 deletions Marlin/src/HAL/AVR/HAL.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,11 @@
// Defines
// ------------------------

//#define analogInputToDigitalPin(IO) IO
// AVR PROGMEM extension for sprintf_P
#define S_FMT "%S"

// AVR PROGMEM extension for string define
#define PGMSTR(NAM,STR) const char NAM[] PROGMEM = STR

#ifndef CRITICAL_SECTION_START
#define CRITICAL_SECTION_START() unsigned char _sreg = SREG; cli()
Expand All @@ -60,9 +64,6 @@
#define ENABLE_ISRS() sei()
#define DISABLE_ISRS() cli()

// On AVR this is in math.h?
//#define square(x) ((x)*(x))

// ------------------------
// Types
// ------------------------
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/HAL/AVR/MarlinSerial.h
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,8 @@
template <uint8_t serial>
struct MarlinInternalSerialCfg {
static constexpr int PORT = serial;
static constexpr unsigned int RX_SIZE = 128;
static constexpr unsigned int TX_SIZE = 48;
static constexpr unsigned int RX_SIZE = DGUS_RX_BUFFER_SIZE;
static constexpr unsigned int TX_SIZE = DGUS_TX_BUFFER_SIZE;
static constexpr bool XONOFF = false;
static constexpr bool EMERGENCYPARSER = false;
static constexpr bool DROPPED_RX = false;
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/HAL/AVR/Servo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@

#include <avr/interrupt.h>

#include "../shared/Marduino.h"
#include "../shared/servo.h"
#include "../shared/servo_private.h"

Expand Down
10 changes: 7 additions & 3 deletions Marlin/src/HAL/AVR/eeprom.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,15 @@

#if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)

/**
* PersistentStore for Arduino-style EEPROM interface
* with implementations supplied by the framework.
*/

#include "../shared/eeprom_api.h"

bool PersistentStore::access_start() { return true; }
size_t PersistentStore::capacity() { return E2END + 1; }
bool PersistentStore::access_start() { return true; }
bool PersistentStore::access_finish() { return true; }

bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
Expand Down Expand Up @@ -61,7 +67,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
return false; // always assume success for AVR's
}

size_t PersistentStore::capacity() { return E2END + 1; }

#endif // EEPROM_SETTINGS || SD_FIRMWARE_UPDATE
#endif // __AVR__
1 change: 0 additions & 1 deletion Marlin/src/HAL/AVR/watchdog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

#ifdef __AVR__

#include "../../inc/MarlinConfig.h"
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/HAL/DUE/DebugMonitor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

#ifdef ARDUINO_ARCH_SAM

#include "../../core/macros.h"
Expand Down
9 changes: 1 addition & 8 deletions Marlin/src/HAL/DUE/HAL.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#define CPU_32_BIT

#include "../shared/Marduino.h"
#include "../shared/eeprom_if.h"
#include "../shared/math_32bit.h"
#include "../shared/HAL_SPI.h"
#include "fastio.h"
Expand Down Expand Up @@ -130,14 +131,6 @@ void sei(); // Enable interrupts
void HAL_clear_reset_source(); // clear reset reason
uint8_t HAL_get_reset_source(); // get reset reason

//
// EEPROM
//
void eeprom_write_byte(uint8_t *pos, unsigned char value);
uint8_t eeprom_read_byte(uint8_t *pos);
void eeprom_read_block (void *__dst, const void *__src, size_t __n);
void eeprom_update_block (const void *__src, void *__dst, size_t __n);

//
// ADC
//
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/HAL/DUE/Servo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@

#if HAS_SERVOS

#include "../shared/Marduino.h"
#include "../shared/servo.h"
#include "../shared/servo_private.h"

Expand Down
Loading