From fadbc36dafab3ee41eddc511af396275c332390a Mon Sep 17 00:00:00 2001 From: unimatrix Date: Sun, 27 Dec 2020 15:00:36 +0100 Subject: [PATCH 1/3] 1 --- Marlin/Configuration.h | 10 +- platformio.ini | 2364 +++++++++++++++++++--------------------- 2 files changed, 1138 insertions(+), 1236 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index a946d5198a69..d33a966112e1 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -24,7 +24,7 @@ //JUST uncomment the option for your machine // #define V6_330_TITAN_TMC 1 // #define V6_330_TITAN_NO_TMC 1 -// #define V6_330_NO_TITAN_TMC 1 +#define V6_330_NO_TITAN_TMC 1 // #define V6_330_NO_TITAN_NO_TMC 1 // #define V6_400_TITAN_TMC 1 // #define V6_400_NO_TITAN_TMC 1 @@ -57,7 +57,7 @@ // #define TFT_LVGL_UI // #define TFT_CLASSIC_UI -// #define TFT_COLOR_UI +#define TFT_COLOR_UI #if V6_330_TITAN_TMC #define MOTHERBOARD BOARD_CHITU3D_V6 @@ -86,7 +86,7 @@ #define X_BED_SIZE 330 #define Y_BED_SIZE 330 #define Z_MAX_POS 400 - #define CUSTOM_MACHINE_NAME "Tronxy X5SA V6 330 TMC" + #define CUSTOM_MACHINE_NAME "Tronxy X5SA-PRO V6 330 TMC" #define COREXY #elif V6_330_NO_TITAN_NO_TMC @@ -1090,7 +1090,7 @@ #elif WITH_TMC && WITH_TITAN #define DEFAULT_AXIS_STEPS_PER_UNIT { 160, 160, 800, 764 } #elif WITH_TMC && !WITH_TITAN && !WITH_BMG - #define DEFAULT_AXIS_STEPS_PER_UNIT { 160, 160, 800, 186 } + #define DEFAULT_AXIS_STEPS_PER_UNIT { 160, 160, 800, 275 } #elif WITH_TITAN && !WITH_TMC #if defined(T2_LEADSCREW) #define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 1600, 420 } @@ -1434,7 +1434,7 @@ * These options are most useful for the BLTouch probe, but may also improve * readings with inductive probes and piezo sensors. */ -//#define PROBING_HEATERS_OFF // Turn heaters off when probing +#define PROBING_HEATERS_OFF // Turn heaters off when probing #if ENABLED(PROBING_HEATERS_OFF) //#define WAIT_FOR_BED_HEATER // Wait for bed to heat back up between probes (to improve accuracy) #endif diff --git a/platformio.ini b/platformio.ini index eb63edbf877b..c9b83e49d271 100644 --- a/platformio.ini +++ b/platformio.ini @@ -1,1421 +1,1323 @@ -# -# Marlin Firmware -# PlatformIO Configuration File -# -# For detailed documentation with EXAMPLES: -# -# https://docs.platformio.org/en/latest/projectconf/index.html -# - -# Automatic targets - enable auto-uploading -#targets = upload - -# -# By default platformio build will abort after 5 errors. -# Remove '-fmax-errors=5' from build_flags below to see all. -# +; PlatformIO Project Configuration File +; +; Build options: build flags, source filter +; Upload options: custom upload port, speed and extra flags +; Library options: dependencies, extra library storages +; Advanced options: extra scripting +; +; Please visit documentation for the other options and examples +; https://docs.platformio.org/page/projectconf.html [platformio] -src_dir = Marlin -boards_dir = buildroot/share/PlatformIO/boards +src_dir = Marlin +boards_dir = buildroot/share/PlatformIO/boards default_envs = chitu_v5_gpio_init -include_dir = Marlin +include_dir = Marlin -# -# The 'common' values are used for most Marlin builds -# [common] default_src_filter = + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -extra_scripts = - pre:buildroot/share/PlatformIO/scripts/common-dependencies.py - pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py - post:buildroot/share/PlatformIO/scripts/common-dependencies-post.py -build_flags = -fmax-errors=5 -g -D__MARLIN_FIRMWARE__ -fmerge-all-constants -lib_deps = - -# -# Feature Dependencies -# + - - - - - - + - - + - + - - - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + - + - + - + - - + - - + - + - + - + - + - + - + - - + - - + - - + - - + - - + - + - - + - - + - + - - + - - + - - + - + - + - + - - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - - + - - + - + - + - - + - - + - + - - + - + - - + - - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + - - + - + - + - - + - + - + - + - + - - + - +extra_scripts = + pre:buildroot/share/PlatformIO/scripts/common-dependencies.py + pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py + post:buildroot/share/PlatformIO/scripts/common-dependencies-post.py +build_flags = -fmax-errors=5 -g -D__MARLIN_FIRMWARE__ -fmerge-all-constants +lib_deps = + [features] -HAS_TFT_LVGL_UI = lvgl=https://github.com/makerbase-mks/LVGL-6.1.1-MKS/archive/master.zip - src_filter=+ - extra_scripts=download_mks_assets.py -HAS_TRINAMIC_CONFIG = TMCStepper@~0.7.1 - src_filter=+ + + + + -HAS_STEALTHCHOP = src_filter=+ -SR_LCD_3W_NL = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip -HAS_MOTOR_CURRENT_I2C = SlowSoftI2CMaster - src_filter=+ -HAS_TMC26X = TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip - src_filter=+ -HAS_L64XX = Arduino-L6470@0.8.0 - src_filter=+ + + -NEOPIXEL_LED = Adafruit NeoPixel@1.5.0 - src_filter=+ -MAX6675_IS_MAX31865 = Adafruit MAX31865 library@~1.1.0 -USES_LIQUIDCRYSTAL = LiquidCrystal@1.5.0 -USES_LIQUIDCRYSTAL_I2C = marcoschwartz/LiquidCrystal_I2C@1.1.4 -USES_LIQUIDTWI2 = LiquidTWI2@1.2.7 -HAS_WIRED_LCD = src_filter=+ -HAS_MARLINUI_HD44780 = src_filter=+ -HAS_MARLINUI_U8GLIB = U8glib-HAL@~0.4.1 - src_filter=+ -HAS_(FSMC|SPI)_TFT = src_filter=+ + + -HAS_FSMC_TFT = src_filter=+ + -HAS_SPI_TFT = src_filter=+ + -HAS_GRAPHICAL_TFT = src_filter=+ -DWIN_CREALITY_LCD = src_filter=+ -IS_TFTGLCD_PANEL = src_filter=+ -HAS_TOUCH_XPT2046 = src_filter=+ -HAS_LCD_MENU = src_filter=+ -HAS_GAMES = src_filter=+ -MARLIN_BRICKOUT = src_filter=+ -MARLIN_INVADERS = src_filter=+ -MARLIN_MAZE = src_filter=+ -MARLIN_SNAKE = src_filter=+ -HAS_MENU_BACKLASH = src_filter=+ -HAS_MENU_BED_CORNERS = src_filter=+ -LCD_BED_LEVELING = src_filter=+ -HAS_MENU_CANCELOBJECT = src_filter=+ -HAS_MENU_DELTA_CALIBRATE = src_filter=+ -HAS_MENU_FILAMENT = src_filter=+ -LCD_INFO_MENU = src_filter=+ -HAS_MENU_JOB_RECOVERY = src_filter=+ -HAS_MENU_LED = src_filter=+ -HAS_MENU_MEDIA = src_filter=+ -HAS_MENU_MIXER = src_filter=+ -HAS_MENU_MMU2 = src_filter=+ -HAS_MENU_PASSWORD = src_filter=+ -HAS_MENU_POWER_MONITOR = src_filter=+ -HAS_MENU_CUTTER = src_filter=+ -HAS_MENU_TEMPERATURE = src_filter=+ -HAS_MENU_TMC = src_filter=+ -HAS_MENU_TOUCH_SCREEN = src_filter=+ -HAS_MENU_UBL = src_filter=+ -ANYCUBIC_LCD_CHIRON = src_filter=+ + -ANYCUBIC_LCD_I3MEGA = src_filter=+ + -HAS_DGUS_LCD = src_filter=+ + -TOUCH_UI_FTDI_EVE = src_filter=+ -EXTUI_EXAMPLE = src_filter=+ -MALYAN_LCD = src_filter=+ -USB_FLASH_DRIVE_SUPPORT = src_filter=+ -AUTO_BED_LEVELING_BILINEAR = src_filter=+ -AUTO_BED_LEVELING_(3POINT|(BI)?LINEAR) = src_filter=+ -MESH_BED_LEVELING = src_filter=+ + -AUTO_BED_LEVELING_UBL = src_filter=+ + -BACKLASH_COMPENSATION = src_filter=+ -BARICUDA = src_filter=+ + -BINARY_FILE_TRANSFER = src_filter=+ + -BLTOUCH = src_filter=+ -CANCEL_OBJECTS = src_filter=+ + -CASE_LIGHT_ENABLE = src_filter=+ + -EXTERNAL_CLOSED_LOOP_CONTROLLER = src_filter=+ + -USE_CONTROLLER_FAN = src_filter=+ -HAS_MOTOR_CURRENT_DAC = src_filter=+ -DIRECT_STEPPING = src_filter=+ + -EMERGENCY_PARSER = src_filter=+ - -I2C_POSITION_ENCODERS = src_filter=+ -IIC_BL24CXX_EEPROM = src_filter=+ -HAS_SPI_FLASH = src_filter=+ -HAS_ETHERNET = src_filter=+ -HAS_FANMUX = src_filter=+ -FILAMENT_WIDTH_SENSOR = src_filter=+ + -FWRETRACT = src_filter=+ + -HOST_ACTION_COMMANDS = src_filter=+ -HOTEND_IDLE_TIMEOUT = src_filter=+ -JOYSTICK = src_filter=+ -BLINKM = src_filter=+ -HAS_COLOR_LEDS = src_filter=+ + -PCA9533 = src_filter=+ -PCA9632 = src_filter=+ -PRINTER_EVENT_LEDS = src_filter=+ -TEMP_STAT_LEDS = src_filter=+ -MAX7219_DEBUG = src_filter=+ + -MIXING_EXTRUDER = src_filter=+ + -PRUSA_MMU2 = src_filter=+ + -PASSWORD_FEATURE = src_filter=+ + -ADVANCED_PAUSE_FEATURE = src_filter=+ + + -AUTO_POWER_CONTROL = src_filter=+ -HAS_POWER_MONITOR = src_filter=+ + -POWER_LOSS_RECOVERY = src_filter=+ + -PROBE_TEMP_COMPENSATION = src_filter=+ + -HAS_FILAMENT_SENSOR = src_filter=+ + -MK2_MULTIPLEXER = src_filter=+ -EXT_SOLENOID|MANUAL_SOLENOID_CONTROL = src_filter=+ + -HAS_CUTTER = src_filter=+ + -EXPERIMENTAL_I2CBUS = src_filter=+ + -MECHANICAL_GANTRY_CAL.+ = src_filter=+ -Z_STEPPER_AUTO_ALIGN = src_filter=+ + -G26_MESH_VALIDATION = src_filter=+ -ASSISTED_TRAMMING = src_filter=+ -HAS_MESH = src_filter=+ -HAS_LEVELING = src_filter=+ -DELTA_AUTO_CALIBRATION = src_filter=+ -CALIBRATION_GCODE = src_filter=+ -Z_MIN_PROBE_REPEATABILITY_TEST = src_filter=+ -M100_FREE_MEMORY_WATCHER = src_filter=+ -BACKLASH_GCODE = src_filter=+ -IS_KINEMATIC = src_filter=+ -HAS_EXTRA_ENDSTOPS = src_filter=+ -SKEW_CORRECTION_GCODE = src_filter=+ -DIRECT_PIN_CONTROL = src_filter=+ + -PINS_DEBUGGING = src_filter=+ -NO_VOLUMETRICS = src_filter=- -HAS_MULTI_EXTRUDER = src_filter=+ -HAS_HOTEND_OFFSET = src_filter=+ -EDITABLE_SERVO_ANGLES = src_filter=+ -PIDTEMP = src_filter=+ -PREVENT_COLD_EXTRUSION = src_filter=+ -PIDTEMPBED = src_filter=+ -HAS_USER_THERMISTORS = src_filter=+ -SD_ABORT_ON_ENDSTOP_HIT = src_filter=+ -BAUD_RATE_GCODE = src_filter=+ -HAS_SMART_EFF_MOD = src_filter=+ -COOLANT_CONTROL = src_filter=+ -HAS_SOFTWARE_ENDSTOPS = src_filter=+ -HAS_DUPLICATION_MODE = src_filter=+ -LIN_ADVANCE = src_filter=+ -PHOTO_GCODE = src_filter=+ -CONTROLLER_FAN_EDITABLE = src_filter=+ -GCODE_MACROS = src_filter=+ -GRADIENT_MIX = src_filter=+ -HAS_SAVED_POSITIONS = src_filter=+ + -PARK_HEAD_ON_PAUSE = src_filter=+ -FILAMENT_LOAD_UNLOAD_GCODES = src_filter=+ -CNC_WORKSPACE_PLANES = src_filter=+ -CNC_COORDINATE_SYSTEMS = src_filter=+ -HAS_M206_COMMAND = src_filter=+ -EXPECTED_PRINTER_CHECK = src_filter=+ -HOST_KEEPALIVE_FEATURE = src_filter=+ -REPETIER_GCODE_M360 = src_filter=+ -HAS_GCODE_M876 = src_filter=+ -HAS_RESUME_CONTINUE = src_filter=+ -HAS_LCD_CONTRAST = src_filter=+ -LCD_SET_PROGRESS_MANUALLY = src_filter=+ -TOUCH_SCREEN_CALIBRATION = src_filter=+ -ARC_SUPPORT = src_filter=+ -GCODE_MOTION_MODES = src_filter=+ -BABYSTEPPING = src_filter=+ + -Z_PROBE_SLED = src_filter=+ -G38_PROBE_TARGET = src_filter=+ -MAGNETIC_PARKING_EXTRUDER = src_filter=+ -SDSUPPORT = src_filter=+ -HAS_EXTRUDERS = src_filter=+ + -AUTO_REPORT_TEMPERATURES = src_filter=+ -INCH_MODE_SUPPORT = src_filter=+ -TEMPERATURE_UNITS_SUPPORT = src_filter=+ -NEED_HEX_PRINT = src_filter=+ -NEED_LSF = src_filter=+ -NOZZLE_PARK_FEATURE = src_filter=+ + -NOZZLE_CLEAN_FEATURE = src_filter=+ + -DELTA = src_filter=+ + -BEZIER_CURVE_SUPPORT = src_filter=+ + -PRINTCOUNTER = src_filter=+ -HAS_BED_PROBE = src_filter=+ + + + -IS_SCARA = src_filter=+ -MORGAN_SCARA = src_filter=+ -(ESP3D_)?WIFISUPPORT = AsyncTCP, ESP Async WebServer - ESP3DLib=https://github.com/luc-github/ESP3DLib.git - arduinoWebSockets=https://github.com/Links2004/arduinoWebSockets.git - ESP32SSDP=https://github.com/luc-github/ESP32SSDP.git - lib_ignore=ESPAsyncTCP - -# -# Default values apply to all 'env:' prefixed environments -# +has_tft_lvgl_ui = lvgl=https://github.com/makerbase-mks/LVGL-6.1.1-MKS/archive/master.zip + src_filter=+ + extra_scripts=download_mks_assets.py +has_trinamic_config = TMCStepper@~0.7.1 + src_filter=+ + + + + +has_stealthchop = src_filter=+ +sr_lcd_3w_nl = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip +has_motor_current_i2c = SlowSoftI2CMaster + src_filter=+ +has_tmc26x = TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip + src_filter=+ +has_l64xx = Arduino-L6470@0.8.0 + src_filter=+ + + +neopixel_led = Adafruit NeoPixel@1.5.0 + src_filter=+ +max6675_is_max31865 = Adafruit MAX31865 library@~1.1.0 +uses_liquidcrystal = LiquidCrystal@1.5.0 +uses_liquidcrystal_i2c = marcoschwartz/LiquidCrystal_I2C@1.1.4 +uses_liquidtwi2 = LiquidTWI2@1.2.7 +has_wired_lcd = src_filter=+ +has_marlinui_hd44780 = src_filter=+ +has_marlinui_u8glib = U8glib-HAL@~0.4.1 + src_filter=+ +has_(fsmc|spi)_tft = src_filter=+ + + +has_fsmc_tft = src_filter=+ + +has_spi_tft = src_filter=+ + +has_graphical_tft = src_filter=+ +dwin_creality_lcd = src_filter=+ +is_tftglcd_panel = src_filter=+ +has_touch_xpt2046 = src_filter=+ +has_lcd_menu = src_filter=+ +has_games = src_filter=+ +marlin_brickout = src_filter=+ +marlin_invaders = src_filter=+ +marlin_maze = src_filter=+ +marlin_snake = src_filter=+ +has_menu_backlash = src_filter=+ +has_menu_bed_corners = src_filter=+ +lcd_bed_leveling = src_filter=+ +has_menu_cancelobject = src_filter=+ +has_menu_delta_calibrate = src_filter=+ +has_menu_filament = src_filter=+ +lcd_info_menu = src_filter=+ +has_menu_job_recovery = src_filter=+ +has_menu_led = src_filter=+ +has_menu_media = src_filter=+ +has_menu_mixer = src_filter=+ +has_menu_mmu2 = src_filter=+ +has_menu_password = src_filter=+ +has_menu_power_monitor = src_filter=+ +has_menu_cutter = src_filter=+ +has_menu_temperature = src_filter=+ +has_menu_tmc = src_filter=+ +has_menu_touch_screen = src_filter=+ +has_menu_ubl = src_filter=+ +anycubic_lcd_chiron = src_filter=+ + +anycubic_lcd_i3mega = src_filter=+ + +has_dgus_lcd = src_filter=+ + +touch_ui_ftdi_eve = src_filter=+ +extui_example = src_filter=+ +malyan_lcd = src_filter=+ +usb_flash_drive_support = src_filter=+ +auto_bed_leveling_bilinear = src_filter=+ +auto_bed_leveling_(3point|(bi)?linear) = src_filter=+ +mesh_bed_leveling = src_filter=+ + +auto_bed_leveling_ubl = src_filter=+ + +backlash_compensation = src_filter=+ +baricuda = src_filter=+ + +binary_file_transfer = src_filter=+ + +bltouch = src_filter=+ +cancel_objects = src_filter=+ + +case_light_enable = src_filter=+ + +external_closed_loop_controller = src_filter=+ + +use_controller_fan = src_filter=+ +has_motor_current_dac = src_filter=+ +direct_stepping = src_filter=+ + +emergency_parser = src_filter=+ - +i2c_position_encoders = src_filter=+ +iic_bl24cxx_eeprom = src_filter=+ +has_spi_flash = src_filter=+ +has_ethernet = src_filter=+ +has_fanmux = src_filter=+ +filament_width_sensor = src_filter=+ + +fwretract = src_filter=+ + +host_action_commands = src_filter=+ +hotend_idle_timeout = src_filter=+ +joystick = src_filter=+ +blinkm = src_filter=+ +has_color_leds = src_filter=+ + +pca9533 = src_filter=+ +pca9632 = src_filter=+ +printer_event_leds = src_filter=+ +temp_stat_leds = src_filter=+ +max7219_debug = src_filter=+ + +mixing_extruder = src_filter=+ + +prusa_mmu2 = src_filter=+ + +password_feature = src_filter=+ + +advanced_pause_feature = src_filter=+ + + +auto_power_control = src_filter=+ +has_power_monitor = src_filter=+ + +power_loss_recovery = src_filter=+ + +probe_temp_compensation = src_filter=+ + +has_filament_sensor = src_filter=+ + +mk2_multiplexer = src_filter=+ +ext_solenoid|manual_solenoid_control = src_filter=+ + +has_cutter = src_filter=+ + +experimental_i2cbus = src_filter=+ + +mechanical_gantry_cal.+ = src_filter=+ +z_stepper_auto_align = src_filter=+ + +g26_mesh_validation = src_filter=+ +assisted_tramming = src_filter=+ +has_mesh = src_filter=+ +has_leveling = src_filter=+ +delta_auto_calibration = src_filter=+ +calibration_gcode = src_filter=+ +z_min_probe_repeatability_test = src_filter=+ +m100_free_memory_watcher = src_filter=+ +backlash_gcode = src_filter=+ +is_kinematic = src_filter=+ +has_extra_endstops = src_filter=+ +skew_correction_gcode = src_filter=+ +direct_pin_control = src_filter=+ + +pins_debugging = src_filter=+ +no_volumetrics = src_filter=- +has_multi_extruder = src_filter=+ +has_hotend_offset = src_filter=+ +editable_servo_angles = src_filter=+ +pidtemp = src_filter=+ +prevent_cold_extrusion = src_filter=+ +pidtempbed = src_filter=+ +has_user_thermistors = src_filter=+ +sd_abort_on_endstop_hit = src_filter=+ +baud_rate_gcode = src_filter=+ +has_smart_eff_mod = src_filter=+ +coolant_control = src_filter=+ +has_software_endstops = src_filter=+ +has_duplication_mode = src_filter=+ +lin_advance = src_filter=+ +photo_gcode = src_filter=+ +controller_fan_editable = src_filter=+ +gcode_macros = src_filter=+ +gradient_mix = src_filter=+ +has_saved_positions = src_filter=+ + +park_head_on_pause = src_filter=+ +filament_load_unload_gcodes = src_filter=+ +cnc_workspace_planes = src_filter=+ +cnc_coordinate_systems = src_filter=+ +has_m206_command = src_filter=+ +expected_printer_check = src_filter=+ +host_keepalive_feature = src_filter=+ +repetier_gcode_m360 = src_filter=+ +has_gcode_m876 = src_filter=+ +has_resume_continue = src_filter=+ +has_lcd_contrast = src_filter=+ +lcd_set_progress_manually = src_filter=+ +touch_screen_calibration = src_filter=+ +arc_support = src_filter=+ +gcode_motion_modes = src_filter=+ +babystepping = src_filter=+ + +z_probe_sled = src_filter=+ +g38_probe_target = src_filter=+ +magnetic_parking_extruder = src_filter=+ +sdsupport = src_filter=+ +has_extruders = src_filter=+ + +auto_report_temperatures = src_filter=+ +inch_mode_support = src_filter=+ +temperature_units_support = src_filter=+ +need_hex_print = src_filter=+ +need_lsf = src_filter=+ +nozzle_park_feature = src_filter=+ + +nozzle_clean_feature = src_filter=+ + +delta = src_filter=+ + +bezier_curve_support = src_filter=+ + +printcounter = src_filter=+ +has_bed_probe = src_filter=+ + + + +is_scara = src_filter=+ +morgan_scara = src_filter=+ +(esp3d_)?wifisupport = AsyncTCP, ESP Async WebServer + ESP3DLib=https://github.com/luc-github/ESP3DLib.git + arduinoWebSockets=https://github.com/Links2004/arduinoWebSockets.git + ESP32SSDP=https://github.com/luc-github/ESP32SSDP.git + lib_ignore=ESPAsyncTCP + [env] -framework = arduino +framework = arduino extra_scripts = ${common.extra_scripts} -build_flags = ${common.build_flags} -lib_deps = ${common.lib_deps} +build_flags = ${common.build_flags} +lib_deps = ${common.lib_deps} monitor_speed = 250000 -monitor_flags = - --quiet - --echo - --eol - LF - --filter - colorize - --filter - time - -################################# -# # -# Unique Core Architectures # -# # -# Add a new "env" below if no # -# entry has values suitable to # -# build for a given board. # -# # -################################# - -################################# -# # -# AVR Architecture # -# # -################################# - -# -# AVR (8-bit) Common Environment values -# +monitor_flags = + --quiet + --echo + --eol + LF + --filter + colorize + --filter + time + [common_avr8] board_build.f_cpu = 16000000L -src_filter = ${common.default_src_filter} + +src_filter = ${common.default_src_filter} + -# -# ATmega2560 -# [env:mega2560] -platform = atmelavr -extends = common_avr8 -board = megaatmega2560 - -# -# ATmega2560 with extended pins 70-85 defined -# BOARD_BQ_ZUM_MEGA_3D -# BOARD_ULTIMAIN_2 -# BOARD_MIGHTYBOARD_REVE -# BOARD_EINSTART_S -# +platform = atmelavr +extends = common_avr8 +board = megaatmega2560 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:mega2560ext] -platform = atmelavr -extends = env:mega2560 -board = megaatmega2560 +platform = atmelavr +extends = env:mega2560 +board = megaatmega2560 board_build.variant = megaextendedpins -extra_scripts = ${common.extra_scripts} - pre:buildroot/share/PlatformIO/scripts/copy_marlin_variant_to_framework.py +extra_scripts = ${common.extra_scripts} + pre:buildroot/share/PlatformIO/scripts/copy_marlin_variant_to_framework.py +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# ATmega1280 -# [env:mega1280] -platform = atmelavr -extends = common_avr8 -board = megaatmega1280 +platform = atmelavr +extends = common_avr8 +board = megaatmega1280 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# MightyBoard ATmega2560 (MegaCore 100 pin boards variants) -# [env:MightyBoard1280] -platform = atmelavr -extends = common_avr8 -board = ATmega1280 -upload_speed = 57600 - -# -# MightyBoard ATmega2560 (MegaCore 100 pin boards variants) -# +platform = atmelavr +extends = common_avr8 +board = ATmega1280 +upload_speed = 57600 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:MightyBoard2560] -platform = atmelavr -extends = common_avr8 -board = ATmega2560 +platform = atmelavr +extends = common_avr8 +board = ATmega2560 upload_protocol = wiring -upload_speed = 57600 +upload_speed = 57600 board_upload.maximum_size = 253952 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# RAMBo -# [env:rambo] -platform = atmelavr -extends = common_avr8 -board = reprap_rambo +platform = atmelavr +extends = common_avr8 +board = reprap_rambo +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# FYSETC F6 V1.3 -# [env:FYSETC_F6_13] -platform = atmelavr -extends = common_avr8 -board = fysetc_f6_13 +platform = atmelavr +extends = common_avr8 +board = fysetc_f6_13 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# FYSETC F6 V1.4 -# [env:FYSETC_F6_14] -platform = atmelavr -extends = common_avr8 -board = fysetc_f6_14 +platform = atmelavr +extends = common_avr8 +board = fysetc_f6_14 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# Sanguinololu (ATmega644p) -# [env:sanguino644p] -platform = atmelavr -extends = common_avr8 -board = sanguino_atmega644p +platform = atmelavr +extends = common_avr8 +board = sanguino_atmega644p +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# Sanguinololu (ATmega1284p) -# [env:sanguino1284p] -platform = atmelavr -extends = common_avr8 -board = sanguino_atmega1284p +platform = atmelavr +extends = common_avr8 +board = sanguino_atmega1284p board_upload.maximum_size = 126976 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# Melzi and clones (ATmega1284p) -# [env:melzi] -platform = atmelavr -extends = common_avr8 -board = sanguino_atmega1284p -upload_speed = 57600 +platform = atmelavr +extends = common_avr8 +board = sanguino_atmega1284p +upload_speed = 57600 board_upload.maximum_size = 126976 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# Melzi and clones (Optiboot bootloader) -# [env:melzi_optiboot] -platform = atmelavr -extends = common_avr8 -board = sanguino_atmega1284p -upload_speed = 115200 - -# -# Melzi and clones (Zonestar Melzi2 with tuned flags) -# +platform = atmelavr +extends = common_avr8 +board = sanguino_atmega1284p +upload_speed = 115200 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:melzi_optimized] -platform = atmelavr -extends = env:melzi_optiboot -build_flags = ${common.build_flags} -fno-tree-scev-cprop -fno-split-wide-types -Wl,--relax -mcall-prologues +platform = atmelavr +extends = env:melzi_optiboot +build_flags = ${common.build_flags} -fno-tree-scev-cprop -fno-split-wide-types -Wl,--relax -mcall-prologues build_unflags = -g -ggdb +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# AT90USB1286 boards using CDC bootloader -# - BRAINWAVE -# - BRAINWAVE_PRO -# - SAV_MKI -# - TEENSYLU -# [env:at90usb1286_cdc] -platform = teensy -extends = common_avr8 -board = at90usb1286 -lib_ignore = ${env:common_avr8.lib_ignore}, Teensy_ADC, NativeEthernet - -# -# AT90USB1286 boards using DFU bootloader -# - PrintrBoard -# - PrintrBoard Rev.F -# - ? 5DPRINT ? -# +platform = teensy +extends = common_avr8 +board = at90usb1286 +lib_ignore = ${env:common_avr8.lib_ignore}, Teensy_ADC, NativeEthernet +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:at90usb1286_dfu] -platform = teensy -extends = env:at90usb1286_cdc - -################################# -# # -# DUE Architecture # -# # -################################# - -# -# Due (Atmel SAM3X8E ARM Cortex-M3) -# -# - RAMPS4DUE -# - RADDS -# +platform = teensy +extends = env:at90usb1286_cdc +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:DUE] -platform = atmelsam -board = due -src_filter = ${common.default_src_filter} + + +platform = atmelsam +board = due +src_filter = ${common.default_src_filter} + + +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 [env:DUE_USB] -platform = atmelsam -extends = env:DUE -board = dueUSB +platform = atmelsam +extends = env:DUE +board = dueUSB +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 [env:DUE_debug] -# Used when WATCHDOG_RESET_MANUAL is enabled -platform = atmelsam -extends = env:DUE -build_flags = ${common.build_flags} - -funwind-tables - -mpoke-function-name - -# -# Archim SAM -# +platform = atmelsam +extends = env:DUE +build_flags = ${common.build_flags} + -funwind-tables + -mpoke-function-name +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [common_DUE_archim] -platform = atmelsam -extends = env:DUE -board = archim -build_flags = ${common.build_flags} - -DARDUINO_SAM_ARCHIM -DARDUINO_ARCH_SAM -D__SAM3X8E__ -DUSBCON +platform = atmelsam +extends = env:DUE +board = archim +build_flags = ${common.build_flags} + -DARDUINO_SAM_ARCHIM -DARDUINO_ARCH_SAM -D__SAM3X8E__ -DUSBCON board_build.variants_dir = buildroot/share/PlatformIO/variants/ extra_scripts = ${common.extra_scripts} - Marlin/src/HAL/DUE/upload_extra_script.py + Marlin/src/HAL/DUE/upload_extra_script.py [env:DUE_archim] -platform = ${common_DUE_archim.platform} -extends = common_DUE_archim +platform = ${common_DUE_archim.platform} +extends = common_DUE_archim +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# Used when WATCHDOG_RESET_MANUAL is enabled [env:DUE_archim_debug] -platform = ${common_DUE_archim.platform} -extends = common_DUE_archim -build_flags = ${common_DUE_archim.build_flags} -funwind-tables -mpoke-function-name - -################################# -# # -# SAMD51 Architecture # -# # -################################# - -# -# Adafruit Grand Central M4 (Atmel SAMD51P20A ARM Cortex-M4) -# +platform = ${common_DUE_archim.platform} +extends = common_DUE_archim +build_flags = ${common_DUE_archim.build_flags} -funwind-tables -mpoke-function-name +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:SAMD51_grandcentral_m4] -platform = atmelsam -board = adafruit_grandcentral_m4 -build_flags = ${common.build_flags} -std=gnu++17 -build_unflags = -std=gnu++11 -src_filter = ${common.default_src_filter} + -lib_deps = ${common.lib_deps} - SoftwareSerialM - Adafruit SPIFlash -custom_marlin.SDSUPPORT = SdFat - Adafruit Fork -debug_tool = jlink - -################################# -# # -# LPC176x Architecture # -# # -################################# - -# -# NXP LPC176x ARM Cortex-M3 -# +platform = atmelsam +board = adafruit_grandcentral_m4 +build_flags = ${common.build_flags} -std=gnu++17 +build_unflags = -std=gnu++11 +src_filter = ${common.default_src_filter} + +lib_deps = + ${common.lib_deps} + SoftwareSerialM + Adafruit SPIFlash + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 +custom_marlin.sdsupport = SdFat - Adafruit Fork +debug_tool = jlink + [common_LPC] -platform = https://github.com/p3p/pio-nxplpc-arduino-lpc176x/archive/0.1.3.zip +platform = https://github.com/p3p/pio-nxplpc-arduino-lpc176x/archive/0.1.3.zip platform_packages = framework-arduino-lpc176x@^0.2.5 -board = nxp_lpc1768 -lib_ldf_mode = off -lib_compat_mode = strict -extra_scripts = ${common.extra_scripts} - Marlin/src/HAL/LPC1768/upload_extra_script.py -src_filter = ${common.default_src_filter} + + -lib_deps = ${common.lib_deps} - Servo -custom_marlin.USES_LIQUIDCRYSTAL = LiquidCrystal@1.0.0 -custom_marlin.NEOPIXEL_LED = Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/1.5.0.zip -build_flags = ${common.build_flags} -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC1768/include -IMarlin/src/HAL/LPC1768/u8g - # debug options for backtrace - #-funwind-tables - #-mpoke-function-name - -# -# NXP LPC176x ARM Cortex-M3 -# +board = nxp_lpc1768 +lib_ldf_mode = off +lib_compat_mode = strict +extra_scripts = ${common.extra_scripts} + Marlin/src/HAL/LPC1768/upload_extra_script.py +src_filter = ${common.default_src_filter} + + +lib_deps = ${common.lib_deps} + Servo +custom_marlin.uses_liquidcrystal = LiquidCrystal@1.0.0 +custom_marlin.neopixel_led = Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/1.5.0.zip +build_flags = ${common.build_flags} -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC1768/include -IMarlin/src/HAL/LPC1768/u8g + [env:LPC1768] -platform = ${common_LPC.platform} -extends = common_LPC -board = nxp_lpc1768 +platform = ${common_LPC.platform} +extends = common_LPC +board = nxp_lpc1768 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 [env:LPC1769] -platform = ${common_LPC.platform} -extends = common_LPC -board = nxp_lpc1769 - -################################# -# # -# STM32 Architecture # -# # -################################# - -# -# HAL/STM32 Base Environment values -# +platform = ${common_LPC.platform} +extends = common_LPC +board = nxp_lpc1769 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [common_stm32] -platform = ststm32@~8.0 -build_flags = ${common.build_flags} - -std=gnu++14 - -DUSBCON -DUSBD_USE_CDC - -DTIM_IRQ_PRIO=13 +platform = ststm32@~8.0 +build_flags = ${common.build_flags} + -std=gnu++14 + -DUSBCON -DUSBD_USE_CDC + -DTIM_IRQ_PRIO=13 build_unflags = -std=gnu++11 -src_filter = ${common.default_src_filter} + + +src_filter = ${common.default_src_filter} + + -# -# HAL/STM32F1 Common Environment values -# [common_stm32f1] -platform = ststm32@~6.1 -build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py - ${common.build_flags} -std=gnu++14 -DHAVE_SW_SERIAL +platform = ststm32@~6.1 +build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py + ${common.build_flags} -std=gnu++14 -DHAVE_SW_SERIAL build_unflags = -std=gnu11 -std=gnu++11 -src_filter = ${common.default_src_filter} + -lib_ignore = SPI -lib_deps = ${common.lib_deps} - SoftwareSerialM - -# -# STM32F103RC -# +src_filter = ${common.default_src_filter} + +lib_ignore = SPI +lib_deps = ${common.lib_deps} + SoftwareSerialM + [env:STM32F103RC] -platform = ${common_stm32f1.platform} -extends = common_stm32f1 -board = genericSTM32F103RC +platform = ${common_stm32f1.platform} +extends = common_stm32f1 +board = genericSTM32F103RC platform_packages = tool-stm32duino -monitor_speed = 115200 +monitor_speed = 115200 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# MEEB_3DP (STM32F103RCT6 with 512K) -# [env:STM32F103RC_meeb] -platform = ${common_stm32f1.platform} -extends = common_stm32f1 -board = MEEB_3DP +platform = ${common_stm32f1.platform} +extends = common_stm32f1 +board = MEEB_3DP platform_packages = tool-stm32duino -build_flags = ${common_stm32f1.build_flags} - -DDEBUG_LEVEL=0 - -DSS_TIMER=4 - -DSTM32_FLASH_SIZE=512 - -DHSE_VALUE=12000000U - -DUSE_USB_COMPOSITE - -DVECT_TAB_OFFSET=0x2000 - -DGENERIC_BOOTLOADER -extra_scripts = ${common.extra_scripts} - pre:buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py - buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py -lib_deps = ${common.lib_deps} - SoftwareSerialM - USBComposite for STM32F1@0.91 -custom_marlin.NEOPIXEL_LED = Adafruit NeoPixel=https://github.com/ccccmagicboy/Adafruit_NeoPixel#meeb_3dp_use -debug_tool = stlink -upload_protocol = dfu - -# -# STM32F103RC_fysetc -# +build_flags = ${common_stm32f1.build_flags} + -DDEBUG_LEVEL=0 + -DSS_TIMER=4 + -DSTM32_FLASH_SIZE=512 + -DHSE_VALUE=12000000U + -DUSE_USB_COMPOSITE + -DVECT_TAB_OFFSET=0x2000 + -DGENERIC_BOOTLOADER +extra_scripts = ${common.extra_scripts} + pre:buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py + buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py +lib_deps = + ${common.lib_deps} + SoftwareSerialM + USBComposite for STM32F1@0.91 + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 +custom_marlin.neopixel_led = Adafruit NeoPixel=https://github.com/ccccmagicboy/Adafruit_NeoPixel#meeb_3dp_use +debug_tool = stlink +upload_protocol = dfu + [env:STM32F103RC_fysetc] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RC -extra_scripts = ${common.extra_scripts} - buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py -build_flags = ${common_stm32f1.build_flags} -DDEBUG_LEVEL=0 -lib_ldf_mode = chain -debug_tool = stlink -upload_protocol = serial - -# -# BigTree SKR Mini V1.1 / SKR mini E3 / SKR E3 DIP (STM32F103RCT6 ARM Cortex-M3) -# -# STM32F103RC_btt ............. RCT6 with 256K -# STM32F103RC_btt_USB ......... RCT6 with 256K (USB mass storage) -# STM32F103RC_btt_512K ........ RCT6 with 512K -# STM32F103RC_btt_512K_USB .... RCT6 with 512K (USB mass storage) -# -# WARNING! If you have an SKR Mini v1.1 or an SKR Mini E3 1.0 / 1.2 / 2.0 / DIP -# and experience a printer freeze, re-flash Marlin using the regular (non-512K) -# build option. 256K chips may be re-branded 512K chips, but this means the -# upper 256K is sketchy, and failure is very likely. -# +platform = ${common_stm32f1.platform} +extends = env:STM32F103RC +extra_scripts = ${common.extra_scripts} + buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py +build_flags = ${common_stm32f1.build_flags} -DDEBUG_LEVEL=0 +lib_ldf_mode = chain +debug_tool = stlink +upload_protocol = serial +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 [env:STM32F103RC_btt] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RC -extra_scripts = ${common.extra_scripts} - buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py -build_flags = ${common_stm32f1.build_flags} - -DDEBUG_LEVEL=0 -DSS_TIMER=4 -monitor_speed = 115200 +platform = ${common_stm32f1.platform} +extends = env:STM32F103RC +extra_scripts = ${common.extra_scripts} + buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py +build_flags = ${common_stm32f1.build_flags} + -DDEBUG_LEVEL=0 -DSS_TIMER=4 +monitor_speed = 115200 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 [env:STM32F103RC_btt_USB] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RC_btt -build_flags = ${env:STM32F103RC_btt.build_flags} -DUSE_USB_COMPOSITE -lib_deps = ${env:STM32F103RC_btt.lib_deps} - USBComposite for STM32F1@0.91 +platform = ${common_stm32f1.platform} +extends = env:STM32F103RC_btt +build_flags = ${env:STM32F103RC_btt.build_flags} -DUSE_USB_COMPOSITE +lib_deps = + ${env:STM32F103RC_btt.lib_deps} + USBComposite for STM32F1@0.91 + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 [env:STM32F103RC_btt_512K] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RC_btt -board_upload.maximum_size=524288 -build_flags = ${env:STM32F103RC_btt.build_flags} -DSTM32_FLASH_SIZE=512 +platform = ${common_stm32f1.platform} +extends = env:STM32F103RC_btt +board_upload.maximum_size = 524288 +build_flags = ${env:STM32F103RC_btt.build_flags} -DSTM32_FLASH_SIZE=512 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 [env:STM32F103RC_btt_512K_USB] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RC_btt_512K -build_flags = ${env:STM32F103RC_btt_512K.build_flags} -DUSE_USB_COMPOSITE -lib_deps = ${env:STM32F103RC_btt_512K.lib_deps} - USBComposite for STM32F1@0.91 - -# -# STM32F103RE -# +platform = ${common_stm32f1.platform} +extends = env:STM32F103RC_btt_512K +build_flags = ${env:STM32F103RC_btt_512K.build_flags} -DUSE_USB_COMPOSITE +lib_deps = + ${env:STM32F103RC_btt_512K.lib_deps} + USBComposite for STM32F1@0.91 + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:STM32F103RE] -platform = ${common_stm32f1.platform} -extends = common_stm32f1 -board = genericSTM32F103RE +platform = ${common_stm32f1.platform} +extends = common_stm32f1 +board = genericSTM32F103RE platform_packages = tool-stm32duino -monitor_speed = 115200 +monitor_speed = 115200 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# STM32F103RE_btt ............. RET6 -# STM32F103RE_btt_USB ......... RET6 (USB mass storage) -# [env:STM32F103RE_btt] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RE -extra_scripts = ${common.extra_scripts} - buildroot/share/PlatformIO/scripts/STM32F103RE_SKR_E3_DIP.py -build_flags = ${common_stm32f1.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4 -debug_tool = stlink -upload_protocol = stlink +platform = ${common_stm32f1.platform} +extends = env:STM32F103RE +extra_scripts = ${common.extra_scripts} + buildroot/share/PlatformIO/scripts/STM32F103RE_SKR_E3_DIP.py +build_flags = ${common_stm32f1.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4 +debug_tool = stlink +upload_protocol = stlink +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 [env:STM32F103RE_btt_USB] -platform = ${common_stm32f1.platform} -extends = env:STM32F103RE_btt -build_flags = ${env:STM32F103RE_btt.build_flags} -DUSE_USB_COMPOSITE -lib_deps = ${common_stm32f1.lib_deps} - USBComposite for STM32F1@0.91 - -# -# STM32F4 with STM32GENERIC -# +platform = ${common_stm32f1.platform} +extends = env:STM32F103RE_btt +build_flags = ${env:STM32F103RE_btt.build_flags} -DUSE_USB_COMPOSITE +lib_deps = + ${common_stm32f1.lib_deps} + USBComposite for STM32F1@0.91 + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:STM32F4] -platform = ${common_stm32.platform} -board = disco_f407vg -build_flags = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F4 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED -src_filter = ${common.default_src_filter} + - - -# -# STM32F7 with STM32GENERIC -# +platform = ${common_stm32.platform} +board = disco_f407vg +build_flags = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F4 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED +src_filter = ${common.default_src_filter} + - +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:STM32F7] -platform = ${common_stm32.platform} -board = remram_v1 -build_flags = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F7 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED -src_filter = ${common.default_src_filter} + - - -# -# ST NUCLEO-F767ZI Development Board -# This environment is for testing purposes prior to control boards -# being readily available based on STM32F7 MCUs -# +platform = ${common_stm32.platform} +board = remram_v1 +build_flags = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F7 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED +src_filter = ${common.default_src_filter} + - +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:NUCLEO_F767ZI] -platform = ${common_stm32.platform} -extends = common_stm32 -board = nucleo_f767zi -build_flags = ${common_stm32.build_flags} -DTIMER_SERIAL=TIM9 - -# -# ARMED (STM32) -# +platform = ${common_stm32.platform} +extends = common_stm32 +board = nucleo_f767zi +build_flags = ${common_stm32.build_flags} -DTIMER_SERIAL=TIM9 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:ARMED] -platform = ${common_stm32.platform} -extends = common_stm32 -board = armed_v1 -build_flags = ${common_stm32.build_flags} - -O2 -ffreestanding -fsigned-char -fno-move-loop-invariants -fno-strict-aliasing - -# -# Geeetech GTM32 (STM32F103VET6) -# +platform = ${common_stm32.platform} +extends = common_stm32 +board = armed_v1 +build_flags = ${common_stm32.build_flags} + -O2 -ffreestanding -fsigned-char -fno-move-loop-invariants -fno-strict-aliasing +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:STM32F103VE_GTM32] -platform = ${common_stm32f1.platform} -extends = common_stm32f1 -board = genericSTM32F103VE -build_flags = ${common_stm32f1.build_flags} - -ffunction-sections -fdata-sections -nostdlib -MMD - -DMCU_STM32F103VE -DARDUINO_GENERIC_STM32F103V -DARDUINO_ARCH_STM32F1 -DBOARD_generic_stm32f103v - -DDEBUG_LEVEL=DEBUG_NONE -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DVECT_TAB_ADDR=0x8000000 - -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6 -upload_protocol = serial - -# -# Longer 3D board in Alfawise U20 (STM32F103VET6) -# +platform = ${common_stm32f1.platform} +extends = common_stm32f1 +board = genericSTM32F103VE +build_flags = ${common_stm32f1.build_flags} + -ffunction-sections -fdata-sections -nostdlib -MMD + -DMCU_STM32F103VE -DARDUINO_GENERIC_STM32F103V -DARDUINO_ARCH_STM32F1 -DBOARD_generic_stm32f103v + -DDEBUG_LEVEL=DEBUG_NONE -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DVECT_TAB_ADDR=0x8000000 + -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6 +upload_protocol = serial +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:STM32F103VE_longer] -platform = ${common_stm32f1.platform} -extends = common_stm32f1 -board = genericSTM32F103VE +platform = ${common_stm32f1.platform} +extends = common_stm32f1 +board = genericSTM32F103VE extra_scripts = ${common.extra_scripts} - buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py -build_flags = ${common_stm32f1.build_flags} - -DMCU_STM32F103VE -DSTM32F1xx -USERIAL_USB -DU20 -DTS_V12 + buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py +build_flags = ${common_stm32f1.build_flags} + -DMCU_STM32F103VE -DSTM32F1xx -USERIAL_USB -DU20 -DTS_V12 build_unflags = ${common_stm32f1.build_unflags} - -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6 -lib_ignore = ${common_stm32f1.lib_ignore} + -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6 +lib_ignore = ${common_stm32f1.lib_ignore} +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# MKS Robin Mini (STM32F103VET6) -# [env:mks_robin_mini] -platform = ${common_stm32f1.platform} -extends = common_stm32f1 -board = genericSTM32F103VE +platform = ${common_stm32f1.platform} +extends = common_stm32f1 +board = genericSTM32F103VE extra_scripts = ${common.extra_scripts} - buildroot/share/PlatformIO/scripts/mks_robin_mini.py -build_flags = ${common_stm32f1.build_flags} - -DMCU_STM32F103VE + buildroot/share/PlatformIO/scripts/mks_robin_mini.py +build_flags = ${common_stm32f1.build_flags} + -DMCU_STM32F103VE +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# MKS Robin Nano (STM32F103VET6) -# [env:mks_robin_nano35] -platform = ${common_stm32f1.platform} -extends = common_stm32f1 -board = genericSTM32F103VE +platform = ${common_stm32f1.platform} +extends = common_stm32f1 +board = genericSTM32F103VE platform_packages = tool-stm32duino -extra_scripts = ${common.extra_scripts} - buildroot/share/PlatformIO/scripts/mks_robin_nano35.py -build_flags = ${common_stm32f1.build_flags} - -DMCU_STM32F103VE -DSS_TIMER=4 -debug_tool = jlink +extra_scripts = ${common.extra_scripts} + buildroot/share/PlatformIO/scripts/mks_robin_nano35.py +build_flags = ${common_stm32f1.build_flags} + -DMCU_STM32F103VE -DSS_TIMER=4 +debug_tool = jlink upload_protocol = jlink +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# MKS Robin (STM32F103ZET6) -# [env:mks_robin] -platform = ${common_stm32f1.platform} -extends = common_stm32f1 -board = genericSTM32F103ZE +platform = ${common_stm32f1.platform} +extends = common_stm32f1 +board = genericSTM32F103ZE extra_scripts = ${common.extra_scripts} - buildroot/share/PlatformIO/scripts/mks_robin.py -build_flags = ${common_stm32f1.build_flags} - -DSS_TIMER=4 -DSTM32_XL_DENSITY + buildroot/share/PlatformIO/scripts/mks_robin.py +build_flags = ${common_stm32f1.build_flags} + -DSS_TIMER=4 -DSTM32_XL_DENSITY +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# MKS Robin (STM32F103ZET6) -# Uses HAL STM32 to support Marlin UI for TFT screen with optional touch panel -# [env:mks_robin_stm32] -platform = ${common_stm32.platform} -extends = common_stm32 -board = genericSTM32F103ZE -board_build.core = stm32 -board_build.variant = MARLIN_F103Zx +platform = ${common_stm32.platform} +extends = common_stm32 +board = genericSTM32F103ZE +board_build.core = stm32 +board_build.variant = MARLIN_F103Zx board_build.ldscript = ldscript.ld -board_build.offset = 0x7000 +board_build.offset = 0x7000 board_build.firmware = Robin.bin -build_flags = ${common_stm32.build_flags} - -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -build_unflags = ${common_stm32.build_unflags} - -DUSBCON -DUSBD_USE_CDC -extra_scripts = ${common.extra_scripts} - pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py - buildroot/share/PlatformIO/scripts/stm32_bootloader.py - buildroot/share/PlatformIO/scripts/mks_encrypt.py -lib_deps = - -# -# MKS Robin Pro (STM32F103ZET6) -# +build_flags = ${common_stm32.build_flags} + -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 +build_unflags = ${common_stm32.build_unflags} + -DUSBCON -DUSBD_USE_CDC +extra_scripts = ${common.extra_scripts} + pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py + buildroot/share/PlatformIO/scripts/stm32_bootloader.py + buildroot/share/PlatformIO/scripts/mks_encrypt.py +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:mks_robin_pro] -platform = ${common_stm32f1.platform} -extends = env:mks_robin +platform = ${common_stm32f1.platform} +extends = env:mks_robin extra_scripts = ${common.extra_scripts} - buildroot/share/PlatformIO/scripts/mks_robin_pro.py + buildroot/share/PlatformIO/scripts/mks_robin_pro.py +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# TRIGORILLA PRO (STM32F103ZET6) -# [env:trigorilla_pro] -platform = ${common_stm32f1.platform} -extends = env:mks_robin +platform = ${common_stm32f1.platform} +extends = env:mks_robin extra_scripts = ${common.extra_scripts} +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# MKS Robin E3D (STM32F103RCT6) and -# MKS Robin E3 with TMC2209 -# [env:mks_robin_e3] -platform = ${common_stm32f1.platform} -extends = common_stm32f1 -board = genericSTM32F103RC +platform = ${common_stm32f1.platform} +extends = common_stm32f1 +board = genericSTM32F103RC platform_packages = tool-stm32duino extra_scripts = ${common.extra_scripts} - buildroot/share/PlatformIO/scripts/mks_robin_e3.py -build_flags = ${common_stm32f1.build_flags} - -DDEBUG_LEVEL=0 -DSS_TIMER=4 - -# -# MKS Robin E3p (STM32F103VET6) -# - LVGL UI -# + buildroot/share/PlatformIO/scripts/mks_robin_e3.py +build_flags = ${common_stm32f1.build_flags} + -DDEBUG_LEVEL=0 -DSS_TIMER=4 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:mks_robin_e3p] -platform = ${common_stm32f1.platform} -extends = common_stm32f1 -board = genericSTM32F103VE +platform = ${common_stm32f1.platform} +extends = common_stm32f1 +board = genericSTM32F103VE platform_packages = tool-stm32duino -extra_scripts = ${common.extra_scripts} - buildroot/share/PlatformIO/scripts/mks_robin_e3p.py -build_flags = ${common_stm32f1.build_flags} - -DMCU_STM32F103VE -DSS_TIMER=4 -debug_tool = jlink +extra_scripts = ${common.extra_scripts} + buildroot/share/PlatformIO/scripts/mks_robin_e3p.py +build_flags = ${common_stm32f1.build_flags} + -DMCU_STM32F103VE -DSS_TIMER=4 +debug_tool = jlink upload_protocol = jlink +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# MKS Robin Lite/Lite2 (STM32F103RCT6) -# [env:mks_robin_lite] -platform = ${common_stm32f1.platform} -extends = common_stm32f1 -board = genericSTM32F103RC +platform = ${common_stm32f1.platform} +extends = common_stm32f1 +board = genericSTM32F103RC extra_scripts = ${common.extra_scripts} - buildroot/share/PlatformIO/scripts/mks_robin_lite.py + buildroot/share/PlatformIO/scripts/mks_robin_lite.py +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# MKS ROBIN LITE3 (STM32F103RCT6) -# [env:mks_robin_lite3] -platform = ${common_stm32f1.platform} -extends = common_stm32f1 -board = genericSTM32F103RC +platform = ${common_stm32f1.platform} +extends = common_stm32f1 +board = genericSTM32F103RC extra_scripts = ${common.extra_scripts} - buildroot/share/PlatformIO/scripts/mks_robin_lite3.py + buildroot/share/PlatformIO/scripts/mks_robin_lite3.py +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# JGAurora A5S A1 (STM32F103ZET6) -# [env:jgaurora_a5s_a1] -platform = ${common_stm32f1.platform} -extends = common_stm32f1 -board = genericSTM32F103ZE +platform = ${common_stm32f1.platform} +extends = common_stm32f1 +board = genericSTM32F103ZE extra_scripts = ${common.extra_scripts} - buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py -build_flags = ${common_stm32f1.build_flags} - -DSTM32F1xx -DSTM32_XL_DENSITY + buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py +build_flags = ${common_stm32f1.build_flags} + -DSTM32F1xx -DSTM32_XL_DENSITY +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# Malyan M200 (STM32F103CB) -# [env:STM32F103CB_malyan] -platform = ${common_stm32f1.platform} -extends = common_stm32f1 -board = malyanM200 -build_flags = ${common_stm32f1.build_flags} - -DMCU_STM32F103CB -D__STM32F1__=1 -std=c++1y -DSERIAL_USB -ffunction-sections -fdata-sections - -Wl,--gc-sections -DDEBUG_LEVEL=0 -D__MARLIN_FIRMWARE__ -lib_ignore = ${common_stm32f1.lib_ignore} - SoftwareSerialM - -# -# Malyan M200 v2 (STM32F070RB) -# +platform = ${common_stm32f1.platform} +extends = common_stm32f1 +board = malyanM200 +build_flags = ${common_stm32f1.build_flags} + -DMCU_STM32F103CB -D__STM32F1__=1 -std=c++1y -DSERIAL_USB -ffunction-sections -fdata-sections + -Wl,--gc-sections -DDEBUG_LEVEL=0 -D__MARLIN_FIRMWARE__ +lib_ignore = ${common_stm32f1.lib_ignore} + SoftwareSerialM +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:STM32F070RB_malyan] -platform = ${common_stm32.platform} -extends = common_stm32 -board = malyanM200v2 +platform = ${common_stm32.platform} +extends = common_stm32 +board = malyanM200v2 build_flags = ${common_stm32.build_flags} -DHAL_PCD_MODULE_ENABLED - -O2 -ffreestanding -fsigned-char -fno-move-loop-invariants -fno-strict-aliasing - -DCUSTOM_STARTUP_FILE + -O2 -ffreestanding -fsigned-char -fno-move-loop-invariants -fno-strict-aliasing + -DCUSTOM_STARTUP_FILE +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# Malyan M200 v2 (STM32F070CB) -# [env:STM32F070CB_malyan] -platform = ${common_stm32.platform} -extends = common_stm32 -board = malyanm200_f070cb +platform = ${common_stm32.platform} +extends = common_stm32 +board = malyanm200_f070cb build_flags = ${common_stm32.build_flags} - -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB -DHAL_UART_MODULE_ENABLED -DCUSTOM_STARTUP_FILE + -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB -DHAL_UART_MODULE_ENABLED -DCUSTOM_STARTUP_FILE +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# Malyan M300 (STM32F070CB) -# [env:malyan_M300] -platform = ${common_stm32.platform} -extends = common_stm32 -board = malyanm300_f070cb +platform = ${common_stm32.platform} +extends = common_stm32 +board = malyanm300_f070cb build_flags = ${common_stm32.build_flags} - -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB -DHAL_UART_MODULE_ENABLED -src_filter = ${common.default_src_filter} + + -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB -DHAL_UART_MODULE_ENABLED +src_filter = ${common.default_src_filter} + +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# Chitu boards like Tronxy X5s (STM32F103ZET6) -# [env:chitu_f103] -platform = ${common_stm32f1.platform} -extends = common_stm32f1 -board = CHITU_F103 +platform = ${common_stm32f1.platform} +extends = common_stm32f1 +board = CHITU_F103 extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-dependencies.py - pre:buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py - buildroot/share/PlatformIO/scripts/chitu_crypt.py -build_flags = ${common_stm32f1.build_flags} - -DSTM32F1xx -DSTM32_XL_DENSITY - # Random Chitu V5 boards that a problem that need a hack before the GPIO init. Uncomment this if your auto-home keeps pushing bed down, and never work - -DCHITU_V5_Z_MIN_BUGFIX + pre:buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py + buildroot/share/PlatformIO/scripts/chitu_crypt.py +build_flags = ${common_stm32f1.build_flags} + -DSTM32F1xx -DSTM32_XL_DENSITY + -DCHITU_V5_Z_MIN_BUGFIX build_unflags = ${common_stm32f1.build_unflags} - -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG= -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6 + -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG= -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# Some Chitu V5 boards have a problem with GPIO init. -# Use this target if G28 or G29 are always failing. -# [env:chitu_v5_gpio_init] -platform = ${common_stm32f1.platform} -extends = env:chitu_f103 -build_flags = ${env:chitu_f103.build_flags} -DCHITU_V5_Z_MIN_BUGFIX +platform = ${common_stm32f1.platform} +extends = env:chitu_f103 +build_flags = ${env:chitu_f103.build_flags} -DCHITU_V5_Z_MIN_BUGFIX +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# Creality (STM32F103RET6) -# [env:STM32F103RET6_creality] -platform = ${common_stm32f1.platform} -extends = common_stm32f1 -board = genericSTM32F103RE -build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py - ${common.build_flags} -std=gnu++14 -DSTM32_XL_DENSITY -DTEMP_TIMER_CHAN=4 -extra_scripts = ${common.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 +platform = ${common_stm32f1.platform} +extends = common_stm32f1 +board = genericSTM32F103RE +build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py + ${common.build_flags} -std=gnu++14 -DSTM32_XL_DENSITY -DTEMP_TIMER_CHAN=4 +extra_scripts = ${common.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 +monitor_speed = 115200 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# FLSUN QQ (STM32F103VET6) -# [env:flsun_hispeed] -platform = ${common_stm32f1.platform} -extends = common_stm32f1 -board = genericSTM32F103VE +platform = ${common_stm32f1.platform} +extends = common_stm32f1 +board = genericSTM32F103VE platform_packages = tool-stm32duino -extra_scripts = ${common.extra_scripts} - buildroot/share/PlatformIO/scripts/mks_robin_mini.py - buildroot/share/PlatformIO/scripts/add_nanolib.py -build_flags = ${common_stm32f1.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4 -lib_deps = SoftwareSerialM - #Adafruit NeoPixel=https://github.com/Foxies-CSTL/Robin-NeoPixel-Lib/archive/master.zip - -# -# STM32F401VE -# 'STEVAL-3DP001V1' STM32F401VE board - https://www.st.com/en/evaluation-tools/steval-3dp001v1.html -# +extra_scripts = ${common.extra_scripts} + buildroot/share/PlatformIO/scripts/mks_robin_mini.py + buildroot/share/PlatformIO/scripts/add_nanolib.py +build_flags = ${common_stm32f1.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4 +lib_deps = + SoftwareSerialM + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:STM32F401VE_STEVAL] -platform = ${common_stm32.platform} -extends = common_stm32 -board = STEVAL_STM32F401VE -build_flags = ${common_stm32.build_flags} - -DARDUINO_STEVAL -DSTM32F401xE - -DDISABLE_GENERIC_SERIALUSB -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS -extra_scripts = ${common.extra_scripts} - pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py - buildroot/share/PlatformIO/scripts/STEVAL__F401XX.py - -# -# FLYF407ZG -# +platform = ${common_stm32.platform} +extends = common_stm32 +board = STEVAL_STM32F401VE +build_flags = ${common_stm32.build_flags} + -DARDUINO_STEVAL -DSTM32F401xE + -DDISABLE_GENERIC_SERIALUSB -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS +extra_scripts = ${common.extra_scripts} + pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py + buildroot/share/PlatformIO/scripts/STEVAL__F401XX.py +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:FLYF407ZG] -platform = ${common_stm32.platform} -extends = common_stm32 -board = FLYF407ZG -build_flags = ${common_stm32.build_flags} - -DVECT_TAB_OFFSET=0x8000 -extra_scripts = ${common.extra_scripts} - pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py - -# -# FLY MINI(stm32f103rct6) -# +platform = ${common_stm32.platform} +extends = common_stm32 +board = FLYF407ZG +build_flags = ${common_stm32.build_flags} + -DVECT_TAB_OFFSET=0x8000 +extra_scripts = ${common.extra_scripts} + pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:FLY_MINI] -platform = ${common_stm32f1.platform} -extends = common_stm32f1 -board = genericSTM32F103RC +platform = ${common_stm32f1.platform} +extends = common_stm32f1 +board = genericSTM32F103RC platform_packages = tool-stm32duino -extra_scripts = ${common.extra_scripts} - buildroot/share/PlatformIO/scripts/fly_mini.py -build_flags = ${common_stm32f1.build_flags} - -DDEBUG_LEVEL=0 -DSS_TIMER=4 - -# -# FYSETC S6 (STM32F446VET6 ARM Cortex-M4) -# +extra_scripts = ${common.extra_scripts} + buildroot/share/PlatformIO/scripts/fly_mini.py +build_flags = ${common_stm32f1.build_flags} + -DDEBUG_LEVEL=0 -DSS_TIMER=4 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:FYSETC_S6] -platform = ${common_stm32.platform} -extends = common_stm32 +platform = ${common_stm32.platform} +extends = common_stm32 platform_packages = tool-stm32duino -board = marlin_fysetc_s6 -build_flags = ${common_stm32.build_flags} - -DVECT_TAB_OFFSET=0x10000 - -DHAL_PCD_MODULE_ENABLED -extra_scripts = ${common.extra_scripts} - pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py -debug_tool = stlink -upload_protocol = dfu -upload_command = dfu-util -a 0 -s 0x08010000:leave -D "$SOURCE" - -# -# STM32F407VET6 with RAMPS-like shield -# 'Black' STM32F407VET6 board - https://wiki.stm32duino.com/index.php?title=STM32F407 -# Shield - https://github.com/jmz52/Hardware -# +board = marlin_fysetc_s6 +build_flags = ${common_stm32.build_flags} + -DVECT_TAB_OFFSET=0x10000 + -DHAL_PCD_MODULE_ENABLED +extra_scripts = ${common.extra_scripts} + pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py +debug_tool = stlink +upload_protocol = dfu +upload_command = dfu-util -a 0 -s 0x08010000:leave -D "$SOURCE" +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:STM32F407VE_black] -platform = ${common_stm32.platform} -extends = common_stm32 -board = blackSTM32F407VET6 -build_flags = ${common_stm32.build_flags} - -DARDUINO_BLACK_F407VE - -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS -extra_scripts = ${common.extra_scripts} - pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py - -# -# BigTreeTech SKR Pro (STM32F407ZGT6 ARM Cortex-M4) -# +platform = ${common_stm32.platform} +extends = common_stm32 +board = blackSTM32F407VET6 +build_flags = ${common_stm32.build_flags} + -DARDUINO_BLACK_F407VE + -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS +extra_scripts = ${common.extra_scripts} + pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:BIGTREE_SKR_PRO] -platform = ${common_stm32.platform} -extends = common_stm32 -board = BigTree_SKR_Pro -build_flags = ${common_stm32.build_flags} - -DSTM32F407_5ZX -DVECT_TAB_OFFSET=0x8000 -extra_scripts = ${common.extra_scripts} - pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py -#upload_protocol = stlink -#upload_command = "$PROJECT_PACKAGES_DIR/tool-stm32duino/stlink/ST-LINK_CLI.exe" -c SWD -P "$BUILD_DIR/firmware.bin" 0x8008000 -Rst -Run -debug_tool = stlink -debug_init_break = - -# -# Bigtreetech GTR V1.0 (STM32F407IGT6 ARM Cortex-M4) -# +platform = ${common_stm32.platform} +extends = common_stm32 +board = BigTree_SKR_Pro +build_flags = ${common_stm32.build_flags} + -DSTM32F407_5ZX -DVECT_TAB_OFFSET=0x8000 +extra_scripts = ${common.extra_scripts} + pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py +debug_tool = stlink +debug_init_break = +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:BIGTREE_GTR_V1_0] -platform = ${common_stm32.platform} -extends = common_stm32 -board = BigTree_GTR_v1 -extra_scripts = ${common.extra_scripts} - pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py -build_flags = ${common_stm32.build_flags} - -DSTM32F407IX -DVECT_TAB_OFFSET=0x8000 - -# -# BigTreeTech BTT002 V1.0 (STM32F407VGT6 ARM Cortex-M4) -# +platform = ${common_stm32.platform} +extends = common_stm32 +board = BigTree_GTR_v1 +extra_scripts = ${common.extra_scripts} + pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py +build_flags = ${common_stm32.build_flags} + -DSTM32F407IX -DVECT_TAB_OFFSET=0x8000 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:BIGTREE_BTT002] -platform = ${common_stm32.platform} -extends = common_stm32 -board = BigTree_Btt002 -build_flags = ${common_stm32.build_flags} - -DSTM32F407_5VX -DVECT_TAB_OFFSET=0x8000 - -DHAVE_HWSERIAL2 - -DHAVE_HWSERIAL3 - -DPIN_SERIAL2_RX=PD_6 - -DPIN_SERIAL2_TX=PD_5 -extra_scripts = ${common.extra_scripts} - pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py - -# -# Lerdge base -# +platform = ${common_stm32.platform} +extends = common_stm32 +board = BigTree_Btt002 +build_flags = ${common_stm32.build_flags} + -DSTM32F407_5VX -DVECT_TAB_OFFSET=0x8000 + -DHAVE_HWSERIAL2 + -DHAVE_HWSERIAL3 + -DPIN_SERIAL2_RX=PD_6 + -DPIN_SERIAL2_TX=PD_5 +extra_scripts = ${common.extra_scripts} + pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [lerdge_common] -platform = ${common_stm32.platform} -extends = common_stm32 -board = LERDGE +platform = ${common_stm32.platform} +extends = common_stm32 +board = LERDGE board_build.offset = 0x10000 -extra_scripts = ${common.extra_scripts} - pre:buildroot/share/PlatformIO/scripts/copy_marlin_variant_to_framework.py - buildroot/share/PlatformIO/scripts/stm32_bootloader.py - buildroot/share/PlatformIO/scripts/lerdge.py -build_flags = ${common_stm32.build_flags} - -DSTM32F4 -DSTM32F4xx -DTARGET_STM32F4 - -DDISABLE_GENERIC_SERIALUSB -DARDUINO_ARCH_STM32 -DARDUINO_LERDGE - -DTRANSFER_CLOCK_DIV=8 -DHAL_SRAM_MODULE_ENABLED -build_unflags = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 - -# -# Lerdge X -# +extra_scripts = ${common.extra_scripts} + pre:buildroot/share/PlatformIO/scripts/copy_marlin_variant_to_framework.py + buildroot/share/PlatformIO/scripts/stm32_bootloader.py + buildroot/share/PlatformIO/scripts/lerdge.py +build_flags = ${common_stm32.build_flags} + -DSTM32F4 -DSTM32F4xx -DTARGET_STM32F4 + -DDISABLE_GENERIC_SERIALUSB -DARDUINO_ARCH_STM32 -DARDUINO_LERDGE + -DTRANSFER_CLOCK_DIV=8 -DHAL_SRAM_MODULE_ENABLED +build_unflags = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 + [env:LERDGEX] -extends = lerdge_common +extends = lerdge_common board_build.firmware = Lerdge_X_firmware_force.bin +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# Lerdge S -# [env:LERDGES] -extends = lerdge_common +extends = lerdge_common board_build.firmware = Lerdge_firmware_force.bin +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# Lerdge K -# [env:LERDGEK] -extends = lerdge_common +extends = lerdge_common board_build.firmware = Lerdge_K_firmware_force.bin -build_flags = ${lerdge_common.build_flags} - -DLERDGEK +build_flags = ${lerdge_common.build_flags} + -DLERDGEK +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# RUMBA32 -# [env:rumba32] -platform = ${common_stm32.platform} -extends = common_stm32 -build_flags = ${common_stm32.build_flags} - -Os - -DHAL_PCD_MODULE_ENABLED - -DDISABLE_GENERIC_SERIALUSB - -DHAL_UART_MODULE_ENABLED - -DTIMER_SERIAL=TIM9 -board = rumba32_f446ve +platform = ${common_stm32.platform} +extends = common_stm32 +build_flags = ${common_stm32.build_flags} + -Os + -DHAL_PCD_MODULE_ENABLED + -DDISABLE_GENERIC_SERIALUSB + -DHAL_UART_MODULE_ENABLED + -DTIMER_SERIAL=TIM9 +board = rumba32_f446ve upload_protocol = dfu -monitor_speed = 500000 +monitor_speed = 500000 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 -# -# MKS Robin Nano V1.2 and V2 using hal STM32 -# [env:mks_robin_nano35_stm32] -platform = ${common_stm32.platform} -extends = common_stm32 -build_flags = ${common_stm32.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4 -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -board = genericSTM32F103VE -board_build.core = stm32 -board_build.variant = MARLIN_F103Vx +platform = ${common_stm32.platform} +extends = common_stm32 +build_flags = ${common_stm32.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4 -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 +board = genericSTM32F103VE +board_build.core = stm32 +board_build.variant = MARLIN_F103Vx board_build.ldscript = ldscript.ld -board_build.offset = 0x7000 +board_build.offset = 0x7000 board_build.firmware = Robin_nano35.bin board_upload.offset_address = 0x08007000 -build_unflags = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC -debug_tool = jlink -upload_protocol = jlink -extra_scripts = ${common.extra_scripts} - pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py - buildroot/share/PlatformIO/scripts/stm32_bootloader.py - buildroot/share/PlatformIO/scripts/mks_encrypt.py - -################################# -# # -# Other Architectures # -# # -################################# - -# -# Espressif ESP32 -# +build_unflags = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC +debug_tool = jlink +upload_protocol = jlink +extra_scripts = ${common.extra_scripts} + pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py + buildroot/share/PlatformIO/scripts/stm32_bootloader.py + buildroot/share/PlatformIO/scripts/mks_encrypt.py +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:esp32] -platform = espressif32@1.11.2 -board = esp32dev -build_flags = ${common.build_flags} -DCORE_DEBUG_LEVEL=0 -src_filter = ${common.default_src_filter} + -lib_ignore = NativeEthernet -upload_speed = 115200 -#upload_port = marlinesp.local -#board_build.flash_mode = qio - -# -# Teensy 3.1 / 3.2 (ARM Cortex-M4) -# +platform = espressif32@1.11.2 +board = esp32dev +build_flags = ${common.build_flags} -DCORE_DEBUG_LEVEL=0 +src_filter = ${common.default_src_filter} + +lib_ignore = NativeEthernet +upload_speed = 115200 +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:teensy31] -platform = teensy -board = teensy31 -src_filter = ${common.default_src_filter} + -lib_ignore = NativeEthernet - -# -# Teensy 3.5 / 3.6 (ARM Cortex-M4) -# +platform = teensy +board = teensy31 +src_filter = ${common.default_src_filter} + +lib_ignore = NativeEthernet +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:teensy35] -platform = teensy -board = teensy35 -src_filter = ${common.default_src_filter} + -lib_ignore = NativeEthernet +platform = teensy +board = teensy35 +src_filter = ${common.default_src_filter} + +lib_ignore = NativeEthernet +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 [env:teensy36] -platform = teensy -board = teensy36 -src_filter = ${common.default_src_filter} + -lib_ignore = NativeEthernet - -# -# Teensy 4.0 / 4.1 (ARM Cortex-M7) -# +platform = teensy +board = teensy36 +src_filter = ${common.default_src_filter} + +lib_ignore = NativeEthernet +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:teensy41] -platform = teensy -board = teensy41 -src_filter = ${common.default_src_filter} + - -# -# Native -# No supported Arduino libraries, base Marlin only -# +platform = teensy +board = teensy41 +src_filter = ${common.default_src_filter} + +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 + [env:linux_native] -platform = native -framework = -build_flags = -D__PLAT_LINUX__ -std=gnu++17 -ggdb -g -lrt -lpthread -D__MARLIN_FIRMWARE__ -Wno-expansion-to-defined +platform = native +framework = +build_flags = -D__PLAT_LINUX__ -std=gnu++17 -ggdb -g -lrt -lpthread -D__MARLIN_FIRMWARE__ -Wno-expansion-to-defined src_build_flags = -Wall -IMarlin/src/HAL/LINUX/include -build_unflags = -Wall -lib_ldf_mode = off -lib_deps = -src_filter = ${common.default_src_filter} + - -# -# Just print the dependency tree -# +build_unflags = -Wall +lib_ldf_mode = off +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 +src_filter = ${common.default_src_filter} + + [env:include_tree] -platform = atmelavr -board = megaatmega2560 +platform = atmelavr +board = megaatmega2560 build_flags = -c -H -std=gnu++11 -Wall -Os -D__MARLIN_FIRMWARE__ -src_filter = + +src_filter = + +lib_deps = + tencent/RapidJSON@1.1.0 + mbed-madcowswe/fixedpoint@0.0.0+sha.ac99b6f474a0 From eabb62359846bbec37c84a9c04547d14b58e4aed Mon Sep 17 00:00:00 2001 From: unimatrix Date: Sun, 20 Jun 2021 14:58:09 +0200 Subject: [PATCH 2/3] Update Configuration.h --- Marlin/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index d33a966112e1..564953972faf 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1090,7 +1090,7 @@ #elif WITH_TMC && WITH_TITAN #define DEFAULT_AXIS_STEPS_PER_UNIT { 160, 160, 800, 764 } #elif WITH_TMC && !WITH_TITAN && !WITH_BMG - #define DEFAULT_AXIS_STEPS_PER_UNIT { 160, 160, 800, 275 } + #define DEFAULT_AXIS_STEPS_PER_UNIT { 160, 160, 3200, 275 } #elif WITH_TITAN && !WITH_TMC #if defined(T2_LEADSCREW) #define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 1600, 420 } From 7fccafb7621916eec26f1033245e3d4b26821850 Mon Sep 17 00:00:00 2001 From: unimatrix Date: Sun, 17 Oct 2021 09:23:57 +0200 Subject: [PATCH 3/3] bed mesh --- Marlin/Configuration.h | 6 +- Marlin/src/lcd/language/language_de.h | 1 + Marlin/src/lcd/language/language_en.h | 1 + Marlin/src/lcd/menu/menu_bed_leveling.cpp | 99 ++++++++++++++++++++--- 4 files changed, 94 insertions(+), 13 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 564953972faf..f898e15b4d1e 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1634,7 +1634,7 @@ * With an LCD controller the process is guided step-by-step. */ //#define AUTO_BED_LEVELING_3POINT -//#define AUTO_BED_LEVELING_LINEAR +#define AUTO_BED_LEVELING_BILINEAR #if WITHOUT_ABL #define MESH_BED_LEVELING #else @@ -1686,7 +1686,7 @@ #if EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR) // Set the number of grid points per dimension. - #define GRID_MAX_POINTS_X 4 + #define GRID_MAX_POINTS_X 5 #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X // Probe along the Y axis, advancing X after each column @@ -1752,7 +1752,7 @@ #if ENABLED(LCD_BED_LEVELING) #define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis. #define LCD_PROBE_Z_RANGE 4 // (mm) Z Range centered on Z_MIN_POS for LCD Z adjustment - //#define MESH_EDIT_MENU // Add a menu to edit mesh points + #define MESH_EDIT_MENU // Add a menu to edit mesh points #endif // Add a menu item to move between bed corners for manual bed adjustment diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index f8d891576e15..01653aa467c2 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -110,6 +110,7 @@ namespace Language_de { PROGMEM Language_Str MSG_LEVEL_CORNERS = _UxGT("Ecken nivellieren"); PROGMEM Language_Str MSG_NEXT_CORNER = _UxGT("Nächste Ecke"); PROGMEM Language_Str MSG_MESH_EDITOR = _UxGT("Netz Editor"); + PROGMEM Language_Str MSG_SHOW_MESH = _UxGT("Netz anzeigen"); PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("Netz bearbeiten"); PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("Netzbearb. angeh."); PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("Messpunkt"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index 42954d79e5b9..cf129a556a88 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -124,6 +124,7 @@ namespace Language_en { PROGMEM Language_Str MSG_LEVEL_CORNERS = _UxGT("Level Corners"); PROGMEM Language_Str MSG_NEXT_CORNER = _UxGT("Next Corner"); PROGMEM Language_Str MSG_MESH_EDITOR = _UxGT("Mesh Editor"); + PROGMEM Language_Str MSG_SHOW_MESH = _UxGT("Show Mesh"); PROGMEM Language_Str MSG_EDIT_MESH = _UxGT("Edit Mesh"); PROGMEM Language_Str MSG_EDITING_STOPPED = _UxGT("Mesh Editing Stopped"); PROGMEM Language_Str MSG_PROBING_MESH = _UxGT("Probing Point"); diff --git a/Marlin/src/lcd/menu/menu_bed_leveling.cpp b/Marlin/src/lcd/menu/menu_bed_leveling.cpp index e19b04ccb517..4e3961a2c0db 100644 --- a/Marlin/src/lcd/menu/menu_bed_leveling.cpp +++ b/Marlin/src/lcd/menu/menu_bed_leveling.cpp @@ -206,16 +206,94 @@ sync_plan_position(); } - void menu_edit_mesh() { - static uint8_t xind, yind; // =0 - START_MENU(); - BACK_ITEM(MSG_BED_LEVELING); - EDIT_ITEM(uint8, MSG_MESH_X, &xind, 0, GRID_MAX_POINTS_X - 1); - EDIT_ITEM(uint8, MSG_MESH_Y, &yind, 0, GRID_MAX_POINTS_Y - 1); - EDIT_ITEM_FAST(float43, MSG_MESH_EDIT_Z, &Z_VALUES(xind, yind), -(LCD_PROBE_Z_RANGE) * 0.5, (LCD_PROBE_Z_RANGE) * 0.5, refresh_planner); - END_MENU(); - } - + // Show Mesh Menu (c) 2021 aKuechel +void menu_show_mesh() { +#if (GRID_MAX_POINTS_Y==3) +int ygrida=0, ygridc=1, ygride=2; +#endif // Y=3 +#if (GRID_MAX_POINTS_Y==5) +int ygrida=0, ygridb=1, ygridc=2, ygridd=3, ygride=4; +#endif // Y=5 +#if (GRID_MAX_POINTS_Y==7) +int ygrida=0, ygridc=3, ygride=6; +#endif // Y=7 +#if (GRID_MAX_POINTS_Y==9) +int ygrida=0, ygridb=2, ygridc=4, ygridd=6, ygride=8; +#endif // Y=9 +#if (GRID_MAX_POINTS_X==3) +int xgrida=0, xgridc=1, xgride=2; +#endif // X=3 +#if (GRID_MAX_POINTS_X==5) +int xgrida=0, xgridb=1, xgridc=2, xgridd=3, xgride=4; +#endif // X=5 +#if (GRID_MAX_POINTS_X==7) +int xgrida=0, xgridc=3, xgride=6; +#endif // X=7 +#if (GRID_MAX_POINTS_X==9) +int xgrida=0, xgridb=2, xgridc=4, xgridd=6, xgride=8; +#endif // X=9 +int posxstart=20; +int posxabst=(TFT_WIDTH - 120) / 4; // 90 +int posystart=5; +int posyabst=(TFT_HEIGHT - 160) / 4; // 40 +START_MENU(); +BACK_ITEM(MSG_BED_LEVELING); +tft.canvas(5, 55, TFT_WIDTH - 10, TFT_HEIGHT - 55); +tft.set_background(COLOR_BACKGROUND); +tft.add_rectangle(0, 0, TFT_WIDTH - 10, TFT_HEIGHT - 110, COLOR_AXIS_HOMED); +#if (GRID_MAX_POINTS_X==3 || GRID_MAX_POINTS_X==5 || GRID_MAX_POINTS_X==7 || GRID_MAX_POINTS_X==9) +#if (GRID_MAX_POINTS_Y==3 || GRID_MAX_POINTS_Y==5 || GRID_MAX_POINTS_Y==7 || GRID_MAX_POINTS_Y==9) +float korrektur=(Z_VALUES(xgrida, ygrida)+Z_VALUES(xgrida, ygridc)+Z_VALUES(xgrida, ygride)+Z_VALUES(xgridc, ygrida)+Z_VALUES(xgridc, ygride)+Z_VALUES(xgride, ygrida)+Z_VALUES(xgride, ygridc)+Z_VALUES(xgride, ygride))/8; +tft.add_text(posxstart, posystart, COLOR_AXIS_HOMED, ftostr53_63(Z_VALUES(xgrida, ygride)-korrektur)); +tft.add_text(posxstart + (posxabst * 2), posystart, COLOR_AXIS_HOMED, ftostr53_63(Z_VALUES(xgridc, ygride)-korrektur)); +tft.add_text(posxstart + (posxabst * 4), posystart, COLOR_AXIS_HOMED, ftostr53_63(Z_VALUES(xgride, ygride)-korrektur)); +tft.add_text(posxstart, posystart + (posyabst * 2), COLOR_AXIS_HOMED, ftostr53_63(Z_VALUES(xgrida, ygridc)-korrektur)); +tft.add_text(posxstart + (posxabst * 2), posystart + (posyabst * 2), COLOR_AXIS_NOT_HOMED, ftostr53_63(Z_VALUES(xgridc, ygridc)-korrektur)); +tft.add_text(posxstart + (posxabst * 4), posystart + (posyabst * 2), COLOR_AXIS_HOMED, ftostr53_63(Z_VALUES(xgride, ygridc)-korrektur)); +tft.add_text(posxstart, posystart + (posyabst * 4), COLOR_AXIS_HOMED, ftostr53_63(Z_VALUES(xgrida, ygrida)-korrektur)); +tft.add_text(posxstart + (posxabst * 2), posystart + (posyabst * 4), COLOR_AXIS_HOMED, ftostr53_63(Z_VALUES(xgridc, ygrida)-korrektur)); +tft.add_text(posxstart + (posxabst * 4), posystart + (posyabst * 4), COLOR_AXIS_HOMED, ftostr53_63(Z_VALUES(xgride, ygrida)-korrektur)); +#if (GRID_MAX_POINTS_X==5 || GRID_MAX_POINTS_X==9) +tft.add_text(posxstart + posxabst, posystart, COLOR_AXIS_NOT_HOMED, ftostr53_63(Z_VALUES(xgridb, ygride)-korrektur)); +tft.add_text(posxstart + (posxabst * 3), posystart, COLOR_AXIS_NOT_HOMED, ftostr53_63(Z_VALUES(xgridd, ygride)-korrektur)); +tft.add_text(posxstart + posxabst, posystart + (posyabst * 2), COLOR_AXIS_NOT_HOMED, ftostr53_63(Z_VALUES(xgridb, ygridc)-korrektur)); +tft.add_text(posxstart + (posxabst * 3), posystart + (posyabst * 2), COLOR_AXIS_NOT_HOMED, ftostr53_63(Z_VALUES(xgridd, ygridc)-korrektur)); +tft.add_text(posxstart + posxabst, posystart + (posyabst * 4), COLOR_AXIS_NOT_HOMED, ftostr53_63(Z_VALUES(xgridb, ygrida)-korrektur)); +tft.add_text(posxstart + (posxabst * 3), posystart + (posyabst * 4), COLOR_AXIS_NOT_HOMED, ftostr53_63(Z_VALUES(xgridd, ygrida)-korrektur)); +#endif +#if (GRID_MAX_POINTS_Y==5 || GRID_MAX_POINTS_Y==9) +tft.add_text(posxstart, posystart + posyabst, COLOR_AXIS_NOT_HOMED, ftostr53_63(Z_VALUES(xgrida, ygridd)-korrektur)); +tft.add_text(posxstart + (posxabst *2), posystart + posyabst, COLOR_AXIS_NOT_HOMED, ftostr53_63(Z_VALUES(xgridc, ygridd)-korrektur)); +tft.add_text(posxstart + (posxabst * 4), posystart + posyabst, COLOR_AXIS_NOT_HOMED, ftostr53_63(Z_VALUES(xgride, ygridd)-korrektur)); +tft.add_text(posxstart, posystart + (posyabst * 3), COLOR_AXIS_NOT_HOMED, ftostr53_63(Z_VALUES(xgrida, ygridb)-korrektur)); +tft.add_text(posxstart + (posxabst *2), posystart + (posyabst * 3), COLOR_AXIS_NOT_HOMED, ftostr53_63(Z_VALUES(xgridc, ygridb)-korrektur)); +tft.add_text(posxstart + (posxabst * 4), posystart + (posyabst * 3), COLOR_AXIS_NOT_HOMED, ftostr53_63(Z_VALUES(xgride, ygridb)-korrektur)); +#if (GRID_MAX_POINTS_X==5 || GRID_MAX_POINTS_X==9) +tft.add_text(posxstart + posxabst, posystart + posyabst, COLOR_AXIS_NOT_HOMED, ftostr53_63(Z_VALUES(xgridb, ygridd)-korrektur)); +tft.add_text(posxstart + (posxabst * 3), posystart + posyabst, COLOR_AXIS_NOT_HOMED, ftostr53_63(Z_VALUES(xgridd, ygridd)-korrektur)); +tft.add_text(posxstart + posxabst, posystart + (posyabst * 3), COLOR_AXIS_NOT_HOMED, ftostr53_63(Z_VALUES(xgridb, ygridb)-korrektur)); +tft.add_text(posxstart + (posxabst * 3), posystart + (posyabst * 3), COLOR_AXIS_NOT_HOMED, ftostr53_63(Z_VALUES(xgridd, ygridb)-korrektur)); +#endif +#endif +#else +tft.add_text(posxstart, posystart + (posyabst * 2), COLOR_AXIS_HOMED, "GRID_MAX_POINTS in Configuration.h"); +tft.add_text(posxstart, posystart + (posyabst * 3), COLOR_AXIS_HOMED, "have to be 3, 5, 7 or 9"); +#endif +#else +tft.add_text(posxstart, posystart + (posyabst * 2), COLOR_AXIS_HOMED, "GRID_MAX_POINTS in Configuration.h"); +tft.add_text(posxstart, posystart + (posyabst * 3), COLOR_AXIS_HOMED, "have to be 3, 5, 7 or 9"); +#endif +END_MENU(); +} +void menu_edit_mesh() { +static uint8_t xind, yind; // =0 +START_MENU(); +BACK_ITEM(MSG_BED_LEVELING); +EDIT_ITEM(uint8, MSG_MESH_X, &xind, 0, (GRID_MAX_POINTS_X) - 1); +EDIT_ITEM(uint8, MSG_MESH_Y, &yind, 0, (GRID_MAX_POINTS_Y) - 1); +EDIT_ITEM_FAST(float43, MSG_MESH_EDIT_Z, &Z_VALUES(xind, yind), -(LCD_PROBE_Z_RANGE) * 0.5, (LCD_PROBE_Z_RANGE) * 0.5, refresh_planner); +END_MENU(); +} #endif // MESH_EDIT_MENU /** @@ -254,6 +332,7 @@ void menu_bed_leveling() { #endif #if ENABLED(MESH_EDIT_MENU) + if (is_valid) SUBMENU(MSG_SHOW_MESH, menu_show_mesh); if (is_valid) SUBMENU(MSG_EDIT_MESH, menu_edit_mesh); #endif