Przeglądaj źródła

Bring config up-to-date

Richard Wackerbarth 9 lat temu
rodzic
commit
7bb7a52940

+ 4
- 1
Marlin/configurator/config/boards.h Wyświetl plik

@@ -16,6 +16,7 @@
16 16
 #define BOARD_RAMPS_13_EEF      36   // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Fan)
17 17
 #define BOARD_RAMPS_13_SF       38   // RAMPS 1.3 / 1.4 (Power outputs: Spindle, Controller Fan)
18 18
 #define BOARD_FELIX2            37   // Felix 2.0+ Electronics Board (RAMPS like)
19
+#define BOARD_RIGIDBOARD        42   // Invent-A-Part RigidBoard
19 20
 #define BOARD_GEN6              5    // Gen6
20 21
 #define BOARD_GEN6_DELUXE       51   // Gen6 deluxe
21 22
 #define BOARD_SANGUINOLOLU_11   6    // Sanguinololu < 1.2
@@ -42,11 +43,13 @@
42 43
 #define BOARD_GEN3_MONOLITHIC   22   // Gen3 Monolithic Electronics
43 44
 #define BOARD_MEGATRONICS       70   // Megatronics
44 45
 #define BOARD_MEGATRONICS_2     701  // Megatronics v2.0
45
-#define BOARD_MEGATRONICS_1     702  // Minitronics v1.0
46
+#define BOARD_MINITRONICS       702  // Minitronics v1.0/1.1
46 47
 #define BOARD_MEGATRONICS_3     703  // Megatronics v3.0
47 48
 #define BOARD_OMCA_A            90   // Alpha OMCA board
48 49
 #define BOARD_OMCA              91   // Final OMCA board
49 50
 #define BOARD_RAMBO             301  // Rambo
51
+#define BOARD_MINIRAMBO         302  // Mini-Rambo
52
+#define BOARD_MEGACONTROLLER    310  // Mega controller
50 53
 #define BOARD_ELEFU_3           21   // Elefu Ra Board (v3)
51 54
 #define BOARD_5DPRINT           88   // 5DPrint D8 Driver Board
52 55
 #define BOARD_LEAPFROG          999  // Leapfrog

+ 9
- 5
Marlin/configurator/config/language.h Wyświetl plik

@@ -20,6 +20,7 @@
20 20
 // de       German
21 21
 // es       Spanish
22 22
 // ru       Russian
23
+// bg       Bulgarian
23 24
 // it       Italian
24 25
 // pt       Portuguese
25 26
 // pt-br    Portuguese (Brazil)
@@ -45,7 +46,7 @@
45 46
 
46 47
 #if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2)
47 48
   #define MACHINE_NAME "Ultimaker"
48
-  #define SOURCE_CODE_URL "http://firmware.ultimaker.com"
49
+  #define SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"
49 50
 #elif MB(RUMBA)
50 51
   #define MACHINE_NAME "Rumba"
51 52
 #elif MB(3DRAG)
@@ -122,10 +123,6 @@
122 123
 #define MSG_INVALID_EXTRUDER                "Invalid extruder"
123 124
 #define MSG_INVALID_SOLENOID                "Invalid solenoid"
124 125
 #define MSG_ERR_NO_THERMISTORS              "No thermistors - no temperature"
125
-#define MSG_HEATING                         "Heating..."
126
-#define MSG_HEATING_COMPLETE                "Heating done."
127
-#define MSG_BED_HEATING                     "Bed Heating."
128
-#define MSG_BED_DONE                        "Bed done."
129 126
 #define MSG_M115_REPORT                     "FIRMWARE_NAME:Marlin " BUILD_VERSION " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
130 127
 #define MSG_COUNT_X                         " Count X: "
131 128
 #define MSG_ERR_KILLED                      "Printer halted. kill() called!"
@@ -195,6 +192,8 @@
195 192
 #define MSG_KP                              " Kp: "
196 193
 #define MSG_KI                              " Ki: "
197 194
 #define MSG_KD                              " Kd: "
195
+#define MSG_B                               "B:"
196
+#define MSG_T                               "T:"
198 197
 #define MSG_AT                              " @:"
199 198
 #define MSG_PID_AUTOTUNE_FINISHED           MSG_PID_AUTOTUNE " finished! Put the last Kp, Ki and Kd constants from below into Configuration.h"
200 199
 #define MSG_PID_DEBUG                       " PID_DEBUG "
@@ -213,6 +212,11 @@
213 212
 #define MSG_T_MAXTEMP                       "MAXTEMP triggered"
214 213
 #define MSG_T_MINTEMP                       "MINTEMP triggered"
215 214
 
215
+// Debug
216
+#define MSG_DEBUG_ECHO                      "DEBUG ECHO ENABLED"
217
+#define MSG_DEBUG_INFO                      "DEBUG INFO ENABLED"
218
+#define MSG_DEBUG_ERRORS                    "DEBUG ERRORS ENABLED"
219
+#define MSG_DEBUG_DRYRUN                    "DEBUG DRYRUN ENABLED"
216 220
 
217 221
 // LCD Menu Messages
218 222
 

Ładowanie…
Anuluj
Zapisz