Skip to content

Commit

Permalink
marlinui reorder
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Jan 21, 2022
1 parent c78099b commit 1a207c8
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions Marlin/src/lcd/marlinui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ MarlinUI ui;
#if HAS_DISPLAY
#include "../gcode/queue.h"
#include "fontutils.h"
#include "../sd/cardreader.h"
#endif

#if ENABLED(DWIN_CREALITY_LCD)
Expand Down Expand Up @@ -175,6 +174,12 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;

#endif

// Encoder Handling
#if HAS_ENCODER_ACTION
uint32_t MarlinUI::encoderPosition;
volatile int8_t encoderDiff; // Updated in update_buttons, added to encoderPosition every LCD update
#endif

void MarlinUI::init() {

init_lcd();
Expand Down Expand Up @@ -248,8 +253,6 @@ void MarlinUI::init() {

#include "lcdprint.h"

#include "../sd/cardreader.h"

#include "../module/temperature.h"
#include "../module/planner.h"
#include "../module/motion.h"
Expand Down Expand Up @@ -311,12 +314,6 @@ void MarlinUI::init() {
bool MarlinUI::old_is_printing;
#endif

// Encoder Handling
#if HAS_ENCODER_ACTION
uint32_t MarlinUI::encoderPosition;
volatile int8_t encoderDiff; // Updated in update_buttons, added to encoderPosition every LCD update
#endif

#if ENABLED(SDSUPPORT)

#include "../sd/cardreader.h"
Expand Down

0 comments on commit 1a207c8

Please sign in to comment.