Merge release 2.7.0 to main branch

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -64,4 +64,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

CHANGELOG.md

@@ -1,4 +1,25 @@
 # Changelog
+## [2.7.0] Not Released
+### Added
+- Now compatible with Septentrio Mosaic-X5 firmware 4.15. Default login/password is `basegnss/basegnss!`.
+- GUI -> Settings: Add display of network interface mac address.
+- GUI -> Settings: Add Tcp host addr entry to open or block external access to the Gnss receiver. [#490](https://github.com/Stefal/rtkbase/issues/490)
+- GUI ->: Add mount name in the web page title. Thanks to @sbonaime [#484](https://github.com/Stefal/rtkbase/issues/484)
+- GUI -> Logs: .sbf files get a type in the type column.
+- GUI -> Logs: .obs and .2?o files displayed as RINEX in type column.
+### Changed
+- RTKLib upgraded to release v2.5.0-EX.
+- Add Galileo inside rinex preset for Nrcan. [#479](https://github.com/Stefal/rtkbase/issues/479)
+- U-Blox ZED-F9P settings : Dynamic model sets to static during configuration. Thanks to @Jef239 [#488](https://github.com/Stefal/rtkbase/issues/488)
+### Fixed
+- GUI -> Logs: Fix wrong path when using custom data directory. [#471](https://github.com/Stefal/rtkbase/issues/471)
+- GUI -> Settings: Better toggle buttons color behaviour.
+### Deprecated
+- Operating systems older than Debian 12 / Ubuntu 24.04 can't update RTKBase anymore.
+- Python release < 3.11 deprecated
+### Security
+- Update various python module
+- Update js library (leaflet, bootstrap-table)
 
 ## [2.6.4] - 2025-11-26
 ### Fixed

README.md

@@ -336,8 +336,8 @@ A gnss receiver with a timepulse output is a very accurate [stratum 0](https://e
 
    ```
 ## Requirements:
-Debian base distro >= 11 (Bullseye)
-Python >= 3.8
+Debian base distro >= 12 (Bookworms)
+Python >= 3.11
 
 ## History:
 See the [changelog](./CHANGELOG.md)
@@ -346,7 +346,7 @@ See the [changelog](./CHANGELOG.md)
 RTKBase is licensed under AGPL 3 (see [LICENSE](./LICENSE) file).
 
 RTKBase uses some parts of other software:
-+ [RTKLIB](https://github.com/tomojitakasu/RTKLIB) (BSD-2-Clause)
++ [RTKLIB-EX](https://github.com/rtklibexplorer/RTKLIB) (BSD-2-Clause)
 + [ReachView](https://github.com/emlid/ReachView) (GPL v3)
 + [Flask](https://palletsprojects.com/p/flask/) [Jinja](https://palletsprojects.com/p/jinja/) [Werkzeug](https://palletsprojects.com/p/werkzeug/) (BSD-3-Clause)
 + [Flask SocketIO](https://github.com/miguelgrinberg/Flask-SocketIO) (MIT)

archive_and_clean.sh

@@ -7,7 +7,7 @@ source <( grep '=' ${BASEDIR}/settings.conf )
 cd ${datadir}
 
 check_space(){
-  df -mP ${datadir} | grep -v '^Filesystem' | awk '{ print $4 }'
+  df -mP ${datadir} | tail -n1 | awk '{ print $4 }'
 }
 
 #Check if there is enough available space (default value is more than 500MB), and delete oldest archive if needed.

receiver_cfg/Septentrio_Mosaic-X5.cfg

@@ -9,9 +9,11 @@ setSBFOutput, Stream1, , +BDSRaw+BDSRawB1C+BDSRawB2a+BDSRawB2b
 setSBFOutput, Stream1, , +QZSRawL1CA+QZSRawL2C+QZSRawL5
 setSBFOutput, Stream1, , +NAVICRaw
 setSBFOutput, Stream1, , +GEORawL1+GEORawL5
+setSatelliteTracking, -SBAS
 setSignalTracking, GPSL1CA+GPSL1PY+GPSL2PY+GPSL2C+GPSL5+GLOL1CA+GLOL2P+GLOL2CA+GLOL3+GALL1BC+GALE6BC+GALE5a+GALE5b+GALE5+GEOL1+GEOL5+BDSB1I+BDSB2I+BDSB3I+BDSB1C+BDSB2a+BDSB2b+QZSL1CA+QZSL2C+QZSL5+QZSL1CB+NAVICL5
 setSBFOutput, Stream1, , +PVTGeodetic+ChannelStatus+ReceiverStatus+SatVisibility+ReceiverTime
 setPVTMode, Static
 setPPSParameters, sec1, Low2High, , UTC
-setUSBInternetAccess, on
-#END
+setUSBInternetAccess, off
+setHttpsSettings, HTTP
+#END

receiver_cfg/Septentrio_Mosaic-X5_4.15.cfg

@@ -0,0 +1,20 @@
+# Config file for using a Septentrio Mosaic X5 with RTKBase
+setSBFOutput, Stream1, USB1
+setSBFOutput, Stream1, , , sec1
+setSBFOutput, Stream1, , MeasEpoch+MeasExtra+EndOfMeas
+setSBFOutput, Stream1, , +GPSRawCA+GPSRawL2C+GPSRawL5
+setSBFOutput, Stream1, , +GLORawCA
+setSBFOutput, Stream1, , +GALRawFNAV+GALRawINAV+GALRawCNAV
+setSBFOutput, Stream1, , +BDSRaw+BDSRawB1C+BDSRawB2a+BDSRawB2b
+setSBFOutput, Stream1, , +QZSRawL1CA+QZSRawL2C+QZSRawL5
+setSBFOutput, Stream1, , +NAVICRaw
+setSBFOutput, Stream1, , +GEORawL1+GEORawL5
+setSatelliteTracking, -SBAS
+setSignalTracking, GPSL1CA+GPSL1PY+GPSL2PY+GPSL2C+GPSL5+GLOL1CA+GLOL2P+GLOL2CA+GLOL3+GALL1BC+GALE6BC+GALE5a+GALE5b+GALE5+GEOL1+GEOL5+BDSB1I+BDSB2I+BDSB3I+BDSB1C+BDSB2a+BDSB2b+QZSL1CA+QZSL2C+QZSL5+QZSL1CB+NAVICL5
+setSBFOutput, Stream1, , +PVTGeodetic+ChannelStatus+ReceiverStatus+SatVisibility+ReceiverTime
+setPVTMode, Static
+setPPSParameters, sec1, Low2High, , UTC
+setUSBInternetAccess, off
+setHttpsSettings, HTTP
+login, basegnss, basegnss!, RxAdmin, S3pt3ntr10
+#END

receiver_cfg/U-Blox_ZED-F9P_config_info.txt

@@ -6,6 +6,7 @@ The U-Blox_ZED-F9P_rtkbase.txt config file is based on default settings with the
 - NAV-PVT enabled
 - NAV-SAT enabled
 - NAV-SIG enabled
+- CFG-NAVSPG-DYNMODEL Dynamic model sets to static
 - NMEA on USB out disabled
 - NMEA on UART1 out disabled
 

receiver_cfg/U-Blox_ZED-F9P_rtkbase.cfg

@@ -11,3 +11,4 @@ CFG-MSGOUT-UBX_NAV_SAT_USB,1
 CFG-MSGOUT-UBX_NAV_SAT_UART1,1
 CFG-MSGOUT-UBX_NAV_SIG_USB,1
 CFG-MSGOUT-UBX_NAV_SIG_UART1,1
+CFG-NAVSPG-DYNMODEL,2

receiver_cfg/Unicore_UM980_rtcm3.cfg

@@ -14,4 +14,5 @@ rtcm1087 1
 rtcm1097 1
 rtcm1107 1
 rtcm1117 1
-rtcm1127 1
+rtcm1127 1
+MASK 0

receiver_cfg/Unicore_UM982_rtcm3.cfg

@@ -14,4 +14,5 @@ rtcm1087 1
 rtcm1097 1
 rtcm1107 1
 rtcm1117 1
-rtcm1127 1
+rtcm1127 1
+MASK 0

run_cast.sh

@@ -13,11 +13,11 @@ in_tcp="tcpcli://localhost:${tcp_port}#${receiver_format}"
 #in_ext_tcp is mainly for dev purpose to receive a raw stream from another base
 in_ext_tcp="tcpcli://${ext_tcp_source}:${ext_tcp_port}#${receiver_format}"
 
-out_caster_A="ntrips://:${svr_pwd_a}@${svr_addr_a}:${svr_port_a}/${mnt_name_a}#rtcm3 -msg ${rtcm_msg_a} -p ${position}"
+out_caster_A="-msg ${rtcm_msg_a} -out ntrips://:${svr_pwd_a}@${svr_addr_a}:${svr_port_a}/${mnt_name_a}#rtcm3 -p ${position}"
 #add receiver options if it exists
 [[ ! -z "${ntrip_a_receiver_options}" ]] && out_caster_A=""${out_caster_A}" -opt "${ntrip_a_receiver_options}""
 
-out_caster_B="ntrips://:${svr_pwd_b}@${svr_addr_b}:${svr_port_b}/${mnt_name_b}#rtcm3 -msg ${rtcm_msg_b} -p ${position}"
+out_caster_B="-msg ${rtcm_msg_b} -out ntrips://:${svr_pwd_b}@${svr_addr_b}:${svr_port_b}/${mnt_name_b}#rtcm3 -p ${position}"
 #add receiver options if it exists
 [[ ! -z "${ntrip_b_receiver_options}" ]] && out_caster_B=""${out_caster_B}" -opt "${ntrip_b_receiver_options}""
 
@@ -29,26 +29,27 @@ if [[ ${local_ntripc_user} == '' ]] && [[ ${local_ntripc_pwd} == '' ]]
     local_ntripc_auth='B' #Basic authentification
 fi
 out_local_caster_source_table="${local_ntripc_mnt_name};rtcm3;${local_ntripc_msg};${receiver_frequency_count};GPS+GLO+GAL+BDS+QZS;NONE;NONE;${array_pos[0]};${array_pos[1]};0;0;RTKBase_${receiver},${version};NONE;${local_ntripc_auth};N;;"
-out_local_caster="ntripc://${local_ntripc_user}:${local_ntripc_pwd}@:${local_ntripc_port}/${local_ntripc_mnt_name}:${out_local_caster_source_table}#rtcm3 -msg ${local_ntripc_msg} -p ${position}"
+out_local_caster="-msg ${local_ntripc_msg} -out ntripc://${local_ntripc_user}:${local_ntripc_pwd}@:${local_ntripc_port}/${local_ntripc_mnt_name}:${out_local_caster_source_table}#rtcm3 -p ${position}"
 #add receiver options if it exists
 [[ ! -z "${local_ntripc_receiver_options}" ]] && out_local_caster="${out_local_caster} -opt ${local_ntripc_receiver_options}"
-out_tcp="tcpsvr://:${tcp_port}"
+
+out_tcp="tcpsvr://${tcp_host_addr}:${tcp_port}"
 
 out_file="file://${datadir}/${file_name}.${receiver_format}::T::S=${file_rotate_time} -f ${file_overlap_time}"
 
-out_rtcm_svr="tcpsvr://:${rtcm_svr_port}#rtcm3 -msg ${rtcm_svr_msg} -p ${position}"
+out_rtcm_svr="-msg ${rtcm_svr_msg} -out tcpsvr://:${rtcm_svr_port}#rtcm3 -p ${position}"
 #add receiver options if it exists
 [[ ! -z "${rtcm_receiver_options}" ]] && out_rtcm_svr=""${out_rtcm_svr}" -opt "${rtcm_receiver_options}""
 
-out_rtcm_client="tcpcli://${rtcm_client_user}:${rtcm_client_pwd}@${rtcm_client_addr}:${rtcm_client_port}#rtcm3 -msg ${rtcm_client_msg} -p ${position}"
+out_rtcm_client="-msg ${rtcm_client_msg} -out tcpcli://${rtcm_client_user}:${rtcm_client_pwd}@${rtcm_client_addr}:${rtcm_client_port}#rtcm3 -p ${position}"
 #add receiver options if it exists
 [[ ! -z "${rtcm_client_receiver_options}" ]] && out_rtcm_client=""${out_rtcm_client}" -opt "${rtcm_receiver_client_options}""
 
-out_rtcm_udp_svr="udpsvr://:${rtcm_udp_svr_port}#rtcm3 -msg ${rtcm_udp_svr_msg} -p ${position}"
+out_rtcm_udp_svr="-msg ${rtcm_udp_svr_msg} -out udpsvr://:${rtcm_udp_svr_port}#rtcm3 -p ${position}"
 #add receiver options if it exists
 [[ ! -z "${rtcm_udp_svr_receiver_options}" ]] && out_rtcm_udp_svr=""${out_rtcm_udp_svr}" -opt "${rtcm_udp_svr_receiver_options}""
 
-out_rtcm_serial="serial://${out_com_port}:${out_com_port_settings}#rtcm3 -msg ${rtcm_serial_msg} -p ${position}"
+out_rtcm_serial="-msg ${rtcm_serial_msg} -out serial://${out_com_port}:${out_com_port_settings}#rtcm3 -p ${position}"
 #add receiver options if it exists
 [[ ! -z "${rtcm_serial_receiver_options}" ]] && out_rtcm_serial=""${out_rtcm_serial}" -opt "${rtcm_serial_receiver_options}""
 
@@ -58,41 +59,41 @@ mkdir -p ${logdir}
     out_tcp)
     #echo ${cast} -in ${!1} -out $out_tcp
     # What is this ${!1} ? It's variable indirection
-    ${cast} -in ${!1} -out ${out_tcp} -b 1 -t ${level} -fl ${logdir}/str2str_tcp.log &
+    ${cast} -in ${!1} -out ${out_tcp} -b 1 -t ${level} -fl ${logdir}/str2str_tcp_$(date "+%F-%T").log
     ;;
 
   out_caster_A)
     #echo ${cast} -in ${!1} -out $out_caster
-    ${cast} -in ${!1} -out ${out_caster_A} -i "${receiver_info}" -a "${antenna_info}" -t ${level} -fl ${logdir}/str2str_ntrip_A.log &
+    ${cast} -in ${!1} ${out_caster_A} -i "${receiver_info}" -a "${antenna_info}" -t ${level} -fl ${logdir}/str2str_ntrip_A.log
     ;;
 
   out_caster_B)
-    ${cast} -in ${!1} -out ${out_caster_B} -i "${receiver_info}" -a "${antenna_info}" -t ${level} -fl ${logdir}/str2str_ntrip_B.log &
+    ${cast} -in ${!1} ${out_caster_B} -i "${receiver_info}" -a "${antenna_info}" -t ${level} -fl ${logdir}/str2str_ntrip_B.log
     ;;
 
   out_local_caster)
     #echo ${cast} -in ${!1} -out "${out_local_caster}"
-    ${cast} -in ${!1} -out ${out_local_caster} -i "${receiver_info}" -a "${antenna_info}" -t ${level} -fl ${logdir}/str2str_ntrip.log &
+    ${cast} -in ${!1} ${out_local_caster} -i "${receiver_info}" -a "${antenna_info}" -t ${level} -fl ${logdir}/str2str_ntrip.log
     ;;
 
   out_rtcm_svr)
     #echo ${cast} -in ${!1} -out $out_rtcm_svr
-    ${cast} -in ${!1} -out ${out_rtcm_svr} -i "${receiver_info}" -a "${antenna_info}" -t ${level} -fl ${logdir}/str2str_rtcm_svr.log &
+    ${cast} -in ${!1} ${out_rtcm_svr} -i "${receiver_info}" -a "${antenna_info}" -t ${level} -fl ${logdir}/str2str_rtcm_svr.log
     ;;
 
   out_rtcm_client)
     #echo ${cast} -in ${!1} -out $out_rtcm_client
-  ${cast} -in ${!1} -out ${out_rtcm_client} -i "${receiver_info}" -a "${antenna_info}" -t ${level} -fl ${logdir}/str2str_rtcm_client.log &
+    ${cast} -in ${!1} ${out_rtcm_client} -i "${receiver_info}" -a "${antenna_info}" -t ${level} -fl ${logdir}/str2str_rtcm_client.log
   ;;
 
   out_rtcm_udp_svr)
     #echo ${cast} -in ${!1} -out $out_rtcm_udp_svr
-    ${cast} -in ${!1} -out ${out_rtcm_udp_svr} -i "${receiver_info}" -a "${antenna_info}" -t ${level} -fl ${logdir}/str2str_rtcm_udp_svr.log &
+    ${cast} -in ${!1} ${out_rtcm_udp_svr} -i "${receiver_info}" -a "${antenna_info}" -t ${level} -fl ${logdir}/str2str_rtcm_udp_svr.log
     ;;
 
   out_rtcm_serial)
     #echo ${cast} -in ${!1} -out $out_rtcm_serial
-    ${cast} -in ${!1} -out ${out_rtcm_serial} -i "${receiver_info}" -a "${antenna_info}" -t ${level} -fl ${logdir}/str2str_rtcm_serial.log &
+    ${cast} -in ${!1} ${out_rtcm_serial} -i "${receiver_info}" -a "${antenna_info}" -t ${level} -fl ${logdir}/str2str_rtcm_serial.log
     ;;
 
   out_file)
@@ -102,7 +103,7 @@ mkdir -p ${logdir}
     if [ ${ret} -eq 0 ]
     then
       mkdir -p ${datadir}
-      ${cast} -in ${!1} -out ${out_file} -t ${level} -fl ${logdir}/str2str_file.log &
+      ${cast} -in ${!1} -out ${out_file} -t ${level} -fl ${logdir}/str2str_file.log
     fi
     ;;
 

settings.conf.default

@@ -2,9 +2,9 @@
 
 [general]
 # Version
-version=2.6.4
+version=2.7.0
 # Rtkbase upgrade mandatory "checkpoint"
-checkpoint_version=2.7.0
+checkpoint_version=2.8.0
 # User who runs str2str_file service
 user=
 # NTRIP caster program
@@ -44,6 +44,8 @@ receiver_firmware=''
 receiver_carrier=''
 #Antenna info, id, serial number. Without space inside the strings
 antenna_info='ADVNULLANTENNA'
+#Tcp host address to bind the tcp stream
+tcp_host_addr='127.0.0.1'
 #tcp port for RAW stream. If you change this value, edit gpsd conf file to reflect the port in DEVICES.
 tcp_port='5015'
 #ext_tcp_source is mainly for dev purpose to receive a raw stream from another base

tools/convbin.sh

@@ -44,14 +44,14 @@ convert_to_rinex_ign_bis() {
   "${CONVBIN_PATH}" "${args}"
     return $?
 }
-# Rinex v3.04 - 30s -  GPS + GLONASS
+# Rinex v3.04 - 30s -  GPS + GLONASS + GALILEO
 convert_to_rinex_nrcan() {
   echo "- CREATING RINEX " "${RINEX_FILE}"
   "${CONVBIN_PATH}" "${raw_file}" -v 3.04 -r "${RAW_TYPE}"       \
         -hc "${RTKBASE_VERSION}" -hm "${MOUNT_NAME}"   \
         -hp "${ANT_POSITION}" -ha 0000/"${ANT_TYPE}"   \
         -hr 0000/"${RECEIVER}"/"${REC_VERSION}"        \
-        -f 2 -y E -y J -y S -y C -y I                  \
+        -f 2 -y J -y S -y C -y I                  \
         -od -os -oi -ot -ti 30 -tt 0                   \
         -ro "${REC_OPTION}" -o "${RINEX_FILE}"
     return $?

tools/find_rtkbase/CHANGELOG.md

@@ -1,4 +1,10 @@
 # Changelog
 
-## [0.1] - not released
+## [0.2] - Not released
+### Added
+- Shift+click on "open" button open the browser with the RTKBase ip address.
+### Changed
+- Switch from scapy to requests for http request.
+
+## [0.1] - 2025-02-16
 - First release

tools/find_rtkbase/find_rtkbase.py

@@ -21,7 +21,7 @@ def __init__(self, master, ports=[80, 443], allscan=False):
         self.master = master
         self.ports = ports
         self.allscan = allscan
-        master.title("Find RTKBase v0.1")
+        master.title("Find RTKBase v0.2")
         master.geometry("400x200")
         master.columnconfigure(0, weight=1)
         master.rowconfigure(0, weight=1)
@@ -123,12 +123,16 @@ def _after_scan_thread(self):
         self.base_buttons_list = ["base" + str(i) + "Button" for i, j in enumerate(self.available_base)]
         if len(self.available_base)>0:
             for i, base in enumerate(self.available_base):
-                def action(ip = (base.get('server') or base.get('ip')), port = base.get('port')):
+                def browser_fqdn(event, ip = (base.get('server') or base.get('ip')), port = base.get('port')):
+                    self.launch_browser(ip, port)
+                def browser_ip(event, ip = (base.get('ip')), port = base.get('port')):
                     self.launch_browser(ip, port)
 
                 self.base_labels_list[i] = ttk.Label(self.top_frame, text=f"{base.get('server') or base.get('fqdn')} ({base.get('ip')})")
                 self.base_labels_list[i].grid(column=0, row=i)
-                self.base_buttons_list[i] = ttk.Button(self.top_frame, text='Open', command=action)
+                self.base_buttons_list[i] = ttk.Button(self.top_frame, text='Open')
+                self.base_buttons_list[i].bind("<Button-1>", browser_fqdn)
+                self.base_buttons_list[i].bind("<Shift-Button-1>", browser_ip)
                 self.base_buttons_list[i].grid(column=3, row=i)
         else:
             self.nobase_label.grid()

tools/find_rtkbase/scan_network.py

@@ -1,8 +1,8 @@
 #! /usr/bin/env python3
-import json
 import time
 import logging
 import argparse
+import requests
 import scapy.all as scapy
 scapy.load_layer("http")
 from zeroconf import Zeroconf
@@ -111,12 +111,12 @@ def get_rtkbase_infos(host_list):
                             if address is None:
                                 continue
                             log.debug(f"{address}:{port} Api request")
-                            res = http_request(address, path="/api/v1/infos", port=port)
+                            res = requests.get(f"http://{address}:{port}/api/v1/infos", timeout=10)
                             log.debug(f"{address}:{port} Api response: {res}")
-                            ans = json.loads(res.load.decode()) if res is not None else None
+                            ans = res.json() if res is not None and res.status_code == 200 else None
                             if ans:
                                 break
-                        except (TimeoutError, TypeError, ConnectionRefusedError) as e:
+                        except (TimeoutError, TypeError, requests.exceptions.ConnectionError) as e:
                             log.debug(f"{address}:{port} - {e}")
 
                     if ans and ans.get('app') == 'RTKBase':