3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-29 23:07:42 +00:00
Code Issues Releases Wiki Activity

Merge pull request #10919 from thinkyhead/bf1_misc_cleanups_jun2

Browse Source 
[1.1.x] Clean up ST7565, dual endstops homing
This commit is contained in:
Scott Lahteine 2018-06-03 03:35:55 -05:00 committed by GitHub
commit 3be22fc1fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 147 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
Marlin/Marlin_main.cpp
View File

@ -1372,7 +1372,7 @@ bool get_target_extruder_from_command(const uint16_t code) {
#endif #endif
#if ENABLED(DELTA) #if ENABLED(DELTA)
switch(axis) { switch (axis) {
#if HAS_SOFTWARE_ENDSTOPS #if HAS_SOFTWARE_ENDSTOPS
case X_AXIS: case X_AXIS:
case Y_AXIS: case Y_AXIS:
@ -2937,9 +2937,14 @@ static void do_homing_move(const AxisEnum axis, const float distance, const floa
if (DEBUGGING(LEVELING)) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR(">>> do_homing_move(", axis_codes[axis]); SERIAL_ECHOPAIR(">>> do_homing_move(", axis_codes[axis]);
SERIAL_ECHOPAIR(", ", distance); SERIAL_ECHOPAIR(", ", distance);
SERIAL_ECHOPAIR(", ", fr_mm_s); SERIAL_ECHOPGM(", ");
SERIAL_ECHOPAIR(" [", fr_mm_s ? fr_mm_s : homing_feedrate(axis)); if (fr_mm_s)
SERIAL_ECHOLNPGM("])"); SERIAL_ECHO(fr_mm_s);
else {
SERIAL_ECHOPAIR("[", homing_feedrate(axis));
SERIAL_CHAR(']');
}
SERIAL_ECHOLNPGM(")");
} }
#endif #endif
@ -3058,11 +3063,12 @@ static void homeaxis(const AxisEnum axis) {
} }
#endif #endif
const int axis_home_dir = const int axis_home_dir = (
#if ENABLED(DUAL_X_CARRIAGE) #if ENABLED(DUAL_X_CARRIAGE)
(axis == X_AXIS) ? x_home_dir(active_extruder) : axis == X_AXIS ? x_home_dir(active_extruder) :
#endif #endif
home_dir(axis); home_dir(axis)
);
// Homing Z towards the bed? Deploy the Z probe or endstop. // Homing Z towards the bed? Deploy the Z probe or endstop.
#if HOMING_Z_WITH_PROBE #if HOMING_Z_WITH_PROBE
@ -3070,14 +3076,20 @@ static void homeaxis(const AxisEnum axis) {
#endif #endif
// Set flags for X, Y, Z motor locking // Set flags for X, Y, Z motor locking
#if ENABLED(X_DUAL_ENDSTOPS) #if ENABLED(X_DUAL_ENDSTOPS) || ENABLED(Y_DUAL_ENDSTOPS) || ENABLED(Z_DUAL_ENDSTOPS)
if (axis == X_AXIS) stepper.set_homing_flag_x(true); switch (axis) {
#endif #if ENABLED(X_DUAL_ENDSTOPS)
#if ENABLED(Y_DUAL_ENDSTOPS) case X_AXIS:
if (axis == Y_AXIS) stepper.set_homing_flag_y(true); #endif
#endif #if ENABLED(Y_DUAL_ENDSTOPS)
#if ENABLED(Z_DUAL_ENDSTOPS) case Y_AXIS:
if (axis == Z_AXIS) stepper.set_homing_flag_z(true); #endif
#if ENABLED(Z_DUAL_ENDSTOPS)
case Z_AXIS:
#endif
stepper.set_homing_dual_axis(true);
default: break;
}
#endif #endif
// Fast move towards endstop until triggered // Fast move towards endstop until triggered
@ -3120,34 +3132,32 @@ static void homeaxis(const AxisEnum axis) {
const bool pos_dir = axis_home_dir > 0; const bool pos_dir = axis_home_dir > 0;
#if ENABLED(X_DUAL_ENDSTOPS) #if ENABLED(X_DUAL_ENDSTOPS)
if (axis == X_AXIS) { if (axis == X_AXIS) {
const bool lock_x1 = pos_dir ? (endstops.x_endstop_adj > 0) : (endstops.x_endstop_adj < 0);
const float adj = ABS(endstops.x_endstop_adj); const float adj = ABS(endstops.x_endstop_adj);
if (lock_x1) stepper.set_x_lock(true); else stepper.set_x2_lock(true); if (pos_dir ? (endstops.x_endstop_adj > 0) : (endstops.x_endstop_adj < 0)) stepper.set_x_lock(true); else stepper.set_x2_lock(true);
do_homing_move(axis, pos_dir ? -adj : adj); do_homing_move(axis, pos_dir ? -adj : adj);
if (lock_x1) stepper.set_x_lock(false); else stepper.set_x2_lock(false); stepper.set_x_lock(false);
stepper.set_homing_flag_x(false); stepper.set_x2_lock(false);
} }
#endif #endif
#if ENABLED(Y_DUAL_ENDSTOPS) #if ENABLED(Y_DUAL_ENDSTOPS)
if (axis == Y_AXIS) { if (axis == Y_AXIS) {
const bool lock_y1 = pos_dir ? (endstops.y_endstop_adj > 0) : (endstops.y_endstop_adj < 0);
const float adj = ABS(endstops.y_endstop_adj); const float adj = ABS(endstops.y_endstop_adj);
if (lock_y1) stepper.set_y_lock(true); else stepper.set_y2_lock(true); if (pos_dir ? (endstops.y_endstop_adj > 0) : (endstops.y_endstop_adj < 0)) stepper.set_y_lock(true); else stepper.set_y2_lock(true);
do_homing_move(axis, pos_dir ? -adj : adj); do_homing_move(axis, pos_dir ? -adj : adj);
if (lock_y1) stepper.set_y_lock(false); else stepper.set_y2_lock(false); stepper.set_y_lock(false);
stepper.set_homing_flag_y(false); stepper.set_y2_lock(false);
} }
#endif #endif
#if ENABLED(Z_DUAL_ENDSTOPS) #if ENABLED(Z_DUAL_ENDSTOPS)
if (axis == Z_AXIS) { if (axis == Z_AXIS) {
const bool lock_z1 = pos_dir ? (endstops.z_endstop_adj > 0) : (endstops.z_endstop_adj < 0);
const float adj = ABS(endstops.z_endstop_adj); const float adj = ABS(endstops.z_endstop_adj);
if (lock_z1) stepper.set_z_lock(true); else stepper.set_z2_lock(true); if (pos_dir ? (endstops.z_endstop_adj > 0) : (endstops.z_endstop_adj < 0)) stepper.set_z_lock(true); else stepper.set_z2_lock(true);
do_homing_move(axis, pos_dir ? -adj : adj); do_homing_move(axis, pos_dir ? -adj : adj);
if (lock_z1) stepper.set_z_lock(false); else stepper.set_z2_lock(false); stepper.set_z_lock(false);
stepper.set_homing_flag_z(false); stepper.set_z2_lock(false);
} }
#endif #endif
stepper.set_homing_dual_axis(false);
#endif #endif
#if IS_SCARA #if IS_SCARA
@ -3191,8 +3201,7 @@ static void homeaxis(const AxisEnum axis) {
// Clear retracted status if homing the Z axis // Clear retracted status if homing the Z axis
#if ENABLED(FWRETRACT) #if ENABLED(FWRETRACT)
if (axis == Z_AXIS) if (axis == Z_AXIS) fwretract.hop_amount = 0.0;
fwretract.hop_amount = 0.0;
#endif #endif
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
@ -4442,7 +4451,7 @@ void home_all_axes() { gcode_G28(true); }
reset_bed_level(); reset_bed_level();
break; break;
} // switch(state) } // switch (state)
if (state == MeshNext) { if (state == MeshNext) {
SERIAL_PROTOCOLPAIR("MBL G29 point ", MIN(mbl_probe_index, GRID_MAX_POINTS)); SERIAL_PROTOCOLPAIR("MBL G29 point ", MIN(mbl_probe_index, GRID_MAX_POINTS));

2
Marlin/endstops.cpp
View File

@ -562,7 +562,7 @@ void Endstops::update() {
if (dual_hit) { \ if (dual_hit) { \
_ENDSTOP_HIT(AXIS1, MINMAX); \ _ENDSTOP_HIT(AXIS1, MINMAX); \
/* if not performing home or if both endstops were trigged during homing... */ \ /* if not performing home or if both endstops were trigged during homing... */ \
if (!stepper.performing_homing || dual_hit == 0x3) \ if (!stepper.homing_dual_axis || dual_hit == 0x3) \
planner.endstop_triggered(_AXIS(AXIS1)); \ planner.endstop_triggered(_AXIS(AXIS1)); \
} \ } \
}while(0) }while(0)

3
Marlin/language_cz.h
View File

@ -146,8 +146,7 @@
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL Postupne") #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL Postupne")
#define MSG_LED_CONTROL _UxGT("LED Nastaveni") #define MSG_LED_CONTROL _UxGT("LED Nastaveni")
#define MSG_LEDS_ON _UxGT("Svetla Zap") #define MSG_LEDS _UxGT("Svetla")
#define MSG_LEDS_OFF _UxGT("Svetla Vyp")
#define MSG_LED_PRESETS _UxGT("Svetla Predvolby") #define MSG_LED_PRESETS _UxGT("Svetla Predvolby")
#define MSG_SET_LEDS_RED _UxGT("Cervena") #define MSG_SET_LEDS_RED _UxGT("Cervena")
#define MSG_SET_LEDS_ORANGE _UxGT("Oranzova") #define MSG_SET_LEDS_ORANGE _UxGT("Oranzova")

3
Marlin/language_cz_utf8.h
View File

@ -149,8 +149,7 @@
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL Postupně") #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL Postupně")
#define MSG_LED_CONTROL _UxGT("LED Nastavení") #define MSG_LED_CONTROL _UxGT("LED Nastavení")
#define MSG_LEDS_ON _UxGT("Světla Zap") #define MSG_LEDS _UxGT("Světla")
#define MSG_LEDS_OFF _UxGT("Světla Vyp")
#define MSG_LED_PRESETS _UxGT("Světla Předvolby") #define MSG_LED_PRESETS _UxGT("Světla Předvolby")
#define MSG_SET_LEDS_RED _UxGT("Červená") #define MSG_SET_LEDS_RED _UxGT("Červená")
#define MSG_SET_LEDS_ORANGE _UxGT("Oranžová") #define MSG_SET_LEDS_ORANGE _UxGT("Oranžová")

3
Marlin/language_de.h
View File

@ -311,8 +311,7 @@
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("Schrittweises UBL") #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("Schrittweises UBL")
#define MSG_LED_CONTROL _UxGT("LED Kontrolle") #define MSG_LED_CONTROL _UxGT("LED Kontrolle")
#define MSG_LEDS_ON _UxGT("Licht an") #define MSG_LEDS _UxGT("Licht")
#define MSG_LEDS_OFF _UxGT("Licht aus")
#define MSG_LED_PRESETS _UxGT("Licht Einstellungen") #define MSG_LED_PRESETS _UxGT("Licht Einstellungen")
#define MSG_SET_LEDS_RED _UxGT("Rot") #define MSG_SET_LEDS_RED _UxGT("Rot")
#define MSG_SET_LEDS_ORANGE _UxGT("Orange") #define MSG_SET_LEDS_ORANGE _UxGT("Orange")

7
Marlin/language_en.h
View File

@ -371,11 +371,8 @@
#ifndef MSG_LED_CONTROL #ifndef MSG_LED_CONTROL
#define MSG_LED_CONTROL _UxGT("LED Control") #define MSG_LED_CONTROL _UxGT("LED Control")
#endif #endif
#ifndef MSG_LEDS_ON #ifndef MSG_LEDS
#define MSG_LEDS_ON _UxGT("Lights On") #define MSG_LEDS _UxGT("Lights")
#endif
#ifndef MSG_LEDS_OFF
#define MSG_LEDS_OFF _UxGT("Lights Off")
#endif #endif
#ifndef MSG_LED_PRESETS #ifndef MSG_LED_PRESETS
#define MSG_LED_PRESETS _UxGT("Light Presets") #define MSG_LED_PRESETS _UxGT("Light Presets")

3
Marlin/language_eu.h
View File

@ -142,8 +142,7 @@
//#define MSG_UBL_Z_OFFSET_STOPPED _UxGT("Z-Offset Stopped") //#define MSG_UBL_Z_OFFSET_STOPPED _UxGT("Z-Offset Stopped")
//#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("Step-By-Step UBL") //#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("Step-By-Step UBL")
#define MSG_LED_CONTROL _UxGT("LED ezarpenak") #define MSG_LED_CONTROL _UxGT("LED ezarpenak")
#define MSG_LEDS_ON _UxGT("Argiak piztu") #define MSG_LEDS _UxGT("Argiak")
#define MSG_LEDS_OFF _UxGT("Argiak itzali")
#define MSG_LED_PRESETS _UxGT("Argi aurrehautaketak") #define MSG_LED_PRESETS _UxGT("Argi aurrehautaketak")
#define MSG_SET_LEDS_RED _UxGT("Gorria") #define MSG_SET_LEDS_RED _UxGT("Gorria")
#define MSG_SET_LEDS_ORANGE _UxGT("Laranja") #define MSG_SET_LEDS_ORANGE _UxGT("Laranja")

3
Marlin/language_fr.h
View File

@ -144,8 +144,7 @@
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL Pas a pas") #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL Pas a pas")
#define MSG_LED_CONTROL _UxGT("Controle LED") #define MSG_LED_CONTROL _UxGT("Controle LED")
#define MSG_LEDS_ON _UxGT("Lumiere ON") #define MSG_LEDS _UxGT("Lumiere")
#define MSG_LEDS_OFF _UxGT("Lumiere OFF")
#define MSG_LED_PRESETS _UxGT("Preregl. LED.") #define MSG_LED_PRESETS _UxGT("Preregl. LED.")
#define MSG_SET_LEDS_RED _UxGT("Rouge") #define MSG_SET_LEDS_RED _UxGT("Rouge")
#define MSG_SET_LEDS_ORANGE _UxGT("Orange") #define MSG_SET_LEDS_ORANGE _UxGT("Orange")

3
Marlin/language_fr_utf8.h
View File

@ -145,8 +145,7 @@
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL Pas à pas") #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL Pas à pas")
#define MSG_LED_CONTROL _UxGT("Contrôle LED") #define MSG_LED_CONTROL _UxGT("Contrôle LED")
#define MSG_LEDS_ON _UxGT("Lumière ON") #define MSG_LEDS _UxGT("Lumière")
#define MSG_LEDS_OFF _UxGT("Lumière OFF")
#define MSG_LED_PRESETS _UxGT("Préregl. LED") #define MSG_LED_PRESETS _UxGT("Préregl. LED")
#define MSG_SET_LEDS_RED _UxGT("Rouge") #define MSG_SET_LEDS_RED _UxGT("Rouge")
#define MSG_SET_LEDS_ORANGE _UxGT("Orange") #define MSG_SET_LEDS_ORANGE _UxGT("Orange")

