Skip to content

Commit

Permalink
Add MK4
Browse files Browse the repository at this point in the history
  • Loading branch information
@dragomirecky
Prusa Research authored and dragomirecky committed Mar 24, 2023
1 parent 92146ff commit e688bdf
Show file tree
Hide file tree
Showing 2,175 changed files with 529,478 additions and 1,105 deletions.
8 changes: 4 additions & 4 deletions .vscode/launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,14 +221,14 @@
"request": "launch",
},
{
"name": "Launch MK404 Simulator",
"name": "Launch MK4 Simulator",
"type": "cortex-debug",
"servertype": "qemu",
"serverpath": "${workspaceRoot}/.dependencies/mini403-0.5.4/qemu-system-buddy",
"armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-10.3.1/bin",
"osx": {
"serverArgs": [
"-machine", "prusa-mk404",
"-machine", "prusa-mk4",
"-display", "cocoa",
"-drive", "id=usbstick,file=fat:rw:${workspaceFolder}/build-vscode-buddy/simulator/usbdir",
"-device", "usb-storage,drive=usbstick",
Expand All @@ -241,7 +241,7 @@
},
"windows": {
"serverArgs": [
"-machine", "prusa-mk404",
"-machine", "prusa-mk4",
"-display", "sdl",
"-drive", "id=usbstick,file=fat:rw:${workspaceFolder}\\build-vscode-buddy\\simulator\\usbdir",
"-device", "usb-storage,drive=usbstick",
Expand All @@ -254,7 +254,7 @@
},
"linux": {
"serverArgs": [
"-machine", "prusa-mk404",
"-machine", "prusa-mk4",
"-display", "gtk",
"-drive", "id=usbstick,file=fat:rw:${workspaceFolder}/build-vscode-buddy/simulator/usbdir",
"-device", "usb-storage,drive=usbstick",
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ set(PRINTER_VERSION "1") # default version
# The PRINTER_TYPE is (besides being used in the code) being stored in the .bbf and checked by the
# bootloader (which contains the same "enum" as below). Preferably do not use it on an interface
# though, there should be a better number to use there, e.g. the PRINTER_CODE (USB PID)
if(PRINTER STREQUAL "MK404")
if(PRINTER STREQUAL "MK4")
set(PRINTER_TYPE "1")
set(PRINTER_VERSION "4")
set(PRINTER_CODE "13")
Expand Down Expand Up @@ -290,7 +290,7 @@ add_compile_options(-g)
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
if(MCU MATCHES "STM32F40"
OR MCU MATCHES "STM32G0"
OR PRINTER STREQUAL "MK404"
OR PRINTER STREQUAL "MK4"
OR PRINTER STREQUAL "XL"
OR PRINTER STREQUAL "IXL"
)
Expand Down
64 changes: 40 additions & 24 deletions CMakePresets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@
"type": "BOOL",
"value": "YES"
},
"TRANSLATIONS_ENABLED": {
"type": "BOOL",
"value": "YES"
},
"BOOTLOADER": {
"type": "STRING",
"value": "YES"
Expand Down Expand Up @@ -106,6 +110,10 @@
"type": "BOOL",
"value": "YES"
},
"TRANSLATIONS_ENABLED": {
"type": "BOOL",
"value": "YES"
},
"BOOTLOADER": {
"type": "STRING",
"value": "NO"
Expand Down Expand Up @@ -173,6 +181,10 @@
"type": "BOOL",
"value": "YES"
},
"TRANSLATIONS_ENABLED": {
"type": "BOOL",
"value": "YES"
},
"BOOTLOADER": {
"type": "STRING",
"value": "YES"
Expand Down Expand Up @@ -240,6 +252,10 @@
"type": "BOOL",
"value": "YES"
},
"TRANSLATIONS_ENABLED": {
"type": "BOOL",
"value": "YES"
},
"BOOTLOADER": {
"type": "STRING",
"value": "NO"
Expand Down Expand Up @@ -275,7 +291,7 @@
}
},
{
"name": "mk404-xBuddy027c-400step-planetary_debug_boot",
"name": "mk4-xBuddy027c-400step-planetary_debug_boot",
"generator": "Ninja",
"binaryDir": "build-vscode-buddy",
"cacheVariables": {
Expand All @@ -289,7 +305,7 @@
},
"PRINTER": {
"type": "STRING",
"value": "MK404"
"value": "MK4"
},
"BOARD": {
"type": "STRING",
Expand Down Expand Up @@ -338,7 +354,7 @@
}
},
{
"name": "mk404-xBuddy027c-400step-planetary_debug_noboot",
"name": "mk4-xBuddy027c-400step-planetary_debug_noboot",
"generator": "Ninja",
"binaryDir": "build-vscode-buddy",
"cacheVariables": {
Expand All @@ -352,7 +368,7 @@
},
"PRINTER": {
"type": "STRING",
"value": "MK404"
"value": "MK4"
},
"BOARD": {
"type": "STRING",
Expand Down Expand Up @@ -401,7 +417,7 @@
}
},
{
"name": "mk404-xBuddy027c-400step-planetary_release_boot",
"name": "mk4-xBuddy027c-400step-planetary_release_boot",
"generator": "Ninja",
"binaryDir": "build-vscode-buddy",
"cacheVariables": {
Expand All @@ -415,7 +431,7 @@
},
"PRINTER": {
"type": "STRING",
"value": "MK404"
"value": "MK4"
},
"BOARD": {
"type": "STRING",
Expand Down Expand Up @@ -464,7 +480,7 @@
}
},
{
"name": "mk404-xBuddy027c-400step-planetary_release_noboot",
"name": "mk4-xBuddy027c-400step-planetary_release_noboot",
"generator": "Ninja",
"binaryDir": "build-vscode-buddy",
"cacheVariables": {
Expand All @@ -478,7 +494,7 @@
},
"PRINTER": {
"type": "STRING",
"value": "MK404"
"value": "MK4"
},
"BOARD": {
"type": "STRING",
Expand Down Expand Up @@ -527,7 +543,7 @@
}
},
{
"name": "mk404-xBuddy034-400step_debug_boot",
"name": "mk4-xBuddy034-400step_debug_boot",
"generator": "Ninja",
"binaryDir": "build-vscode-buddy",
"cacheVariables": {
Expand All @@ -541,7 +557,7 @@
},
"PRINTER": {
"type": "STRING",
"value": "MK404"
"value": "MK4"
},
"BOARD": {
"type": "STRING",
Expand Down Expand Up @@ -590,7 +606,7 @@
}
},
{
"name": "mk404-xBuddy034-400step_debug_noboot",
"name": "mk4-xBuddy034-400step_debug_noboot",
"generator": "Ninja",
"binaryDir": "build-vscode-buddy",
"cacheVariables": {
Expand All @@ -604,7 +620,7 @@
},
"PRINTER": {
"type": "STRING",
"value": "MK404"
"value": "MK4"
},
"BOARD": {
"type": "STRING",
Expand Down Expand Up @@ -653,7 +669,7 @@
}
},
{
"name": "mk404-xBuddy034-400step_release_boot",
"name": "mk4-xBuddy034-400step_release_boot",
"generator": "Ninja",
"binaryDir": "build-vscode-buddy",
"cacheVariables": {
Expand All @@ -667,7 +683,7 @@
},
"PRINTER": {
"type": "STRING",
"value": "MK404"
"value": "MK4"
},
"BOARD": {
"type": "STRING",
Expand Down Expand Up @@ -716,7 +732,7 @@
}
},
{
"name": "mk404-xBuddy034-400step_release_noboot",
"name": "mk4-xBuddy034-400step_release_noboot",
"generator": "Ninja",
"binaryDir": "build-vscode-buddy",
"cacheVariables": {
Expand All @@ -730,7 +746,7 @@
},
"PRINTER": {
"type": "STRING",
"value": "MK404"
"value": "MK4"
},
"BOARD": {
"type": "STRING",
Expand Down Expand Up @@ -779,7 +795,7 @@
}
},
{
"name": "mk404-xBuddy034-400step-planetary_debug_boot",
"name": "mk4-xBuddy034-400step-planetary_debug_boot",
"generator": "Ninja",
"binaryDir": "build-vscode-buddy",
"cacheVariables": {
Expand All @@ -793,7 +809,7 @@
},
"PRINTER": {
"type": "STRING",
"value": "MK404"
"value": "MK4"
},
"BOARD": {
"type": "STRING",
Expand Down Expand Up @@ -842,7 +858,7 @@
}
},
{
"name": "mk404-xBuddy034-400step-planetary_debug_noboot",
"name": "mk4-xBuddy034-400step-planetary_debug_noboot",
"generator": "Ninja",
"binaryDir": "build-vscode-buddy",
"cacheVariables": {
Expand All @@ -856,7 +872,7 @@
},
"PRINTER": {
"type": "STRING",
"value": "MK404"
"value": "MK4"
},
"BOARD": {
"type": "STRING",
Expand Down Expand Up @@ -905,7 +921,7 @@
}
},
{
"name": "mk404-xBuddy034-400step-planetary_release_boot",
"name": "mk4-xBuddy034-400step-planetary_release_boot",
"generator": "Ninja",
"binaryDir": "build-vscode-buddy",
"cacheVariables": {
Expand All @@ -919,7 +935,7 @@
},
"PRINTER": {
"type": "STRING",
"value": "MK404"
"value": "MK4"
},
"BOARD": {
"type": "STRING",
Expand Down Expand Up @@ -968,7 +984,7 @@
}
},
{
"name": "mk404-xBuddy034-400step-planetary_release_noboot",
"name": "mk4-xBuddy034-400step-planetary_release_noboot",
"generator": "Ninja",
"binaryDir": "build-vscode-buddy",
"cacheVariables": {
Expand All @@ -982,7 +998,7 @@
},
"PRINTER": {
"type": "STRING",
"value": "MK404"
"value": "MK4"
},
"BOARD": {
"type": "STRING",
Expand Down
Loading

2 comments on commit e688bdf

@arekm
Copy link

@arekm arekm commented on e688bdf Mar 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will we see proper branch / tags / development history in github for this firmware instead of this huge code drop in single commit ?

@arekm
Copy link

@arekm arekm commented on e688bdf Mar 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository."

Please sign in to comment.