diff --git a/.gitignore b/.gitignore index 258a1a5..88deea8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /lulzbot-15.02.1-1.03.tar.gz /cura-lulzbot-17.10.tar.gz /cura-lulzbot-19.01.tar.gz +/cura-lulzbot-19.05.tar.gz diff --git a/cura-lulzbot-no-firmware.patch b/cura-lulzbot-no-firmware.patch index 3a4a959..1febe9d 100644 --- a/cura-lulzbot-no-firmware.patch +++ b/cura-lulzbot-no-firmware.patch @@ -1,34 +1,35 @@ -diff -up cura-lulzbot-19.01/Cura/gui/firmwareInstall.py.nofw cura-lulzbot-19.01/Cura/gui/firmwareInstall.py ---- cura-lulzbot-19.01/Cura/gui/firmwareInstall.py.nofw 2015-12-02 08:25:19.000000000 -0800 -+++ cura-lulzbot-19.01/Cura/gui/firmwareInstall.py 2016-01-08 10:51:40.660274545 -0800 -@@ -18,69 +18,6 @@ from Cura.util import profile +diff -up cura-lulzbot-19.05/Cura/gui/firmwareInstall.py.nofw cura-lulzbot-19.05/Cura/gui/firmwareInstall.py +--- cura-lulzbot-19.05/Cura/gui/firmwareInstall.py.nofw 2016-02-24 15:23:41.000000000 -0500 ++++ cura-lulzbot-19.05/Cura/gui/firmwareInstall.py 2016-03-18 13:32:19.368592635 -0400 +@@ -18,70 +18,6 @@ from Cura.util import profile from Cura.util import resources def getDefaultFirmware(machineIndex = None): - firmwareDict = { - 'ultimaker2go':"MarlinUltimaker2go.hex", - 'Witbox':"MarlinWitbox.hex", -- 'lulzbot_mini': "Mini-Single-or-Flexystruder-LBHexagon-2015Q2.hex", -- 'lulzbot_mini_flexystruder': "Mini-Single-or-Flexystruder-LBHexagon-2015Q2.hex", -- 'lulzbot_TAZ_4_SingleV1': "Taz4-5-Single-or-Flexystruder-Budaschnozzle-2014Q3.hex", -- 'lulzbot_TAZ_5_SingleV1': "Taz4-5-Single-or-Flexystruder-Budaschnozzle-2014Q3.hex", -- 'lulzbot_TAZ_4_05nozzle': "Taz4-Single-Extruder-LBHexagon-2015Q3.hex", -- 'lulzbot_TAZ_5_05nozzle': "Taz5-Single-Extruder-LBHexagon-2015Q3.hex", -- 'lulzbot_TAZ_4_035nozzle': "Taz4-Single-Extruder-LBHexagon-2015Q3.hex", -- 'lulzbot_TAZ_5_035nozzle': "Taz5-Single-Extruder-LBHexagon-2015Q3.hex", -- 'lulzbot_TAZ_4_FlexystruderV1': "Taz4-5-Single-or-Flexystruder-Budaschnozzle-2014Q3.hex", -- 'lulzbot_TAZ_5_FlexystruderV1': "Taz4-5-Single-or-Flexystruder-Budaschnozzle-2014Q3.hex", -- 'lulzbot_TAZ_4_FlexystruderV2': "Taz4-5-Flexystruder-LBHexagon-2015Q3.hex", -- 'lulzbot_TAZ_5_FlexystruderV2': "Taz4-5-Flexystruder-LBHexagon-2015Q3.hex", -- 'lulzbot_TAZ_4_DualV1': "Taz4-5-Dual-or-FlexyDually-Budaschnozzle-2015Q1.hex", -- 'lulzbot_TAZ_5_DualV1': "Taz4-5-Dual-or-FlexyDually-Budaschnozzle-2015Q1.hex", -- 'lulzbot_TAZ_4_DualV2': "Taz4-5-Dual-LBHexagon-2015Q3.hex", -- 'lulzbot_TAZ_5_DualV2': "Taz4-5-Dual-LBHexagon-2015Q3.hex", -- 'lulzbot_TAZ_4_FlexyDuallyV1': "Taz4-5-Dual-or-FlexyDually-Budaschnozzle-2015Q1.hex", -- 'lulzbot_TAZ_5_FlexyDuallyV1': "Taz4-5-Dual-or-FlexyDually-Budaschnozzle-2015Q1.hex", -- 'lulzbot_TAZ_4_FlexyDuallyV2': "Taz4-5-FlexyDually-LBHexagon-2015Q3.hex", -- 'lulzbot_TAZ_5_FlexyDuallyV2': "Taz4-5-FlexyDually-LBHexagon-2015Q3.hex", -- 'lulzbot_TAZ_6_SingleTilapia': "Taz6-Single-Tilapia-2015-Q4.hex" +- 'lulzbot_mini': "Mini-Single-or-Flexystruder-LBHexagon-2015Q3.hex", +- 'lulzbot_mini_flexystruder': "Mini-Single-or-Flexystruder-LBHexagon-2015Q3.hex", +- 'lulzbot_TAZ_4_SingleV1': "TAZ4-5-Single-or-Flexystruder-Budaschnozzle-2014Q3.hex", +- 'lulzbot_TAZ_5_SingleV1': "TAZ4-5-Single-or-Flexystruder-Budaschnozzle-2014Q3.hex", +- 'lulzbot_TAZ_4_05nozzle': "TAZ4-Single-Extruder-LBHexagon-2015Q3.hex", +- 'lulzbot_TAZ_5_05nozzle': "TAZ5-Single-Extruder-LBHexagon-2015Q3.hex", +- 'lulzbot_TAZ_4_035nozzle': "TAZ4-Single-Extruder-LBHexagon-2015Q3.hex", +- 'lulzbot_TAZ_5_035nozzle': "TAZ5-Single-Extruder-LBHexagon-2015Q3.hex", +- 'lulzbot_TAZ_4_FlexystruderV1': "TAZ4-5-Single-or-Flexystruder-Budaschnozzle-2014Q3.hex", +- 'lulzbot_TAZ_5_FlexystruderV1': "TAZ4-5-Single-or-Flexystruder-Budaschnozzle-2014Q3.hex", +- 'lulzbot_TAZ_4_FlexystruderV2': "TAZ4-5-Flexystruder-LBHexagon-2015Q3.hex", +- 'lulzbot_TAZ_5_FlexystruderV2': "TAZ4-5-Flexystruder-LBHexagon-2015Q3.hex", +- 'lulzbot_TAZ_4_DualV1': "TAZ4-5-Dual-or-FlexyDually-Budaschnozzle-2015Q1.hex", +- 'lulzbot_TAZ_5_DualV1': "TAZ4-5-Dual-or-FlexyDually-Budaschnozzle-2015Q1.hex", +- 'lulzbot_TAZ_4_DualV2': "TAZ4-5-Dual-LBHexagon-2015Q3.hex", +- 'lulzbot_TAZ_5_DualV2': "TAZ4-5-Dual-LBHexagon-2015Q3.hex", +- 'lulzbot_TAZ_4_FlexyDuallyV1': "TAZ4-5-Dual-or-FlexyDually-Budaschnozzle-2015Q1.hex", +- 'lulzbot_TAZ_5_FlexyDuallyV1': "TAZ4-5-Dual-or-FlexyDually-Budaschnozzle-2015Q1.hex", +- 'lulzbot_TAZ_4_FlexyDuallyV2': "TAZ4-5-FlexyDually-LBHexagon-2015Q3.hex", +- 'lulzbot_TAZ_5_FlexyDuallyV2': "TAZ4-5-FlexyDually-LBHexagon-2015Q3.hex", +- 'lulzbot_TAZ_6_Single_v2.1': "TAZ6_Single_v1.0.2.19.hex", +- 'lulzbot_TAZ_6_Flexystruder_v2': "TAZ6_Flexystruder_v1.0.2.19.hex", - } - machine_type = profile.getMachineSetting('machine_type', machineIndex) - extruders = profile.getMachineSettingFloat('extruder_amount', machineIndex) @@ -71,7 +72,7 @@ diff -up cura-lulzbot-19.01/Cura/gui/firmwareInstall.py.nofw cura-lulzbot-19.01/ return None def InstallFirmware(parent = None, filename = None, port = None, machineIndex = None): -@@ -122,7 +59,7 @@ class InstallFirmwareDialog(wx.Dialog): +@@ -123,7 +59,7 @@ class InstallFirmwareDialog(wx.Dialog): def Run(self): if self.filename is None: @@ -80,9 +81,9 @@ diff -up cura-lulzbot-19.01/Cura/gui/firmwareInstall.py.nofw cura-lulzbot-19.01/ return False self.success = False self.thread = threading.Thread(target=self.OnRun) -diff -up cura-lulzbot-19.01/Cura/gui/mainWindow.py.nofw cura-lulzbot-19.01/Cura/gui/mainWindow.py ---- cura-lulzbot-19.01/Cura/gui/mainWindow.py.nofw 2015-12-02 08:25:19.000000000 -0800 -+++ cura-lulzbot-19.01/Cura/gui/mainWindow.py 2016-01-08 10:51:01.713658988 -0800 +diff -up cura-lulzbot-19.05/Cura/gui/mainWindow.py.nofw cura-lulzbot-19.05/Cura/gui/mainWindow.py +--- cura-lulzbot-19.05/Cura/gui/mainWindow.py.nofw 2016-02-24 15:23:41.000000000 -0500 ++++ cura-lulzbot-19.05/Cura/gui/mainWindow.py 2016-03-18 13:31:48.135890077 -0400 @@ -394,7 +394,6 @@ class mainWindow(wx.Frame): # Enabled sash @@ -91,7 +92,7 @@ diff -up cura-lulzbot-19.01/Cura/gui/mainWindow.py.nofw cura-lulzbot-19.01/Cura/ if profile.getMachineSetting('machine_type').startswith('ultimaker2') or \ profile.getMachineSetting('machine_type').startswith('lulzbot_'): self.bedLevelWizardMenuItem.Enable(False) -@@ -511,9 +510,6 @@ class mainWindow(wx.Frame): +@@ -515,9 +514,6 @@ class mainWindow(wx.Frame): #Add tools for machines. self.machineMenu.AppendSeparator() diff --git a/cura-lulzbot.spec b/cura-lulzbot.spec index c6d7fff..31a8871 100644 --- a/cura-lulzbot.spec +++ b/cura-lulzbot.spec @@ -1,21 +1,19 @@ Name: cura-lulzbot -Version: 19.01 -Release: 2%{?dist} +Version: 19.05 +Release: 1%{?dist} Summary: Cura LulzBot Edition, 3D printer control software - # Code is AGPLv3 # Example models are CC-BY-SA License: AGPLv3 and CC-BY-SA - URL: https://www.lulzbot.com/cura # This is no longer hosted on Github :( # So I did: # git clone https://code.alephobjects.com/diffusion/CURA/cura.git # cd cura +# git checkout lulzbot-19.05 # git archive --format=tar.gz --prefix=cura-lulzbot-%{version}/ lulzbot-%{version} > ../cura-lulzbot-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz - Source1: %{name} Source2: %{name}.desktop @@ -43,6 +41,8 @@ Requires: pyserial Requires: numpy Requires: python-power Requires: CuraEngine >= 15.04 +# So that it just works +Requires: 3dprinter-udev-rules %description The default software for the LulzBot Mini 3D printer is called Cura LulzBot @@ -127,6 +127,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2} %{_bindir}/%{name} %changelog +* Fri Mar 18 2016 Tom Callaway - 19.05-1 +- update to 19.05 + * Wed Feb 03 2016 Fedora Release Engineering - 19.01-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 32dd496..4143a44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9551ecc880f84ebbf00f436560dbf3c5 cura-lulzbot-19.01.tar.gz +edda018539d8d7ee3a0c8a1a4a7059e4 cura-lulzbot-19.05.tar.gz