Skip to content

Commit 166324f

Browse files
marciotthinkyhead
marciot
authored and
thinkyhead
committed
🐛 Fix and improve FTDI Eve Touch UI (#22361, #22439, #22459, #22468, #22500, #22530)
1 parent 3924545 commit 166324f

Some content is hidden

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

45 files changed

+175
-168
lines changed

‎Marlin/src/HAL/LINUX/hardware/Gpio.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ struct GpioEvent {
4040
pin_type pin_id;
4141
GpioEvent::Type event;
4242

43-
GpioEvent(uint64_t timestamp, pin_type pin_id, GpioEvent::Type event){
43+
GpioEvent(uint64_t timestamp, pin_type pin_id, GpioEvent::Type event) {
4444
this->timestamp = timestamp;
4545
this->pin_id = pin_id;
4646
this->event = event;

‎Marlin/src/HAL/LINUX/hardware/LinearAxis.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void LinearAxis::update() {
5151
}
5252

5353
void LinearAxis::interrupt(GpioEvent ev) {
54-
if (ev.pin_id == step_pin && !Gpio::pin_map[enable_pin].value){
54+
if (ev.pin_id == step_pin && !Gpio::pin_map[enable_pin].value) {
5555
if (ev.event == GpioEvent::RISE) {
5656
last_update = ev.timestamp;
5757
position += -1 + 2 * Gpio::pin_map[dir_pin].value;

‎Marlin/src/HAL/LINUX/hardware/Timer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class Timer {
5252
return (*(intptr_t*)timerid);
5353
}
5454

55-
static void handler(int sig, siginfo_t *si, void *uc){
55+
static void handler(int sig, siginfo_t *si, void *uc) {
5656
Timer* _this = (Timer*)si->si_value.sival_ptr;
5757
_this->avg_error += (Clock::nanos() - _this->start_time) - _this->period; //high_resolution_clock is also limited in precision, but best we have
5858
_this->avg_error /= 2; //very crude precision analysis (actually within +-500ns usually)

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
8787
.tag(13) .button(BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE))
8888
.tag(14) .button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_DEFAULTS))
8989
.colors(action_btn)
90-
.tag(1). button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
90+
.tag(1). button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
9191
#undef GRID_COLS
9292
#undef GRID_ROWS
9393
}

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ bool BioConfirmHomeE::onTouchEnd(uint8_t tag) {
3636
switch (tag) {
3737
case 1:
3838
#if defined(AXIS_LEVELING_COMMANDS) && defined(PARK_AND_RELEASE_COMMANDS)
39-
SpinnerDialogBox::enqueueAndWait_P(F(
39+
SpinnerDialogBox::enqueueAndWait(F(
4040
"G28 E\n"
4141
AXIS_LEVELING_COMMANDS "\n"
4242
PARK_AND_RELEASE_COMMANDS

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ bool BioConfirmHomeXYZ::onTouchEnd(uint8_t tag) {
3636
switch (tag) {
3737
case 1:
3838
#ifdef PARK_AND_RELEASE_COMMANDS
39-
SpinnerDialogBox::enqueueAndWait_P(F(
39+
SpinnerDialogBox::enqueueAndWait(F(
4040
"G28\n"
4141
PARK_AND_RELEASE_COMMANDS
4242
));

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void MainMenu::onRedraw(draw_mode_t what) {
5454
.tag(8).button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_ADVANCED_SETTINGS))
5555
.tag(9).button(BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_INFO_MENU))
5656
.colors(action_btn)
57-
.tag(1).button(BTN_POS(1,10), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
57+
.tag(1).button(BTN_POS(1,10), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
5858
}
5959

6060
#undef GRID_COLS
@@ -67,17 +67,17 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
6767
const bool e_homed = isAxisPositionKnown(E0);
6868

6969
switch (tag) {
70-
case 1: SaveSettingsDialogBox::promptToSaveSettings(); break;
71-
case 2: GOTO_SCREEN(BioConfirmHomeXYZ); break;
72-
case 3: SpinnerDialogBox::enqueueAndWait_P(e_homed ? F("G0 E0 F120") : F("G112")); break;
73-
case 4: StatusScreen::unlockMotors(); break;
70+
case 1: SaveSettingsDialogBox::promptToSaveSettings(); break;
71+
case 2: GOTO_SCREEN(BioConfirmHomeXYZ); break;
72+
case 3: SpinnerDialogBox::enqueueAndWait(e_homed ? F("G0 E0 F120") : F("G112")); break;
73+
case 4: StatusScreen::unlockMotors(); break;
7474
#ifdef AXIS_LEVELING_COMMANDS
75-
case 5: SpinnerDialogBox::enqueueAndWait_P(F(AXIS_LEVELING_COMMANDS)); break;
75+
case 5: SpinnerDialogBox::enqueueAndWait(F(AXIS_LEVELING_COMMANDS)); break;
7676
#endif
77-
case 6: GOTO_SCREEN(TemperatureScreen); break;
78-
case 7: GOTO_SCREEN(InterfaceSettingsScreen); break;
79-
case 8: GOTO_SCREEN(AdvancedSettingsMenu); break;
80-
case 9: GOTO_SCREEN(AboutScreen); break;
77+
case 6: GOTO_SCREEN(TemperatureScreen); break;
78+
case 7: GOTO_SCREEN(InterfaceSettingsScreen); break;
79+
case 8: GOTO_SCREEN(AdvancedSettingsMenu); break;
80+
case 9: GOTO_SCREEN(AboutScreen); break;
8181
default:
8282
return false;
8383
}

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ bool StatusScreen::onTouchEnd(uint8_t tag) {
316316
case 9: GOTO_SCREEN(FilesScreen); break;
317317
case 10: GOTO_SCREEN(MainMenu); break;
318318
case 13: GOTO_SCREEN(BioConfirmHomeE); break;
319-
case 14: SpinnerDialogBox::enqueueAndWait_P(F("G28Z")); break;
319+
case 14: SpinnerDialogBox::enqueueAndWait(F("G28Z")); break;
320320
case 15: GOTO_SCREEN(TemperatureScreen); break;
321321
case 16: fine_motion = !fine_motion; break;
322322
default: return false;

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void TuneMenu::onRedraw(draw_mode_t what) {
5454
.enabled(!isPrinting()).tag(5).button(BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_MOVE_TO_HOME))
5555
.enabled(!isPrinting()).tag(6).button(BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_RAISE_PLUNGER))
5656
.enabled(!isPrinting()).tag(7).button(BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_RELEASE_XY_AXIS))
57-
.colors(action_btn) .tag(1).button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
57+
.colors(action_btn) .tag(1).button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
5858
}
5959
#undef GRID_COLS
6060
#undef GRID_ROWS
@@ -67,7 +67,7 @@ bool TuneMenu::onTouchEnd(uint8_t tag) {
6767
case 3: GOTO_SCREEN(TemperatureScreen); break;
6868
case 4: GOTO_SCREEN(NudgeNozzleScreen); break;
6969
case 5: GOTO_SCREEN(BioConfirmHomeXYZ); break;
70-
case 6: SpinnerDialogBox::enqueueAndWait_P(F("G0 E0 F120")); break;
70+
case 6: SpinnerDialogBox::enqueueAndWait(F("G0 E0 F120")); break;
7171
case 7: StatusScreen::unlockMotors(); break;
7272
default:
7373
return false;

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
6767
.tag(10).button(DISPLAY_POS, GET_TEXT_F(MSG_DISPLAY_MENU))
6868
.tag(11).button(RESTORE_DEFAULTS_POS, GET_TEXT_F(MSG_RESTORE_DEFAULTS))
6969
.colors(action_btn)
70-
.tag(1).button(BACK_POS, GET_TEXT_F(MSG_BACK));
70+
.tag(1).button(BACK_POS, GET_TEXT_F(MSG_BUTTON_DONE));
7171
}
7272
}
7373

0 commit comments

Comments
 (0)