Merge conflic solved

Merge branch 'master' of github.com:daid/Cura

Conflicts:
	Cura/util/profile.py

Cura/cura_sf/fabmetheus_utilities/settings.py

@@ -90,6 +90,9 @@ def calcLayerSkip(setting):
 		return 0
 	return int(math.ceil((bottomThickness - layerThickness) / layerThickness + 0.0001) - 1)
 
+def calculateBridgeFlow(setting):
+	return (profile.getProfileSettingFloat('bridge_speed') / 100) * (profile.getProfileSettingFloat('bridge_material_amount') / 100)
+
 def getProfileInformation():
 	return {
 		'carve': {
@@ -179,7 +182,7 @@ def getProfileInformation():
 			'Activate_Speed': "True",
 			'Add_Flow_Rate': "True",
 			'Bridge_Feed_Rate_Multiplier_ratio': storedPercentSetting('bridge_speed'),
-			'Bridge_Flow_Rate_Multiplier_ratio': storedPercentSetting('bridge_material_amount'),
+			'Bridge_Flow_Rate_Multiplier_ratio': calculateBridgeFlow,
 			'Duty_Cyle_at_Beginning_portion': DEFSET,
 			'Duty_Cyle_at_Ending_portion': DEFSET,
 			'Feed_Rate_mm/s': storedSettingFloat("print_speed"),

Cura/firmware/default.h

@@ -1,17 +1,17 @@
 #ifndef __CONFIGURATION_H
 #define __CONFIGURATION_H
-#define STRING_VERSION_CONFIG_H "Marlin-Mon, 5 Mar 2012 09:56:50 -0800 - f3095493b06d52a33ae77a0b8c1f92a22633261a"
+#define STRING_VERSION_CONFIG_H "Marlin-Thu, 12 Apr 2012 14:01:30 +0200 - 414408b2d0fed428b55445f48b01d00932a7a92c"
 #define STRING_CONFIG_H_AUTHOR "Build-Me-Marlin"
 #define BAUDRATE 250000
 #define __ARDUINO_NR__ 4
 #define EXTRUDERS 1
-#define MINIMUM_PLANNER_SPEED 2.0
+#define MINIMUM_PLANNER_SPEED 0.05
 #define MOTHERBOARD 7
 #define HEATER_0_USES_AD595
 #define HEATER_0_MINTEMP 5
 #define HEATER_0_MAXTEMP 275
 #define BED_CHECK_INTERVAL 5000
-#define TEMP_RESIDENCY_TIME 30
+#define TEMP_RESIDENCY_TIME 5
 #define TEMP_HYSTERESIS 3
 #define TEMP_SENSOR_AD595_OFFSET 0.000000
 #define TEMP_SENSOR_AD595_GAIN   1.000000
@@ -24,8 +24,8 @@
 #define PID_dT 0.128
 #define PID_PID
 #define  DEFAULT_Kp 22.2
-#define  DEFAULT_Ki (1.25*PID_dT)
-#define  DEFAULT_Kd (99/PID_dT)
+#define  DEFAULT_Ki 1.08
+#define  DEFAULT_Kd 114
 #define PID_ADD_EXTRUSION_RATE
 #define  DEFAULT_Kc (1)
 #define ENDSTOPPULLUPS
@@ -81,6 +81,14 @@ const bool Z_ENDSTOPS_INVERTING = true;
 #define DEFAULT_STEPPER_DEACTIVE_COMMAND "M84 X Y E"
 #define EEPROM_SETTINGS
 #define EEPROM_CHITCHAT
+#define SDSUPPORT
+#define SD_FINISHED_STEPPERRELEASE true
+#define SD_FINISHED_RELEASECOMMAND "M84 X Y E"
+#define ULTIPANEL
+#define NEWPANEL
+#define ULTRA_LCD
+#define LCD_WIDTH 20
+#define LCD_HEIGHT 4
 #define PLA_PREHEAT_HOTEND_TEMP 180
 #define PLA_PREHEAT_HPB_TEMP 70
 #define PLA_PREHEAT_FAN_SPEED 255

Cura/gui/opengl.py

@@ -32,7 +32,7 @@ def InitGL(window, view3D, zoom):
 	glLoadIdentity()
 	aspect = float(size.GetWidth()) / float(size.GetHeight())
 	if view3D:
-		gluPerspective(90.0, aspect, 1.0, 1000.0)
+		gluPerspective(45.0, aspect, 1.0, 1000.0)
 	else:
 		glOrtho(-aspect, aspect, -1, 1, -1000.0, 1000.0)
 

Cura/gui/preview3d.py

@@ -119,6 +119,10 @@ class previewPanel(wx.Panel):
 		self.toolbar2.AddControl(self.rotate)
 		self.Bind(wx.EVT_SPINCTRL, self.OnRotate, self.rotate)
 
+		self.scaleMax = wx.Button(self.toolbar, -1, 'Max size', size=(21*3.5,21))
+		self.toolbar.AddControl(self.scaleMax)
+		self.Bind(wx.EVT_BUTTON, self.OnScaleMax, self.scaleMax)
+
 		self.toolbar2.Realize()
 		self.updateToolbar()
 		
@@ -168,6 +172,22 @@ class previewPanel(wx.Panel):
 		profile.putProfileSetting('model_scale', self.scale.GetValue())
 		self.updateModelTransform()
 	
+	def OnScaleMax(self, e):
+		if self.triangleMesh == None:
+			return
+		scale = float(self.scale.GetValue())
+		vMin = self.triangleMesh.getMinimum() / scale
+		vMax = self.triangleMesh.getMaximum() / scale
+		scaleX1 = (self.machineSize.x - self.machineCenter.x) / ((vMax.x - vMin.x) / 2)
+		scaleY1 = (self.machineSize.y - self.machineCenter.y) / ((vMax.y - vMin.y) / 2)
+		scaleX2 = (self.machineCenter.x) / ((vMax.x - vMin.x) / 2)
+		scaleY2 = (self.machineCenter.y) / ((vMax.y - vMin.y) / 2)
+		scaleZ = self.machineSize.z / (vMax.z - vMin.z)
+		scale = min(scaleX1, scaleY1, scaleX2, scaleY2, scaleZ)
+		self.scale.SetValue(str(scale))
+		profile.putProfileSetting('model_scale', self.scale.GetValue())
+		self.updateModelTransform()
+	
 	def OnRotate(self, e):
 		profile.putProfileSetting('model_rotate_base', self.rotate.GetValue())
 		self.updateModelTransform()
@@ -360,7 +380,7 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
 		wx.EVT_MOUSEWHEEL(self, self.OnMouseWheel)
 		self.yaw = 30
 		self.pitch = 60
-		self.zoom = 150
+		self.zoom = 300
 		self.offsetX = 0
 		self.offsetY = 0
 		self.view3D = True

Cura/util/profile.py

@@ -65,7 +65,7 @@ profileDefaultSettings = {
 	'raft_margin': '5',
 	'raft_base_material_amount': '100',
 	'raft_interface_material_amount': '100',
-	'bottom_thickness': '0.0',
+	'bottom_thickness': '0.3',
 	'add_start_end_gcode': 'True',
 	'gcode_extension': 'gcode',
 }
@@ -184,7 +184,7 @@ def putPreference(name, value):
 		globalPreferenceParser.read(getPreferencePath())
 	if not globalPreferenceParser.has_section('preference'):
 		globalPreferenceParser.add_section('preference')
-	globalPreferenceParser.set('preference', name, str(value).encode("utf-8"))
+	globalPreferenceParser.set('preference', name, unicode(value).encode("utf-8"))
 	globalPreferenceParser.write(open(getPreferencePath(), 'w'))
 
 #########################################################

Cura/util/util3d.py

@@ -27,6 +27,7 @@ class Vector3():
 
 	def __div__(self, v):
 		return Vector3( self.x / v, self.y / v, self.z / v )
+	__truediv__ = __div__
 
 	def __neg__(self):
 		return Vector3( - self.x, - self.y, - self.z )