Skip to content

Commit ee00e6c

Browse files
MagoKimbraMagoKimbra
committed
Fix Core and update Nextion
1 parent a0ec46a commit ee00e6c

File tree

11 files changed

+174
-138
lines changed

11 files changed

+174
-138
lines changed

‎MarlinKimbra4due/Configuration.h‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,6 @@
6363
//#define SCARA
6464
/***********************************************************************\
6565
66-
/***********************************************************************\
67-
************************ CORE X (YZ) MOLTIPLICATOR ********************
68-
***********************************************************************/
69-
// This define the moltiplicator axis from X to Y or Z in COREXY or
70-
// COREXZ. Normally is equal 1.
71-
#define COREX_MOLTIPLICATOR 1
72-
7366
/***********************************************************************\
7467
********************** Do not touch this section **********************
7568
***********************************************************************/

‎MarlinKimbra4due/Configuration_Cartesian.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@
1414
//#define ENDSTOPPULLUP_XMIN
1515
//#define ENDSTOPPULLUP_YMIN
1616
//#define ENDSTOPPULLUP_ZMIN
17+
//#define ENDSTOPPULLUP_Z2MIN
1718
//#define ENDSTOPPULLUP_XMAX
1819
//#define ENDSTOPPULLUP_YMAX
1920
//#define ENDSTOPPULLUP_ZMAX
21+
//#define ENDSTOPPULLUP_Z2MAX
2022
//#define ENDSTOPPULLUP_ZPROBE
2123
//#define ENDSTOPPULLUP_EMIN
2224
#endif
@@ -26,12 +28,12 @@
2628
#define Y_MIN_ENDSTOP_LOGIC false // set to true to invert the logic of the endstop.
2729
#define Z_MIN_ENDSTOP_LOGIC false // set to true to invert the logic of the endstop.
2830
#define Z2_MIN_ENDSTOP_LOGIC false // set to true to invert the logic of the endstop.
29-
#define E_MIN_ENDSTOP_LOGIC false // set to true to invert the logic of the endstop.
3031
#define X_MAX_ENDSTOP_LOGIC false // set to true to invert the logic of the endstop.
3132
#define Y_MAX_ENDSTOP_LOGIC false // set to true to invert the logic of the endstop.
3233
#define Z_MAX_ENDSTOP_LOGIC false // set to true to invert the logic of the endstop.
3334
#define Z2_MAX_ENDSTOP_LOGIC false // set to true to invert the logic of the endstop.
3435
#define Z_PROBE_ENDSTOP_LOGIC false // set to true to invert the logic of the endstop.
36+
#define E_MIN_ENDSTOP_LOGIC false // set to true to invert the logic of the endstop.
3537

3638
// ENDSTOP SETTINGS:
3739
// Sets direction of endstop when homing; 1=MAX, -1=MIN

‎MarlinKimbra4due/Configuration_Core.h‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,21 @@
66
//=============================Mechanical Settings===========================
77
//===========================================================================
88

9+
/***********************************************************************
10+
************************ CORE X (YZ) MOLTIPLICATOR ********************
11+
***********************************************************************
12+
* This define the moltiplicator axis from X to Y or Z in COREXY or
13+
* COREXZ.
14+
* Example:
15+
* COREXY set COREX_XZ_FACTOR 1
16+
* The result is:
17+
* X = dX + COREX_YZ_FACTOR * dY = dX + 1 * dY = dX + dY
18+
* Y = dX - COREX_YZ_FACTOR * dY = dX - 1 * dY = dX - dY
19+
* Z = dZ
20+
*/
21+
#define COREX_YZ_FACTOR 1
22+
23+
924
// coarse Endstop Settings
1025
//#define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
1126

@@ -14,9 +29,11 @@
1429
//#define ENDSTOPPULLUP_XMIN
1530
//#define ENDSTOPPULLUP_YMIN
1631
//#define ENDSTOPPULLUP_ZMIN
32+
//#define ENDSTOPPULLUP_Z2MIN
1733
//#define ENDSTOPPULLUP_XMAX
1834
//#define ENDSTOPPULLUP_YMAX
1935
//#define ENDSTOPPULLUP_ZMAX
36+
//#define ENDSTOPPULLUP_Z2MAX
2037
//#define ENDSTOPPULLUP_ZPROBE
2138
//#define ENDSTOPPULLUP_EMIN
2239
#endif
@@ -26,12 +43,12 @@
2643
#define Y_MIN_ENDSTOP_LOGIC false // set to true to invert the logic of the endstop.
2744
#define Z_MIN_ENDSTOP_LOGIC false // set to true to invert the logic of the endstop.
2845
#define Z2_MIN_ENDSTOP_LOGIC false // set to true to invert the logic of the endstop.
29-
#define E_MIN_ENDSTOP_LOGIC false // set to true to invert the logic of the endstop.
3046
#define X_MAX_ENDSTOP_LOGIC false // set to true to invert the logic of the endstop.
3147
#define Y_MAX_ENDSTOP_LOGIC false // set to true to invert the logic of the endstop.
3248
#define Z_MAX_ENDSTOP_LOGIC false // set to true to invert the logic of the endstop.
3349
#define Z2_MAX_ENDSTOP_LOGIC false // set to true to invert the logic of the endstop.
3450
#define Z_PROBE_ENDSTOP_LOGIC false // set to true to invert the logic of the endstop.
51+
#define E_MIN_ENDSTOP_LOGIC false // set to true to invert the logic of the endstop.
3552

3653
// ENDSTOP SETTINGS:
3754
// Sets direction of endstop when homing; 1=MAX, -1=MIN