3
Marlin/language_it.h
View File

@ -144,8 +144,7 @@
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL passo passo") #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL passo passo")
#define MSG_LED_CONTROL _UxGT("Controllo LED") #define MSG_LED_CONTROL _UxGT("Controllo LED")
#define MSG_LEDS_ON _UxGT("Luci On") #define MSG_LEDS _UxGT("Luci")
#define MSG_LEDS_OFF _UxGT("Luci Off")
#define MSG_LED_PRESETS _UxGT("Preset luci") #define MSG_LED_PRESETS _UxGT("Preset luci")
#define MSG_SET_LEDS_RED _UxGT("Rosso") #define MSG_SET_LEDS_RED _UxGT("Rosso")
#define MSG_SET_LEDS_ORANGE _UxGT("Arancione") #define MSG_SET_LEDS_ORANGE _UxGT("Arancione")

3
Marlin/language_pt-br.h
View File

@ -145,8 +145,7 @@
#define MSG_UBL_Z_OFFSET_STOPPED _UxGT("Compensacao Z parou") #define MSG_UBL_Z_OFFSET_STOPPED _UxGT("Compensacao Z parou")
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL passo a passo") #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL passo a passo")
#define MSG_LED_CONTROL _UxGT("Controle do LED") #define MSG_LED_CONTROL _UxGT("Controle do LED")
#define MSG_LEDS_ON _UxGT("Luz Acesa") #define MSG_LEDS _UxGT("Luz")
#define MSG_LEDS_OFF _UxGT("Luz Apagada")
#define MSG_LED_PRESETS _UxGT("Configuracao da Luz") #define MSG_LED_PRESETS _UxGT("Configuracao da Luz")
#define MSG_SET_LEDS_RED _UxGT("Luz Vermelha") #define MSG_SET_LEDS_RED _UxGT("Luz Vermelha")
#define MSG_SET_LEDS_ORANGE _UxGT("Luz Laranja") #define MSG_SET_LEDS_ORANGE _UxGT("Luz Laranja")

