Move axis_homed, axis_known_position to motion.*
This commit is contained in:
@ -41,7 +41,7 @@
|
||||
* location: <http://www.gnu.org/licenses/>. *
|
||||
****************************************************************************/
|
||||
|
||||
#include "../../Marlin.h"
|
||||
#include "../../inc/MarlinConfigPre.h"
|
||||
|
||||
#if ENABLED(EXTENSIBLE_UI)
|
||||
|
||||
@ -109,7 +109,7 @@ namespace UI {
|
||||
// Machine was killed, reinit SysTick so we are able to compute time without ISRs
|
||||
if (currTimeHI == 0) {
|
||||
// Get the last time the Arduino time computed (from CMSIS) and convert it to SysTick
|
||||
currTimeHI = (uint32_t)((GetTickCount() * (uint64_t)(F_CPU/8000)) >> 24);
|
||||
currTimeHI = (uint32_t)((GetTickCount() * (uint64_t)(F_CPU / 8000)) >> 24);
|
||||
|
||||
// Reinit the SysTick timer to maximize its period
|
||||
SysTick->LOAD = SysTick_LOAD_RELOAD_Msk; // get the full range for the systick timer
|
||||
@ -136,7 +136,7 @@ namespace UI {
|
||||
#else
|
||||
|
||||
// TODO: Implement for AVR
|
||||
uint32_t safe_millis() { return millis(); }
|
||||
FORCE_INLINE uint32_t safe_millis() { return millis(); }
|
||||
|
||||
#endif
|
||||
|
||||
@ -399,6 +399,7 @@ namespace UI {
|
||||
#endif
|
||||
|
||||
#if ENABLED(JUNCTION_DEVIATION)
|
||||
|
||||
float getJunctionDeviation_mm() {
|
||||
return planner.junction_deviation_mm;
|
||||
}
|
||||
@ -407,13 +408,15 @@ namespace UI {
|
||||
planner.junction_deviation_mm = clamp(value, 0.01, 0.3);
|
||||
planner.recalculate_max_e_jerk();
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
float getAxisMaxJerk_mm_s(const axis_t axis) {
|
||||
return planner.max_jerk[axis];
|
||||
return planner.max_jerk[axis];
|
||||
}
|
||||
|
||||
float getAxisMaxJerk_mm_s(const extruder_t extruder) {
|
||||
return planner.max_jerk[E_AXIS];
|
||||
return planner.max_jerk[E_AXIS];
|
||||
}
|
||||
|
||||
void setAxisMaxJerk_mm_s(const float value, const axis_t axis) {
|
||||
|
@ -188,7 +188,7 @@
|
||||
//
|
||||
void _lcd_level_bed_continue() {
|
||||
defer_return_to_status = true;
|
||||
axis_homed = 0;
|
||||
set_all_unhomed();
|
||||
lcd_goto_screen(_lcd_level_bed_homing);
|
||||
enqueue_and_echo_commands_P(PSTR("G28"));
|
||||
}
|
||||
|
@ -502,7 +502,7 @@ void _lcd_ubl_output_map_lcd() {
|
||||
*/
|
||||
void _lcd_ubl_output_map_lcd_cmd() {
|
||||
if (!all_axes_known()) {
|
||||
axis_homed = 0;
|
||||
set_all_unhomed();
|
||||
enqueue_and_echo_commands_P(PSTR("G28"));
|
||||
}
|
||||
lcd_goto_screen(_lcd_ubl_map_homing);
|
||||
|
Reference in New Issue
Block a user