diff --git a/README.md b/README.md
index d71d05052..c5a078ce7 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ Version History
| Version | Date | Comment |
|---------|------:|---------|
-| [v3.1.0](https://github.com/artisan-roaster-scope/artisan/releases/tag/v3.1.0) | Nov XX, 2024 | Adds support for induction heated [Gemma machines by Sweet Coffee Italia](https://artisan-scope.org/machines/sci/), the latest [Santoker machines](https://artisan-scope.org/machines/santoker/) connecting via Bluetooth, [Primo roasting machines](https://artisan-scope.org/machines/primo/), [ColorTrack](https://artisan-scope.org/devices/colortrack/) sensors, [Stronghold](https://stronghold.coffee/) profile import, and [Phidget stepper controllers](https://artisan-scope.org/devices/phidgets/) and more.
Release Sponsor: [Algrano](https://algrano.com/)
|
+| [v3.1.0](https://github.com/artisan-roaster-scope/artisan/releases/tag/v3.1.0) | Nov 22, 2024 | Adds support for induction heated [Gemma machines by Sweet Coffee Italia](https://artisan-scope.org/machines/sci/), the latest [Santoker machines](https://artisan-scope.org/machines/santoker/) connecting via Bluetooth, [Primo roasting machines](https://artisan-scope.org/machines/primo/), [ColorTrack](https://artisan-scope.org/devices/colortrack/) sensors, [Stronghold](https://stronghold.coffee/) profile import, and [Phidget stepper controllers](https://artisan-scope.org/devices/phidgets/) and more.
Release Sponsor: [Algrano](https://algrano.com/)
|
| [v3.0.2](https://github.com/artisan-roaster-scope/artisan/releases/tag/v3.0.2) | Aug 20, 2024 | Bug fixes |
| [v3.0.0](https://github.com/artisan-roaster-scope/artisan/releases/tag/v3.0.0) | Aug 1, 2024 | Adds [roast scheduling](https://doc.artisan.plus/docs/schedule/) support
Release Sponsor: [artisan.plus](https://artisan.plus/)
|
| [v2.10.4](https://github.com/artisan-roaster-scope/artisan/releases/tag/v2.10.4) | Mar 21, 2024 | Bug fixes |
diff --git a/src/artisanlib/__init__.py b/src/artisanlib/__init__.py
index 0555e2d2e..5785cb092 100644
--- a/src/artisanlib/__init__.py
+++ b/src/artisanlib/__init__.py
@@ -2,6 +2,6 @@
__revision__ = ''
__build__ = '0'
-__release_sponsor_name__ = 'artisan.plus'
-__release_sponsor_domain__ = 'artisan.plus'
-__release_sponsor_url__ = 'https://artisan.plus/'
+__release_sponsor_name__ = 'Algrano'
+__release_sponsor_domain__ = 'algrano.com'
+__release_sponsor_url__ = 'https://algrano.com/artisan?utm_source=artisan&utm_medium=referral&utm_campaign=algrano_x_artisan'
diff --git a/src/artisanlib/canvas.py b/src/artisanlib/canvas.py
index 229fae5eb..c8df96192 100644
--- a/src/artisanlib/canvas.py
+++ b/src/artisanlib/canvas.py
@@ -2431,7 +2431,7 @@ def showExtraCurve(self, extra_device: int, curve: str, state: bool) -> None:
@pyqtSlot(int, bool)
def showEvents(self, event_type: int, state: bool) -> None:
event_type -= 1
- if len(self.showEtypes) > event_type > 0 and self.showEtypes[event_type] != state:
+ if len(self.showEtypes) > event_type >= 0 and self.showEtypes[event_type] != state:
self.showEtypes[event_type] = state
self.redraw(recomputeAllDeltas=False,re_smooth_foreground=False)
diff --git a/src/debian/usr/share/doc/artisan/changelog b/src/debian/usr/share/doc/artisan/changelog
index 77c3c6432..2dcfc9971 100644
--- a/src/debian/usr/share/doc/artisan/changelog
+++ b/src/debian/usr/share/doc/artisan/changelog
@@ -1,3 +1,10 @@
+artisan (3.1.0-0) precise; urgency=low
+ * new upstream release
+ * changes since 3.0.2:
+ - additional device and machine support
+ - bug fixes
+ -- Fr, 22 Nov 2024 19:32:14 +0200
+
artisan (3.0.2-0) precise; urgency=low
* new upstream release
* changes since 3.0.0:
diff --git a/src/plus/blend.py b/src/plus/blend.py
index bc304ced6..51d0be43a 100644
--- a/src/plus/blend.py
+++ b/src/plus/blend.py
@@ -50,6 +50,7 @@
)
from PyQt5.QtCore import Qt, pyqtSlot, QSize, QSettings # type: ignore # @UnusedImport @Reimport @UnresolvedImport
from PyQt5.QtGui import QKeySequence, QAction, QIcon, QStandardItemModel # type: ignore # @UnusedImport @Reimport @UnresolvedImport
+ from PyQt5.QtWidgets import QAction # type: ignore # @UnusedImport @Reimport @UnresolvedImport
# try:
# from PyQt5 import sip # type: ignore # @Reimport @UnresolvedImport @UnusedImport
# except Exception: # pylint: disable=broad-except
diff --git a/src/setup-macos3-legacy.py b/src/setup-macos3-legacy.py
index 7a84a88d8..f7213bc54 100755
--- a/src/setup-macos3-legacy.py
+++ b/src/setup-macos3-legacy.py
@@ -236,20 +236,18 @@
# # brew install libusb
#
# to get libusb installed
+# lib usb v1.0.27 is not compatible with this platform
try:
- subprocess.check_call(r'cp /usr/local/Cellar/libusb/1.0.27/lib/libusb-1.0.0.dylib Artisan.app/Contents/Frameworks/libusb-1.0.dylib',shell = True)
+ subprocess.check_call(r'cp /usr/local/Cellar/libusb/1.0.26/lib/libusb-1.0.0.dylib Artisan.app/Contents/Frameworks/libusb-1.0.dylib',shell = True)
except Exception: # pylint: disable=broad-except
try:
- subprocess.check_call(r'cp /usr/local/Cellar/libusb/1.0.26/lib/libusb-1.0.0.dylib Artisan.app/Contents/Frameworks/libusb-1.0.dylib',shell = True)
+ subprocess.check_call(r'cp /usr/local/Cellar/libusb/1.0.25/lib/libusb-1.0.0.dylib Artisan.app/Contents/Frameworks/libusb-1.0.dylib',shell = True)
except Exception: # pylint: disable=broad-except
try:
- subprocess.check_call(r'cp /usr/local/Cellar/libusb/1.0.25/lib/libusb-1.0.0.dylib Artisan.app/Contents/Frameworks/libusb-1.0.dylib',shell = True)
+ subprocess.check_call(r'cp /usr/local/Cellar/libusb/1.0.24/lib/libusb-1.0.0.dylib Artisan.app/Contents/Frameworks/libusb-1.0.dylib',shell = True)
except Exception: # pylint: disable=broad-except
- try:
- subprocess.check_call(r'cp /usr/local/Cellar/libusb/1.0.24/lib/libusb-1.0.0.dylib Artisan.app/Contents/Frameworks/libusb-1.0.dylib',shell = True)
- except Exception: # pylint: disable=broad-except
- print('ERROR: failed to locate libusb')
- sys.exit(1)
+ print('ERROR: failed to locate libusb')
+ sys.exit(1)
diff --git a/wiki/ReleaseHistory.md b/wiki/ReleaseHistory.md
index ab7ac7630..6f7dd489e 100644
--- a/wiki/ReleaseHistory.md
+++ b/wiki/ReleaseHistory.md
@@ -3,7 +3,7 @@ Detailed Release History
----
-v3.1.0 (November XX, 2024)
+v3.1.0 (November 22, 2024)
------------------
* ADDITIONS
@@ -50,6 +50,7 @@ v3.1.0 (November XX, 2024)
- fixes an issue in WebSocket communication where time did not progress with empty `Data Request` ([Issue #1737](../../../issues/1737))
- fixes an issue with the Analyzer result panes disappearing under some conditions ([Discussion #1736](../../../discussions/1736))
- fixes saving of designer point which could result in failure on loading ([Discussion #1721](../../../discussions/1721))
+ - fixes Artisan Command `showEvents(1,x)` ([Discussion #1741](../../../discussions/1741))
* REMOVALS
- support for the image format BMP has been removed