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

fix platform

Browse Source
This commit is contained in:
InsanityAutomation
2021-02-10 07:24:51 -05:00
parent 923ce8e1d8
commit 80123bfdf2
2 changed files with 51 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/src/lcd/dwin/e3v2/dwin.cpp
+19 -19
View File
@@ -1155,10 +1155,10 @@ void HMI_Move_X(void) {
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
if (encoder_diffState != ENCODER_DIFF_NO) {
if (encoder_diffState == ENCODER_DIFF_CW) {
HMI_ValueStruct.Move_X_scale += EncoderRate.encoderMoveValue;
HMI_ValueStruct.Move_X_scaled += EncoderRate.encoderMoveValue;
}
else if (encoder_diffState == ENCODER_DIFF_CCW) {
HMI_ValueStruct.Move_X_scale -= EncoderRate.encoderMoveValue;
HMI_ValueStruct.Move_X_scaled -= EncoderRate.encoderMoveValue;
}
LIMIT(HMI_ValueStruct.Move_X_scaled, (X_MIN_POS) * MINUNITMULT, (X_MAX_POS) * MINUNITMULT);
@@ -1166,7 +1166,7 @@ void HMI_Move_X(void) {
DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 216, MBASE(1), HMI_ValueStruct.Move_X_scaled);
DWIN_UpdateLCD();
DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 1, 216, MBASE(1), HMI_ValueStruct.Move_X_scale);
DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 1, 216, MBASE(1), HMI_ValueStruct.Move_X_scaled);
if (!planner.is_full()) {
// Wait for planner moves to finish!
planner.synchronize();
@@ -1189,10 +1189,10 @@ void HMI_Move_Y(void) {
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
if (encoder_diffState != ENCODER_DIFF_NO) {
if (encoder_diffState == ENCODER_DIFF_CW) {
HMI_ValueStruct.Move_Y_scale += EncoderRate.encoderMoveValue;
HMI_ValueStruct.Move_Y_scaled += EncoderRate.encoderMoveValue;
}
else if (encoder_diffState == ENCODER_DIFF_CCW) {
HMI_ValueStruct.Move_Y_scale -= EncoderRate.encoderMoveValue;
HMI_ValueStruct.Move_Y_scaled -= EncoderRate.encoderMoveValue;
}
LIMIT(HMI_ValueStruct.Move_Y_scaled, (Y_MIN_POS) * MINUNITMULT, (Y_MAX_POS) * MINUNITMULT);
@@ -1200,7 +1200,7 @@ void HMI_Move_Y(void) {
DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 216, MBASE(2), HMI_ValueStruct.Move_Y_scaled);
DWIN_UpdateLCD();
DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 1, 216, MBASE(2), HMI_ValueStruct.Move_Y_scale);
DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 1, 216, MBASE(2), HMI_ValueStruct.Move_Y_scaled);
if (!planner.is_full()) {
// Wait for planner moves to finish!
planner.synchronize();
@@ -1223,10 +1223,10 @@ void HMI_Move_Z(void) {
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
if (encoder_diffState != ENCODER_DIFF_NO) {
if (encoder_diffState == ENCODER_DIFF_CW) {
HMI_ValueStruct.Move_Z_scale += EncoderRate.encoderMoveValue;
HMI_ValueStruct.Move_Z_scaled += EncoderRate.encoderMoveValue;
}
else if (encoder_diffState == ENCODER_DIFF_CCW) {
HMI_ValueStruct.Move_Z_scale -= EncoderRate.encoderMoveValue;
HMI_ValueStruct.Move_Z_scaled -= EncoderRate.encoderMoveValue;
}
LIMIT(HMI_ValueStruct.Move_Z_scaled, Z_MIN_POS * MINUNITMULT, Z_MAX_POS * MINUNITMULT);
@@ -1234,7 +1234,7 @@ void HMI_Move_Z(void) {
DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 216, MBASE(3), HMI_ValueStruct.Move_Z_scaled);
DWIN_UpdateLCD();
DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 1, 216, MBASE(3), HMI_ValueStruct.Move_Z_scale);
DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 1, 216, MBASE(3), HMI_ValueStruct.Move_Z_scaled);
if (!planner.is_full()) {
// Wait for planner moves to finish!
planner.synchronize();
@@ -1259,21 +1259,21 @@ void HMI_Move_Z(void) {
ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
if (encoder_diffState != ENCODER_DIFF_NO) {
if (encoder_diffState == ENCODER_DIFF_CW) {
HMI_ValueStruct.Move_E_scale += EncoderRate.encoderMoveValue;
HMI_ValueStruct.Move_E_scaled += EncoderRate.encoderMoveValue;
}
else if (encoder_diffState == ENCODER_DIFF_CCW) {
HMI_ValueStruct.Move_E_scale -= EncoderRate.encoderMoveValue;
HMI_ValueStruct.Move_E_scaled -= EncoderRate.encoderMoveValue;
}
last_E_scale = HMI_ValueStruct.Move_E_scale;
DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 216, MBASE(4), HMI_ValueStruct.Move_E_scale);
last_E_scale = HMI_ValueStruct.Move_E_scaled;
DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 216, MBASE(4), HMI_ValueStruct.Move_E_scaled);
if ((HMI_ValueStruct.Move_E_scale - last_E_scale) > (EXTRUDE_MAXLENGTH) * MINUNITMULT)
HMI_ValueStruct.Move_E_scale = last_E_scale + (EXTRUDE_MAXLENGTH) * MINUNITMULT;
else if ((last_E_scale - HMI_ValueStruct.Move_E_scale) > (EXTRUDE_MAXLENGTH) * MINUNITMULT)
HMI_ValueStruct.Move_E_scale = last_E_scale - (EXTRUDE_MAXLENGTH) * MINUNITMULT;
current_position.e = HMI_ValueStruct.Move_E_scale / 10;
DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 216, MBASE(4), HMI_ValueStruct.Move_E_scale);
if ((HMI_ValueStruct.Move_E_scaled - last_E_scale) > (EXTRUDE_MAXLENGTH) * MINUNITMULT)
HMI_ValueStruct.Move_E_scaled = last_E_scale + (EXTRUDE_MAXLENGTH) * MINUNITMULT;
else if ((last_E_scale - HMI_ValueStruct.Move_E_scaled) > (EXTRUDE_MAXLENGTH) * MINUNITMULT)
HMI_ValueStruct.Move_E_scaled = last_E_scale - (EXTRUDE_MAXLENGTH) * MINUNITMULT;
current_position.e = HMI_ValueStruct.Move_E_scaled / 10;
DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 216, MBASE(4), HMI_ValueStruct.Move_E_scaled);
DWIN_UpdateLCD();
if (!planner.is_full()) {
platformio.ini
+32 -64
View File
@@ -2663,118 +2663,86 @@ build_flags = ${common.build_flags} -DMachineS5 -DBedAC -DPOWER_LOSS_RECOVERY -
[env:Ender3V2]
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = genericSTM32F103RC
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
${common.build_flags} -std=gnu++14 -DSTM32_XL_DENSITY -DTEMP_TIMER_CHAN=4 -DMachineEnder3V2
extra_scripts = ${common.extra_scripts}
platform = ${env:STM32F103RE.platform}
extends = env:STM32F103RE
build_flags = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4 -DMachineEnder3V2
extra_scripts = ${env:STM32F103RE.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/random-bin.py
buildroot/share/PlatformIO/scripts/creality.py
lib_ignore = ${common_stm32f1.lib_ignore}
debug_tool = jlink
upload_protocol = jlink
monitor_speed = 115200
[env:Ender3V2_BLT]
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = genericSTM32F103RC
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
${common.build_flags} -std=gnu++14 -DSTM32_XL_DENSITY -DTEMP_TIMER_CHAN=4 -DMachineEnder3V2 -DABL_BLTOUCH
extra_scripts = ${common.extra_scripts}
platform = ${env:STM32F103RE.platform}
extends = env:STM32F103RE
build_flags = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4 -DMachineEnder3V2 -DABL_BLTOUCH
extra_scripts = ${env:STM32F103RE.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/random-bin.py
buildroot/share/PlatformIO/scripts/creality.py
lib_ignore = ${common_stm32f1.lib_ignore}
debug_tool = jlink
upload_protocol = jlink
monitor_speed = 115200
[env:Ender3V2_427]
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = genericSTM32F103RC
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
${common.build_flags} -std=gnu++14 -DSTM32_XL_DENSITY -DTEMP_TIMER_CHAN=4 -DMachineEnder3V2 -DCreality427
extra_scripts = ${common.extra_scripts}
platform = ${env:STM32F103RE.platform}
extends = env:STM32F103RE
build_flags = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4 -DMachineEnder3V2 -DCreality427
extra_scripts = ${env:STM32F103RE.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/random-bin.py
buildroot/share/PlatformIO/scripts/creality.py
lib_ignore = ${common_stm32f1.lib_ignore}
debug_tool = jlink
upload_protocol = jlink
monitor_speed = 115200
[env:Ender3V2_427_BLT]
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = genericSTM32F103RC
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
${common.build_flags} -std=gnu++14 -DSTM32_XL_DENSITY -DTEMP_TIMER_CHAN=4 -DMachineEnder3V2 -DABL_BLTOUCH -DCreality427
extra_scripts = ${common.extra_scripts}
platform = ${env:STM32F103RE.platform}
extends = env:STM32F103RE
build_flags = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4 -DMachineEnder3V2 -DABL_BLTOUCH -DCreality427
extra_scripts = ${env:STM32F103RE.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/random-bin.py
buildroot/share/PlatformIO/scripts/creality.py
lib_ignore = ${common_stm32f1.lib_ignore}
debug_tool = jlink
upload_protocol = jlink
monitor_speed = 115200
[env:Ender3_422]
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = genericSTM32F103RC
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
${common.build_flags} -std=gnu++14 -DSTM32_XL_DENSITY -DTEMP_TIMER_CHAN=4 -DMachineEnder3Pro422
extra_scripts = ${common.extra_scripts}
platform = ${env:STM32F103RE.platform}
extends = env:STM32F103RE
build_flags = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4 -DMachineEnder3Pro422
extra_scripts = ${env:STM32F103RE.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/random-bin.py
buildroot/share/PlatformIO/scripts/creality.py
lib_ignore = ${common_stm32f1.lib_ignore}
debug_tool = jlink
upload_protocol = jlink
monitor_speed = 115200
[env:Ender3_422_BLT]
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = genericSTM32F103RC
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
${common.build_flags} -std=gnu++14 -DSTM32_XL_DENSITY -DTEMP_TIMER_CHAN=4 -DMachineEnder3Pro422 -DABL_BLTOUCH
extra_scripts = ${common.extra_scripts}
platform = ${env:STM32F103RE.platform}
extends = env:STM32F103RE
build_flags = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4 -DMachineEnder3Pro422 -DABL_BLTOUCH
extra_scripts = ${env:STM32F103RE.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/random-bin.py
buildroot/share/PlatformIO/scripts/creality.py
lib_ignore = ${common_stm32f1.lib_ignore}
debug_tool = jlink
upload_protocol = jlink
monitor_speed = 115200
[env:Ender3_427]
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = genericSTM32F103RC
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
${common.build_flags} -std=gnu++14 -DSTM32_XL_DENSITY -DTEMP_TIMER_CHAN=4 -DMachineEnder3Pro427
extra_scripts = ${common.extra_scripts}
platform = ${env:STM32F103RE.platform}
extends = env:STM32F103RE
build_flags = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4 -DMachineEnder3Pro427
extra_scripts = ${env:STM32F103RE.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/random-bin.py
buildroot/share/PlatformIO/scripts/creality.py
lib_ignore = ${common_stm32f1.lib_ignore}
debug_tool = jlink
upload_protocol = jlink
monitor_speed = 115200
[env:Ender3_427_BLT]
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = genericSTM32F103RC
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
${common.build_flags} -std=gnu++14 -DSTM32_XL_DENSITY -DTEMP_TIMER_CHAN=4 -DMachineEnder3Pro427 -DABL_BLTOUCH
extra_scripts = ${common.extra_scripts}
platform = ${env:STM32F103RE.platform}
extends = env:STM32F103RE
build_flags = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4 -DMachineEnder3Pro427 -DABL_BLTOUCH
extra_scripts = ${env:STM32F103RE.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/random-bin.py
buildroot/share/PlatformIO/scripts/creality.py
lib_ignore = ${common_stm32f1.lib_ignore}
debug_tool = jlink
upload_protocol = jlink
monitor_speed = 115200
#