Merge branch 'stable-1.2.2' into v2_proto

remove fake bg stuff
2016-07-27 15:15:19 +02:00 · 2016-04-18 15:21:14 +02:00 · 2016-03-24 16:29:27 +01:00 · 2016-03-23 16:33:50 +01:00 · 2016-03-23 16:25:19 +01:00 · 2016-03-23 16:24:20 +01:00
2 changed files with 10 additions and 4 deletions
--- a/src/octoprint/util/comm_acc2.py
+++ b/src/octoprint/util/comm_acc2.py
@ -358,6 +358,7 @@ class MachineCom(object):
 	def _handle_ok_message(self):
 		if self._state == self.STATE_HOMING:
 			self._changeState(self.STATE_OPERATIONAL)
 			self._onHomingDone()
 	def _handle_error_message(self, line):
 		self._errorValue = line
@ -557,6 +558,11 @@ class MachineCom(object):
 		payload = dict(port=self._port, baudrate=self._baudrate)
 		eventManager().fire(Events.CONNECTED, payload)
 	def _onHomingDone(self):
 		self.sendCommand("G92X500Y0Z0")
 		self.sendCommand("G90")
 		self.sendCommand("G21")
 	def _detectPort(self, close):
 		self._log("Serial port list: %s" % (str(serialList())))
 		for p in serialList():
Author	SHA1	Message	Date
make-ing	f799a3285f	Merge branch 'stable-1.2.2' into v2_proto	2016-07-27 15:15:19 +02:00
make-ing	26a5692543	Merge branch 'stable-1.2.2' into v2_proto	2016-04-18 15:21:14 +02:00
make-ing	7352c551ec	remove fake bg stuff	2016-03-24 16:29:27 +01:00
make-ing	19eb4b690a	reset fake bg stuff	2016-03-23 16:33:50 +01:00
make-ing	ca54be985e	Merge remote-tracking branch 'origin/v2_proto' into v2_proto	2016-03-23 16:25:19 +01:00
make-ing	b105047cad	Merge branch 'stable-1.2.2' into v2_proto	2016-03-23 16:24:20 +01:00
Teja	89d493a33b	stretched preview	2016-03-19 08:55:11 +01:00
Teja	d89ec331da	fake_bg	2016-03-19 08:41:12 +01:00
Teja	f54d932928	fake_bg	2016-03-19 08:40:22 +01:00
make-ing	14f83133b7	added _onHomingDone method and call to ok handler and changed G92 Gcode to X500Y0Z0	2016-03-04 14:56:49 +01:00