Skip to content

Commit 654bf67

Browse files
wb2oszwb2osz
authored
Merge branch 'dev' into gpiod
2 parents b8919ba + 2260df1 commit 654bf67

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+2484
-774
lines changed

‎.github/workflows/ci.yml

+162
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
name: 'build direwolf'
2+
3+
on:
4+
# permit to manually trigger the CI
5+
workflow_dispatch:
6+
inputs:
7+
cmake_flags:
8+
description: 'Custom CMAKE flags'
9+
required: false
10+
push:
11+
paths-ignore:
12+
- '.github/**'
13+
pull_request:
14+
paths-ignore:
15+
- '.github/**'
16+
17+
jobs:
18+
build:
19+
name: ${{ matrix.config.name }}
20+
runs-on: ${{ matrix.config.os }}
21+
strategy:
22+
fail-fast: false
23+
matrix:
24+
config:
25+
- {
26+
name: 'Windows Latest MinGW 64bit',
27+
os: windows-latest,
28+
cc: 'x86_64-w64-mingw32-gcc',
29+
cxx: 'x86_64-w64-mingw32-g++',
30+
ar: 'x86_64-w64-mingw32-ar',
31+
windres: 'x86_64-w64-mingw32-windres',
32+
arch: 'x86_64',
33+
build_type: 'Release',
34+
cmake_extra_flags: '-G "MinGW Makefiles"'
35+
}
36+
- {
37+
name: 'Windows 2019 MinGW 32bit',
38+
os: windows-2019,
39+
cc: 'i686-w64-mingw32-gcc',
40+
cxx: 'i686-w64-mingw32-g++',
41+
ar: 'i686-w64-mingw32-ar',
42+
windres: 'i686-w64-mingw32-windres',
43+
arch: 'i686',
44+
build_type: 'Release',
45+
cmake_extra_flags: '-G "MinGW Makefiles"'
46+
}
47+
- {
48+
name: 'macOS latest',
49+
os: macos-latest,
50+
cc: 'clang',
51+
cxx: 'clang++',
52+
arch: 'x86_64',
53+
build_type: 'Release',
54+
cmake_extra_flags: ''
55+
}
56+
- {
57+
name: 'Ubuntu latest Debug',
58+
os: ubuntu-latest,
59+
cc: 'gcc',
60+
cxx: 'g++',
61+
arch: 'x86_64',
62+
build_type: 'Debug',
63+
cmake_extra_flags: ''
64+
}
65+
- {
66+
name: 'Ubuntu 22.04',
67+
os: ubuntu-22.04,
68+
cc: 'gcc',
69+
cxx: 'g++',
70+
arch: 'x86_64',
71+
build_type: 'Release',
72+
cmake_extra_flags: ''
73+
}
74+
- {
75+
name: 'Ubuntu 20.04',
76+
os: ubuntu-20.04,
77+
cc: 'gcc',
78+
cxx: 'g++',
79+
arch: 'x86_64',
80+
build_type: 'Release',
81+
cmake_extra_flags: ''
82+
}
83+
84+
steps:
85+
- name: checkout
86+
uses: actions/checkout@v2
87+
with:
88+
fetch-depth: 8
89+
- name: dependency
90+
shell: bash
91+
run: |
92+
# this is not perfect but enought for now
93+
if [ "$RUNNER_OS" == "Linux" ]; then
94+
sudo apt-get update
95+
sudo apt-get install libasound2-dev libudev-dev libhamlib-dev gpsd
96+
elif [ "$RUNNER_OS" == "macOS" ]; then
97+
# just to simplify I use homebrew but
98+
# we can use macports (latest direwolf is already available as port)
99+
brew install portaudio hamlib gpsd
100+
elif [ "$RUNNER_OS" == "Windows" ]; then
101+
# add the folder to PATH
102+
echo "C:\msys64\mingw32\bin" >> $GITHUB_PATH
103+
fi
104+
- name: create build environment
105+
run: |
106+
cmake -E make_directory ${{github.workspace}}/build
107+
- name: configure
108+
shell: bash
109+
working-directory: ${{github.workspace}}/build
110+
run: |
111+
if [ "$RUNNER_OS" == "Windows" ]; then
112+
export CC=${{ matrix.config.cc }}
113+
export CXX=${{ matrix.config.cxx }}
114+
export AR=${{ matrix.config.ar }}
115+
export WINDRES=${{ matrix.config.windres }}
116+
fi
117+
cmake $GITHUB_WORKSPACE \
118+
-DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \
119+
-DCMAKE_C_COMPILER=${{ matrix.config.cc }} \
120+
-DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} \
121+
-DCMAKE_CXX_FLAGS="-Werror" -DUNITTEST=1 \
122+
${{ matrix.config.cmake_extra_flags }} \
123+
${{ github.event.inputs.cmake_flags }}
124+
- name: build
125+
shell: bash
126+
working-directory: ${{github.workspace}}/build
127+
run: |
128+
if [ "$RUNNER_OS" == "Windows" ]; then
129+
export CC=${{ matrix.config.cc }}
130+
export CXX=${{ matrix.config.cxx }}
131+
export AR=${{ matrix.config.ar }}
132+
export WINDRES=${{ matrix.config.windres }}
133+
fi
134+
cmake --build . --config ${{ matrix.config.build_type }} \
135+
${{ github.event.inputs.cmake_flags }}
136+
- name: test
137+
continue-on-error: true
138+
shell: bash
139+
working-directory: ${{github.workspace}}/build
140+
run: |
141+
ctest -C ${{ matrix.config.build_type }} \
142+
--parallel 2 --output-on-failure \
143+
${{ github.event.inputs.cmake_flags }}
144+
- name: package
145+
shell: bash
146+
working-directory: ${{github.workspace}}/build
147+
run: |
148+
if [ "$RUNNER_OS" == "Windows" ] || [ "$RUNNER_OS" == "macOS" ]; then
149+
make package
150+
fi
151+
- name: archive binary
152+
uses: actions/upload-artifact@v2
153+
with:
154+
name: direwolf_${{ matrix.config.os }}_${{ matrix.config.arch }}_${{ github.sha }}
155+
path: |
156+
${{github.workspace}}/build/direwolf-*.zip
157+
${{github.workspace}}/build/direwolf.conf
158+
${{github.workspace}}/build/src/*
159+
${{github.workspace}}/build/CMakeCache.txt
160+
!${{github.workspace}}/build/src/cmake_install.cmake
161+
!${{github.workspace}}/build/src/CMakeFiles
162+
!${{github.workspace}}/build/src/Makefile

‎.github/workflows/codeql-analysis.yml

+73
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
on:
15+
push:
16+
branches: [ dev ]
17+
pull_request:
18+
# The branches below must be a subset of the branches above
19+
branches: [ dev ]
20+
schedule:
21+
- cron: '25 8 * * 4'
22+
23+
jobs:
24+
analyze:
25+
name: Analyze
26+
runs-on: ubuntu-latest
27+
permissions:
28+
actions: read
29+
contents: read
30+
security-events: write
31+
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
language: [ 'cpp', 'python' ]
36+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
37+
# Learn more about CodeQL language support at https://git.io/codeql-language-support
38+
39+
steps:
40+
- name: Checkout repository
41+
uses: actions/checkout@v2
42+
43+
# Initializes the CodeQL tools for scanning.
44+
- name: Initialize CodeQL
45+
uses: github/codeql-action/init@v1
46+
with:
47+
languages: ${{ matrix.language }}
48+
# If you wish to specify custom queries, you can do so here or in a config file.
49+
# By default, queries listed here will override any specified in a config file.
50+
# Prefix the list here with "+" to use these queries and those in the config file.
51+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
52+
53+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
54+
# If this step fails, then you should remove it and run the build manually (see below)
55+
- name: Autobuild
56+
uses: github/codeql-action/autobuild@v1
57+
58+
# ℹ️ Command-line programs to run using the OS shell.
59+
# 📚 https://git.io/JvXDl
60+
61+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
62+
# and modify them (or add more) to build your code if your project
63+
# uses a compiled language
64+
65+
- run: |
66+
mkdir build
67+
cd build
68+
cmake -DUNITTEST=1 ..
69+
make
70+
make test
71+
72+
- name: Perform CodeQL Analysis
73+
uses: github/codeql-action/analyze@v1

‎CHANGES.md

+44-4
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,68 @@
22
# Revision History #
33

44

5-
## Version 1.7 -- Under Development ('dev' branch) ##
5+
## Version 1.7 -- October 2023 ##
6+
7+
8+
### New Documentation: ###
9+
10+
Additional documentation location to slow down growth of main repository. [https://github.com/wb2osz/direwolf-doc](https://github.com/wb2osz/direwolf-doc) . These are more oriented toward achieving a goal and understanding, as opposed to the User Guide which describes the functionality.
11+
12+
- ***APRS Digipeaters***
13+
14+
- ***Internal Packet Routing***
15+
16+
- ***Radio Interface Guide***
17+
18+
- ***Successful IGate Operation***
19+
20+
- ***Understanding APRS Packets***
621

722

823
### New Features: ###
924

10-
- Improved Layer 2 Protocol [(IL2P)](https://en.wikipedia.org/wiki/FX.25_Forward_Error_Correction). Use "-I 1" on command line to enable transmit for first channel. Compatible with Nino TNC for 1200 and 9600 bps.
1125

12-
- Limited support for CM109/CM119 GPIO PTT on Windows.
26+
27+
- New ICHANNEL configuration option to map a KISS client application channel to APRS-IS. Packets from APRS-IS will be presented to client applications as the specified channel. Packets sent, by client applications, to that channel will go to APRS-IS rather than a radio channel. Details in ***Internal-Packet-Routing.pdf***.
28+
29+
- New variable speed option for gen_packets. For example, "-v 5,0.1" would generate packets from 5% too slow to 5% too fast with increments of 0.1. Some implementations might have imprecise timing. Use this to test how well TNCs tolerate sloppy timing.
30+
31+
- Improved Layer 2 Protocol [(IL2P)](https://en.wikipedia.org/wiki/FX.25_Forward_Error_Correction). Compatible with Nino TNC for 1200 and 9600 bps. Use "-I 1" on command line to enable transmit for first channel. For more general case, add to config file (simplified version, see User Guide for more details):
32+
33+
> After: "CHANNEL 1" (or other channel)
34+
>
35+
> Add: "IL2PTX 1"
36+
37+
- Limited support for CM108/CM119 GPIO PTT on Windows.
1338

1439
- Dire Wolf now advertises itself using DNS Service Discovery. This allows suitable APRS / Packet Radio applications to find a network KISS TNC without knowing the IP address or TCP port. Thanks to Hessu for providing this. Currently available only for Linux and Mac OSX. [Read all about it here.](https://github.com/hessu/aprs-specs/blob/master/TCP-KISS-DNS-SD.md)
1540

1641
- The transmit calibration tone (-x) command line option now accepts a radio channel number and/or a single letter mode: a = alternate tones, m = mark tone, s = space tone, p = PTT only no sound.
1742

1843
- The BEACON configuration now recognizes the SOURCE= option. This replaces the AX.25 source address rather than using the MYCALL value for the channel. This is useful for sending more than 5 analog telemetry channels. Use two, or more, source addresses with up to 5 analog channels each.
1944

20-
- For more flexibility, the FX.25 transmit property can now be set individually by channel, rather than having a global setting for all channels. The -X on the command line applies only to channel 0. For other channels you need to add a new line to the configuration file.
45+
- For more flexibility, the FX.25 transmit property can now be set individually by channel, rather than having a global setting for all channels. The -X on the command line applies only to channel 0. For other channels you need to add a new line to the configuration file. You can specify a specific number of parity bytes (16, 32, 64) or 1 to choose automatically based on packet size.
2146

2247
> After: "CHANNEL 1" (or other channel)
2348
>
2449
> Add: "FX25TX 1" (or 16 or 32 or 64)
2550
2651

52+
53+
### Bugs Fixed: ###
54+
55+
- The t/m packet filter incorrectly included bulletins. It now allows only "messages" to specific stations. Use of t/m is discouraged. i/180 is the preferred filter for messages to users recently heard locally.
56+
57+
- Packet filtering now skips over any third party header before classifying packet types.
58+
59+
- Fixed build for Alpine Linux.
60+
61+
### Notes: ###
62+
63+
The Windows binary distribution now uses gcc (MinGW) version 11.3.0.
64+
The Windows version is built for both 32 and 64 bit operating systems.
65+
Use the 64 bit version if possible; it runs considerably faster.
66+
2767
## Version 1.6 -- October 2020 ##
2868

2969
### New Build Procedure: ###

‎CMakeLists.txt

+35-10
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,16 @@ elseif(APPLE)
167167
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_MACOS_DNSSD")
168168

169169
elseif (WIN32)
170-
if(NOT VS2015 AND NOT VS2017 AND NOT VS2019)
171-
message(FATAL_ERROR "You must use Microsoft Visual Studio 2015 | 2017 | 2019 as compiler")
170+
if(C_MSVC)
171+
if (NOT VS2015 AND NOT VS2017 AND NOT VS2019)
172+
message(FATAL_ERROR "You must use Microsoft Visual Studio 2015, 2017 or 2019 as compiler")
173+
else()
174+
# compile with full multicore
175+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
176+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
177+
set(CUSTOM_SHELL_BIN "")
178+
endif()
172179
endif()
173-
174-
# compile with full multicore
175-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
176-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
177-
178-
set(CUSTOM_SHELL_BIN "")
179180
endif()
180181

181182
if (C_CLANG OR C_GCC)
@@ -264,9 +265,33 @@ endif(WIN32 OR CYGWIN)
264265
# requirements
265266

266267
include(CheckSymbolExists)
268+
267269
# Some platforms provide their own strlcpy & strlcat. (BSD, MacOSX)
268-
# Others don't so we provide our own. (Most, but not all Linux)
269-
# Define the preprocessor macro so libgps does not supply its own version.
270+
# Others don't so we provide our own. (Windows, most, but not all Linux)
271+
# Here we detect whether these are provided by the OS and set a symbol
272+
# so that:
273+
# (1) libgps does not supply its own version.
274+
# (2) we know whether we need to supply our own copy.
275+
#
276+
# This was all working fine until these were added to the gnu c library 2.38.
277+
# References:
278+
# - https://www.gnu.org/software/libc/sources.html
279+
# - https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=NEWS;hb=HEAD
280+
#
281+
# This test is not detecting them for glibc 2.38 resulting in a conflict.
282+
# Why? Are they declared in a different file or in some strange way?
283+
#
284+
# This is how they are declared in include/string.h:
285+
#
286+
# extern __typeof (strlcpy) __strlcpy;
287+
# libc_hidden_proto (__strlcpy)
288+
# extern __typeof (strlcat) __strlcat;
289+
# libc_hidden_proto (__strlcat)
290+
#
291+
# Apparently cmake does not recognize this style.
292+
# Keep this here for BSD type systems where it behaves as expected.
293+
# We will need to add a hack in direwolf.h to define these if glibc version >= 2.38.
294+
270295
check_symbol_exists(strlcpy string.h HAVE_STRLCPY)
271296
if(HAVE_STRLCPY)
272297
add_compile_options(-DHAVE_STRLCPY)

0 commit comments

Comments
 (0)