Version 1.2.0

Author: luigifab

README.md

@@ -1,54 +1,56 @@
 # 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/) and the [RADEX ONE](https://quartarad.com/product-category/radiation-detector/) Geiger counters. It allow to read and clear stored data via USB. Warning! This tool is completely unrelated with QuartaRad.
 
-![RD1212](images/RD1212.jpg?raw=true)
+![RADEX RD1212](images/RD1212.jpg?raw=true)
+![RADEX ONE](images/ONE.jpg?raw=true)
 
 ## Screenshots
 
 [![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)
 
-* Read `src/cmd.py` for examples.
+* Read `src/radexreader.py` for examples.
 * Run the command `radexreader` available with DEB/RPM packages.
-* Run the command `cmd.py` available with PYPI package.
+* Run the command `radexreader.py` available with PYPI package.
 
 ## Installation
 
-It require *libusb*.
+It require *libusb*, *pyusb* and *pyserial*.
 
 * Debian and Ubuntu: `sudo apt install python3-radexreader radexreader` (coming soon or via [PPA](https://launchpad.net/~luigifab/+archive/ubuntu/packages))
 
 * Fedora: `sudo dnf install python3-radexreader` (coming soon)
 
-* Linux: `sudo python3 -m pip install pyusb pyserial radexreader` (+libusb)
+* OpenSuse: `sudo zypper install python3-radexreader`
 
-* Mac: `sudo pip install pyusb pyserial radexreader` (+libusb)
+* Linux: `sudo python3 -m pip install radexreader` (+libusb)
 
-* Windows: `python -m pip install pyusb pyserial radexreader` (+[libusb](https://libusb.info/), put libusb-1.0.dll in system32)
+* Mac: `sudo pip install radexreader` (+libusb)
+
+* Windows: `python -m pip install 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`
+then: `apk update ; apk add libusb ; python3 -m pip install radexreader`
 
 ## PPA
 
 Installation for Debian and Ubuntu with [PPA](https://launchpad.net/~luigifab/+archive/ubuntu/packages):
-```
+```bash
 sudo add-apt-repository ppa:luigifab/packages
 sudo apt update
 sudo apt install python3-radexreader radexreader
- -- or --
+# 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 --
+# 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
@@ -60,15 +62,15 @@ pub   rsa4096 2020-10-31 [SC]
 
 ## Copyright
 
-- Current version: 1.1.0 (04/04/2021)
+- Current version: 1.2.0 (05/05/2021)
 - Compatibility: Python 3.3 / 3.4 / 3.5 / 3.6 / 3.7 / 3.8 / 3.9
 - 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)
+[fedora python-radexreader.rpm](https://src.fedoraproject.org/rpms/python3-radexreader)\
+[opensuse python-radexreader.rpm](https://software.opensuse.org/package/python-radexreader)\
+[ubuntu 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.1.0-1) unstable; urgency=low
+python-radexreader (1.2.0-1) unstable; urgency=low
 
   * Initial debian package release (Closes: #973447)
 
- -- Fabrice Creuzot <[email protected]>  Sun, 04 Apr 2021 20:00:00 +0000
+ -- Fabrice Creuzot <[email protected]>  Wed, 05 May 2021 20:00:00 +0000

debian/control

@@ -4,27 +4,29 @@ Priority: optional
 Maintainer: Fabrice Creuzot <[email protected]>
 Build-Depends: debhelper-compat (= 13), python3-all, dh-python, dh-exec
 Rules-Requires-Root: no
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Homepage: https://github.com/luigifab/python-radexreader
 Vcs-Browser: https://github.com/luigifab/python-radexreader
 Vcs-Git: https://github.com/luigifab/python-radexreader.git
 
 Package: python3-radexreader
 Architecture: all
-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.
+Depends: ${misc:Depends}, ${python3:Depends}, python3-serial, python3-usb
+Description: Reader for the RADEX RD1212 and ONE Geiger counters (Python module)
+ The RadexReader is an user-space driver for the RADEX RD1212 and
+ the RADEX ONE Geiger counters. It allow to read and clear stored
+ data via USB.
  .
  To avoid Access denied (insufficient permissions), don't forget
  to unplug the device after installation.
 
 Package: radexreader
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}, python3-radexreader
-Description: Reader for the RADEX RD1212 Geiger counter (CLI)
- The RadexReader is an user-space driver for the RADEX RD1212. It
- allow to read and clear stored data via USB.
+Description: Reader for the RADEX RD1212 and ONE Geiger counters (CLI)
+ The RadexReader is an user-space driver for the RADEX RD1212 and
+ the RADEX ONE Geiger counters. It allow to read and clear stored
+ data via USB.
  .
  To avoid Access denied (insufficient permissions), don't forget
  to unplug the device after installation.

debian/deb.sh

@@ -2,9 +2,8 @@
 # debian: sudo apt install dpkg-dev devscripts dh-make dh-python dh-exec
 
 
-
 cd "$(dirname "$0")"
-version="1.1.0"
+version="1.2.0"
 
 
 rm -rf builder/
@@ -32,7 +31,7 @@ fi
 
 
 # create packages for debian and ubuntu
-for serie in unstable hirsute groovy focal bionic xenial trusty precise; do
+for serie in unstable impish hirsute groovy focal bionic xenial trusty precise; do
 
 	if [ $serie = "unstable" ]; then
 		# for ubuntu
@@ -100,7 +99,7 @@ for serie in unstable hirsute groovy focal bionic xenial trusty precise; do
 	cd ..
 done
 
-ls -dltrh $PWD/builder/*.deb $PWD/builder/*.changes
+ls -dltrh builder/*.deb builder/*.changes
 echo "==========================="
 
 # cleanup

debian/metainfo.xml

@@ -3,14 +3,19 @@
 	<id>python3-radexreader</id>
 	<name>python3-radexreader</name>
 	<metadata_license>GPL-2+</metadata_license>
-	<summary>Reader for the RADEX RD1212 Geiger counter</summary>
+	<summary>Reader for the RADEX RD1212 and ONE Geiger counters</summary>
 	<description>
 		<p>
-			The RadexReader is an user-space driver for the RADEX RD1212.
+			The RadexReader is an user-space driver for the RADEX RD1212 and the RADEX ONE Geiger counters.
 			It allow to read and clear stored data via USB.
 		</p>
 	</description>
 	<provides>
+		<!-- RD1212v2 -->
 		<modalias>usb:v03EBp5603d*</modalias>
+		<!-- RD1212v1 -->
+		<modalias>usb:v10C4pEA60d*</modalias>
+		<!-- ONEv1 -->
+		<modalias>usb:vABBApA011d*</modalias>
 	</provides>
 </component>

debian/radexreader.install

@@ -1,2 +1,2 @@
 #!/usr/bin/dh-exec
-src/cmd.py => usr/bin/radexreader
+src/radexreader.py => usr/bin/radexreader

debian/rules

@@ -6,4 +6,4 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 	dh $@ --with python3
 
 override_dh_update_autotools_config:
-	sed -i 's/python3-radexreader /python3-radexreader-deb /g' src/cmd.py
+	sed -i 's/python3-radexreader /python3-radexreader-deb /g' src/radexreader.py

debian/udev

@@ -1 +1,3 @@
-SUBSYSTEM=="usb", ATTR{idVendor}=="03eb", ATTR{idProduct}=="5603", TAG+="uaccess"
+SUBSYSTEM=="usb", ATTR{idVendor}=="03eb", ATTR{idProduct}=="5603", TAG+="uaccess"
+SUBSYSTEM=="usb", ATTR{idVendor}=="10c4", ATTR{idProduct}=="ea60", TAG+="uaccess"
+SUBSYSTEM=="usb", ATTR{idVendor}=="abba", ATTR{idProduct}=="a011", TAG+="uaccess"

fedora/python-radexreader.spec

@@ -1,50 +1,55 @@
-%global common_summary_en Reader for the RADEX RD1212 Geiger counter
-%global common_summary_fr Lecteur pour le compteur Geiger RADEX RD1212
+%global common_summary_en Reader for the RADEX RD1212 and ONE Geiger counters
+%global common_summary_fr Lecteur pour les compteurs Geiger RADEX RD1212 et ONE
 
 %global common_description_en %{expand:
-The RadexReader is an user-space driver for the RADEX RD1212 Geiger counter.
-It allow to read and clear stored data via USB.
+The RadexReader is an user-space driver for the RADEX RD1212 and
+the RADEX ONE Geiger counters. It allow to read and clear stored
+data via USB.
 
 To avoid Access denied (insufficient permissions), don't forget
 to unplug the device after installation.}
 
 %global common_description_fr %{expand:
-Le RadexReader est un pilote en espace utilisateur pour le compteur Geiger
-RADEX RD1212. Il permet de lire et d'effacer les données stockées via USB.
+Le RadexReader est un pilote en espace utilisateur pour les compteurs
+Geiger RADEX RD1212 et RADEX ONE. Il permet de lire et d'effacer les
+données stockées via USB.
 
 Pour éviter un Access denied (insufficient permissions), n'oubliez pas
 de débrancher l'appareil après l'installation.}
 
-Name:        python-radexreader
-Version:     1.1.0
-Release:     1%{?dist}
-Summary:     %{common_summary_en}
-Summary(fr): %{common_summary_fr}
-License:     GPLv2+
-URL:         https://github.com/luigifab/python-radexreader
-Source0:     %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
-BuildArch:   noarch
+Name:          python-radexreader
+Version:       1.2.0
+Release:       1%{?dist}
+Summary:       %{common_summary_en}
+Summary(fr):   %{common_summary_fr}
+License:       GPLv2+
+URL:           https://github.com/luigifab/python-radexreader
+Source0:       %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
-BuildRequires: python3-devel
+BuildArch:     noarch
 BuildRequires: hunspell-fr
-Requires: python3
-Requires: python3dist(pyusb)
-Requires: python3dist(pyserial)
 
 %description %{common_description_en}
 %description -l fr %{common_description_fr}
 
 
 %package -n python3-radexreader
 %py_provides python3-radexreader
-Summary:     %{common_summary_en}
-Summary(fr): %{common_summary_fr}
+Summary:       %{common_summary_en}
+Summary(fr):   %{common_summary_fr}
+
+BuildRequires: python3-devel
+Requires:      python3
+Requires:      %{py3_dist pyserial}
+Requires:      %{py3_dist pyusb}
+
 %description -n python3-radexreader %{common_description_en}
 %description -n python3-radexreader -l fr %{common_description_fr}
 
+
 %prep
 %setup -q -n python-radexreader-%{version}
-sed -i 's/python3-radexreader /python3-radexreader-rpm /g' src/cmd.py
+sed -i 's/python3-radexreader /python3-radexreader-rpm /g' src/radexreader.py
 sed -i 's/\#\!\/usr\/bin\/python3/\#/g' src/radexreader/__init__.py
 
 %build
@@ -57,7 +62,7 @@ cd src
 mkdir -p %{buildroot}%{_bindir}/
 mkdir -p %{buildroot}/lib/udev/rules.d/
 install -p -m 644 ../debian/udev %{buildroot}/lib/udev/rules.d/60-python3-radexreader.rules
-install -p -m 755 ../src/cmd.py  %{buildroot}%{_bindir}/radexreader
+install -p -m 755 ../src/radexreader.py %{buildroot}%{_bindir}/radexreader
 
 %files -n python3-radexreader
 %license LICENSE
@@ -69,5 +74,5 @@ install -p -m 755 ../src/cmd.py  %{buildroot}%{_bindir}/radexreader
 
 
 %changelog
-* Sun Apr 04 2021 Fabrice Creuzot <[email protected]> - 1.1.0-1
-- Initial fedora package release (Closes: #1896742)
+* Wed May 05 2021 Fabrice Creuzot <[email protected]> - 1.2.0-1
+- Initial fedora package release (Closes: rhbz#1896742)

fedora/rpm.sh

@@ -1,10 +1,9 @@
 #!/bin/bash
-# debian: sudo apt install dpkg-dev devscripts dh-make dh-python dh-exec rpm
-# fedora: sudo dnf install rpmdevtools rpm-sign python3-devel
+# fedora: sudo dnf install rpmdevtools rpm-sign python3-devel hunspell-fr
 # fedora: configure: error: C compiler cannot create executables? remove and reinstall glibc-devel gcc
 
 cd "$(dirname "$0")"
-version="1.1.0"
+version="1.2.0"
 
 
 rm -rf builder/ ~/rpmbuild/
@@ -21,7 +20,7 @@ else
 	rm -rf /tmp/${temp}/*/builder/ /tmp/${temp}/radexreader/__pycache__/
 
 	mv /tmp/${temp} builder/
-	cp /usr/share/common-licenses/GPL-2 builder/${temp}/LICENSE
+	cp /usr/share/licenses/linux-firmware/GPL-2 builder/${temp}/LICENSE
 
 	cd builder/
 	tar czf ${temp}.tar.gz ${temp}
@@ -32,7 +31,7 @@ else
 fi
 
 # create package (rpm sign https://access.redhat.com/articles/3359321)
-rpmbuild --nodeps -ba python-radexreader.spec
+rpmbuild -ba python-radexreader.spec
 rpm --addsign ~/rpmbuild/RPMS/*/*.rpm
 rpm --addsign ~/rpmbuild/SRPMS/*.rpm
 mv ~/rpmbuild/RPMS/*/*.rpm builder/
@@ -42,7 +41,7 @@ rpm --checksig builder/*.rpm
 echo "==========================="
 rpmlint python-radexreader.spec builder/*.rpm
 echo "==========================="
-ls -dltrh $PWD/builder/*.rpm
+ls -dltrh builder/*.rpm
 echo "==========================="
 
 # cleanup