Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev 2.6 to master #407

Merged
merged 137 commits into from
Jul 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
137 commits
Select commit Hold shift + click to select a range
fbcbdfb
More controls on modem status
Stefal Oct 27, 2023
d42c89c
change service type. forking doesn't work for a non daemonized script
Stefal Oct 29, 2023
9416e84
more print() to help me debugging
Stefal Nov 8, 2023
8386646
pin werkzeug version
Stefal Nov 8, 2023
ab32fa5
add nmcli requirement
Stefal Nov 14, 2023
90696ad
add heading
Stefal Feb 7, 2024
15ea5a4
compress sbf files
Stefal Feb 8, 2024
a335a97
update armbian-ramlog
Stefal Feb 15, 2024
3f3e599
fix https://github.com/rtklibexplorer/RTKLIB/issues/186
Stefal Feb 29, 2024
d71d928
add ping host test
Stefal Mar 22, 2024
be0970d
add tcp client, udp server and udp client service
Stefal Mar 23, 2024
d9063e2
update internal schema
Stefal Mar 24, 2024
5d6bcf7
hide upd services
Stefal Mar 24, 2024
2c9fa58
Revert rtcm_receiver_option name change
Stefal Mar 24, 2024
7e10957
revert variable name change
Stefal Mar 24, 2024
66e7604
fix #374
Stefal Mar 24, 2024
b4b616e
fix #374
Stefal Mar 24, 2024
8f26224
udev rules for mosaic-x5 gnss receiver
Stefal Mar 29, 2024
3bcc1e3
Add python module to send command to mosaic X5
Stefal Mar 29, 2024
1cef36d
Detect Septentrio receiver
Stefal Mar 30, 2024
ae42e16
Add context manager for SeptGnss class
Stefal Mar 30, 2024
1ba17ff
Fix config file.
Stefal Mar 31, 2024
07c7325
Add sept_tool.py command line tool to configure the mosaic-X5
Stefal Mar 31, 2024
c8a1f07
add mosaic-X5 configuration
Stefal Mar 31, 2024
effb43e
less print
Stefal Apr 2, 2024
7dad102
enable pps
Stefal Apr 3, 2024
0544d23
check authorized connection descriptor
Stefal Apr 3, 2024
342ae04
update
Stefal Apr 4, 2024
a9f81ab
adding nftables dependencie
Stefal Apr 5, 2024
4f7be30
Higher timeout needed for the first connexion with the Mosaic
Stefal Apr 10, 2024
ff35a86
rtkbase_path is not available. Revert to $BASEDIR
Stefal Apr 10, 2024
19bb8b5
Forms : add description and default values
Stefal Apr 21, 2024
949cefc
fix #387
Stefal May 18, 2024
f849068
update changelog
Stefal May 18, 2024
2d67322
remove sbas rtcm msg (1107) after F9P configuration.
Stefal May 19, 2024
5686338
update changelog
Stefal May 19, 2024
4ba984d
Adding Mosaic reverse proxy, to open the integrated mosaic web server…
Stefal May 19, 2024
f8126c5
fix firmware error detection
Stefal May 20, 2024
4813b6d
disable debug
Stefal May 20, 2024
bb4f1a1
add unit file for reverse proxy
Stefal May 20, 2024
159ac82
rename reverse proxy file
Stefal May 20, 2024
3bcf0fb
Merge branch 'dev' into lte_modem_support
Stefal May 22, 2024
3038dae
enable Mosaic reverse proxy service if this receiver is detected
Stefal May 22, 2024
5f361f6
Fix requirements for modem_config.py
Stefal May 26, 2024
e36049d
remove debug args
Stefal May 28, 2024
d202f34
start modem-config from the venv
Stefal May 28, 2024
9c5fdd9
moving Cellular requirements installation step
Stefal May 28, 2024
012a88b
update changelog
Stefal May 28, 2024
e7b4dde
Merge branch 'dev' into mosaic-x5
Stefal May 28, 2024
3b1b355
Merge pull request #398 from Stefal/mosaic-x5
Stefal May 28, 2024
c2fb226
fix import
Stefal May 28, 2024
472217b
less print
Stefal May 28, 2024
5541f78
rename script and unit
Stefal May 28, 2024
27f72a5
Add USE_PUBLIC_IP constant
Stefal May 28, 2024
afc6971
enable modem_check timer if modem is detected
Stefal May 28, 2024
2eda2c3
Merge branch 'dev' into lte_modem_support
Stefal May 29, 2024
c93c72e
Merge pull request #393 from Stefal/lte_modem_support
Stefal May 29, 2024
e599288
remove debug
Stefal May 29, 2024
b25f005
fix pattern that wasn't working
Stefal May 29, 2024
662c62d
modify description to the new service name
Stefal May 29, 2024
bf07260
Merge branch 'dev' into tcp-client_udp
Stefal May 29, 2024
00ec57a
Merge pull request #377 from Stefal/tcp-client_udp
Stefal May 29, 2024
5d27970
add missing parameters for tcp client connection
Stefal May 29, 2024
7968d8e
simplify services start & add some debug 'echo' for modem_check
Stefal May 29, 2024
bdc95fe
no install section needed when the service is started with a timer
Stefal May 29, 2024
3a61100
start modem_check at boot
Stefal May 29, 2024
4dc65ea
disable unuseful rtcm tcp client
Stefal May 29, 2024
a89c3d7
add cli arg to start server
Stefal May 30, 2024
0f25bb9
don't need these echo anymore
Stefal May 30, 2024
4583743
set cellular modem priority only if the config is successful
Stefal May 30, 2024
6e0e13e
update uninstall.sh
Stefal May 30, 2024
b1c390c
update python module
Stefal May 30, 2024
452b990
update gitignore
Stefal May 30, 2024
6684b06
update changelog
Stefal May 30, 2024
18bcb12
service to create nmea data from gnss raw data and feed gpsd
Stefal May 30, 2024
082f35f
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
Stefal May 30, 2024
00b581e
delay the gpsd service restart after rtkrcv
Stefal May 31, 2024
7621849
updating backplane for Orange Pi Zero 3
Stefal Jun 4, 2024
22cbd1a
Use gunicorn as web server for the gnss rproxy
Stefal Jun 4, 2024
a73df70
remove debug print message
Stefal Jun 4, 2024
6912959
wip
Stefal Jun 4, 2024
608388f
add gunicorn requirement
Stefal Jun 6, 2024
3c0c156
switch back to eventlet wgsi server
Stefal Jun 10, 2024
da4651b
switch to gevent
Stefal Jun 10, 2024
9c863fa
Merge branch 'dev' into use_gunicorn
Stefal Jun 10, 2024
2b8a24e
update changelog
Stefal Jun 10, 2024
d57136d
Merge pull request #399 from Stefal/use_gunicorn
Stefal Jun 10, 2024
8df119d
upgrade rtklib to b34j
Stefal Jun 10, 2024
544a35c
use prebuilt binary for Opi Zero3
Stefal Jun 11, 2024
af70a5b
fix wrong gevent release number
Stefal Jun 11, 2024
ab1351b
disable eventlet wgsi server
Stefal Jun 11, 2024
71de675
fixing missing gunicorn start
Stefal Jun 11, 2024
585b2ad
fix missing class
Stefal Jun 11, 2024
9d25f8f
fix missing import
Stefal Jun 11, 2024
e199834
update changelog
Stefal Jun 11, 2024
0f87291
manage cli argument with gunicorn
Stefal Jun 11, 2024
439025f
2.5.0 to 2.6.0 upgrade script
Stefal Jun 11, 2024
9f3c2be
bump version
Stefal Jun 11, 2024
22093c5
Update changelog
Stefal Jun 11, 2024
d069aeb
update readme
Stefal Jun 11, 2024
56591f0
display dash only if mosaic
Stefal Jun 12, 2024
efb1730
update service list
Stefal Jun 12, 2024
c2bf6bc
restart raw2nmea after main settings changes
Stefal Jun 12, 2024
130f60f
cosmetic fixes
Stefal Jun 12, 2024
c4f1324
enable mosaic web proxy after a detect&configure from gui
Stefal Jun 12, 2024
b0678a0
cosmetic fixes
Stefal Jun 12, 2024
0797cca
After resetting settings, user and some path were missing.
Stefal Jun 12, 2024
d5724f2
add argparse module
Stefal Jun 13, 2024
c7a1898
push sleep time after mosaic reset to 60s
Stefal Jun 13, 2024
77defa9
remove test line
Stefal Jun 13, 2024
a8f39e1
add retry to the mosaic sept_tool and during the configuration
Stefal Jun 13, 2024
c850197
better retry routine
Stefal Jun 14, 2024
41c1d90
check if gnss configuration is ok
Stefal Jun 14, 2024
ff0e6d9
less print()
Stefal Jun 14, 2024
e2dd98c
fix wrong hole position
Stefal Jun 14, 2024
fa0e501
set rtklib binaries executable
Stefal Jun 15, 2024
19ddc2d
ignore venv dir
Stefal Jun 15, 2024
8bfe867
return 0 because the previous line could return 1
Stefal Jun 15, 2024
a1da082
Changing update process because os.execl() doesn't work anymore with …
Stefal Jun 18, 2024
dbb8549
shorter timeout to shutdown rtkbase a little faster.
Stefal Jun 18, 2024
16f31c5
disable tests which don't work
Stefal Jun 18, 2024
150f283
remove commented sections
Stefal Jun 18, 2024
bbbd5c7
print error when os check failed
Stefal Jun 18, 2024
f22fcaa
model for manual update
Stefal Jun 19, 2024
ae97f30
return no content
Stefal Jun 19, 2024
3fa2484
integrate manual update as an url parameter (?update=manual)
Stefal Jun 19, 2024
3cee11d
move service restart after the new release number injection.
Stefal Jun 19, 2024
6446b7e
Raise up needed os release
Stefal Jun 19, 2024
347b1c4
More details when the os is too old.
Stefal Jun 19, 2024
b3733aa
Use js to POST manual update, or it will refresh the page and break m…
Stefal Jun 19, 2024
196f49f
Move rtkbase_update.sh path to tools folder
Stefal Jun 19, 2024
f4ea493
typo
Stefal Jun 19, 2024
79d5951
cleaning old code and requirements.
Stefal Jun 20, 2024
22364bc
some pylint cleaning
Stefal Jun 21, 2024
ed32e2b
add missing gpsd installation
Stefal Jun 21, 2024
04c38a9
update link
Stefal Jun 21, 2024
aa7fd9b
Fix wrong index for service status (due to removed tcp/udp services)
Stefal Jun 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ settings.conf
test.sh
test.conf
*.FCStd1
/venv/*
/venv*/*
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
15 changes: 10 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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`
Expand All @@ -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:
Expand All @@ -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:
```
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion archive_and_clean.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified drawing/fond de panier rtkbase.FCStd
Binary file not shown.
Loading
Loading