From 2c8a5f8291632dc6ad6537299758f325b9fa2de1 Mon Sep 17 00:00:00 2001 From: majikd83 Date: Mon, 17 Jul 2023 23:52:35 -0400 Subject: [PATCH] bfconfig --- Marlin/Configuration.h | 12 ++++---- Marlin/Configuration_adv.h | 14 ++++----- Marlin/config.ini | 59 +++++++++++++++++++++++++++----------- platformio.ini | 6 ++-- 4 files changed, 59 insertions(+), 32 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 33ff609ca45b6..7ff527ded4572 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -2040,13 +2040,13 @@ */ #define G26_MESH_VALIDATION #if ENABLED(G26_MESH_VALIDATION) - #define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle. - #define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for G26. - #define MESH_TEST_HOTEND_TEMP 205 // (°C) Default nozzle temperature for G26. - #define MESH_TEST_BED_TEMP 60 // (°C) Default bed temperature for G26. - #define G26_XY_FEEDRATE 20 // (mm/s) Feedrate for G26 XY moves. + #define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle. + #define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for G26. + #define MESH_TEST_HOTEND_TEMP 205 // (°C) Default nozzle temperature for G26. + #define MESH_TEST_BED_TEMP 60 // (°C) Default bed temperature for G26. + #define G26_XY_FEEDRATE 20 // (mm/s) Feedrate for G26 XY moves. #define G26_XY_FEEDRATE_TRAVEL 100 // (mm/s) Feedrate for G26 XY travel moves. - #define G26_RETRACT_MULTIPLIER 1.0 // G26 Q (retraction) used by default between mesh test elements. + #define G26_RETRACT_MULTIPLIER 1.0 // G26 Q (retraction) used by default between mesh test elements. #endif #endif diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index f3f995a42ca54..de0ce36cacdc2 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -284,7 +284,7 @@ // #if TEMP_SENSOR_SOC #define THERMAL_PROTECTION_SOC // Halt the printer if the SoC sensor leaves the temp range below. - #define SOC_MAXTEMP 85 // (°C) + #define SOC_MAXTEMP 85 // (°C) #endif /** @@ -573,14 +573,14 @@ */ #define USE_CONTROLLER_FAN #if ENABLED(USE_CONTROLLER_FAN) - #define CONTROLLER_FAN_PIN PD12 // Set a custom pin for the controller fan - #define CONTROLLER_FAN2_PIN P // Set a custom pin for second controller fan + #define CONTROLLER_FAN_PIN 60 // Set a custom pin for the controller fan + #define CONTROLLER_FAN2_PIN 61 // Set a custom pin for second controller fan //#define CONTROLLER_FAN_USE_Z_ONLY // With this option only the Z axis is considered //#define CONTROLLER_FAN_IGNORE_Z // Ignore Z stepper. Useful when stepper timeout is disabled. - #define CONTROLLERFAN_SPEED_MIN 0 // (0-255) Minimum speed. (If set below this value the fan is turned off.) - #define CONTROLLERFAN_SPEED_ACTIVE 255 // (0-255) Active speed, used when any motor is enabled - #define CONTROLLERFAN_SPEED_IDLE 0 // (0-255) Idle speed, used when motors are disabled - #define CONTROLLERFAN_IDLE_TIME 60 // (seconds) Extra time to keep the fan running after disabling motors + #define CONTROLLERFAN_SPEED_MIN 0 // (0-255) Minimum speed. (If set below this value the fan is turned off.) + #define CONTROLLERFAN_SPEED_ACTIVE 255 // (0-255) Active speed, used when any motor is enabled + #define CONTROLLERFAN_SPEED_IDLE 0 // (0-255) Idle speed, used when motors are disabled + #define CONTROLLERFAN_IDLE_TIME 60 // (seconds) Extra time to keep the fan running after disabling motors // Use TEMP_SENSOR_BOARD as a trigger for enabling the controller fan //#define CONTROLLER_FAN_MIN_BOARD_TEMP 40 // (°C) Turn on the fan if the board reaches this temperature diff --git a/Marlin/config.ini b/Marlin/config.ini index 5602777e7b1cd..43beb1bb62467 100644 --- a/Marlin/config.ini +++ b/Marlin/config.ini @@ -2,7 +2,7 @@ # Marlin Firmware # config.ini - Options to apply before the build # -# Generated by Marlin build on 2023-06-17 at 07:55:58 +# Generated by Marlin build on 2023-07-17 at 22:16:48 # [config:base] @@ -21,7 +21,6 @@ bed_tramming_leveling_order = { LF, RF, RB, LB } bed_tramming_z_hop = 4.0 bltouch = on busy_while_heating = on -cooler_overshoot = 2 custom_machine_name = "mecha-octopus" default_acceleration = 3000 default_axis_steps_per_unit = { 80, 80, 400, 120 } @@ -37,18 +36,16 @@ default_nominal_filament_dia = 1.75 default_retract_acceleration = 3000 default_travel_acceleration = 3000 detect_broken_endstop = on -disable_e = false +disable_reduced_accuracy_warning = on disable_x = false disable_y = false disable_z = false display_charset_hd44780 = JAPANESE -dummy_thermistor_998_value = 25 dummy_thermistor_999_value = 100 e0_driver_type = TMC2209 eeprom_boot_silent = on eeprom_chitchat = on eeprom_settings = on -enable_leveling_after_g28 = on enable_leveling_fade_height = on endstoppulldown_zmin_probe = on endstoppullups = on @@ -56,6 +53,10 @@ extruders = 1 extrude_maxlength = 200 extrude_mintemp = 170 e_enable_on = 0 +g26_mesh_validation = on +g26_retract_multiplier = 1.0 +g26_xy_feedrate = 20 +g26_xy_feedrate_travel = 100 grid_max_points_x = 8 grid_max_points_y = GRID_MAX_POINTS_X heater_0_maxtemp = 300 @@ -76,12 +77,15 @@ lcd_language = en leveled_segment_length = 5.0 manual_probe_start_z = 0.2 max_bed_power = 255 -max_chamber_power = 255 max_software_endstops = on max_software_endstop_x = on max_software_endstop_y = on max_software_endstop_z = on mesh_inset = 1 +mesh_test_bed_temp = 60 +mesh_test_hotend_temp = 205 +mesh_test_layer_height = 0.2 +mesh_test_nozzle_size = 0.4 min_software_endstops = on min_software_endstop_x = on min_software_endstop_y = on @@ -94,7 +98,6 @@ neopixel_led = on neopixel_pixels = 144 neopixel_type = NEO_GRB nozzle_to_probe_offset = { -40, -10, 0 } -num_m106_fans = 3 pidtemp = on pid_autotune_menu = on pid_functional_range = 10 @@ -119,12 +122,13 @@ printjob_timer_autostart = on probe_enable_disable = on probing_margin = 10 reprap_discount_full_graphic_smart_controller = on +restore_leveling_after_g28 = on sdsupport = on sd_check_and_retry = on segment_leveled_moves = on -serial_port = -1 -serial_port_2 = 1 -serial_port_3 = 2 +serial_port = 1 +serial_port_2 = 2 +serial_port_3 = -1 servo_delay = { 50 } soft_pwm_scale = 0 speaker = on @@ -149,11 +153,12 @@ temp_sensor_chamber = 0 temp_sensor_cooler = 0 temp_sensor_probe = 0 temp_sensor_redundant = 0 -temp_sensor_soc = 0 +temp_sensor_soc = 100 temp_window = 1 thermal_protection_bed = on thermal_protection_hotends = on ubl_mesh_edit_moves_z = on +ubl_mesh_wizard = on ubl_save_active_on_m500 = on use_probe_for_z_homing = on validate_homing_endstops = on @@ -187,6 +192,7 @@ z_min_endstop_hit_state = HIGH z_min_pos = 0 z_min_probe_endstop_hit_state = HIGH z_min_probe_repeatability_test = on +z_min_probe_uses_z_min_endstop_pin = on z_probe_feedrate_fast = (4*60) z_probe_feedrate_slow = (Z_PROBE_FEEDRATE_FAST / 2) z_probe_low_point = -2 @@ -198,6 +204,7 @@ z_safe_homing_y_point = Y_CENTER [config:advanced] adaptive_step_smoothing = on +advanced_ok = on arc_support = on autotemp = on autotemp_factor = 0.1f @@ -205,6 +212,7 @@ autotemp_max = 250 autotemp_min = 210 autotemp_oldweight = 0.98 auto_report_position = on +auto_report_sd_status = on auto_report_temperatures = on axis_relative_modes = { false, false, false, false } babystepping = on @@ -230,6 +238,14 @@ chamber_auto_fan_temperature = 30 chamber_check_interval = 5000 chopper_timing = CHOPPER_DEFAULT_24V configuration_embedding = on +controllerfan_idle_time = 60 +controllerfan_speed_active = 255 +controllerfan_speed_idle = 0 +controllerfan_speed_min = 0 +controller_fan2_pin = 61 +controller_fan_editable = on +controller_fan_menu = on +controller_fan_pin = 60 cooler_auto_fan_pin = -1 cooler_auto_fan_speed = 255 cooler_auto_fan_temperature = 18 @@ -240,10 +256,10 @@ default_minsegmenttime = 20000 default_mintravelfeedrate = 0.0 default_stepper_timeout_sec = 120 default_volumetric_extruder_limit = 0.00 -disable_due_sd_mmc = on -disable_idle_x = on +disable_idle_e = on disable_idle_y = on -disable_idle_z = on +doubleclick_for_z_babystepping = on +doubleclick_max_interval = 1250 e0_auto_fan_pin = -1 e0_chain_pos = -1 e0_current = 800 @@ -271,12 +287,14 @@ fanmux2_pin = -1 faster_gcode_parser = on fine_manual_move = 0.025 gcode_case_insensitive = on +gcode_quoted_strings = on hold_multiplier = 0.5 homing_bump_divisor = { 2, 2, 4 } homing_bump_mm = { 5, 5, 2 } host_action_commands = on host_pause_m76 = on host_prompt_support = on +host_shutdown_menu_item = on host_start_menu_item = on host_status_notifications = on interpolate = true @@ -293,6 +311,7 @@ led_user_preset_red = 255 led_user_preset_white = 255 long_filename_host_support = on long_filename_write_support = on +m114_detail = on m115_geometry_report = on manual_e_moves_relative = on manual_feedrate = { 50*60, 50*60, 4*60, 2*60 } @@ -305,18 +324,24 @@ min_arc_segment_mm = 0.1 min_circle_segments = 72 min_steps_per_segment = 6 monitor_driver_status = on +move_z_idle_multiplicator = 1 +move_z_when_idle = on multistepping_limit = 16 n_arc_correction = 25 +paren_comments = on pe_leds_completed_time = (30*60) probe_deploy_stow_menu = on proportional_font_ratio = 1.0 report_current_change = on +report_fan_change = on scroll_long_filenames = on +sdcard_connection = ONBOARD sdcard_ratherrecentfirst = on sd_finished_releasecommand = "M84" sd_finished_stepperrelease = true sd_menu_confirm_start = on sd_procedure_depth = 1 +serial_float_precision = 4 serial_overrun_protection = on service_warning_buzzes = 3 show_bootscreen = on @@ -324,6 +349,8 @@ show_elapsed_time = on show_progress_percent = on slowdown = on slowdown_divisor = 2 +soc_maxtemp = 85 +soft_reset_on_kill = on soft_reset_via_serial = on sound_on_default = on status_bed_anim = on @@ -340,8 +367,6 @@ step_state_y = HIGH step_state_z = HIGH stop_on_error = on temp_sensor_ad595_gain = 1.0 -temp_sensor_ad595_offset = 0.0 -temp_sensor_ad8495_gain = 1.0 temp_sensor_ad8495_offset = 0.0 thermal_protection_bed_hysteresis = 2 thermal_protection_bed_period = 20 @@ -351,11 +376,13 @@ thermal_protection_cooler_hysteresis = 3 thermal_protection_cooler_period = 10 thermal_protection_hysteresis = 4 thermal_protection_period = 40 +thermal_protection_soc = on thermocouple_max_errors = 15 tmc_debug = on tx_buffer_size = 0 ultipanel_feedmultiply = on usb_flash_drive_support = on +use_controller_fan = on use_otg_usb_host = on use_watchdog = on utf_filename_support = on diff --git a/platformio.ini b/platformio.ini index b68d323a0485a..c40af280bc49d 100644 --- a/platformio.ini +++ b/platformio.ini @@ -15,7 +15,7 @@ default_envs = STM32F446ZE_btt_USB include_dir = Marlin extra_configs = Marlin/config.ini - ; ini/avr.ini + ini/avr.ini ; ini/due.ini ; ini/esp32.ini ini/features.ini @@ -24,7 +24,7 @@ extra_configs = ; ini/samd21.ini ; ini/samd51.ini ini/stm32-common.ini - ; ini/stm32f0.ini + ini/stm32f0.ini ; ini/stm32f1-maple.ini ; ini/stm32f1.ini ini/stm32f4.ini @@ -32,7 +32,7 @@ extra_configs = ; ini/stm32h7.ini ; ini/stm32g0.ini ; ini/teensy.ini - ; ini/renamed.ini + ini/renamed.ini [common] build_flags =