Skip to content

Commit

Permalink
Release v5.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Prusa Research authored and dragomirecky committed Sep 18, 2023
1 parent fd23054 commit bfb0ffc
Show file tree
Hide file tree
Showing 208 changed files with 192,989 additions and 72,039 deletions.
258 changes: 3 additions & 255 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -278,258 +278,6 @@
"name": "mk4_debug_boot",
"generator": "Ninja",
"binaryDir": "build-vscode-buddy",
"cacheVariables": {
"CMAKE_MAKE_PROGRAM": {
"type": "FILEPATH",
"value": "${sourceDir}/.dependencies/ninja-1.10.2/ninja"
},
"CMAKE_EXPORT_COMPILE_COMMANDS": {
"type": "STRING",
"value": "ON"
},
"PRINTER": {
"type": "STRING",
"value": "MK4"
},
"BOARD": {
"type": "STRING",
"value": "<default>"
},
"BOARD_VERSION": {
"type": "STRING",
"value": "0.2.7"
},
"PRESET_COMPILE_OPTIONS": {
"type": "STRING",
"value": "-DHAS_LDO_400_STEP -DHAS_PLANETARY_GEARBOX"
},
"BOOTLOADER": {
"type": "STRING",
"value": "YES"
},
"GENERATE_BBF": {
"type": "BOOL",
"value": "TRUE"
},
"GENERATE_DFU": {
"type": "BOOL",
"value": "OFF"
},
"SIGNING_KEY": {
"type": "FILEPATH",
"value": ""
},
"CMAKE_TOOLCHAIN_FILE": {
"type": "FILEPATH",
"value": "${sourceDir}/cmake/GccArmNoneEabi.cmake"
},
"CMAKE_BUILD_TYPE": {
"type": "STRING",
"value": "Debug"
},
"PROJECT_VERSION_SUFFIX": {
"type": "STRING",
"value": "<auto>"
},
"PROJECT_VERSION_SUFFIX_SHORT": {
"type": "STRING",
"value": "<auto>"
}
}
},
{
"name": "mk4_debug_noboot",
"generator": "Ninja",
"binaryDir": "build-vscode-buddy",
"cacheVariables": {
"CMAKE_MAKE_PROGRAM": {
"type": "FILEPATH",
"value": "${sourceDir}/.dependencies/ninja-1.10.2/ninja"
},
"CMAKE_EXPORT_COMPILE_COMMANDS": {
"type": "STRING",
"value": "ON"
},
"PRINTER": {
"type": "STRING",
"value": "MK4"
},
"BOARD": {
"type": "STRING",
"value": "<default>"
},
"BOARD_VERSION": {
"type": "STRING",
"value": "0.2.7"
},
"PRESET_COMPILE_OPTIONS": {
"type": "STRING",
"value": "-DHAS_LDO_400_STEP -DHAS_PLANETARY_GEARBOX"
},
"BOOTLOADER": {
"type": "STRING",
"value": "NO"
},
"GENERATE_BBF": {
"type": "BOOL",
"value": "FALSE"
},
"GENERATE_DFU": {
"type": "BOOL",
"value": "OFF"
},
"SIGNING_KEY": {
"type": "FILEPATH",
"value": ""
},
"CMAKE_TOOLCHAIN_FILE": {
"type": "FILEPATH",
"value": "${sourceDir}/cmake/GccArmNoneEabi.cmake"
},
"CMAKE_BUILD_TYPE": {
"type": "STRING",
"value": "Debug"
},
"PROJECT_VERSION_SUFFIX": {
"type": "STRING",
"value": "<auto>"
},
"PROJECT_VERSION_SUFFIX_SHORT": {
"type": "STRING",
"value": "<auto>"
}
}
},
{
"name": "mk4_release_boot",
"generator": "Ninja",
"binaryDir": "build-vscode-buddy",
"cacheVariables": {
"CMAKE_MAKE_PROGRAM": {
"type": "FILEPATH",
"value": "${sourceDir}/.dependencies/ninja-1.10.2/ninja"
},
"CMAKE_EXPORT_COMPILE_COMMANDS": {
"type": "STRING",
"value": "ON"
},
"PRINTER": {
"type": "STRING",
"value": "MK4"
},
"BOARD": {
"type": "STRING",
"value": "<default>"
},
"BOARD_VERSION": {
"type": "STRING",
"value": "0.2.7"
},
"PRESET_COMPILE_OPTIONS": {
"type": "STRING",
"value": "-DHAS_LDO_400_STEP -DHAS_PLANETARY_GEARBOX"
},
"BOOTLOADER": {
"type": "STRING",
"value": "YES"
},
"GENERATE_BBF": {
"type": "BOOL",
"value": "TRUE"
},
"GENERATE_DFU": {
"type": "BOOL",
"value": "OFF"
},
"SIGNING_KEY": {
"type": "FILEPATH",
"value": ""
},
"CMAKE_TOOLCHAIN_FILE": {
"type": "FILEPATH",
"value": "${sourceDir}/cmake/GccArmNoneEabi.cmake"
},
"CMAKE_BUILD_TYPE": {
"type": "STRING",
"value": "Release"
},
"PROJECT_VERSION_SUFFIX": {
"type": "STRING",
"value": "<auto>"
},
"PROJECT_VERSION_SUFFIX_SHORT": {
"type": "STRING",
"value": "<auto>"
}
}
},
{
"name": "mk4_release_noboot",
"generator": "Ninja",
"binaryDir": "build-vscode-buddy",
"cacheVariables": {
"CMAKE_MAKE_PROGRAM": {
"type": "FILEPATH",
"value": "${sourceDir}/.dependencies/ninja-1.10.2/ninja"
},
"CMAKE_EXPORT_COMPILE_COMMANDS": {
"type": "STRING",
"value": "ON"
},
"PRINTER": {
"type": "STRING",
"value": "MK4"
},
"BOARD": {
"type": "STRING",
"value": "<default>"
},
"BOARD_VERSION": {
"type": "STRING",
"value": "0.2.7"
},
"PRESET_COMPILE_OPTIONS": {
"type": "STRING",
"value": "-DHAS_LDO_400_STEP -DHAS_PLANETARY_GEARBOX"
},
"BOOTLOADER": {
"type": "STRING",
"value": "NO"
},
"GENERATE_BBF": {
"type": "BOOL",
"value": "FALSE"
},
"GENERATE_DFU": {
"type": "BOOL",
"value": "OFF"
},
"SIGNING_KEY": {
"type": "FILEPATH",
"value": ""
},
"CMAKE_TOOLCHAIN_FILE": {
"type": "FILEPATH",
"value": "${sourceDir}/cmake/GccArmNoneEabi.cmake"
},
"CMAKE_BUILD_TYPE": {
"type": "STRING",
"value": "Release"
},
"PROJECT_VERSION_SUFFIX": {
"type": "STRING",
"value": "<auto>"
},
"PROJECT_VERSION_SUFFIX_SHORT": {
"type": "STRING",
"value": "<auto>"
}
}
},
{
"name": "mk3.9_debug_boot",
"generator": "Ninja",
"binaryDir": "build-vscode-buddy",
"cacheVariables": {
"CMAKE_MAKE_PROGRAM": {
"type": "FILEPATH",
Expand Down Expand Up @@ -590,7 +338,7 @@
}
},
{
"name": "mk3.9_debug_noboot",
"name": "mk4_debug_noboot",
"generator": "Ninja",
"binaryDir": "build-vscode-buddy",
"cacheVariables": {
Expand Down Expand Up @@ -653,7 +401,7 @@
}
},
{
"name": "mk3.9_release_boot",
"name": "mk4_release_boot",
"generator": "Ninja",
"binaryDir": "build-vscode-buddy",
"cacheVariables": {
Expand Down Expand Up @@ -716,7 +464,7 @@
}
},
{
"name": "mk3.9_release_noboot",
"name": "mk4_release_noboot",
"generator": "Ninja",
"binaryDir": "build-vscode-buddy",
"cacheVariables": {
Expand Down
5 changes: 4 additions & 1 deletion ProjectOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ set(PRINTERS_WITH_TOOLCHANGER "XL")
set(PRINTERS_WITH_SIDE_FSENSOR "XL")
set(PRINTERS_WITH_EMBEDDED_ESP32 "XL")
set(PRINTERS_WITH_SIDE_LEDS "XL" "iX")
set(PRINTERS_WITH_TRANSLATIONS "MINI")
set(PRINTERS_WITH_TRANSLATIONS "MK4" "XL")
set(PRINTERS_WITH_LOVE_BOARD "MK4" "iX")
set(PRINTERS_WITH_MMU2 "MK4" "MK3.5")

Expand Down Expand Up @@ -579,6 +579,9 @@ else()
define_boolean_option(NETWORKING_BENCHMARK_ENABLED NO)
endif()

# asyncio causes speed regressions so let's disable it for now
define_boolean_option(USE_ASYNCIO NO)

# define enabled features

if(BOOTLOADER STREQUAL "YES"
Expand Down
4 changes: 4 additions & 0 deletions include/buddy/lwipopts.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ extern "C" {
#define LWIP_SO_RCVTIMEO 1
#define LWIP_SO_SNDTIMEO 1

// Some attempts to "tune" it to use less memory in unstable network environment with many retries of new connections.
#define LWIP_TCP_CLOSE_TIMEOUT_MS_DEFAULT 5000 /* 5s for closing a connection must be enough... or let the other side time out */
#define TCP_OVERSIZE 0

#define LWIP_DNS 1
/*
* We have a HTTP server (PrusaLink). The browsers tend to keep few
Expand Down
7 changes: 0 additions & 7 deletions include/marlin/Configuration_MINI_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -480,13 +480,6 @@
//#define HALT_ON_PROBING_ERROR
//after enabling HOMING_MAX_ATTEMPTS, homing can fail
#define HOMING_MAX_ATTEMPTS 10
#ifdef HOMING_MAX_ATTEMPTS
// ranges in mm - allowed distance between homing probes for XYZ axes
constexpr float axis_home_min_diff[] = {-0.2, -0.2, -0.1};
constexpr float axis_home_max_diff[] = { 0.2, 0.2, 0.1};
constexpr float axis_home_invert_min_diff[] = {-1, -1, -1};
constexpr float axis_home_invert_max_diff[] = { 1, 1, 1};
#endif// HOMING_MAX_ATTEMPTS

// Homing hits each endstop, retracts by these distances, then does a slower bump.
#define X_HOME_BUMP_MM 10
Expand Down
6 changes: 2 additions & 4 deletions include/marlin/Configuration_MK3.5.h
Original file line number Diff line number Diff line change
Expand Up @@ -1100,21 +1100,19 @@
#define Z_END_GAP 10

// MK3.9 (200 step motors) does not support precise homing
#if defined(HAS_LDO_400_STEP)
/**
* Calibrates X, Y homing positions and uses
* the reference to provide repeatable homing position.
*/
#define PRECISE_HOMING
// #define PRECISE_HOMING

/**
* Number of precise homing tries
*
* Three times more tries are used when recovering from crash
* or power panic.
*/
#define PRECISE_HOMING_TRIES 15
#endif
// #define PRECISE_HOMING_TRIES 15

/**
* Software Endstops
Expand Down
30 changes: 5 additions & 25 deletions include/marlin/Configuration_MK3.5_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -466,14 +466,6 @@
#define HOMING_MAX_ATTEMPTS 10
#endif

#ifdef HOMING_MAX_ATTEMPTS
// ranges in mm - allowed distance between homing probes for XYZ axes
constexpr float axis_home_min_diff[] = {-0.2, -0.2, -0.1};
constexpr float axis_home_max_diff[] = { 0.2, 0.2, 0.5};
constexpr float axis_home_invert_min_diff[] = {-1, -1, -1};
constexpr float axis_home_invert_max_diff[] = { 1, 1, 1};
#endif// HOMING_MAX_ATTEMPTS

// Homing hits each endstop, retracts by these distances, then does a slower bump.
#define X_HOME_BUMP_MM 10
#define Y_HOME_BUMP_MM 10
Expand Down Expand Up @@ -1736,25 +1728,13 @@
// Milliseconds to wait on hold before auto-restarting during short power failures
#define POWER_PANIC_HOLD_RST_MS 5000

#ifdef HAS_LDO_400_STEP
// TODO: currently arbitrary, needs to include optimal feedrates too
#define POWER_PANIC_X_CURRENT 350 // (mA) RMS current for parking
#define POWER_PANIC_X_FEEDRATE 200 // (mm/s, running at POWER_PANIC_X_CURRENT)

#define POWER_PANIC_Z_CURRENT 350 // (mA) RMS current _after_ alignment
#define POWER_PANIC_Z_FEEDRATE 50 // (mm/s, running at default current)
#define POWER_PANIC_X_CURRENT 350 // (mA) RMS current for parking
#define POWER_PANIC_X_FEEDRATE 200 // (mm/s, running at POWER_PANIC_X_CURRENT)

#define POWER_PANIC_E_CURRENT 300 // (mA) RMS current
#else
// TODO: currently arbitrary
#define POWER_PANIC_X_CURRENT 350 // (mA) RMS current for parking
#define POWER_PANIC_X_FEEDRATE 200 // (mm/s, running at POWER_PANIC_X_CURRENT)
#define POWER_PANIC_Z_CURRENT 350 // (mA) RMS current _after_ alignment
#define POWER_PANIC_Z_FEEDRATE 50 // (mm/s, running at default current)

#define POWER_PANIC_Z_CURRENT 350 // (mA) RMS current _after_ alignment
#define POWER_PANIC_Z_FEEDRATE 50 // (mm/s, running at default current)

#define POWER_PANIC_E_CURRENT 300 // (mA) RMS current
#endif
#define POWER_PANIC_E_CURRENT 300 // (mA) RMS current
#endif

/**
Expand Down
Loading

0 comments on commit bfb0ffc

Please sign in to comment.