Browse Source

Prusa => Průša

vanilla_fb_2.0.x
Scott Lahteine 4 years ago
parent
commit
4955aa5b78
  1. 8
      Marlin/Configuration.h
  2. 8
      Marlin/Configuration_adv.h
  3. 4
      Marlin/src/MarlinCore.cpp
  4. 2
      Marlin/src/gcode/calibrate/G76_M871.cpp
  5. 2
      Marlin/src/inc/Conditionals_LCD.h
  6. 2
      Marlin/src/inc/SanityCheck.h
  7. 2
      Marlin/src/module/thermistor/thermistors.h
  8. 2
      Marlin/src/pins/stm32f4/pins_LERDGE_S.h
  9. 2
      Marlin/src/pins/stm32f4/pins_VAKE403D.h

8
Marlin/Configuration.h

@ -177,7 +177,7 @@
#endif #endif
/** /**
* Prusa Multi-Material Unit v2 * Průša Multi-Material Unit v2
* *
* Requires NOZZLE_PARK_FEATURE to park print head in case MMU unit fails. * Requires NOZZLE_PARK_FEATURE to park print head in case MMU unit fails.
* Requires EXTRUDERS = 5 * Requires EXTRUDERS = 5
@ -373,7 +373,7 @@
* 4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !! * 4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
* 5 : 100K thermistor - ATC Semitec 104GT-2/104NT-4-R025H42G (Used in ParCan, J-Head, and E3D) (4.7k pullup) * 5 : 100K thermistor - ATC Semitec 104GT-2/104NT-4-R025H42G (Used in ParCan, J-Head, and E3D) (4.7k pullup)
* 501 : 100K Zonestar (Tronxy X3A) Thermistor * 501 : 100K Zonestar (Tronxy X3A) Thermistor
* 502 : 100K Zonestar Thermistor used by hot bed in Zonestar Prusa P802M * 502 : 100K Zonestar Thermistor used by hot bed in Zonestar Průša P802M
* 512 : 100k RPW-Ultra hotend thermistor (4.7k pullup) * 512 : 100k RPW-Ultra hotend thermistor (4.7k pullup)
* 6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup) * 6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
* 7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup) * 7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
@ -1720,9 +1720,9 @@
#define DISPLAY_CHARSET_HD44780 JAPANESE #define DISPLAY_CHARSET_HD44780 JAPANESE
/** /**
* Info Screen Style (0:Classic, 1:Prusa) * Info Screen Style (0:Classic, 1:Průša)
* *
* :[0:'Classic', 1:'Prusa'] * :[0:'Classic', 1:'Průša']
*/ */
#define LCD_INFO_SCREEN_STYLE 0 #define LCD_INFO_SCREEN_STYLE 0

8
Marlin/Configuration_adv.h

