Skip to content

Commit f1e7ce1

Browse files
thinkyheadthinkyhead
committed
Merge branch 'import-2.1.x' into pr/1165
2 parents 849326c + 928d735 commit f1e7ce1

405 files changed

Lines changed: 5273 additions & 2 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎config/default/Configuration_adv.h‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4123,22 +4123,27 @@
41234123
#define MAIN_MENU_ITEM_1_DESC "Home & UBL Info"
41244124
#define MAIN_MENU_ITEM_1_GCODE "G28\nG29 W"
41254125
//#define MAIN_MENU_ITEM_1_CONFIRM // Show a confirmation dialog before this action
4126+
//#define MAIN_MENU_ITEM_1_IMMEDIATE // Skip the queue and execute immediately. Rarely needed.
41264127

41274128
#define MAIN_MENU_ITEM_2_DESC "Preheat for " PREHEAT_1_LABEL
41284129
#define MAIN_MENU_ITEM_2_GCODE "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
41294130
//#define MAIN_MENU_ITEM_2_CONFIRM
4131+
//#define MAIN_MENU_ITEM_2_IMMEDIATE
41304132

41314133
//#define MAIN_MENU_ITEM_3_DESC "Preheat for " PREHEAT_2_LABEL
41324134
//#define MAIN_MENU_ITEM_3_GCODE "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
41334135
//#define MAIN_MENU_ITEM_3_CONFIRM
4136+
//#define MAIN_MENU_ITEM_3_IMMEDIATE
41344137

41354138
//#define MAIN_MENU_ITEM_4_DESC "Heat Bed/Home/Level"
41364139
//#define MAIN_MENU_ITEM_4_GCODE "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
41374140
//#define MAIN_MENU_ITEM_4_CONFIRM
4141+
//#define MAIN_MENU_ITEM_4_IMMEDIATE
41384142

41394143
//#define MAIN_MENU_ITEM_5_DESC "Home & Info"
41404144
//#define MAIN_MENU_ITEM_5_GCODE "G28\nM503"
41414145
//#define MAIN_MENU_ITEM_5_CONFIRM
4146+
//#define MAIN_MENU_ITEM_5_IMMEDIATE
41424147
#endif
41434148

41444149
// @section custom config menu
@@ -4155,22 +4160,27 @@
41554160
#define CONFIG_MENU_ITEM_1_DESC "Wifi ON"
41564161
#define CONFIG_MENU_ITEM_1_GCODE "M118 [ESP110] WIFI-STA pwd=12345678"
41574162
//#define CONFIG_MENU_ITEM_1_CONFIRM // Show a confirmation dialog before this action
4163+
//#define CONFIG_MENU_ITEM_1_IMMEDIATE // Skip the queue and execute immediately. Rarely needed.
41584164

41594165
#define CONFIG_MENU_ITEM_2_DESC "Bluetooth ON"
41604166
#define CONFIG_MENU_ITEM_2_GCODE "M118 [ESP110] BT pwd=12345678"
41614167
//#define CONFIG_MENU_ITEM_2_CONFIRM
4168+
//#define CONFIG_MENU_ITEM_2_IMMEDIATE
41624169

41634170
//#define CONFIG_MENU_ITEM_3_DESC "Radio OFF"
41644171
//#define CONFIG_MENU_ITEM_3_GCODE "M118 [ESP110] OFF pwd=12345678"
41654172
//#define CONFIG_MENU_ITEM_3_CONFIRM
4173+
//#define CONFIG_MENU_ITEM_3_IMMEDIATE
41664174

41674175
//#define CONFIG_MENU_ITEM_4_DESC "Wifi ????"
41684176
//#define CONFIG_MENU_ITEM_4_GCODE "M118 ????"
41694177
//#define CONFIG_MENU_ITEM_4_CONFIRM
4178+
//#define CONFIG_MENU_ITEM_4_IMMEDIATE
41704179

41714180
//#define CONFIG_MENU_ITEM_5_DESC "Wifi ????"
41724181
//#define CONFIG_MENU_ITEM_5_GCODE "M118 ????"
41734182
//#define CONFIG_MENU_ITEM_5_CONFIRM
4183+
//#define CONFIG_MENU_ITEM_5_IMMEDIATE
41744184
#endif
41754185

41764186
// @section custom buttons
@@ -4187,6 +4197,7 @@
41874197
#define BUTTON1_WHEN_PRINTING false // Button allowed to trigger during printing?
41884198
#define BUTTON1_GCODE "G28"
41894199
#define BUTTON1_DESC "Homing" // Optional string to set the LCD status
4200+
//#define BUTTON1_IMMEDIATE // Skip the queue and run the G-code immediately. Rarely needed.
41904201
#endif
41914202