3
Marlin/language_pt-br_utf8.h
View File

@ -147,8 +147,7 @@
#define MSG_UBL_Z_OFFSET_STOPPED _UxGT("Compensação Z parou") #define MSG_UBL_Z_OFFSET_STOPPED _UxGT("Compensação Z parou")
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL passo a passo") #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL passo a passo")
#define MSG_LED_CONTROL _UxGT("Controle do LED") #define MSG_LED_CONTROL _UxGT("Controle do LED")
#define MSG_LEDS_ON _UxGT("Luz Acesa") #define MSG_LEDS _UxGT("Luz")
#define MSG_LEDS_OFF _UxGT("Luz Apagada")
#define MSG_LED_PRESETS _UxGT("Configuração da Luz") #define MSG_LED_PRESETS _UxGT("Configuração da Luz")
#define MSG_SET_LEDS_RED _UxGT("Luz Vermelha") #define MSG_SET_LEDS_RED _UxGT("Luz Vermelha")
#define MSG_SET_LEDS_ORANGE _UxGT("Luz Laranja") #define MSG_SET_LEDS_ORANGE _UxGT("Luz Laranja")

3
Marlin/language_ru.h
View File

@ -145,8 +145,7 @@
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("Пошаговое UBL") #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("Пошаговое UBL")
#define MSG_LED_CONTROL _UxGT("Настройки LED") #define MSG_LED_CONTROL _UxGT("Настройки LED")
#define MSG_LEDS_ON _UxGT("Включить подсветку") #define MSG_LEDS _UxGT("Подсветку")
#define MSG_LEDS_OFF _UxGT("Выключить подсветку")
#define MSG_LED_PRESETS _UxGT("Предустановки света") #define MSG_LED_PRESETS _UxGT("Предустановки света")
#define MSG_SET_LEDS_RED _UxGT("Красный свет") #define MSG_SET_LEDS_RED _UxGT("Красный свет")
#define MSG_SET_LEDS_ORANGE _UxGT("Оранжевый свет") #define MSG_SET_LEDS_ORANGE _UxGT("Оранжевый свет")

