Skip to content

Commit

Permalink
Update - HC32 configs
Browse files Browse the repository at this point in the history
  • Loading branch information
classicrocker883 committed Sep 19, 2024
1 parent 07819b1 commit fd517ff
Show file tree
Hide file tree
Showing 11 changed files with 991 additions and 419 deletions.
2 changes: 1 addition & 1 deletion configurations/Voxelab Aquila HC32/C2/Default/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/**
* Marlin release version identifier
*/
#define SHORT_BUILD_VERSION "2.1.3f-8"
#define SHORT_BUILD_VERSION "2.1.3f-9"

/**
* Verbose version identifier which should contain a reference to the location
Expand Down
2 changes: 1 addition & 1 deletion configurations/Voxelab Aquila HC32/C2/MM/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/**
* Marlin release version identifier
*/
#define SHORT_BUILD_VERSION "2.1.3f-8"
#define SHORT_BUILD_VERSION "2.1.3f-9"

/**
* Verbose version identifier which should contain a reference to the location
Expand Down
57 changes: 30 additions & 27 deletions configurations/Voxelab Aquila HC32/ConfigurationBLT.h
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@

/**
* Select a third serial port on the board to use for communication with the host.
* Currently only supported for AVR, DUE, LPC1768/9 and STM32/STM32F1
* Currently supported for AVR, DUE, SAMD51, LPC1768/9, STM32/STM32F1/HC32, and Teensy 4.x
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
*/
//#define SERIAL_PORT_3 1
Expand Down Expand Up @@ -394,14 +394,15 @@
* PRUSA_MMU1 : Průša MMU1 (The "multiplexer" version)
* PRUSA_MMU2 : Průša MMU2
* PRUSA_MMU2S : Průša MMU2S (Requires MK3S extruder with motion sensor, EXTRUDERS = 5)
* PRUSA_MMU3 : Průša MMU3 (Requires MK3S extruder with motion sensor and MMU firmware version 3.x.x, EXTRUDERS = 5)
* EXTENDABLE_EMU_MMU2 : MMU with configurable number of filaments (ERCF, SMuFF or similar with Průša MMU2 compatible firmware)
* EXTENDABLE_EMU_MMU2S : MMUS with configurable number of filaments (ERCF, SMuFF or similar with Průša MMU2 compatible firmware)
*
* Requires NOZZLE_PARK_FEATURE to park print head in case MMU unit fails.
* See additional options in Configuration_adv.h.
* :["PRUSA_MMU1", "PRUSA_MMU2", "PRUSA_MMU2S", "EXTENDABLE_EMU_MMU2", "EXTENDABLE_EMU_MMU2S"]
* :["PRUSA_MMU1", "PRUSA_MMU2", "PRUSA_MMU2S", "PRUSA_MMU3", "EXTENDABLE_EMU_MMU2", "EXTENDABLE_EMU_MMU2S"]
*/
//#define MMU_MODEL PRUSA_MMU2
//#define MMU_MODEL PRUSA_MMU3

// @section psu control

Expand Down Expand Up @@ -724,7 +725,7 @@
* Use a physical model of the hotend to control temperature. When configured correctly this gives
* better responsiveness and stability than PID and removes the need for PID_EXTRUSION_SCALING
* and PID_FAN_SCALING. Enable MPC_AUTOTUNE and use M306 T to autotune the model.
* @section mpctemp
* @section mpc temp
*/
#if ENABLED(MPCTEMP)
#define MPC_AUTOTUNE // Include a method to do MPC auto-tuning (~6.3K bytes of flash)
Expand Down Expand Up @@ -852,14 +853,16 @@
// Lasko "MyHeat Personal Heater" (200w) modified with a Fotek SSR-10DA to control only the heating element
// and placed inside the small Creality printer enclosure tent.
//
#define DEFAULT_chamberKp 37.04
#define DEFAULT_chamberKi 1.40
#define DEFAULT_chamberKp 37.04
#define DEFAULT_chamberKi 1.40
#define DEFAULT_chamberKd 655.17
// M309 P37.04 I1.04 D655.17

// FIND YOUR OWN: "M303 E-2 C8 S50" to run autotune on the chamber at 50 degreesC for 8 cycles.
#endif // PIDTEMPCHAMBER

// @section pid temp