41924203
//#define BUTTON2_PIN -1
@@ -4195,6 +4206,7 @@
41954206
#define BUTTON2_WHEN_PRINTING false
41964207
#define BUTTON2_GCODE "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
41974208
#define BUTTON2_DESC "Preheat for " PREHEAT_1_LABEL
4209+
//#define BUTTON2_IMMEDIATE
41984210
#endif
41994211

42004212
//#define BUTTON3_PIN -1
@@ -4203,6 +4215,7 @@
42034215
#define BUTTON3_WHEN_PRINTING false
42044216
#define BUTTON3_GCODE "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
42054217
#define BUTTON3_DESC "Preheat for " PREHEAT_2_LABEL
4218+
//#define BUTTON3_IMMEDIATE
42064219
#endif
42074220
#endif
42084221

‎config/examples/3DFabXYZ/Migbot/Configuration_adv.h‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4144,18 +4144,27 @@
41444144
#define MAIN_MENU_ITEM_1_DESC "Probe Mesh&Save"
41454145
#define MAIN_MENU_ITEM_1_GCODE "G28\nG29 P1\nG29 P3 T0\nG29 S0 A F10\nG29 J2\nM500"
41464146
//#define MAIN_MENU_ITEM_1_CONFIRM // Show a confirmation dialog before this action
4147+
//#define MAIN_MENU_ITEM_1_IMMEDIATE // Skip the queue and execute immediately. Rarely needed.
41474148

41484149
#define MAIN_MENU_ITEM_2_DESC "Manual Mesh&Save"
41494150
#define MAIN_MENU_ITEM_2_GCODE "G28\nG29 P4 R999 T\nG29 S0 A F10\nM500"
41504151
//#define MAIN_MENU_ITEM_2_CONFIRM
4152+
//#define MAIN_MENU_ITEM_2_IMMEDIATE
41514153

41524154
#define MAIN_MENU_ITEM_3_DESC "Print Test Pattern"
41534155
#define MAIN_MENU_ITEM_3_GCODE "G26 C P O2.25" // Do a typical test sequence
41544156
//#define MAIN_MENU_ITEM_3_CONFIRM
4157+
//#define MAIN_MENU_ITEM_3_IMMEDIATE
41554158

41564159
#define MAIN_MENU_ITEM_4_DESC "Move Bed Forward"
41574160
#define MAIN_MENU_ITEM_4_GCODE "G28 X0 Y0\nG1 X0 Y180 F3000\nM84" // move X/Y to min endstops & Feed the bed forward & steppers off
41584161
//#define MAIN_MENU_ITEM_4_CONFIRM
4162+
//#define MAIN_MENU_ITEM_4_IMMEDIATE
4163+
4164+
//#define MAIN_MENU_ITEM_5_DESC "Home & Info"
4165+
//#define MAIN_MENU_ITEM_5_GCODE "G28\nM503"
4166+
//#define MAIN_MENU_ITEM_5_CONFIRM
4167+
//#define MAIN_MENU_ITEM_5_IMMEDIATE
41594168
#endif
41604169

41614170
// @section custom config menu
@@ -4172,22 +4181,27 @@
41724181
#define CONFIG_MENU_ITEM_1_DESC "Wifi ON"
41734182
#define CONFIG_MENU_ITEM_1_GCODE "M118 [ESP110] WIFI-STA pwd=12345678"
41744183
//#define CONFIG_MENU_ITEM_1_CONFIRM // Show a confirmation dialog before this action
4184+
//#define CONFIG_MENU_ITEM_1_IMMEDIATE // Skip the queue and execute immediately. Rarely needed.
41754185

41764186
#define CONFIG_MENU_ITEM_2_DESC "Bluetooth ON"
41774187
#define CONFIG_MENU_ITEM_2_GCODE "M118 [ESP110] BT pwd=12345678"
41784188
//#define CONFIG_MENU_ITEM_2_CONFIRM
4189+
//#define CONFIG_MENU_ITEM_2_IMMEDIATE
41794190

41804191
//#define CONFIG_MENU_ITEM_3_DESC "Radio OFF"
41814192
//#define CONFIG_MENU_ITEM_3_GCODE "M118 [ESP110] OFF pwd=12345678"
41824193
//#define CONFIG_MENU_ITEM_3_CONFIRM
4194+
//#define CONFIG_MENU_ITEM_3_IMMEDIATE
41834195

