Skip to content

Commit b3b5e99

Browse files
committed
adds QtDBus linked by Qt 5.11.2 libqcocoa.dylib platforms plugin
1 parent 061428a commit b3b5e99

27 files changed

+38068
-38066
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Version History
4040

4141
| Version | Date | Comment |
4242
|---------|------|---------|
43-
| v1.4.0 | xx.xx.2018 | Adds time guide, additional PhasesLCD configurations, export/convert to Excel and import/export to Probat Pilot v1.4, channel tare, playback DROP event, always ON mode, support for ambient data and Phidget ambient sensors [HUM1000](https://www.phidgets.com/?tier=3&catid=14&pcid=12&prodid=644) and [PRE1000](https://www.phidgets.com/?tier=3&catid=64&pcid=57&prodid=719), [PID P-on-Measurement/Input mode](http://brettbeauregard.com/blog/2017/06/introducing-proportional-on-measurement/), improved curve smoothing, machine support for [Atilla GOLD plus 7"](http://www.atilla.com.br/p/atilla-5kg-gold-plus/), [Besca roasting machines](https://www.bescaroasters.com/), [Coffee-Tech Engineering Ghibli](https://www.coffee-tech.com/products/commercial-roasters/ghibli-r15/) and [Diedrich Roasters](https://www.diedrichroasters.com/), bug fixes
43+
| v1.4.0 | 03.10.2018 | Adds time guide, additional PhasesLCD configurations, export/convert to Excel and import/export to Probat Pilot v1.4, channel tare, playback DROP event, always ON mode, support for ambient data and Phidget ambient sensors [HUM1000](https://www.phidgets.com/?tier=3&catid=14&pcid=12&prodid=644) and [PRE1000](https://www.phidgets.com/?tier=3&catid=64&pcid=57&prodid=719), [PID P-on-Measurement/Input mode](http://brettbeauregard.com/blog/2017/06/introducing-proportional-on-measurement/), improved curve smoothing, machine support for [Atilla GOLD plus 7"](http://www.atilla.com.br/p/atilla-5kg-gold-plus/), [Besca roasting machines](https://www.bescaroasters.com/), [Coffee-Tech Engineering Ghibli](https://www.coffee-tech.com/products/commercial-roasters/ghibli-r15/) and [Diedrich Roasters](https://www.diedrichroasters.com/), bug fixes
4444
| v1.3.1 | 20.05.2018 | [Fuji PID PXF](https://www.fujielectric.com/products/instruments/products/controller/PXF.html), bug fixes
4545
| v1.3.0 | 15.04.2018 | Adds Siemens S7 support, MODBUS BCD decode, color themes, extraction yield calculator, support for machines of [Aillio](https://aillio.com/), [BC Roasters](http://www.buckeyecoffee.com/), [Bühler](http://www.buhlergroup.com/), [Coffed](http://coffed.pl/), [Coffee-Tech](https://www.coffee-tech.com/), [Coffeetool](http://coffeetool.gr/), [Giesen](http://www.giesencoffeeroasters.eu/), [IMF](http://www.imf-srl.com/), [K+M](https://www.kirschundmausser.de/), [Loring](https://loring.com/), [Proaster](http://proaster.coffee/), [San Franciscan](http://www.sanfranroaster.com/), [Toper](http://www.toper.com/), [US Roaster Corp](http://www.usroastercorp.com/)|
4646
| v1.2.0 | 21.12.2017 | Adds [replay by temperature](https://artisan-roasterscope.blogspot.de/2017/10/profile-templates.html), support for [Phidgets API v22](https://www.phidgets.com/docs/Operating_System_Support), Phidgets USB devices [USB 1002](https://www.phidgets.com/?tier=3&catid=2&pcid=1&prodid=2), [1014](https://www.phidgets.com/?tier=3&prodid=9), [1017](https://www.phidgets.com/?tier=3&catid=46&pcid=39&prodid=15) and VINT devices [HUB0000](https://www.phidgets.com/?tier=3&catid=2&pcid=1&prodid=643), [TMP1100](https://www.phidgets.com/?tier=3&catid=14&pcid=12&prodid=725), [TMP1101](https://www.phidgets.com/?tier=3&catid=64&pcid=57&prodid=726), [TMP1200](https://www.phidgets.com/?tier=3&catid=14&pcid=12&prodid=968), [OUT1000](https://www.phidgets.com/?view=search&q=OUT1000),[OUT1001](https://www.phidgets.com/?tier=3&catid=2&pcid=1&prodid=712),[OUT1002](https://www.phidgets.com/?tier=3&catid=2&pcid=1&prodid=713),[OUT1100](https://www.phidgets.com/?tier=3&catid=2&pcid=1&prodid=714), [VOLTCRAFT PL-125-T2](https://www.conrad.de/de/temperatur-messgeraet-voltcraft-pl-125-t2-200-bis-1372-c-fuehler-typ-k-j-kalibriert-nach-werksstandard-ohne-zertifi-1012836.html), as well as the [VOLTCRAFT PL-125-T4](https://www.conrad.de/de/temperatur-messgeraet-voltcraft-pl-125-t4-200-bis-1372-c-fuehler-typ-k-j-kalibriert-nach-werksstandard-ohne-zertifi-1013036.html), improved RoR and dropout handling (last version supporting Mac OS X 10.12 and Linux glibc 2.17)|

src/artisanlib/main.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@
8888
from PyQt5.QtNetwork import QLocalSocket, QLocalServer # @UnusedImport
8989

9090
try: # hidden import to allow pyinstaller build on OS X to include the PyQt5.11 private sip module
91-
from PyQt5 import sip # @UnusedImport
91+
from PyQt5 import sip # @UnusedImport
92+
import PyQt5.QtDBus
9293
except:
9394
pass
9495

src/build-mac3.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ elif [[ "$1" = "legacy" ]]; then
2626
export ARTISAN_LEGACY_BUILD=true
2727
else
2828
# standard local builds
29-
export PYTHON=/Library/Frameworks/Python.framework/Versions/3.7
30-
export PYTHONPATH=$PYTHON/lib/python3.7
31-
export PYTHON_V=3.7
29+
export PYTHON=/Library/Frameworks/Python.framework/Versions/3.6
30+
export PYTHONPATH=$PYTHON/lib/python3.6
31+
export PYTHON_V=3.6
3232
export QT_PATH=${PYTHONPATH}/site-packages/PyQt5/Qt
3333
export QT_SRC_PATH=~/Qt5.11.2/5.11.2/clang_64
3434
export MACOSX_DEPLOYMENT_TARGET=10.13

src/setup-mac3.py

+1
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ def my_parse_makefile(filename, g):
238238
'QtSvg.framework',
239239
'QtPrintSupport.framework',
240240
'QtNetwork.framework',
241+
'QtDBus.framework',
241242
# 'QtXml.framework',
242243
# 'QtMacExtras.framework',
243244
]

0 commit comments

Comments
 (0)