Skip to content

Commit 2dd147f

Browse files
authored
Merge pull request #407 from Stefal/dev
Merge dev 2.6 to master
2 parents 12c49b1 + aa7fd9b commit 2dd147f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+2458
-1316
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ settings.conf
99
test.sh
1010
test.conf
1111
*.FCStd1
12-
/venv/*
12+
/venv*/*

CHANGELOG.md

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

README.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Frontend's main features are:
2727
Other images are available in the ./images folder.
2828

2929
## Ready to flash release:
30-
A ready to flash image is available for Orange Pi Zero SBC : [Armbian_RTKBase](https://github.com/Stefal/build/releases/latest)
30+
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)
3131

3232
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).
3333

@@ -126,7 +126,9 @@ The `install.sh` script can be used without the `--all` option to split the inst
126126
-h | --help
127127
Display this help message.
128128
```
129+
129130
So, if you really want it, let's go for a manual installation with some explanations:
131+
130132
1. Install dependencies with `sudo ./install.sh --dependencies`, or do it manually with:
131133
```bash
132134
sudo apt update
@@ -138,7 +140,7 @@ So, if you really want it, let's go for a manual installation with some explanat
138140

139141
```bash
140142
cd ~
141-
wget -qO - https://github.com/rtklibexplorer/RTKLIB/archive/refs/tags/b34g.tar.gz | tar -xvz
143+
wget -qO - https://github.com/rtklibexplorer/RTKLIB/archive/refs/tags/b34j.tar.gz | tar -xvz
142144
```
143145

144146
+ compile and install str2str:
@@ -264,6 +266,8 @@ RTKBase use several RTKLIB `str2str` instances started with `run_cast.sh` as sys
264266
The web GUI is available when the `rtkbase_web` service is running.
265267

266268
## Advanced:
269+
+ Offline base station without U-Blox receiver, how to get date and time:
270+
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`
267271
+ Aerial images:
268272
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:
269273
`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
276280
cd ~
277281
wget https://raw.githubusercontent.com/Stefal/rtkbase/dev/tools/install.sh -O install.sh
278282
chmod +x install.sh
279-
sudo ./install.sh --alldev dev
283+
sudo ./install.sh --all repo --rtkbase-repo dev
280284
```
281285

282286
## Other usages:
@@ -296,7 +300,7 @@ A gnss receiver with a timepulse output is a very accurate [stratum 0](https://e
296300

297301
+ Set gpsd and chrony to use PPS
298302

299-
+ gpsd: comment the `DEVICE` line in `/etc/defaut/gpsd` and uncomment `#DEVICES="tcp:\\127.0.0.1:5015 \dev\pps0`
303+
+ 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.
300304

301305
+ 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:
302306
```
@@ -327,7 +331,8 @@ A gnss receiver with a timepulse output is a very accurate [stratum 0](https://e
327331
328332
```
329333
## Requirements:
330-
Python >= 3.7
334+
Debian base distro >= 11 (Bullseye)
335+
Python >= 3.8
331336

332337
## History:
333338
See the [changelog](./CHANGELOG.md)

archive_and_clean.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ done
3030

3131
#archive and compress previous day's gnss data.
3232
#find . -maxdepth 1 -type f -mtime -1 -mmin +60 -name "*.ubx*" -exec tar -jcvf ${archive_name} --remove-files {} +;
33-
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} {} +;
33+
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} {} +;
3434

3535
#delete gnss data older than x days.
3636
#find . -maxdepth 1 -type f -name "*.tar.bz2" -mtime +${archive_rotate} -delete
-9.59 KB
Binary file not shown.

0 commit comments

Comments
 (0)