From 7bb7a52940f1303d6462a221294a151a97821dbf Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth <rkw@dataplex.net> Date: Mon, 3 Aug 2015 07:35:33 -0500 Subject: [PATCH] Bring config up-to-date --- Marlin/configurator/config/boards.h | 5 ++++- Marlin/configurator/config/language.h | 14 +++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Marlin/configurator/config/boards.h b/Marlin/configurator/config/boards.h index 5e782125db..f6bbc9d673 100644 --- a/Marlin/configurator/config/boards.h +++ b/Marlin/configurator/config/boards.h @@ -16,6 +16,7 @@ #define BOARD_RAMPS_13_EEF 36 // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Fan) #define BOARD_RAMPS_13_SF 38 // RAMPS 1.3 / 1.4 (Power outputs: Spindle, Controller Fan) #define BOARD_FELIX2 37 // Felix 2.0+ Electronics Board (RAMPS like) +#define BOARD_RIGIDBOARD 42 // Invent-A-Part RigidBoard #define BOARD_GEN6 5 // Gen6 #define BOARD_GEN6_DELUXE 51 // Gen6 deluxe #define BOARD_SANGUINOLOLU_11 6 // Sanguinololu < 1.2 @@ -42,11 +43,13 @@ #define BOARD_GEN3_MONOLITHIC 22 // Gen3 Monolithic Electronics #define BOARD_MEGATRONICS 70 // Megatronics #define BOARD_MEGATRONICS_2 701 // Megatronics v2.0 -#define BOARD_MEGATRONICS_1 702 // Minitronics v1.0 +#define BOARD_MINITRONICS 702 // Minitronics v1.0/1.1 #define BOARD_MEGATRONICS_3 703 // Megatronics v3.0 #define BOARD_OMCA_A 90 // Alpha OMCA board #define BOARD_OMCA 91 // Final OMCA board #define BOARD_RAMBO 301 // Rambo +#define BOARD_MINIRAMBO 302 // Mini-Rambo +#define BOARD_MEGACONTROLLER 310 // Mega controller #define BOARD_ELEFU_3 21 // Elefu Ra Board (v3) #define BOARD_5DPRINT 88 // 5DPrint D8 Driver Board #define BOARD_LEAPFROG 999 // Leapfrog diff --git a/Marlin/configurator/config/language.h b/Marlin/configurator/config/language.h index a13b69e3df..10f012775a 100644 --- a/Marlin/configurator/config/language.h +++ b/Marlin/configurator/config/language.h @@ -20,6 +20,7 @@ // de German // es Spanish // ru Russian +// bg Bulgarian // it Italian // pt Portuguese // pt-br Portuguese (Brazil) @@ -45,7 +46,7 @@ #if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2) #define MACHINE_NAME "Ultimaker" - #define SOURCE_CODE_URL "http://firmware.ultimaker.com" + #define SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin" #elif MB(RUMBA) #define MACHINE_NAME "Rumba" #elif MB(3DRAG) @@ -122,10 +123,6 @@ #define MSG_INVALID_EXTRUDER "Invalid extruder" #define MSG_INVALID_SOLENOID "Invalid solenoid" #define MSG_ERR_NO_THERMISTORS "No thermistors - no temperature" -#define MSG_HEATING "Heating..." -#define MSG_HEATING_COMPLETE "Heating done." -#define MSG_BED_HEATING "Bed Heating." -#define MSG_BED_DONE "Bed done." #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" #define MSG_COUNT_X " Count X: " #define MSG_ERR_KILLED "Printer halted. kill() called!" @@ -195,6 +192,8 @@ #define MSG_KP " Kp: " #define MSG_KI " Ki: " #define MSG_KD " Kd: " +#define MSG_B "B:" +#define MSG_T "T:" #define MSG_AT " @:" #define MSG_PID_AUTOTUNE_FINISHED MSG_PID_AUTOTUNE " finished! Put the last Kp, Ki and Kd constants from below into Configuration.h" #define MSG_PID_DEBUG " PID_DEBUG " @@ -213,6 +212,11 @@ #define MSG_T_MAXTEMP "MAXTEMP triggered" #define MSG_T_MINTEMP "MINTEMP triggered" +// Debug +#define MSG_DEBUG_ECHO "DEBUG ECHO ENABLED" +#define MSG_DEBUG_INFO "DEBUG INFO ENABLED" +#define MSG_DEBUG_ERRORS "DEBUG ERRORS ENABLED" +#define MSG_DEBUG_DRYRUN "DEBUG DRYRUN ENABLED" // LCD Menu Messages -- GitLab