Skip to content

Commit 95b8b0a

Browse files
thinkyheadthinkyhead
committed
Fix includes, API changes
1 parent 21b3aec commit 95b8b0a

File tree

14 files changed

+173
-180
lines changed

14 files changed

+173
-180
lines changed

‎Marlin/src/lcd/e3v2/common/dwin_api.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828

2929
#include "../../../inc/MarlinConfig.h"
3030

31+
#include <string.h> // for memset
32+
3133
uint8_t DWIN_SendBuf[11 + DWIN_WIDTH / 6 * 2] = { 0xAA };
3234
uint8_t DWIN_BufTail[4] = { 0xCC, 0x33, 0xC3, 0x3C };
3335
uint8_t databuf[26] = { 0 };

‎Marlin/src/lcd/e3v2/common/encoder.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@ void Encoder_Configuration() {
7676
}
7777

7878
// Analyze encoder value and return state
79-
ENCODER_DiffState Encoder_ReceiveAnalyze() {
79+
EncoderState Encoder_ReceiveAnalyze() {
8080
const millis_t now = millis();
8181
static uint8_t lastEncoderBits;
8282
uint8_t newbutton = 0;
8383
static signed char temp_diff = 0;
8484

85-
ENCODER_DiffState temp_diffState = ENCODER_DIFF_NO;
85+
EncoderState temp_diffState = ENCODER_DIFF_NO;
8686
if (BUTTON_PRESSED(EN1)) newbutton |= EN_A;
8787
if (BUTTON_PRESSED(EN2)) newbutton |= EN_B;
8888
if (BUTTON_PRESSED(ENC)) {

‎Marlin/src/lcd/e3v2/common/encoder.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ typedef enum {
4343
ENCODER_DIFF_CW = 1, // clockwise rotation
4444
ENCODER_DIFF_CCW = 2, // counterclockwise rotation
4545
ENCODER_DIFF_ENTER = 3 // click
46-
} ENCODER_DiffState;
46+
} EncoderState;
4747

4848
// Encoder initialization
4949
void Encoder_Configuration();
5050

5151
// Analyze encoder value and return state
52-
ENCODER_DiffState Encoder_ReceiveAnalyze();
52+
EncoderState Encoder_ReceiveAnalyze();
5353

5454
/*********************** Encoder LED ***********************/
5555

‎Marlin/src/lcd/e3v2/creality/dwin.cpp‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ void Draw_Back_First(const bool is_sel=true) {
470470
}
471471

472472
template <typename T>
473-
inline bool Apply_Encoder(const ENCODER_DiffState &encoder_diffState, T &valref) {
473+
inline bool Apply_Encoder(const EncoderState &encoder_diffState, T &valref) {
474474
if (encoder_diffState == ENCODER_DIFF_CW)
475475
valref += EncoderRate.encoderMoveValue;
476476
else if (encoder_diffState == ENCODER_DIFF_CCW)
@@ -1292,11 +1292,11 @@ void Goto_MainMenu() {
12921292
TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)();
12931293
}
12941294

1295-
inline ENCODER_DiffState get_encoder_state() {
1295+
inline EncoderState get_encoder_state() {
12961296
static millis_t Encoder_ms = 0;
12971297
const millis_t ms = millis();
12981298
if (PENDING(ms, Encoder_ms)) return ENCODER_DIFF_NO;
1299-
const ENCODER_DiffState state = Encoder_ReceiveAnalyze();
1299+
const EncoderState state = Encoder_ReceiveAnalyze();
13001300
if (state != ENCODER_DIFF_NO) Encoder_ms = ms + ENCODER_WAIT_MS;
13011301
return state;
13021302
}
@@ -1317,7 +1317,7 @@ void HMI_Move_Done(const AxisEnum axis) {
13171317
}
13181318

13191319
void HMI_Move_X() {
1320-
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
1320+
EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
13211321
if (encoder_diffState == ENCODER_DIFF_NO) return;
13221322
if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_X_scaled)) {
13231323
Draw_Edit_Float3(1, HMI_ValueStruct.Move_X_scaled);
@@ -1331,7 +1331,7 @@ void HMI_Move_X() {
13311331
}
13321332

13331333
void HMI_Move_Y() {
1334-
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
1334+
EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
13351335
if (encoder_diffState == ENCODER_DIFF_NO) return;
13361336
if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_Y_scaled)) {
13371337
Draw_Edit_Float3(2, HMI_ValueStruct.Move_Y_scaled);
@@ -1345,7 +1345,7 @@ void HMI_Move_Y() {
13451345
}
13461346

13471347
void HMI_Move_Z() {
1348-
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
1348+
EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
13491349
if (encoder_diffState == ENCODER_DIFF_NO) return;
13501350
if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_Z_scaled)) {
13511351
Draw_Edit_Float3(3, HMI_ValueStruct.Move_Z_scaled);
@@ -1362,7 +1362,7 @@ void HMI_Move_Z() {
13621362

13631363
void HMI_Move_E() {
13641364
static float last_E_scaled = 0;
1365-
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
1365+
EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
13661366
if (encoder_diffState == ENCODER_DIFF_NO) return;
13671367
if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_E_scaled)) {
13681368
last_E_scaled = HMI_ValueStruct.Move_E_scaled;
@@ -1383,7 +1383,7 @@ void HMI_Move_Z() {
13831383
bool printer_busy() { return planner.movesplanned() || printingIsActive(); }
13841384

13851385
void HMI_Zoffset() {
1386-
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
1386+
EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
13871387
if (encoder_diffState == ENCODER_DIFF_NO) return;
13881388
uint8_t zoff_line;
13891389
switch (HMI_ValueStruct.show_mode) {
@@ -1416,7 +1416,7 @@ void HMI_Move_Z() {
14161416
#if HAS_HOTEND
14171417

14181418
void HMI_ETemp() {
1419-
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
1419+
EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
14201420
if (encoder_diffState == ENCODER_DIFF_NO) return;
14211421
uint8_t temp_line;
14221422
switch (HMI_ValueStruct.show_mode) {
@@ -1458,7 +1458,7 @@ void HMI_Move_Z() {
14581458
#if HAS_HEATED_BED
14591459

14601460
void HMI_BedTemp() {
1461-
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
1461+
EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
14621462
if (encoder_diffState == ENCODER_DIFF_NO) return;
14631463
uint8_t bed_line;
14641464
switch (HMI_ValueStruct.show_mode) {
@@ -1500,7 +1500,7 @@ void HMI_Move_Z() {
15001500
#if HAS_PREHEAT && HAS_FAN
15011501

15021502
void HMI_FanSpeed() {
1503-
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
1503+
EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
15041504
if (encoder_diffState == ENCODER_DIFF_NO) return;
15051505
uint8_t fan_line;
15061506
switch (HMI_ValueStruct.show_mode) {
@@ -1541,7 +1541,7 @@ void HMI_Move_Z() {
15411541
#endif // HAS_PREHEAT && HAS_FAN
15421542

15431543
void HMI_PrintSpeed() {
1544-
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
1544+
EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
15451545
if (encoder_diffState == ENCODER_DIFF_NO) return;
15461546
if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.print_speed)) {
15471547
checkkey = Tune;
@@ -1559,7 +1559,7 @@ void HMI_PrintSpeed() {
15591559
#define LAST_AXIS TERN(HAS_HOTEND, E_AXIS, Z_AXIS)
15601560

15611561
void HMI_MaxFeedspeedXYZE() {
1562-
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
1562+
EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
15631563
if (encoder_diffState == ENCODER_DIFF_NO) return;
15641564
if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Feedspeed)) {
15651565
checkkey = MaxSpeed;
@@ -1578,7 +1578,7 @@ void HMI_MaxFeedspeedXYZE() {
15781578
}
15791579

15801580
void HMI_MaxAccelerationXYZE() {
1581-
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
1581+
EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
15821582
if (encoder_diffState == ENCODER_DIFF_NO) return;
15831583
if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Acceleration)) {
15841584
checkkey = MaxAcceleration;
@@ -1599,7 +1599,7 @@ void HMI_MaxAccelerationXYZE() {
15991599
#if HAS_CLASSIC_JERK
16001600

16011601
void HMI_MaxJerkXYZE() {
1602-
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
1602+
EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
16031603
if (encoder_diffState == ENCODER_DIFF_NO) return;
16041604
if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Jerk_scaled)) {
16051605
checkkey = MaxJerk;
@@ -1620,7 +1620,7 @@ void HMI_MaxAccelerationXYZE() {
16201620
#endif // HAS_CLASSIC_JERK
16211621

16221622
void HMI_StepXYZE() {
1623-
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
1623+
EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
16241624
if (encoder_diffState == ENCODER_DIFF_NO) return;
16251625
if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Step_scaled)) {
16261626
checkkey = Step;
@@ -2075,7 +2075,7 @@ void Draw_Print_File_Menu() {
20752075

20762076
// Main Process
20772077
void HMI_MainMenu() {
2078-
ENCODER_DiffState encoder_diffState = get_encoder_state();
2078+
EncoderState encoder_diffState = get_encoder_state();
20792079
if (encoder_diffState == ENCODER_DIFF_NO) return;
20802080

20812081
if (encoder_diffState == ENCODER_DIFF_CW) {
@@ -2135,7 +2135,7 @@ void HMI_MainMenu() {
21352135

21362136
// Select (and Print) File
21372137
void HMI_SelectFile() {
2138-
ENCODER_DiffState encoder_diffState = get_encoder_state();
2138+
EncoderState encoder_diffState = get_encoder_state();
21392139

21402140
const uint16_t hasUpDir = !card.flag.workDirIsRoot;
21412141

@@ -2255,7 +2255,7 @@ void HMI_SelectFile() {
22552255

22562256
// Printing
22572257
void HMI_Printing() {
2258-
ENCODER_DiffState encoder_diffState = get_encoder_state();
2258+
EncoderState encoder_diffState = get_encoder_state();
22592259
if (encoder_diffState == ENCODER_DIFF_NO) return;
22602260

22612261
if (HMI_flag.done_confirm_flag) {
@@ -2333,7 +2333,7 @@ void HMI_Printing() {
23332333

23342334
// Pause and Stop window
23352335
void HMI_PauseOrStop() {
2336-
ENCODER_DiffState encoder_diffState = get_encoder_state();
2336+
EncoderState encoder_diffState = get_encoder_state();
23372337
if (encoder_diffState == ENCODER_DIFF_NO) return;
23382338

23392339
if (encoder_diffState == ENCODER_DIFF_CW)
@@ -2632,7 +2632,7 @@ void HMI_AudioFeedback(const bool success=true) {
26322632

26332633
// Prepare
26342634
void HMI_Prepare() {
2635-
ENCODER_DiffState encoder_diffState = get_encoder_state();
2635+
EncoderState encoder_diffState = get_encoder_state();
26362636
if (encoder_diffState == ENCODER_DIFF_NO) return;
26372637

26382638
// Avoid flicker by updating only the previous menu
@@ -2846,7 +2846,7 @@ void Draw_Temperature_Menu() {
28462846

28472847
// Control
28482848
void HMI_Control() {
2849-
ENCODER_DiffState encoder_diffState = get_encoder_state();
2849+
EncoderState encoder_diffState = get_encoder_state();
28502850
if (encoder_diffState == ENCODER_DIFF_NO) return;
28512851

28522852
// Avoid flicker by updating only the previous menu
@@ -2942,7 +2942,7 @@ void HMI_Control() {
29422942

29432943
// Axis Move
29442944
void HMI_AxisMove() {
2945-
ENCODER_DiffState encoder_diffState = get_encoder_state();
2945+
EncoderState encoder_diffState = get_encoder_state();
29462946
if (encoder_diffState == ENCODER_DIFF_NO) return;
29472947

29482948
#if ENABLED(PREVENT_COLD_EXTRUSION)
@@ -3018,7 +3018,7 @@ void HMI_AxisMove() {
30183018

30193019
// TemperatureID
30203020
void HMI_Temperature() {
3021-
ENCODER_DiffState encoder_diffState = get_encoder_state();
3021+
EncoderState encoder_diffState = get_encoder_state();
30223022
if (encoder_diffState == ENCODER_DIFF_NO) return;
30233023

30243024
// Avoid flicker by updating only the previous menu
@@ -3445,7 +3445,7 @@ void Draw_Steps_Menu() {
34453445

34463446
// Motion
34473447
void HMI_Motion() {
3448-
ENCODER_DiffState encoder_diffState = get_encoder_state();
3448+
EncoderState encoder_diffState = get_encoder_state();
34493449
if (encoder_diffState == ENCODER_DIFF_NO) return;
34503450

34513451
// Avoid flicker by updating only the previous menu
@@ -3493,7 +3493,7 @@ void HMI_Motion() {
34933493

34943494
// Advanced Settings
34953495
void HMI_AdvSet() {
3496-
ENCODER_DiffState encoder_diffState = get_encoder_state();
3496+
EncoderState encoder_diffState = get_encoder_state();
34973497
if (encoder_diffState == ENCODER_DIFF_NO) return;
34983498

34993499
// Avoid flicker by updating only the previous menu
@@ -3590,7 +3590,7 @@ void HMI_AdvSet() {
35903590

35913591
// Home Offset
35923592
void HMI_HomeOff() {
3593-
ENCODER_DiffState encoder_diffState = get_encoder_state();
3593+
EncoderState encoder_diffState = get_encoder_state();
35943594
if (encoder_diffState == ENCODER_DIFF_NO) return;
35953595

35963596
// Avoid flicker by updating only the previous menu
@@ -3629,7 +3629,7 @@ void HMI_AdvSet() {
36293629
}
36303630

36313631
void HMI_HomeOffN(const AxisEnum axis, float &posScaled, const_float_t lo, const_float_t hi) {
3632-
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
3632+
EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
36333633
if (encoder_diffState == ENCODER_DIFF_NO) return;
36343634

36353635
if (Apply_Encoder(encoder_diffState, posScaled)) {
@@ -3653,7 +3653,7 @@ void HMI_AdvSet() {
36533653

36543654
// Probe Offset
36553655
void HMI_ProbeOff() {
3656-
ENCODER_DiffState encoder_diffState = get_encoder_state();
3656+
EncoderState encoder_diffState = get_encoder_state();
36573657
if (encoder_diffState == ENCODER_DIFF_NO) return;
36583658

36593659
// Avoid flicker by updating only the previous menu
@@ -3686,7 +3686,7 @@ void HMI_AdvSet() {
36863686
}
36873687

36883688
void HMI_ProbeOffN(float &posScaled, float &offset_ref) {
3689-
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
3689+
EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
36903690
if (encoder_diffState == ENCODER_DIFF_NO) return;
36913691

36923692
if (Apply_Encoder(encoder_diffState, posScaled)) {
@@ -3707,7 +3707,7 @@ void HMI_AdvSet() {
37073707

37083708
// Info
37093709
void HMI_Info() {
3710-
ENCODER_DiffState encoder_diffState = get_encoder_state();
3710+
EncoderState encoder_diffState = get_encoder_state();
37113711
if (encoder_diffState == ENCODER_DIFF_NO) return;
37123712
if (encoder_diffState == ENCODER_DIFF_ENTER) {
37133713
#if HAS_ONESTEP_LEVELING
@@ -3724,7 +3724,7 @@ void HMI_Info() {
37243724

37253725
// Tune
37263726
void HMI_Tune() {
3727-
ENCODER_DiffState encoder_diffState = get_encoder_state();
3727+
EncoderState encoder_diffState = get_encoder_state();
37283728
if (encoder_diffState == ENCODER_DIFF_NO) return;
37293729

37303730
// Avoid flicker by updating only the previous menu
@@ -3810,7 +3810,7 @@ void HMI_Tune() {
38103810

38113811
// PLA Preheat
38123812
void HMI_PLAPreheatSetting() {
3813-
ENCODER_DiffState encoder_diffState = get_encoder_state();
3813+
EncoderState encoder_diffState = get_encoder_state();
38143814
if (encoder_diffState == ENCODER_DIFF_NO) return;
38153815

38163816
// Avoid flicker by updating only the previous menu
@@ -3866,7 +3866,7 @@ void HMI_Tune() {
38663866

38673867
// ABS Preheat
38683868
void HMI_ABSPreheatSetting() {
3869-
ENCODER_DiffState encoder_diffState = get_encoder_state();
3869+
EncoderState encoder_diffState = get_encoder_state();
38703870
if (encoder_diffState == ENCODER_DIFF_NO) return;
38713871

38723872
// Avoid flicker by updating only the previous menu
@@ -3924,7 +3924,7 @@ void HMI_Tune() {
39243924

39253925
// Max Speed
39263926
void HMI_MaxSpeed() {
3927-
ENCODER_DiffState encoder_diffState = get_encoder_state();
3927+
EncoderState encoder_diffState = get_encoder_state();
39283928
if (encoder_diffState == ENCODER_DIFF_NO) return;
39293929

39303930
// Avoid flicker by updating only the previous menu
@@ -3953,7 +3953,7 @@ void HMI_MaxSpeed() {
39533953

39543954
// Max Acceleration
39553955
void HMI_MaxAcceleration() {
3956-
ENCODER_DiffState encoder_diffState = get_encoder_state();
3956+
EncoderState encoder_diffState = get_encoder_state();
39573957
if (encoder_diffState == ENCODER_DIFF_NO) return;
39583958

39593959
// Avoid flicker by updating only the previous menu
@@ -3983,7 +3983,7 @@ void HMI_MaxAcceleration() {
39833983
#if HAS_CLASSIC_JERK
39843984
// Max Jerk
39853985
void HMI_MaxJerk() {
3986-
ENCODER_DiffState encoder_diffState = get_encoder_state();
3986+
EncoderState encoder_diffState = get_encoder_state();
39873987
if (encoder_diffState == ENCODER_DIFF_NO) return;
39883988

39893989
// Avoid flicker by updating only the previous menu
@@ -4013,7 +4013,7 @@ void HMI_MaxAcceleration() {
40134013

40144014
// Step
40154015
void HMI_Step() {
4016-
ENCODER_DiffState encoder_diffState = get_encoder_state();
4016+
EncoderState encoder_diffState = get_encoder_state();
40174017
if (encoder_diffState == ENCODER_DIFF_NO) return;
40184018

40194019
// Avoid flicker by updating only the previous menu
@@ -4169,7 +4169,7 @@ void EachMomentUpdate() {
41694169
DWIN_UpdateLCD();
41704170

41714171
while (recovery_flag) {
4172-
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
4172+
EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
41734173
if (encoder_diffState != ENCODER_DIFF_NO) {
41744174
if (encoder_diffState == ENCODER_DIFF_ENTER) {
41754175
recovery_flag = false;

‎Marlin/src/lcd/e3v2/creality/dwin_lcd.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#include "../../../inc/MarlinConfig.h"
3636

3737
#include "dwin_lcd.h"
38-
#include <string.h> // for memset
3938

4039
//#define DEBUG_OUT 1
4140
#include "../../../core/debug_out.h"

0 commit comments

Comments
 (0)