41844196
//#define CONFIG_MENU_ITEM_4_DESC "Wifi ????"
41854197
//#define CONFIG_MENU_ITEM_4_GCODE "M118 ????"
41864198
//#define CONFIG_MENU_ITEM_4_CONFIRM
4199+
//#define CONFIG_MENU_ITEM_4_IMMEDIATE
41874200

41884201
//#define CONFIG_MENU_ITEM_5_DESC "Wifi ????"
41894202
//#define CONFIG_MENU_ITEM_5_GCODE "M118 ????"
41904203
//#define CONFIG_MENU_ITEM_5_CONFIRM
4204+
//#define CONFIG_MENU_ITEM_5_IMMEDIATE
41914205
#endif
41924206

41934207
// @section custom buttons
@@ -4204,6 +4218,7 @@
42044218
#define BUTTON1_WHEN_PRINTING false // Button allowed to trigger during printing?
42054219
#define BUTTON1_GCODE "G28"
42064220
#define BUTTON1_DESC "Homing" // Optional string to set the LCD status
4221+
//#define BUTTON1_IMMEDIATE // Skip the queue and execute immediately. Rarely needed.
42074222
#endif
42084223

42094224
//#define BUTTON2_PIN -1
@@ -4212,6 +4227,7 @@
42124227
#define BUTTON2_WHEN_PRINTING false
42134228
#define BUTTON2_GCODE "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
42144229
#define BUTTON2_DESC "Preheat for " PREHEAT_1_LABEL
4230+
//#define BUTTON2_IMMEDIATE
42154231
#endif
42164232

42174233
//#define BUTTON3_PIN -1
@@ -4220,6 +4236,7 @@
42204236
#define BUTTON3_WHEN_PRINTING false
42214237
#define BUTTON3_GCODE "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
42224238
#define BUTTON3_DESC "Preheat for " PREHEAT_2_LABEL
4239+
//#define BUTTON3_IMMEDIATE
42234240
#endif
42244241
#endif
42254242

‎config/examples/3DMatik/XL/Configuration_adv.h‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4144,22 +4144,27 @@
41444144
#define MAIN_MENU_ITEM_1_DESC "Home & UBL Info"
41454145
#define MAIN_MENU_ITEM_1_GCODE "G28\nG29 W"
41464146
//#define MAIN_MENU_ITEM_1_CONFIRM // Show a confirmation dialog before this action
4147+
//#define MAIN_MENU_ITEM_1_IMMEDIATE // Skip the queue and execute immediately. Rarely needed.
41474148

41484149
#define MAIN_MENU_ITEM_2_DESC "Preheat for " PREHEAT_1_LABEL
41494150
#define MAIN_MENU_ITEM_2_GCODE "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
41504151
//#define MAIN_MENU_ITEM_2_CONFIRM
4152+
//#define MAIN_MENU_ITEM_2_IMMEDIATE
41514153

41524154
//#define MAIN_MENU_ITEM_3_DESC "Preheat for " PREHEAT_2_LABEL
41534155
//#define MAIN_MENU_ITEM_3_GCODE "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
41544156
//#define MAIN_MENU_ITEM_3_CONFIRM
4157+
//#define MAIN_MENU_ITEM_3_IMMEDIATE
41554158

41564159
//#define MAIN_MENU_ITEM_4_DESC "Heat Bed/Home/Level"
41574160
//#define MAIN_MENU_ITEM_4_GCODE "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
41584161
//#define MAIN_MENU_ITEM_4_CONFIRM
4162+
//#define MAIN_MENU_ITEM_4_IMMEDIATE
41594163

41604164
//#define MAIN_MENU_ITEM_5_DESC "Home & Info"
41614165
//#define MAIN_MENU_ITEM_5_GCODE "G28\nM503"
41624166
//#define MAIN_MENU_ITEM_5_CONFIRM
4167+
//#define MAIN_MENU_ITEM_5_IMMEDIATE
41634168
#endif
41644169

41654170
// @section custom config menu
@@ -4176,22 +4181,27 @@
41764181
#define CONFIG_MENU_ITEM_1_DESC "Wifi ON"
41774182
#define CONFIG_MENU_ITEM_1_GCODE "M118 [ESP110] WIFI-STA pwd=12345678"
41784183
//#define CONFIG_MENU_ITEM_1_CONFIRM // Show a confirmation dialog before this action
4184+
//#define CONFIG_MENU_ITEM_1_IMMEDIATE // Skip the queue and execute immediately. Rarely needed.
41794185

