josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Activated/new functions 

filament runout sensor activated
heated bed PID tuning added and changed cycles from 5 to 8
Minor translation changes
This commit is contained in:
3d-gussner 2017-08-01 15:54:17 +02:00
parent 1cc5f5972b
commit 8c690b68c1
13 changed files with 71 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/Configuration.h
View File

@ -70,7 +70,7 @@
//#define STRING_VERSION "1.0.2" //#define STRING_VERSION "1.0.2"
#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time
#define STRING_CONFIG_H_AUTHOR "3D-gussner, Test" // Who made the changes. #define STRING_CONFIG_H_AUTHOR "3d-gussner,0801v1" // Who made the changes.
// SERIAL_PORT selects which serial port should be used for communication with the host. // SERIAL_PORT selects which serial port should be used for communication with the host.
// This allows the connection of wireless adapters (for instance) to non-default port pins. // This allows the connection of wireless adapters (for instance) to non-default port pins.
@ -682,7 +682,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
* Note may require analog pins to be defined for different motherboards * Note may require analog pins to be defined for different motherboards
**********************************************************************/ **********************************************************************/
// Uncomment below to enable // Uncomment below to enable
//#define FILAMENT_SENSOR #define FILAMENT_SENSOR
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2) #define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel #define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel

5
Firmware/ConfigurationStore.cpp
View File

@ -358,9 +358,8 @@ bool Config_RetrieveSettings()
calculate_volumetric_multipliers(); calculate_volumetric_multipliers();
// Call updatePID (similar to when we have processed M301) // Call updatePID (similar to when we have processed M301)
updatePID(); updatePID();
float tmp1[] = DEFAULT_AXIS_STEPS_PER_UNIT;
axis_steps_per_unit[3] = tmp1[3]; SERIAL_ECHO_START;
SERIAL_ECHO_START;
SERIAL_ECHOLNPGM("Stored settings retrieved"); SERIAL_ECHOLNPGM("Stored settings retrieved");
} }
else else

1
Firmware/Configuration_prusa.h
View File

@ -179,6 +179,7 @@ ADDITIONAL FEATURES SETTINGS
// Define Prusa filament runout sensor // Define Prusa filament runout sensor
#define FILAMENT_RUNOUT_SUPPORT #define FILAMENT_RUNOUT_SUPPORT
const bool FR_SENS_INVERTING = true; // set to true to invert the logic of the filament runout.
#ifdef FILAMENT_RUNOUT_SUPPORT #ifdef FILAMENT_RUNOUT_SUPPORT
#define FILAMENT_RUNOUT_SENSOR 1 #define FILAMENT_RUNOUT_SENSOR 1

10
Firmware/Marlin_main.cpp
View File

@ -1036,6 +1036,7 @@ void setup()
SERIAL_ECHOLNPGM(STRING_CONFIG_H_AUTHOR); SERIAL_ECHOLNPGM(STRING_CONFIG_H_AUTHOR);
SERIAL_ECHOPGM("Compiled: "); SERIAL_ECHOPGM("Compiled: ");
SERIAL_ECHOLNPGM(__DATE__); SERIAL_ECHOLNPGM(__DATE__);
SERIAL_ECHOLNPGM(__TIME__);
#endif #endif
#endif #endif
@ -4489,6 +4490,15 @@ Sigma_Exit:
SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN);
} }
SERIAL_PROTOCOLLN(""); SERIAL_PROTOCOLLN("");
#endif
#if defined(FR_SENS) && FR_SENS > -1
SERIAL_PROTOCOLRPGM(MSG_Y_MAX);
if(READ(FR_SENS)^FR_SENS_INVERTING){
SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT);
}else{
SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN);
}
SERIAL_PROTOCOLLN("");
#endif #endif
break; break;
//TODO: update for all axis, use for loop //TODO: update for all axis, use for loop

28
Firmware/language_all.cpp
View File

