From 073f26ace8c656f8d2332f37a3eb35e553fb84ca Mon Sep 17 00:00:00 2001 From: dj2ls Date: Sun, 4 Sep 2022 19:45:15 +0200 Subject: [PATCH 1/3] hotfix for #240 and failing GitHub action --- .github/workflows/build_multiplatform.yml | 4 ++-- tnc/codec2.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index ebcaf4d1..e6fd623f 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -114,8 +114,8 @@ jobs: distro: bullseye libcodec2_os_name: libcodec2_ubuntu-bullseye_armv7.so - arch: armv7 - distro: ubuntu18.04 - libcodec2_os_name: libcodec2_ubuntu-1804_armv7.so + distro: ubuntu20.04 + libcodec2_os_name: libcodec2_ubuntu-2004_armv7.so steps: - uses: actions/checkout@v2.1.0 diff --git a/tnc/codec2.py b/tnc/codec2.py index a8c2f441..f7ce6b64 100644 --- a/tnc/codec2.py +++ b/tnc/codec2.py @@ -30,7 +30,7 @@ class FREEDV_MODE(Enum): fsk_ldpc = 9 fsk_ldpc_0 = 200 fsk_ldpc_1 = 201 - + auto_mode = 255 # TODO: find a better way for this --> better remove the need for this line # Function for returning the mode value def freedv_get_mode_value_by_name(mode: str) -> int: From dbffd1f01db95df53cfe740629785c5b8ae98cac Mon Sep 17 00:00:00 2001 From: dj2ls Date: Mon, 5 Sep 2022 09:04:35 +0200 Subject: [PATCH 2/3] removed mode 255 from mode list --- tnc/codec2.py | 1 - tnc/data_handler.py | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tnc/codec2.py b/tnc/codec2.py index f7ce6b64..18b5ee46 100644 --- a/tnc/codec2.py +++ b/tnc/codec2.py @@ -30,7 +30,6 @@ class FREEDV_MODE(Enum): fsk_ldpc = 9 fsk_ldpc_0 = 200 fsk_ldpc_1 = 201 - auto_mode = 255 # TODO: find a better way for this --> better remove the need for this line # Function for returning the mode value def freedv_get_mode_value_by_name(mode: str) -> int: diff --git a/tnc/data_handler.py b/tnc/data_handler.py index 0e858fc9..f3314785 100644 --- a/tnc/data_handler.py +++ b/tnc/data_handler.py @@ -805,7 +805,6 @@ class DATA: self.log.info( "[TNC] | TX | DATACHANNEL", - mode=FREEDV_MODE(mode).name, Bytes=static.TOTAL_BYTES, ) @@ -843,7 +842,7 @@ class DATA: # we have TX_N_MAX_RETRIES_PER_BURST attempts for sending a burst for self.tx_n_retry_of_burst in range(TX_N_MAX_RETRIES_PER_BURST): data_mode = mode - self.log.debug("[TNC] FIXED MODE:", mode=FREEDV_MODE(data_mode).name) + # self.log.debug("[TNC] FIXED MODE:", mode=FREEDV_MODE(data_mode).name) # we are doing a modulo check of transmission retries of the actual burst # every 2nd retry which fails, decreases speedlevel by 1. From c3f8e3d8993856d16fa7e43800cab5a7961dc6a8 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Mon, 5 Sep 2022 09:20:59 +0200 Subject: [PATCH 3/3] another attempt of fixing GitHub action --- .github/workflows/build_multiplatform.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index e6fd623f..f90823bf 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -154,15 +154,18 @@ jobs: case "${{ matrix.distro }}" in ubuntu*|jessie|stretch|buster|bullseye) apt-get update -q -y - apt-get install -q -y git build-essential cmake + apt-get install -q -y git build-essential cmake gcc g++ + cmake --version ;; fedora*) dnf -y update - dnf -y install git which build-essential cmake + dnf -y install git which build-essential cmake gcc-c++ gcc + cmake --version ;; alpine*) apk update - apk add git build-essential cmake + apk add git build-essential cmake gcc g++ + cmake --version ;; esac