41804186
#define CONFIG_MENU_ITEM_2_DESC "Bluetooth ON"
41814187
#define CONFIG_MENU_ITEM_2_GCODE "M118 [ESP110] BT pwd=12345678"
41824188
//#define CONFIG_MENU_ITEM_2_CONFIRM
4189+
//#define CONFIG_MENU_ITEM_2_IMMEDIATE
41834190

41844191
//#define CONFIG_MENU_ITEM_3_DESC "Radio OFF"
41854192
//#define CONFIG_MENU_ITEM_3_GCODE "M118 [ESP110] OFF pwd=12345678"
41864193
//#define CONFIG_MENU_ITEM_3_CONFIRM
4194+
//#define CONFIG_MENU_ITEM_3_IMMEDIATE
41874195

41884196
//#define CONFIG_MENU_ITEM_4_DESC "Wifi ????"
41894197
//#define CONFIG_MENU_ITEM_4_GCODE "M118 ????"
41904198
//#define CONFIG_MENU_ITEM_4_CONFIRM
4199+
//#define CONFIG_MENU_ITEM_4_IMMEDIATE
41914200

41924201
//#define CONFIG_MENU_ITEM_5_DESC "Wifi ????"
41934202
//#define CONFIG_MENU_ITEM_5_GCODE "M118 ????"
41944203
//#define CONFIG_MENU_ITEM_5_CONFIRM
4204+
//#define CONFIG_MENU_ITEM_5_IMMEDIATE
41954205
#endif
41964206

41974207
// @section custom buttons
@@ -4208,6 +4218,7 @@
42084218
#define BUTTON1_WHEN_PRINTING false // Button allowed to trigger during printing?
42094219
#define BUTTON1_GCODE "G28"
42104220
#define BUTTON1_DESC "Homing" // Optional string to set the LCD status
4221+
//#define BUTTON1_IMMEDIATE // Skip the queue and execute immediately. Rarely needed.
42114222
#endif
42124223

42134224
//#define BUTTON2_PIN -1
@@ -4216,6 +4227,7 @@
42164227
#define BUTTON2_WHEN_PRINTING false
42174228
#define BUTTON2_GCODE "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
42184229
#define BUTTON2_DESC "Preheat for " PREHEAT_1_LABEL
4230+
//#define BUTTON2_IMMEDIATE
42194231
#endif
42204232

42214233
//#define BUTTON3_PIN -1
@@ -4224,6 +4236,7 @@
42244236
#define BUTTON3_WHEN_PRINTING false
42254237
#define BUTTON3_GCODE "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
42264238
#define BUTTON3_DESC "Preheat for " PREHEAT_2_LABEL
4239+
//#define BUTTON3_IMMEDIATE
42274240
#endif
42284241
#endif
42294242

‎config/examples/ADIMLab/Gantry v1/Configuration_adv.h‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4144,22 +4144,27 @@
41444144
#define MAIN_MENU_ITEM_1_DESC "Home & UBL Info"
41454145
#define MAIN_MENU_ITEM_1_GCODE "G28\nG29 W"
41464146
//#define MAIN_MENU_ITEM_1_CONFIRM // Show a confirmation dialog before this action
4147+
//#define MAIN_MENU_ITEM_1_IMMEDIATE // Skip the queue and execute immediately. Rarely needed.
41474148

41484149
#define MAIN_MENU_ITEM_2_DESC "Preheat for " PREHEAT_1_LABEL
41494150
#define MAIN_MENU_ITEM_2_GCODE "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
41504151
//#define MAIN_MENU_ITEM_2_CONFIRM
4152+
//#define MAIN_MENU_ITEM_2_IMMEDIATE
41514153

41524154
//#define MAIN_MENU_ITEM_3_DESC "Preheat for " PREHEAT_2_LABEL
41534155
//#define MAIN_MENU_ITEM_3_GCODE "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
41544156
//#define MAIN_MENU_ITEM_3_CONFIRM
4157+
//#define MAIN_MENU_ITEM_3_IMMEDIATE
41554158

41564159
//#define MAIN_MENU_ITEM_4_DESC "Heat Bed/Home/Level"
41574160
//#define MAIN_MENU_ITEM_4_GCODE "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
41584161
//#define MAIN_MENU_ITEM_4_CONFIRM
4162+
//#define MAIN_MENU_ITEM_4_IMMEDIATE
41594163

