Skip to content

Commit

Permalink
version 1.0.22
Browse files Browse the repository at this point in the history
- new Windows build setup adding support for HDPI screens
- adds support for PRECAL
  • Loading branch information
myTonino committed Sep 30, 2017
1 parent e0532f1 commit 4af7ebb
Show file tree
Hide file tree
Showing 35 changed files with 1,183 additions and 290 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Tonino Resources

Version History
---------------
- v1.0.22 Adds PRECAL support
- v1.0.21 Bug fixes
- v1.0.20 Bug fixes
- v1.0.19 Adds Raspbian build
Expand Down
2 changes: 1 addition & 1 deletion src/build-mac35-pi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

export MACOSX_DEPLOYMENT_TARGET=10.7
export MACOSX_DEPLOYMENT_TARGET=10.10

export PYTHON=/Library/Frameworks/Python.framework/Versions/3.5
export PYTHONPATH=$PYTHON/lib/python3.5/site-packages
Expand Down
4 changes: 2 additions & 2 deletions src/build-mac35.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

export MACOSX_DEPLOYMENT_TARGET=10.7
export MACOSX_DEPLOYMENT_TARGET=10.10
export PYTHONPATH="/Library/Frameworks/Python.framework/Versions/3.5/lib/python3.5/site-packages"
export PATH=/Library/Frameworks/Python.framework/Versions/3.5/bin:/Library/Frameworks/Python.framework/Versions/3.5/lib:$PATH

export QT_PATH=~/Qt5.8.0/5.8/clang_64
export QT_PATH=~/Qt5.9.1/5.9.1/clang_64
export PATH=$QT_PATH/bin:$QT_PATH/lib:$PATH
export DYLD_FRAMEWORK_PATH=$QT_PATH/lib

Expand Down
16 changes: 16 additions & 0 deletions src/build-win3-pi.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
@echo off

pyinstaller --noconfirm tonino-win.spec

rem #
rem # Don't make assumptions as to where the 'makensis.exe' is - look in the obvious places
rem #
if exist "C:\Program Files (x86)\NSIS\makensis.exe" set NSIS_EXE="C:\Program Files (x86)\NSIS\makensis.exe"
if exist "C:\Program Files\NSIS\makensis.exe" set NSIS_EXE="C:\Program Files\NSIS\makensis.exe"
if exist "%ProgramFiles%\NSIS\makensis.exe" set NSIS_EXE="%ProgramFiles%\NSIS\makensis.exe"
if exist "%ProgramFiles(x86)%\NSIS\makensis.exe" set NSIS_EXE="%ProgramFiles(x86)%\NSIS\makensis.exe"

rem #
rem #
rem #
%NSIS_EXE% setup-install3-pi.nsi
22 changes: 12 additions & 10 deletions src/doc/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ The project home of this app is on GitHub were all source and binary files are a

FEATURES

o runs on Mac OS X >10.7 on Intel, Windows, and Linux
o runs on Mac OS X >10.9 on Intel, Windows, and Linux
(on OS X >=10.8 Mountain Lion you need to tick "Allow applications downloaded from Anywhere" in the Security & Privacy Preference Panel to start the app)
o allows to connect to a Tonino device and trigger the measurements
o designer for custom scales
Expand All @@ -30,7 +30,7 @@ o Windows
http://www.ftdichip.com/Drivers/VCP.htm
- Download and run the Tonino App Windows installer

o Mac OS X (>=10.7.x)
o Mac OS X (>=10.9.x)

- Install USB/serial driver from FTDI
http://www.ftdichip.com/Drivers/VCP.htm
Expand Down Expand Up @@ -81,28 +81,30 @@ LIBRARIES

The Tonino app uses the following libraries in unmodified forms:

- Python 2.7.x and 3.4.x released under the PSF licence http://www.python.org/psf/
- Python 3.5.x released under the PSF licence http://www.python.org/psf/
http://www.python.org/
- QT 5.5.x under the Qt GNU Lesser General Public License version 2.1 (LGPL)
- QT 5.9.x under the Qt GNU Lesser General Public License version 2.1 (LGPL)
http://qt-project.org/products/licensing
- Numpy 1.8.x and Scipy 0.14.x, Copyright (c) 2005, NumPy Developers; All Rights Reserved
- Numpy 1.x and Scipy 0.19.x, Copyright (c) 2005, NumPy Developers; All Rights Reserved
http://www.scipy.org/
- PyQt 5.x and SIP 4.16.x under the Qt GNU GPL v. 3.0 licence; Copyright (c) 2010 Riverbank Computing Limited
- PyQt 5.x and SIP 4.x under the Qt GNU GPL v. 3.0 licence; Copyright (c) 2010 Riverbank Computing Limited
http://www.riverbankcomputing.co.uk/software/pyqt/
- matplotlib 1.3.x, Copyright (c) 2002-2013 John D. Hunter; All Rights Reserved. Distributed under a licence based on PSF.
- matplotlib 2.x, Copyright (c) 2002-2013 John D. Hunter; All Rights Reserved. Distributed under a licence based on PSF.
http://matplotlib.sourceforge.net
- py2app 0.9.x under the PSF open source licence; Copyright (c) 2004-2006 Bob Ippolito <bob at redivi.com>
Copyright (c) 2010-2012 Ronald Oussoren <ronaldoussoren at mac.com>.
http://packages.python.org/py2app/
- py2exe, Copyright (c) 2000-2005 Thomas Heller, Mark Hammond, Jimmy Retzlaff
- pyinstaller, Copyright (c) 2000-2005 Thomas Heller, Mark Hammond, Jimmy Retzlaff
http://www.py2exe.org/
- bbfreeze, Copyright (c) 2007-2012 brainbot technologies AG. Distributed under the zlib/libpng license.


VERSION HISTORY

v1.0.20 (30.9.2017)
- Adds PRECAL support

v1.0.20 (2.4.2017)
- Minor fixes
- Minor fixes

v1.0.19 (10.11.2016)
- Adds Raspian build
Expand Down
7 changes: 7 additions & 0 deletions src/doc/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
tonino (1.0.22-1) precise; urgency=low
* new upstream release
* fixes since 1.0.20:
- adds PRECAL support
- updated classic and tiny firmware
-- <[email protected]> Sat, 30 Sep 2017 19:32:14 +0200

tonino (1.0.21-1) precise; urgency=low
* new upstream release
* fixes since 1.0.19:
Expand Down
2 changes: 1 addition & 1 deletion src/lib/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

__version__ = '1.0.21'
__version__ = '1.0.22'
Loading

0 comments on commit 4af7ebb

Please sign in to comment.