Merge pull request prusa3d#3192 from 3d-gussner/PFW-1271_PF-buildv20

PFW-1271 PF-build v2.0.0
GHF · Aug 2, 2021 · 3bf5d93 · 3bf5d93
2 parents 4f40380 + fd6dbba
commit 3bf5d93
Show file tree

Hide file tree

Showing 4 changed files with 1,872 additions and 668 deletions.
diff --git a/.gitignore b/.gitignore
@@ -53,3 +53,5 @@ Firmware/Doc
 /Firmware/Firmware.vcxproj
 /Firmware/Configuration_prusa_bckp.h
 /Firmware/variants/printers.h
+Configuration.tmp
+config.tmp
diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h
@@ -19,7 +19,13 @@ extern PGM_P sPrinterName;
 #define FW_MAJOR 3
 #define FW_MINOR 10
 #define FW_REVISION 1
-#define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-RC1"
+//#define FW_FLAVOR RC      //uncomment if DEBUG, DEVEL, APLHA, BETA or RC
+//#define FW_FLAVERSION 1     //uncomment if FW_FLAVOR is defined and versioning is needed.
+#ifndef FW_FLAVOR
+    #define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION)
+#else
+    #define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_FLAVOR) "" STR(FW_FLAVERSION)
+#endif
 
 #define FW_COMMIT_NR 4587