Skip to content

🚸 Probe / Level Menu #27393

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Sep 12, 2024
Merged

🚸 Probe / Level Menu #27393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b8f79d
🎨 Housekeeping
thinkyhead Sep 3, 2024
6203651
🚸 Tweak UBL menu
thinkyhead Sep 3, 2024
590616e
🚸 Babystep Probe specific titles
thinkyhead Sep 3, 2024
b2b46ec
🚸 Probe / Level Menu
thinkyhead Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Marlin/src/core/multi_language.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ typedef const char Language_Str[];
#define LANG_CHARSIZE GET_TEXT(CHARSIZE)
#define USE_WIDE_GLYPH (LANG_CHARSIZE > 2)

// The final "\0" is added invisibly by the compiler
#define MSG_1_LINE(A) A "\0" "\0"
#define MSG_2_LINE(A,B) A "\0" B "\0"
#define MSG_3_LINE(A,B,C) A "\0" B "\0" C
8 changes: 6 additions & 2 deletions Marlin/src/feature/babystep.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void Babystep::add_mm(const AxisEnum axis, const_float_t mm) {

#if ENABLED(BD_SENSOR)
void Babystep::set_mm(const AxisEnum axis, const_float_t mm) {
//if (DISABLED(BABYSTEP_WITHOUT_HOMING) && axes_should_home(_BV(axis))) return;
//if (DISABLED(BABYSTEP_WITHOUT_HOMING) && axis_should_home(axis)) return;
const int16_t distance = mm * planner.settings.axis_steps_per_mm[axis];
accum = distance; // Count up babysteps for the UI
steps[BS_AXIS_IND(axis)] = distance;
Expand All @@ -70,8 +70,12 @@ void Babystep::add_mm(const AxisEnum axis, const_float_t mm) {
}
#endif

bool Babystep::can_babystep(const AxisEnum axis) {
return (ENABLED(BABYSTEP_WITHOUT_HOMING) || !axis_should_home(axis));
}

void Babystep::add_steps(const AxisEnum axis, const int16_t distance) {
if (DISABLED(BABYSTEP_WITHOUT_HOMING) && axes_should_home(_BV(axis))) return;
if (!can_babystep(axis)) return;

accum += distance; // Count up babysteps for the UI
steps[BS_AXIS_IND(axis)] += distance;
Expand Down
1 change: 1 addition & 0 deletions Marlin/src/feature/babystep.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ class Babystep {
}
#endif

static bool can_babystep(const AxisEnum axis);
static void add_steps(const AxisEnum axis, const int16_t distance);
static void add_mm(const AxisEnum axis, const_float_t mm);

Expand Down
15 changes: 6 additions & 9 deletions Marlin/src/feature/mmu3/mmu2_progress_converter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,33 +30,30 @@

#include "../../core/language.h"
#include "mmu2_progress_converter.h"
#ifdef __AVR__
#include <avr/pgmspace.h>
#endif
#include "mmu_hw/progress_codes.h"
#include "mmu_hw/errors_list.h"

namespace MMU3 {

FSTR_P const progressTexts[] PROGMEM = {
GET_TEXT_F(MSG_PROGRESS_OK),
GET_TEXT_F(MSG_PROGRESS_ENGAGE_IDLER),
GET_TEXT_F(MSG_PROGRESS_DISENGAGE_IDLER),
GET_TEXT_F(MSG_PROGRESS_OK), // TODO: Generic messages for Marlin
GET_TEXT_F(MSG_PROGRESS_ENGAGE_IDLER), // reused below
GET_TEXT_F(MSG_PROGRESS_DISENGAGE_IDLER), // reused below
GET_TEXT_F(MSG_PROGRESS_UNLOAD_FINDA),
GET_TEXT_F(MSG_PROGRESS_UNLOAD_PULLEY),
GET_TEXT_F(MSG_PROGRESS_FEED_FINDA),
GET_TEXT_F(MSG_PROGRESS_FEED_EXTRUDER),
GET_TEXT_F(MSG_PROGRESS_FEED_NOZZLE),
GET_TEXT_F(MSG_PROGRESS_AVOID_GRIND),
GET_TEXT_F(MSG_FINISHING_MOVEMENTS), // reuse from messages.cpp
GET_TEXT_F(MSG_FINISHING_MOVEMENTS),
GET_TEXT_F(MSG_PROGRESS_DISENGAGE_IDLER), // err disengaging idler is the same text
GET_TEXT_F(MSG_PROGRESS_ENGAGE_IDLER), // engage dtto.
GET_TEXT_F(MSG_PROGRESS_WAIT_USER),
GET_TEXT_F(MSG_PROGRESS_ERR_INTERNAL),
GET_TEXT_F(MSG_PROGRESS_ERR_HELP_FIL),
GET_TEXT_F(MSG_PROGRESS_ERR_TMC),
GET_TEXT_F(MSG_UNLOADING_FILAMENT), // reuse from messages.cpp
GET_TEXT_F(MSG_LOADING_FILAMENT), // reuse from messages.cpp
GET_TEXT_F(MSG_UNLOADING_FILAMENT),
GET_TEXT_F(MSG_LOADING_FILAMENT),
GET_TEXT_F(MSG_PROGRESS_SELECT_SLOT),
GET_TEXT_F(MSG_PROGRESS_PREPARE_BLADE),
GET_TEXT_F(MSG_PROGRESS_PUSH_FILAMENT),
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/calibrate/G28.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ void GcodeSuite::G28() {

#else // !DELTA && !AXEL_TPARA

#define _UNSAFE(A) (homeZ && TERN0(Z_SAFE_HOMING, axes_should_home(_BV(A##_AXIS))))
#define _UNSAFE(A) TERN0(Z_SAFE_HOMING, homeZ && axis_should_home(_AXIS(A)))

const bool homeZ = TERN0(HAS_Z_AXIS, parser.seen_test('Z')),
NUM_AXIS_LIST_( // Other axes should be homed before Z safe-homing
Expand Down
15 changes: 15 additions & 0 deletions Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@

#include "langdata.h"

const u8g_fntpgm_uint8_t fontpage_344_146_146[45] U8G_FONT_SECTION("fontpage_344_146_146") = {
0x00,0x0B,0x0D,0x00,0xFD,0x00,0x00,0x00,0x00,0x00,0x92,0x92,0x00,0x09,0xFE,0x00,
0x00,0x09,0x0B,0x16,0x0A,0x01,0xFE,0xF9,0x00,0x09,0x00,0x11,0x80,0x11,0x00,0x61,
0x00,0x80,0x00,0x4A,0x00,0x4A,0x00,0x72,0x00,0x4D,0x00,0x74,0x80};
const u8g_fntpgm_uint8_t fontpage_344_240_240[34] U8G_FONT_SECTION("fontpage_344_240_240") = {
0x00,0x0B,0x0D,0x00,0xFD,0x00,0x00,0x00,0x00,0x00,0xF0,0xF0,0x00,0x09,0xFE,0x00,
0x00,0x08,0x0B,0x0B,0x0A,0x01,0xFE,0xF9,0x09,0x09,0x11,0x17,0x21,0x41,0x81,0x01,
Expand Down Expand Up @@ -191,6 +195,10 @@ const u8g_fntpgm_uint8_t fontpage_377_248_248[45] U8G_FONT_SECTION("fontpage_377
0x00,0x0B,0x0D,0x00,0xFD,0x00,0x00,0x00,0x00,0x00,0xF8,0xF8,0x00,0x09,0xFE,0x00,
0x00,0x0A,0x0B,0x16,0x0A,0x00,0xFE,0x20,0x80,0x20,0x80,0x3F,0x00,0x20,0x80,0x3F,
0x00,0x04,0x00,0xFF,0xC0,0x00,0x00,0x20,0x00,0x20,0x00,0x3F,0x80};
const u8g_fntpgm_uint8_t fontpage_380_140_140[41] U8G_FONT_SECTION("fontpage_380_140_140") = {
0x00,0x0B,0x0D,0x00,0xFD,0x00,0x00,0x00,0x00,0x00,0x8C,0x8C,0x00,0x09,0x00,0x00,
0x00,0x0A,0x09,0x12,0x0A,0x00,0x00,0x20,0x80,0x20,0x80,0x3F,0x80,0x20,0x80,0x20,
0x80,0x3F,0x80,0x00,0x00,0x00,0x00,0xFF,0xC0};
const u8g_fntpgm_uint8_t fontpage_380_196_196[34] U8G_FONT_SECTION("fontpage_380_196_196") = {
0x00,0x0B,0x0D,0x00,0xFD,0x00,0x00,0x00,0x00,0x00,0xC4,0xC4,0x00,0x09,0xFE,0x00,
0x00,0x08,0x0B,0x0B,0x0A,0x01,0xFE,0x89,0x89,0x89,0xF9,0x89,0x89,0x89,0xF9,0x01,
Expand Down Expand Up @@ -329,6 +337,10 @@ const u8g_fntpgm_uint8_t fontpage_400_156_156[45] U8G_FONT_SECTION("fontpage_400
0x00,0x0B,0x0D,0x00,0xFD,0x00,0x00,0x00,0x00,0x00,0x9C,0x9C,0x00,0x09,0xFE,0x00,
0x00,0x09,0x0B,0x16,0x0A,0x00,0xFE,0x7A,0x80,0x0A,0x80,0x0A,0x80,0x16,0x80,0x12,
0x80,0x2A,0x80,0x4A,0x80,0x86,0x80,0x02,0x80,0x02,0x80,0x02,0x80};
const u8g_fntpgm_uint8_t fontpage_400_240_240[41] U8G_FONT_SECTION("fontpage_400_240_240") = {
0x00,0x0B,0x0D,0x00,0xFD,0x00,0x00,0x00,0x00,0x00,0xF0,0xF0,0x00,0x09,0x00,0x00,
0x00,0x0A,0x09,0x12,0x0A,0x00,0x00,0x3F,0x00,0x01,0x00,0x02,0x00,0x0C,0x00,0x33,
0x00,0x64,0x80,0x04,0x00,0x04,0x00,0xFF,0xC0};
const u8g_fntpgm_uint8_t fontpage_401_253_253[45] U8G_FONT_SECTION("fontpage_401_253_253") = {
0x00,0x0B,0x0D,0x00,0xFD,0x00,0x00,0x00,0x00,0x00,0xFD,0xFD,0x00,0x09,0xFE,0x00,
0x00,0x0A,0x0B,0x16,0x0A,0x00,0xFE,0x3F,0x00,0x01,0x00,0x0E,0x00,0x71,0x80,0x00,
Expand Down Expand Up @@ -439,6 +451,7 @@ const u8g_fntpgm_uint8_t fontpage_431_136_136[34] U8G_FONT_SECTION("fontpage_431
0x01,0x01};

static const uxg_fontinfo_t g_fontinfo_ko_KR[] PROGMEM = {
FONTDATA_ITEM(344, 146, 146, fontpage_344_146_146), // '값' -- '값'
FONTDATA_ITEM(344, 240, 240, fontpage_344_240_240), // '거' -- '거'
FONTDATA_ITEM(345, 224, 224, fontpage_345_224_224), // '고' -- '고'
FONTDATA_ITEM(347, 248, 248, fontpage_347_248_248), // '그' -- '그'
Expand Down Expand Up @@ -485,6 +498,7 @@ static const uxg_fontinfo_t g_fontinfo_ko_KR[] PROGMEM = {
FONTDATA_ITEM(377, 160, 160, fontpage_377_160_160), // '베' -- '베'
FONTDATA_ITEM(377, 168, 168, fontpage_377_168_168), // '벨' -- '벨'
FONTDATA_ITEM(377, 248, 248, fontpage_377_248_248), // '본' -- '본'
FONTDATA_ITEM(380, 140, 140, fontpage_380_140_140), // '브' -- '브'
FONTDATA_ITEM(380, 196, 196, fontpage_380_196_196), // '비' -- '비'
FONTDATA_ITEM(385, 172, 172, fontpage_385_172_172), // '사' -- '사'
FONTDATA_ITEM(385, 189, 189, fontpage_385_189_189), // '삽' -- '삽'
Expand Down Expand Up @@ -518,6 +532,7 @@ static const uxg_fontinfo_t g_fontinfo_ko_KR[] PROGMEM = {
FONTDATA_ITEM(400, 132, 132, fontpage_400_132_132), // '전' -- '전'
FONTDATA_ITEM(400, 149, 149, fontpage_400_149_149), // '정' -- '정'
FONTDATA_ITEM(400, 156, 156, fontpage_400_156_156), // '제' -- '제'
FONTDATA_ITEM(400, 240, 240, fontpage_400_240_240), // '조' -- '조'
FONTDATA_ITEM(401, 253, 253, fontpage_401_253_253), // '죽' -- '죽'
FONTDATA_ITEM(402, 128, 128, fontpage_402_128_128), // '준' -- '준'
FONTDATA_ITEM(402, 145, 145, fontpage_402_145_145), // '중' -- '중'
Expand Down
Loading
Loading