Skip to content

Commit 3c8568c

Browse files
committed
Upgrade to RTKlib b34i
1 parent f08fbce commit 3c8568c

File tree

11 files changed

+19
-18
lines changed

11 files changed

+19
-18
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
- Rules to manage rtkbase services without sudo (Bookworm or newer).
88
- Trying to detect the wrong cpu temp on Orange Pi Zero. #224
99
### Changed
10-
- RTKLib upgraded to release b34h from rtklibexplorer.
10+
- RTKLib upgraded to release b34i from rtklibexplorer.
1111
- RTKBase now use a virtual environnement for the python environnement
1212
- install.sh -> --detect-usb-gnss renamed to --detect-gnss
1313
- Rinex conversion -> limit to 2 frequencies removed in "full" presets

rtkbase_update.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,9 @@ upd_2.4.2() {
328328
#check if we can apply the update
329329
#FOR THE OLDER ME -> Don't forget to modify the os detection if there is a 2.5.x release !!!
330330
[[ $checking == '--checking' ]] && check_before_update
331-
331+
echo '################################'
332332
echo 'Starting standard update'
333+
echo '################################'
333334
update || { echo 'Update failed (update)' ; exit 1 ;}
334335
# calling specific update function. If we are using v2.2.5, it will call the function upd_2.2.5
335336
echo 'Starting specific update'

tools/bin/rtklib_b34h/aarch64/convbin

-2.92 MB
Binary file not shown.

tools/bin/rtklib_b34h/aarch64/rtkrcv

-4.05 MB
Binary file not shown.

tools/bin/rtklib_b34h/aarch64/str2str

-3.05 MB
Binary file not shown.

tools/bin/rtklib_b34h/armv7l/convbin

-2.31 MB
Binary file not shown.

tools/bin/rtklib_b34i/armv7l/convbin

2.31 MB
Binary file not shown.

tools/install.sh

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ man_help(){
3737
echo ' Install all dependencies like git build-essential python3-pip ...'
3838
echo ''
3939
echo ' -r | --rtklib'
40-
echo ' Get RTKlib 2.4.3b34h from github and compile it.'
41-
echo ' https://github.com/rtklibexplorer/RTKLIB/tree/b34h'
40+
echo ' Get RTKlib 2.4.3b34i from github and compile it.'
41+
echo ' https://github.com/rtklibexplorer/RTKLIB/tree/b34i'
4242
echo ''
4343
echo ' -b | --rtkbase-release'
4444
echo ' Get last release of RTKBase:'
@@ -181,13 +181,13 @@ install_rtklib() {
181181
sbc_array=('Xunlong Orange Pi Zero' 'Raspberry Pi')
182182
#test if computer_model in sbc_array (https://stackoverflow.com/questions/3685970/check-if-a-bash-array-contains-a-value)
183183
if printf '%s\0' "${sbc_array[@]}" | grep -Fxqz -- "${computer_model}" \
184-
&& [[ -f "${rtkbase_path}"'/tools/bin/rtklib_b34h/'"${arch_package}"'/str2str' ]] \
184+
&& [[ -f "${rtkbase_path}"'/tools/bin/rtklib_b34i/'"${arch_package}"'/str2str' ]] \
185185
&& lsb_release -c | grep -qE 'buster|bullseye|bookworm'
186186
then
187187
echo 'Copying new rtklib binary for ' "${computer_model}" ' - ' "${arch_package}"
188-
cp "${rtkbase_path}"'/tools/bin/rtklib_b34h/'"${arch_package}"/str2str /usr/local/bin/
189-
cp "${rtkbase_path}"'/tools/bin/rtklib_b34h/'"${arch_package}"/rtkrcv /usr/local/bin/
190-
cp "${rtkbase_path}"'/tools/bin/rtklib_b34h/'"${arch_package}"/convbin /usr/local/bin/
188+
cp "${rtkbase_path}"'/tools/bin/rtklib_b34i/'"${arch_package}"/str2str /usr/local/bin/
189+
cp "${rtkbase_path}"'/tools/bin/rtklib_b34i/'"${arch_package}"/rtkrcv /usr/local/bin/
190+
cp "${rtkbase_path}"'/tools/bin/rtklib_b34i/'"${arch_package}"/convbin /usr/local/bin/
191191
else
192192
echo 'No binary available for ' "${computer_model}" ' - ' "${arch_package}" '. We will build it from source'
193193
_compil_rtklib
@@ -196,20 +196,20 @@ install_rtklib() {
196196

197197
_compil_rtklib() {
198198
echo '################################'
199-
echo 'COMPILING RTKLIB'
199+
echo 'COMPILING RTKLIB 2.4.3 b34i'
200200
echo '################################'
201-
#Get Rtklib 2.4.3 b34h release
202-
sudo -u "${RTKBASE_USER}" wget -qO - https://github.com/rtklibexplorer/RTKLIB/archive/refs/tags/b34h.tar.gz | tar -xvz
201+
#Get Rtklib 2.4.3 b34i release
202+
sudo -u "${RTKBASE_USER}" wget -qO - https://github.com/rtklibexplorer/RTKLIB/archive/refs/tags/b34i.tar.gz | tar -xvz
203203
#Install Rtklib app
204204
#TODO add correct CTARGET in makefile?
205-
make --directory=RTKLIB-b34h/app/consapp/str2str/gcc
206-
make --directory=RTKLIB-b34h/app/consapp/str2str/gcc install
207-
make --directory=RTKLIB-b34h/app/consapp/rtkrcv/gcc
208-
make --directory=RTKLIB-b34h/app/consapp/rtkrcv/gcc install
209-
make --directory=RTKLIB-b34h/app/consapp/convbin/gcc
210-
make --directory=RTKLIB-b34h/app/consapp/convbin/gcc install
205+
make --directory=RTKLIB-b34i/app/consapp/str2str/gcc
206+
make --directory=RTKLIB-b34i/app/consapp/str2str/gcc install
207+
make --directory=RTKLIB-b34i/app/consapp/rtkrcv/gcc
208+
make --directory=RTKLIB-b34i/app/consapp/rtkrcv/gcc install
209+
make --directory=RTKLIB-b34i/app/consapp/convbin/gcc
210+
make --directory=RTKLIB-b34i/app/consapp/convbin/gcc install
211211
#deleting RTKLIB
212-
rm -rf RTKLIB-b34h/
212+
rm -rf RTKLIB-b34i/
213213
}
214214

215215
_rtkbase_repo(){

0 commit comments

Comments
 (0)