#if ANY(PIDTEMP, PIDTEMPBED, PIDTEMPCHAMBER)
//#define PID_OPENLOOP // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX
//#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
Expand Down Expand Up @@ -1489,7 +1492,8 @@
* A lightweight, solenoid-driven probe.
* For information about this sensor https://github.com/bigtreetech/MicroProbe
*
* Also requires: PROBE_ENABLE_DISABLE, ENDSTOP_INTERRUPTS_FEATURE if FT_MOTION is enabled.
* Also requires PROBE_ENABLE_DISABLE
* With FT_MOTION requires ENDSTOP_INTERRUPTS_FEATURE
*/
//#define BIQU_MICROPROBE_V1 // Triggers HIGH
//#define BIQU_MICROPROBE_V2 // Triggers LOW
Expand Down Expand Up @@ -1635,7 +1639,7 @@
#define Z_PROBE_FEEDRATE_FAST (9*60)

// Feedrate (mm/min) for the "accurate" probe of each point
#define Z_PROBE_FEEDRATE_SLOW (150) //(Z_PROBE_FEEDRATE_FAST * 0.3125)
#define Z_PROBE_FEEDRATE_SLOW (150) // (Z_PROBE_FEEDRATE_FAST * 0.3125)

/**
* Probe Activation Switch
Expand All @@ -1659,6 +1663,7 @@
#define PROBE_TARE_DELAY 200 // (ms) Delay after tare before
#define PROBE_TARE_STATE HIGH // State to write pin for tare
//#define PROBE_TARE_PIN PA5 // Override default pin
//#define PROBE_TARE_MENU // Display a menu item to tare the probe
#if ENABLED(PROBE_ACTIVATION_SWITCH)
//#define PROBE_TARE_ONLY_WHILE_INACTIVE // Fail to tare/probe if PROBE_ACTIVATION_SWITCH is active
#endif
Expand Down Expand Up @@ -1696,8 +1701,8 @@
* probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here.
*
* EXAMPLE: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* BUT: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle.
* EXAMPLE: 'M851 Z-5' with a CLEARANCE of 4 => 9mm from bed to nozzle.
* BUT: 'M851 Z+1' with a CLEARANCE of 2 => 2mm from bed to nozzle.
*/
#define Z_CLEARANCE_DEPLOY_PROBE 10 // (mm) Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // (mm) Z Clearance between probe points
Expand Down Expand Up @@ -1820,7 +1825,7 @@
*/
#define Z_IDLE_HEIGHT Z_HOME_POS

#define Z_CLEARANCE_FOR_HOMING 5 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ...
#define Z_CLEARANCE_FOR_HOMING 10 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ...
// You'll need this much clearance above Z_MAX_POS to avoid grinding.

//#define Z_AFTER_HOMING 10 // (mm) Height to move to after homing (if Z was homed)
Expand Down Expand Up @@ -2086,7 +2091,7 @@

/**
* Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way.
* Useful to retract or move the Z-Probe out of the way.
*/
//#define EVENT_GCODE_AFTER_G29 "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10"

Expand Down Expand Up @@ -2309,9 +2314,9 @@
//#define MANUAL_W_HOME_POS 0

/**
* Use "Z Safe Homing" to avoid homing with a Z probe outside the bed area.
* Use "Z Safe Homing" to avoid homing with a Z-Probe outside the bed area.
*
* - Moves the Z probe (or nozzle) to a defined XY point before Z homing.
* - Moves the Z-Probe (or nozzle) to a defined XY point before Z homing.
* - Allows Z homing only when XY positions are known and trusted.
* - If stepper drivers sleep, XY homing may be required again before Z homing.
*/
Expand Down Expand Up @@ -2446,7 +2451,7 @@
//#define PREHEAT_1_TEMP_CHAMBER 35
#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255

#define PREHEAT_2_LABEL "ABS" //PETG
#define PREHEAT_2_LABEL "ABS" // PETG
#define PREHEAT_2_TEMP_HOTEND 240
#define PREHEAT_2_TEMP_BED 75
//#define PREHEAT_2_TEMP_CHAMBER 35
Expand All @@ -2462,7 +2467,7 @@
//#define PREHEAT_4_TEMP_BED 80
//#define PREHEAT_4_FAN_SPEED 128 // Value from 0 to 255

//#define PREHEAT_5_LABEL "CUSTOM" //NYLON
//#define PREHEAT_5_LABEL "CUSTOM" // NYLON
//#define PREHEAT_5_TEMP_HOTEND 240
//#define PREHEAT_5_TEMP_BED 60
//#define PREHEAT_5_FAN_SPEED 128
Expand All @@ -2484,7 +2489,7 @@

