Merge pull request #44 from PavelSindler/MK2

German language added, updated spanish language messages, checking if…
prusa3d · Feb 14, 2017 · 5a584d9 · 5a584d9
2 parents b8fc055 + 590cc8f
commit 5a584d9
Show file tree

Hide file tree

Showing 13 changed files with 1,046 additions and 389 deletions.
diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h
@@ -5,7 +5,7 @@
 #include "Configuration_prusa.h"
 
 // Firmware version
-#define FW_version "3.0.10-RC1"
+#define FW_version "3.0.10"
 
 #define FW_PRUSA3D_MAGIC "PRUSA3DFW"
 #define FW_PRUSA3D_MAGIC_LEN 10

diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h
@@ -317,3 +317,13 @@ extern void calculate_volumetric_multipliers();
 // Similar to the default Arduino delay function, 
 // but it keeps the background tasks running.
 extern void delay_keep_alive(int ms);
+
+extern void check_babystep();
+
+#ifdef DIS
+
+void d_setup();
+float d_ReadData();
+void bed_analysis(float x_dimension, float y_dimension, int x_points_num, int y_points_num, float shift_x, float shift_y);
+
+#endif