Merge pull request #407 from Stefal/dev

Merge dev 2.6 to master

.gitignore

@@ -9,4 +9,4 @@ settings.conf
 test.sh
 test.conf
 *.FCStd1
-/venv/*
+/venv*/*

CHANGELOG.md

@@ -1,4 +1,29 @@
 # Changelog
+
+## [2.6.0] - not released
+### Added
+ - Septentrio Mosaic-X5 detection and configuration
+ - Reverse proxy server with Rtkbase authentication, for Mosaic-X5 web interface
+ - Added description below form input. #381
+ - New optional service, rtkbase_raw2nmea.service, to get date and time with a gnss receiver unknown to gpsd. (CLI only) #394
+### Changed
+ - RTKLib upgraded to release b34j from rtklibexplorer.
+ - Switch server from eventlet to gevent + Gunicorn server.
+### Deprecated
+  - Operating systems older than Debian 11 / Ubuntu 22.04 can't update RTKBase anymore.
+  - Python release < 3.8 deprecated
+### Removed
+ - Eventlet python module is not needed anymore.
+### Fixed
+ - Remove Sbas rtcm message (1107) after F9P configuration. #391
+ - Tooltips buttons were a link to top page. #387
+ - Fix armbian ramlog bug with log older than 1 day. https://github.com/Stefal/build/issues/16
+ - Archive service will compress .sbf files too.
+ - Fix duplicates in .sbf to rinex conversion : https://github.com/rtklibexplorer/RTKLIB/issues/186
+ - Various fixes : #374
+### Security
+ - Update various python modules.
+
 ## [2.5.0] - 2024-01-30
 ### Added
  - udev rules to create ttyGNSS port for usb connected F9P.

README.md

@@ -27,7 +27,7 @@ Frontend's main features are:
 Other images are available in the ./images folder.
 
 ## Ready to flash release:
-A ready to flash image is available for Orange Pi Zero SBC : [Armbian_RTKBase](https://github.com/Stefal/build/releases/latest)
+A ready to flash image is available for Orange Pi Zero, Orange Pi Zero 2, Orange Pi Zero 3 SBC : [Armbian_RTKBase](https://github.com/Stefal/build/releases/latest)
 
 If you use a Raspberry Pi, thanks to [jancelin](https://github.com/jancelin), you can download a ready to flash iso file [here](https://github.com/jancelin/pi-gen/releases/latest).
 
@@ -126,7 +126,9 @@ The `install.sh` script can be used without the `--all` option to split the inst
             -h | --help
                               Display this help message.
    ```
+
 So, if you really want it, let's go for a manual installation with some explanations:
+
 1. Install dependencies with `sudo ./install.sh --dependencies`, or do it manually with:
    ```bash
     sudo apt update
@@ -138,7 +140,7 @@ So, if you really want it, let's go for a manual installation with some explanat
 
       ```bash
       cd ~
-      wget -qO - https://github.com/rtklibexplorer/RTKLIB/archive/refs/tags/b34g.tar.gz | tar -xvz
+      wget -qO - https://github.com/rtklibexplorer/RTKLIB/archive/refs/tags/b34j.tar.gz | tar -xvz
       ```
 
    + compile and install str2str:
@@ -264,6 +266,8 @@ RTKBase use several RTKLIB `str2str` instances started with `run_cast.sh` as sys
 The web GUI is available when the `rtkbase_web` service is running.
 
 ## Advanced:
++ Offline base station without U-Blox receiver, how to get date and time:
+If gpsd can't understand the raw data from your gnss receiver, you can enable the raw2nmea service. It will convert the raw data to the tcp port set in `settings.conf` (nmea_port) and gpsd will use it to feed chrony. `systemctl enable --now rtkbase_raw2nmea`
 + Aerial images:
 The default map background is OpenStreetMap, but you can switch to a worldwide aerial layer if you have a Maptiler key. To enable this layer, create a free account on [Maptiler](https://www.maptiler.com/), create a key and add it to `settings.conf` inside the `[general]` section:
 `maptiler_key=your_key`
@@ -276,7 +280,7 @@ If you want to install RTKBase from the dev branch, you can do it with these com
 cd ~
 wget https://raw.githubusercontent.com/Stefal/rtkbase/dev/tools/install.sh -O install.sh
 chmod +x install.sh
-sudo ./install.sh --alldev dev
+sudo ./install.sh --all repo --rtkbase-repo dev
 ```
 
 ## Other usages:
@@ -296,7 +300,7 @@ A gnss receiver with a timepulse output is a very accurate [stratum 0](https://e
 
 + Set gpsd and chrony to use PPS
 
-   + gpsd: comment the `DEVICE` line in `/etc/defaut/gpsd` and uncomment `#DEVICES="tcp:\\127.0.0.1:5015 \dev\pps0`
+   + gpsd: comment the `DEVICE` line in `/etc/defaut/gpsd` and uncomment `#DEVICES="tcp:\\127.0.0.1:5015 \dev\pps0`. Edit the port if you use the rtkbase_raw2nmea service.
 
    + chrony: inside `/etc/chrony/chrony.conf` uncomment the refclock pps line  and add noselect to the 'refclock SHM 0`. You should have something like this:
    ```
@@ -327,7 +331,8 @@ A gnss receiver with a timepulse output is a very accurate [stratum 0](https://e
 
    ```
 ## Requirements:
-Python >= 3.7
+Debian base distro >= 11 (Bullseye)
+Python >= 3.8
 
 ## History:
 See the [changelog](./CHANGELOG.md)

archive_and_clean.sh

@@ -30,7 +30,7 @@ done
 
 #archive and compress previous day's gnss data.
 #find . -maxdepth 1 -type f -mtime -1 -mmin +60 -name "*.ubx*" -exec tar -jcvf ${archive_name} --remove-files {} +;
-find . -maxdepth 1 -type f -mtime -960 -mmin +60 \( -name "*.rtcm*" -o -name "*.nov*" -o -name "*.oem*" -o -name "*.ubx*" -o -name "*.ss2*" -o -name "*.hemis*" -o -name "*.stq*" -o -name "*.javad*" -o -name "*.nvs*" -o -name "*.binex*" \) -exec zip -m9 ${archive_name} {} +;
+find . -maxdepth 1 -type f -mtime -960 -mmin +60 \( -name "*.rtcm*" -o -name "*.nov*" -o -name "*.oem*" -o -name "*.ubx*" -o -name "*.ss2*" -o -name "*.hemis*" -o -name "*.stq*" -o -name "*.javad*" -o -name "*.nvs*" -o -name "*.binex*" -o -name "*.sbf*" \) -exec zip -m9 ${archive_name} {} +;
 
 #delete gnss data older than x days.
 #find . -maxdepth 1 -type f -name "*.tar.bz2" -mtime +${archive_rotate} -delete