‎MarlinKimbra4due/Configuration_adv.h‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143

144144
#if ENABLED(Z_DUAL_STEPPER_DRIVERS)
145145

146-
// Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
146+
// Z DUAL ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
147147
// That way the machine is capable to align the bed during home, since both Z steppers are homed.
148148
// There is also an implementation of M666 (software endstops adjustment) to this feature.
149149
// After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
@@ -152,17 +152,7 @@
152152
// Play a little bit with small adjustments (0.5mm) and check the behaviour.
153153
// The M119 (endstops report) will start reporting the Z2 Endstop as well.
154154

155-
#define Z2_STEP_PIN E2_STEP_PIN // Stepper to be used to Z2 axis.
156-
#define Z2_DIR_PIN E2_DIR_PIN
157-
#define Z2_ENABLE_PIN E2_ENABLE_PIN
158-
159-
// #define Z_DUAL_ENDSTOPS
160-
161-
#if ENABLED(Z_DUAL_ENDSTOPS)
162-
#define Z2_MAX_PIN 36 //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
163-
const bool Z2_MAX_ENDSTOP_INVERTING = false;
164-
#define DISABLE_XMAX_ENDSTOP //Better to disable the XMAX to avoid conflict. Just rename "XMAX_ENDSTOP" by the endstop you are using for Z2 axis.
165-
#endif
155+
//#define Z_DUAL_ENDSTOPS
166156

167157
#endif // Z_DUAL_STEPPER_DRIVERS
168158

@@ -263,10 +253,10 @@
263253

264254
// Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
265255
// Alligator Board support 16 or 32 only value
266-
#define MICROSTEP_MODES {32, 32, 32, 32} // X Y Z E - [1,2,4,8,16,32]
256+
#define MICROSTEP_MODES {32, 32, 16, 16} // X Y Z E - [1,2,4,8,16,32]
267257

268258
// Motor Current setting (Only functional on ALLIGATOR BOARD)
269-
#define MOTOR_CURRENT {1, 1, 1, 1, 1, 1, 1} // X Y Z E0 E1 E2 E3 - Values 0 - 2.5 A
259+
#define MOTOR_CURRENT {1.1, 1.1, 1.4, 0.6, 1, 1, 1} // X Y Z E0 E1 E2 E3 - Values 0 - 2.5 A
270260

271261
// Motor Current setting (Only functional when motor driver current ref pins are connected to a digital trimpot on supported boards)
272262
#define DIGIPOT_MOTOR_CURRENT {135,135,135,135,135} // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)

‎MarlinKimbra4due/Marlin_main.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7224,11 +7224,6 @@ void prepare_move() {
72247224
if (!prepare_move_cartesian()) return;
72257225
#endif
72267226

7227-
#ifdef IDLE_OOZING_PREVENT || EXTRUDER_RUNOUT_PREVENT
7228-
axis_last_activity = millis();
7229-
axis_is_moving = false;
7230-
#endif
7231-
72327227
set_current_to_destination();
72337228
}
72347229

‎MarlinKimbra4due/conditionals.h‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,14 +257,16 @@
257257
* ENDSTOPPULLUPS
258258
*/
259259
#if ENABLED(ENDSTOPPULLUPS)
260-
#define ENDSTOPPULLUP_XMAX
261-
#define ENDSTOPPULLUP_YMAX
262-
#define ENDSTOPPULLUP_ZMAX
263260
#define ENDSTOPPULLUP_XMIN
264261
#define ENDSTOPPULLUP_YMIN
265262
#define ENDSTOPPULLUP_ZMIN
266-
#define ENDSTOPPULLUP_EMIN
263+
#define ENDSTOPPULLUP_Z2MIN
264+
#define ENDSTOPPULLUP_XMAX
265+
#define ENDSTOPPULLUP_YMAX
266+
#define ENDSTOPPULLUP_ZMAX
267+
#define ENDSTOPPULLUP_Z2MAX
267268
#define ENDSTOPPULLUP_ZPROBE
269+
#define ENDSTOPPULLUP_EMIN
268270
#endif
269271

270272
/**

‎MarlinKimbra4due/configuration_store.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -456,16 +456,16 @@ void Config_ResetDefault() {
456456
else
457457
max_e_jerk[i] = tmp5[max_i - 1];
458458
#if HOTENDS > 1
459-
max_i = sizeof(tmp9) / sizeof(*tmp9);
460-
if(i < max_i)
461-
hotend_offset[X_AXIS][i] = tmp9[i];
462-
else
463-
hotend_offset[X_AXIS][i] = 0;
464-
max_i = sizeof(tmp10) / sizeof(*tmp10);
465-
if(i < max_i)
466-
hotend_offset[Y_AXIS][i] = tmp10[i];
467-
else
468-
hotend_offset[Y_AXIS][i] = 0;
459+
max_i = sizeof(tmp9) / sizeof(*tmp9);
460+
if(i < max_i)
461+
hotend_offset[X_AXIS][i] = tmp9[i];
462+
else
463+
hotend_offset[X_AXIS][i] = 0;
464+
max_i = sizeof(tmp10) / sizeof(*tmp10);
465+
if(i < max_i)
466+
hotend_offset[Y_AXIS][i] = tmp10[i];
467+
else
468+
hotend_offset[Y_AXIS][i] = 0;
469469
#endif // HOTENDS > 1
470470
}
471471
}

‎MarlinKimbra4due/nextion/marlinkimbra.tft‎

-733 KB
Binary file not shown.

‎MarlinKimbra4due/nextion/marlinkimbra_v0_2.tft‎

542 KB
Binary file not shown.

0 commit comments

Comments
 (0)