3
Marlin/language_sk_utf8.h
View File

@ -148,8 +148,7 @@
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL Postupne") #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL Postupne")
#define MSG_LED_CONTROL _UxGT("Nastavenie LED") #define MSG_LED_CONTROL _UxGT("Nastavenie LED")
#define MSG_LEDS_ON _UxGT("Zapnúť svetlo") #define MSG_LEDS _UxGT("Svetlo")
#define MSG_LEDS_OFF _UxGT("Vypnúť svetlo")
#define MSG_LED_PRESETS _UxGT("Prednastavené farby") #define MSG_LED_PRESETS _UxGT("Prednastavené farby")
#define MSG_SET_LEDS_RED _UxGT("Červená") #define MSG_SET_LEDS_RED _UxGT("Červená")
#define MSG_SET_LEDS_ORANGE _UxGT("Oranžová") #define MSG_SET_LEDS_ORANGE _UxGT("Oranžová")

3
Marlin/language_zh_CN.h
View File

@ -141,8 +141,7 @@
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("一步步UBL") // "Step-By-Step UBL" #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("一步步UBL") // "Step-By-Step UBL"
#define MSG_LED_CONTROL _UxGT("灯管控制") // "LED Control") #define MSG_LED_CONTROL _UxGT("灯管控制") // "LED Control")
#define MSG_LEDS_ON _UxGT("灯亮") // "Lights On") #define MSG_LEDS _UxGT("灯") // "Lights")
#define MSG_LEDS_OFF _UxGT("灯灭") // "Lights Off")
#define MSG_LED_PRESETS _UxGT("灯预置") // "Light Presets") #define MSG_LED_PRESETS _UxGT("灯预置") // "Light Presets")
#define MSG_SET_LEDS_RED _UxGT("红") // "Red") #define MSG_SET_LEDS_RED _UxGT("红") // "Red")
#define MSG_SET_LEDS_ORANGE _UxGT("橙") // "Orange") #define MSG_SET_LEDS_ORANGE _UxGT("橙") // "Orange")

3
Marlin/language_zh_TW.h
View File

@ -141,8 +141,7 @@
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("一步步UBL") // "Step-By-Step UBL" #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("一步步UBL") // "Step-By-Step UBL"
#define MSG_LED_CONTROL _UxGT("灯管控制") // "LED Control") #define MSG_LED_CONTROL _UxGT("灯管控制") // "LED Control")
#define MSG_LEDS_ON _UxGT("灯亮") // "Lights On") #define MSG_LEDS _UxGT("灯") // "Lights")
#define MSG_LEDS_OFF _UxGT("灯灭") // "Lights Off")
#define MSG_LED_PRESETS _UxGT("灯预置") // "Light Presets") #define MSG_LED_PRESETS _UxGT("灯预置") // "Light Presets")
#define MSG_SET_LEDS_RED _UxGT("红") // "Red") #define MSG_SET_LEDS_RED _UxGT("红") // "Red")
#define MSG_SET_LEDS_ORANGE _UxGT("橙") // "Orange") #define MSG_SET_LEDS_ORANGE _UxGT("橙") // "Orange")