#if ENABLED(NOZZLE_PARK_FEATURE)
// Specify a park position as { X, Y, Z_raise }
#define NOZZLE_PARK_POINT { 0, 200, 50 } //changed MRiscoC Customizable by menu
#define NOZZLE_PARK_POINT { 0, 200, 50 } // MRiscoC Customizable by menu
#define NOZZLE_PARK_MOVE 0 // Park motion: 0 = XY Move, 1 = X Only, 2 = Y Only, 3 = X before Y, 4 = Y before X
#define NOZZLE_PARK_Z_RAISE_MIN 10 // (mm) Always raise Z by at least this distance // MRiscoC uses Park Z Raise from 0 to avoid backlash issues
#define NOZZLE_PARK_XY_FEEDRATE 125 // (mm/s) X and Y axes feedrate (also used for delta Z axis)
Expand Down Expand Up @@ -2570,7 +2575,7 @@
//#define NOZZLE_CLEAN_HEATUP // Heat up the nozzle instead of skipping wipe

// Explicit wipe G-code script applies to a G12 with no arguments.
#define WIPE_SEQUENCE_COMMANDS "G0 X2 Y200 Z50\nG0 Z0.3\nG0 Z0.3\nG92 E0\nG1 Y140 E10 F1500\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200\nG92 E0"
#define WIPE_SEQUENCE_COMMANDS "G0X2Y200Z50\nG0Z0.3\nG0Z0.3\nG92E0\nG1Y140E10F1500\nG1X2.3F5000\nG92E0\nG1Y10E10F1200\nG92E0"
// PrusaSlicer Start G-code Purge Line
#endif

Expand Down Expand Up @@ -2756,7 +2761,7 @@
//
// Set this option if CLOCKWISE causes values to DECREASE
//
#define REVERSE_ENCODER_DIRECTION //Aquila enable -- Ender disable
#define REVERSE_ENCODER_DIRECTION // Aquila enable -- Ender disable

//
// This option reverses the encoder direction for navigating LCD menus.
Expand Down Expand Up @@ -3171,7 +3176,7 @@
//#define U8GLIB_SH1106_EINSTART

//
// Overlord OLED display/controller with i2c buzzer and LEDs
// Overlord OLED display/controller with I2C buzzer and LEDs
//
//#define OVERLORD_OLED

Expand Down Expand Up @@ -3434,7 +3439,7 @@

//#define TFT_SHARED_IO // I/O is shared between TFT display and other devices. Disable async data transfer.

#define COMPACT_MARLIN_BOOT_LOGO // Use compressed data to save Flash space.
#define COMPACT_MARLIN_BOOT_LOGO // Use compressed data to save Flash space
#endif

#if ENABLED(TFT_LVGL_UI)
Expand Down Expand Up @@ -3470,8 +3475,8 @@
#define PROUI_EX 1 // Extended UI features (15152 bytes of flash)
//#define CV_LASER_MODULE
//#define HAS_GCODE_PREVIEW 1
#define DISABLE_TUNING_GRAPH 0// Temp plot graph - PID/MPC Tuning (1624 bytes of flash)
#define HAS_ESDIAG 1 // View End-stop switch continuity (560 bytes of flash)
#define DISABLE_TUNING_GRAPH 0// PID/MPC Tuning Plot Graph (1624 bytes of flash)
#define HAS_ESDIAG 1 // View End-stop switch continuity (560 bytes of flash)
#define HAS_CGCODE 1 // Extra Gcode options (3320 bytes of flash)
//#define HAS_LOCKSCREEN 1 // Simple lockscreen as to not accidentally change something (568 bytes of flash)
#define USE_GRID_MESHVIEWER 1 // Enable two mesh graph types : one (1560 bytes of flash)
Expand All @@ -3481,10 +3486,8 @@
#if ENABLED(BLTOUCH)
#define HS_MENU_ITEM // BLTOUCH_HS_MODE menu option (56 bytes of flash)
#endif
#if DISABLED(DISABLE_TUNING_GRAPH)
#define PROUI_ITEM_PLOT // Temperature Plot Graph item in Tune/Prepare Menu (688 bytes of flash)
#endif
//#define PROUI_ITEM_PLR // Power-loss Recovery option in Tune Menu (POWER_LOSS_RECOVERY 3400 bytes of flash)
#define PROUI_ITEM_PLOT // Temp Plot Graph item in Tune/Prepare Menu (688 bytes of flash)
//#define PROUI_ITEM_PLR // Power-Loss Recovery option in Tune Menu (POWER_LOSS_RECOVERY 3400 bytes of flash)
//#define PROUI_ITEM_JD // Juntion Deviation item in Tune Menu (only if JD is enabled)
#define PROUI_ITEM_ADVK // Linear Advance item in Tune Menu (only if LA is enabled)
#define SHOW_REAL_POS
Expand Down
Loading

0 comments on commit fd517ff

Please sign in to comment.