From 126ca22f9908263ab960f4cce87c59367a4cc416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Sun, 20 Jan 2013 00:29:48 +0100 Subject: [PATCH 1/5] Moved LICENSE file to root directory to make it more visible. Added hint to README.md that OctoPrint is released under AGPL --- octoprint/LICENSE => LICENSE | 0 README.md | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) rename octoprint/LICENSE => LICENSE (100%) diff --git a/octoprint/LICENSE b/LICENSE similarity index 100% rename from octoprint/LICENSE rename to LICENSE diff --git a/README.md b/README.md index 8c8bde6..e19f628 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,10 @@ allows * optional: creation of timelapse recordings of the printjob via webcam stream (using e.g. MJPG-Streamer) -- currently two timelaspe methods are implemented, triggering a shot on z-layer change or every "n" seconds The intended usecase is to run OctoPrint on a single-board computer like the Raspberry Pi and a WiFi module, -connect the printer to the server and therefore create a WiFi-enabled 3D printer. +connect the printer to the server and therefore create a WiFi-enabled 3D printer. If you want to add a webcam for visual +monitoring and timelapse support, you'll need a **powered** USB hub. -If you want to add a webcam for visual monitoring and timelapse support, you'll need a **powered** USB hub. +OctoPrint is Free Software and released under the [GNU Affero General Public License V3](http://www.gnu.org/licenses/agpl.html). Dependencies ------------ From ac907cf94237fa8d9b05e8a467074e9fd00fcf82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Mon, 21 Jan 2013 18:38:31 +0100 Subject: [PATCH 2/5] Update README.md Added dependency on subversion package for compiling mjpg-streamer --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e19f628..22421f9 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,7 @@ You should then be able to start the OctoPrint server: If you also want webcam and timelapse support, you'll need to download and compile MJPG-Streamer: cd ~ - sudo apt-get install libjpeg8-dev imagemagick libav-tools + sudo apt-get install subversion libjpeg8-dev imagemagick libav-tools wget -Omjpg-streamer.tar.gz http://mjpg-streamer.svn.sourceforge.net/viewvc/mjpg-streamer/mjpg-streamer/?view=tar tar xfz mjpg-streamer.tar.gz cd mjpg-streamer @@ -201,4 +201,4 @@ I also want to thank [Janina Himmen](http://jhimmen.de/) for providing the kick- Why is it called OctoPrint and what's with the crystal ball in the logo? ------------------------------------------------------------------------ -It so happens that I needed a favicon and also OctoPrint's first name -- Printer WebUI -- simply lacked a certain coolness to it. So I asked The Internet(tm) for advise. After some brainstorming, the idea of a cute Octopus watching his print job remotely through a crystal ball was born... [or something like that](https://plus.google.com/u/0/106003970953341660077/posts/UmLD5mW8yBQ). \ No newline at end of file +It so happens that I needed a favicon and also OctoPrint's first name -- Printer WebUI -- simply lacked a certain coolness to it. So I asked The Internet(tm) for advise. After some brainstorming, the idea of a cute Octopus watching his print job remotely through a crystal ball was born... [or something like that](https://plus.google.com/u/0/106003970953341660077/posts/UmLD5mW8yBQ). From df443f335cafbd7665ec5250113deacf892c3a6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Sun, 27 Jan 2013 11:14:42 +0100 Subject: [PATCH 3/5] Updated README after repository rename --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index e19f628..30aaa2f 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,3 @@ -Attention -========= - -OctoPrint -- formerly known as Printer WebUI -- will be migrated to a new repository location reflecting its new name on Saturday 26th 2013. It will then -be located at http://github.com/foosel/OctoPrint. Please be prepared to upgrade your links and remote refs. Sorry for the inconvenience. - OctoPrint ========= From 1482292b33af2510cd26c5e67129f6caf478a809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Sun, 27 Jan 2013 11:23:01 +0100 Subject: [PATCH 4/5] Added instructions on what to do after the rename --- README.md | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 962654c..4d805a4 100644 --- a/README.md +++ b/README.md @@ -123,13 +123,13 @@ listed in requirements.txt: cd ~ sudo apt-get install python-pip git - git clone https://github.com/foosel/PrinterWebUI.git - cd PrinterWebUI + git clone https://github.com/foosel/OctoPrint.git + cd OctoPrint sudo pip install -r requirements.txt You should then be able to start the OctoPrint server: - pi@raspberrypi ~/PrinterWebUI $ ./run + pi@raspberrypi ~/OctoPrint $ ./run * Running on http://0.0.0.0:5000/ If you also want webcam and timelapse support, you'll need to download and compile MJPG-Streamer: @@ -196,3 +196,19 @@ Why is it called OctoPrint and what's with the crystal ball in the logo? ------------------------------------------------------------------------ It so happens that I needed a favicon and also OctoPrint's first name -- Printer WebUI -- simply lacked a certain coolness to it. So I asked The Internet(tm) for advise. After some brainstorming, the idea of a cute Octopus watching his print job remotely through a crystal ball was born... [or something like that](https://plus.google.com/u/0/106003970953341660077/posts/UmLD5mW8yBQ). + +What do I have to do after the rename from Printer WebUI to OctoPrint? +---------------------------------------------------------------------- + +If you did checkout OctoPrint from its previous location at https://github.com/foosel/PrinterWebUI.git, you'll have to +update your so-called remote references in git in order to make 'git pull' use the new repository location as origin. + +To do so you'll only need to execute the following command in your OctoPrint/PrinterWebUI folder: + + git remote set-url origin https://github.com/foosel/OctoPrint.git + +After that you might also want to rename your base directory (which probably still is called 'PrinterWebUI') to 'OctoPrint' +and delete the folder 'printer_webui' in your base folder (which stays there thanks to Python's compiled bytecode files +even after a rename of the Python package to 'octoprint'). + +After that you are set, the configuration files are migrated automatically :) \ No newline at end of file From 357514ca0e2753365cb6e2aed40f304d1c50649f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Sun, 27 Jan 2013 11:23:55 +0100 Subject: [PATCH 5/5] Added instructions on what to do after the rename --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4d805a4..ab587e4 100644 --- a/README.md +++ b/README.md @@ -205,7 +205,7 @@ update your so-called remote references in git in order to make 'git pull' use t To do so you'll only need to execute the following command in your OctoPrint/PrinterWebUI folder: - git remote set-url origin https://github.com/foosel/OctoPrint.git + git remote set-url origin https://github.com/foosel/OctoPrint.git After that you might also want to rename your base directory (which probably still is called 'PrinterWebUI') to 'OctoPrint' and delete the folder 'printer_webui' in your base folder (which stays there thanks to Python's compiled bytecode files