Skip to content

Commit 742c555

Browse files
committed
Update to 2.0.3
1 parent 717c4fe commit 742c555

File tree

82 files changed

+1588
-53735
lines changed

Some content is hidden

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

82 files changed

+1588
-53735
lines changed

Marlin/Configuration.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,8 @@
379379
* 13 : 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
380380
* 15 : 100k thermistor calibration for JGAurora A5 hotend
381381
* 18 : ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327
382-
* 20 : Pt100 with circuit in the Ultimainboard V2.x
382+
* 20 : Pt100 with circuit in the Ultimainboard V2.x with 5v excitation (AVR)
383+
* 21 : Pt100 with circuit in the Ultimainboard V2.x with 3.3v excitation (STM32 \ LPC176x....)
383384
* 201 : Pt100 with circuit in Overlord, similar to Ultimainboard V2.x
384385
* 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
385386
* 61 : 100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup

Marlin/Configuration_adv.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@
819819
// probing on a screwhead or hollow washer, probe near the edges.
820820
//#define CALIBRATION_MEASURE_AT_TOP_EDGES
821821

822-
// Define pin which is read during calibration
822+
// Define the pin to read during calibration
823823
#ifndef CALIBRATION_PIN
824824
#define CALIBRATION_PIN -1 // Override in pins.h or set to -1 to use your Z endstop
825825
#define CALIBRATION_PIN_INVERTING false // Set to true to invert the pin

Marlin/Version.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
/**
2929
* Marlin release version identifier
3030
*/
31-
//#define SHORT_BUILD_VERSION "2.0.2"
31+
//#define SHORT_BUILD_VERSION "2.0.3"
3232

3333
/**
3434
* Verbose version identifier which should contain a reference to the location
@@ -41,7 +41,7 @@
4141
* here we define this default string as the date where the latest release
4242
* version was tagged.
4343
*/
44-
//#define STRING_DISTRIBUTION_DATE "2020-01-27"
44+
//#define STRING_DISTRIBUTION_DATE "2020-01-31"
4545

4646
/**
4747
* Defines a generic printer name to be output to the LCD after booting Marlin.

Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_sw_i2c.cpp under construction

-254
This file was deleted.

Marlin/src/MarlinCore.cpp

+16-16
Original file line numberDiff line numberDiff line change
@@ -291,36 +291,36 @@ void quickstop_stepper() {
291291
}
292292

293293
void enable_e_steppers() {
294-
#define _ENA_E(N) enable_E##N();
294+
#define _ENA_E(N) ENABLE_AXIS_E##N();
295295
REPEAT(E_STEPPERS, _ENA_E)
296296
}
297297

298298
void enable_all_steppers() {
299299
#if ENABLED(AUTO_POWER_CONTROL)
300300
powerManager.power_on();
301301
#endif
302-
enable_X();
303-
enable_Y();
304-
enable_Z();
302+
ENABLE_AXIS_X();
303+
ENABLE_AXIS_Y();
304+
ENABLE_AXIS_Z();
305305
enable_e_steppers();
306306
}
307307

308308
void disable_e_steppers() {
309-
#define _DIS_E(N) disable_E##N();
309+
#define _DIS_E(N) DISABLE_AXIS_E##N();
310310
REPEAT(E_STEPPERS, _DIS_E)
311311
}
312312

313313
void disable_e_stepper(const uint8_t e) {
314-
#define _CASE_DIS_E(N) case N: disable_E##N(); break;
314+
#define _CASE_DIS_E(N) case N: DISABLE_AXIS_E##N(); break;
315315
switch (e) {
316316
REPEAT(EXTRUDERS, _CASE_DIS_E)
317317
}
318318
}
319319

320320
void disable_all_steppers() {
321-
disable_X();
322-
disable_Y();
323-
disable_Z();
321+
DISABLE_AXIS_X();
322+
DISABLE_AXIS_Y();
323+
DISABLE_AXIS_Z();
324324
disable_e_steppers();
325325
}
326326

@@ -461,13 +461,13 @@ void manage_inactivity(const bool ignore_stepper_queue/*=false*/) {
461461
if (!already_shutdown_steppers) {
462462
already_shutdown_steppers = true; // L6470 SPI will consume 99% of free time without this
463463
#if ENABLED(DISABLE_INACTIVE_X)
464-
disable_X();
464+
DISABLE_AXIS_X();
465465
#endif
466466
#if ENABLED(DISABLE_INACTIVE_Y)
467-
disable_Y();
467+
DISABLE_AXIS_Y();
468468
#endif
469469
#if ENABLED(DISABLE_INACTIVE_Z)
470-
disable_Z();
470+
DISABLE_AXIS_Z();
471471
#endif
472472
#if ENABLED(DISABLE_INACTIVE_E)
473473
disable_e_steppers();
@@ -542,19 +542,19 @@ void manage_inactivity(const bool ignore_stepper_queue/*=false*/) {
542542
#if ENABLED(SWITCHING_EXTRUDER)
543543
bool oldstatus;
544544
switch (active_extruder) {
545-
default: oldstatus = E0_ENABLE_READ(); enable_E0(); break;
545+
default: oldstatus = E0_ENABLE_READ(); ENABLE_AXIS_E0(); break;
546546
#if E_STEPPERS > 1
547-
case 2: case 3: oldstatus = E1_ENABLE_READ(); enable_E1(); break;
547+
case 2: case 3: oldstatus = E1_ENABLE_READ(); ENABLE_AXIS_E1(); break;
548548
#if E_STEPPERS > 2
549-
case 4: case 5: oldstatus = E2_ENABLE_READ(); enable_E2(); break;
549+
case 4: case 5: oldstatus = E2_ENABLE_READ(); ENABLE_AXIS_E2(); break;
550550
#endif // E_STEPPERS > 2
551551
#endif // E_STEPPERS > 1
552552
}
553553
#else // !SWITCHING_EXTRUDER
554554
bool oldstatus;
555555
switch (active_extruder) {
556556
default:
557-
#define _CASE_EN(N) case N: oldstatus = E##N##_ENABLE_READ(); enable_E##N(); break;
557+
#define _CASE_EN(N) case N: oldstatus = E##N##_ENABLE_READ(); ENABLE_AXIS_E##N(); break;
558558
REPEAT(E_STEPPERS, _CASE_EN);
559559
}
560560
#endif

Marlin/src/core/boards.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -332,9 +332,10 @@
332332
//
333333
// Espressif ESP32 WiFi
334334
//
335-
#define BOARD_ESPRESSIF_ESP32 6000
335+
#define BOARD_ESPRESSIF_ESP32 6000 // Generic ESP32
336336
#define BOARD_MRR_ESPA 6001
337337
#define BOARD_MRR_ESPE 6002
338+
#define BOARD_E4D_BOX 6003 // E4d@BOX
338339

339340
//
340341
// Simulations

0 commit comments

Comments
 (0)