Merge branch 'dev' of https://github.com/Stefal/rtkbase into dev

Stefal · Feb 11, 2023 · 90646e4 · 90646e4
2 parents 8d6ddb3 + 35e319b
commit 90646e4
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - GUI -> Settings: Added a button to detect and/or configure the gnss receiver. #70
 - GUI -> Settings: Added a button to show/hide the Ntrip passwords. Thanks to @GwnDaan #208 
 - GUI -> Settings: Added Gnss receiver informations (Model and firmware release).
+- GUI -> Settings: Alert when user wants to leave the page with unsaved settings. #235
 - GUI -> Status: Added tooltip on the blue pin to explain that it's a coarse location. #247
 - GUI -> Status: Added an alert if the main service isn't active.
 - GUI -> Logs: Added 3 more Rinex presets, and modified rinex window layout. #43 #134 #190 #200

diff --git a/tools/bin/rtklib_b34g/armhf/convbin b/tools/bin/rtklib_b34g/armhf/convbin
diff --git a/tools/bin/rtklib_b34g/armhf/rtkrcv b/tools/bin/rtklib_b34g/armhf/rtkrcv
diff --git a/tools/bin/rtklib_b34g/armhf/str2str b/tools/bin/rtklib_b34g/armhf/str2str
diff --git a/web_app/server.py b/web_app/server.py
@@ -261,7 +261,7 @@ def check_update(source_url = None, current_release = None, prerelease=rtkbaseco
  new_release = {}
  source_url = source_url if source_url is not None else "https://api.github.com/repos/stefal/rtkbase/releases"
  current_release = current_release if current_release is not None else rtkbaseconfig.get("general", "version").strip("v")
- current_release = current_release.replace("-beta", "").replace("-alpha", "").replace("-rc", "")
+ current_release = current_release.split("-beta", 1)[0].split("-alpha", 1)[0].split("-rc", 1)[0].split("b", 1)[0]
 
  try: 
  response = requests.get(source_url)