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

resolve bad merge

Browse Source
This commit is contained in:
InsanityAutomation
2021-04-28 10:39:32 -04:00
parent bdc256c048
commit af0b39982b
2 changed files with 2 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/src/lcd/extui/ui_api.cpp
+1 -5
View File
@@ -1065,11 +1065,7 @@ namespace ExtUI {
}
void onStatusChanged_P(PGM_P const pstr) {
char msg[strlen_P(pstr) + 1];
strcpy_P(msg, pstr);
if(strlen(msg) > 20)
msg[20]="\0";
onStatusChanged(msg);
onStatusChanged(pstr);
}
FileList::FileList() { refresh(); }
platformio.ini
+1 -73
View File
@@ -19,7 +19,7 @@
src_dir = Marlin
boards_dir = buildroot/share/PlatformIO/boards
default_envs =
10SPro_BIL
10SPro_BIL
10SPro_BLT_BIL
CRX_BLT_UBL_NoFil
CRX_BLT_BIL_NoFil
@@ -1404,78 +1404,6 @@ extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DFilSensors -DHotendMosquito
[env:CRXPro_BIL_NoFil]
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal
[env:CRXPro_UBL_NoFil]
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DABL_UBL
[env:CRXPro_BIL_Fil]
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DFilSensors
[env:CRXPro_UBL_Fil]
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DABL_UBL -DFilSensors
[env:CRXPro_BILNoFilMC]
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DHotendMosquito
[env:CRXPro_UBLNoFilMC]
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DABL_UBL -DHotendMosquito
[env:CRXPro_BIL_Fil_MC]
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DFilSensors -DHotendMosquito
[env:CRXPro_UBL_Fil_MC]
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DABL_UBL -DFilSensors -DHotendMosquito
[env:CRXPro_BILNoFilME]
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DHotendMosquito -DHotendE3D
[env:CRXPro_UBLNoFilME]
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DABL_UBL -DHotendMosquito -DHotendE3D
[env:CRXPro_BIL_Fil_ME]
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DFilSensors -DHotendMosquito -DHotendE3D
[env:CRXPro_UBL_Fil_ME]
platform = atmelavr
extends = common_avr8
board = megaatmega2560
build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DABL_UBL -DFilSensors -DHotendMosquito -DHotendE3D
[env:10SProBLTUBLEncMC]
platform = atmelavr
extends = common_avr8