adjust envs

This commit is contained in:
InsanityAutomation
2022-08-23 19:29:00 -04:00
parent 1fcad0b87c
commit e5f087bd98
2 changed files with 26 additions and 22 deletions
+6 -6
View File
@@ -690,7 +690,7 @@
#elif ANY(MachineEnder3V2, MachineEnder3S1) && ANY(FORCEV2DISPLAY, SKRE3Turbo)
#define LCD_SERIAL_PORT 1
#define LCD_BAUDRATE 115200
#define SERIAL_CATCHALL -1
//#define SERIAL_CATCHALL -1
#elif ANY(MachineCR10SPro, MachineCRX, MachineEnder5Plus, MachineCR10Max, MachineCR5) && NONE(GraphicLCD, OrigLCD, MachineEnder3V2, MachineEnder3S1, Creality422, Creality427, MachineEnder6, FORCEV2DISPLAY)
#define LCD_SERIAL_PORT 2
#define LCD_BAUDRATE 115200
@@ -698,7 +698,7 @@
#elif ANY(MachineCR10SPro, MachineCRX, MachineEnder5Plus, MachineCR5, MachineCR10Max, MachineEnder6, Creality422, Creality427, MachineSermoonD1, MachineEnder3Touchscreen, MachineCR6, MachineCR6Max, FORCEV2DISPLAY) && NONE(GraphicLCD, OrigLCD)
#define LCD_SERIAL_PORT 3
#define LCD_BAUDRATE 115200
#define SERIAL_CATCHALL 1
//#define SERIAL_CATCHALL 1
#elif ENABLED(MachineCR10Smart)
#define LCD_SERIAL_PORT 3
#define LCD_BAUDRATE 115200
@@ -4064,9 +4064,9 @@
// If you have a speaker that can produce tones, enable it here.
// By default Marlin assumes you have a buzzer with a fixed frequency.
//
#if ANY(MachineCR6, MachineCR6Max, MachineEnder3Touchscreen)
//#if ANY(MachineCR6, MachineCR6Max, MachineEnder3Touchscreen)
#define SPEAKER
#endif
//#endif
//
// The duration and frequency for the UI feedback sound.
@@ -4750,9 +4750,9 @@
// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
// which is not as annoying as with the hardware PWM. On the other hand, if this frequency
// is too low, you should also increment SOFT_PWM_SCALE.
#if ANY(SKRPRO11, SKRMiniE3V2, MachineEnder6, MachineEnder7, Creality427, Creality422, SKR_CR6, CR6_452, MachineCR30, MachineCR6, MachineCR6Max, MachineCR10Smart, MachineCR10SmartPro, MachineEnder3S1, MachineEnder2Pro)
//#if ANY(SKRPRO11, SKRMiniE3V2, MachineEnder6, MachineEnder7, Creality427, Creality422, SKR_CR6, CR6_452, MachineCR30, MachineCR6, MachineCR6Max, MachineCR10Smart, MachineCR10SmartPro, MachineEnder3S1, MachineEnder2Pro)
#define FAN_SOFT_PWM
#endif
//#endif
// Incrementing this by 1 will double the software PWM frequency,
// affecting heaters, and the fan if FAN_SOFT_PWM is enabled.
// However, control resolution will be halved for each increment;
+20 -16
View File
@@ -18,12 +18,8 @@ default_envs =
10SPro_BLT_BIL
CRX_BLT_UBL_NoFil
CRX_BLT_BIL_NoFil
E5PUBLSlntDZ
E5PBILSlntDZ
E5P_UBL_DZ
E5P_BIL_DZ
E5P_UBL_Slnt
E5P_BIL_Slnt
E5P_UBL
E5P_BIL
CR10Max_UBL
@@ -36,14 +32,10 @@ default_envs =
10SProV2_BIL
CRX_NoFil
CRX_Fil
E5PBILSlntDZH
E5P_BIL_DZH
E5P_UBL_SlntH
E5P_BIL_SlntH
E5P_UBLH
E5P_BILH
E5P_UBL_DZH
E5PUBLSlntDZH
10SPro_BLT_UBL_Enc
S5_AC
S5_BLT
@@ -97,12 +89,8 @@ default_envs =
CR10Max_UBL_MC
E5P_BIL_MC
E5P_UBL_MC
E5P_BIL_Slnt_MC
E5P_UBL_Slnt_MC
E5P_BIL_DZ_MC
E5P_UBL_DZ_MC
E5PBILSlntDZ_MC
E5PUBLSlntDZ_MC
CRX_BLT_BILNoFilMC
CRX_BLT_UBLNoFilMC
CRX_BLT_BIL_Fil_MC
@@ -170,12 +158,8 @@ default_envs =
CR10Max_UBL_ME
E5P_BIL_ME
E5P_UBL_ME
E5P_BIL_Slnt_ME
E5P_UBL_Slnt_ME
E5P_BIL_DZ_ME
E5P_UBL_DZ_ME
E5PBILSlntDZ_ME
E5PUBLSlntDZ_ME
CRX_BLTBILNoFilME
CRX_BLTUBLNoFilME
CRX_BLT_BIL_Fil_ME
@@ -394,6 +378,8 @@ default_envs =
SermoonD1_BLT
SermoonD1_BLT_ZM
CR10Smart
CR10Smart_64kBL
CR10SmartPro
Ender2Pro
Ender2Pro_BLT
CR5Pro
@@ -3808,6 +3794,24 @@ build_flags = ${stm32_variant.build_flags}
-DSS_TIMER=4 -DTIMER_SERVO=TIM5
-DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineCR10Smart
[env:CR10Smart_64kBL]
extends = stm32_variant
board_build.variant = MARLIN_F103Rx
board_build.offset = 0x10000
board_upload.offset_address = 0x08010000
build_unflags = ${stm32_variant.build_unflags}
-DUSBCON -DUSBD_USE_CDC
extra_scripts = ${stm32_variant.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/random-bin.py
monitor_speed = 115200
debug_tool = jlink
upload_protocol = jlink
board = genericSTM32F103RC
build_flags = ${stm32_variant.build_flags}
-DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED
-DSS_TIMER=4 -DTIMER_SERVO=TIM5
-DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DMachineCR10Smart
[env:CR10SmartPro]
extends = stm32_variant
board_build.variant = MARLIN_F103Rx