Update mrbeam_index.jinja2

mr drawification
Update README.md
2018-06-29 01:29:29 +02:00 · 2018-06-29 01:12:06 +02:00 · 2018-06-29 01:04:49 +02:00 · 2017-01-20 11:30:05 +01:00 · 2016-10-04 13:03:35 +02:00
6 changed files with 22 additions and 23 deletions
--- a/README.md
+++ b/README.md
@ -1,5 +1,6 @@
 OctoPrint
 =========
 What I did was take the MrBeam fork of Octoprint (because I have a MrBeam, and I like it) - and modify it for pen plotting with an axidraw v3 clone.
 [![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=foosel&url=https://github.com/foosel/OctoPrint&title=OctoPrint&language=&tags=github&category=software)
--- a/src/octoprint/plugins/softwareupdate/scripts/git-pull.py
+++ b/src/octoprint/plugins/softwareupdate/scripts/git-pull.py
@ -97,7 +97,7 @@ def update_source(git_executable, folder, target, force=False):
 			raise RuntimeError("Could not update, \"git reset --hard\" failed with returncode %d: %s" % (returncode, stdout))
 	print(">>> Running: git pull")
-	returncode, stdout = _git(["pull"], folder, git_executable=git_executable)
+	returncode, stdout = _git(["pull", "origin", "stable-1.2.2"], folder, git_executable=git_executable)
 	if returncode != 0:
 		raise RuntimeError("Could not update, \"git pull\" failed with returncode %d: %s" % (returncode, stdout))
 	print(stdout)
--- a/src/octoprint/plugins/svgtogcode/static/js/working_area.js
+++ b/src/octoprint/plugins/svgtogcode/static/js/working_area.js
@ -133,9 +133,15 @@ $(function(){
 		};
 		self.getXYCoord = function(evt){
-			var scale = evt.target.parentElement.transform.baseVal[0].matrix.a;
+			if(/firefox/.test(navigator.userAgent.toLowerCase())) {
-			var x = self.px2mm(evt.offsetX) * scale;
+				var scale = evt.target.parentElement.transform.baseVal[0].matrix.a;
-			var y = self.px2mm(parseFloat(evt.target.attributes.height.value) - evt.offsetY) * scale;
+				var x = self.px2mm(evt.offsetX) * scale;
 				var y = self.px2mm(parseFloat(evt.target.attributes.height.value) - evt.offsetY) * scale;
 			} else
 			{
 				var x = self.px2mm(evt.offsetX);
 				var y = self.px2mm(parseFloat(evt.target.farthestViewportElement.clientHeight) - evt.offsetY);
 			}
 			x = Math.min(x, self.workingAreaWidthMM());
 			y = Math.min(y, self.workingAreaHeightMM());
 			return {x:x, y:y};
--- a/src/octoprint/static/img/mr-draw-red_x120.png
+++ b/src/octoprint/static/img/mr-draw-red_x120.png
--- a/src/octoprint/templates/mrbeam_index.jinja2
+++ b/src/octoprint/templates/mrbeam_index.jinja2
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
    <head>
-        <title data-bind="text: title">Mr Beam</title>
+        <title data-bind="text: title">Mr Draw</title>
        <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}">
        <link rel="apple-touch-icon" sizes="114x114" href="{{ url_for('static', filename='img/apple-touch-icon-114x114.png') }}">
@ -15,8 +15,8 @@
 		<nav class="navbar navbar-default navbar-fixed-top" role="navigation" id="navbar">
 			<div class="container">
 				<div class="navbar-header brand" style="min-width: 272px;">
-					<a class="navbar-brand" href="#" >
+					<a class="navbar-brand" href="#">
-						<img alt="Mr Beam Logo" src="{{ url_for('static', filename='img/mr-typo-red_x120.png') }}">
+						<img alt="Mr Draw Logo" src="{{ url_for('static', filename='img/mr-draw-red_x120.png') }}">
 					</a>
 				</div>
 				<!-- Navbar -->
@ -58,7 +58,7 @@
 									<div id="control" class="accordion-inner" data-bind="visible: isReady() || isLocked() || isFlashing()">
 										<div data-bind="visible: isLocked ">
-											Mr Beam is in a locked state as it does not know its position.
+											Mr Draw is in a locked state as it does not know its position.
 											First remove any objects blocking the gantry's travel range.
 											Then do a homing cycle.
 											<div style='text-align: center; padding:.5em;'>
@ -160,7 +160,7 @@
 												-->
 												{{ _('Approx. Total Job Time') }}: <strong data-bind="text: estimatedPrintTimeString"></strong><br>
 												<div data-bind="visible: isPrinting() || isPaused()">
-
+													
 													<div class="progress">
 														<div class="bar" id="job_progressBar" data-bind="style: { width: progressString() + '%' }">&nbsp;{{ _('Processed') }} :  <strong data-bind="text: byteString"></strong></div>
 													</div>
@ -183,7 +183,7 @@
 															</button>
 														</div>
 														<span>Passes</span>
-
+														
 													</div>
 												</div>
@ -533,7 +533,7 @@
 												<i class="icon-camera icon-white"></i>
 												<span>{{ _('Photo') }}</span>
 											</a>
-
+												
 										</div>
 										<div id="gcode_upload_progress" class="progress" style="width: 100%;">
 											<div class="bar" style="width: 0%"></div>
@ -657,12 +657,10 @@
 							<div class="span4">
 								<ul class="focus_steps">
 									<li>1. Place your material on the working area</li>
-									<li>2. Move the laser over the material</li>
+									<li>2. Move the pen over the material</li>
-									<li>3. Put on your safety glasses</li>
+									<li>&RightArrow; Now enable the pen calibration mode</li>
-									<li>4. Turn the laser safety switch to on</li>
+									<li>5. Adjust the pen until it touches the paper</li>
-									<li>&RightArrow; Now enable the focus mode</li>
+									<li>&RightArrow; Disable the pen calibration mode. </li>
 									<li>5. Adjust the focus until the laser beam is as small as possible</li>
 									<li>&RightArrow; Disable the focus mode. </li>
 								</ul>
 								<div style="text-align:center">
 								<div class="btn-group" role="group" aria-label="focus mode control" style="">
--- a/src/octoprint/util/comm_acc2.py
+++ b/src/octoprint/util/comm_acc2.py
@ -358,7 +358,6 @@ 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
@ -558,11 +557,6 @@ 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
James Devine	ceca65577c	Update mrbeam_index.jinja2	2018-06-29 01:29:29 +02:00
James Devine	47cd5345e8	mr drawification	2018-06-29 01:12:06 +02:00
James Devine	3a24067560	Update README.md	2018-06-29 01:04:49 +02:00
make-ing	ff8b77500b	changed pull command in git-pull.py script to fix my github delete repo fuck up.	2017-01-20 11:30:05 +01:00
make-ing	39c8f7886a	chrome vs. firefox bugfix... Maybe needs further check to see if it can be simplyfied. Maybe use other values etc...	2016-10-04 13:03:35 +02:00