Skip to content

Commit

Permalink
Upgrade to RTKlib b34i
Browse files Browse the repository at this point in the history
Stefal committed Jan 27, 2024
1 parent f08fbce commit 3c8568c
Showing 11 changed files with 19 additions and 18 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
- Rules to manage rtkbase services without sudo (Bookworm or newer).
- Trying to detect the wrong cpu temp on Orange Pi Zero. #224
### Changed
- RTKLib upgraded to release b34h from rtklibexplorer.
- RTKLib upgraded to release b34i from rtklibexplorer.
- RTKBase now use a virtual environnement for the python environnement
- install.sh -> --detect-usb-gnss renamed to --detect-gnss
- Rinex conversion -> limit to 2 frequencies removed in "full" presets
3 changes: 2 additions & 1 deletion rtkbase_update.sh
Original file line number Diff line number Diff line change
@@ -328,8 +328,9 @@ upd_2.4.2() {
#check if we can apply the update
#FOR THE OLDER ME -> Don't forget to modify the os detection if there is a 2.5.x release !!!
[[ $checking == '--checking' ]] && check_before_update

echo '################################'
echo 'Starting standard update'
echo '################################'
update || { echo 'Update failed (update)' ; exit 1 ;}
# calling specific update function. If we are using v2.2.5, it will call the function upd_2.2.5
echo 'Starting specific update'
Binary file removed tools/bin/rtklib_b34h/aarch64/convbin
Binary file not shown.
Binary file removed tools/bin/rtklib_b34h/aarch64/rtkrcv
Binary file not shown.
Binary file removed tools/bin/rtklib_b34h/aarch64/str2str
Binary file not shown.
Binary file removed tools/bin/rtklib_b34h/armv7l/convbin
Binary file not shown.
Binary file added tools/bin/rtklib_b34i/armv7l/convbin
Binary file not shown.
Binary file not shown.
Binary file not shown.
32 changes: 16 additions & 16 deletions tools/install.sh
Original file line number Diff line number Diff line change
@@ -37,8 +37,8 @@ man_help(){
echo ' Install all dependencies like git build-essential python3-pip ...'
echo ''
echo ' -r | --rtklib'
echo ' Get RTKlib 2.4.3b34h from github and compile it.'
echo ' https://github.com/rtklibexplorer/RTKLIB/tree/b34h'
echo ' Get RTKlib 2.4.3b34i from github and compile it.'
echo ' https://github.com/rtklibexplorer/RTKLIB/tree/b34i'
echo ''
echo ' -b | --rtkbase-release'
echo ' Get last release of RTKBase:'
@@ -181,13 +181,13 @@ install_rtklib() {
sbc_array=('Xunlong Orange Pi Zero' 'Raspberry Pi')
#test if computer_model in sbc_array (https://stackoverflow.com/questions/3685970/check-if-a-bash-array-contains-a-value)
if printf '%s\0' "${sbc_array[@]}" | grep -Fxqz -- "${computer_model}" \
&& [[ -f "${rtkbase_path}"'/tools/bin/rtklib_b34h/'"${arch_package}"'/str2str' ]] \
&& [[ -f "${rtkbase_path}"'/tools/bin/rtklib_b34i/'"${arch_package}"'/str2str' ]] \
&& lsb_release -c | grep -qE 'buster|bullseye|bookworm'
then
echo 'Copying new rtklib binary for ' "${computer_model}" ' - ' "${arch_package}"
cp "${rtkbase_path}"'/tools/bin/rtklib_b34h/'"${arch_package}"/str2str /usr/local/bin/
cp "${rtkbase_path}"'/tools/bin/rtklib_b34h/'"${arch_package}"/rtkrcv /usr/local/bin/
cp "${rtkbase_path}"'/tools/bin/rtklib_b34h/'"${arch_package}"/convbin /usr/local/bin/
cp "${rtkbase_path}"'/tools/bin/rtklib_b34i/'"${arch_package}"/str2str /usr/local/bin/
cp "${rtkbase_path}"'/tools/bin/rtklib_b34i/'"${arch_package}"/rtkrcv /usr/local/bin/
cp "${rtkbase_path}"'/tools/bin/rtklib_b34i/'"${arch_package}"/convbin /usr/local/bin/
else
echo 'No binary available for ' "${computer_model}" ' - ' "${arch_package}" '. We will build it from source'
_compil_rtklib
@@ -196,20 +196,20 @@ install_rtklib() {

_compil_rtklib() {
echo '################################'
echo 'COMPILING RTKLIB'
echo 'COMPILING RTKLIB 2.4.3 b34i'
echo '################################'
#Get Rtklib 2.4.3 b34h release
sudo -u "${RTKBASE_USER}" wget -qO - https://github.com/rtklibexplorer/RTKLIB/archive/refs/tags/b34h.tar.gz | tar -xvz
#Get Rtklib 2.4.3 b34i release
sudo -u "${RTKBASE_USER}" wget -qO - https://github.com/rtklibexplorer/RTKLIB/archive/refs/tags/b34i.tar.gz | tar -xvz
#Install Rtklib app
#TODO add correct CTARGET in makefile?
make --directory=RTKLIB-b34h/app/consapp/str2str/gcc
make --directory=RTKLIB-b34h/app/consapp/str2str/gcc install
make --directory=RTKLIB-b34h/app/consapp/rtkrcv/gcc
make --directory=RTKLIB-b34h/app/consapp/rtkrcv/gcc install
make --directory=RTKLIB-b34h/app/consapp/convbin/gcc
make --directory=RTKLIB-b34h/app/consapp/convbin/gcc install
make --directory=RTKLIB-b34i/app/consapp/str2str/gcc
make --directory=RTKLIB-b34i/app/consapp/str2str/gcc install
make --directory=RTKLIB-b34i/app/consapp/rtkrcv/gcc
make --directory=RTKLIB-b34i/app/consapp/rtkrcv/gcc install
make --directory=RTKLIB-b34i/app/consapp/convbin/gcc
make --directory=RTKLIB-b34i/app/consapp/convbin/gcc install
#deleting RTKLIB
rm -rf RTKLIB-b34h/
rm -rf RTKLIB-b34i/
}

_rtkbase_repo(){

0 comments on commit 3c8568c

Please sign in to comment.