41604164
//#define MAIN_MENU_ITEM_5_DESC "Home & Info"
41614165
//#define MAIN_MENU_ITEM_5_GCODE "G28\nM503"
41624166
//#define MAIN_MENU_ITEM_5_CONFIRM
4167+
//#define MAIN_MENU_ITEM_5_IMMEDIATE
41634168
#endif
41644169

41654170
// @section custom config menu
@@ -4176,22 +4181,27 @@
41764181
#define CONFIG_MENU_ITEM_1_DESC "Wifi ON"
41774182
#define CONFIG_MENU_ITEM_1_GCODE "M118 [ESP110] WIFI-STA pwd=12345678"
41784183
//#define CONFIG_MENU_ITEM_1_CONFIRM // Show a confirmation dialog before this action
4184+
//#define CONFIG_MENU_ITEM_1_IMMEDIATE // Skip the queue and execute immediately. Rarely needed.
41794185

41804186
#define CONFIG_MENU_ITEM_2_DESC "Bluetooth ON"
41814187
#define CONFIG_MENU_ITEM_2_GCODE "M118 [ESP110] BT pwd=12345678"
41824188
//#define CONFIG_MENU_ITEM_2_CONFIRM
4189+
//#define CONFIG_MENU_ITEM_2_IMMEDIATE
41834190

41844191
//#define CONFIG_MENU_ITEM_3_DESC "Radio OFF"
41854192
//#define CONFIG_MENU_ITEM_3_GCODE "M118 [ESP110] OFF pwd=12345678"
41864193
//#define CONFIG_MENU_ITEM_3_CONFIRM
4194+
//#define CONFIG_MENU_ITEM_3_IMMEDIATE
41874195

41884196
//#define CONFIG_MENU_ITEM_4_DESC "Wifi ????"
41894197
//#define CONFIG_MENU_ITEM_4_GCODE "M118 ????"
41904198
//#define CONFIG_MENU_ITEM_4_CONFIRM
4199+
//#define CONFIG_MENU_ITEM_4_IMMEDIATE
41914200

41924201
//#define CONFIG_MENU_ITEM_5_DESC "Wifi ????"
41934202
//#define CONFIG_MENU_ITEM_5_GCODE "M118 ????"
41944203
//#define CONFIG_MENU_ITEM_5_CONFIRM
4204+
//#define CONFIG_MENU_ITEM_5_IMMEDIATE
41954205
#endif
41964206

41974207
// @section custom buttons
@@ -4208,6 +4218,7 @@
42084218
#define BUTTON1_WHEN_PRINTING false // Button allowed to trigger during printing?
42094219
#define BUTTON1_GCODE "G28"
42104220
#define BUTTON1_DESC "Homing" // Optional string to set the LCD status
4221+
//#define BUTTON1_IMMEDIATE // Skip the queue and execute immediately. Rarely needed.
42114222
#endif
42124223

42134224
//#define BUTTON2_PIN -1
@@ -4216,6 +4227,7 @@
42164227
#define BUTTON2_WHEN_PRINTING false
42174228
#define BUTTON2_GCODE "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
42184229
#define BUTTON2_DESC "Preheat for " PREHEAT_1_LABEL
4230+
//#define BUTTON2_IMMEDIATE
42194231
#endif
42204232

42214233
//#define BUTTON3_PIN -1
@@ -4224,6 +4236,7 @@
42244236
#define BUTTON3_WHEN_PRINTING false
42254237
#define BUTTON3_GCODE "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
42264238
#define BUTTON3_DESC "Preheat for " PREHEAT_2_LABEL
4239+
//#define BUTTON3_IMMEDIATE
42274240
#endif
42284241
#endif
42294242

‎config/examples/ADIMLab/Gantry v2/Configuration_adv.h‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4144,22 +4144,27 @@
41444144
#define MAIN_MENU_ITEM_1_DESC "Home & UBL Info"
41454145
#define MAIN_MENU_ITEM_1_GCODE "G28\nG29 W"
41464146
//#define MAIN_MENU_ITEM_1_CONFIRM // Show a confirmation dialog before this action
4147+
//#define MAIN_MENU_ITEM_1_IMMEDIATE // Skip the queue and execute immediately. Rarely needed.
41474148

41484149
#define MAIN_MENU_ITEM_2_DESC "Preheat for " PREHEAT_1_LABEL
41494150
#define MAIN_MENU_ITEM_2_GCODE "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
41504151
//#define MAIN_MENU_ITEM_2_CONFIRM
4152+
//#define MAIN_MENU_ITEM_2_IMMEDIATE
41514153