@ -856,7 +856,7 @@ const char MSG_DATE_CZ[] PROGMEM = "Datum:";
const char MSG_DATE_IT[] PROGMEM = "Data"; const char MSG_DATE_IT[] PROGMEM = "Data";
const char MSG_DATE_ES[] PROGMEM = "Fecha:"; const char MSG_DATE_ES[] PROGMEM = "Fecha:";
const char MSG_DATE_PL[] PROGMEM = "Data:"; const char MSG_DATE_PL[] PROGMEM = "Data:";
const char MSG_DATE_DE[] PROGMEM = "Datum"; const char MSG_DATE_DE[] PROGMEM = "Datum:";
const char MSG_DATE_NL[] PROGMEM = "Datum:"; const char MSG_DATE_NL[] PROGMEM = "Datum:";
const char * const MSG_DATE_LANG_TABLE[LANG_NUM] PROGMEM = { const char * const MSG_DATE_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_DATE_EN, MSG_DATE_EN,
@ -869,8 +869,16 @@ const char * const MSG_DATE_LANG_TABLE[LANG_NUM] PROGMEM = {
}; };
const char MSG_DEFAULT_SETTINGS_LOADED_EN[] PROGMEM = "Default settings loaded"; const char MSG_DEFAULT_SETTINGS_LOADED_EN[] PROGMEM = "Default settings loaded";
const char * const MSG_DEFAULT_SETTINGS_LOADED_LANG_TABLE[1] PROGMEM = { const char MSG_DEFAULT_SETTINGS_LOADED_DE[] PROGMEM = "Standardeinstellungen geladen";
MSG_DEFAULT_SETTINGS_LOADED_EN const char MSG_DEFAULT_SETTINGS_LOADED_NL[] PROGMEM = "Standaard instellingen geladen";
const char * const MSG_DEFAULT_SETTINGS_LOADED_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_DEFAULT_SETTINGS_LOADED_EN,
MSG_DEFAULT_SETTINGS_LOADED_EN,
MSG_DEFAULT_SETTINGS_LOADED_EN,
MSG_DEFAULT_SETTINGS_LOADED_EN,
MSG_DEFAULT_SETTINGS_LOADED_EN,
MSG_DEFAULT_SETTINGS_LOADED_DE,
MSG_DEFAULT_SETTINGS_LOADED_NL
}; };
const char MSG_DISABLE_STEPPERS_EN[] PROGMEM = "Disable steppers"; const char MSG_DISABLE_STEPPERS_EN[] PROGMEM = "Disable steppers";
@ -1818,7 +1826,7 @@ const char MSG_MEASURED_SKEW_CZ[] PROGMEM = "Merene zkoseni:";
const char MSG_MEASURED_SKEW_IT[] PROGMEM = "Incl. misurata:"; const char MSG_MEASURED_SKEW_IT[] PROGMEM = "Incl. misurata:";
const char MSG_MEASURED_SKEW_ES[] PROGMEM = "Inclin. medida:"; const char MSG_MEASURED_SKEW_ES[] PROGMEM = "Inclin. medida:";
const char MSG_MEASURED_SKEW_PL[] PROGMEM = "Zmier. sciecie:"; const char MSG_MEASURED_SKEW_PL[] PROGMEM = "Zmier. sciecie:";
const char MSG_MEASURED_SKEW_DE[] PROGMEM = "Schraeglauf:"; const char MSG_MEASURED_SKEW_DE[] PROGMEM = "Symmetrie:";
const char MSG_MEASURED_SKEW_NL[] PROGMEM = "Symmetrie:"; const char MSG_MEASURED_SKEW_NL[] PROGMEM = "Symmetrie:";
const char * const MSG_MEASURED_SKEW_LANG_TABLE[LANG_NUM] PROGMEM = { const char * const MSG_MEASURED_SKEW_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_MEASURED_SKEW_EN, MSG_MEASURED_SKEW_EN,
@ -2699,7 +2707,7 @@ const char MSG_SD_INSERTED_CZ[] PROGMEM = "Karta vlozena";
const char MSG_SD_INSERTED_IT[] PROGMEM = "SD inserita"; const char MSG_SD_INSERTED_IT[] PROGMEM = "SD inserita";
const char MSG_SD_INSERTED_ES[] PROGMEM = "Tarjeta insertada"; const char MSG_SD_INSERTED_ES[] PROGMEM = "Tarjeta insertada";
const char MSG_SD_INSERTED_PL[] PROGMEM = "Karta wlozona"; const char MSG_SD_INSERTED_PL[] PROGMEM = "Karta wlozona";
const char MSG_SD_INSERTED_DE[] PROGMEM = "SD Karte eingesetzt"; const char MSG_SD_INSERTED_DE[] PROGMEM = "SD eingesetzt";
const char MSG_SD_INSERTED_NL[] PROGMEM = "SD ingestoken"; const char MSG_SD_INSERTED_NL[] PROGMEM = "SD ingestoken";
const char * const MSG_SD_INSERTED_LANG_TABLE[LANG_NUM] PROGMEM = { const char * const MSG_SD_INSERTED_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_SD_INSERTED_EN, MSG_SD_INSERTED_EN,
@ -2736,7 +2744,7 @@ const char MSG_SD_REMOVED_CZ[] PROGMEM = "Karta vyjmuta";
const char MSG_SD_REMOVED_IT[] PROGMEM = "SD rimossa"; const char MSG_SD_REMOVED_IT[] PROGMEM = "SD rimossa";
const char MSG_SD_REMOVED_ES[] PROGMEM = "Tarjeta retirada"; const char MSG_SD_REMOVED_ES[] PROGMEM = "Tarjeta retirada";
const char MSG_SD_REMOVED_PL[] PROGMEM = "Karta wyjeta"; const char MSG_SD_REMOVED_PL[] PROGMEM = "Karta wyjeta";
const char MSG_SD_REMOVED_DE[] PROGMEM = "SD Karte entfernt"; const char MSG_SD_REMOVED_DE[] PROGMEM = "SD entfernt ";
const char MSG_SD_REMOVED_NL[] PROGMEM = "SD verwijderd"; const char MSG_SD_REMOVED_NL[] PROGMEM = "SD verwijderd";
const char * const MSG_SD_REMOVED_LANG_TABLE[LANG_NUM] PROGMEM = { const char * const MSG_SD_REMOVED_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_SD_REMOVED_EN, MSG_SD_REMOVED_EN,
@ -3234,7 +3242,7 @@ const char MSG_SEVERE_SKEW_CZ[] PROGMEM = "Tezke zkoseni:";
const char MSG_SEVERE_SKEW_IT[] PROGMEM = "Inc. rilevante:"; const char MSG_SEVERE_SKEW_IT[] PROGMEM = "Inc. rilevante:";
const char MSG_SEVERE_SKEW_ES[] PROGMEM = "Inclin. severa:"; const char MSG_SEVERE_SKEW_ES[] PROGMEM = "Inclin. severa:";
const char MSG_SEVERE_SKEW_PL[] PROGMEM = "Ostre sciecie:"; const char MSG_SEVERE_SKEW_PL[] PROGMEM = "Ostre sciecie:";
const char MSG_SEVERE_SKEW_DE[] PROGMEM = "Schwerer Schr.:"; const char MSG_SEVERE_SKEW_DE[] PROGMEM = "Schwere Asym.:";
const char MSG_SEVERE_SKEW_NL[] PROGMEM = "Hevige Asym.:"; const char MSG_SEVERE_SKEW_NL[] PROGMEM = "Hevige Asym.:";
const char * const MSG_SEVERE_SKEW_LANG_TABLE[LANG_NUM] PROGMEM = { const char * const MSG_SEVERE_SKEW_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_SEVERE_SKEW_EN, MSG_SEVERE_SKEW_EN,
@ -3300,7 +3308,7 @@ const char MSG_SLIGHT_SKEW_CZ[] PROGMEM = "Lehke zkoseni:";
const char MSG_SLIGHT_SKEW_IT[] PROGMEM = "Incl. leggera:"; const char MSG_SLIGHT_SKEW_IT[] PROGMEM = "Incl. leggera:";
const char MSG_SLIGHT_SKEW_ES[] PROGMEM = "Inclin. ligera:"; const char MSG_SLIGHT_SKEW_ES[] PROGMEM = "Inclin. ligera:";
const char MSG_SLIGHT_SKEW_PL[] PROGMEM = "Lekkie sciecie:"; const char MSG_SLIGHT_SKEW_PL[] PROGMEM = "Lekkie sciecie:";
const char MSG_SLIGHT_SKEW_DE[] PROGMEM = "Leichter Schr.:"; const char MSG_SLIGHT_SKEW_DE[] PROGMEM = "Geringe Asym.:";
const char MSG_SLIGHT_SKEW_NL[] PROGMEM = "Geringe Asym.:"; const char MSG_SLIGHT_SKEW_NL[] PROGMEM = "Geringe Asym.:";
const char * const MSG_SLIGHT_SKEW_LANG_TABLE[LANG_NUM] PROGMEM = { const char * const MSG_SLIGHT_SKEW_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_SLIGHT_SKEW_EN, MSG_SLIGHT_SKEW_EN,
@ -3800,7 +3808,7 @@ const char MSG_USED_CZ[] PROGMEM = "Pouzite behem tisku";
const char MSG_USED_IT[] PROGMEM = "Usati nella stampa"; const char MSG_USED_IT[] PROGMEM = "Usati nella stampa";
const char MSG_USED_ES[] PROGMEM = "Usado en impresion"; const char MSG_USED_ES[] PROGMEM = "Usado en impresion";
const char MSG_USED_PL[] PROGMEM = "Uzyte przy druku"; const char MSG_USED_PL[] PROGMEM = "Uzyte przy druku";
const char MSG_USED_DE[] PROGMEM = "Beim Druck benutzte"; const char MSG_USED_DE[] PROGMEM = "Benutzt beim Druck";
const char MSG_USED_NL[] PROGMEM = "Gebruikt bij print"; const char MSG_USED_NL[] PROGMEM = "Gebruikt bij print";
const char * const MSG_USED_LANG_TABLE[LANG_NUM] PROGMEM = { const char * const MSG_USED_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_USED_EN, MSG_USED_EN,
@ -3935,7 +3943,7 @@ const char MSG_Y_DISTANCE_FROM_MIN_CZ[] PROGMEM = "Y vzdalenost od min:";
const char MSG_Y_DISTANCE_FROM_MIN_IT[] PROGMEM = "Distanza Y da min:"; const char MSG_Y_DISTANCE_FROM_MIN_IT[] PROGMEM = "Distanza Y da min:";
const char MSG_Y_DISTANCE_FROM_MIN_ES[] PROGMEM = "Dist. Y desde min:"; const char MSG_Y_DISTANCE_FROM_MIN_ES[] PROGMEM = "Dist. Y desde min:";
const char MSG_Y_DISTANCE_FROM_MIN_PL[] PROGMEM = "Odleglosc Y od min.:"; const char MSG_Y_DISTANCE_FROM_MIN_PL[] PROGMEM = "Odleglosc Y od min.:";
const char MSG_Y_DISTANCE_FROM_MIN_DE[] PROGMEM = "Y Entfernung vom min"; const char MSG_Y_DISTANCE_FROM_MIN_DE[] PROGMEM = "Y Entfernung von min";
const char MSG_Y_DISTANCE_FROM_MIN_NL[] PROGMEM = "Y afstand van min"; const char MSG_Y_DISTANCE_FROM_MIN_NL[] PROGMEM = "Y afstand van min";
const char * const MSG_Y_DISTANCE_FROM_MIN_LANG_TABLE[LANG_NUM] PROGMEM = { const char * const MSG_Y_DISTANCE_FROM_MIN_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_Y_DISTANCE_FROM_MIN_EN, MSG_Y_DISTANCE_FROM_MIN_EN,

4
Firmware/language_all.h
View File

@ -151,8 +151,8 @@ extern const char* const MSG_CURRENT_LANG_TABLE[LANG_NUM];
#define MSG_CURRENT LANG_TABLE_SELECT(MSG_CURRENT_LANG_TABLE) #define MSG_CURRENT LANG_TABLE_SELECT(MSG_CURRENT_LANG_TABLE)
extern const char* const MSG_DATE_LANG_TABLE[LANG_NUM]; extern const char* const MSG_DATE_LANG_TABLE[LANG_NUM];
#define MSG_DATE LANG_TABLE_SELECT(MSG_DATE_LANG_TABLE) #define MSG_DATE LANG_TABLE_SELECT(MSG_DATE_LANG_TABLE)
extern const char* const MSG_DEFAULT_SETTINGS_LOADED_LANG_TABLE[1]; extern const char* const MSG_DEFAULT_SETTINGS_LOADED_LANG_TABLE[LANG_NUM];
#define MSG_DEFAULT_SETTINGS_LOADED LANG_TABLE_SELECT_EXPLICIT(MSG_DEFAULT_SETTINGS_LOADED_LANG_TABLE, 0) #define MSG_DEFAULT_SETTINGS_LOADED LANG_TABLE_SELECT(MSG_DEFAULT_SETTINGS_LOADED_LANG_TABLE)
extern const char* const MSG_DISABLE_STEPPERS_LANG_TABLE[LANG_NUM]; extern const char* const MSG_DISABLE_STEPPERS_LANG_TABLE[LANG_NUM];
#define MSG_DISABLE_STEPPERS LANG_TABLE_SELECT(MSG_DISABLE_STEPPERS_LANG_TABLE) #define MSG_DISABLE_STEPPERS LANG_TABLE_SELECT(MSG_DISABLE_STEPPERS_LANG_TABLE)
extern const char* const MSG_DWELL_LANG_TABLE[LANG_NUM]; extern const char* const MSG_DWELL_LANG_TABLE[LANG_NUM];

47
Firmware/language_de.h
View File

@ -6,9 +6,9 @@
* *
*/ */
#define(length=20) WELCOME_MSG CUSTOM_MENDEL_NAME " bereit." #define(length=20) WELCOME_MSG CUSTOM_MENDEL_NAME " bereit."
#define MSG_SD_INSERTED "SD Karte eingesetzt" #define MSG_SD_INSERTED "SD eingesetzt"
#define MSG_SD_REMOVED "SD Karte entfernt" #define MSG_SD_REMOVED "SD entfernt "
#define MSG_MAIN "Hauptmenue" #define MSG_MAIN "Hauptmenue"
#define(length=20) MSG_DISABLE_STEPPERS "Motoren aus" #define(length=20) MSG_DISABLE_STEPPERS "Motoren aus"
#define MSG_AUTO_HOME "Startposition" #define MSG_AUTO_HOME "Startposition"
@ -40,9 +40,9 @@
#define MSG_MOTION "Bewegung" #define MSG_MOTION "Bewegung"
#define MSG_VOLUMETRIC "Filament" #define MSG_VOLUMETRIC "Filament"
#define MSG_VOLUMETRIC_ENABLED "E in mm3" #define MSG_VOLUMETRIC_ENABLED "E in mm3"
#define MSG_STORE_EPROM "EPROM speichern" #define MSG_STORE_EPROM "EEPROM speichern"
#define MSG_LOAD_EPROM "EPROM laden" #define MSG_LOAD_EPROM "EEPROM laden"
#define MSG_RESTORE_FAILSAFE "Standardkonfiguration" #define MSG_RESTORE_FAILSAFE "Standardwerte setzen"
#define MSG_REFRESH "Aktualisieren" #define MSG_REFRESH "Aktualisieren"
#define MSG_WATCH "Information" #define MSG_WATCH "Information"
#define MSG_TUNE "Feineinstellung" #define MSG_TUNE "Feineinstellung"
@ -60,7 +60,7 @@
#define MSG_STOPPED "GESTOPPT. " #define MSG_STOPPED "GESTOPPT. "
#define MSG_FILAMENTCHANGE "Filament-Wechsel" #define MSG_FILAMENTCHANGE "Filament-Wechsel"
#define MSG_INIT_SDCARD "SD erkennen" #define MSG_INIT_SDCARD "SD erkennen"
#define MSG_CNG_SDCARD "SD Karte wechsel" #define MSG_CNG_SDCARD "SD wechseln"
#define MSG_BABYSTEP_X "Babystep X" #define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y" #define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Live Z einstellen" #define MSG_BABYSTEP_Z "Live Z einstellen"
@ -210,7 +210,6 @@
#define(length=20, lines=8) MSG_MOVE_CARRIAGE_TO_THE_TOP "Kalibrieren von XYZ. Drehen Sie den Knopf, bis beide Z-Schlitten obere Anschaege erreichen. Klicken wenn beide ganz oben sind." #define(length=20, lines=8) MSG_MOVE_CARRIAGE_TO_THE_TOP "Kalibrieren von XYZ. Drehen Sie den Knopf, bis beide Z-Schlitten obere Anschaege erreichen. Klicken wenn beide ganz oben sind."
#define(length=20, lines=8) MSG_MOVE_CARRIAGE_TO_THE_TOP_Z "Kalibrieren von Z. Drehen Sie den Knopf, bis beide Z-Schlitten obere Anschaege erreichen. Klicken wenn beide ganz oben sind." #define(length=20, lines=8) MSG_MOVE_CARRIAGE_TO_THE_TOP_Z "Kalibrieren von Z. Drehen Sie den Knopf, bis beide Z-Schlitten obere Anschaege erreichen. Klicken wenn beide ganz oben sind."
<<<<<<< HEAD
#define(length=20, lines=8) MSG_CONFIRM_NOZZLE_CLEAN "Bitte reinigen Sie die Duese zur Kalibrierung. Klicken wenn sauber." #define(length=20, lines=8) MSG_CONFIRM_NOZZLE_CLEAN "Bitte reinigen Sie die Duese zur Kalibrierung. Klicken wenn sauber."
#define(length=20, lines=8) MSG_CONFIRM_CARRIAGE_AT_THE_TOP "Sind beide Z Schlitten ganz oben?" #define(length=20, lines=8) MSG_CONFIRM_CARRIAGE_AT_THE_TOP "Sind beide Z Schlitten ganz oben?"
@ -326,34 +325,4 @@
#define MSG_MEASURED_SKEW "Symmetrie:" #define MSG_MEASURED_SKEW "Symmetrie:"
#define MSG_SLIGHT_SKEW "Geringe Asym.:" #define MSG_SLIGHT_SKEW "Geringe Asym.:"
#define MSG_SEVERE_SKEW "Schwere Asym.:" #define MSG_SEVERE_SKEW "Schwere Asym.:"
======= #define(length=20, lines=4) MSG_DEFAULT_SETTINGS_LOADED "Standardeinstellungen geladen"
#define MSG_LOAD_ALL "Alle laden"
#define MSG_LOAD_FILAMENT_1 "Filament 1 laden"
#define MSG_LOAD_FILAMENT_2 "Filament 2 laden"
#define MSG_LOAD_FILAMENT_3 "Filament 3 laden"
#define MSG_LOAD_FILAMENT_4 "Filament 4 laden"
#define MSG_UNLOAD_FILAMENT_1 "Filam. 1 entladen"
#define MSG_UNLOAD_FILAMENT_2 "Filam. 2 entladen"
#define MSG_UNLOAD_FILAMENT_3 "Filam. 3 entladen"
#define MSG_UNLOAD_FILAMENT_4 "Filam. 4 entladen"
#define MSG_UNLOAD_ALL "Alles entladen"
#define MSG_PREPARE_FILAMENT "Filam. bereithalten"
#define MSG_ALL "Alle"
#define MSG_USED "Beim Druck benutzte"
#define MSG_CURRENT "Aktuelles"
#define MSG_CHOOSE_EXTRUDER "Waehlen Sie Extruder"
#define MSG_EXTRUDER "Extruder"
#define MSG_EXTRUDER_1 "Extruder 1"
#define MSG_EXTRUDER_2 "Extruder 2"
#define MSG_EXTRUDER_3 "Extruder 3"
#define MSG_EXTRUDER_4 "Extruder 4"
#define MSG_DATE "Datum"
#define MSG_XYZ_DETAILS "XYZ Kal. Details"
#define MSG_Y_DISTANCE_FROM_MIN "Y Entfernung vom min"
#define MSG_LEFT "Links:"
#define MSG_CENTER "Mitte:"
#define MSG_RIGHT "Rechts:"
#define MSG_MEASURED_SKEW "Schraeglauf:"
#define MSG_SLIGHT_SKEW "Leichter Schr.:"
#define MSG_SEVERE_SKEW "Schwerer Schr.:"
>>>>>>> refs/remotes/prusa3d/MK2

8
Firmware/language_en.h
View File

@ -273,9 +273,9 @@
#define MSG_MESH_BED_LEVELING "Mesh Bed Leveling" #define MSG_MESH_BED_LEVELING "Mesh Bed Leveling"
#define MSG_MENU_CALIBRATION "Calibration" #define MSG_MENU_CALIBRATION "Calibration"
#define(length=19, lines=1) MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF "SD card [normal]" #define(length=20) MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF "SD card [normal]"
#define(length=19, lines=1) MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON "SD card [FlshAir]" #define(length=20) MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON "SD card [FlshAir]"
#define(length=20, lines=1) MSG_PRINTER_DISCONNECTED "Printer disconnected" #define(length=20) MSG_PRINTER_DISCONNECTED "Printer disconnected"
#define(length=20, lines=1) MSG_FINISHING_MOVEMENTS "Finishing movements" #define(length=20, lines=1) MSG_FINISHING_MOVEMENTS "Finishing movements"
#define(length=20, lines=1) MSG_PRINT_PAUSED "Print paused" #define(length=20, lines=1) MSG_PRINT_PAUSED "Print paused"
#define(length=20, lines=1) MSG_RESUMING_PRINT "Resuming print" #define(length=20, lines=1) MSG_RESUMING_PRINT "Resuming print"
@ -314,4 +314,4 @@
#define(length=15, lines=1) MSG_MEASURED_SKEW "Measured skew:" #define(length=15, lines=1) MSG_MEASURED_SKEW "Measured skew:"
#define(length=15, lines=1) MSG_SLIGHT_SKEW "Slight skew:" #define(length=15, lines=1) MSG_SLIGHT_SKEW "Slight skew:"
#define(length=15, lines=1) MSG_SEVERE_SKEW "Severe skew:" #define(length=15, lines=1) MSG_SEVERE_SKEW "Severe skew:"
#define(length=20, lines=4) MSG_DEFAULT_SETTINGS_LOADED "Default settings loaded" #define(length=20, lines=4) MSG_DEFAULT_SETTINGS_LOADED "Default settings loaded"

3
Firmware/language_nl.h
View File

@ -323,4 +323,5 @@
#define MSG_RIGHT "Rechts:" #define MSG_RIGHT "Rechts:"
#define MSG_MEASURED_SKEW "Symmetrie:" #define MSG_MEASURED_SKEW "Symmetrie:"
#define MSG_SLIGHT_SKEW "Geringe Asym.:" #define MSG_SLIGHT_SKEW "Geringe Asym.:"
#define MSG_SEVERE_SKEW "Hevige Asym.:" #define MSG_SEVERE_SKEW "Hevige Asym.:"
#define(length=20, lines=4) MSG_DEFAULT_SETTINGS_LOADED "Standaard instellingen geladen"

26
Firmware/ultralcd.cpp
View File

@ -725,9 +725,12 @@ void lcd_commands()
enquecommand_P(PSTR("G1 Z15 F1500")); enquecommand_P(PSTR("G1 Z15 F1500"));
st_synchronize(); st_synchronize();
#ifdef SNMM #ifdef SNMM
lcd_commands_step = 8; lcd_commands_step = 7;
#else #else
lcd_commands_step = 6; lcd_commands_step = 5;
#endif
#ifdef DEFAULT_PID_BED_TEMP
lcd_commands_step = lcd_commands_step+1
#endif #endif
} }
@ -773,7 +776,7 @@ void lcd_commands()
lcd_commands_type = 0; lcd_commands_type = 0;
} }
} }
#ifdef DEFAULT_PID_BED_TEMP
if (lcd_commands_type == LCD_COMMAND_PID_BED) { if (lcd_commands_type == LCD_COMMAND_PID_BED) {
char cmd1[30]; char cmd1[30];
@ -815,7 +818,7 @@ void lcd_commands()
lcd_commands_type = 0; lcd_commands_type = 0;
} }
} }
#endif
} }
@ -975,6 +978,7 @@ static void lcd_support_menu()
MENU_ITEM(back, PSTR("------------"), lcd_main_menu); MENU_ITEM(back, PSTR("------------"), lcd_main_menu);
MENU_ITEM(back, MSG_DATE, lcd_main_menu); MENU_ITEM(back, MSG_DATE, lcd_main_menu);
MENU_ITEM(back, PSTR(__DATE__), lcd_main_menu); MENU_ITEM(back, PSTR(__DATE__), lcd_main_menu);
MENU_ITEM(back, PSTR(__TIME__), lcd_main_menu);
MENU_ITEM(back, PSTR(STRING_CONFIG_H_AUTHOR), lcd_main_menu); MENU_ITEM(back, PSTR(STRING_CONFIG_H_AUTHOR), lcd_main_menu);
// Show the FlashAir IP address, if the card is available. // Show the FlashAir IP address, if the card is available.
@ -1631,7 +1635,7 @@ void pid_extruder() {
} }
} }
#ifdef DEFAULT_PID_BED_TEMP
void pid_bed() { void pid_bed() {
lcd_implementation_clear(); lcd_implementation_clear();
@ -1650,6 +1654,7 @@ void pid_bed() {
} }
} }
#endif
void lcd_adjust_z() { void lcd_adjust_z() {
int enc_dif = 0; int enc_dif = 0;
@ -2067,13 +2072,17 @@ void lcd_bed_calibration_show_result(BedSkewOffsetDetectionResultType result, ui
static void lcd_show_end_stops() { static void lcd_show_end_stops() {
lcd.setCursor(0, 0); lcd.setCursor(0, 0);
lcd_printPGM((PSTR("End stops diag"))); lcd_printPGM((PSTR("End stops/sens diag")));
lcd.setCursor(0, 1); lcd.setCursor(0, 1);
lcd_printPGM((READ(X_MIN_PIN) ^ X_MIN_ENDSTOP_INVERTING == 1) ? (PSTR("X1")) : (PSTR("X0"))); lcd_printPGM((READ(X_MIN_PIN) ^ X_MIN_ENDSTOP_INVERTING == 1) ? (PSTR("X1")) : (PSTR("X0")));
lcd.setCursor(0, 2); lcd.setCursor(0, 2);
lcd_printPGM((READ(Y_MIN_PIN) ^ Y_MIN_ENDSTOP_INVERTING == 1) ? (PSTR("Y1")) : (PSTR("Y0"))); lcd_printPGM((READ(Y_MIN_PIN) ^ Y_MIN_ENDSTOP_INVERTING == 1) ? (PSTR("Y1")) : (PSTR("Y0")));
lcd.setCursor(0, 3); lcd.setCursor(0, 3);
lcd_printPGM((READ(Z_MIN_PIN) ^ Z_MIN_ENDSTOP_INVERTING == 1) ? (PSTR("Z1")) : (PSTR("Z0"))); lcd_printPGM((READ(Z_MIN_PIN) ^ Z_MIN_ENDSTOP_INVERTING == 1) ? (PSTR("Z1")) : (PSTR("Z0")));
#ifdef FR_SENS
lcd.setCursor(4, 1);
lcd_printPGM((READ(FR_SENS) ^ FR_SENS_INVERTING == 1) ? (PSTR("FR_S1")) : (PSTR("FR_S0")));
#endif
} }
static void menu_show_end_stops() { static void menu_show_end_stops() {
@ -2715,8 +2724,10 @@ MENU_ITEM(function, MSG_CALIBRATE_BED, lcd_mesh_calibration);
MENU_ITEM(submenu, MSG_CALIBRATION_PINDA_MENU, lcd_pinda_calibration_menu); MENU_ITEM(submenu, MSG_CALIBRATION_PINDA_MENU, lcd_pinda_calibration_menu);
#endif //MK1BP #endif //MK1BP
MENU_ITEM(submenu, MSG_PID_EXTRUDER, pid_extruder); MENU_ITEM(submenu, MSG_PID_EXTRUDER, pid_extruder);
#ifdef DEFAULT_PID_BED_TEMP
MENU_ITEM(submenu, MSG_PID_BED, pid_bed); MENU_ITEM(submenu, MSG_PID_BED, pid_bed);
MENU_ITEM(submenu, MSG_SHOW_END_STOPS, menu_show_end_stops); #endif
MENU_ITEM(submenu, MSG_SHOW_END_STOPS, menu_show_end_stops);
#ifndef MK1BP #ifndef MK1BP
MENU_ITEM(gcode, MSG_CALIBRATE_BED_RESET, PSTR("M44")); MENU_ITEM(gcode, MSG_CALIBRATE_BED_RESET, PSTR("M44"));
#endif //MK1BP #endif //MK1BP
@ -4136,7 +4147,6 @@ void lcd_sdcard_stop()
lcd_return_to_status(); lcd_return_to_status();
lcd_ignore_click(true); lcd_ignore_click(true);
lcd_commands_type = LCD_COMMAND_STOP_PRINT; lcd_commands_type = LCD_COMMAND_STOP_PRINT;
// Turn off the print fan // Turn off the print fan

2
Firmware/ultralcd.h
View File

@ -95,7 +95,9 @@ void lcd_mylang();
#define LCD_COMMAND_LONG_PAUSE 5 #define LCD_COMMAND_LONG_PAUSE 5
#define LCD_COMMAND_LONG_PAUSE_RESUME 6 #define LCD_COMMAND_LONG_PAUSE_RESUME 6
#define LCD_COMMAND_PID_EXTRUDER 7 #define LCD_COMMAND_PID_EXTRUDER 7
#ifdef DEFAULT_PID_BED_TEMP
#define LCD_COMMAND_PID_BED 8 #define LCD_COMMAND_PID_BED 8
#endif
extern unsigned long lcd_timeoutToStatus; extern unsigned long lcd_timeoutToStatus;
extern int lcd_commands_type; extern int lcd_commands_type;

1
Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h
View File

@ -169,6 +169,7 @@ ADDITIONAL FEATURES SETTINGS
// Define Prusa filament runout sensor // Define Prusa filament runout sensor
#define FILAMENT_RUNOUT_SUPPORT #define FILAMENT_RUNOUT_SUPPORT
const bool FR_SENS_INVERTING = true; // set to true to invert the logic of the filament runout.
#ifdef FILAMENT_RUNOUT_SUPPORT #ifdef FILAMENT_RUNOUT_SUPPORT
#define FILAMENT_RUNOUT_SENSOR 1 #define FILAMENT_RUNOUT_SENSOR 1

1
Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h
View File

@ -179,6 +179,7 @@ ADDITIONAL FEATURES SETTINGS
// Define Prusa filament runout sensor // Define Prusa filament runout sensor
#define FILAMENT_RUNOUT_SUPPORT #define FILAMENT_RUNOUT_SUPPORT
const bool FR_SENS_INVERTING = true; // set to true to invert the logic of the filament runout.
#ifdef FILAMENT_RUNOUT_SUPPORT #ifdef FILAMENT_RUNOUT_SUPPORT
#define FILAMENT_RUNOUT_SENSOR 1 #define FILAMENT_RUNOUT_SENSOR 1