Config sections, multi-field values, toggles, etc
- Auto-detect “switchable” items where possible - Handle switchable multi-value fields - Add standard sections to config form - Add section markers to configurations - Add value options to configurations - Remove and re-add fields for loaded configs - Preserve sections across configs - Preserve non-added fields - Style added fields wider & newline by default
This commit is contained in:
		| @@ -1,6 +1,8 @@ | ||||
| #ifndef CONFIGURATION_ADV_H | ||||
| #define CONFIGURATION_ADV_H | ||||
|  | ||||
| // @section temperature | ||||
|  | ||||
| //=========================================================================== | ||||
| //=============================Thermal Settings  ============================ | ||||
| //=========================================================================== | ||||
| @@ -44,6 +46,8 @@ | ||||
| //The M105 command return, besides traditional information, the ADC value read from temperature sensors. | ||||
| //#define SHOW_TEMP_ADC_VALUES | ||||
|  | ||||
| // @section extruder | ||||
|  | ||||
| //  extruder run-out prevention. | ||||
| //if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded | ||||
| //#define EXTRUDER_RUNOUT_PREVENT | ||||
| @@ -53,6 +57,8 @@ | ||||
| #define EXTRUDER_RUNOUT_SPEED 1500.  //extrusion speed | ||||
| #define EXTRUDER_RUNOUT_EXTRUDE 100 | ||||
|  | ||||
| // @section temperature | ||||
|  | ||||
| //These defines help to calibrate the AD595 sensor in case you get wrong temperature measurements. | ||||
| //The measured temperature is defined as "actualTemp = (measuredTemp * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET" | ||||
| #define TEMP_SENSOR_AD595_OFFSET 0.0 | ||||
| @@ -70,6 +76,8 @@ | ||||
| // before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu) | ||||
| //#define FAN_KICKSTART_TIME 100 | ||||
|  | ||||
| // @section extruder | ||||
|  | ||||
| // Extruder cooling fans | ||||
| // Configure fan pin outputs to automatically turn on/off when the associated | ||||
| // extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE. | ||||
| @@ -87,6 +95,8 @@ | ||||
| //=============================Mechanical Settings=========================== | ||||
| //=========================================================================== | ||||
|  | ||||
| // @section machine | ||||
|  | ||||
| #define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing | ||||
|  | ||||
|  | ||||
| @@ -210,12 +220,16 @@ | ||||
|  | ||||
| #endif //DUAL_X_CARRIAGE | ||||
|  | ||||
| // @section homing | ||||
|  | ||||
| //homing hits the endstop, then retracts by this distance, before it tries to slowly bump again: | ||||
| #define X_HOME_RETRACT_MM 5 | ||||
| #define Y_HOME_RETRACT_MM 5 | ||||
| #define Z_HOME_RETRACT_MM 2 | ||||
| //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially. | ||||
|  | ||||
| // @section machine | ||||
|  | ||||
| #define AXIS_RELATIVE_MODES {false, false, false, false} | ||||
| #ifdef CONFIG_STEPPERS_TOSHIBA | ||||
| #define MAX_STEP_FREQUENCY 10000 // Max step frequency for Toshiba Stepper Controllers | ||||
| @@ -228,12 +242,14 @@ | ||||
| #define INVERT_Z_STEP_PIN false | ||||
| #define INVERT_E_STEP_PIN false | ||||
|  | ||||
| //default stepper release if idle | ||||
| //default stepper release if idle. Set to 0 to deactivate. | ||||
| #define DEFAULT_STEPPER_DEACTIVE_TIME 60 | ||||
|  | ||||
| #define DEFAULT_MINIMUMFEEDRATE       0.0     // minimum feedrate | ||||
| #define DEFAULT_MINTRAVELFEEDRATE     0.0 | ||||
|  | ||||
| // @section lcd | ||||
|  | ||||
| // Feedrates for manual moves along X, Y, Z, E from panel | ||||
| #ifdef ULTIPANEL | ||||
| #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60}  // set the speeds for manual moves (mm/min) | ||||
| @@ -244,6 +260,8 @@ | ||||
|     #define ULTIPANEL_FEEDMULTIPLY | ||||
| #endif | ||||
|  | ||||
| // @section extras | ||||
|  | ||||
| // minimum time in microseconds that a movement needs to take if the buffer is emptied. | ||||
| #define DEFAULT_MINSEGMENTTIME        20000 | ||||
|  | ||||
| @@ -287,6 +305,8 @@ | ||||
| //#define CHDK 4        //Pin for triggering CHDK to take a picture see how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/ | ||||
| #define CHDK_DELAY 50 //How long in ms the pin should stay HIGH before going LOW again | ||||
|  | ||||
| // @section lcd | ||||
|  | ||||
| #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers? | ||||
| #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place. | ||||
|  | ||||
| @@ -315,6 +335,8 @@ | ||||
|   #endif | ||||
| #endif | ||||
|  | ||||
| // @section more | ||||
|  | ||||
| // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation. | ||||
| //#define USE_WATCHDOG | ||||
|  | ||||
| @@ -373,12 +395,16 @@ | ||||
|  | ||||
| const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement | ||||
|  | ||||
| // @section lcd | ||||
|  | ||||
| // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted | ||||
| // You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT | ||||
| // in the pins.h file.  When using a push button pulling the pin to ground this will need inverted.  This setting should | ||||
| // be commented out otherwise | ||||
| #define SDCARDDETECTINVERTED | ||||
|  | ||||
| // @section hidden | ||||
|  | ||||
| #ifdef ULTIPANEL | ||||
|  #undef SDCARDDETECTINVERTED | ||||
| #endif | ||||
| @@ -399,6 +425,8 @@ const unsigned int dropsegments=5; //everything with less than this number of st | ||||
|   #define PS_ON_ASLEEP LOW | ||||
| #endif | ||||
|  | ||||
| // @section temperature | ||||
|  | ||||
| // Control heater 0 and heater 1 in parallel. | ||||
| //#define HEATERS_PARALLEL | ||||
|  | ||||
| @@ -406,6 +434,8 @@ const unsigned int dropsegments=5; //everything with less than this number of st | ||||
| //=============================Buffers           ============================ | ||||
| //=========================================================================== | ||||
|  | ||||
| // @section hidden | ||||
|  | ||||
| // The number of linear motions that can be in the plan at any give time. | ||||
| // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering. | ||||
| #if defined SDSUPPORT | ||||
| @@ -414,11 +444,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st | ||||
|   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer | ||||
| #endif | ||||
|  | ||||
| // @section more | ||||
|  | ||||
| //The ASCII buffer for receiving from the serial: | ||||
| #define MAX_CMD_SIZE 96 | ||||
| #define BUFSIZE 4 | ||||
|  | ||||
| // @section extras | ||||
|  | ||||
| // Firmware based and LCD controlled retract | ||||
| // M207 and M208 can be used to define parameters for the retraction. | ||||
| @@ -460,6 +492,8 @@ const unsigned int dropsegments=5; //everything with less than this number of st | ||||
| //=============================  Define Defines  ============================ | ||||
| //=========================================================================== | ||||
|  | ||||
| // @section hidden | ||||
|  | ||||
| #if defined (ENABLE_AUTO_BED_LEVELING) && defined (DELTA) | ||||
|   #error "Bed Auto Leveling is still not compatible with Delta Kinematics." | ||||
| #endif | ||||
|   | ||||
		Reference in New Issue
	
	Block a user