6
Marlin/stepper.cpp
View File

@ -76,7 +76,7 @@ Stepper stepper; // Singleton
block_t* Stepper::current_block = NULL; // A pointer to the block currently being traced block_t* Stepper::current_block = NULL; // A pointer to the block currently being traced
#if ENABLED(X_DUAL_ENDSTOPS) || ENABLED(Y_DUAL_ENDSTOPS) || ENABLED(Z_DUAL_ENDSTOPS) #if ENABLED(X_DUAL_ENDSTOPS) || ENABLED(Y_DUAL_ENDSTOPS) || ENABLED(Z_DUAL_ENDSTOPS)
bool Stepper::performing_homing = false; bool Stepper::homing_dual_axis = false;
#endif #endif
#if HAS_MOTOR_CURRENT_PWM #if HAS_MOTOR_CURRENT_PWM
@ -153,7 +153,7 @@ bool Stepper::all_steps_done = false;
uint32_t Stepper::acceleration_time, Stepper::deceleration_time; uint32_t Stepper::acceleration_time, Stepper::deceleration_time;
volatile int32_t Stepper::count_position[NUM_AXIS] = { 0 }; volatile int32_t Stepper::count_position[NUM_AXIS] = { 0 };
volatile signed char Stepper::count_direction[NUM_AXIS] = { 1, 1, 1, 1 }; int8_t Stepper::count_direction[NUM_AXIS] = { 1, 1, 1, 1 };
#if ENABLED(MIXING_EXTRUDER) #if ENABLED(MIXING_EXTRUDER)
int32_t Stepper::counter_m[MIXING_STEPPERS]; int32_t Stepper::counter_m[MIXING_STEPPERS];
@ -170,7 +170,7 @@ volatile int32_t Stepper::endstops_trigsteps[XYZ];
#if ENABLED(X_DUAL_ENDSTOPS) || ENABLED(Y_DUAL_ENDSTOPS) || ENABLED(Z_DUAL_ENDSTOPS) #if ENABLED(X_DUAL_ENDSTOPS) || ENABLED(Y_DUAL_ENDSTOPS) || ENABLED(Z_DUAL_ENDSTOPS)
#define DUAL_ENDSTOP_APPLY_STEP(A,V) \ #define DUAL_ENDSTOP_APPLY_STEP(A,V) \
if (performing_homing) { \ if (homing_dual_axis) { \
if (A##_HOME_DIR < 0) { \ if (A##_HOME_DIR < 0) { \
if (!(TEST(endstops.state(), A##_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##_motor) A##_STEP_WRITE(V); \ if (!(TEST(endstops.state(), A##_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##_motor) A##_STEP_WRITE(V); \
if (!(TEST(endstops.state(), A##2_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##2_motor) A##2_STEP_WRITE(V); \ if (!(TEST(endstops.state(), A##2_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##2_motor) A##2_STEP_WRITE(V); \

10
Marlin/stepper.h
View File

@ -86,7 +86,7 @@ class Stepper {
static block_t* current_block; // A pointer to the block currently being traced static block_t* current_block; // A pointer to the block currently being traced
#if ENABLED(X_DUAL_ENDSTOPS) || ENABLED(Y_DUAL_ENDSTOPS) || ENABLED(Z_DUAL_ENDSTOPS) #if ENABLED(X_DUAL_ENDSTOPS) || ENABLED(Y_DUAL_ENDSTOPS) || ENABLED(Z_DUAL_ENDSTOPS)
static bool performing_homing; static bool homing_dual_axis;
#endif #endif
#if HAS_MOTOR_CURRENT_PWM #if HAS_MOTOR_CURRENT_PWM
@ -164,7 +164,7 @@ class Stepper {
// //
// Current direction of stepper motors (+1 or -1) // Current direction of stepper motors (+1 or -1)
// //
static volatile signed char count_direction[NUM_AXIS]; static int8_t count_direction[NUM_AXIS];
// //
// Mixing extruder mix counters // Mixing extruder mix counters
@ -241,18 +241,18 @@ class Stepper {
static void microstep_readings(); static void microstep_readings();
#endif #endif
#if ENABLED(X_DUAL_ENDSTOPS) || ENABLED(Y_DUAL_ENDSTOPS) || ENABLED(Z_DUAL_ENDSTOPS)
FORCE_INLINE static void set_homing_dual_axis(const bool state) { homing_dual_axis = state; }
#endif
#if ENABLED(X_DUAL_ENDSTOPS) #if ENABLED(X_DUAL_ENDSTOPS)
FORCE_INLINE static void set_homing_flag_x(const bool state) { performing_homing = state; }
FORCE_INLINE static void set_x_lock(const bool state) { locked_X_motor = state; } FORCE_INLINE static void set_x_lock(const bool state) { locked_X_motor = state; }
FORCE_INLINE static void set_x2_lock(const bool state) { locked_X2_motor = state; } FORCE_INLINE static void set_x2_lock(const bool state) { locked_X2_motor = state; }
#endif #endif
#if ENABLED(Y_DUAL_ENDSTOPS) #if ENABLED(Y_DUAL_ENDSTOPS)
FORCE_INLINE static void set_homing_flag_y(const bool state) { performing_homing = state; }
FORCE_INLINE static void set_y_lock(const bool state) { locked_Y_motor = state; } FORCE_INLINE static void set_y_lock(const bool state) { locked_Y_motor = state; }
FORCE_INLINE static void set_y2_lock(const bool state) { locked_Y2_motor = state; } FORCE_INLINE static void set_y2_lock(const bool state) { locked_Y2_motor = state; }
#endif #endif
#if ENABLED(Z_DUAL_ENDSTOPS) #if ENABLED(Z_DUAL_ENDSTOPS)
FORCE_INLINE static void set_homing_flag_z(const bool state) { performing_homing = state; }
FORCE_INLINE static void set_z_lock(const bool state) { locked_Z_motor = state; } FORCE_INLINE static void set_z_lock(const bool state) { locked_Z_motor = state; }
FORCE_INLINE static void set_z2_lock(const bool state) { locked_Z2_motor = state; } FORCE_INLINE static void set_z2_lock(const bool state) { locked_Z2_motor = state; }
#endif #endif

6
Marlin/ultralcd.cpp
View File

@ -4244,10 +4244,8 @@ void lcd_quick_feedback(const bool clear_buttons) {
void lcd_led_menu() { void lcd_led_menu() {
START_MENU(); START_MENU();
MENU_BACK(MSG_MAIN); MENU_BACK(MSG_MAIN);
if (leds.lights_on) bool led_on = leds.lights_on;
MENU_ITEM(function, MSG_LEDS_OFF, leds.toggle); MENU_ITEM_EDIT_CALLBACK(bool, MSG_LEDS, &led_on, leds.toggle);
else
MENU_ITEM(function, MSG_LEDS_ON, leds.toggle);
MENU_ITEM(function, MSG_SET_LEDS_DEFAULT, leds.set_default); MENU_ITEM(function, MSG_SET_LEDS_DEFAULT, leds.set_default);
#if ENABLED(LED_COLOR_PRESETS) #if ENABLED(LED_COLOR_PRESETS)
MENU_ITEM(submenu, MSG_LED_PRESETS, lcd_led_presets_menu); MENU_ITEM(submenu, MSG_LED_PRESETS, lcd_led_presets_menu);

154
Marlin/ultralcd_st7565_u8glib_VIKI.h
View File

@ -122,10 +122,26 @@
#define U8G_DELAY() u8g_10MicroDelay() #define U8G_DELAY() u8g_10MicroDelay()
#endif #endif
#define ST7565_CS() { WRITE(ST7565_CS_PIN,1); U8G_DELAY(); } #define ST7565_CS() do{ WRITE(ST7565_CS_PIN, HIGH); U8G_DELAY(); }while(0)
#define ST7565_NCS() { WRITE(ST7565_CS_PIN,0); } #define ST7565_NCS() WRITE(ST7565_CS_PIN, LOW)
#define ST7565_A0() { WRITE(ST7565_A0_PIN,1); U8G_DELAY(); } #define ST7565_A0() do{ WRITE(ST7565_A0_PIN, HIGH); U8G_DELAY(); }while(0)
#define ST7565_NA0() { WRITE(ST7565_A0_PIN,0); } #define ST7565_NA0() WRITE(ST7565_A0_PIN, LOW)
#define ST7565_ADC_REVERSE(N) ST7565_WRITE_BYTE(0xA0 | ((N) & 0x1))
#define ST7565_BIAS_MODE(N) ST7565_WRITE_BYTE(0xA2 | ((N) & 0x1))
#define ST7565_ALL_PIX(N) ST7565_WRITE_BYTE(0xA4 | ((N) & 0x1))
#define ST7565_INVERTED(N) ST7565_WRITE_BYTE(0xA6 | ((N) & 0x1))
#define ST7565_ON(N) ST7565_WRITE_BYTE(0xAE | ((N) & 0x1))
#define ST7565_OUT_MODE(N) ST7565_WRITE_BYTE(0xC0 | ((N) & 0x1) << 3)
#define ST7565_POWER_CONTROL(N) ST7565_WRITE_BYTE(0x28 | (N))
#define ST7565_V0_RATIO(N) ST7565_WRITE_BYTE(0x20 | ((N) & 0x7))
#define ST7565_CONTRAST(N) do{ ST7565_WRITE_BYTE(0x81); ST7565_WRITE_BYTE(N); }while(0)
#define ST7565_COLUMN_ADR(N) do{ ST7565_WRITE_BYTE(0x10 | ((N) >> 4) & 0xF); ST7565_WRITE_BYTE(0x00 | ((N) & 0xF)); }while(0)
#define ST7565_PAGE_ADR(N) ST7565_WRITE_BYTE(0xB0 | (N))
#define ST7565_START_LINE(N) ST7565_WRITE_BYTE(0x40 | (N))
#define ST7565_SLEEP_MODE() ST7565_WRITE_BYTE(0xAC)
#define ST7565_NOOP() ST7565_WRITE_BYTE(0xE3)
uint8_t u8g_dev_st7565_64128n_2x_VIKI_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, void *arg) { uint8_t u8g_dev_st7565_64128n_2x_VIKI_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, void *arg) {
switch (msg) { switch (msg) {
@ -137,109 +153,103 @@ uint8_t u8g_dev_st7565_64128n_2x_VIKI_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg
OUT_WRITE(ST7565_CLK_PIN, LOW); OUT_WRITE(ST7565_CLK_PIN, LOW);
#if HARDWARE_SPI #if HARDWARE_SPI
OUT_WRITE(SDSS, 1); // must be set to an output first or else will never go into master mode OUT_WRITE(SDSS, 1); // must be set to an output first or else will never go into master mode
SPCR = 0x50; // enable SPI in master mode at fast speed SPCR = 0x50; // enable SPI in master mode at fast speed
SPSR = 1; // kick it up to 2x speed mode SPSR = 1; // kick it up to 2x speed mode
#endif #endif
OUT_WRITE(ST7565_A0_PIN, LOW); OUT_WRITE(ST7565_A0_PIN, LOW);
ST7565_CS(); /* disable chip */ ST7565_CS(); // chip select off
ST7565_NA0(); /* instruction mode */ ST7565_NA0(); // instruction mode
ST7565_NCS(); /* enable chip */ ST7565_NCS(); // chip select
ST7565_WRITE_BYTE(0x0A2); /* 0x0A2: LCD bias 1/9 (according to Displaytech 64128N datasheet) */ ST7565_BIAS_MODE(0); // 0xA2: LCD bias 1/9 (according to Displaytech 64128N datasheet)
ST7565_WRITE_BYTE(0x0A0); /* Normal ADC Select (according to Displaytech 64128N datasheet) */ ST7565_ADC_REVERSE(0); // Normal (not flipped) ADC Select (according to Displaytech 64128N datasheet)
ST7565_WRITE_BYTE(0x0C8); /* common output mode: set scan direction normal operation/SHL Select; 0x0C0 --> SHL = 0; normal; 0x0C8 --> SHL = 1 */ ST7565_OUT_MODE(1); // common output mode: set scan direction normal operation/SHL Select; 0x0C0 --> SHL = 0; normal; 0x0C8 --> SHL = 1
ST7565_WRITE_BYTE(0x040); /* Display start line for Displaytech 64128N */ ST7565_START_LINE(0); // Display start line for Displaytech 64128N
ST7565_WRITE_BYTE(0x028 | 0x04); /* power control: turn on voltage converter */ //ST7565_POWER_CONTROL(0x4); // power control: turn on Booster
//U8G_ESC_DLY(50); /* delay 50 ms - hangs after a reset if used */ //U8G_ESC_DLY(50); // delay 50 ms - hangs after a reset if used
ST7565_WRITE_BYTE(0x028 | 0x06); /* power control: turn on voltage regulator */ //ST7565_POWER_CONTROL(0x6); // power control: turn on Booster, Voltage Regulator
//U8G_ESC_DLY(50); /* delay 50 ms - hangs after a reset if used */ //U8G_ESC_DLY(50); // delay 50 ms - hangs after a reset if used
ST7565_WRITE_BYTE(0x028 | 0x07); /* power control: turn on voltage follower */ ST7565_POWER_CONTROL(0x7); // power control: turn on Booster, Voltage Regulator, Voltage Follower
//U8G_ESC_DLY(50); /* delay 50 ms - hangs after a reset if used */ //U8G_ESC_DLY(50); // delay 50 ms - hangs after a reset if used
ST7565_WRITE_BYTE(0x010); /* Set V0 voltage resistor ratio. Setting for controlling brightness of Displaytech 64128N */ ST7565_V0_RATIO(0); // Set V0 Voltage Resistor ratio. Setting for controlling brightness of Displaytech 64128N
ST7565_WRITE_BYTE(0x0A6); /* display normal, bit val 0: LCD pixel off. */ ST7565_INVERTED(0); // display normal, bit val 0: LCD pixel off.
ST7565_WRITE_BYTE(0x081); /* set contrast */ ST7565_CONTRAST(0x1E); // Contrast value. Setting for controlling contrast of Displaytech 64128N
ST7565_WRITE_BYTE(0x01E); /* Contrast value. Setting for controlling brightness of Displaytech 64128N */
ST7565_WRITE_BYTE(0x0AF); /* display on */ ST7565_ON(1); // display on
U8G_ESC_DLY(100); /* delay 100 ms */ U8G_ESC_DLY(100); // delay 100 ms
ST7565_WRITE_BYTE(0x0A5); /* display all points; ST7565 */ ST7565_ALL_PIX(1); // display all points; ST7565
U8G_ESC_DLY(100); /* delay 100 ms */ U8G_ESC_DLY(100); // delay 100 ms
U8G_ESC_DLY(100); /* delay 100 ms */ U8G_ESC_DLY(100); // delay 100 ms
ST7565_WRITE_BYTE(0x0A4); /* normal display */ ST7565_ALL_PIX(0); // normal display
ST7565_CS(); /* disable chip */ ST7565_CS(); // chip select off
} /* end of sequence */ } // end of sequence
break; break;
case U8G_DEV_MSG_STOP: break; case U8G_DEV_MSG_STOP: break;
case U8G_DEV_MSG_PAGE_NEXT: { case U8G_DEV_MSG_PAGE_NEXT: {
u8g_pb_t *pb = (u8g_pb_t *)(dev->dev_mem); u8g_pb_t *pb = (u8g_pb_t*)(dev->dev_mem);
ST7565_CS(); /* disable chip */ ST7565_CS(); // chip select off
ST7565_NA0(); /* instruction mode */ ST7565_NA0(); // instruction mode
ST7565_NCS(); /* enable chip */ ST7565_NCS(); // chip select
ST7565_WRITE_BYTE(0x010); /* set upper 4 bit of the col adr to 0x10 */ ST7565_COLUMN_ADR(0x00); // high 4 bits to 0, low 4 bits to 0. Changed for DisplayTech 64128N
ST7565_WRITE_BYTE(0x000); /* set lower 4 bit of the col adr to 0x00. Changed for DisplayTech 64128N */ // end of sequence
/* end of sequence */ ST7565_PAGE_ADR(2 * pb->p.page); // select current page (ST7565R)
ST7565_WRITE_BYTE(0x0B0 | (2*pb->p.page));; /* select current page (ST7565R) */ ST7565_A0(); // data mode
ST7565_A0(); /* data mode */ ST7560_WriteSequence((uint8_t)pb->width, (uint8_t*)pb->buf);
ST7560_WriteSequence( (uint8_t) pb->width, (uint8_t *)pb->buf); ST7565_CS(); // chip select off
ST7565_CS(); /* disable chip */ ST7565_NA0(); // instruction mode
ST7565_NA0(); /* instruction mode */ ST7565_NCS(); // chip select
ST7565_NCS(); /* enable chip */ ST7565_COLUMN_ADR(0x00); // high 4 bits to 0, low 4 bits to 0
ST7565_WRITE_BYTE(0x010); /* set upper 4 bit of the col adr to 0x10 */ // end of sequence
ST7565_WRITE_BYTE(0x000); /* set lower 4 bit of the col adr to 0x00. Changed for DisplayTech 64128N */ ST7565_PAGE_ADR(2 * pb->p.page + 1); // select current page (ST7565R)
/* end of sequence */ ST7565_A0(); // data mode
ST7565_WRITE_BYTE(0x0B0 | (2*pb->p.page+1)); /* select current page (ST7565R) */ ST7560_WriteSequence((uint8_t)pb->width, (uint8_t*)(pb->buf) + pb->width);
ST7565_A0(); /* data mode */ ST7565_CS(); // chip select off
ST7560_WriteSequence( (uint8_t) pb->width, (uint8_t *)(pb->buf)+pb->width);
ST7565_CS(); /* disable chip */
} }
break; break;
case U8G_DEV_MSG_CONTRAST: case U8G_DEV_MSG_CONTRAST:
ST7565_NCS(); ST7565_NCS();
ST7565_NA0(); /* instruction mode */ ST7565_NA0(); // instruction mode
ST7565_WRITE_BYTE(0x081); ST7565_CONTRAST((*(uint8_t*)arg) >> 2);
ST7565_WRITE_BYTE((*(uint8_t *)arg) >> 2); ST7565_CS(); // chip select off
ST7565_CS(); /* disable chip */
return 1; return 1;
case U8G_DEV_MSG_SLEEP_ON: case U8G_DEV_MSG_SLEEP_ON:
ST7565_NA0(); /* instruction mode */ ST7565_NA0(); // instruction mode
ST7565_NCS(); /* enable chip */ ST7565_NCS(); // chip select
ST7565_WRITE_BYTE(0x0AC); /* static indicator off */ ST7565_SLEEP_MODE(); // static indicator off
ST7565_WRITE_BYTE(0x000); /* indicator register set (not sure if this is required) */ //ST7565_WRITE_BYTE(0x00); // indicator register set (not sure if this is required)
ST7565_WRITE_BYTE(0x0AE); /* display off */ ST7565_ON(0); // display off
ST7565_WRITE_BYTE(0x0A5); /* all points on */ ST7565_ALL_PIX(1); // all points on
ST7565_CS(); /* disable chip , bugfix 12 nov 2014 */ ST7565_CS(); // chip select off
/* end of sequence */
return 1; return 1;
case U8G_DEV_MSG_SLEEP_OFF: case U8G_DEV_MSG_SLEEP_OFF:
ST7565_NA0(); /* instruction mode */ ST7565_NA0(); // instruction mode
ST7565_NCS(); /* enable chip */ ST7565_NCS(); // chip select
ST7565_WRITE_BYTE(0x0A4); /* all points off */ ST7565_ALL_PIX(0); // all points off
ST7565_WRITE_BYTE(0x0AF); /* display on */ ST7565_ON(1); // display on
U8G_ESC_DLY(50); /* delay 50 ms */ U8G_ESC_DLY(50); // delay 50 ms
ST7565_CS(); /* disable chip , bugfix 12 nov 2014 */ ST7565_CS(); // chip select off
/* end of sequence */
return 1; return 1;
} }
return u8g_dev_pb16v1_base_fn(u8g, dev, msg, arg); return u8g_dev_pb16v1_base_fn(u8g, dev, msg, arg);
} }
uint8_t u8g_dev_st7565_64128n_2x_VIKI_buf[LCD_PIXEL_WIDTH*2] U8G_NOCOMMON; uint8_t u8g_dev_st7565_64128n_2x_VIKI_buf[LCD_PIXEL_WIDTH * 2] U8G_NOCOMMON;
u8g_pb_t u8g_dev_st7565_64128n_2x_VIKI_pb = {{16, LCD_PIXEL_HEIGHT, 0, 0, 0}, LCD_PIXEL_WIDTH, u8g_dev_st7565_64128n_2x_VIKI_buf}; u8g_pb_t u8g_dev_st7565_64128n_2x_VIKI_pb = {{16, LCD_PIXEL_HEIGHT, 0, 0, 0}, LCD_PIXEL_WIDTH, u8g_dev_st7565_64128n_2x_VIKI_buf};
u8g_dev_t u8g_dev_st7565_64128n_2x_VIKI_sw_spi = {u8g_dev_st7565_64128n_2x_VIKI_fn, &u8g_dev_st7565_64128n_2x_VIKI_pb, &u8g_com_null_fn}; u8g_dev_t u8g_dev_st7565_64128n_2x_VIKI_sw_spi = {u8g_dev_st7565_64128n_2x_VIKI_fn, &u8g_dev_st7565_64128n_2x_VIKI_pb, &u8g_com_null_fn};