Version 1.1.0

Author: luigifab

README.md

@@ -1,38 +1,74 @@
 # RadexReader
 
-The RadexReader is an user-space driver for the [RADEX RD1212](https://quartarad.com/product-category/radiation-detector/) Geiger counter. It allow to read and clear stored data via USB. Warning! This tool is completely unrelated with QuartaRad.
+The RadexReader is an user-space driver for the [RADEX RD1212](https://quartarad.com/product-category/radiation-detector/) Geiger counter. It allow to read and clear **stored data** via USB. Warning! This tool is completely unrelated with QuartaRad.
 
-Debian and Fedora packages submitted: [deb](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=974217), [rpm](https://bugzilla.redhat.com/show_bug.cgi?id=1896742). Ubuntu: [PPA](https://launchpad.net/~luigifab/+archive/ubuntu/packages).
+![RD1212](images/RD1212.jpg?raw=true)
 
-## Installation
-
-It require *libusb*.
+## Screenshots
 
-* Debian and Ubuntu: `sudo apt install python3-radexreader radexreader` (coming soon, or via PPA)
-
-* Fedora: `sudo dnf install python3-radexreader` (coming soon)
-
-* Linux: `sudo python3 -m pip install pyusb radexreader` (+libusb)
+[![Screnshot 1](images/thumbs/read.png?raw=true)](images/read.png?raw=true)
+[![Screnshot 2](images/thumbs/compare.png?raw=true)](images/compare.png?raw=true)
 
-* Mac: `sudo pip install pyusb radexreader` (+libusb)
+* Read `src/cmd.py` for examples.
+* Run the command `radexreader` available with DEB/RPM packages.
+* Run the command `cmd.py` available with PYPI package.
 
-* Windows: `python -m pip install pyusb radexreader` (+[libusb](https://libusb.info/), put libusb-1.0.dll in system32)
+## Installation
 
-* Docker Alpine: `sudo docker run --rm --user root -it --privileged -v /dev:/dev python:3.x-alpine /bin/sh` then: `apk update ; apk add libusb ; python3 -m pip install pyusb radexreader`
+It require *libusb*.
 
-## Usage and Screenshots
+* Debian and Ubuntu: `sudo apt install python3-radexreader radexreader` (coming soon or via [PPA](https://launchpad.net/~luigifab/+archive/ubuntu/packages))
 
-* Read `src/cmd.py` for usage examples.
-* Run the command `radexreader` available with DEB/RPM packages.
-* Run the command `cmd.py` available with PYPI package.
+* Fedora: `sudo dnf install python3-radexreader` (coming soon)
 
-[![Screnshot 1](images/thumbs/read.png?raw=true)](images/read.png?raw=true)
-[![Screnshot 2](images/thumbs/compare.png?raw=true)](images/compare.png?raw=true)
+* Linux: `sudo python3 -m pip install pyusb pyserial radexreader` (+libusb)
+
+* Mac: `sudo pip install pyusb pyserial radexreader` (+libusb)
+
+* Windows: `python -m pip install pyusb pyserial radexreader` (+[libusb](https://libusb.info/), put libusb-1.0.dll in system32)
+
+* Docker Alpine: `sudo docker run --rm --user root -it --privileged -v /dev:/dev python:3.x-alpine /bin/sh`\
+then: `apk update ; apk add libusb ; python3 -m pip install pyusb pyserial radexreader`
+
+## PPA
+
+Installation for Debian and Ubuntu with [PPA](https://launchpad.net/~luigifab/+archive/ubuntu/packages):
+```
+sudo add-apt-repository ppa:luigifab/packages
+sudo apt update
+sudo apt install python3-radexreader radexreader
+ -- or --
+sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys FFE5BD439356DF7D
+echo "deb http://ppa.launchpad.net/luigifab/packages/ubuntu hirsute main" | sudo tee -a /etc/apt/sources.list
+sudo apt update
+sudo apt install python3-radexreader radexreader
+ -- or --
+sudo wget -O /etc/apt/trusted.gpg.d/luigifab.gpg https://www.luigifab.fr/apt.gpg
+echo "deb http://ppa.launchpad.net/luigifab/packages/ubuntu hirsute main" | sudo tee -a /etc/apt/sources.list
+sudo apt update
+sudo apt install python3-radexreader radexreader
+```
+
+```bash
+# sha256sum /etc/apt/trusted.gpg.d/luigifab.gpg
+578c89a677048e38007462d543686b53587efba9f93814601169253c45ff9213
+# apt-key list
+/etc/apt/trusted.gpg.d/luigifab.gpg
+pub   rsa4096 2020-10-31 [SC]
+      458B 0C46 D024 FD8C B8BC  99CD FFE5 BD43 9356 DF7D
+```
 
 ## Copyright
 
-- Current version: 1.0.0 (11/11/2020)
+- Current version: 1.1.0 (04/04/2021)
 - Compatibility: Python 3.3 / 3.4 / 3.5 / 3.6 / 3.7 / 3.8 / 3.9
-- Links: [PYPI package](https://pypi.org/project/radexreader/), [PPA](https://launchpad.net/~luigifab/+archive/ubuntu/packages)
-
-This program is provided under the terms of the *GNU GPLv2+* license.
+- Links: [luigifab.fr](https://www.luigifab.fr/python/radexreader) - [github.com](https://github.com/luigifab/python-radexreader) - [pypi.org](https://pypi.org/project/radexreader/)\
+[debian python-radexreader.deb](https://tracker.debian.org/pkg/python3-radexreader)
+  *([ITP](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=973447),
+   [RFS](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=974217))*\
+[fedora python-radexreader.rpm](https://src.fedoraproject.org/rpms/python3-radexreader)
+  *([RR](https://bugzilla.redhat.com/show_bug.cgi?id=1896742))*\
+[launchpad PPA](https://launchpad.net/~luigifab/+archive/ubuntu/packages)
+
+This program is provided under the terms of the **GNU GPLv2+** license.\
+If you like, take some of your time to improve some translations, go to https://bit.ly/2HyCCEc.

debian/changelog

@@ -1,5 +1,5 @@
-python-radexreader (1.0.0-5) unstable; urgency=low
+python-radexreader (1.1.0-1) unstable; urgency=low
 
   * Initial debian package release (Closes: #973447)
 
- -- Fabrice Creuzot <code@luigifab.fr>  Wed, 11 Nov 2020 12:00:00 +0000
+ -- Fabrice Creuzot <code@luigifab.fr>  Sun, 04 Apr 2021 20:00:00 +0000

debian/control

@@ -11,7 +11,7 @@ Vcs-Git: https://github.com/luigifab/python-radexreader.git
 
 Package: python3-radexreader
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}, python3-usb
+Depends: ${misc:Depends}, ${python3:Depends}, python3-usb, python3-serial
 Description: Reader for the RADEX RD1212 Geiger counter (Python module)
  The RadexReader is an user-space driver for the RADEX RD1212. It
  allow to read and clear stored data via USB.
@@ -20,7 +20,6 @@ Description: Reader for the RADEX RD1212 Geiger counter (Python module)
  to unplug the device after installation.
 
 Package: radexreader
-Section: devel
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}, python3-radexreader
 Description: Reader for the RADEX RD1212 Geiger counter (CLI)

debian/copyright

@@ -3,7 +3,7 @@ Source: https://github.com/luigifab/python-radexreader
 Upstream-Contact: Fabrice Creuzot <code@luigifab.fr>
 
 Files: *
-Copyright: 2020 Fabrice Creuzot (luigifab) <code@luigifab.fr>
+Copyright: 2020-2021 Fabrice Creuzot (luigifab) <code@luigifab.fr>
 License: GPL-2+
 
 License: GPL-2+

debian/deb.sh

@@ -4,7 +4,7 @@
 
 
 cd "$(dirname "$0")"
-version="1.0.0"
+version="1.1.0"
 
 
 rm -rf builder/
@@ -81,7 +81,7 @@ for serie in unstable hirsute groovy focal bionic xenial trusty precise; do
 			echo 9 > debian/compat
 		fi
 		sed -i 's/unstable/'${serie}'/g' debian/changelog
-		sed -i 's/-5) /-5+'${serie}') /' debian/changelog
+		sed -i 's/-1) /-1+'${serie}') /' debian/changelog
 		dpkg-buildpackage -us -uc -ui -d -S
 	fi
 	echo "==========================="

fedora/python-radexreader.spec

@@ -16,7 +16,7 @@ Pour éviter un Access denied (insufficient permissions), n'oubliez pas
 de débrancher l'appareil après l'installation.}
 
 Name:        python-radexreader
-Version:     1.0.0
+Version:     1.1.0
 Release:     1%{?dist}
 Summary:     %{common_summary_en}
 Summary(fr): %{common_summary_fr}
@@ -29,6 +29,7 @@ BuildRequires: python3-devel
 BuildRequires: hunspell-fr
 Requires: python3
 Requires: python3dist(pyusb)
+Requires: python3dist(pyserial)
 
 %description %{common_description_en}
 %description -l fr %{common_description_fr}
@@ -68,5 +69,5 @@ install -p -m 755 ../src/cmd.py  %{buildroot}%{_bindir}/radexreader
 
 
 %changelog
-* Wed Nov 11 2020 Fabrice Creuzot <code@luigifab.fr> - 1.0.0-1
+* Sun Apr 04 2021 Fabrice Creuzot <code@luigifab.fr> - 1.1.0-1
 - Initial fedora package release (Closes: #1896742)

fedora/rpm.sh

@@ -4,7 +4,7 @@
 # fedora: configure: error: C compiler cannot create executables? remove and reinstall glibc-devel gcc
 
 cd "$(dirname "$0")"
-version="1.0.0"
+version="1.1.0"
 
 
 rm -rf builder/ ~/rpmbuild/

images/RD1212.jpg

@@ -4,7 +4,7 @@
 
 
 cd "$(dirname "$0")"
-version="1.0.0"
+version="1.1.0"
 rm -rf builder/
 
 
@@ -31,8 +31,7 @@ sed -i 's/Usage: radexreader /Usage: cmd.py /g'             builder/radexreader-
 
 
 
-# create package
-# https://packaging.python.org/tutorials/packaging-projects/
+# create package (https://packaging.python.org/tutorials/packaging-projects/)
 cd builder/radexreader-${version}/
 python3 -m pip install --user --upgrade setuptools wheel --no-warn-script-location
 python3 setup.py sdist bdist_wheel

pypi/pypi.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/python3
 # -*- coding: utf8 -*-
 # Created L/19/10/2020
-# Updated D/08/11/2020
+# Updated V/26/03/2021
 #
-# Copyright 2020 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
+# Copyright 2020-2021 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
 # https://github.com/luigifab/python-radexreader
 # https://www.luigifab.fr/python/radexreader
 #
@@ -22,24 +22,32 @@
 import time
 import sys
 import usb
+import serial
 
 try:
 	import radexreader
-	msg = 'Information   python3-radexreader ' + radexreader.__version__ + ' with python ' + python_version() + ' and pyusb ' + usb.__version__
+	msg = 'Information   python3-radexreader ' + radexreader.__version__ + ' with python ' + python_version() + ' + pyusb ' + usb.__version__ + ' + pyserial ' + serial.__version__
 except:
 	import os
 	sys.path.append(os.path.abspath(__file__).replace('cmd.py', ''))
 	import radexreader
-	msg = 'Information   radexreader ' + radexreader.__version__ + ' with python ' + python_version() + ' and pyusb ' + usb.__version__
+	msg = 'Information   radexreader ' + radexreader.__version__ + ' with python ' + python_version() + ' + pyusb ' + usb.__version__ + ' + pyserial ' + serial.__version__
 
 if len(sys.argv) > 1:
 
+	if sys.argv[1] == 'serial':
+		print(msg)
+		reader = radexreader.RadexReader()
+		reader.print_info()
+		reader.print_serial_number()
+		exit(0)
+
 	if sys.argv[1] == 'erase':
 		print(msg)
 		reader = radexreader.RadexReader()
 		reader.print_info()
 		reader.erase()
-		print('done!')
+		print('done')
 		exit(0)
 
 	if sys.argv[1] == 'tail':
@@ -51,7 +59,7 @@
 			measures = reader.read(True)
 			for timestamp, measure in measures.items():
 				if timestamp != prev:
-					print("%s  %s µSv/h  ±%s%% (%s ≤ %s ≤ %s)" % (
+					print('%s  %s µSv/h  ±%s%% (%s ≤ %s ≤ %s)' % (
 						str(datetime.utcfromtimestamp(timestamp)),
 						str('{:.2f}'.format(measure['val'])).rjust(6, ' '),
 						str(int(measure['pct'])),
@@ -63,13 +71,26 @@
 			time.sleep(10)
 		exit(0)
 
+	if sys.argv[1] == 'tailjson':
+		import json
+		reader = radexreader.RadexReader()
+		prev   = None
+		while True:
+			measures = reader.read(True)
+			for timestamp, measure in measures.items():
+				if timestamp != prev:
+					print(json.dumps(measure))
+				prev = timestamp
+			time.sleep(10)
+		exit(0)
+
 	if sys.argv[1] == 'readlast':
 		print(msg)
 		reader = radexreader.RadexReader()
 		reader.print_info()
 		measures = reader.read(True)
 		for timestamp, measure in measures.items():
-			print("%s  %s µSv/h  ±%s%% (%s ≤ %s ≤ %s)" % (
+			print('%s  %s µSv/h  ±%s%% (%s ≤ %s ≤ %s)' % (
 				str(datetime.utcfromtimestamp(timestamp)),
 				str('{:.2f}'.format(measure['val'])).rjust(6, ' '),
 				str(int(measure['pct'])),
@@ -78,7 +99,12 @@
 				str('{:.2f}'.format(measure['max']))
 			))
 		if not measures:
-			print("no data stored")
+			print('no data stored')
+		exit(0)
+
+	if sys.argv[1] == 'jsonlast':
+		import json
+		print(json.dumps(radexreader.RadexReader().read(True)))
 		exit(0)
 
 	if sys.argv[1] == 'readall':
@@ -87,7 +113,7 @@
 		reader.print_info()
 		measures = reader.read(False)
 		for timestamp, measure in measures.items():
-			print("%s  %s µSv/h  ±%s%% (%s ≤ %s ≤ %s)" % (
+			print('%s  %s µSv/h  ±%s%% (%s ≤ %s ≤ %s)' % (
 				str(datetime.utcfromtimestamp(timestamp)),
 				str('{:.2f}'.format(measure['val'])).rjust(6, ' '),
 				str(int(measure['pct'])),
@@ -96,18 +122,13 @@
 				str('{:.2f}'.format(measure['max']))
 			))
 		if not measures:
-			print("no data stored")
-		exit(0)
-
-	if sys.argv[1] == 'jsonlast':
-		import json
-		print(json.dumps(radexreader.RadexReader().read(True)))
+			print('no data stored')
 		exit(0)
 
 	if sys.argv[1] == 'jsonall':
 		import json
 		print(json.dumps(radexreader.RadexReader().read(False)))
 		exit(0)
 
-print('Usage: radexreader erase|tail|readlast|readall|jsonlast|jsonall')
+print('Usage: radexreader erase|tail|tailjson|readlast|jsonlast|readall|jsonall')
 exit(-1)