jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add casting for handler

Browse Source
This commit is contained in:
InsanityAutomation
2023-02-03 17:40:47 -05:00
parent a33f7ddc8c
commit 8ea02e3ede
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp
+12 -10
View File
@@ -576,7 +576,7 @@ int RTSSHOW::RTS_RecData()
const uint16_t vp = tmp[0] << 8 | tmp[1];
const uint8_t dlen = tmp[2] << 1; // Convert to Bytes. (Display works with words)
//SERIAL_ECHOLNPGM(" vp=", vp, " dlen=", dlen);
SERIAL_ECHOLNPGM(" vp=", vp, " dlen=", dlen);
recdat.addr = vp;
recdat.len = tmp[2];
for(unsigned int i = 0;i < dlen; i+=2)
@@ -869,10 +869,12 @@ void RTSSHOW::RTS_HandleData()
break;
}
if(recdat.addr == VolumeDisplay)
if(Checkkey == ManualSetTemp)
Checkkey = ManualSetTemp;
else if(recdat.addr == VolumeDisplay)
Checkkey = VolumeDisplay;
else if(recdat.addr == T2Offset_X || recdat.addr == T2Offset_Y || recdat.addr == T2Offset_Z)
Checkkey = IdexSettings;
Checkkey = Idex_Settings;
else if(recdat.addr == DisplayBrightness)
Checkkey = DisplayBrightness;
else if(recdat.addr == DisplayStandbyBrightness)
@@ -978,31 +980,31 @@ void RTSSHOW::RTS_HandleData()
break;
#if ENABLED(DUAL_X_CARRIAGE)
case IdexSettings:
case Idex_Settings:
if (recdat.addr == T2Offset_X)
{
SERIAL_ECHOLNPGM("T2Offset_X Set 0 : ", recdat.data[0]);
SERIAL_ECHOLNPGM("T2Offset_X Set 1 : ", recdat.data[1]);
//SERIAL_ECHOLNPGM("T2Offset_X Set 0 : ", recdat.data[0]);
//SERIAL_ECHOLNPGM("T2Offset_X Set 1 : ", recdat.data[1]);
union { long l; short lb[2]; } tmpLongBuff;
tmpLongBuff.lb[0] = recdat.data[1];
tmpLongBuff.lb[1] = recdat.data[0];
SERIAL_ECHOLNPGM("T2Offset_X L : ", tmpLongBuff.l);
setNozzleOffset_mm(tmpLongBuff.l/1000, X, E1);
//SERIAL_ECHOLNPGM("T2Offset_X L : ", tmpLongBuff.l);
setNozzleOffset_mm((float)tmpLongBuff.l/1000, X, E1);
}
else if (recdat.addr == T2Offset_Y)
{
union { long l; short lb[2]; } tmpLongBuff;
tmpLongBuff.lb[0] = recdat.data[1];
tmpLongBuff.lb[1] = recdat.data[0];
setNozzleOffset_mm(tmpLongBuff.l/1000, Y, E1);
setNozzleOffset_mm((float)tmpLongBuff.l/1000, Y, E1);
}
else if (recdat.addr == T2Offset_Z)
{
union { long l; short lb[2]; } tmpLongBuff;
tmpLongBuff.lb[0] = recdat.data[1];
tmpLongBuff.lb[1] = recdat.data[0];
setNozzleOffset_mm(tmpLongBuff.l/1000, Z, E1);
setNozzleOffset_mm((float)tmpLongBuff.l/1000, Z, E1);
}
break;
#endif
Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.h
+2 -2
View File
@@ -96,7 +96,6 @@ namespace ExtUI {
#define T2Offset_Y 0x1094
#define T2Offset_Z 0x1098
#define T2StepMM_E 0x109C
#define IdexSettings 0x9999
#define ActiveToolVP 0x1014
@@ -266,9 +265,10 @@ static RTSSHOW rtscheck;
#define Filement_Value (15+Addvalue)
#define Language_Value (18+Addvalue)
#define Filename_Value (22+Addvalue)
#define Idex_Settings_Value (26+Addvalue)
enum PROC_COM {Printfile=0,Ajust,Feedrate,PrintChoice=PrintChoice_Value,Zoffset=Zoffset_Value,TempControl,ManualSetTemp,Setting=Setting_Value,
ReturnBack,Bedlevel,Autohome,XYZEaxis=XYZEaxis_Value,Filement=Filement_Value,LanguageChoice=Language_Value,No_Filement,PwrOffNoF,Volume,Filename=Filename_Value};
ReturnBack,Bedlevel,Autohome,XYZEaxis=XYZEaxis_Value,Filement=Filement_Value,LanguageChoice=Language_Value,No_Filement,PwrOffNoF,Volume,Filename=Filename_Value,Idex_Settings=Idex_Settings_Value};
const unsigned long Addrbuf[] = {0x1002, 0x1004, 0x1006, 0x1008, 0x100A, 0x100C, 0x1026, 0x1030, 0x1032, 0x1034, 0x103A,
0x103E, 0x1040, 0x1044, 0x1046, 0x1048, 0x104A, 0x104C, 0x1054, 0x1056, 0x1058,