41524154
//#define MAIN_MENU_ITEM_3_DESC "Preheat for " PREHEAT_2_LABEL
41534155
//#define MAIN_MENU_ITEM_3_GCODE "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
41544156
//#define MAIN_MENU_ITEM_3_CONFIRM
4157+
//#define MAIN_MENU_ITEM_3_IMMEDIATE
41554158

41564159
//#define MAIN_MENU_ITEM_4_DESC "Heat Bed/Home/Level"
41574160
//#define MAIN_MENU_ITEM_4_GCODE "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
41584161
//#define MAIN_MENU_ITEM_4_CONFIRM
4162+
//#define MAIN_MENU_ITEM_4_IMMEDIATE
41594163

41604164
//#define MAIN_MENU_ITEM_5_DESC "Home & Info"
41614165
//#define MAIN_MENU_ITEM_5_GCODE "G28\nM503"
41624166
//#define MAIN_MENU_ITEM_5_CONFIRM
4167+
//#define MAIN_MENU_ITEM_5_IMMEDIATE
41634168
#endif
41644169

41654170
// @section custom config menu
@@ -4176,22 +4181,27 @@
41764181
#define CONFIG_MENU_ITEM_1_DESC "Wifi ON"
41774182
#define CONFIG_MENU_ITEM_1_GCODE "M118 [ESP110] WIFI-STA pwd=12345678"
41784183
//#define CONFIG_MENU_ITEM_1_CONFIRM // Show a confirmation dialog before this action
4184+
//#define CONFIG_MENU_ITEM_1_IMMEDIATE // Skip the queue and execute immediately. Rarely needed.
41794185

41804186
#define CONFIG_MENU_ITEM_2_DESC "Bluetooth ON"
41814187
#define CONFIG_MENU_ITEM_2_GCODE "M118 [ESP110] BT pwd=12345678"
41824188
//#define CONFIG_MENU_ITEM_2_CONFIRM
4189+
//#define CONFIG_MENU_ITEM_2_IMMEDIATE
41834190

41844191
//#define CONFIG_MENU_ITEM_3_DESC "Radio OFF"
41854192
//#define CONFIG_MENU_ITEM_3_GCODE "M118 [ESP110] OFF pwd=12345678"
41864193
//#define CONFIG_MENU_ITEM_3_CONFIRM
4194+
//#define CONFIG_MENU_ITEM_3_IMMEDIATE
41874195

41884196
//#define CONFIG_MENU_ITEM_4_DESC "Wifi ????"
41894197
//#define CONFIG_MENU_ITEM_4_GCODE "M118 ????"
41904198
//#define CONFIG_MENU_ITEM_4_CONFIRM
4199+
//#define CONFIG_MENU_ITEM_4_IMMEDIATE
41914200

41924201
//#define CONFIG_MENU_ITEM_5_DESC "Wifi ????"
41934202
//#define CONFIG_MENU_ITEM_5_GCODE "M118 ????"
41944203
//#define CONFIG_MENU_ITEM_5_CONFIRM
4204+
//#define CONFIG_MENU_ITEM_5_IMMEDIATE
41954205
#endif
41964206

41974207
// @section custom buttons
@@ -4208,6 +4218,7 @@
42084218
#define BUTTON1_WHEN_PRINTING false // Button allowed to trigger during printing?
42094219
#define BUTTON1_GCODE "G28"
42104220
#define BUTTON1_DESC "Homing" // Optional string to set the LCD status
4221+
//#define BUTTON1_IMMEDIATE // Skip the queue and execute immediately. Rarely needed.
42114222
#endif
42124223

42134224
//#define BUTTON2_PIN -1
@@ -4216,6 +4227,7 @@
42164227
#define BUTTON2_WHEN_PRINTING false
42174228
#define BUTTON2_GCODE "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
42184229
#define BUTTON2_DESC "Preheat for " PREHEAT_1_LABEL
4230+
//#define BUTTON2_IMMEDIATE
42194231
#endif
42204232

42214233
//#define BUTTON3_PIN -1
@@ -4224,6 +4236,7 @@
42244236
#define BUTTON3_WHEN_PRINTING false
42254237
#define BUTTON3_GCODE "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
42264238
#define BUTTON3_DESC "Preheat for " PREHEAT_2_LABEL
4239+
//#define BUTTON3_IMMEDIATE
42274240
#endif
42284241
#endif
42294242

0 commit comments

Comments
 (0)