Merge branch 'master' into ms-hamlib-4-7

Author: tmiw

README.md

@@ -141,14 +141,36 @@ one to build FreeDV for ARM as well as for Intel Windows systems.
 
 ### Instructions
 
-1. Download LLVM MinGW at https://github.com/mstorsjo/llvm-mingw/releases/.
-2. Decompress into your preferred location. For example: `tar xvf llvm-mingw-20220906-ucrt-ubuntu-18.04-x86_64.tar.xz` (The exact filename here will depend on the file downloaded in step (1). Note that for best results, you should use a build containing "ucrt" in the file name corresponding to the platform which you're building the Windows binary from.)
-3. Add LLVM MinGW to your PATH: `export PATH=/path/to/llvm-mingw-20220906-ucrt-ubuntu-18.04-x86_64/bin:$PATH`. (The folder containing the LLVM tools is typically named the same as the file downloaded in step (2) minus the extension.)
-4. Create a build folder inside freedv-gui: `mkdir build_windows`
-5. Run CMake to configure the FreeDV build: `cd build_windows && cmake -DCMAKE_TOOLCHAIN_FILE=${PWD}/../cross-compile/freedv-mingw-llvm-[architecture].cmake ..`
-   * Valid architectures are: aarch64 (64 bit ARM), i686 (32 bit Intel/AMD), x86_64 (64 bit Intel/AMD)
-6. Build FreeDV as normal: `make` (You can also add `-j[num]` to the end of this command to use multiple cores and shorten the build time.)
-7. Create FreeDV installer: `make package`
+1. Install WINE (example commands for Ubuntu below):
+
+```
+    sudo dpkg --add-architecture i386
+    sudo sh -c "curl https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor > /etc/apt/trusted.gpg.d/winehq.gpg"
+    sudo sh -c "apt-add-repository \"https://dl.winehq.org/wine-builds/ubuntu\""
+    sudo apt-get update
+    sudo apt install -y --install-recommends winehq-staging
+    WINEPREFIX=`pwd`/wine-env WINEARCH=win64 DISPLAY= winecfg /v win10
+```
+
+2. Install Python inside the WINE environment:
+
+```
+    export WINEPREFIX=`pwd`/wine-env
+    wget https://www.python.org/ftp/python/3.14.3/python-3.14.3-amd64.exe
+    WINEARCH=win64 DISPLAY= wine ./python-3.14.3-amd64.exe
+    DISPLAY= wine c:\\Program\ Files\\Python314\\Scripts\\pip.exe install numpy==2.3.5
+```
+
+(*Note: if using WSL2, you will need to choose "Customize Installation", skip "Optional Features" (hit Next), and then in "Advanced Options" check "Install Python 3.14 for all users" inside Python setup.*)
+
+3. Download LLVM MinGW at https://github.com/mstorsjo/llvm-mingw/releases/.
+4. Decompress into your preferred location. For example: `tar xvf llvm-mingw-20220906-ucrt-ubuntu-18.04-x86_64.tar.xz` (The exact filename here will depend on the file downloaded in step (1). Note that for best results, you should use a build containing "ucrt" in the file name corresponding to the platform which you're building the Windows binary from.)
+5. Add LLVM MinGW to your PATH: `export PATH=/path/to/llvm-mingw-20220906-ucrt-ubuntu-18.04-x86_64/bin:$PATH`. (The folder containing the LLVM tools is typically named the same as the file downloaded in step (2) minus the extension.)
+6. Create a build folder inside freedv-gui: `mkdir build_windows`
+7. Run CMake to configure the FreeDV build: `cd build_windows && cmake -DCMAKE_TOOLCHAIN_FILE=${PWD}/../cross-compile/freedv-mingw-llvm-[architecture].cmake -DPython3_ROOT_DIR=$WINEPREFIX/drive_c/Program\ Files/Python314 ..`
+   * Valid architectures are: aarch64 (64 bit ARM), x86_64 (64 bit Intel/AMD)
+8. Build FreeDV as normal: `make` (You can also add `-j[num]` to the end of this command to use multiple cores and shorten the build time.)
+9. Create FreeDV installer: `make package`
 
 ## Building and installing on macOS
 

USER_MANUAL.html

@@ -1187,6 +1187,8 @@ <h2 data-number="18.1" id="v2.3.0-tbd-2026"><span
 <li>Update audio device list in Easy Setup after opening advanced audio
 setup. (PR #1223)</li>
 <li>Easy Setup: Fix crash while displaying Hamlib error. (PR #1224)</li>
+<li>Force numpy to 2.3.x due to illegal instruction errors. (PR
+#1230)</li>
 </ul></li>
 <li>Enhancements:
 <ul>
@@ -1197,6 +1199,11 @@ <h2 data-number="18.1" id="v2.3.0-tbd-2026"><span
 <ul>
 <li>Windows/macOS: Update Python to 3.14.3. (PR #1221)</li>
 </ul></li>
+<li>Documentation:
+<ul>
+<li>Update README instructions to reflect current Windows build steps.
+(PR #1232)</li>
+</ul></li>
 </ol>
 <h2 data-number="18.2" id="v2.2.1-february-2026"><span
 class="header-section-number">18.2</span> V2.2.1 February 2026</h2>

USER_MANUAL.md

@@ -882,10 +882,13 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
     * FreeDV Reporter: Fix display issues on non-English systems. (PR #1217)
     * Update audio device list in Easy Setup after opening advanced audio setup. (PR #1223)
     * Easy Setup: Fix crash while displaying Hamlib error. (PR #1224)
+    * Force numpy to 2.3.x due to illegal instruction errors. (PR #1230)
 2. Enhancements:
     * FreeDV Reporter: Use ItemsAdded/ItemsDeleted instead of Cleared() for performance. (PR #1212)
 3. Build system:
     * Windows/macOS: Update Python to 3.14.3. (PR #1221)
+4. Documentation:
+    * Update README instructions to reflect current Windows build steps. (PR #1232)
 
 ## V2.2.1 February 2026
 

USER_MANUAL.pdf

@@ -62,7 +62,7 @@ source rade-venv/bin/activate # || { echo "ERROR: activate venv failed"; exit 1;
 # Clear cache in venv
 pip3 cache purge
 pip3 install --upgrade pip || echo "WARNING: pip upgrade failed"
-pip3 install numpy
+pip3 install numpy==2.3.5
 pip3 install torch==2.9.1 --index-url https://download.pytorch.org/whl/cpu
 pip3 install matplotlib
 cd -

appimage/make-appimage.sh

@@ -1,2 +1,3 @@
 torch==2.9.1
+numpy==2.3.5
 matplotlib

cmake/rade-requirements.txt

@@ -36,12 +36,12 @@ cp ../delocating.py.patched pkg-venv/lib/python3.12/site-packages/delocate/deloc
 # Download RADE dependencies appropriate for both architectures (x86_64 and arm64)
 
 mkdir arm64
-pip3 download --platform macosx_11_0_arm64 --python-version 3.14 --only-binary=:all: filelock typing-extensions setuptools sympy networkx jinja2 fsspec optree opt-einsum numpy matplotlib
+pip3 download --platform macosx_11_0_arm64 --python-version 3.14 --only-binary=:all: filelock typing-extensions setuptools sympy networkx jinja2 fsspec optree opt-einsum numpy==2.3.5 matplotlib
 wget -O arm64/torch-2.9.1a0+gitd38164a-cp314-cp314-macosx_11_0_arm64.whl https://github.com/tmiw/pytorch-macos-packages/releases/download/v2.9.1-20251129/torch-2.9.1a0+gitd38164a-cp314-cp314-macosx_11_0_arm64.whl
 mv *arm64.whl arm64
 
 mkdir x86_64
-pip3 download --platform macosx_11_0_x86_64 --python-version 3.14 --only-binary=:all: filelock typing-extensions setuptools sympy networkx jinja2 fsspec optree opt-einsum numpy matplotlib
+pip3 download --platform macosx_11_0_x86_64 --python-version 3.14 --only-binary=:all: filelock typing-extensions setuptools sympy networkx jinja2 fsspec optree opt-einsum numpy==2.3.5 matplotlib
 wget -O x86_64/torch-2.9.1a0+gitd38164a-cp314-cp314-macosx_11_0_x86_64.whl https://github.com/tmiw/pytorch-macos-packages/releases/download/v2.9.1-20251129/torch-2.9.1a0+gitd38164a-cp314-cp314-macosx_11_0_x86_64.whl
 #rm numpy*
 #wget -O x86_64/numpy-2.3.2-cp312-cp312-macosx_11_0_x86_64.whl https://k6aq.net/freedv-build/numpy-2.3.2-cp312-cp312-macosx_11_0_x86_64.whl

generate-univ-pkgs.sh

@@ -42,6 +42,20 @@ $ SSDR_RADIO_ADDRESS=192.168.1.2 PYTHONPATH=$(pwd)/rade_src src/integrations/fle
 To ensure proper reporting to FreeDV Reporter by the waveform, make sure that your callsign is properly 
 configured in SmartSDR (i.e. it doesn't say "FLEX" when first starting).
 
+### Executing on Windows Subsystem For Linux (WSL)
+
+Prior to building the waveform, WSL needs some settings changes to allow it to have the required network
+support. Edit .wslconfig to contain the following:
+
+```
+[wsl2]
+networkingMode=Mirrored
+firewall=false
+```
+
+Then, from a PowerShell session running as Administrator, execute `Set-NetFirewallHyperVVMSetting -Name '{40E0AC32-46A5-438A-A0B2-2B479E8F2E90}' -DefaultInboundAction Allow`.
+You will then need to restart WSL by executing `wsl.exe --shutdown` and then reopening the Linux instance.
+
 ## Full list of options
 
 ```