Merge branch 'PFW-1189' of https://github.com/3d-gussner/Prusa-Firmware into PFW-1189
This commit is contained in:
commit
40c8f3e1ca
2 changed files with 2 additions and 2 deletions
|
@ -17,7 +17,7 @@ extern PGM_P sPrinterName;
|
||||||
|
|
||||||
// Firmware version
|
// Firmware version
|
||||||
#define FW_VERSION "3.10.0-RC2"
|
#define FW_VERSION "3.10.0-RC2"
|
||||||
#define FW_COMMIT_NR 4903
|
#define FW_COMMIT_NR 4104
|
||||||
// FW_VERSION_UNKNOWN means this is an unofficial build.
|
// FW_VERSION_UNKNOWN means this is an unofficial build.
|
||||||
// The firmware should only be checked into github with this symbol.
|
// The firmware should only be checked into github with this symbol.
|
||||||
#define FW_DEV_VERSION FW_VERSION_UNKNOWN
|
#define FW_DEV_VERSION FW_VERSION_UNKNOWN
|
||||||
|
|
|
@ -272,7 +272,7 @@
|
||||||
|
|
||||||
#MSG_STACK_ERROR c=20 r=4
|
#MSG_STACK_ERROR c=20 r=4
|
||||||
"Error - static memory has been overwritten"
|
"Error - static memory has been overwritten"
|
||||||
"Chyba - Doslo k prepisu staticke pameti!"
|
"Chyba - Doslo k prepisu staticke pameti"
|
||||||
|
|
||||||
#MSG_CUT_FILAMENT c=16
|
#MSG_CUT_FILAMENT c=16
|
||||||
"Cut filament"
|
"Cut filament"
|
||||||
|
|
Loading…
Reference in a new issue