From 834b010eb10d52b0bbe83a0a9c6aff92493105ea Mon Sep 17 00:00:00 2001 From: Jacob Oliver Date: Sat, 13 Aug 2016 10:55:01 +0100 Subject: [PATCH 01/15] Create Ubuntu-Install.sh Create an easy installer for Ubuntu systems --- Installers/Ubuntu-Install.sh | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 Installers/Ubuntu-Install.sh diff --git a/Installers/Ubuntu-Install.sh b/Installers/Ubuntu-Install.sh new file mode 100644 index 0000000..c9a211f --- /dev/null +++ b/Installers/Ubuntu-Install.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +echo Please enter your password to continue... +sudo su + +# Install the following dependencies from repositories without asking questions, git-core can be removed afterwords as it's only used to initialise a local git repository +echo Installing dependencies +apt-get -y install git-core python3 cython3 libusb python3-pip + +# Install the hidapi dependency +pip install hidapi + +# Get the sudoers home directory before changing directory into it +eval echo "~$SUDO_USER" && cd - + +# Make a directory called python-evic under the sudoers home directory +mkdir python-evic + +# Clone the pythin-evic repository the change directory into it +echo Cloning python-evic repository +git clone git://github.com/Ban3/python-evic.git ./python-evic && cd ./python-evic + +# Install python-evic +echo Installing python-evic +python3 setup.py install + +echo Installation complete. Run \"sudo evic-usb upload /path/to/firmware.bin\" to install a new firmware. From 9d65caf2cb0372cc11a78f415fe4db5de17a7cdc Mon Sep 17 00:00:00 2001 From: Jacob Oliver Date: Sat, 13 Aug 2016 14:47:05 +0100 Subject: [PATCH 02/15] Update Ubuntu-Install.sh --- Installers/Ubuntu-Install.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Installers/Ubuntu-Install.sh b/Installers/Ubuntu-Install.sh index c9a211f..5a80e81 100644 --- a/Installers/Ubuntu-Install.sh +++ b/Installers/Ubuntu-Install.sh @@ -1,14 +1,13 @@ #!/bin/sh echo Please enter your password to continue... -sudo su # Install the following dependencies from repositories without asking questions, git-core can be removed afterwords as it's only used to initialise a local git repository echo Installing dependencies -apt-get -y install git-core python3 cython3 libusb python3-pip +sudo apt-get -y install git-core python3 cython3 libusb python3-pip # Install the hidapi dependency -pip install hidapi +sudo pip install hidapi # Get the sudoers home directory before changing directory into it eval echo "~$SUDO_USER" && cd - @@ -22,6 +21,6 @@ git clone git://github.com/Ban3/python-evic.git ./python-evic && cd ./python-evi # Install python-evic echo Installing python-evic -python3 setup.py install +sudo python3 setup.py install echo Installation complete. Run \"sudo evic-usb upload /path/to/firmware.bin\" to install a new firmware. From c2f7c04448a8cb54fb0d1fec390e3db98c67d25d Mon Sep 17 00:00:00 2001 From: Jacob Oliver Date: Sat, 13 Aug 2016 14:50:16 +0100 Subject: [PATCH 03/15] Update README.rst Update to add information about tested and supported devices --- README.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index dc76d7f..6ad9a1d 100644 --- a/README.rst +++ b/README.rst @@ -20,7 +20,8 @@ Supported devices * Vaporflask Classic* * Vaporflask Lite* * Vaporflask Stout* -* Reuleaux RX200* +* Reuleaux RX200 +* Reuleaux RX200S \*Untested @@ -29,6 +30,8 @@ Tested firmware versions * Evic VTC Mini <=3.02 * Presa TC75W 1.02\* +* RX200 3.10 +* RX200S 4.10 * Examples from `evic-sdk `_ \*Flashing Presa firmware to a VTC Mini requires changing the hardware version From 98a3e04b4c2c5de5cc665c3ae78a386cbf782f8f Mon Sep 17 00:00:00 2001 From: Jacob Oliver Date: Sat, 13 Aug 2016 15:09:47 +0100 Subject: [PATCH 04/15] Update Ubuntu-Install.sh --- Installers/Ubuntu-Install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Installers/Ubuntu-Install.sh b/Installers/Ubuntu-Install.sh index 5a80e81..9d10de4 100644 --- a/Installers/Ubuntu-Install.sh +++ b/Installers/Ubuntu-Install.sh @@ -4,13 +4,13 @@ echo Please enter your password to continue... # Install the following dependencies from repositories without asking questions, git-core can be removed afterwords as it's only used to initialise a local git repository echo Installing dependencies -sudo apt-get -y install git-core python3 cython3 libusb python3-pip +sudo apt-get -y install git-core python3 cython3 libusb-1.0.0 python3-pip # Install the hidapi dependency sudo pip install hidapi # Get the sudoers home directory before changing directory into it -eval echo "~$SUDO_USER" && cd - +cd ~ # Make a directory called python-evic under the sudoers home directory mkdir python-evic From 51f886ca586a65f34e4265ec54e49e840f5944fe Mon Sep 17 00:00:00 2001 From: Jacob Oliver Date: Sat, 13 Aug 2016 16:59:58 +0100 Subject: [PATCH 05/15] Update Ubuntu-Install.sh --- Installers/Ubuntu-Install.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Installers/Ubuntu-Install.sh b/Installers/Ubuntu-Install.sh index 9d10de4..a308429 100644 --- a/Installers/Ubuntu-Install.sh +++ b/Installers/Ubuntu-Install.sh @@ -4,10 +4,7 @@ echo Please enter your password to continue... # Install the following dependencies from repositories without asking questions, git-core can be removed afterwords as it's only used to initialise a local git repository echo Installing dependencies -sudo apt-get -y install git-core python3 cython3 libusb-1.0.0 python3-pip - -# Install the hidapi dependency -sudo pip install hidapi +sudo apt-get -y install git-core python3 cython3 libusb-1.0.0 python3-pip python3-hidapi python3-pil # Get the sudoers home directory before changing directory into it cd ~ From e255d26b912c67ff34834eb23b4e859c6b6ae70a Mon Sep 17 00:00:00 2001 From: Jacob Oliver Date: Sat, 13 Aug 2016 17:04:25 +0100 Subject: [PATCH 06/15] Update Ubuntu-Install.sh --- Installers/Ubuntu-Install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installers/Ubuntu-Install.sh b/Installers/Ubuntu-Install.sh index a308429..e53b0cb 100644 --- a/Installers/Ubuntu-Install.sh +++ b/Installers/Ubuntu-Install.sh @@ -4,7 +4,7 @@ echo Please enter your password to continue... # Install the following dependencies from repositories without asking questions, git-core can be removed afterwords as it's only used to initialise a local git repository echo Installing dependencies -sudo apt-get -y install git-core python3 cython3 libusb-1.0.0 python3-pip python3-hidapi python3-pil +sudo apt-get -y install git-core python3 cython3 libusb-1.0.0 python3-pip python3-hidapi python3-pil python3-setuptools # Get the sudoers home directory before changing directory into it cd ~ From 5924577b34034b3f325abeef63b6e1f57804e44f Mon Sep 17 00:00:00 2001 From: Jacob Oliver Date: Sat, 13 Aug 2016 17:19:25 +0100 Subject: [PATCH 07/15] Update Ubuntu-Install.sh --- Installers/Ubuntu-Install.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Installers/Ubuntu-Install.sh b/Installers/Ubuntu-Install.sh index e53b0cb..513ddeb 100644 --- a/Installers/Ubuntu-Install.sh +++ b/Installers/Ubuntu-Install.sh @@ -4,7 +4,10 @@ echo Please enter your password to continue... # Install the following dependencies from repositories without asking questions, git-core can be removed afterwords as it's only used to initialise a local git repository echo Installing dependencies -sudo apt-get -y install git-core python3 cython3 libusb-1.0.0 python3-pip python3-hidapi python3-pil python3-setuptools +sudo apt-get -y install git-core libusb-1.0.0 libudev-dev python3 cython3 python3-pip python3-pil python3-setuptools + +cd /tmp +pip3 install hidapi # Get the sudoers home directory before changing directory into it cd ~ From 1a0fbdda3be27939df5f709f7d01998cb3f7595a Mon Sep 17 00:00:00 2001 From: Jacob Oliver Date: Sat, 13 Aug 2016 17:22:34 +0100 Subject: [PATCH 08/15] Update Ubuntu-Install.sh --- Installers/Ubuntu-Install.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Installers/Ubuntu-Install.sh b/Installers/Ubuntu-Install.sh index 513ddeb..061d27b 100644 --- a/Installers/Ubuntu-Install.sh +++ b/Installers/Ubuntu-Install.sh @@ -12,12 +12,14 @@ pip3 install hidapi # Get the sudoers home directory before changing directory into it cd ~ -# Make a directory called python-evic under the sudoers home directory -mkdir python-evic +# If the git repository already exists then delete it +if [ -d "python-evic" ]; then + rm -Rf python-evic +fi # Clone the pythin-evic repository the change directory into it echo Cloning python-evic repository -git clone git://github.com/Ban3/python-evic.git ./python-evic && cd ./python-evic +git clone git://github.com/Ban3/python-evic.git && cd ./python-evic # Install python-evic echo Installing python-evic From b595ec65a33aadf0c85b5781ae4c8bf175bb10b6 Mon Sep 17 00:00:00 2001 From: Jacob Oliver Date: Sat, 13 Aug 2016 17:39:56 +0100 Subject: [PATCH 09/15] Update Ubuntu-Install.sh --- Installers/Ubuntu-Install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installers/Ubuntu-Install.sh b/Installers/Ubuntu-Install.sh index 061d27b..782e7f4 100644 --- a/Installers/Ubuntu-Install.sh +++ b/Installers/Ubuntu-Install.sh @@ -7,7 +7,7 @@ echo Installing dependencies sudo apt-get -y install git-core libusb-1.0.0 libudev-dev python3 cython3 python3-pip python3-pil python3-setuptools cd /tmp -pip3 install hidapi +pip3 install hidapi click # Get the sudoers home directory before changing directory into it cd ~ From 42480e7e729fc35b662a53a1ce1006f7559f0546 Mon Sep 17 00:00:00 2001 From: Jacob Oliver Date: Sat, 13 Aug 2016 17:44:51 +0100 Subject: [PATCH 10/15] Update README.rst --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 6ad9a1d..db5346d 100644 --- a/README.rst +++ b/README.rst @@ -47,7 +47,7 @@ Using ``evic-usb`` requires ``cython-hidapi``. You can install it using ``pip`` :: - $ pip install hidapi + $ pip install hidapi click setuptools pil Building ``cython-hidapi`` requires libusb headers and cython. On Arch Linux they can be obtained from the repositories by installing packages ``libusb`` and ``cython``. Debian based distributions will have packages ``libusb-1.0-0-dev`` and ``cython``. From 0156987329cf89c81de42a1e794650f309b9c796 Mon Sep 17 00:00:00 2001 From: Jacob Oliver Date: Sat, 13 Aug 2016 17:48:11 +0100 Subject: [PATCH 11/15] Update device.py --- evic/device.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/evic/device.py b/evic/device.py index ae124af..1cb8c01 100644 --- a/evic/device.py +++ b/evic/device.py @@ -62,7 +62,8 @@ class HIDTransfer(object): 'W010': "Classic", 'W011': "Lite", 'W013': "Stout", - 'W014': "Reuleaux RX200"} + 'W014': "Reuleaux RX200", + 'W033': "Reuleaux RX200S"} supported_product_ids = {'E052': ['E052', 'W007'], 'E056': ['E056'], 'E060': ['E060'], @@ -72,7 +73,8 @@ class HIDTransfer(object): 'W010': ['W010'], 'W011': ['W011'], 'W013': ['W013'], - 'W014': ['W014']} + 'W014': ['W014'], + 'W064': ['W064'] supported_logo_size = {'E052': (64, 40), 'E056': (64, 40), 'E060': (64, 40), From 55ea9266841b177ea5cd50ff4f1a30c19342074b Mon Sep 17 00:00:00 2001 From: Jacob Oliver Date: Sat, 13 Aug 2016 17:48:35 +0100 Subject: [PATCH 12/15] Update device.py --- evic/device.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evic/device.py b/evic/device.py index 1cb8c01..4c3a4c3 100644 --- a/evic/device.py +++ b/evic/device.py @@ -74,7 +74,7 @@ class HIDTransfer(object): 'W011': ['W011'], 'W013': ['W013'], 'W014': ['W014'], - 'W064': ['W064'] + 'W064': ['W064']} supported_logo_size = {'E052': (64, 40), 'E056': (64, 40), 'E060': (64, 40), From 5b2a4c788b4d44f0f441a5ff7cfdc9492a0e0eb3 Mon Sep 17 00:00:00 2001 From: Jacob Oliver Date: Sat, 13 Aug 2016 18:30:25 +0100 Subject: [PATCH 13/15] Update README.rst --- README.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.rst b/README.rst index db5346d..d6ea7bb 100644 --- a/README.rst +++ b/README.rst @@ -40,6 +40,11 @@ on some devices. Backup your data flash before flashing! Installation ------------- +Installing on Ubuntu: +^^^^^^^^^^^^^^^^^^^^^^ +Download Ubuntu-Install.sh from the Installers directory. Right click > Properties > Mark Executable. +It will automatically download and install all of the required dependencies and evic-usb. + Install from source: ^^^^^^^^^^^^^^^^^^^^^^ From a6e4f518d1b163475f2173c55087f366680802e6 Mon Sep 17 00:00:00 2001 From: Jacob Oliver Date: Sat, 13 Aug 2016 18:31:28 +0100 Subject: [PATCH 14/15] Update Ubuntu-Install.sh --- Installers/Ubuntu-Install.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Installers/Ubuntu-Install.sh b/Installers/Ubuntu-Install.sh index 782e7f4..2359df3 100644 --- a/Installers/Ubuntu-Install.sh +++ b/Installers/Ubuntu-Install.sh @@ -25,4 +25,8 @@ git clone git://github.com/Ban3/python-evic.git && cd ./python-evic echo Installing python-evic sudo python3 setup.py install +# Cleanup +cd ../ +rm -Rf python-evic + echo Installation complete. Run \"sudo evic-usb upload /path/to/firmware.bin\" to install a new firmware. From 8614ccc59600a573ea9fa748a884175ac2c5bb17 Mon Sep 17 00:00:00 2001 From: Jacob Oliver Date: Mon, 15 Aug 2016 10:14:11 +0100 Subject: [PATCH 15/15] Update Ubuntu-Install.sh Create python-evic under /tmp instead of users home directory --- Installers/Ubuntu-Install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Installers/Ubuntu-Install.sh b/Installers/Ubuntu-Install.sh index 2359df3..be59e98 100644 --- a/Installers/Ubuntu-Install.sh +++ b/Installers/Ubuntu-Install.sh @@ -9,8 +9,8 @@ sudo apt-get -y install git-core libusb-1.0.0 libudev-dev python3 cython3 python cd /tmp pip3 install hidapi click -# Get the sudoers home directory before changing directory into it -cd ~ +# Build within /tmp +cd /tmp # If the git repository already exists then delete it if [ -d "python-evic" ]; then