@ -2424,7 +2424,7 @@
* CHOPPER_DEFAULT_24V * CHOPPER_DEFAULT_24V
* CHOPPER_DEFAULT_36V * CHOPPER_DEFAULT_36V
* CHOPPER_09STEP_24V // 0.9 degree steppers (24V) * CHOPPER_09STEP_24V // 0.9 degree steppers (24V)
* CHOPPER_PRUSAMK3_24V // Imported parameters from the official Prusa firmware for MK3 (24V) * CHOPPER_PRUSAMK3_24V // Imported parameters from the official Průša firmware for MK3 (24V)
* CHOPPER_MARLIN_119 // Old defaults from Marlin v1.1.9 * CHOPPER_MARLIN_119 // Old defaults from Marlin v1.1.9
* *
* Define you own with * Define you own with
@ -3396,7 +3396,7 @@
#endif #endif
/** /**
* Prusa Multi-Material Unit v2 * Průša Multi-Material Unit v2
* Enable in Configuration.h * Enable in Configuration.h
*/ */
#if ENABLED(PRUSA_MMU2) #if ENABLED(PRUSA_MMU2)
@ -3420,7 +3420,7 @@
//#define MMU2_MENUS //#define MMU2_MENUS
#if ENABLED(MMU2_MENUS) #if ENABLED(MMU2_MENUS)
// Settings for filament load / unload from the LCD menu. // Settings for filament load / unload from the LCD menu.
// This is for Prusa MK3-style extruders. Customize for your hardware. // This is for Průša MK3-style extruders. Customize for your hardware.
#define MMU2_FILAMENTCHANGE_EJECT_FEED 80.0 #define MMU2_FILAMENTCHANGE_EJECT_FEED 80.0
#define MMU2_LOAD_TO_NOZZLE_SEQUENCE \ #define MMU2_LOAD_TO_NOZZLE_SEQUENCE \
{ 7.2, 1145 }, \ { 7.2, 1145 }, \
@ -3446,7 +3446,7 @@
/** /**
* MMU Extruder Sensor * MMU Extruder Sensor
* *
* Support for a Prusa (or other) IR Sensor to detect filament near the extruder * Support for a Průša (or other) IR Sensor to detect filament near the extruder
* and make loading more reliable. Suitable for an extruder equipped with a filament * and make loading more reliable. Suitable for an extruder equipped with a filament
* sensor less than 38mm from the gears. * sensor less than 38mm from the gears.
* *

4
Marlin/src/MarlinCore.cpp

@ -684,7 +684,7 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) {
* - Read Buttons and Update the LCD * - Read Buttons and Update the LCD
* - Run i2c Position Encoders * - Run i2c Position Encoders
* - Auto-report Temperatures / SD Status * - Auto-report Temperatures / SD Status
* - Update the Prusa MMU2 * - Update the Průša MMU2
* - Handle Joystick jogging * - Handle Joystick jogging
*/ */
void idle(TERN_(ADVANCED_PAUSE_FEATURE, bool no_stepper_sleep/*=false*/)) { void idle(TERN_(ADVANCED_PAUSE_FEATURE, bool no_stepper_sleep/*=false*/)) {
@ -760,7 +760,7 @@ void idle(TERN_(ADVANCED_PAUSE_FEATURE, bool no_stepper_sleep/*=false*/)) {
} }
#endif #endif
// Update the Prusa MMU2 // Update the Průša MMU2
TERN_(PRUSA_MMU2, mmu2.mmu_loop()); TERN_(PRUSA_MMU2, mmu2.mmu_loop());
// Handle Joystick jogging // Handle Joystick jogging

2
Marlin/src/gcode/calibrate/G76_M871.cpp

@ -45,7 +45,7 @@
* - When calibrating bed, probe temperature is held constant. * - When calibrating bed, probe temperature is held constant.
* Compensation values are deltas to first probe measurement at bed temp. = 60°C. * Compensation values are deltas to first probe measurement at bed temp. = 60°C.
* - The hotend will not be heated at any time. * - The hotend will not be heated at any time.
* - On my Prusa MK3S clone I put a piece of paper between the probe and the hotend * - On my Průša MK3S clone I put a piece of paper between the probe and the hotend
* so the hotend fan would not cool my probe constantly. Alternativly you could just * so the hotend fan would not cool my probe constantly. Alternativly you could just
* make sure the fan is not running while running the calibration process. * make sure the fan is not running while running the calibration process.
* *

2
Marlin/src/inc/Conditionals_LCD.h

@ -512,7 +512,7 @@
#undef DISABLE_INACTIVE_EXTRUDER #undef DISABLE_INACTIVE_EXTRUDER
#endif #endif
// Prusa MK2 Multiplexer and MMU 2.0 force SINGLENOZZLE // Průša MK2 Multiplexer and MMU 2.0 force SINGLENOZZLE
#if EITHER(MK2_MULTIPLEXER, PRUSA_MMU2) #if EITHER(MK2_MULTIPLEXER, PRUSA_MMU2)
#define SINGLENOZZLE #define SINGLENOZZLE
#endif #endif

2
Marlin/src/inc/SanityCheck.h

@ -2876,7 +2876,7 @@ static_assert( _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
#endif #endif
/** /**
* Prusa MMU2 requirements * Průša MMU2 requirements
*/ */
#if ENABLED(PRUSA_MMU2) #if ENABLED(PRUSA_MMU2)
#if EXTRUDERS != 5 #if EXTRUDERS != 5

2
Marlin/src/module/thermistor/thermistors.h

@ -72,7 +72,7 @@ typedef struct { int16_t value, celsius; } temp_entry_t;
#if ANY_THERMISTOR_IS(501) // 100K Zonestar thermistor #if ANY_THERMISTOR_IS(501) // 100K Zonestar thermistor
#include "thermistor_501.h" #include "thermistor_501.h"
#endif #endif
#if ANY_THERMISTOR_IS(502) // Unknown thermistor used by the Zonestar Prusa P802M hot bed #if ANY_THERMISTOR_IS(502) // Unknown thermistor used by the Zonestar Průša P802M hot bed
#include "thermistor_502.h" #include "thermistor_502.h"
#endif #endif
#if ANY_THERMISTOR_IS(512) // 100k thermistor in RPW-Ultra hotend, Pull-up = 4.7 kOhm, "unknown model" #if ANY_THERMISTOR_IS(512) // 100k thermistor in RPW-Ultra hotend, Pull-up = 4.7 kOhm, "unknown model"

2
Marlin/src/pins/stm32f4/pins_LERDGE_S.h

@ -127,7 +127,7 @@
#endif #endif
// //
// Prusa i3 MK2 Multi Material Multiplexer Support // Průša i3 MK2 Multi Material Multiplexer Support
// //
//#define E_MUX0_PIN -1 //#define E_MUX0_PIN -1
//#define E_MUX1_PIN -1 //#define E_MUX1_PIN -1

2
Marlin/src/pins/stm32f4/pins_VAKE403D.h

@ -147,7 +147,7 @@
//#define NEOPIXEL_PIN PF13 //#define NEOPIXEL_PIN PF13
// //
// Prusa i3 MK2 Multi Material Multiplexer Support // Průša i3 MK2 Multi Material Multiplexer Support
// //
//#define E_MUX0_PIN PG3 //#define E_MUX0_PIN PG3
//#define E_MUX1_PIN PG4 //#define E_MUX1_PIN PG4

Loading…
Cancel
Save