diff --git a/.gitignore b/.gitignore index 88deea8..15f2744 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /cura-lulzbot-17.10.tar.gz /cura-lulzbot-19.01.tar.gz /cura-lulzbot-19.05.tar.gz +/cura-lulzbot-19.08.tar.gz diff --git a/cura-lulzbot-no-firmware.patch b/cura-lulzbot-no-firmware.patch index 1febe9d..bf844eb 100644 --- a/cura-lulzbot-no-firmware.patch +++ b/cura-lulzbot-no-firmware.patch @@ -1,35 +1,51 @@ -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 +diff --git a/Cura/gui/firmwareInstall.py b/Cura/gui/firmwareInstall.py +index ced33b5..c41162e 100644 +--- a/Cura/gui/firmwareInstall.py ++++ b/Cura/gui/firmwareInstall.py +@@ -18,85 +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-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", +- +- #Mini +- 'lulzbot_mini': "Mini-Single-or-Flexystruder-LBHexagon-1.0.2.2.hex", +- 'lulzbot_mini_flexystruder': "Mini-Single-or-Flexystruder-LBHexagon-1.0.2.2.hex", +- +- #TAZ Budaschnozzle +- '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_FlexystruderV1': "Taz4-5-Single-or-Flexystruder-Budaschnozzle-2014Q3.hex", +- 'lulzbot_TAZ_5_FlexystruderV1': "Taz4-5-Single-or-Flexystruder-Budaschnozzle-2014Q3.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_FlexyDuallyV1': "Taz4-5-Dual-or-FlexyDually-Budaschnozzle-2015Q1.hex", +- 'lulzbot_TAZ_5_FlexyDuallyV1': "Taz4-5-Dual-or-FlexyDually-Budaschnozzle-2015Q1.hex", +- +- #TAZ Hexagon +- 'lulzbot_TAZ_4_05nozzle': "TAZ4-5-Standard-LBHexagon-1.0.0.1.hex", +- 'lulzbot_TAZ_4_035nozzle': "TAZ4-5-Standard-LBHexagon-1.0.0.1.hex", +- +- 'lulzbot_TAZ_5_05nozzle': "TAZ4-5-Standard-LBHexagon-1.0.0.1.hex", +- 'lulzbot_TAZ_5_035nozzle': "TAZ4-5-Standard-LBHexagon-1.0.0.1.hex", +- +- 'lulzbot_TAZ_4_FlexystruderV2': "TAZ4-5-Flexystruder-LBHexagon-1.0.0.1.hex", +- 'lulzbot_TAZ_5_FlexystruderV2': "TAZ4-5-Flexystruder-LBHexagon-1.0.0.1.hex", +- +- 'lulzbot_TAZ_4_DualV2': "TAZ4-5-Dual-LBHexagon-1.0.0.1.hex", +- 'lulzbot_TAZ_5_DualV2': "TAZ4-5-Dual-LBHexagon-1.0.0.1.hex", +- +- 'lulzbot_TAZ_4_FlexyDuallyV2': "TAZ4-5-FlexyDually-LBHexagon-1.0.0.1.hex", +- 'lulzbot_TAZ_5_FlexyDuallyV2': "TAZ4-5-FlexyDually-LBHexagon-1.0.0.1.hex", +- +- #TAZ 6 +- '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", +- 'lulzbot_TAZ_6_Dual_v2': "TAZ6_Dual_v1.0.2.19.hex", +- 'lulzbot_TAZ_6_FlexyDually_v2': "TAZ6_Dual_v1.0.2.19.hex", - } - machine_type = profile.getMachineSetting('machine_type', machineIndex) - extruders = profile.getMachineSettingFloat('extruder_amount', machineIndex) @@ -72,7 +88,7 @@ diff -up cura-lulzbot-19.05/Cura/gui/firmwareInstall.py.nofw cura-lulzbot-19.05/ return None def InstallFirmware(parent = None, filename = None, port = None, machineIndex = None): -@@ -123,7 +59,7 @@ class InstallFirmwareDialog(wx.Dialog): +@@ -138,7 +59,7 @@ class InstallFirmwareDialog(wx.Dialog): def Run(self): if self.filename is None: @@ -81,9 +97,10 @@ diff -up cura-lulzbot-19.05/Cura/gui/firmwareInstall.py.nofw cura-lulzbot-19.05/ return False self.success = False self.thread = threading.Thread(target=self.OnRun) -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 +diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py +index ecf0369..047df7a 100644 +--- a/Cura/gui/mainWindow.py ++++ b/Cura/gui/mainWindow.py @@ -394,7 +394,6 @@ class mainWindow(wx.Frame): # Enabled sash diff --git a/cura-lulzbot.spec b/cura-lulzbot.spec index 31a8871..bea7445 100644 --- a/cura-lulzbot.spec +++ b/cura-lulzbot.spec @@ -1,5 +1,5 @@ Name: cura-lulzbot -Version: 19.05 +Version: 19.08 Release: 1%{?dist} Summary: Cura LulzBot Edition, 3D printer control software # Code is AGPLv3 @@ -11,7 +11,7 @@ URL: https://www.lulzbot.com/cura # So I did: # git clone https://code.alephobjects.com/diffusion/CURA/cura.git # cd cura -# git checkout lulzbot-19.05 +# git checkout lulzbot-%{version} # git archive --format=tar.gz --prefix=cura-lulzbot-%{version}/ lulzbot-%{version} > ../cura-lulzbot-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz Source1: %{name} @@ -127,6 +127,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2} %{_bindir}/%{name} %changelog +* Tue Apr 12 2016 Miro Hrončok - 19.08-1 +- update to 19.08 + * Fri Mar 18 2016 Tom Callaway - 19.05-1 - update to 19.05 diff --git a/sources b/sources index 4143a44..aef96a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -edda018539d8d7ee3a0c8a1a4a7059e4 cura-lulzbot-19.05.tar.gz +a3b3047e3a2605cba11ffb266cc293ee cura-lulzbot-19.08.tar.gz