diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f3433092..1a829f57 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -301,6 +301,318 @@ jobs:
         path: __Builds\installer\QTAC-windows-arm64.exe
         if-no-files-found: error
 
+  build-source-linux:
+    needs: [fetch-ftdi-linux, build-docs]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-22.04, ubuntu-latest]
+        qt_version: ['6.9.2', '6.10.0']
+
+    steps:
+    - uses: actions/checkout@v6
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y python3-pip wget libxkbcommon-x11-0 x11-common libxcb-xinerama0-dev build-essential libgl1-mesa-dev mesa-common-dev uuid-dev libpulse-dev ninja-build libudev-dev
+
+    - name: Cache Qt installation on Linux
+      uses: actions/cache@v5
+      with:
+        path: ${{ matrix.qt_version }}/gcc_64
+        key: ${{ matrix.os }}-qt-${{ matrix.qt_version }}
+
+    - name: Install aqtinstall
+      run: pip install aqtinstall
+
+    - name: Install Qt ${{ matrix.qt_version }} on ${{ matrix.os }}
+      run: |
+        aqt install-qt linux desktop ${{ matrix.qt_version }} linux_gcc_64 -m qtmultimedia qtserialport
+        echo "QTBIN=$HOME/work/qcom-test-automation-controller/qcom-test-automation-controller/${{ matrix.qt_version }}/gcc_64/bin" >> $GITHUB_ENV
+
+    - name: Restore FTDI archive on Linux
+      uses: actions/cache/restore@v5
+      with:
+        path: third-party/libftd2xx-linux-x86_64-1.4.33.tgz
+        key: ftdi-linux-1.4.33
+
+    - name: Configure
+      run: |
+        export PATH="$QTBIN:$PATH"
+        cmake -S source -B build/source/Release \
+          -DCMAKE_PREFIX_PATH="$(dirname $QTBIN)" \
+          -DCMAKE_COLOR_DIAGNOSTICS=ON \
+          -DCMAKE_GENERATOR=Ninja \
+          -DCMAKE_BUILD_TYPE=Release
+
+    - name: Build
+      run: cmake --build build/source/Release
+
+    - name: Run tests
+      run: |
+        cd build/source/Release
+        ctest --output-on-failure
+
+    - name: Install patchelf
+      run: sudo apt-get install -y patchelf
+
+    - name: Deploy Qt runtime
+      run: |
+        export PATH="$QTBIN:$PATH"
+        QT_ROOT="$(dirname $QTBIN)"
+        DEPLOY_BIN_DIR="source/__Builds/Linux/Release/bin"
+        DEPLOY_LIB_DIR="source/__Builds/Linux/Release/lib"
+        DEPLOY_PLUGIN_DIR="source/__Builds/Linux/Release/plugins"
+        mkdir -p "$DEPLOY_LIB_DIR" "$DEPLOY_PLUGIN_DIR"
+        find "$DEPLOY_BIN_DIR" -type f -executable -exec ldd {} \; 2>/dev/null \
+          | awk '/=>/ {print $3}' | sort -u \
+          | grep "$QT_ROOT" \
+          | xargs -I{} cp -an {} "$DEPLOY_LIB_DIR/" || true
+        find "$QT_ROOT/lib" -maxdepth 1 -name "libQt6*.so*" -exec cp -an {} "$DEPLOY_LIB_DIR/" \; || true
+        find "$QT_ROOT/lib" -maxdepth 1 -name "libicu*.so*" -exec cp -an {} "$DEPLOY_LIB_DIR/" \; || true
+        for plugin_dir in iconengines imageformats platforminputcontexts platforms platformthemes xcbglintegrations; do
+          if [ -d "$QT_ROOT/plugins/$plugin_dir" ]; then
+            mkdir -p "$DEPLOY_PLUGIN_DIR/$plugin_dir"
+            cp -a "$QT_ROOT/plugins/$plugin_dir/." "$DEPLOY_PLUGIN_DIR/$plugin_dir/"
+          fi
+        done
+        find "$DEPLOY_BIN_DIR" -type f -executable | while read exe; do
+          patchelf --set-rpath '$ORIGIN/../lib' "$exe" || true
+        done
+
+    - name: Download built docs artifact
+      uses: actions/download-artifact@v4
+      with:
+        name: qtac-docs-html
+        path: docs-html
+
+    - name: Replace docs source with built HTML
+      run: |
+        rm -rf docs
+        mv docs-html docs
+
+    - name: Package QTAC (source)
+      run: |
+        chmod +x packaging/linux/package_QTAC.sh
+        PKG_NAME=qualcomm-qtac-source \
+          SRC_DIR="$(pwd)/source/__Builds/Linux/Release" \
+          ./packaging/linux/package_QTAC.sh
+
+    - name: Package QTAC (source, no-GUI)
+      run: |
+        PKG_NAME=qualcomm-qtac-source-nogui \
+          SRC_DIR="$(pwd)/source/__Builds/Linux/Release" \
+          NO_GUI=1 \
+          ./packaging/linux/package_QTAC.sh
+
+    - name: Upload installer artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: QTAC-source-${{ matrix.os }}-qt${{ matrix.qt_version }}
+        path: packaging/linux/build/*.deb
+        if-no-files-found: error
+
+  build-source-windows:
+    needs: [fetch-ftdi-windows, build-docs]
+    runs-on: windows-2022
+    strategy:
+      fail-fast: false
+      matrix:
+        qt_version: ['6.9.2', '6.10.0']
+
+    steps:
+    - uses: actions/checkout@v6
+
+    - name: Install Python dependencies
+      shell: pwsh
+      run: pip install aqtinstall
+
+    - name: Cache Qt installation on Windows
+      uses: actions/cache@v5
+      with:
+        path: C:\Qt\${{ matrix.qt_version }}\msvc2022_64
+        key: ${{ runner.os }}-qt-${{ matrix.qt_version }}
+
+    - name: Install Qt ${{ matrix.qt_version }} for MSVC
+      shell: pwsh
+      run: |
+        aqt install-qt windows desktop ${{ matrix.qt_version }} win64_msvc2022_64 --outputdir "C:\Qt" -m qtserialport qtmultimedia
+        echo "QTBIN=C:\Qt\${{ matrix.qt_version }}\msvc2022_64\bin" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+    - name: Restore FTDI archive on Windows
+      uses: actions/cache/restore@v5
+      with:
+        path: third-party\CDM-v2.12.36.4-WHQL-Certified.zip
+        key: ftdi-windows-2.12.36.4
+
+    - name: Install .NET Framework 4.8 Developer Pack
+      shell: pwsh
+      run: choco install netfx-4.8-devpack -y
+
+    - name: Build (source)
+      shell: pwsh
+      run: |
+        $env:QTDIR = "C:\Qt\${{ matrix.qt_version }}\msvc2022_64"
+        .\build_app.ps1
+
+    - name: Run tests
+      shell: pwsh
+      run: |
+        cd build\Release
+        ctest --output-on-failure
+
+    - name: Download built docs artifact
+      uses: actions/download-artifact@v4
+      with:
+        name: qtac-docs-html
+        path: docs-html
+
+    - name: Replace docs source with built HTML
+      shell: pwsh
+      run: |
+        Remove-Item -Recurse -Force docs
+        Move-Item docs-html docs
+
+    - name: Deploy Qt runtime (source, x64)
+      shell: pwsh
+      run: |
+        $qtBin = "C:\Qt\${{ matrix.qt_version }}\msvc2022_64\bin"
+        $binDir = "source\__Builds\x64\Release\bin"
+        $env:PATH = "$qtBin;$env:PATH"
+        & "$qtBin\windeployqt.exe" --release --no-translations --no-system-d3d-compiler `
+          (Get-ChildItem $binDir -Filter "*.exe" | Select-Object -First 1 -ExpandProperty FullName)
+
+    - name: Build installer (QTAC-source-windows-x64.exe)
+      shell: pwsh
+      run: |
+        .\packaging\windows\build-installer.ps1 `
+          -BinDir "source\__Builds\x64\Release\bin"
+
+    - name: Build installer (QTAC-source-windows-x64-nogui.exe)
+      shell: pwsh
+      run: |
+        .\packaging\windows\build-installer.ps1 `
+          -BinDir "source\__Builds\x64\Release\bin" `
+          -NoGui
+
+    - name: Upload installer artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: QTAC-source-windows-x64-qt${{ matrix.qt_version }}
+        path: __Builds\installer\QTAC-windows-*.exe
+        if-no-files-found: error
+
+  build-source-windows-arm64:
+    needs: [fetch-ftdi-windows-arm64, build-docs]
+    runs-on: windows-11-arm
+    strategy:
+      fail-fast: false
+      matrix:
+        qt_version: ['6.9.2', '6.10.0']
+
+    steps:
+    - uses: actions/checkout@v6
+
+    - name: Install Python dependencies
+      shell: pwsh
+      run: pip install aqtinstall
+
+    - name: Cache Qt installation for ARM64
+      uses: actions/cache@v5
+      with:
+        path: C:\Qt\${{ matrix.qt_version }}\msvc2022_arm64
+        key: windows-arm64-qt-${{ matrix.qt_version }}
+
+    - name: Install Qt ${{ matrix.qt_version }} for MSVC ARM64
+      shell: pwsh
+      run: |
+        aqt install-qt windows_arm64 desktop ${{ matrix.qt_version }} win64_msvc2022_arm64 --outputdir "C:\Qt" --autodesktop -m qtserialport qtmultimedia
+        echo "QTBIN=C:\Qt\${{ matrix.qt_version }}\msvc2022_arm64\bin" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+    - name: Restore FTDI archive for ARM64
+      uses: actions/cache/restore@v5
+      with:
+        path: third-party\CDM-v2.12.36.20-for-ARM64-WHQL-Certified.zip
+        key: ftdi-windows-arm64-2.12.36.20
+
+    - name: Build (source)
+      shell: pwsh
+      run: |
+        $env:QTDIR = "C:\Qt\${{ matrix.qt_version }}\msvc2022_arm64"
+        $vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
+        $vsPath  = ""
+        if (Test-Path $vswhere) {
+          $vsPath = & $vswhere -nologo -latest -property installationPath 2>$null
+        }
+        if (-not $vsPath) {
+          foreach ($e in @('Enterprise','Community','Professional')) {
+            $p = "C:\Program Files\Microsoft Visual Studio\2022\$e"
+            if (Test-Path $p) { $vsPath = $p; break }
+          }
+        }
+        if (-not $vsPath) { throw "VS2022 not found" }
+        $vcvarsall = "$vsPath\VC\Auxiliary\Build\vcvarsall.bat"
+        $envLines = cmd /c "`"$vcvarsall`" arm64 && set" 2>&1
+        $envLines | Where-Object { $_ -match '^[A-Za-z_][A-Za-z0-9_]+=.' } | ForEach-Object {
+          $kv = $_ -split '=', 2
+          if ($kv.Count -eq 2) { [System.Environment]::SetEnvironmentVariable($kv[0], $kv[1]) }
+        }
+        $qtRoot = $env:QTDIR
+        $env:PATH = "$qtRoot\bin;$env:PATH"
+        cmake -S source -B build\Release -DCMAKE_PREFIX_PATH="$qtRoot" -G Ninja -DCMAKE_BUILD_TYPE=Release
+        if ($LASTEXITCODE -ne 0) { throw "Configure failed" }
+        cmake --build build\Release
+        if ($LASTEXITCODE -ne 0) { throw "Build failed" }
+
+    - name: Run tests
+      shell: pwsh
+      run: |
+        cd build\Release
+        ctest --output-on-failure
+
+    - name: Download built docs artifact
+      uses: actions/download-artifact@v4
+      with:
+        name: qtac-docs-html
+        path: docs-html
+
+    - name: Replace docs source with built HTML
+      shell: pwsh
+      run: |
+        Remove-Item -Recurse -Force docs
+        Move-Item docs-html docs
+
+    - name: Deploy Qt runtime (source, ARM64)
+      shell: pwsh
+      run: |
+        $qtBin = "C:\Qt\${{ matrix.qt_version }}\msvc2022_arm64\bin"
+        $binDir = "source\__Builds\ARM64\Release\bin"
+        $env:PATH = "$qtBin;$env:PATH"
+        & "$qtBin\windeployqt.exe" --release --no-translations --no-system-d3d-compiler `
+          (Get-ChildItem $binDir -Filter "*.exe" | Select-Object -First 1 -ExpandProperty FullName)
+
+    - name: Build installer (QTAC-source-windows-arm64.exe)
+      shell: pwsh
+      run: |
+        .\packaging\windows\build-installer.ps1 `
+          -BinDir "source\__Builds\ARM64\Release\bin"
+
+    - name: Build installer (QTAC-source-windows-arm64-nogui.exe)
+      shell: pwsh
+      run: |
+        .\packaging\windows\build-installer.ps1 `
+          -BinDir "source\__Builds\ARM64\Release\bin" `
+          -NoGui
+
+    - name: Upload installer artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: QTAC-source-windows-arm64-qt${{ matrix.qt_version }}
+        path: __Builds\installer\QTAC-windows-*.exe
+        if-no-files-found: error
+
   publish-release-linux:
     name: Publish release (Linux)
     if: github.ref_type == 'tag'
@@ -440,6 +752,143 @@ jobs:
           }
         }
         $assets = Get-ChildItem release-assets -File | ForEach-Object { $_.FullName }
+        gh release upload "$env:TAG" $assets `
+          --repo "$env:GITHUB_REPOSITORY" `
+          --clobber
+
+  publish-release-source-linux:
+    name: Publish release (source Linux)
+    if: github.ref_type == 'tag'
+    needs: build-source-linux
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: write
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v6
+      with:
+        fetch-depth: 0
+
+    - name: Verify tag is on main branch
+      id: verify_main
+      run: |
+        set -euo pipefail
+        git fetch origin main --quiet
+        if git merge-base --is-ancestor "$GITHUB_SHA" origin/main; then
+          echo "Tagged commit $GITHUB_SHA is on main; proceeding with release."
+          echo "on_main=true" >> "$GITHUB_OUTPUT"
+        else
+          echo "Tagged commit $GITHUB_SHA is NOT on main; skipping release publish."
+          echo "on_main=false" >> "$GITHUB_OUTPUT"
+        fi
+
+    - name: Download source Linux build artifacts
+      if: steps.verify_main.outputs.on_main == 'true'
+      uses: actions/download-artifact@v4
+      with:
+        pattern: QTAC-source-*ubuntu*
+        path: release-artifacts
+
+    - name: Flatten artifacts into a single directory
+      if: steps.verify_main.outputs.on_main == 'true'
+      run: |
+        set -euo pipefail
+        mkdir -p release-assets
+        find release-artifacts -mindepth 2 -type f -print0 | while IFS= read -r -d '' f; do
+          artifact_name="$(basename "$(dirname "$f")")"
+          filename="$(basename "$f")"
+          cp "$f" "release-assets/${artifact_name}_${filename}"
+        done
+        echo "Source Linux release assets to upload:"
+        ls -la release-assets
+
+    - name: Ensure GitHub Release exists and upload assets
+      if: steps.verify_main.outputs.on_main == 'true'
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        TAG: ${{ github.ref_name }}
+      run: |
+        set -euo pipefail
+        if ! gh release view "$TAG" --repo "$GITHUB_REPOSITORY" >/dev/null 2>&1; then
+          gh release create "$TAG" \
+            --repo "$GITHUB_REPOSITORY" \
+            --title "$TAG" \
+            --generate-notes || \
+          gh release view "$TAG" --repo "$GITHUB_REPOSITORY" >/dev/null 2>&1
+        fi
+        gh release upload "$TAG" release-assets/* \
+          --repo "$GITHUB_REPOSITORY" \
+          --clobber
+
+  publish-release-source-windows:
+    name: Publish release (source Windows)
+    if: github.ref_type == 'tag'
+    needs: [build-source-windows, build-source-windows-arm64]
+    runs-on: windows-2022
+    permissions:
+      contents: write
+    steps:
+    - name: Checkout repository (full history)
+      uses: actions/checkout@v6
+      with:
+        fetch-depth: 0
+
+    - name: Verify tag is on main branch
+      id: verify_main
+      shell: pwsh
+      run: |
+        $ErrorActionPreference = 'Stop'
+        git fetch origin main --quiet
+        git merge-base --is-ancestor "$env:GITHUB_SHA" origin/main
+        if ($LASTEXITCODE -eq 0) {
+          Write-Host "Tagged commit $env:GITHUB_SHA is on main; proceeding with release."
+          "on_main=true" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
+        } else {
+          Write-Host "Tagged commit $env:GITHUB_SHA is NOT on main; skipping release publish."
+          "on_main=false" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
+        }
+
+    - name: Download source Windows build artifacts
+      if: steps.verify_main.outputs.on_main == 'true'
+      uses: actions/download-artifact@v4
+      with:
+        pattern: QTAC-source-windows-*
+        path: release-artifacts
+
+    - name: Flatten artifacts into a single directory
+      if: steps.verify_main.outputs.on_main == 'true'
+      shell: pwsh
+      run: |
+        New-Item -ItemType Directory -Force -Path release-assets | Out-Null
+        Get-ChildItem release-artifacts -Directory | ForEach-Object {
+          $artifactName = $_.Name
+          Get-ChildItem $_.FullName -File -Recurse | ForEach-Object {
+            $target = Join-Path 'release-assets' ("${artifactName}_$($_.Name)")
+            Copy-Item $_.FullName $target -Force
+          }
+        }
+        Write-Host "Source Windows release assets to upload:"
+        Get-ChildItem release-assets | Format-Table -AutoSize
+
+    - name: Ensure GitHub Release exists and upload assets
+      if: steps.verify_main.outputs.on_main == 'true'
+      shell: pwsh
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        TAG: ${{ github.ref_name }}
+      run: |
+        $ErrorActionPreference = 'Stop'
+        gh release view "$env:TAG" --repo "$env:GITHUB_REPOSITORY" 2>$null
+        if ($LASTEXITCODE -ne 0) {
+          gh release create "$env:TAG" `
+            --repo "$env:GITHUB_REPOSITORY" `
+            --title "$env:TAG" `
+            --generate-notes
+          if ($LASTEXITCODE -ne 0) {
+            gh release view "$env:TAG" --repo "$env:GITHUB_REPOSITORY"
+          }
+        }
+        $assets = Get-ChildItem release-assets -File | ForEach-Object { $_.FullName }
         gh release upload "$env:TAG" $assets `
           --repo "$env:GITHUB_REPOSITORY" `
           --clobber
\ No newline at end of file
diff --git a/.semgrepignore b/.semgrepignore
new file mode 100644
index 00000000..b6321b41
--- /dev/null
+++ b/.semgrepignore
@@ -0,0 +1,6 @@
+# Third-party code — not subject to Semgrep analysis
+third-party/
+
+# Vendor headers bundled with the source library
+source/library/ftd2xx.h
+source/library/WinTypes.h
diff --git a/build_app.bat b/build_app.bat
new file mode 100644
index 00000000..1ec30b5b
--- /dev/null
+++ b/build_app.bat
@@ -0,0 +1,48 @@
+@echo off
+setlocal
+
+:: Locate vcvars64 via vswhere (prefers newest VS install)
+set "VSWHERE=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
+if not exist "%VSWHERE%" (
+    echo vswhere.exe not found. Is Visual Studio 2022 installed?
+    exit /b 1
+)
+for /f "usebackq tokens=*" %%i in (`"%VSWHERE%" -latest -products * -requires Microsoft.VisualCpp.Tools.HostX64.TargetX64 -property installationPath`) do set "VS_INSTALLPATH=%%i"
+if not defined VS_INSTALLPATH (
+    echo No VS2022 install with VC++ x64 tools found.
+    exit /b 1
+)
+call "%VS_INSTALLPATH%\VC\Auxiliary\Build\vcvars64.bat" >nul 2>&1
+echo vcvars loaded
+
+:: Locate Qt — honor QTDIR env var, else use default install location
+if defined QTDIR (
+    set "QTBIN=%QTDIR%\bin"
+) else (
+    :: Search for msvc2022_64 under C:\Qt
+    for /f "usebackq tokens=*" %%i in (`dir /b /s /ad "C:\Qt\msvc2022_64" 2^>nul`) do (
+        if exist "%%i\bin\qmake.exe" set "QTROOT=%%i" & goto :qt_found
+    )
+    echo Qt not found. Set QTDIR or install Qt to C:\Qt\
+    exit /b 1
+    :qt_found
+    set "QTBIN=%QTROOT%\bin"
+)
+set "PATH=%QTBIN%;%PATH%"
+
+cmake -S source -B build\Release -DCMAKE_PREFIX_PATH="%QTROOT%" -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=cl > build_out.txt 2>&1
+if errorlevel 1 (
+    echo CMAKE CONFIGURE FAILED
+    type build_out.txt
+    exit /b 1
+)
+
+cmake --build build\Release --target qtac-app TACDev test_tacdev_api test_hardware_psoc >> build_out.txt 2>&1
+if errorlevel 1 (
+    echo CMAKE BUILD FAILED
+    type build_out.txt
+    exit /b 1
+)
+
+echo BUILD SUCCESS
+type build_out.txt
diff --git a/build_app.ps1 b/build_app.ps1
new file mode 100644
index 00000000..886eca8d
--- /dev/null
+++ b/build_app.ps1
@@ -0,0 +1,58 @@
+$ErrorActionPreference = 'Continue'
+$root = $PSScriptRoot
+
+# Locate VS via vswhere
+$vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
+if (Test-Path $vswhere) {
+    $vsInstallPath = & $vswhere -latest -products * -requires Microsoft.VisualCpp.Tools.HostX64.TargetX64 -property installationPath
+    $vcvars = "$vsInstallPath\VC\Auxiliary\Build\vcvars64.bat"
+} else {
+    $vcvars = @(
+        "${env:ProgramFiles}\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat",
+        "${env:ProgramFiles}\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvars64.bat",
+        "${env:ProgramFiles}\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat",
+        "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
+    ) | Where-Object { Test-Path $_ } | Select-Object -First 1
+}
+if (-not $vcvars -or -not (Test-Path $vcvars)) { Write-Error "vcvars64.bat not found - is VS2022 installed?"; exit 1 }
+
+# Locate Qt — honor QTDIR env var, else search standard install locations
+if ($env:QTDIR -and (Test-Path "$env:QTDIR\bin\qmake.exe")) {
+    $qtRoot = $env:QTDIR
+} else {
+    $qtRoot = Get-ChildItem 'C:\Qt' -Filter 'msvc2022_64' -Recurse -Depth 2 -Directory -ErrorAction SilentlyContinue |
+              Where-Object { Test-Path "$($_.FullName)\bin\qmake.exe" } |
+              Sort-Object FullName -Descending |
+              Select-Object -First 1 -ExpandProperty FullName
+}
+if (-not $qtRoot) { Write-Error "Qt not found. Set QTDIR or install Qt to C:\Qt\"; exit 1 }
+$qtbin = "$qtRoot\bin"
+
+# Import MSVC environment
+$envLines = cmd /c "`"$vcvars`" && set" 2>&1
+$envLines | Where-Object { $_ -match '^[A-Za-z_][A-Za-z0-9_]+=.' } | ForEach-Object {
+    $kv = $_ -split '=', 2
+    if ($kv.Count -eq 2) { [System.Environment]::SetEnvironmentVariable($kv[0], $kv[1]) }
+}
+$env:PATH = "$qtbin;$env:PATH"
+Write-Output "MSVC env loaded from: $vcvars"
+Write-Output "Qt root: $qtRoot"
+Write-Output "cl.exe: $((Get-Command cl.exe -ErrorAction SilentlyContinue).Source)"
+
+Set-Location $root
+
+# Configure
+Write-Output "--- Configuring ---"
+& cmake -S "source" -B "build\Release" "-DCMAKE_PREFIX_PATH=$qtRoot" -G Ninja -DCMAKE_BUILD_TYPE=Release
+if ($LASTEXITCODE -ne 0) { Write-Error "Configure failed"; exit 1 }
+
+# Build qtac-app and TACDev
+Write-Output "--- Building qtac-app ---"
+& cmake --build "build\Release" --target qtac-app
+if ($LASTEXITCODE -ne 0) { Write-Error "Build failed"; exit 1 }
+
+Write-Output "--- Building TACDev ---"
+& cmake --build "build\Release" --target TACDev
+if ($LASTEXITCODE -ne 0) { Write-Error "Build failed"; exit 1 }
+
+Write-Output "--- BUILD SUCCESS ---"
diff --git a/build_tests.ps1 b/build_tests.ps1
new file mode 100644
index 00000000..98d521fe
--- /dev/null
+++ b/build_tests.ps1
@@ -0,0 +1,15 @@
+$ErrorActionPreference = 'Stop'
+. "$PSScriptRoot\env_setup.ps1"
+
+$build = "$PSScriptRoot\build\Release"
+$out   = "$PSScriptRoot\build_out.txt"
+
+Write-Host "--- Configuring ---"
+& cmake -S "$PSScriptRoot\source" -B "$build" "-DCMAKE_PREFIX_PATH=$qtRoot" -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=cl 2>&1 | Tee-Object -FilePath $out
+if ($LASTEXITCODE -ne 0) { Write-Error "Configure failed"; exit 1 }
+
+Write-Host "--- Building ---"
+& cmake --build "$build" --target qtac-app TACDev test_tacdev_api test_hardware_psoc 2>&1 | Tee-Object -FilePath $out -Append
+if ($LASTEXITCODE -ne 0) { Write-Error "Build failed"; exit 1 }
+
+Write-Host "BUILD SUCCESS"
diff --git a/configurations/TAC_FTDI_13.tcnf b/configurations/TAC_FTDI_13.tcnf
new file mode 100644
index 00000000..d1fa2dc5
--- /dev/null
+++ b/configurations/TAC_FTDI_13.tcnf
@@ -0,0 +1,551 @@
+{
+    "author": "bryantf-qc",
+    "bus": [
+        {
+            "bus": "A",
+            "bus_function": 1,
+            "chip_index": 0
+        },
+        {
+            "bus": "B",
+            "bus_function": 1,
+            "chip_index": 0
+        },
+        {
+            "bus": "C",
+            "bus_function": 2,
+            "chip_index": 0
+        },
+        {
+            "bus": "D",
+            "bus_function": 2,
+            "chip_index": 0
+        }
+    ],
+    "buttons": [],
+    "chip_count": 1,
+    "creation_date": "Mon Jul  7 00:00:00 2026",
+    "description": "ALPACA LITE (FTDI) - default layout",
+    "fileVersion": 1,
+    "modification_date": "Mon Jul  7 00:00:00 2026",
+    "name": "ALPACA LITE (FTDI)",
+    "pins": [
+        {
+            "bus": "A",
+            "chip_index": 0,
+            "command": "",
+            "command_group": 0,
+            "enabled": false,
+            "group": "General",
+            "help_hint": "",
+            "initial_value": false,
+            "input": false,
+            "inverted": false,
+            "name": "",
+            "pin_number": "0",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "A",
+            "chip_index": 0,
+            "command": "",
+            "command_group": 0,
+            "enabled": false,
+            "group": "General",
+            "help_hint": "",
+            "initial_value": false,
+            "input": false,
+            "inverted": false,
+            "name": "",
+            "pin_number": "1",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "A",
+            "chip_index": 0,
+            "command": "",
+            "command_group": 0,
+            "enabled": false,
+            "group": "General",
+            "help_hint": "",
+            "initial_value": false,
+            "input": false,
+            "inverted": false,
+            "name": "",
+            "pin_number": "2",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "A",
+            "chip_index": 0,
+            "command": "",
+            "command_group": 0,
+            "enabled": false,
+            "group": "General",
+            "help_hint": "",
+            "initial_value": false,
+            "input": false,
+            "inverted": false,
+            "name": "",
+            "pin_number": "3",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "A",
+            "chip_index": 0,
+            "command": "",
+            "command_group": 0,
+            "enabled": false,
+            "group": "General",
+            "help_hint": "",
+            "initial_value": false,
+            "input": false,
+            "inverted": false,
+            "name": "",
+            "pin_number": "4",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "A",
+            "chip_index": 0,
+            "command": "",
+            "command_group": 0,
+            "enabled": false,
+            "group": "General",
+            "help_hint": "",
+            "initial_value": false,
+            "input": false,
+            "inverted": false,
+            "name": "",
+            "pin_number": "5",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "A",
+            "chip_index": 0,
+            "command": "",
+            "command_group": 0,
+            "enabled": false,
+            "group": "General",
+            "help_hint": "",
+            "initial_value": false,
+            "input": false,
+            "inverted": false,
+            "name": "",
+            "pin_number": "6",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "A",
+            "chip_index": 0,
+            "command": "",
+            "command_group": 0,
+            "enabled": false,
+            "group": "General",
+            "help_hint": "",
+            "initial_value": false,
+            "input": false,
+            "inverted": false,
+            "name": "",
+            "pin_number": "7",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "B",
+            "chip_index": 0,
+            "command": "",
+            "command_group": 0,
+            "enabled": false,
+            "group": "General",
+            "help_hint": "",
+            "initial_value": false,
+            "input": false,
+            "inverted": false,
+            "name": "",
+            "pin_number": "0",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "B",
+            "chip_index": 0,
+            "command": "",
+            "command_group": 0,
+            "enabled": false,
+            "group": "General",
+            "help_hint": "",
+            "initial_value": false,
+            "input": false,
+            "inverted": false,
+            "name": "",
+            "pin_number": "1",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "B",
+            "chip_index": 0,
+            "command": "",
+            "command_group": 0,
+            "enabled": false,
+            "group": "General",
+            "help_hint": "",
+            "initial_value": false,
+            "input": false,
+            "inverted": false,
+            "name": "",
+            "pin_number": "2",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "B",
+            "chip_index": 0,
+            "command": "",
+            "command_group": 0,
+            "enabled": false,
+            "group": "General",
+            "help_hint": "",
+            "initial_value": false,
+            "input": false,
+            "inverted": false,
+            "name": "",
+            "pin_number": "3",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "B",
+            "chip_index": 0,
+            "command": "",
+            "command_group": 0,
+            "enabled": false,
+            "group": "General",
+            "help_hint": "",
+            "initial_value": false,
+            "input": false,
+            "inverted": false,
+            "name": "",
+            "pin_number": "4",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "B",
+            "chip_index": 0,
+            "command": "",
+            "command_group": 0,
+            "enabled": false,
+            "group": "General",
+            "help_hint": "",
+            "initial_value": false,
+            "input": false,
+            "inverted": false,
+            "name": "",
+            "pin_number": "5",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "B",
+            "chip_index": 0,
+            "command": "",
+            "command_group": 0,
+            "enabled": false,
+            "group": "General",
+            "help_hint": "",
+            "initial_value": false,
+            "input": false,
+            "inverted": false,
+            "name": "",
+            "pin_number": "6",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "B",
+            "chip_index": 0,
+            "command": "",
+            "command_group": 0,
+            "enabled": false,
+            "group": "General",
+            "help_hint": "",
+            "initial_value": false,
+            "input": false,
+            "inverted": false,
+            "name": "",
+            "pin_number": "7",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "C",
+            "chip_index": 0,
+            "command": "pshold",
+            "command_group": 2,
+            "enabled": true,
+            "group": "General",
+            "help_hint": "Force PS_HOLD to high",
+            "initial_value": false,
+            "input": true,
+            "inverted": false,
+            "name": "Force PS_HOLD High",
+            "pin_number": "0",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "C",
+            "chip_index": 0,
+            "command": "uim1",
+            "command_group": 2,
+            "enabled": true,
+            "group": "General",
+            "help_hint": "Disconnects the UIM 1",
+            "initial_value": false,
+            "input": true,
+            "inverted": false,
+            "name": "Disconnect UIM1",
+            "pin_number": "1",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "C",
+            "chip_index": 0,
+            "command": "headset",
+            "command_group": 2,
+            "enabled": true,
+            "group": "General",
+            "help_hint": "Disconnects headset",
+            "initial_value": false,
+            "input": true,
+            "inverted": false,
+            "name": "Headset Disconnect",
+            "pin_number": "2",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "C",
+            "chip_index": 0,
+            "command": "uim2",
+            "command_group": 2,
+            "enabled": true,
+            "group": "General",
+            "help_hint": "Disconnects the UIM 2",
+            "initial_value": false,
+            "input": true,
+            "inverted": false,
+            "name": "Disconnect UIM2",
+            "pin_number": "3",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "C",
+            "chip_index": 0,
+            "command": "sdcard",
+            "command_group": 2,
+            "enabled": true,
+            "group": "General",
+            "help_hint": "Disconnects the SD Card",
+            "initial_value": false,
+            "input": true,
+            "inverted": false,
+            "name": "Disconnect SD Card",
+            "pin_number": "4",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "C",
+            "chip_index": 0,
+            "command": "sedl",
+            "command_group": 2,
+            "enabled": true,
+            "group": "Fusion",
+            "help_hint": "Secondary Emergency Download Mode",
+            "initial_value": false,
+            "input": true,
+            "inverted": false,
+            "name": "Secondary Emergency Download Mode (EDL)",
+            "pin_number": "5",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "C",
+            "chip_index": 0,
+            "command": "usb1",
+            "command_group": 1,
+            "enabled": true,
+            "group": "General",
+            "help_hint": "Disconnects VBUS 1",
+            "initial_value": false,
+            "input": true,
+            "inverted": true,
+            "name": "USB 1 (VBUS Only)",
+            "pin_number": "6",
+            "priority": 2,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "C",
+            "chip_index": 0,
+            "command": "sresn",
+            "command_group": 2,
+            "enabled": true,
+            "group": "Fusion",
+            "help_hint": "Fusion Secondary PM_RESIN_N",
+            "initial_value": false,
+            "input": true,
+            "inverted": false,
+            "name": "Secondary PM_RESIN_N_SEC",
+            "pin_number": "7",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "D",
+            "chip_index": 0,
+            "command": "volup",
+            "command_group": 3,
+            "enabled": true,
+            "group": "General",
+            "help_hint": "VOL_UP + PWR_ON = Held for boot to UEFI menu",
+            "initial_value": false,
+            "input": true,
+            "inverted": false,
+            "name": "Volume Up",
+            "pin_number": "0",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "D",
+            "chip_index": 0,
+            "command": "battery",
+            "command_group": 1,
+            "enabled": true,
+            "group": "General",
+            "help_hint": "Battery power off/on",
+            "initial_value": false,
+            "input": true,
+            "inverted": true,
+            "name": "Battery",
+            "pin_number": "1",
+            "priority": 2,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "D",
+            "chip_index": 0,
+            "command": "voldn",
+            "command_group": 3,
+            "enabled": true,
+            "group": "General",
+            "help_hint": "(PM_RESIN_N) (Held to boot to fastboot)",
+            "initial_value": false,
+            "input": true,
+            "inverted": false,
+            "name": "Volume Down",
+            "pin_number": "2",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "D",
+            "chip_index": 0,
+            "command": "pkey",
+            "command_group": 3,
+            "enabled": true,
+            "group": "General",
+            "help_hint": "Power On (VOL_UP + PWR_ON = Held for boot to UEFI menu)",
+            "initial_value": false,
+            "input": true,
+            "inverted": false,
+            "name": "Power Key",
+            "pin_number": "3",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "D",
+            "chip_index": 0,
+            "command": "eud",
+            "command_group": 2,
+            "enabled": true,
+            "group": "General",
+            "help_hint": "Embedded USB Debug (EUD)",
+            "initial_value": false,
+            "input": true,
+            "inverted": false,
+            "name": "EUD",
+            "pin_number": "4",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "D",
+            "chip_index": 0,
+            "command": "pedl",
+            "command_group": 2,
+            "enabled": true,
+            "group": "General",
+            "help_hint": "Primary Emergency Download Mode",
+            "initial_value": false,
+            "input": true,
+            "inverted": false,
+            "name": "EDL",
+            "pin_number": "5",
+            "priority": -1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "D",
+            "chip_index": 0,
+            "command": "TC_READY_N",
+            "command_group": 0,
+            "enabled": false,
+            "group": "General",
+            "help_hint": "SW must program it to 1 to enable some output signals. False - Disables the control on some of the FTDI pins: DDBUS 0/2/4/7, CDBUS 0/2/4/7. True - Enable the control on all the FTDI pins.",
+            "initial_value": true,
+            "input": true,
+            "inverted": false,
+            "name": "TC_READY_N",
+            "pin_number": "6",
+            "priority": 1,
+            "run_priority": "-1,-1"
+        },
+        {
+            "bus": "D",
+            "chip_index": 0,
+            "command": "usb0",
+            "command_group": 1,
+            "enabled": true,
+            "group": "General",
+            "help_hint": "Disconnects VBUS0",
+            "initial_value": false,
+            "input": false,
+            "inverted": true,
+            "name": "USB 0 (VBUS Only)",
+            "pin_number": "7",
+            "priority": 2,
+            "run_priority": "-1,-1"
+        }
+    ],
+    "platform_id": 13,
+    "platform_type": "FTDI",
+    "reset_enabled": false,
+    "script": "",
+    "tabs": []
+}
diff --git a/configurations/TAC_FTDI_65.tcnf b/configurations/TAC_FTDI_65.tcnf
index 1a15d85f..143c7675 100644
--- a/configurations/TAC_FTDI_65.tcnf
+++ b/configurations/TAC_FTDI_65.tcnf
@@ -532,15 +532,15 @@
         {
             "bus": "D",
             "chip_index": 0,
-            "command": "<type a command>",
+            "command": "ftdi_en",
             "command_group": 0,
             "enabled": true,
-            "group": "<select a group>",
+            "group": "Fusion",
             "help_hint": "SW must program it to 1 to enable some output signals. False - Disables the control on some of the FTDI pins: DDBUS 0/2/4/7, CDBUS 0/2/4/7. True - Enable the control on all the FTDI pins.",
             "initial_value": true,
             "input": false,
             "inverted": false,
-            "name": "<type a label name>",
+            "name": "FTDI Enable",
             "pin_number": "6",
             "priority": 1,
             "run_priority": "-1,-1"
diff --git a/configurations/devicelist.json b/configurations/devicelist.json
index 60eca665..64465b45 100644
--- a/configurations/devicelist.json
+++ b/configurations/devicelist.json
@@ -113,13 +113,13 @@
             "chip2BusSet": 0,
             "chip3BusSet": 0,
             "chip4BusSet": 0,
-            "configPath": "",
+            "configPath": "../../../../configurations/TAC_FTDI_13.tcnf",
             "debugBoardType": 3,
             "description": "ALPACA LITE (FTDI)",
             "name": "ALPACA LITE (FTDI)",
             "platform_id": 13,
             "revision": 0,
-            "usb_descriptor": ""
+            "usb_descriptor": "ALPACA-LITE MTP DEBUG BOARD"
         },
         {
             "configPath": "../../../../configurations/TAC_PSOC_14.tcnf",
@@ -648,6 +648,7 @@
             "configPath": "../../../../configurations/TAC_PSOC_66.tcnf",
             "debugBoardType": 2,
             "description": "Hawi MTP8975 - PSoC",
+            "firmware_chip": 4,
             "name": "Hawi MTP8975",
             "platform_id": 66,
             "revision": 86,
diff --git a/deploy_app.ps1 b/deploy_app.ps1
new file mode 100644
index 00000000..e147ade1
--- /dev/null
+++ b/deploy_app.ps1
@@ -0,0 +1,22 @@
+. "$PSScriptRoot\env_setup.ps1"
+
+$appDir  = "$PSScriptRoot\build\Release"
+$ftdiBin = "$PSScriptRoot\__Builds\x64\Release\bin"
+$confDir = "$PSScriptRoot\configurations"
+
+# Copy ftd2xx.dll next to exe
+Copy-Item "$ftdiBin\ftd2xx.dll" $appDir -Force
+Write-Output "Copied ftd2xx.dll"
+
+# Copy devicelist.json and all tcnf configs so the app can find them in the exe directory
+Copy-Item "$confDir\devicelist.json" $appDir -Force
+Write-Output "Copied devicelist.json"
+Copy-Item "$confDir\*.tcnf" $appDir -Force
+Write-Output "Copied *.tcnf files"
+Copy-Item "$confDir\DefaultScript.txt" $appDir -Force
+Write-Output "Copied DefaultScript.txt"
+
+# Run windeployqt to copy Qt DLLs
+$windeployqt = "$qtRoot\bin\windeployqt.exe"
+& $windeployqt --release "$appDir\qtac-app.exe"
+Write-Output "windeployqt done, exit: $LASTEXITCODE"
diff --git a/docs/proposal-remove-qt-from-cli.md b/docs/proposal-remove-qt-from-cli.md
new file mode 100644
index 00000000..4374076f
--- /dev/null
+++ b/docs/proposal-remove-qt-from-cli.md
@@ -0,0 +1,613 @@
+# Proposal: Remove Qt Dependency from QCommonConsole & TACDev Interface Library
+
+**Date:** 2026-05-12
+**Status:** Draft
+**Scope:** QCommonConsole library, TACDev interface library only
+
+---
+
+## 1. Problem Statement
+
+The two foundational libraries in the QTAC project — **QCommonConsole** (core device logic) and **TACDev** (public C/C++ API) — are tightly coupled to the Qt framework despite containing no GUI code. Every consumer of these libraries (CLI tools, automation scripts, language bindings) inherits the full Qt dependency chain.
+
+| Problem | Impact |
+|---------|--------|
+| **Heavy runtime** | Any binary linking QCommonConsole ships ~50-100 MB of Qt DLLs (Core, SerialPort, Network, Xml, Concurrent) |
+| **Build requirement** | Qt 6.9+ SDK must be installed to compile anything that touches device hardware |
+| **Licensing burden** | Qt's LGPL/commercial license propagates to all consumers of the core library |
+| **Platform lock-in** | Core library cannot be used on platforms where Qt is unavailable (embedded Linux, RTOS, minimal containers) |
+| **Cross-compilation friction** | Cross-compiling Qt for ARM/other architectures is significantly harder than pure C++ |
+| **MOC overhead** | Qt's Meta-Object Compiler adds a build step to every file with `Q_OBJECT`, slowing compilation |
+
+**Goal:** `QCommonConsole` and `TACDev` should depend only on standard C/C++ (C++17/20) and minimal, vendorable libraries — usable by any consumer (CLI, GUI, scripts, embedded) without requiring Qt.
+
+**Out of scope:** CLI applications (`devlist`, `tacdump`, `ftdi-check`, etc.), GUI applications, and UI libraries (`QCommon`, `UI-Common`). These consume the core library and will benefit automatically once it is Qt-free, but their own code is not changed in this proposal.
+
+---
+
+## 2. Current Qt Usage Inventory
+
+### 2.1 Qt Modules Linked
+
+| Library | Qt Modules | Why |
+|---------|-----------|-----|
+| **QCommonConsole** | Core, SerialPort, Network, Xml, Concurrent | Strings, containers, serial I/O, JSON, threading |
+| **TACDev** | Core, SerialPort | Wraps QCommonConsole, passes Qt types through |
+
+### 2.2 Qt Classes Used in QCommonConsole
+
+**Strings & Buffers (~70 files)**
+
+| Qt Class | Where Used | Role |
+|----------|-----------|------|
+| `QString` | Nearly every header and source file | Primary string type throughout the library |
+| `QByteArray` | SerialPort, DriveThread, FrameCoder, FramePackage, FTDIChipset, AlpacaScript | Raw byte buffer for serial I/O and protocol framing |
+| `QStringList` | CommandLineParser, AlpacaDevice, PlatformConfiguration | Lists of command names, port names, arguments |
+
+**Containers (~40 files)**
+
+| Qt Class | Where Used | Role |
+|----------|-----------|------|
+| `QList<T>` | AlpacaDevice, TACCommand, AlpacaScript, USBDescriptors, RecentFiles | Device lists, command lists, script variables |
+| `QMap<K,V>` | CommandLineParser, TACCommand, AlpacaScript, DriveThread, PlatformConfiguration, TACDevCore | Command-name-to-object lookup, script variable storage, pin mapping |
+| `QVector<T>` | DataPoints | Data point arrays |
+| `QPair<T,U>` | ErrorParameter, FrameCoder | Error code pairs, frame fields |
+
+**Serial Port (~10 files)**
+
+| Qt Class | Where Used | Role |
+|----------|-----------|------|
+| `QSerialPort` | SerialPort.h/cpp (inherits from it) | All UART communication with PSoC and PIC32CX boards |
+| `QSerialPortInfo` | SerialPort.h/cpp, CommDevice | Port enumeration and device discovery |
+
+**JSON (~8 files)**
+
+| Qt Class | Where Used | Role |
+|----------|-----------|------|
+| `QJsonDocument` | AppCore, PlatformConfiguration | Parse `.tcnf` configuration files and `devicelist.json` |
+| `QJsonObject` | AppCore, PlatformConfiguration, USBDescriptors | Access individual fields in config JSON |
+| `QJsonArray` | PlatformConfiguration | Iterate pin/button/command arrays in config |
+
+**Threading & Synchronization (~6 files)**
+
+| Qt Class | Where Used | Role |
+|----------|-----------|------|
+| `QThread` | DriveThread (inherits) | Background I/O thread for command execution |
+| `QMutex` | AlpacaDevice, DriveThread | Protect shared device state |
+| `QMutexLocker` | DriveThread | RAII locking |
+
+**Signals & Slots (~10 classes)**
+
+| Class with Q_OBJECT | Signals/Slots Used For |
+|---------------------|----------------------|
+| `SerialPort` | Data received, error occurred, port state changes |
+| `DriveThread` | Command completed, progress updates |
+| `AlpacaDevice` | Device state changes, connection events |
+| `CommDevice` | Communication events |
+| `FrameCoder` | Frame decoded/encoded notifications |
+| `TACDevCore` | High-level device events forwarded to TACDev API |
+| `DateCheckFailEvent` | Custom event for date validation |
+
+**File System (~15 files)**
+
+| Qt Class | Where Used | Role |
+|----------|-----------|------|
+| `QFile` | CommDevice, DriveThread, AppCore, FTDICheckApplication | Read config files, write logs |
+| `QDir` | AppCore, main.cpp (various) | Locate config directory, enumerate files |
+| `QFileInfo` | ConsoleApplicationEnhancements | Check file existence, get paths |
+
+**Settings (~5 files)**
+
+| Qt Class | Where Used | Role |
+|----------|-----------|------|
+| `QSettings` | AlpacaSettings, CommDevice, ConsoleApplicationEnhancements | Store/retrieve user preferences and device calibration |
+
+**Other**
+
+| Qt Class | Where Used | Role |
+|----------|-----------|------|
+| `QVariant` | AlpacaScript, ErrorParameter, FrameCoder, PlatformConfiguration | Generic value containers for script variables |
+| `QSharedPointer<T>` | AlpacaDevice, AlpacaScript, FramePackage | Reference-counted ownership |
+| `QDate` / `QDateTime` | AppCore, AlpacaSharedLibrary, CommDevice, DriveThread | Timestamps and date validation |
+| `QSize` / `QPoint` / `QPointF` | PlatformConfiguration, AlpacaDevice, DataPoints | UI layout hints stored in config (can be simple structs) |
+| `QProcess` | ConsoleApplicationEnhancements | Subprocess execution for driver install |
+| `QLibrary` | ConsoleApplicationEnhancements | Dynamic library loading |
+| `QBitArray` | CharBit | Bit-level manipulation |
+| `QTextStream` | AlpacaScript, AlpacaSharedLibrary, CSV | Text parsing |
+| `QEvent` | DateCheckFailEvent | Custom event type |
+
+### 2.3 Qt Classes Used in TACDev Interface
+
+| Qt Class | Where Used | Role |
+|----------|-----------|------|
+| `QString` | TACDevCore.h/cpp | String parameters passed to/from QCommonConsole |
+| `QMap` | TACDevCore.h | Stores device handle-to-object mapping |
+| `QObject` / `Q_OBJECT` | TACDevCore | Receives signals from core device objects |
+| `QSerialPort` (indirect) | Via QCommonConsole linkage | Inherited dependency |
+
+---
+
+## 3. Replacement Strategy
+
+### 3.1 Standard C++ Replacements (no external dependency)
+
+| Qt Class | Replacement | Standard | Notes |
+|----------|-------------|----------|-------|
+| `QString` | `std::string` | C++17 | UTF-8 by convention; `std::wstring` only at Win32 API boundary |
+| `QByteArray` | `std::vector<uint8_t>` | C++17 | For serial I/O buffers. Use `std::string` where text semantics apply |
+| `QStringList` | `std::vector<std::string>` | C++17 | |
+| `QList<T>` / `QVector<T>` | `std::vector<T>` | C++17 | |
+| `QMap<K,V>` | `std::map<K,V>` | C++17 | Use `std::unordered_map` where ordering is irrelevant |
+| `QPair<T,U>` | `std::pair<T,U>` | C++17 | |
+| `QSharedPointer<T>` | `std::shared_ptr<T>` | C++17 | |
+| `QVariant` | `std::variant<types...>` or `std::any` | C++17 | Define a `ScriptValue` variant with the actual used types |
+| `QFile` / `QDir` / `QFileInfo` | `std::filesystem` + `std::fstream` | C++17 | |
+| `QTextStream` | `std::istringstream` / `std::ostringstream` | C++17 | |
+| `QThread` | `std::jthread` | C++20 | Cooperative cancellation via `std::stop_token` |
+| `QMutex` / `QMutexLocker` | `std::mutex` / `std::lock_guard` | C++17 | |
+| `QDate` / `QDateTime` | `std::chrono::system_clock` / `std::chrono::year_month_day` | C++20 | |
+| `QSize` / `QPoint` / `QPointF` | `struct Size { int w, h; }` etc. | Custom | Trivial POD structs |
+| `QBitArray` | `std::bitset<N>` or `std::vector<bool>` | C++17 | |
+| `Q_NULLPTR` | `nullptr` | C++11 | |
+| `Q_ASSERT` | `assert()` or custom `QTAC_ASSERT` | C | |
+| `Q_OS_WINDOWS` / `Q_OS_LINUX` | `#ifdef _WIN32` / `#ifdef __linux__` | Preprocessor | |
+| `QEvent` | Plain virtual class | Custom | No Qt event loop needed |
+
+### 3.2 External Libraries (minimal, vendorable)
+
+Only two external dependencies are introduced, both header-only and MIT-licensed:
+
+| Replaces | Library | Type | License | Size |
+|----------|---------|------|---------|------|
+| `QJsonDocument`, `QJsonObject`, `QJsonArray` | [nlohmann/json](https://github.com/nlohmann/json) | Header-only | MIT | Single .hpp file (~800 KB) |
+| `QSettings` (INI read/write) | [inih](https://github.com/benhoyt/inih) | Single C file + header | BSD | ~400 lines |
+
+Both are vendored directly into the repository — no package manager or install step required.
+
+### 3.3 Custom Platform Abstractions
+
+These replace Qt modules that wrap OS-specific APIs. Each is a single header with two implementation files (Win32 + POSIX):
+
+| Replaces | New Abstraction | Estimated Size | Notes |
+|----------|----------------|----------------|-------|
+| `QSerialPort` / `QSerialPortInfo` | `qtac::SerialPort` | ~300 lines per platform | Open, close, configure, read, write, enumerate. Pimpl pattern. |
+| `QProcess` | `qtac::Process` | ~150 lines per platform | `CreateProcess` (Win) / `fork+exec` (POSIX). Used only in ConsoleApplicationEnhancements. |
+| `QLibrary` | `qtac::DynamicLibrary` | ~50 lines per platform | `LoadLibrary`/`GetProcAddress` (Win) / `dlopen`/`dlsym` (POSIX) |
+| Signals/Slots | `qtac::Signal<Args...>` | ~40 lines (portable) | `std::function` + `std::vector` + `std::mutex`. See Section 4.1. |
+
+---
+
+## 4. Key Design Patterns
+
+### 4.1 Signal/Slot Replacement
+
+Qt's meta-object signal/slot system is used by ~10 core classes. Replace with a lightweight, thread-safe callback mechanism:
+
+```cpp
+// qtac/signal.h
+#pragma once
+#include <functional>
+#include <vector>
+#include <mutex>
+#include <algorithm>
+
+namespace qtac {
+
+template <typename... Args>
+class Signal {
+public:
+    using Slot = std::function<void(Args...)>;
+
+    int connect(Slot slot) {
+        std::lock_guard lock(mutex_);
+        int id = next_id_++;
+        slots_.push_back({id, std::move(slot)});
+        return id;
+    }
+
+    void disconnect(int id) {
+        std::lock_guard lock(mutex_);
+        std::erase_if(slots_, [id](const auto& s) { return s.id == id; });
+    }
+
+    void operator()(Args... args) {
+        std::lock_guard lock(mutex_);
+        for (auto& s : slots_) s.fn(args...);
+    }
+
+private:
+    struct Entry { int id; Slot fn; };
+    std::vector<Entry> slots_;
+    std::mutex mutex_;
+    int next_id_ = 0;
+};
+
+} // namespace qtac
+```
+
+**Before (Qt):**
+```cpp
+class DriveThread : public QThread {
+    Q_OBJECT
+signals:
+    void commandCompleted(const QString& cmd, bool success);
+public slots:
+    void onNewCommand(const QString& cmd);
+};
+
+// caller
+QObject::connect(device, &AlpacaDevice::sendCommand,
+                 driveThread, &DriveThread::onNewCommand);
+```
+
+**After (Standard C++):**
+```cpp
+class DriveThread {
+public:
+    qtac::Signal<const std::string&, bool> commandCompleted;
+    void onNewCommand(const std::string& cmd);
+    void start();
+    void stop();
+private:
+    std::jthread thread_;
+};
+
+// caller
+device->sendCommand.connect([&](const std::string& cmd) {
+    driveThread->onNewCommand(cmd);
+});
+```
+
+### 4.2 SerialPort Abstraction
+
+```cpp
+// qtac/platform/serial_port.h
+#pragma once
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <vector>
+
+namespace qtac {
+
+enum class Parity   { None, Even, Odd };
+enum class StopBits { One, Two };
+enum class FlowCtrl { None, Hardware, Software };
+
+struct SerialPortInfo {
+    std::string port_name;      // "COM3" or "/dev/ttyUSB0"
+    std::string description;
+    std::string serial_number;
+    uint16_t    vid = 0;
+    uint16_t    pid = 0;
+};
+
+class SerialPort {
+public:
+    SerialPort();
+    ~SerialPort();
+    SerialPort(SerialPort&&) noexcept;
+    SerialPort& operator=(SerialPort&&) noexcept;
+
+    bool open(const std::string& port_name);
+    void close();
+    bool is_open() const;
+
+    bool set_baud_rate(uint32_t baud);
+    bool set_data_bits(uint8_t bits);
+    bool set_parity(Parity p);
+    bool set_stop_bits(StopBits sb);
+    bool set_flow_control(FlowCtrl fc);
+
+    int64_t read(uint8_t* buf, size_t max_bytes, uint32_t timeout_ms = 1000);
+    int64_t write(const uint8_t* buf, size_t len);
+
+    static std::vector<SerialPortInfo> enumerate();
+
+private:
+    struct Impl;
+    std::unique_ptr<Impl> impl_;
+};
+
+} // namespace qtac
+```
+
+Platform backends:
+- `serial_port_win32.cpp` — `CreateFile`, `SetCommState`, `SetCommTimeouts`, `ReadFile`, `WriteFile`, `SetupComm`
+- `serial_port_posix.cpp` — `open`, `tcsetattr`, `cfsetispeed`, `read`, `write`, `select`
+
+### 4.3 DriveThread Without QThread
+
+```cpp
+class DriveThread {
+public:
+    void start() {
+        thread_ = std::jthread([this](std::stop_token st) { run(st); });
+    }
+
+    void stop() {
+        thread_.request_stop();
+        cv_.notify_all();
+    }
+
+    void enqueue(TACCommand cmd) {
+        {
+            std::lock_guard lock(mutex_);
+            queue_.push(std::move(cmd));
+        }
+        cv_.notify_one();
+    }
+
+    qtac::Signal<const std::string&, bool> commandCompleted;
+
+private:
+    void run(std::stop_token st) {
+        while (!st.stop_requested()) {
+            std::unique_lock lock(mutex_);
+            cv_.wait(lock, st, [&] { return !queue_.empty(); });
+            if (st.stop_requested()) break;
+            auto cmd = std::move(queue_.front());
+            queue_.pop();
+            lock.unlock();
+            execute(cmd);
+        }
+    }
+
+    void execute(const TACCommand& cmd);
+
+    std::jthread thread_;
+    std::mutex mutex_;
+    std::condition_variable_any cv_;
+    std::queue<TACCommand> queue_;
+};
+```
+
+### 4.4 JSON / Configuration Loading
+
+**Before (Qt):**
+```cpp
+QFile file(configPath);
+file.open(QIODevice::ReadOnly);
+QJsonDocument doc = QJsonDocument::fromJson(file.readAll());
+QJsonObject root = doc.object();
+QString name = root["name"].toString();
+QJsonArray pins = root["pins"].toArray();
+```
+
+**After (nlohmann/json):**
+```cpp
+std::ifstream file(config_path);
+auto root = nlohmann::json::parse(file);
+std::string name = root["name"].get<std::string>();
+auto& pins = root["pins"];  // iterate directly
+```
+
+---
+
+## 5. Directory Structure After Migration
+
+```
+src/libraries/qcommon-console/
+├── include/qtac/                        # Public headers
+│   ├── alpaca_device.h
+│   ├── ftdi_device.h
+│   ├── psoc_device.h
+│   ├── pic32cx_device.h
+│   ├── platform_configuration.h
+│   ├── drive_thread.h
+│   ├── tac_command.h
+│   ├── alpaca_script.h
+│   ├── usb_descriptors.h
+│   ├── signal.h                         # Signal<> utility
+│   └── platform/                        # Platform abstractions
+│       ├── serial_port.h
+│       ├── process.h
+│       └── dynamic_library.h
+├── src/
+│   ├── alpaca_device.cpp
+│   ├── drive_thread.cpp
+│   ├── platform_configuration.cpp
+│   ├── tac_command.cpp
+│   ├── alpaca_script.cpp
+│   ├── ftdi_device.cpp
+│   ├── psoc_device.cpp
+│   ├── pic32cx_device.cpp
+│   └── platform/
+│       ├── serial_port_win32.cpp
+│       ├── serial_port_posix.cpp
+│       ├── process_win32.cpp
+│       ├── process_posix.cpp
+│       ├── dynamic_library_win32.cpp
+│       └── dynamic_library_posix.cpp
+├── third-party/
+│   ├── nlohmann/json.hpp                # Vendored, MIT
+│   └── inih/ini.h + ini.c              # Vendored, BSD
+└── CMakeLists.txt                       # No find_package(Qt6)
+
+interfaces/C++/TACDev/
+├── include/
+│   └── tacdev.h                         # Pure C API (no Qt types)
+├── src/
+│   └── tacdev_core.cpp                  # Links QCommonConsole only
+└── CMakeLists.txt                       # No find_package(Qt6)
+```
+
+---
+
+## 6. Impact on Consumers
+
+### 6.1 GUI Applications (QTAC, Device Catalog, Config Editor)
+
+GUI apps retain Qt for their own UI layer. They consume the now-pure-C++ core library directly. A thin adapter utility handles type conversion at the GUI boundary:
+
+```
+src/libraries/qt-adapter/
+    include/
+        qt_string_convert.h      # std::string <-> QString
+        qt_signal_bridge.h       # qtac::Signal -> QObject signal forwarding
+    src/
+        qt_signal_bridge.cpp
+```
+
+```cpp
+// qt_string_convert.h
+#pragma once
+#include <QString>
+#include <string>
+
+namespace qtac::qt {
+inline QString toQt(const std::string& s) { return QString::fromStdString(s); }
+inline std::string fromQt(const QString& s) { return s.toStdString(); }
+inline QStringList toQt(const std::vector<std::string>& v) {
+    QStringList out;
+    for (auto& s : v) out.append(QString::fromStdString(s));
+    return out;
+}
+}
+```
+
+**GUI applications are not modified in this proposal** — they only gain a new `qt-adapter` library to link against.
+
+### 6.2 CLI Applications
+
+CLI tools (`devlist`, `tacdump`, `ftdi-check`, etc.) will automatically lose their transitive Qt dependency once the core libraries are migrated. Their own source code may need minor updates to use `std::string` instead of `QString` for values received from the core library, but those changes are mechanical and small.
+
+### 6.3 Language Bindings (Python, C#, Java)
+
+The TACDev C API (`tacdev.h`) already exports `const char*` strings, `int` handles, and `bool` states. The public API surface does not change — bindings continue to work without modification.
+
+### 6.4 Automation Scripts (Python TACDev)
+
+No change. The Python wrapper calls the C API via ctypes. The underlying library implementation is invisible.
+
+---
+
+## 7. Migration Plan
+
+### Phase 0: Scaffolding (1 week)
+
+| Task | Details |
+|------|---------|
+| Create feature branch `feature/remove-qt-core` | All work happens here |
+| Introduce `namespace qtac` | New/migrated headers use `qtac::` namespace |
+| Vendor `nlohmann/json.hpp` into `third-party/nlohmann/` | Single file drop |
+| Vendor `inih` into `third-party/inih/` | Two files (ini.h + ini.c) |
+| Write `qtac::Signal<>` header | ~40 lines, see Section 4.1 |
+| Write platform abstraction headers | `serial_port.h`, `process.h`, `dynamic_library.h` — interfaces only |
+| Set up dual-build CMake option | `option(QTAC_USE_QT "Build with Qt support" ON)` — allows gradual migration |
+
+### Phase 1: Type Replacements (2-3 weeks)
+
+Mechanical, file-by-file replacement of Qt types with standard equivalents. Low risk — each replacement is a direct 1:1 swap.
+
+| Step | Replacement | Files | Risk |
+|------|------------|-------|------|
+| 1a | `QString` -> `std::string` | ~70 | Low — API-visible, but mostly internal |
+| 1b | `QByteArray` -> `std::vector<uint8_t>` | ~50 | Low — check serial read/write call sites |
+| 1c | `QList`/`QVector` -> `std::vector` | ~30 | Low — near-identical API |
+| 1d | `QMap` -> `std::map` | ~15 | Low — iterator differences are minor |
+| 1e | `QSharedPointer` -> `std::shared_ptr` | ~8 | Low — same semantics |
+| 1f | `QPair` -> `std::pair` | ~3 | Low |
+| 1g | `QVariant` -> `std::variant` / `std::any` | ~5 | Medium — need to define the variant type set |
+| 1h | `QDate`/`QDateTime` -> `std::chrono` | ~4 | Low |
+| 1i | `QFile`/`QDir`/`QFileInfo` -> `std::filesystem` + `std::fstream` | ~15 | Low |
+| 1j | `QTextStream` -> `std::stringstream` | ~4 | Low |
+| 1k | `QBitArray` -> `std::bitset` | ~1 | Low |
+| 1l | `Q_NULLPTR`/`Q_ASSERT`/`Q_OS_*` macros | scattered | Low |
+
+### Phase 2: Platform Abstractions (2-3 weeks)
+
+Replace Qt modules that wrap OS-specific functionality. **Highest-risk phase** — serial port correctness is critical.
+
+| Step | Component | Approach | Risk |
+|------|-----------|----------|------|
+| 2a | `qtac::SerialPort` | Win32 + POSIX implementations (~300 lines each) | **High** — must match QSerialPort behavior exactly |
+| 2b | `qtac::Process` | `CreateProcess` / `fork+exec` | Medium — used in limited places |
+| 2c | `qtac::DynamicLibrary` | `LoadLibrary` / `dlopen` | Low — simple wrapper |
+| 2d | INI settings | Replace `QSettings` with `inih` | Low |
+
+**Mitigation for 2a:** Write a serial port test harness that runs the same operations through both `QSerialPort` and `qtac::SerialPort`, comparing results on real hardware. Keep `QSerialPort` available behind the CMake flag during transition.
+
+### Phase 3: Signal/Slot & Threading (1-2 weeks)
+
+| Step | Component | Approach | Risk |
+|------|-----------|----------|------|
+| 3a | Remove `Q_OBJECT` / MOC | Replace all `signals:` with `qtac::Signal<>` members | Medium — must review every `connect()` call |
+| 3b | `QThread` -> `std::jthread` | Rewrite `DriveThread` (see Section 4.3) | Medium — thread lifecycle must be tested |
+| 3c | `QMutex` -> `std::mutex` | Direct replacement | Low |
+| 3d | `QEvent` subclass | Replace with plain virtual class | Low |
+
+### Phase 4: JSON & Configuration (1 week)
+
+| Step | Component | Approach | Risk |
+|------|-----------|----------|------|
+| 4a | `.tcnf` file loading | Rewrite `PlatformConfiguration` parser using `nlohmann::json` | Medium — must validate all config files parse identically |
+| 4b | `devicelist.json` loading | Rewrite `AppCore` / `USBDescriptors` JSON code | Low |
+
+**Validation:** Write a test that loads every `.tcnf` file and `devicelist.json` with both the old Qt parser and the new nlohmann parser, diffing the resulting in-memory structures.
+
+### Phase 5: Cleanup & Validation (1-2 weeks)
+
+| Task | Details |
+|------|---------|
+| Remove `find_package(Qt6)` from QCommonConsole and TACDev CMakeLists | The core libraries no longer depend on Qt |
+| Remove Qt includes from all core headers | Verify no transitive Qt leakage |
+| Build QCommonConsole + TACDev without Qt installed | The litmus test |
+| Verify GUI apps still compile and run | They link `qt-adapter` + Qt for their own UI |
+| Cross-platform CI | Build and test on Windows (MSVC 2022), Linux (GCC 11+), optionally macOS (Clang) |
+| Test with real hardware | Exercise all three board types (FTDI, PSoC, PIC32CX) on both platforms |
+
+---
+
+## 8. Risk Assessment
+
+| Risk | Likelihood | Impact | Mitigation |
+|------|-----------|--------|------------|
+| Serial port behavior regression | Medium | **Critical** | Side-by-side test harness comparing `QSerialPort` vs `qtac::SerialPort` on real hardware; keep Qt fallback via CMake flag during transition |
+| String encoding issues (UTF-8 vs UTF-16) | Medium | Medium | Standardize on UTF-8 in all core code; convert only at Win32 API boundaries |
+| Signal/slot race conditions | Low | High | `qtac::Signal<>` is mutex-protected; review every cross-thread signal path |
+| JSON parsing differences | Low | Medium | Automated test: parse all `.tcnf` files with both parsers, compare output |
+| GUI regression | Low | Medium | GUI adapter isolates core changes from UI layer; minimal GUI code changes |
+| Build breakage during migration | High | Low | Feature branch; phase-by-phase PRs; CI gates on both platforms |
+| `std::filesystem` inconsistencies | Low | Low | Well-supported since GCC 8+, MSVC 2017+, Clang 7+ |
+
+---
+
+## 9. Benefits
+
+| Benefit | Details |
+|---------|---------|
+| **Zero-dependency core** | QCommonConsole and TACDev are self-contained — no Qt runtime needed |
+| **~90% smaller binaries** | Consumers (CLI tools, scripts) go from ~60 MB to ~2-5 MB |
+| **Any-compiler builds** | Core library compiles with any C++20 toolchain, no Qt SDK |
+| **Faster builds** | No MOC step, no Qt header parsing overhead |
+| **Easier cross-compilation** | Pure C++ cross-compiles trivially for ARM, RISC-V, embedded targets |
+| **Simpler onboarding** | Contributors need only a compiler, not the full Qt development environment |
+| **No licensing concerns** | Only MIT/BSD vendored dependencies — no LGPL propagation |
+| **Cleaner architecture** | GUI concerns are fully separated from core device logic |
+
+---
+
+## 10. Estimated Effort
+
+| Phase | Duration | Developers |
+|-------|----------|------------|
+| Phase 0: Scaffolding | 1 week | 1 |
+| Phase 1: Type replacements | 2-3 weeks | 1-2 |
+| Phase 2: Platform abstractions | 2-3 weeks | 1-2 |
+| Phase 3: Signals & threading | 1-2 weeks | 1 |
+| Phase 4: JSON & config | 1 week | 1 |
+| Phase 5: Cleanup & validation | 1-2 weeks | 1-2 |
+| **Total** | **8-12 weeks** | **~10-16 person-weeks** |
+
+---
+
+## 11. Open Decision Points
+
+| # | Question | Options |
+|---|----------|---------|
+| 1 | **Serial port implementation** | (a) Custom Win32/POSIX abstraction — zero deps, full control, more code to maintain<br>(b) `libserialport` — proven, ~5 source files, LGPL license |
+| 2 | **JSON library** | (a) `nlohmann/json` — ergonomic, header-only, MIT, widely used<br>(b) `RapidJSON` — faster parsing, MIT, more verbose API<br>(c) Custom minimal parser — zero deps, but significant work |
+| 3 | **C++ standard level** | (a) C++17 — wider compiler support, use `std::thread` instead of `std::jthread`<br>(b) C++20 — `std::jthread`, `std::format`, calendar types, ranges |
+| 4 | **Migration strategy** | (a) Single feature branch, phase-by-phase PRs merged into it, final merge to `develop`<br>(b) Incremental PRs directly to `develop` with `QTAC_USE_QT` CMake flag |
+| 5 | **Library rename** | Keep `QCommonConsole` name (established) vs rename to `TACCore` or `qtac-core` (drop the Q) |
diff --git a/docs/qtac-architecture.drawio b/docs/qtac-architecture.drawio
new file mode 100644
index 00000000..c71f8224
--- /dev/null
+++ b/docs/qtac-architecture.drawio
@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mxfile host="app.diagrams.net" modified="2026-05-12T00:00:00.000Z" agent="Claude Code" version="21.0.0">
+  <diagram id="qtac-architecture" name="QTAC Architecture">
+    <mxGraphModel dx="1422" dy="900" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1600" pageHeight="1200" math="0" shadow="0">
+      <root>
+        <mxCell id="0" />
+        <mxCell id="1" parent="0" />
+
+        <!-- Title -->
+        <mxCell id="title" value="Qualcomm Test Automation Controller (QTAC) - Architecture" style="text;html=1;fontSize=20;fontStyle=1;align=center;verticalAlign=middle;whiteSpace=wrap;" vertex="1" parent="1">
+          <mxGeometry x="350" y="20" width="900" height="40" as="geometry" />
+        </mxCell>
+
+        <!-- ==================== USER LAYER ==================== -->
+        <mxCell id="user-group" value="User Layer" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;fontStyle=1;fontSize=14;verticalAlign=top;spacingTop=5;dashed=1;dashPattern=5 5;" vertex="1" parent="1">
+          <mxGeometry x="100" y="80" width="1400" height="100" as="geometry" />
+        </mxCell>
+
+        <mxCell id="user-gui" value="&lt;b&gt;GUI User&lt;/b&gt;&lt;br&gt;(TAC Main Window)" style="shape=actor;whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#82b366;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="200" y="100" width="80" height="60" as="geometry" />
+        </mxCell>
+
+        <mxCell id="user-cli" value="&lt;b&gt;CLI User&lt;/b&gt;&lt;br&gt;(Terminal)" style="shape=actor;whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#82b366;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="560" y="100" width="80" height="60" as="geometry" />
+        </mxCell>
+
+        <mxCell id="user-script" value="&lt;b&gt;Automation&lt;/b&gt;&lt;br&gt;(Python/C++/C#/Java)" style="shape=actor;whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#82b366;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="960" y="100" width="80" height="60" as="geometry" />
+        </mxCell>
+
+        <!-- ==================== APPLICATIONS LAYER ==================== -->
+        <mxCell id="app-group" value="Applications Layer" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;fontStyle=1;fontSize=14;verticalAlign=top;spacingTop=5;" vertex="1" parent="1">
+          <mxGeometry x="100" y="210" width="1400" height="130" as="geometry" />
+        </mxCell>
+
+        <!-- GUI Applications -->
+        <mxCell id="app-tac" value="&lt;b&gt;QTAC&lt;/b&gt;&lt;br&gt;Main GUI App&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;(Qt Window)&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#ffe6cc;strokeColor=#d79b00;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="130" y="240" width="130" height="60" as="geometry" />
+        </mxCell>
+
+        <mxCell id="app-catalog" value="&lt;b&gt;Device Catalog&lt;/b&gt;&lt;br&gt;Board Manager GUI&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;(Qt Window)&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#ffe6cc;strokeColor=#d79b00;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="280" y="240" width="130" height="60" as="geometry" />
+        </mxCell>
+
+        <mxCell id="app-confeditor" value="&lt;b&gt;Config Editor&lt;/b&gt;&lt;br&gt;TAC Config GUI&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;(Qt Window)&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#ffe6cc;strokeColor=#d79b00;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="430" y="240" width="130" height="60" as="geometry" />
+        </mxCell>
+
+        <!-- CLI Applications -->
+        <mxCell id="app-devlist" value="&lt;b&gt;DevList&lt;/b&gt;&lt;br&gt;Device Lister" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#e1d5e7;strokeColor=#9673a6;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="590" y="240" width="110" height="60" as="geometry" />
+        </mxCell>
+
+        <mxCell id="app-tacdump" value="&lt;b&gt;TACDump&lt;/b&gt;&lt;br&gt;Diagnostics" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#e1d5e7;strokeColor=#9673a6;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="710" y="240" width="110" height="60" as="geometry" />
+        </mxCell>
+
+        <mxCell id="app-ftdicheck" value="&lt;b&gt;FTDICheck&lt;/b&gt;&lt;br&gt;Driver Manager" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#e1d5e7;strokeColor=#9673a6;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="830" y="240" width="110" height="60" as="geometry" />
+        </mxCell>
+
+        <!-- Programmer Applications -->
+        <mxCell id="app-liteprog" value="&lt;b&gt;LITE&lt;br&gt;Programmer&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f8cecc;strokeColor=#b85450;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="960" y="240" width="100" height="60" as="geometry" />
+        </mxCell>
+
+        <mxCell id="app-psocprog" value="&lt;b&gt;PSoC&lt;br&gt;Programmer&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f8cecc;strokeColor=#b85450;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="1070" y="240" width="100" height="60" as="geometry" />
+        </mxCell>
+
+        <mxCell id="app-updatedev" value="&lt;b&gt;Update&lt;br&gt;DeviceList&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f8cecc;strokeColor=#b85450;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="1180" y="240" width="100" height="60" as="geometry" />
+        </mxCell>
+
+        <!-- Legend for apps -->
+        <mxCell id="legend-gui" value="GUI Apps" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#ffe6cc;strokeColor=#d79b00;fontSize=9;fontStyle=1;" vertex="1" parent="1">
+          <mxGeometry x="1310" y="240" width="70" height="16" as="geometry" />
+        </mxCell>
+        <mxCell id="legend-cli" value="CLI Tools" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#e1d5e7;strokeColor=#9673a6;fontSize=9;fontStyle=1;" vertex="1" parent="1">
+          <mxGeometry x="1310" y="260" width="70" height="16" as="geometry" />
+        </mxCell>
+        <mxCell id="legend-prog" value="Programmers" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f8cecc;strokeColor=#b85450;fontSize=9;fontStyle=1;" vertex="1" parent="1">
+          <mxGeometry x="1310" y="280" width="70" height="16" as="geometry" />
+        </mxCell>
+
+        <!-- ==================== INTERFACE LAYER ==================== -->
+        <mxCell id="iface-group" value="Language Interface Layer (TACDev API)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#82b366;fontStyle=1;fontSize=14;verticalAlign=top;spacingTop=5;" vertex="1" parent="1">
+          <mxGeometry x="100" y="370" width="1400" height="100" as="geometry" />
+        </mxCell>
+
+        <mxCell id="iface-cpp" value="&lt;b&gt;C++ Interface&lt;/b&gt;&lt;br&gt;TACDev.h / TACDev.dll&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;50+ exported functions&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#82b366;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="150" y="400" width="180" height="55" as="geometry" />
+        </mxCell>
+
+        <mxCell id="iface-python" value="&lt;b&gt;Python Interface&lt;/b&gt;&lt;br&gt;TACDev.py (ctypes wrapper)&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;TACDevice class, 40+ methods&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#82b366;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="400" y="400" width="200" height="55" as="geometry" />
+        </mxCell>
+
+        <mxCell id="iface-csharp" value="&lt;b&gt;C# Interface&lt;/b&gt;&lt;br&gt;TACDev.cs&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;P/Invoke wrapper&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#82b366;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="670" y="400" width="160" height="55" as="geometry" />
+        </mxCell>
+
+        <mxCell id="iface-java" value="&lt;b&gt;Java Interface&lt;/b&gt;&lt;br&gt;TACDev.java&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;JNI wrapper&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#82b366;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="900" y="400" width="160" height="55" as="geometry" />
+        </mxCell>
+
+        <mxCell id="iface-api" value="&lt;b&gt;Key API Functions&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;InitializeTACDev() | OpenHandle()&lt;br&gt;SendCommand() | GetCommandState()&lt;br&gt;SetPin() | SetBatteryState()&lt;br&gt;PowerOnButton() | BootToEDL()&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f5f5f5;strokeColor=#666666;fontSize=10;fontColor=#333333;" vertex="1" parent="1">
+          <mxGeometry x="1120" y="393" width="210" height="67" as="geometry" />
+        </mxCell>
+
+        <!-- ==================== CORE LIBRARY LAYER ==================== -->
+        <mxCell id="core-group" value="Core Library (QCommonConsole)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;fontStyle=1;fontSize=14;verticalAlign=top;spacingTop=5;" vertex="1" parent="1">
+          <mxGeometry x="100" y="500" width="1400" height="200" as="geometry" />
+        </mxCell>
+
+        <!-- Device Abstraction -->
+        <mxCell id="core-alpaca" value="&lt;b&gt;AlpacaDevice&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;(Abstract Base Class)&lt;/font&gt;&lt;br&gt;Device factory &amp; enumeration" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="420" y="530" width="180" height="60" as="geometry" />
+        </mxCell>
+
+        <mxCell id="core-ftdi-dev" value="&lt;b&gt;FTDIDevice&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;FTDI chip boards&lt;br&gt;(FT232H/FT245)&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="150" y="620" width="140" height="55" as="geometry" />
+        </mxCell>
+
+        <mxCell id="core-psoc-dev" value="&lt;b&gt;PSOCDevice&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;Cypress PSoC5LP&lt;br&gt;boards&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="320" y="620" width="140" height="55" as="geometry" />
+        </mxCell>
+
+        <mxCell id="core-pic32-dev" value="&lt;b&gt;PIC32CXDevice&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;Microchip PIC32CX&lt;br&gt;SG41 boards&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="490" y="620" width="140" height="55" as="geometry" />
+        </mxCell>
+
+        <!-- Inheritance arrows -->
+        <mxCell id="inherit1" style="edgeStyle=orthogonalEdgeStyle;rounded=1;orthogonalLoop=1;jettySize=auto;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="core-ftdi-dev" target="core-alpaca">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="inherit2" style="edgeStyle=orthogonalEdgeStyle;rounded=1;orthogonalLoop=1;jettySize=auto;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="core-psoc-dev" target="core-alpaca">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="inherit3" style="edgeStyle=orthogonalEdgeStyle;rounded=1;orthogonalLoop=1;jettySize=auto;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.75;entryY=1;entryDx=0;entryDy=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="core-pic32-dev" target="core-alpaca">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+
+        <!-- Supporting modules -->
+        <mxCell id="core-platconfig" value="&lt;b&gt;Platform&lt;br&gt;Configuration&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;.tcnf file loader&lt;br&gt;Pin/Command mapping&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="680" y="530" width="140" height="70" as="geometry" />
+        </mxCell>
+
+        <mxCell id="core-drivethread" value="&lt;b&gt;DriveThread&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;Background I/O thread&lt;br&gt;Command queue&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="860" y="530" width="140" height="70" as="geometry" />
+        </mxCell>
+
+        <mxCell id="core-script" value="&lt;b&gt;AlpacaScript&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;Script variable&lt;br&gt;execution engine&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="1040" y="530" width="130" height="70" as="geometry" />
+        </mxCell>
+
+        <mxCell id="core-taccmd" value="&lt;b&gt;TACCommand&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;Command model&lt;br&gt;&amp; execution&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="1210" y="530" width="120" height="70" as="geometry" />
+        </mxCell>
+
+        <mxCell id="core-devcat" value="&lt;b&gt;Device Catalog&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;devicelist.json&lt;br&gt;Board &amp;#8594; Platform map&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="680" y="625" width="140" height="50" as="geometry" />
+        </mxCell>
+
+        <!-- Core internal connections -->
+        <mxCell id="conn-alpaca-config" style="rounded=1;orthogonalLoop=1;jettySize=auto;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="core-alpaca" target="core-platconfig">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="conn-config-drive" style="rounded=1;orthogonalLoop=1;jettySize=auto;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="core-platconfig" target="core-drivethread">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="conn-drive-script" style="rounded=1;orthogonalLoop=1;jettySize=auto;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="core-drivethread" target="core-script">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="conn-script-cmd" style="rounded=1;orthogonalLoop=1;jettySize=auto;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="core-script" target="core-taccmd">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+
+        <!-- ==================== UI LIBRARY LAYER ==================== -->
+        <mxCell id="ui-group" value="UI Libraries" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#e1d5e7;strokeColor=#9673a6;fontStyle=1;fontSize=12;verticalAlign=top;spacingTop=5;" vertex="1" parent="1">
+          <mxGeometry x="100" y="720" width="400" height="80" as="geometry" />
+        </mxCell>
+
+        <mxCell id="ui-qcommon" value="&lt;b&gt;QCommon&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;LEDWidget, PinLED&lt;br&gt;Dialogs, Custom Controls&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#e1d5e7;strokeColor=#9673a6;fontSize=10;" vertex="1" parent="1">
+          <mxGeometry x="120" y="745" width="160" height="45" as="geometry" />
+        </mxCell>
+
+        <mxCell id="ui-common" value="&lt;b&gt;UI-Common&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;CommandButton, Notification&lt;br&gt;VariableInput, Validators&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#e1d5e7;strokeColor=#9673a6;fontSize=10;" vertex="1" parent="1">
+          <mxGeometry x="310" y="745" width="170" height="45" as="geometry" />
+        </mxCell>
+
+        <!-- ==================== HARDWARE COMM LAYER ==================== -->
+        <mxCell id="hw-group" value="Hardware Communication Layer" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f8cecc;strokeColor=#b85450;fontStyle=1;fontSize=14;verticalAlign=top;spacingTop=5;" vertex="1" parent="1">
+          <mxGeometry x="530" y="720" width="970" height="80" as="geometry" />
+        </mxCell>
+
+        <mxCell id="hw-ftdi" value="&lt;b&gt;FTDI D2XX Library&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;Direct USB access&lt;br&gt;FTDIChipset wrapper&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f8cecc;strokeColor=#b85450;fontSize=10;" vertex="1" parent="1">
+          <mxGeometry x="560" y="745" width="180" height="45" as="geometry" />
+        </mxCell>
+
+        <mxCell id="hw-serial" value="&lt;b&gt;Qt SerialPort&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;UART via COM/ttyUSB&lt;br&gt;SerialPort wrapper&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f8cecc;strokeColor=#b85450;fontSize=10;" vertex="1" parent="1">
+          <mxGeometry x="780" y="745" width="170" height="45" as="geometry" />
+        </mxCell>
+
+        <mxCell id="hw-i2c" value="&lt;b&gt;I2C Protocol&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;Via FTDI I2C adapter&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f8cecc;strokeColor=#b85450;fontSize=10;" vertex="1" parent="1">
+          <mxGeometry x="990" y="745" width="150" height="45" as="geometry" />
+        </mxCell>
+
+        <mxCell id="hw-usb" value="&lt;b&gt;USB Enumeration&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;Device discovery&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f8cecc;strokeColor=#b85450;fontSize=10;" vertex="1" parent="1">
+          <mxGeometry x="1180" y="745" width="140" height="45" as="geometry" />
+        </mxCell>
+
+        <!-- ==================== CONFIGURATION LAYER ==================== -->
+        <mxCell id="config-group" value="Configuration Files" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f5f5f5;strokeColor=#666666;fontStyle=1;fontSize=12;verticalAlign=top;spacingTop=5;fontColor=#333333;" vertex="1" parent="1">
+          <mxGeometry x="100" y="830" width="600" height="90" as="geometry" />
+        </mxCell>
+
+        <mxCell id="config-tcnf" value="&lt;b&gt;.tcnf Files&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;FTDI_X.tcnf, PSOC_X.tcnf&lt;br&gt;PIC32CXAuto_X.tcnf&lt;br&gt;Pins, Buttons, Commands, Bus&lt;/font&gt;" style="shape=document;whiteSpace=wrap;html=1;fillColor=#f5f5f5;strokeColor=#666666;fontSize=10;fontColor=#333333;" vertex="1" parent="1">
+          <mxGeometry x="120" y="855" width="170" height="60" as="geometry" />
+        </mxCell>
+
+        <mxCell id="config-devlist" value="&lt;b&gt;devicelist.json&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;Board type &amp;#8594; Platform ID&lt;br&gt;USB descriptors&lt;br&gt;Config file mappings&lt;/font&gt;" style="shape=document;whiteSpace=wrap;html=1;fillColor=#f5f5f5;strokeColor=#666666;fontSize=10;fontColor=#333333;" vertex="1" parent="1">
+          <mxGeometry x="310" y="855" width="160" height="60" as="geometry" />
+        </mxCell>
+
+        <mxCell id="config-scripts" value="&lt;b&gt;Default Scripts&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;DefaultScript.txt&lt;br&gt;DefaultPIC32CXScript.txt&lt;/font&gt;" style="shape=document;whiteSpace=wrap;html=1;fillColor=#f5f5f5;strokeColor=#666666;fontSize=10;fontColor=#333333;" vertex="1" parent="1">
+          <mxGeometry x="490" y="855" width="160" height="60" as="geometry" />
+        </mxCell>
+
+        <!-- ==================== HARDWARE LAYER ==================== -->
+        <mxCell id="hw-physical" value="Physical Hardware" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#333333;strokeColor=#000000;fontStyle=1;fontSize=14;verticalAlign=top;spacingTop=5;fontColor=#ffffff;" vertex="1" parent="1">
+          <mxGeometry x="730" y="830" width="770" height="150" as="geometry" />
+        </mxCell>
+
+        <mxCell id="board-ftdi" value="&lt;font color=&quot;#ffffff&quot;&gt;&lt;b&gt;FTDI Debug Board&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;FT232H / FT245RL&lt;br&gt;FT232BL chips&lt;/font&gt;&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#666666;strokeColor=#999999;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="760" y="860" width="140" height="55" as="geometry" />
+        </mxCell>
+
+        <mxCell id="board-psoc" value="&lt;font color=&quot;#ffffff&quot;&gt;&lt;b&gt;PSoC5LP Board&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;Cypress PSoC5LP&lt;br&gt;microcontroller&lt;/font&gt;&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#666666;strokeColor=#999999;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="920" y="860" width="140" height="55" as="geometry" />
+        </mxCell>
+
+        <mxCell id="board-pic32" value="&lt;font color=&quot;#ffffff&quot;&gt;&lt;b&gt;PIC32CX Board&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;Microchip PIC32CX&lt;br&gt;SG41 MCU&lt;/font&gt;&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#666666;strokeColor=#999999;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="1080" y="860" width="140" height="55" as="geometry" />
+        </mxCell>
+
+        <mxCell id="qcom-device" value="&lt;font color=&quot;#ffffff&quot;&gt;&lt;b&gt;Qualcomm Device&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;Phone / Tablet / IoT&lt;br&gt;(Alpaca, MTP, QRD platforms)&lt;br&gt;EDL | Fastboot | UEFI modes&lt;/font&gt;&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#4a148c;strokeColor=#7b1fa2;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="1260" y="855" width="200" height="65" as="geometry" />
+        </mxCell>
+
+        <!-- Board to device connections -->
+        <mxCell id="conn-board-dev1" style="rounded=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.3;entryDx=0;entryDy=0;strokeColor=#999999;strokeWidth=2;" edge="1" parent="1" source="board-ftdi" target="qcom-device">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="conn-board-dev2" style="rounded=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#999999;strokeWidth=2;" edge="1" parent="1" source="board-psoc" target="qcom-device">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="conn-board-dev3" style="rounded=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.7;entryDx=0;entryDy=0;strokeColor=#999999;strokeWidth=2;" edge="1" parent="1" source="board-pic32" target="qcom-device">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+
+        <!-- ==================== VERTICAL CONNECTIONS ==================== -->
+
+        <!-- User to Apps -->
+        <mxCell id="conn-user-gui" style="rounded=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeWidth=2;strokeColor=#82b366;" edge="1" parent="1" source="user-gui" target="app-tac">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="conn-user-cli2" style="rounded=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeWidth=2;strokeColor=#9673a6;" edge="1" parent="1" source="user-cli" target="app-devlist">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="conn-user-script2" style="rounded=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeWidth=2;strokeColor=#82b366;" edge="1" parent="1" source="user-script" target="iface-python">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="1000" y="195" />
+              <mxPoint x="1000" y="380" />
+              <mxPoint x="500" y="380" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+
+        <!-- Apps to Interface layer -->
+        <mxCell id="conn-tac-iface" style="rounded=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeWidth=2;strokeColor=#d79b00;" edge="1" parent="1" source="app-tac" target="iface-cpp">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="195" y="320" />
+              <mxPoint x="195" y="380" />
+              <mxPoint x="240" y="380" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+
+        <!-- Interface to Core -->
+        <mxCell id="conn-iface-core" style="rounded=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeWidth=2;strokeColor=#6c8ebf;" edge="1" parent="1" source="iface-cpp" target="core-alpaca">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="240" y="480" />
+              <mxPoint x="510" y="480" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="conn-iface-core2" style="rounded=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeWidth=2;strokeColor=#6c8ebf;" edge="1" parent="1" source="iface-python" target="core-alpaca">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="500" y="480" />
+              <mxPoint x="510" y="480" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+
+        <!-- Core to Hardware Communication -->
+        <mxCell id="conn-core-hw1" style="rounded=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeWidth=2;strokeColor=#b85450;" edge="1" parent="1" source="core-ftdi-dev" target="hw-ftdi">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="220" y="700" />
+              <mxPoint x="650" y="700" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="conn-core-hw2" style="rounded=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeWidth=2;strokeColor=#b85450;" edge="1" parent="1" source="core-psoc-dev" target="hw-serial">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="390" y="700" />
+              <mxPoint x="865" y="700" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="conn-core-hw3" style="rounded=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeWidth=2;strokeColor=#b85450;" edge="1" parent="1" source="core-pic32-dev" target="hw-serial">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="560" y="710" />
+              <mxPoint x="865" y="710" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+
+        <!-- Hardware Comm to Physical -->
+        <mxCell id="conn-hw-board1" style="rounded=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeWidth=3;strokeColor=#b85450;" edge="1" parent="1" source="hw-ftdi" target="board-ftdi">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="conn-hw-board2" style="rounded=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeWidth=3;strokeColor=#b85450;" edge="1" parent="1" source="hw-serial" target="board-psoc">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+
+        <!-- ==================== BUILD/FRAMEWORK NOTE ==================== -->
+        <mxCell id="build-note" value="&lt;b&gt;Build &amp; Frameworks&lt;/b&gt;&lt;br&gt;&lt;font style=&quot;font-size:9px&quot;&gt;CMake 3.16+ | Qt 6.9+ | C++20&lt;br&gt;MSVC 2022 (Win) | GCC 11+ (Linux)&lt;br&gt;Platforms: Windows 10/11, Ubuntu 22.04+&lt;/font&gt;" style="shape=note;whiteSpace=wrap;html=1;fillColor=#f5f5f5;strokeColor=#666666;fontSize=10;fontColor=#333333;size=14;" vertex="1" parent="1">
+          <mxGeometry x="100" y="950" width="250" height="70" as="geometry" />
+        </mxCell>
+
+        <!-- USB label -->
+        <mxCell id="usb-label" value="USB" style="text;html=1;fontSize=10;fontStyle=3;align=center;fontColor=#b85450;" vertex="1" parent="1">
+          <mxGeometry x="630" y="805" width="40" height="20" as="geometry" />
+        </mxCell>
+
+      </root>
+    </mxGraphModel>
+  </diagram>
+</mxfile>
diff --git a/docs/taccl-plan.md b/docs/taccl-plan.md
new file mode 100644
index 00000000..ce786260
--- /dev/null
+++ b/docs/taccl-plan.md
@@ -0,0 +1,252 @@
+# CLI Plan for TACDev Interface
+
+## Context
+Create a GNU-compliant command-line interface exposing all functionality from `interfaces/C++/TACDev/TACDev.h`. This enables shell scripting and automation without C++ code.
+
+## Global Options
+
+| Option | Description |
+| :-- | :-- |
+| `-d, --device=<port>` | Select device by port name |
+| `-s, --serial=<serial>` | Select device by serial number |
+| `-o, --output=<format>` | Output format: `text` (default) or `json` |
+| `-h, --help` | Show help |
+| `--version` | Show taccl and TAC library versions |
+
+`-d` and `-s` are mutually exclusive. One is required for device operations (unless set via environment).
+
+Env: `TACCL_DEVICE` (default for `-d`), `TACCL_SERIAL` (default for `-s`), `TACCL_OUTPUT=json` (default output format).
+
+---
+
+## Commands
+
+### Device Discovery
+```
+taccl list
+```
+Backend: `GetDeviceCount` + `GetPortData`
+
+### Version Information
+```
+taccl version
+```
+Backend: `GetTACVersion`
+
+### Device Information
+```
+taccl info (-d|-s)                        Show all device info
+taccl info (-d|-s) --name                 Show name only
+taccl info (-d|-s) --firmware             Show firmware version only
+taccl info (-d|-s) --hardware             Show hardware only
+taccl info (-d|-s) --hardware-version     Show hardware version only
+taccl info (-d|-s) --uuid                 Show UUID only
+```
+Backend: `GetName`, `GetFirmwareVersion`, `GetHardware`, `GetHardwareVersion`, `GetUUID`
+
+### Device Configuration
+```
+taccl set (-d|-s) --name=<value>          Set device name
+```
+Backend: `SetName`
+
+### Logging
+```
+taccl logging (-d|-s)                     Query logging state
+taccl logging (-d|-s) --state=true|false  Set logging state
+```
+Backend: `GetLoggingState`, `SetLoggingState`
+
+### Commands
+```
+taccl commands (-d|-s)                              List available stateful commands
+taccl quick-commands (-d|-s)                        List available quick commands
+taccl command (-d|-s) --name=<cmd>                  Query command state
+taccl command (-d|-s) --name=<cmd> --state=true|false   Set command state
+taccl command (-d|-s) --name=<cmd>                  Run quick command (no --state)
+```
+Backend (list): `GetCommandCount` + `GetCommand`, `GetQuickCommandCount` + `GetQuickCommand`
+Backend (send/query): `SendCommand`, `GetCommandState`
+
+Note: `taccl command` handles both stateful and quick commands. For quick commands, omit `--state`. The CLI enumerates both lists to determine whether `--state` is required.
+
+### Script Variables
+```
+taccl vars (-d|-s)                                  List all variables
+taccl var (-d|-s) --name=<var>                      Get variable value
+taccl var (-d|-s) --name=<var> --value=<val>        Set variable value
+```
+Backend: `GetScriptVariableCount` + `GetScriptVariable`, `UpdateScriptVariableValue`
+
+### Utility
+```
+taccl help-text (-d|-s)                             Print device help text
+```
+Backend: `GetHelpText`
+
+---
+
+## Boolean Values
+
+Input accepts: `true`, `false`, `1`, `0`
+Output is always: `true` or `false`
+
+---
+
+## Queue Management
+
+Before every `CloseTACHandle`, the CLI automatically calls `IsCommandQueueClear` and waits for the queue to drain. This is not user-visible.
+
+---
+
+## Exit Codes
+
+| Code | Meaning |
+| :-- | :-- |
+| 0 | Success |
+| 1 | General error |
+| 2 | Device not found |
+| 3 | Invalid arguments / usage error |
+| 4 | TAC command failed |
+| 5 | Initialization failed |
+
+Error messages sourced from `GetLastTACError`.
+
+---
+
+## Output Formats
+
+### Human-readable (default)
+
+```
+$ taccl list
+PORT     SERIAL
+COM3     ABC123
+COM5     DEF456
+
+$ taccl info -d=COM3
+name: TAC-Device-1
+firmware: 1.2.3
+hardware: TAC-Lite
+hardware-version: 2.0
+uuid: 550e8400-e29b-41d4-a716-446655440000
+
+$ taccl command -d=COM3 --name=battery
+true
+
+$ taccl command -d=COM3 --name=battery --state=false
+false
+```
+
+### JSON (`-o json`)
+
+Every response includes a mandatory `code` field (0 on success). Errors add an `error` field.
+
+```
+$ taccl -o=json list
+{"code":0,"devices":[{"port":"COM3","serial":"ABC123"},{"port":"COM5","serial":"DEF456"}]}
+
+$ taccl -d=COM3 -o=json info
+{"code":0,"name":"TAC-Device-1","firmware":"1.2.3","hardware":"TAC-Lite","hardwareVersion":"2.0","uuid":"550e8400-e29b-41d4-a716-446655440000"}
+
+$ taccl -d=COM3 -o=json commands
+{"code":0,"commands":["battery","usb0","usb1","pkey","volup","voldn","pedl","sedl"]}
+
+$ taccl -d=COM3 -o=json quick-commands
+{"code":0,"quickCommands":["bootToEDL","bootToFastboot"]}
+
+$ taccl -d=COM3 -o=json command --name=battery
+{"code":0,"command":"battery","state":true}
+
+$ taccl -d=COM3 -o=json command --name=battery --state=false
+{"code":0,"command":"battery","state":false}
+
+$ taccl -d=COM3 -o=json var --name=edl
+{"code":0,"variable":"edl","value":"1200"}
+
+$ taccl -d=COM3 -o=json var --name=edl --value=1200
+{"code":0,"variable":"edl","value":"1200"}
+
+$ taccl -d=COM99 -o=json info
+{"code":2,"error":"device 'COM99' not found"}
+```
+
+---
+
+## Error Handling
+
+- Errors written to stderr
+- Exit with appropriate code
+- JSON errors follow the same schema when `-o json` is set
+
+```
+$ taccl info -d=COM99
+taccl: device 'COM99' not found
+$ echo $?
+2
+
+$ taccl command -d=COM3 --name=battery --state=invalid
+taccl: invalid value 'invalid' for --state, expected 'true', 'false', '1', or '0'
+$ echo $?
+3
+```
+
+---
+
+## Build Requirements
+
+- **No Qt dependency** - standalone C++ with standard library only
+- **Independent build** - separate CMake project, not part of main qtac-cli build
+- **Links against TACDev** - uses the TACDev shared library (DLL/so)
+- **Cross-platform** - Windows and Linux support
+
+## Dependencies
+
+| Library | Purpose | Integration | License |
+|---------|---------|-------------|---------|
+| [nlohmann/json](https://github.com/nlohmann/json) | JSON output (recommended) | Header-only, CMake FetchContent | MIT |
+| [CLI11](https://github.com/CLIUtils/CLI11) | Argument parsing (recommended) | Header-only, CMake FetchContent | BSD-3-Clause |
+
+### Why CLI11?
+- Native subcommand support
+- Auto-generates `--help` and `--version`
+- GNU-compliant option syntax (`--option=value`)
+- Header-only, easy to integrate
+- Cross-platform (no Windows porting issues)
+
+**Alternative:** getopt_long can be used instead if preferred (requires manual subcommand handling and Windows port).
+
+## Files to Create
+
+| File | Purpose |
+|------|---------|
+| `tools/taccl/CMakeLists.txt` | Standalone CMake project |
+| `tools/taccl/main.cpp` | Entry point |
+| `tools/taccl/CLI.h` | CLI11 setup and subcommand definitions |
+| `tools/taccl/CLI.cpp` | Argument parsing implementation |
+| `tools/taccl/Commands.h` | Subcommand handlers header |
+| `tools/taccl/Commands.cpp` | Subcommand implementations |
+| `tools/taccl/Output.h` | Human/JSON output formatting |
+| `tools/taccl/Output.cpp` | Output implementation |
+
+### Reference Files
+- `interfaces/C++/TACDev/TACDev.h` - API to wrap
+- `examples/C++/TACExample.cpp` - Standalone TACDev usage example (no Qt)
+
+---
+
+## Verification
+1. Build standalone:
+   ```
+   cd tools/taccl
+   cmake -B build
+   cmake --build build
+   ```
+2. `taccl --help` - verify help text
+3. `taccl version` - verify version output
+4. `taccl list` - enumerate devices
+5. `taccl info -d=<port>` - query device info
+6. `taccl command -d=<port> --name=battery` - query state
+7. `taccl command -d=<port> --name=battery --state=true` - change state
+8. `taccl list -o=json | jq .` - verify JSON output
+9. `TACCL_DEVICE=<port> taccl command --name=battery` - verify env var fallback
diff --git a/env_setup.ps1 b/env_setup.ps1
new file mode 100644
index 00000000..9654c563
--- /dev/null
+++ b/env_setup.ps1
@@ -0,0 +1,39 @@
+# env_setup.ps1 — dot-source this to load MSVC + Qt into the current session.
+# Usage: . "$PSScriptRoot\env_setup.ps1"
+
+# Locate VS via vswhere
+$vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
+if (Test-Path $vswhere) {
+    $vsInstallPath = & $vswhere -latest -products * -requires Microsoft.VisualCpp.Tools.HostX64.TargetX64 -property installationPath
+    $vcvars = "$vsInstallPath\VC\Auxiliary\Build\vcvars64.bat"
+} else {
+    $vcvars = @(
+        "${env:ProgramFiles}\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat",
+        "${env:ProgramFiles}\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvars64.bat",
+        "${env:ProgramFiles}\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat",
+        "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
+    ) | Where-Object { Test-Path $_ } | Select-Object -First 1
+}
+if (-not $vcvars -or -not (Test-Path $vcvars)) { throw "vcvars64.bat not found - is VS2022 installed?" }
+
+# Locate Qt — honor QTDIR env var, else search standard install locations
+if ($env:QTDIR -and (Test-Path "$env:QTDIR\bin\qmake.exe")) {
+    $qtRoot = $env:QTDIR
+} else {
+    $qtRoot = Get-ChildItem 'C:\Qt' -Filter 'msvc2022_64' -Recurse -Depth 2 -Directory -ErrorAction SilentlyContinue |
+              Where-Object { Test-Path "$($_.FullName)\bin\qmake.exe" } |
+              Sort-Object FullName -Descending |
+              Select-Object -First 1 -ExpandProperty FullName
+}
+if (-not $qtRoot) { throw "Qt not found. Set QTDIR or install Qt to C:\Qt\" }
+
+# Import MSVC environment
+$envLines = cmd /c "`"$vcvars`" && set" 2>&1
+$envLines | Where-Object { $_ -match '^[A-Za-z_][A-Za-z0-9_]+=.' } | ForEach-Object {
+    $kv = $_ -split '=', 2
+    if ($kv.Count -eq 2) { [System.Environment]::SetEnvironmentVariable($kv[0], $kv[1]) }
+}
+$env:PATH = "$qtRoot\bin;$env:PATH"
+
+Write-Host "MSVC env loaded from: $vcvars"
+Write-Host "Qt root: $qtRoot"
diff --git a/packaging/linux/package_QTAC.sh b/packaging/linux/package_QTAC.sh
index 0e64b284..080d9a2c 100644
--- a/packaging/linux/package_QTAC.sh
+++ b/packaging/linux/package_QTAC.sh
@@ -13,6 +13,9 @@ MAINTAINER="${MAINTAINER:-Maintainer <maintainer@example.com>}"
 DESCRIPTION="${DESCRIPTION:-Qualcomm QTAC tool package}"
 INSTALL_PREFIX="${INSTALL_PREFIX:-/opt/qcom/QTAC}"
 CONFIG_INSTALL_DIR="/var/lib/qcom/data/QTAC"
+# Set NO_GUI=1 to produce the headless/automation variant (lib + support
+# files only; no GUI binary, no Qt plugins, no xcb dependencies).
+NO_GUI="${NO_GUI:-0}"
 
 case "${1:-}" in
   -v|--version|version)
@@ -25,8 +28,8 @@ OPTION_ZIP="${1:-}"
 
 BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-# Source directories
-SRC_DIR="$(realpath "$BASE_DIR/../../__Builds/Linux/Release")"
+# Source directories — can be overridden via env var for out-of-tree builds
+SRC_DIR="${SRC_DIR:-$(realpath "$BASE_DIR/../../__Builds/Linux/Release")}"
 CONFIG_SRC_DIR="$(realpath "$BASE_DIR/../../configurations")"
 DOCS_SRC_DIR="$(realpath "$BASE_DIR/../../docs")"
 EXAMPLES_SRC_DIR="$(realpath "$BASE_DIR/../../examples")"
@@ -62,7 +65,7 @@ fi
 
 missing=0
 
-for d in bin lib; do
+for d in lib; do
     if [ ! -d "$SRC_DIR/$d" ]; then
         echo "ERROR: Missing source directory: $SRC_DIR/$d" >&2
         missing=1
@@ -72,6 +75,16 @@ for d in bin lib; do
     fi
 done
 
+if [ "$NO_GUI" -ne 1 ]; then
+    if [ ! -d "$SRC_DIR/bin" ]; then
+        echo "ERROR: Missing source directory: $SRC_DIR/bin" >&2
+        missing=1
+    elif [ -z "$(ls -A "$SRC_DIR/bin")" ]; then
+        echo "ERROR: Source directory empty: $SRC_DIR/bin" >&2
+        missing=1
+    fi
+fi
+
 if [ ! -d "$CONFIG_SRC_DIR" ]; then
     echo "ERROR: Missing configurations directory: $CONFIG_SRC_DIR" >&2
     missing=1
@@ -97,7 +110,7 @@ if [ ! -d "$UDEV_RULES_SRC_DIR" ]; then
     missing=1
 fi
 
-if [ ! -d "$PLUGINS_SRC_DIR" ]; then
+if [ "$NO_GUI" -ne 1 ] && [ ! -d "$PLUGINS_SRC_DIR" ]; then
     echo "ERROR: Missing plugins directory: $PLUGINS_SRC_DIR" >&2
     missing=1
 fi
@@ -112,20 +125,24 @@ BUILDROOT="$WORKDIR/${PKG_NAME}_${VERSION}"
 trap 'if [ "${NO_CLEANUP:-0}" -ne 1 ]; then rm -rf "$WORKDIR"; fi' EXIT
 
 mkdir -p "$BUILDROOT/DEBIAN"
-mkdir -p "$BUILDROOT$INSTALL_PREFIX/bin"
+if [ "$NO_GUI" -ne 1 ]; then
+    mkdir -p "$BUILDROOT$INSTALL_PREFIX/bin"
+    mkdir -p "$BUILDROOT$INSTALL_PREFIX/plugins"
+fi
 mkdir -p "$BUILDROOT$INSTALL_PREFIX/lib"
 mkdir -p "$BUILDROOT$INSTALL_PREFIX/docs"
 mkdir -p "$BUILDROOT$INSTALL_PREFIX/examples"
 mkdir -p "$BUILDROOT$INSTALL_PREFIX/python"
-mkdir -p "$BUILDROOT$INSTALL_PREFIX/plugins"
 mkdir -p "$BUILDROOT$INSTALL_PREFIX/utils"
 mkdir -p "$BUILDROOT$CONFIG_INSTALL_DIR/configurations"
 mkdir -p "$OUTPUT_DIR"
 
 chmod 0755 "$BUILDROOT/DEBIAN"
 
-echo "Copying bin..."
-cp -a "$SRC_DIR/bin/." "$BUILDROOT$INSTALL_PREFIX/bin/"
+if [ "$NO_GUI" -ne 1 ]; then
+    echo "Copying bin..."
+    cp -a "$SRC_DIR/bin/." "$BUILDROOT$INSTALL_PREFIX/bin/"
+fi
 
 echo "Copying lib..."
 cp -a "$SRC_DIR/lib/." "$BUILDROOT$INSTALL_PREFIX/lib/"
@@ -146,30 +163,35 @@ echo "Copying Python..."
 cp -a "$PYTHON_SRC_DIR/." \
       "$BUILDROOT$INSTALL_PREFIX/python/"
 
-echo "Copying plugins..."
-cp -a "$PLUGINS_SRC_DIR/." \
-      "$BUILDROOT$INSTALL_PREFIX/plugins/"
-	  
+if [ "$NO_GUI" -ne 1 ]; then
+    echo "Copying plugins..."
+    cp -a "$PLUGINS_SRC_DIR/." \
+          "$BUILDROOT$INSTALL_PREFIX/plugins/"
+fi
+
 echo "Copying udev rules..."
 cp -a "$UDEV_RULES_SRC_DIR/." \
       "$BUILDROOT$INSTALL_PREFIX/utils/"
 
-find "$BUILDROOT$INSTALL_PREFIX/bin" -type f -exec chmod 755 {} \;
+if [ "$NO_GUI" -ne 1 ]; then
+    find "$BUILDROOT$INSTALL_PREFIX/bin" -type f -exec chmod 755 {} \;
+fi
 find "$BUILDROOT$INSTALL_PREFIX/lib" -type f -exec chmod 755 {} \;
 
 find "$BUILDROOT$INSTALL_PREFIX/docs" -type f -exec chmod 644 {} \; || true
 find "$BUILDROOT$INSTALL_PREFIX/examples" -type f -exec chmod 644 {} \; || true
-find "$BUILDROOT$INSTALL_PREFIX/plugins" -type f -exec chmod 644 {} \; || true
+if [ "$NO_GUI" -ne 1 ]; then
+    find "$BUILDROOT$INSTALL_PREFIX/plugins" -type f -exec chmod 644 {} \; || true
+fi
 find "$BUILDROOT$INSTALL_PREFIX/python" -type f -exec chmod 644 {} \; || true
 
 find "$BUILDROOT$CONFIG_INSTALL_DIR/configurations" -type f -exec chmod 644 {} \; || true
 
 ###############################################################################
-# Validate Qt Plugin Dependencies
+# Validate Qt Plugin Dependencies  (GUI only)
 ###############################################################################
 
-echo ""
-echo "Validating Qt plugin dependencies..."
+if [ "$NO_GUI" -ne 1 ]; then
 
 find "$BUILDROOT$INSTALL_PREFIX/plugins" \
     -type f \
@@ -250,6 +272,8 @@ else
 
 fi
 
+fi # NO_GUI
+
 chown -R root:root "$BUILDROOT" 2>/dev/null || true
 
 cat > "$BUILDROOT/DEBIAN/control" <<EOF
@@ -259,7 +283,7 @@ Section: utils
 Priority: optional
 Architecture: $DEB_ARCH
 Maintainer: $MAINTAINER
-Depends: bash, coreutils, libxcb-cursor0, libxcb-icccm4, libxcb-util1, libxcb-image0, libxcb-keysyms1, libxcb-render-util0
+Depends: bash, coreutils$([ "$NO_GUI" -ne 1 ] && echo ", libxcb-cursor0, libxcb-icccm4, libxcb-util1, libxcb-image0, libxcb-keysyms1, libxcb-render-util0")
 Description: $DESCRIPTION
 EOF
 
@@ -290,31 +314,35 @@ chmod -R 0755 "$CONFIG_INSTALL_DIR" || true
 
 chown -R root:root "\$INSTALL_PREFIX" || true
 chown -R root:root "$CONFIG_INSTALL_DIR" || true
+EOF
+
+if [ "$NO_GUI" -ne 1 ]; then
+cat >> "$BUILDROOT/DEBIAN/postinst" <<'POSTINST_GUI'
 
-echo "[QTAC] Executing UpdateDeviceList..." >> "\$LOG_FILE"
-echo "[QTAC] Command: \$INSTALL_PREFIX/bin/UpdateDeviceList dir=\$CONFIG_DIR" >> "\$LOG_FILE"
+echo "[QTAC] Executing UpdateDeviceList..." >> "$LOG_FILE"
+echo "[QTAC] Command: $INSTALL_PREFIX/bin/UpdateDeviceList dir=$CONFIG_DIR" >> "$LOG_FILE"
 
-if [ -x "\$INSTALL_PREFIX/bin/UpdateDeviceList" ]; then
+if [ -x "$INSTALL_PREFIX/bin/UpdateDeviceList" ]; then
 
-    if "\$INSTALL_PREFIX/bin/UpdateDeviceList" \
-        dir="\$CONFIG_DIR" \
-        >> "\$LOG_FILE" 2>&1
+    if "$INSTALL_PREFIX/bin/UpdateDeviceList" \
+        dir="$CONFIG_DIR" \
+        >> "$LOG_FILE" 2>&1
     then
 
-        echo "[QTAC] UpdateDeviceList completed successfully." >> "\$LOG_FILE"
+        echo "[QTAC] UpdateDeviceList completed successfully." >> "$LOG_FILE"
 
     else
 
-        RET=\$?
+        RET=$?
 
-        echo "[QTAC] WARNING: UpdateDeviceList failed with return code \$RET" \
-            >> "\$LOG_FILE"
+        echo "[QTAC] WARNING: UpdateDeviceList failed with return code $RET" \
+            >> "$LOG_FILE"
 
     fi
 
 else
 
-    echo "[QTAC] ERROR: UpdateDeviceList not found or not executable." >> "\$LOG_FILE"
+    echo "[QTAC] ERROR: UpdateDeviceList not found or not executable." >> "$LOG_FILE"
 
 fi
 
@@ -325,10 +353,10 @@ fi
 if ! ldconfig -p 2>/dev/null | grep -q "libxcb-cursor.so.0"; then
 
     echo "[QTAC] libxcb-cursor0 not found. Installing..." \
-        >> "\$LOG_FILE"
+        >> "$LOG_FILE"
 
     apt-get update \
-        >> "\$LOG_FILE" 2>&1 || true
+        >> "$LOG_FILE" 2>&1 || true
 
     DEBIAN_FRONTEND=noninteractive \
 	apt-get install -y \
@@ -338,23 +366,27 @@ if ! ldconfig -p 2>/dev/null | grep -q "libxcb-cursor.so.0"; then
 		libxcb-image0 \
 		libxcb-keysyms1 \
 		libxcb-render-util0 \
-    >> "\$LOG_FILE" 2>&1 || true
+    >> "$LOG_FILE" 2>&1 || true
 
     ldconfig >/dev/null 2>&1 || true
 
     if ldconfig -p 2>/dev/null | grep -q "libxcb-cursor.so.0"; then
 
         echo "[QTAC] Successfully installed libxcb-cursor0." \
-            >> "\$LOG_FILE"
+            >> "$LOG_FILE"
 
     else
 
         echo "[QTAC] WARNING: Failed to install libxcb-cursor0." \
-            >> "\$LOG_FILE"
+            >> "$LOG_FILE"
 
     fi
 
 fi
+POSTINST_GUI
+fi
+
+cat >> "$BUILDROOT/DEBIAN/postinst" <<EOF
 
 echo "[QTAC] Installing udev rules..." >> "\$LOG_FILE"
 
diff --git a/packaging/windows/build-installer.ps1 b/packaging/windows/build-installer.ps1
index 86f36b20..5bb3bd76 100644
--- a/packaging/windows/build-installer.ps1
+++ b/packaging/windows/build-installer.ps1
@@ -3,12 +3,15 @@
 
 [CmdletBinding()]
 param(
-    [string] $SourceRoot,        
-    [string] $BinDir,            
-    [string] $SevenZipDir,       
-    [string] $OutDir,            
-    [string] $Version,           
-    [switch] $MockPayload        
+    [string] $SourceRoot,
+    [string] $BinDir,
+    [string] $SevenZipDir,
+    [string] $OutDir,
+    [string] $Version,
+    [switch] $MockPayload,
+    # Produce the headless/automation variant: only TACDev.dll + support files,
+    # no GUI binary, no Qt runtime.
+    [switch] $NoGui
 )
 
 $ErrorActionPreference = 'Stop'
@@ -82,8 +85,17 @@ $iexpress = Join-Path $env:WinDir 'System32\iexpress.exe'
 if (-not (Test-Path $iexpress)) { throw "iexpress.exe not found at $iexpress." }
 
 if (-not $Version) {
-    $vc = Get-Content (Join-Path $SourceRoot 'src\libraries\qcommon-console\version.cmake') -Raw
-    if ($vc -match 'QTAC_VERSION\s+"([^"]+)"') { $Version = $Matches[1] } else { $Version = '0.0.0' }
+    $versionCmake = Join-Path $SourceRoot 'src\libraries\qcommon-console\version.cmake'
+    $versionH     = Join-Path $SourceRoot 'source\library\include\qtac\version.h'
+    if (Test-Path $versionCmake) {
+        $vc = Get-Content $versionCmake -Raw
+        if ($vc -match 'QTAC_VERSION\s+"([^"]+)"') { $Version = $Matches[1] }
+    }
+    if (-not $Version -and (Test-Path $versionH)) {
+        $vh = Get-Content $versionH -Raw
+        if ($vh -match 'TAC_LIB_VERSION\s+"([^"]+)"') { $Version = $Matches[1] }
+    }
+    if (-not $Version) { $Version = '0.0.0' }
 }
 
 Write-Host "Building QTAC installer: arch=$Arch version=$Version"
@@ -96,14 +108,34 @@ Remove-Item $pkg -Recurse -Force -ErrorAction SilentlyContinue
 New-Item -ItemType Directory -Force -Path (Join-Path $data 'app') | Out-Null
 
 if ($MockPayload) {
-    Set-Content (Join-Path $data 'app\TAC.exe') 'placeholder'
-    Set-Content (Join-Path $data 'app\FTDICheck.exe') 'placeholder'
-    Set-Content (Join-Path $data 'app\Qt6Core.dll') 'placeholder'
+    if ($NoGui) {
+        Set-Content (Join-Path $data 'app\TACDev.dll') 'placeholder'
+        Set-Content (Join-Path $data 'app\TACDev.lib') 'placeholder'
+    } else {
+        Set-Content (Join-Path $data 'app\TAC.exe') 'placeholder'
+        Set-Content (Join-Path $data 'app\FTDICheck.exe') 'placeholder'
+        Set-Content (Join-Path $data 'app\Qt6Core.dll') 'placeholder'
+    }
 } else {
     if (-not (Test-Path $BinDir)) {
         throw "Build output not found: $BinDir. Run build.bat first (see README > Build & Usage)."
     }
-    Copy-Item (Join-Path $BinDir '*') (Join-Path $data 'app') -Recurse -Force
+    if ($NoGui) {
+        # No-GUI variant: ship only TACDev.dll and its import lib.
+        $libDir = Join-Path (Split-Path $BinDir -Parent) 'lib'
+        foreach ($f in @('TACDev.dll')) {
+            $src = Join-Path $BinDir $f
+            if (Test-Path $src) { Copy-Item $src (Join-Path $data 'app') -Force }
+            else { Write-Warning "$f not found in $BinDir" }
+        }
+        foreach ($f in @('TACDev.lib')) {
+            $src = Join-Path $libDir $f
+            if (Test-Path $src) { Copy-Item $src (Join-Path $data 'app') -Force }
+            else { Write-Warning "$f not found in $libDir" }
+        }
+    } else {
+        Copy-Item (Join-Path $BinDir '*') (Join-Path $data 'app') -Recurse -Force
+    }
 }
 
 if (Test-Path (Join-Path $SourceRoot 'docs')) {
diff --git a/rebuild_library.ps1 b/rebuild_library.ps1
new file mode 100644
index 00000000..d7255e8f
--- /dev/null
+++ b/rebuild_library.ps1
@@ -0,0 +1,3 @@
+. "$PSScriptRoot\env_setup.ps1"
+cmake --build "$PSScriptRoot\build" --config Debug --target qtac-core TACDev qtac-app 2>&1
+exit $LASTEXITCODE
diff --git a/rebuild_tacdev_api.ps1 b/rebuild_tacdev_api.ps1
new file mode 100644
index 00000000..04dac463
--- /dev/null
+++ b/rebuild_tacdev_api.ps1
@@ -0,0 +1,3 @@
+. "$PSScriptRoot\env_setup.ps1"
+cmake --build "$PSScriptRoot\build" --config Debug --target test_tacdev_api
+exit $LASTEXITCODE
diff --git a/rebuild_tests.ps1 b/rebuild_tests.ps1
new file mode 100644
index 00000000..d9a3f471
--- /dev/null
+++ b/rebuild_tests.ps1
@@ -0,0 +1,3 @@
+. "$PSScriptRoot\env_setup.ps1"
+cmake --build "$PSScriptRoot\build" --config Debug --target test_coders_commands test_hardware_ftdi test_hardware_psoc
+exit $LASTEXITCODE
diff --git a/repolint.json b/repolint.json
index 8a8bfd03..f1232ba2 100644
--- a/repolint.json
+++ b/repolint.json
@@ -103,7 +103,8 @@
                 "test*",
                 "docs*",
                 "ftd2xx.h",
-                "WinTypes.h"
+                "WinTypes.h",
+				"third-party*"
               ]
             },
             "lineCount": 60,
diff --git a/run_build.ps1 b/run_build.ps1
new file mode 100644
index 00000000..98ba7b47
--- /dev/null
+++ b/run_build.ps1
@@ -0,0 +1,22 @@
+$ErrorActionPreference = 'Stop'
+. "$PSScriptRoot\env_setup.ps1"
+
+$logfile = "$PSScriptRoot\build_log.txt"
+
+Set-Location $PSScriptRoot
+if (Test-Path build) { Remove-Item -Recurse -Force build }
+
+Write-Host '=== CMAKE CONFIGURE ==='
+& cmake -S "$PSScriptRoot\source" -B build "-DCMAKE_PREFIX_PATH=$qtRoot" -DCMAKE_COLOR_DIAGNOSTICS=OFF -G 'Visual Studio 17 2022' -A x64 2>&1 | Tee-Object -FilePath $logfile
+if ($LASTEXITCODE -ne 0) { Write-Host 'CONFIGURE FAILED'; exit 1 }
+
+Write-Host '=== BUILD DEBUG ==='
+& cmake --build build --config Debug 2>&1 | Tee-Object -FilePath $logfile -Append
+if ($LASTEXITCODE -ne 0) { Write-Host 'DEBUG BUILD FAILED'; exit 1 }
+
+Write-Host '=== BUILD RELEASE ==='
+& cmake --build build --config Release 2>&1 | Tee-Object -FilePath $logfile -Append
+if ($LASTEXITCODE -ne 0) { Write-Host 'RELEASE BUILD FAILED'; exit 1 }
+
+Write-Host 'BUILD SUCCESS'
+exit 0
diff --git a/source/BUILD.md b/source/BUILD.md
new file mode 100644
index 00000000..af88a449
--- /dev/null
+++ b/source/BUILD.md
@@ -0,0 +1,386 @@
+# Build and Run Guide — TACDev and qtac-app
+
+## Prerequisites (Windows)
+
+| Tool | Version | Notes |
+|------|---------|-------|
+| Visual Studio Build Tools | 2022 | MSVC x64 toolchain (`cl.exe`) |
+| CMake | 3.22+ | Must be on `PATH` |
+| Ninja | any | Must be on `PATH` |
+| Qt | 6.9+ | Any `msvc2022_64` kit under `C:\Qt\`; or set `QTDIR` env var |
+| FTDI CDM driver SDK | 2.12.36+ | See §FTDI Bootstrap below |
+
+---
+
+## Prerequisites (Linux)
+
+| Tool | Version | Notes |
+|------|---------|-------|
+| GCC | 7+ | C++11 support required |
+| CMake | 3.22+ | Must be on `PATH` |
+| Ninja | any | Install via `sudo apt install ninja-build` |
+| Qt | 6.9+ | GCC 64-bit component required (e.g., `Qt/6.10.2/gcc_64`) |
+| libudev-dev | any | Install via `sudo apt install libudev-dev` (required for hidapi) |
+
+---
+
+## Build (Linux)
+
+### Using the build script (recommended)
+
+The root-level `build.sh` script builds both Debug and Release configurations and deploys Qt runtime dependencies:
+
+```bash
+# Set QTBIN to point to your Qt installation's bin directory
+export QTBIN=/path/to/Qt/6.10.2/gcc_64/bin
+
+# Run the build script
+./build.sh
+```
+
+The script will:
+1. Validate that `QTBIN` points to a valid Qt GCC 64-bit installation
+2. Download and extract the FTDI library (if not already present)
+3. Configure and build Debug configuration
+4. Configure and build Release configuration
+5. Deploy Qt runtime libraries and plugins to `__Builds/Linux/Release/`
+
+Outputs:
+```
+__Builds/Linux/Release/bin/qtac-app           # GUI application
+__Builds/Linux/Release/lib/libTACDev.so       # Shared library
+__Builds/Linux/Debug/lib/libqtac-core.a       # Static library
+```
+
+### Manual CMake steps
+
+If you prefer manual control or want to build only Debug or Release:
+
+```bash
+# Set up environment
+export QTBIN=/path/to/Qt/6.10.2/gcc_64/bin
+export PATH="$QTBIN:$PATH"
+
+# Configure Debug build
+cmake -S source -B build/Debug \
+    -DCMAKE_PREFIX_PATH="$(dirname "$QTBIN")" \
+    -DCMAKE_BUILD_TYPE=Debug \
+    -G Ninja
+
+# Build Debug
+cmake --build build/Debug
+
+# Configure Release build
+cmake -S source -B build/Release \
+    -DCMAKE_PREFIX_PATH="$(dirname "$QTBIN")" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -G Ninja
+
+# Build Release
+cmake --build build/Release
+```
+
+### Building individual targets
+
+```bash
+cmake --build build/Release --target qtac-app      # GUI application only
+cmake --build build/Release --target TACDev        # Shared library only
+cmake --build build/Release --target qtac-core     # Qt-free static lib only
+```
+
+### Incremental builds
+
+After the initial configuration, you can rebuild quickly:
+
+```bash
+cd build/Debug   # or build/Release
+make -j$(nproc)
+```
+
+---
+
+## Running Tests (Linux)
+
+### Non-hardware tests (no device required)
+
+```bash
+cd build/Debug/test
+
+./test_bytearray
+./test_coders_commands
+./test_containers
+./test_platform_configs
+./test_signal
+./test_string
+./test_stringutils
+./test_tacdev_api  # partial - init/version tests only
+```
+
+### Hardware integration tests (device must be connected)
+
+```bash
+cd build/Debug/test
+
+./test_hardware_ftdi    # requires a TACLite (FTDI) device
+./test_hardware_psoc    # requires a PSoC TAC device
+./test_tacdev_api       # full test requires any supported TAC device
+```
+
+**Note**: Hardware tests require appropriate udev rules for device access. See `udev-rules/` directory.
+
+---
+
+## FTDI Bootstrap (automatic)
+
+The FTDI `ftd2xx` library is downloaded and extracted automatically during
+`cmake` configure. No manual setup is required. On first configure, CMake
+fetches the CDM driver archive from the FTDI website (or the Wayback Machine
+mirror), extracts `ftd2xx.lib` and `ftd2xx.dll`, and places them under
+`__Builds\x64\` (Windows) or `__Builds\Linux\` (Linux).
+
+If your machine has no internet access, manually place the archive at
+`third-party\CDM-v2.12.36.4-WHQL-Certified.zip` before running cmake; the
+bootstrap will use the local file instead of downloading it.
+
+---
+
+## Build (Windows)
+
+### Quick build (recommended) — PowerShell
+
+```powershell
+cd C:\ProdTools\qcom-test-automation-controller
+.\build_app.ps1
+```
+
+Performs:
+1. Locates VS2022 via `vswhere.exe` and loads the MSVC x64 environment
+2. Locates Qt: uses `QTDIR` env var if set, otherwise searches `C:\Qt\` for any `msvc2022_64` kit
+3. `cmake -S source -B build\Release -DCMAKE_PREFIX_PATH=<Qt> -G Ninja -DCMAKE_BUILD_TYPE=Release`
+4. `cmake --build build\Release --target qtac-app`
+5. `cmake --build build\Release --target TACDev`
+
+To use a non-default Qt install:
+```powershell
+$env:QTDIR = 'C:\Qt\6.11.1\msvc2022_64'
+.\build_app.ps1
+```
+
+Outputs:
+```
+build\Release\qtac-app.exe
+build\Release\TACDev.dll
+build\Release\TACDev.lib   (import lib for callers)
+```
+
+### Quick build — batch file
+
+```bat
+cd C:\ProdTools\qcom-test-automation-controller
+build_app.bat
+```
+
+Same steps as the PowerShell script; build log is saved to `build_out.txt`.
+
+### Manual CMake steps
+
+```bat
+call "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
+set PATH=C:\Qt\6.11.1\msvc2022_64\bin;%PATH%
+
+cd C:\ProdTools\qcom-test-automation-controller
+
+cmake -S source -B build\Release ^
+      -DCMAKE_PREFIX_PATH=C:\Qt\6.11.1\msvc2022_64 ^
+      -G Ninja ^
+      -DCMAKE_BUILD_TYPE=Release
+
+cmake --build build\Release --target qtac-app TACDev
+```
+
+### Building individual targets
+
+```bat
+cmake --build build\Release --target qtac-app      # GUI application only
+cmake --build build\Release --target TACDev        # DLL only
+cmake --build build\Release --target qtac-core     # Qt-free static lib only
+```
+
+---
+
+## Rebuild (Windows — incremental, no reconfigure)
+
+When only source files change and the build is already configured:
+
+```powershell
+cd C:\ProdTools\qcom-test-automation-controller
+.\rebuild_library.ps1    # rebuilds qtac-core + TACDev + qtac-app (Debug)
+.\rebuild_tests.ps1      # rebuilds test_coders_commands, test_hardware_ftdi, test_hardware_psoc (Debug)
+```
+
+---
+
+## Deploy (Windows — qtac-app.exe)
+
+After building, run the deploy script to copy Qt runtime DLLs and device
+configuration files alongside the executable:
+
+```powershell
+cd C:\ProdTools\qcom-test-automation-controller
+.\deploy_app.ps1
+```
+
+This copies into `build\Release\`:
+- `ftd2xx.dll` — FTDI runtime
+- `devicelist.json` — device catalogue
+- `*.tcnf` — device configuration files
+- `DefaultScript.txt` — default AlpacaScript
+- All Qt DLLs/plugins (via `windeployqt`)
+
+### Running qtac-app
+
+```bat
+build\Release\qtac-app.exe
+```
+
+The application expects `devicelist.json` and `.tcnf` files to be **in the
+same directory** as the executable. `deploy_app.ps1` places them there.
+
+---
+
+## Deploy (Windows — TACDev.dll)
+
+`TACDev.dll` is a Qt-free C API DLL. Consumers need:
+
+| File | Location after build |
+|------|---------------------|
+| `TACDev.dll` | `build\Release\TACDev.dll` |
+| `TACDev.lib` | `build\Release\source\tacdev\TACDev.lib` |
+| `TACDev.h` | `source\tacdev\TACDev.h` |
+| `ftd2xx.dll` | copy from `__Builds\x64\Release\bin\` |
+| `devicelist.json` | `configurations\devicelist.json` |
+| `*.tcnf` | `configurations\*.tcnf` |
+
+**At runtime**, `devicelist.json` and all `.tcnf` files must be findable
+relative to the executable that loads `TACDev.dll`. The DLL searches starting
+from the exe directory and walking up to four levels.
+
+### Minimal C usage example
+
+```c
+#include "TACDev.h"
+#include <stdio.h>
+
+int main(void) {
+    if (InitializeTACDev() != NO_TAC_ERROR) return 1;
+
+    int count = 0;
+    GetDeviceCount(&count);
+    printf("Devices found: %d\n", count);
+
+    for (int i = 0; i < count; i++) {
+        char port[256];
+        GetPortData(i, port, sizeof(port));
+        printf("  [%d] %s\n", i, port);
+    }
+
+    TAC_HANDLE h = OpenHandleByDescription("COM3");  // adjust as needed
+    if (h == kBadHandle) { printf("Open failed\n"); return 1; }
+
+    char name[128];
+    GetName(h, name, sizeof(name));
+    printf("Device: %s\n", name);
+
+    SendCommand(h, "PowerKey", true);
+
+    CloseTACHandle(h);
+    return 0;
+}
+```
+
+---
+
+## Running Tests (Windows)
+
+### Non-hardware tests (no device required)
+
+```bat
+cd C:\ProdTools\qcom-test-automation-controller\build\Release
+test_bytearray.exe
+test_coders_commands.exe
+test_containers.exe
+test_platform_configs.exe
+test_signal.exe
+test_string.exe
+test_stringutils.exe
+```
+
+### Hardware integration tests (device must be connected)
+
+```bat
+cd C:\ProdTools\qcom-test-automation-controller\build\Release
+test_hardware_ftdi.exe    # requires a TACLite (FTDI) device
+test_hardware_psoc.exe    # requires a PSoC TAC device
+test_tacdev_api.exe       # requires any supported TAC device
+```
+
+### Rebuild tests only
+
+```powershell
+cd C:\ProdTools\qcom-test-automation-controller
+.\rebuild_tests.ps1
+```
+
+---
+
+## Project Structure (relevant to this guide)
+
+```
+C:\ProdTools\qcom-test-automation-controller\
+├── CMakeLists.txt              root — builds src/ subtree only (upstream)
+├── source\
+│   ├── CMakeLists.txt          standalone entry point for source/ subtree
+│   ├── library\                qtac-core Qt-free static lib
+│   ├── libraries\qt-adapter\   Qt ↔ qtac-core bridge (static lib)
+│   ├── app\                    qtac-app Qt6 GUI source
+│   ├── tacdev\                 TACDev.dll C API source + TACDev.h
+│   └── test\                   unit + integration tests
+├── build_app.ps1               PowerShell build script (uses vswhere)
+├── build_app.bat               Batch build script
+├── rebuild_library.ps1         Incremental rebuild of library + app targets
+├── rebuild_tests.ps1           Incremental rebuild of test targets
+├── deploy_app.ps1              windeployqt + copy configs
+├── __Builds\x64\               ftd2xx.lib / ftd2xx.dll (auto-bootstrapped)
+├── configurations\             devicelist.json, *.tcnf
+├── third-party\                boost, hidapi, libserialport, nlohmann/json
+└── build\Release\              cmake build output
+```
+
+---
+
+## Troubleshooting (Windows)
+
+| Symptom | Likely cause | Fix |
+|---------|-------------|-----|
+| `cmake` can't find Qt | Qt not on `CMAKE_PREFIX_PATH` | Pass `-DCMAKE_PREFIX_PATH=C:\Qt\6.11.1\msvc2022_64` |
+| `ftd2xx.lib not found` | FTDI bootstrap failed or no internet | Delete `build\Release` and reconfigure; or pre-place archive at `third-party\CDM-v2.12.36.4-WHQL-Certified.zip` |
+| `ftd2xx.dll not found` at runtime | DLL not deployed | Run `deploy_app.ps1` or copy manually |
+| App opens but shows no devices | `devicelist.json` missing | Run `deploy_app.ps1` or copy `configurations\` files |
+| `cl.exe` not found | MSVC env not loaded | Use `build_app.ps1`/`build_app.bat` which load `vcvars64.bat` |
+| Build fails with `LINK : fatal error LNK1181` | Stale build dir | Delete `build\Release` and reconfigure |
+| hidapi not found | FetchContent network issue | Ensure internet access during first configure |
+
+---
+
+## Troubleshooting (Linux)
+
+| Symptom | Likely cause | Fix |
+|---------|-------------|-----|
+| `QTBIN is not set` | Environment variable missing | `export QTBIN=/path/to/Qt/6.x.x/gcc_64/bin` |
+| `libudev not found` | Missing development headers | `sudo apt install libudev-dev` |
+| `cmake` can't find Qt | Qt not on `CMAKE_PREFIX_PATH` | Pass `-DCMAKE_PREFIX_PATH=/path/to/Qt/6.x.x/gcc_64` |
+| `ninja not found` | Ninja build tool not installed | `sudo apt install ninja-build` |
+| Permission denied on device | Missing udev rules | Copy rules from `udev-rules/` to `/etc/udev/rules.d/` and reload |
+| Qt platform plugin error | Missing Qt XCB libraries | Ensure `libQt6XcbQpa.so` is deployed (done by `build.sh`) |
+| hidapi not found | FetchContent network issue | Ensure internet access during first configure |
+| Ambiguous `String::number()` call | uint64_t type mismatch | Update to `static_cast<unsigned long long>` |
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
new file mode 100644
index 00000000..36e598fa
--- /dev/null
+++ b/source/CMakeLists.txt
@@ -0,0 +1,248 @@
+# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+# SPDX-License-Identifier: BSD-3-Clause
+#
+# Entry point for the Qt-free source/ subtree.
+# Build from repo root:
+#
+#   cmake -S source -B build/source -DCMAKE_PREFIX_PATH=<Qt root>
+#   cmake --build build/source
+#
+# Or use the provided build scripts (build_app.ps1, build_app.bat).
+
+cmake_minimum_required(VERSION 3.22)
+project(QTAC-Source VERSION 1.0 LANGUAGES CXX C)
+
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+# ---------------------------------------------------------------------------
+# FTDI D2XX bootstrap — mirrors third-party/CMakeLists.txt logic so the
+# source/ subtree can be built standalone without the root project.
+# ---------------------------------------------------------------------------
+if(WIN32)
+    if(CMAKE_SYSTEM_PROCESSOR MATCHES "ARM64|aarch64" OR CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64")
+        set(FTDI_URL "https://web.archive.org/web/20250821211500/https://ftdichip.com/wp-content/uploads/2025/03/CDM-v2.12.36.20-for-ARM64-WHQL-Certified.zip")
+        set(FTDI_ARCHIVE "CDM-v2.12.36.20-for-ARM64-WHQL-Certified.zip")
+        set(FTDI_WIN_ARCH "ARM64")
+        set(FTDI_ZIP_LIB_GLOB "ARM64/Release/FTD2XXstatic.lib")
+        set(FTDI_ZIP_DLL_GLOB "ARM64/Release/FTD2XX.dll")
+    else()
+        set(FTDI_URL "https://web.archive.org/web/20250820134143/https://ftdichip.com/wp-content/uploads/2023/09/CDM-v2.12.36.4-WHQL-Certified.zip")
+        set(FTDI_ARCHIVE "CDM-v2.12.36.4-WHQL-Certified.zip")
+        set(FTDI_WIN_ARCH "x64")
+        set(FTDI_ZIP_LIB_GLOB "amd64/ftd2xx.lib")
+        set(FTDI_ZIP_DLL_GLOB "amd64/FTD2XX64.dll")
+    endif()
+    set(DEBUG_LIB   "${CMAKE_SOURCE_DIR}/../__Builds/${FTDI_WIN_ARCH}/Debug/lib/ftd2xx.lib")
+    set(RELEASE_LIB "${CMAKE_SOURCE_DIR}/../__Builds/${FTDI_WIN_ARCH}/Release/lib/ftd2xx.lib")
+else()
+    set(FTDI_URL "https://web.archive.org/web/20250822044524/https://ftdichip.com/wp-content/uploads/2025/03/libftd2xx-linux-x86_64-1.4.33.tgz")
+    set(FTDI_ARCHIVE "libftd2xx-linux-x86_64-1.4.33.tgz")
+    set(DEBUG_LIB   "${CMAKE_SOURCE_DIR}/../__Builds/Linux/Debug/lib/libftd2xx.a")
+    set(RELEASE_LIB "${CMAKE_SOURCE_DIR}/../__Builds/Linux/Release/lib/libftd2xx.a")
+endif()
+
+set(ARCHIVE_PATH "${CMAKE_SOURCE_DIR}/../third-party/${FTDI_ARCHIVE}")
+set(TEMP_DIR     "${CMAKE_CURRENT_BINARY_DIR}/ftdi_extract")
+
+set(DOWNLOAD_SUCCESS FALSE)
+if(EXISTS "${ARCHIVE_PATH}")
+    execute_process(COMMAND ${CMAKE_COMMAND} -E tar tf "${ARCHIVE_PATH}"
+        RESULT_VARIABLE TAR_RESULT OUTPUT_QUIET ERROR_QUIET)
+    if(TAR_RESULT EQUAL 0)
+        set(DOWNLOAD_SUCCESS TRUE)
+        message(STATUS "FTDI: using existing archive at ${ARCHIVE_PATH}")
+    else()
+        file(REMOVE "${ARCHIVE_PATH}")
+    endif()
+endif()
+
+if(NOT DOWNLOAD_SUCCESS)
+    set(RETRY_COUNT 0)
+    while(RETRY_COUNT LESS 3)
+        math(EXPR RETRY_COUNT "${RETRY_COUNT} + 1")
+        file(DOWNLOAD "${FTDI_URL}" "${ARCHIVE_PATH}" SHOW_PROGRESS STATUS DOWNLOAD_STATUS TIMEOUT 300)
+        list(GET DOWNLOAD_STATUS 0 DOWNLOAD_ERROR_CODE)
+        if(DOWNLOAD_ERROR_CODE EQUAL 0 AND EXISTS "${ARCHIVE_PATH}")
+            execute_process(COMMAND ${CMAKE_COMMAND} -E tar tf "${ARCHIVE_PATH}"
+                RESULT_VARIABLE TAR_RESULT OUTPUT_QUIET ERROR_QUIET)
+            if(TAR_RESULT EQUAL 0)
+                set(DOWNLOAD_SUCCESS TRUE)
+                break()
+            endif()
+        endif()
+        if(RETRY_COUNT LESS 3)
+            execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 5)
+        endif()
+    endwhile()
+    if(NOT DOWNLOAD_SUCCESS)
+        message(FATAL_ERROR
+            "Failed to download FTDI archive after ${RETRY_COUNT} attempts.\n"
+            "Manually download '${FTDI_ARCHIVE}' from:\n  ${FTDI_URL}\n"
+            "Place it at: ${ARCHIVE_PATH}\nThen re-run cmake.")
+    endif()
+endif()
+
+file(REMOVE_RECURSE "${TEMP_DIR}")
+file(MAKE_DIRECTORY "${TEMP_DIR}")
+execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${ARCHIVE_PATH}" WORKING_DIRECTORY "${TEMP_DIR}")
+
+if(WIN32)
+    file(MAKE_DIRECTORY "${CMAKE_SOURCE_DIR}/../__Builds/${FTDI_WIN_ARCH}/Debug/lib")
+    file(MAKE_DIRECTORY "${CMAKE_SOURCE_DIR}/../__Builds/${FTDI_WIN_ARCH}/Release/lib")
+    file(GLOB SOURCE_LIB "${TEMP_DIR}/${FTDI_ZIP_LIB_GLOB}")
+    file(GLOB SOURCE_DLL "${TEMP_DIR}/${FTDI_ZIP_DLL_GLOB}")
+    if(SOURCE_DLL)
+        file(MAKE_DIRECTORY "${CMAKE_SOURCE_DIR}/../__Builds/${FTDI_WIN_ARCH}/Debug/bin")
+        file(MAKE_DIRECTORY "${CMAKE_SOURCE_DIR}/../__Builds/${FTDI_WIN_ARCH}/Release/bin")
+        file(COPY "${SOURCE_DLL}" DESTINATION "${CMAKE_SOURCE_DIR}/../__Builds/${FTDI_WIN_ARCH}/Debug/bin")
+        get_filename_component(SOURCE_DLL_NAME "${SOURCE_DLL}" NAME)
+        if(NOT SOURCE_DLL_NAME STREQUAL "ftd2xx.dll")
+            file(RENAME "${CMAKE_SOURCE_DIR}/../__Builds/${FTDI_WIN_ARCH}/Debug/bin/${SOURCE_DLL_NAME}"
+                        "${CMAKE_SOURCE_DIR}/../__Builds/${FTDI_WIN_ARCH}/Debug/bin/ftd2xx.dll")
+        endif()
+        file(COPY "${SOURCE_DLL}" DESTINATION "${CMAKE_SOURCE_DIR}/../__Builds/${FTDI_WIN_ARCH}/Release/bin")
+        if(NOT SOURCE_DLL_NAME STREQUAL "ftd2xx.dll")
+            file(RENAME "${CMAKE_SOURCE_DIR}/../__Builds/${FTDI_WIN_ARCH}/Release/bin/${SOURCE_DLL_NAME}"
+                        "${CMAKE_SOURCE_DIR}/../__Builds/${FTDI_WIN_ARCH}/Release/bin/ftd2xx.dll")
+        endif()
+    endif()
+    if(NOT SOURCE_LIB AND FTDI_WIN_ARCH STREQUAL "x64")
+        file(GLOB SOURCE_LIB "${TEMP_DIR}/Static/amd64/ftd2xx.lib")
+    endif()
+    if(NOT SOURCE_LIB)
+        message(FATAL_ERROR "FTDI ${FTDI_WIN_ARCH} lib not found in the downloaded CDM package.")
+    endif()
+    file(COPY "${SOURCE_LIB}" DESTINATION "${CMAKE_SOURCE_DIR}/../__Builds/${FTDI_WIN_ARCH}/Debug/lib")
+    file(COPY "${SOURCE_LIB}" DESTINATION "${CMAKE_SOURCE_DIR}/../__Builds/${FTDI_WIN_ARCH}/Release/lib")
+    get_filename_component(SOURCE_LIB_NAME "${SOURCE_LIB}" NAME)
+    if(NOT SOURCE_LIB_NAME STREQUAL "ftd2xx.lib")
+        file(RENAME "${CMAKE_SOURCE_DIR}/../__Builds/${FTDI_WIN_ARCH}/Debug/lib/${SOURCE_LIB_NAME}"   "${DEBUG_LIB}")
+        file(RENAME "${CMAKE_SOURCE_DIR}/../__Builds/${FTDI_WIN_ARCH}/Release/lib/${SOURCE_LIB_NAME}" "${RELEASE_LIB}")
+    endif()
+else()
+    file(MAKE_DIRECTORY "${CMAKE_SOURCE_DIR}/../__Builds/Linux/Debug/lib")
+    file(MAKE_DIRECTORY "${CMAKE_SOURCE_DIR}/../__Builds/Linux/Release/lib")
+    file(GLOB SOURCE_LIB "${TEMP_DIR}/*/libftd2xx-static.a")
+    file(COPY "${SOURCE_LIB}" DESTINATION "${CMAKE_SOURCE_DIR}/../__Builds/Linux/Debug/lib")
+    file(COPY "${SOURCE_LIB}" DESTINATION "${CMAKE_SOURCE_DIR}/../__Builds/Linux/Release/lib")
+    file(RENAME "${CMAKE_SOURCE_DIR}/../__Builds/Linux/Debug/lib/libftd2xx-static.a"   "${DEBUG_LIB}")
+    file(RENAME "${CMAKE_SOURCE_DIR}/../__Builds/Linux/Release/lib/libftd2xx-static.a" "${RELEASE_LIB}")
+endif()
+file(REMOVE_RECURSE "${TEMP_DIR}")
+
+if(WIN32)
+    add_library(ftd2xx_debug   STATIC IMPORTED GLOBAL)
+    add_library(ftd2xx_release STATIC IMPORTED GLOBAL)
+    set_target_properties(ftd2xx_debug   PROPERTIES IMPORTED_LOCATION "${DEBUG_LIB}")
+    set_target_properties(ftd2xx_release PROPERTIES IMPORTED_LOCATION "${RELEASE_LIB}")
+else()
+    add_library(ftd2xx STATIC IMPORTED GLOBAL)
+    set_target_properties(ftd2xx PROPERTIES
+        IMPORTED_LOCATION_DEBUG   "${DEBUG_LIB}"
+        IMPORTED_LOCATION_RELEASE "${RELEASE_LIB}"
+        IMPORTED_LOCATION         "${RELEASE_LIB}")
+endif()
+
+function(link_ftd2xx target_name)
+    if(WIN32)
+        target_link_libraries(${target_name} PRIVATE
+            $<$<CONFIG:Debug>:ftd2xx_debug>
+            $<$<CONFIG:Release>:ftd2xx_release>)
+    else()
+        target_link_libraries(${target_name} PRIVATE ftd2xx pthread dl)
+    endif()
+endfunction()
+
+# ---------------------------------------------------------------------------
+# hidapi — fetched here (mirrors third-party/CMakeLists.txt)
+# ---------------------------------------------------------------------------
+include(FetchContent)
+set(HIDAPI_BUILD_HIDTEST OFF CACHE BOOL "" FORCE)
+set(HIDAPI_BUILD_TESTING OFF CACHE BOOL "" FORCE)
+set(BUILD_SHARED_LIBS    OFF CACHE BOOL "Build dependencies as static libraries" FORCE)
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set(HIDAPI_WITH_HIDRAW ON  CACHE BOOL "" FORCE)
+    set(HIDAPI_WITH_LIBUSB OFF CACHE BOOL "" FORCE)
+endif()
+FetchContent_Declare(
+    hidapi
+    GIT_REPOSITORY https://github.com/libusb/hidapi.git
+    GIT_TAG        hidapi-0.15.0
+    GIT_SHALLOW    TRUE
+)
+FetchContent_MakeAvailable(hidapi)
+
+# ---------------------------------------------------------------------------
+# Boost — download the full 1.78.0 headers-only tarball via FetchContent.
+# We use the complete tarball rather than individual per-module repos because
+# boost::json has an extensive transitive dependency tree within the
+# superproject; fetching them individually requires resolving every
+# subdependency manually. The tarball download is cached after the first run.
+# BOOST_ALL_NO_LIB disables Windows auto-link pragmas for any precompiled lib.
+# ---------------------------------------------------------------------------
+cmake_policy(PUSH)
+if(POLICY CMP0169)
+    cmake_policy(SET CMP0169 OLD)
+endif()
+FetchContent_Declare(
+    boost
+    URL      https://archives.boost.io/release/1.78.0/source/boost_1_78_0.tar.gz
+    URL_HASH SHA256=94ced8b72956591c4775ae2207a9763d3600b30d9d7446562c552f0a14a63be7
+)
+FetchContent_GetProperties(boost)
+if(NOT boost_POPULATED)
+    FetchContent_Populate(boost)
+endif()
+cmake_policy(POP)
+
+add_library(boost_headers INTERFACE)
+target_include_directories(boost_headers INTERFACE "${boost_SOURCE_DIR}")
+
+# ---------------------------------------------------------------------------
+# Output directories — must be set at this scope so all subdirectories
+# (library, app, tacdev, test) inherit the same output paths.
+# This mirrors the logic in library/cmake/QtacCommon.cmake (QTAC_WINTARGET).
+# ---------------------------------------------------------------------------
+if(WIN32)
+    if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+        set(_QTAC_WINTARGET "Win32")
+    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "ARM64|aarch64" OR CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64")
+        set(_QTAC_WINTARGET "ARM64")
+    else()
+        set(_QTAC_WINTARGET "x64")
+    endif()
+    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+        set(_QTAC_OUTDIR "${CMAKE_SOURCE_DIR}/__Builds/${_QTAC_WINTARGET}/Debug")
+    else()
+        set(_QTAC_OUTDIR "${CMAKE_SOURCE_DIR}/__Builds/${_QTAC_WINTARGET}/Release")
+    endif()
+else()
+    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+        set(_QTAC_OUTDIR "${CMAKE_SOURCE_DIR}/__Builds/Linux/Debug")
+    else()
+        set(_QTAC_OUTDIR "${CMAKE_SOURCE_DIR}/__Builds/Linux/Release")
+    endif()
+endif()
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${_QTAC_OUTDIR}/bin")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${_QTAC_OUTDIR}/lib")
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${_QTAC_OUTDIR}/lib")
+
+# ---------------------------------------------------------------------------
+# Subtargets
+# ---------------------------------------------------------------------------
+find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core Multimedia)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS
+    Concurrent Gui Multimedia MultimediaWidgets Network SerialPort Widgets Xml)
+qt_standard_project_setup(REQUIRES 6.9)
+
+add_subdirectory(library)
+add_subdirectory(libraries/qt-adapter)
+add_subdirectory(tacdev)
+add_subdirectory(test)
+add_subdirectory(app)
diff --git a/source/app/CMakeLists.txt b/source/app/CMakeLists.txt
new file mode 100644
index 00000000..b8ceb211
--- /dev/null
+++ b/source/app/CMakeLists.txt
@@ -0,0 +1,92 @@
+# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted (subject to the limitations in the
+# disclaimer below) provided that the following conditions are met:
+#
+#     * Redistributions of source code must retain the above copyright
+#         notice, this list of conditions and the following disclaimer.
+#
+#     * Redistributions in binary form must reproduce the above
+#         copyright notice, this list of conditions and the following
+#         disclaimer in the documentation and/or other materials provided
+#         with the distribution.
+#
+#     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+#         contributors may be used to endorse or promote products derived
+#         from this software without specific prior written permission.
+#
+# NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+# GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+# HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cmake_minimum_required(VERSION 3.16)
+project(qtac-app VERSION 1.0 LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
+qt_standard_project_setup()
+
+qt_add_resources(QTAC_APP_RESOURCES resources/TAC.qrc)
+
+qt_add_executable(qtac-app WIN32
+    main.cpp
+    TACApplication.h
+    TACApplication.cpp
+    TACWindow.h
+    TACWindow.cpp
+    TACWindow.ui
+    TACDeviceSelection.h
+    TACDeviceSelection.cpp
+    TACDeviceSelection.ui
+    TACPinFrame.h
+    TACPinFrame.cpp
+    TACPreferences.h
+    TACPreferences.cpp
+    PreferencesDialog.h
+    PreferencesDialog.cpp
+    ${QTAC_APP_RESOURCES}
+)
+
+target_include_directories(qtac-app PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/../library/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../source/libraries/qt-adapter/include
+)
+
+target_link_libraries(qtac-app PRIVATE
+    Qt6::Core
+    Qt6::Gui
+    Qt6::Widgets
+    qt-adapter
+    qtac-core
+)
+
+if(WIN32)
+    if(COMMAND link_ftd2xx)
+        link_ftd2xx(qtac-app)
+    endif()
+    target_link_libraries(qtac-app PRIVATE Advapi32 SetupAPI)
+    # RC compilation with Ninja requires special handling; disabled for now.
+    # target_sources(qtac-app PRIVATE resources/TAC.rc)
+endif()
+
+install(TARGETS qtac-app
+    BUNDLE  DESTINATION .
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
diff --git a/source/app/PreferencesDialog.cpp b/source/app/PreferencesDialog.cpp
new file mode 100644
index 00000000..96e06b5c
--- /dev/null
+++ b/source/app/PreferencesDialog.cpp
@@ -0,0 +1,111 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "PreferencesDialog.h"
+#include "TACPreferences.h"
+
+#include <QCheckBox>
+#include <QDialogButtonBox>
+#include <QDoubleSpinBox>
+#include <QFormLayout>
+#include <QGroupBox>
+#include <QPushButton>
+#include <QVBoxLayout>
+
+PreferencesDialog::PreferencesDialog(TACPreferences* prefs, QWidget* parent)
+    : QDialog(parent)
+    , _prefs(prefs)
+{
+    setWindowTitle("Preferences");
+    setModal(true);
+
+    // --- Startup group ---
+    auto* startupGroup = new QGroupBox("Startup");
+    auto* startupLayout = new QVBoxLayout(startupGroup);
+    _openLastDevice = new QCheckBox("Open last device on start");
+    startupLayout->addWidget(_openLastDevice);
+
+    // --- Auto-Shutdown group ---
+    auto* shutdownGroup = new QGroupBox("Auto Shutdown");
+    auto* shutdownForm = new QFormLayout(shutdownGroup);
+    _autoShutdown = new QCheckBox("Enable auto shutdown");
+    _hours = new QDoubleSpinBox;
+    _hours->setRange(0.1, 120.0);
+    _hours->setSingleStep(0.5);
+    _hours->setSuffix(" hours");
+    _hours->setValue(24.0);
+    shutdownForm->addRow(_autoShutdown);
+    shutdownForm->addRow("Idle time:", _hours);
+
+    connect(_autoShutdown, &QCheckBox::toggled, _hours, &QDoubleSpinBox::setEnabled);
+
+    // --- Buttons ---
+    auto* setDefaultsBtn = new QPushButton("Set To Defaults");
+    auto* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+
+    connect(setDefaultsBtn, &QPushButton::clicked, this, &PreferencesDialog::onSetToDefaults);
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &PreferencesDialog::accept);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+
+    // --- Top-level layout ---
+    auto* mainLayout = new QVBoxLayout(this);
+    mainLayout->addWidget(startupGroup);
+    mainLayout->addWidget(shutdownGroup);
+    mainLayout->addWidget(setDefaultsBtn);
+    mainLayout->addWidget(buttonBox);
+
+    loadFromPrefs();
+}
+
+void PreferencesDialog::loadFromPrefs()
+{
+    _openLastDevice->setChecked(_prefs->openLastDevice());
+    _autoShutdown->setChecked(_prefs->autoShutdown());
+    _hours->setValue(_prefs->autoShutdownHours());
+    _hours->setEnabled(_prefs->autoShutdown());
+}
+
+void PreferencesDialog::onSetToDefaults()
+{
+    _openLastDevice->setChecked(false);
+    _autoShutdown->setChecked(false);
+    _hours->setValue(24.0);
+    _hours->setEnabled(false);
+}
+
+void PreferencesDialog::accept()
+{
+    _prefs->setOpenLastDevice(_openLastDevice->isChecked());
+    _prefs->setAutoShutdown(_autoShutdown->isChecked());
+    _prefs->setAutoShutdownHours(_hours->value());
+    QDialog::accept();
+}
diff --git a/source/app/PreferencesDialog.h b/source/app/PreferencesDialog.h
new file mode 100644
index 00000000..175ca0bd
--- /dev/null
+++ b/source/app/PreferencesDialog.h
@@ -0,0 +1,64 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#pragma once
+
+#include <QDialog>
+
+class TACPreferences;
+class QCheckBox;
+class QDoubleSpinBox;
+
+// ---------------------------------------------------------------------------
+// PreferencesDialog — modal dialog for editing TACPreferences.
+// Built programmatically; no .ui file.
+// ---------------------------------------------------------------------------
+class PreferencesDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit PreferencesDialog(TACPreferences* prefs, QWidget* parent = nullptr);
+
+private slots:
+    void onSetToDefaults();
+    void accept() override;
+
+private:
+    void loadFromPrefs();
+
+    TACPreferences* _prefs{nullptr};
+
+    QCheckBox*      _openLastDevice{nullptr};
+    QCheckBox*      _autoShutdown{nullptr};
+    QDoubleSpinBox* _hours{nullptr};
+};
diff --git a/source/app/TACApplication.cpp b/source/app/TACApplication.cpp
new file mode 100644
index 00000000..29f37d6c
--- /dev/null
+++ b/source/app/TACApplication.cpp
@@ -0,0 +1,113 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "TACApplication.h"
+#include "TACPreferences.h"
+#include "TACWindow.h"
+
+#include <qtac/FTDIDevice.h>
+#include <qtac/PSOCDevice.h>
+#include <qtac/PIC32CXDevice.h>
+#include <qtac/AlpacaDevice.h>
+
+QList<TACWindow*> TACApplication::_windows;
+QPoint            TACApplication::_nextOrigin(40, 40);
+
+TACApplication::TACApplication(int& argc, char** argv)
+    : QApplication(argc, argv)
+{
+    setApplicationName("QTAC");
+    setApplicationVersion("1.0");
+    setOrganizationName("Qualcomm");
+}
+
+TACApplication::~TACApplication() = default;
+
+TACApplication* TACApplication::instance()
+{
+    return qobject_cast<TACApplication*>(QApplication::instance());
+}
+
+TACWindow* TACApplication::createTACWindow(bool show)
+{
+    auto* w = new TACWindow;
+    w->move(_nextOrigin);
+    _nextOrigin += QPoint(20, 20);
+    _windows.append(w);
+    if (show)
+        w->show();
+    return w;
+}
+
+void TACApplication::disconnectTACWindow(TACWindow* w)
+{
+    _windows.removeAll(w);
+}
+
+bool TACApplication::isPortInUse(const QByteArray& portName)
+{
+    for (TACWindow* w : _windows)
+        if (w->portName() == portName)
+            return true;
+    return false;
+}
+
+void TACApplication::quit()
+{
+    // Close all windows cleanly before exiting.
+    for (TACWindow* w : _windows)
+        w->close();
+    _windows.clear();
+    QApplication::quit();
+}
+
+void TACApplication::tryOpenLastDevice()
+{
+    TACPreferences prefs;
+    if (!prefs.openLastDevice()) return;
+    QString last = prefs.lastDevice();
+    if (last.isEmpty()) return;
+
+    FTDIDevice::updateAlpacaDevices();
+    PSOCDevice::updateAlpacaDevices();
+    PIC32CXDevice::updateAlpacaDevices();
+    QByteArray port = last.toLatin1();
+    AlpacaDevice dev = _AlpacaDevice::findAlpacaDevice(
+        qtac::ByteArray(port.constData(), port.size()));
+    if (!dev)
+    {
+        prefs.setLastDevice("");   // device gone — clear it
+        return;
+    }
+    if (!_windows.isEmpty())
+        _windows.first()->openPort(port);
+}
diff --git a/source/app/TACApplication.h b/source/app/TACApplication.h
new file mode 100644
index 00000000..ee58f3d0
--- /dev/null
+++ b/source/app/TACApplication.h
@@ -0,0 +1,72 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#pragma once
+
+#include <QApplication>
+#include <QList>
+#include <QPoint>
+
+class TACWindow;
+
+// ---------------------------------------------------------------------------
+// TACApplication — thin QApplication subclass.
+// Owns the list of open TACWindows and drives device selection/open.
+// ---------------------------------------------------------------------------
+class TACApplication : public QApplication
+{
+    Q_OBJECT
+
+public:
+    TACApplication(int& argc, char** argv);
+    ~TACApplication() override;
+
+    static TACApplication* instance();
+
+    // Creates (and shows) a new blank TACWindow.
+    static TACWindow* createTACWindow(bool show = true);
+
+    // Removes a window from the tracking list; does NOT delete it.
+    static void disconnectTACWindow(TACWindow* w);
+
+    // Returns true if any open window is already using portName.
+    static bool isPortInUse(const QByteArray& portName);
+
+    // If "open last device" is enabled in preferences, tries to reconnect.
+    void tryOpenLastDevice();
+
+    void quit();
+
+private:
+    static QList<TACWindow*> _windows;
+    static QPoint            _nextOrigin;
+};
diff --git a/source/app/TACDeviceSelection.cpp b/source/app/TACDeviceSelection.cpp
new file mode 100644
index 00000000..1f852b65
--- /dev/null
+++ b/source/app/TACDeviceSelection.cpp
@@ -0,0 +1,198 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "TACDeviceSelection.h"
+#include "ui_TACDeviceSelection.h"
+
+#include <qt_string_convert.h>
+
+#include <qtac/FTDIDevice.h>
+#include <qtac/PSOCDevice.h>
+#include <qtac/PIC32CXDevice.h>
+#include <qtac/AlpacaDevice.h>
+
+#include <QPushButton>
+#include <QTableWidgetItem>
+#include <QTimer>
+
+TACDeviceSelection::TACDeviceSelection(QWidget* parent)
+    : QDialog(parent)
+    , _ui(new Ui::TACDeviceSelectionClass)
+{
+    _ui->setupUi(this);
+
+    _ui->_tacDevices->horizontalHeader()->resizeSection(1, 220);
+    _ui->_tacDevices->horizontalHeader()->resizeSection(2, 220);
+
+    setOkEnabled(false);
+
+    connect(_ui->_tacDevices, &QTableWidget::clicked,
+            this,             &TACDeviceSelection::onTableClicked);
+    connect(_ui->_tacDevices, &QTableWidget::doubleClicked,
+            this,             &TACDeviceSelection::onTableDoubleClicked);
+
+    _timer = new QTimer(this);
+    connect(_timer, &QTimer::timeout, this, &TACDeviceSelection::refreshDevices);
+    _timer->start(50); // fast first tick, then slows to 2500 ms after first refresh
+}
+
+TACDeviceSelection::~TACDeviceSelection()
+{
+    _timer->stop();
+    delete _ui;
+}
+
+void TACDeviceSelection::accept()
+{
+    // Set the closing flag FIRST to prevent any ongoing refresh from updating devices
+    _closing = true;
+
+    // Stop the timer and disconnect to prevent race conditions
+    _timer->stop();
+    disconnect(_timer, &QTimer::timeout, this, &TACDeviceSelection::refreshDevices);
+
+    // Capture the currently selected row before accepting.
+    // On Linux, if the user selects a row and clicks OK, the clicked
+    // signal may not have been triggered, so we must check selection here.
+    QList<QTableWidgetItem*> sel = _ui->_tacDevices->selectedItems();
+    if (!sel.isEmpty())
+    {
+        _selectedPort = sel.first()->text().toLatin1();
+    }
+
+    if (_selectedPort.isEmpty())
+    {
+        // Don't accept if nothing is selected
+        // Clear closing flag, reconnect and restart timer since we're not accepting
+        _closing = false;
+        connect(_timer, &QTimer::timeout, this, &TACDeviceSelection::refreshDevices);
+        _timer->start(2500);
+        return;
+    }
+
+    QDialog::accept();
+}
+
+void TACDeviceSelection::reject()
+{
+    // Set the closing flag to prevent any ongoing refresh
+    _closing = true;
+
+    // Stop the timer to prevent race conditions
+    _timer->stop();
+    disconnect(_timer, &QTimer::timeout, this, &TACDeviceSelection::refreshDevices);
+
+    QDialog::reject();
+}
+
+void TACDeviceSelection::onTableClicked(const QModelIndex& index)
+{
+    QTableWidgetItem* item = _ui->_tacDevices->item(index.row(), 0);
+    if (item)
+    {
+        _selectedPort = item->text().toLatin1();
+        setOkEnabled(true);
+    }
+    else
+    {
+        _selectedPort.clear();
+        setOkEnabled(false);
+    }
+}
+
+void TACDeviceSelection::onTableDoubleClicked(const QModelIndex& index)
+{
+    onTableClicked(index);
+    if (!_selectedPort.isEmpty())
+        accept();
+}
+
+void TACDeviceSelection::refreshDevices()
+{
+    // Don't update devices if the dialog is closing
+    if (_closing)
+        return;
+
+    // Remember selection so we can restore it after refresh.
+    QString previousPort;
+    QList<QTableWidgetItem*> sel = _ui->_tacDevices->selectedItems();
+    if (!sel.isEmpty())
+        previousPort = sel.first()->text();
+
+    _ui->_tacDevices->blockSignals(true);
+
+    FTDIDevice::updateAlpacaDevices();
+    PSOCDevice::updateAlpacaDevices();
+    PIC32CXDevice::updateAlpacaDevices();
+
+    AlpacaDevices devices;
+    _AlpacaDevice::getAlpacaDevices(devices);
+
+    _ui->_tacDevices->clearContents();
+    _ui->_tacDevices->setRowCount(static_cast<int>(devices.size()));
+
+    for (int i = 0; i < static_cast<int>(devices.size()); ++i)
+    {
+        const auto& dev = devices[i];
+
+        auto makeItem = [](const QString& text) {
+            auto* item = new QTableWidgetItem(text);
+            item->setFlags(item->flags() & ~Qt::ItemIsEditable);
+            return item;
+        };
+
+        QString port = QtAdapter::toQString(dev->portName());
+        _ui->_tacDevices->setItem(i, 0, makeItem(port));
+        _ui->_tacDevices->setItem(i, 1, makeItem(QtAdapter::toQString(dev->description())));
+        _ui->_tacDevices->setItem(i, 2, makeItem(QtAdapter::toQString(dev->serialNumber())));
+
+        if (port == previousPort)
+        {
+            _ui->_tacDevices->selectRow(i);
+            // On Linux, selectRow() does not trigger the clicked signal,
+            // so we must explicitly restore _selectedPort here.
+            _selectedPort = port.toLatin1();
+            setOkEnabled(true);
+        }
+    }
+
+    _ui->_tacDevices->blockSignals(false);
+
+    // Slow down after first refresh.
+    _timer->setInterval(2500);
+}
+
+void TACDeviceSelection::setOkEnabled(bool enabled)
+{
+    if (auto* btn = _ui->_buttonBox->button(QDialogButtonBox::Ok))
+        btn->setEnabled(enabled);
+}
diff --git a/source/app/TACDeviceSelection.h b/source/app/TACDeviceSelection.h
new file mode 100644
index 00000000..04b61bfd
--- /dev/null
+++ b/source/app/TACDeviceSelection.h
@@ -0,0 +1,76 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#pragma once
+
+#include <QDialog>
+#include <QByteArray>
+
+QT_BEGIN_NAMESPACE
+namespace Ui { class TACDeviceSelectionClass; } // nosemgrep
+QT_END_NAMESPACE
+
+class QTimer;
+
+// ---------------------------------------------------------------------------
+// TACDeviceSelection — modal device picker.
+//
+// Polls all device types (FTDI, PSoC, PIC32CX) every 2.5 s and populates
+// the table.  Double-clicking or clicking OK accepts the dialog.
+// ---------------------------------------------------------------------------
+class TACDeviceSelection : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit TACDeviceSelection(QWidget* parent = nullptr);
+    ~TACDeviceSelection() override;
+
+    QByteArray selectedPortName() const { return _selectedPort; }
+
+public slots:
+    void accept() override;
+    void reject() override;
+
+private slots:
+    void onTableClicked(const QModelIndex& index);
+    void onTableDoubleClicked(const QModelIndex& index);
+    void refreshDevices();
+
+private:
+    void setOkEnabled(bool enabled);
+
+    Ui::TACDeviceSelectionClass* _ui{nullptr};
+    QTimer*                      _timer{nullptr};
+    QByteArray                   _selectedPort;
+    bool                         _closing{false};  // Flag to prevent refresh during close
+};
diff --git a/source/app/TACDeviceSelection.ui b/source/app/TACDeviceSelection.ui
new file mode 100644
index 00000000..202ec473
--- /dev/null
+++ b/source/app/TACDeviceSelection.ui
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TACDeviceSelectionClass</class>
+ <widget class="QDialog" name="TACDeviceSelectionClass">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>592</width>
+    <height>355</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>TAC Device Selection</string>
+  </property>
+  <property name="sizeGripEnabled">
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QTableWidget" name="_tacDevices">
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::SingleSelection</enum>
+     </property>
+     <property name="selectionBehavior">
+      <enum>QAbstractItemView::SelectRows</enum>
+     </property>
+     <attribute name="horizontalHeaderStretchLastSection">
+      <bool>true</bool>
+     </attribute>
+     <attribute name="verticalHeaderVisible">
+      <bool>false</bool>
+     </attribute>
+     <column>
+      <property name="text">
+       <string>Port Name</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Description</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Serial Number</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="_buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>_buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>TACDeviceSelectionClass</receiver>
+   <slot>accept()</slot>
+  </connection>
+  <connection>
+   <sender>_buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>TACDeviceSelectionClass</receiver>
+   <slot>reject()</slot>
+  </connection>
+ </connections>
+</ui>
diff --git a/source/app/TACPinFrame.cpp b/source/app/TACPinFrame.cpp
new file mode 100644
index 00000000..f5d0aab2
--- /dev/null
+++ b/source/app/TACPinFrame.cpp
@@ -0,0 +1,618 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "TACPinFrame.h"
+
+#include <qt_string_convert.h>
+
+#include <qtac/AlpacaDevice.h>
+#include <qtac/CommandGroup.h>
+#include <qtac/PlatformID.h>
+#include <qtac/TACDriveThread.h>
+
+#include <QFormLayout>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QInputDialog>
+#include <QLabel>
+#include <QLineEdit>
+#include <QMap>
+#include <QPlainTextEdit>
+#include <QPushButton>
+#include <QScrollBar>
+#include <QSpinBox>
+#include <QCheckBox>
+#include <QTabWidget>
+#include <QVBoxLayout>
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+static QString groupBoxTitle(CommandGroups g)
+{
+    switch (g)
+    {
+    case eConnectionGroup: return "Connections";
+    case eButtonGroup:     return "Buttons";
+    case eSwitchGroup:     return "Switches";
+    default:               return "Other";
+    }
+}
+
+// ---------------------------------------------------------------------------
+// TACPinFrame
+// ---------------------------------------------------------------------------
+
+TACPinFrame::TACPinFrame(QWidget* parent)
+    : QWidget(parent)
+{
+    setLayout(new QVBoxLayout(this));
+    layout()->setContentsMargins(0, 0, 0, 0);
+    showNotice();
+}
+
+void TACPinFrame::setDevice(TACDeviceBridge* bridge)
+{
+    clearPins();
+    _bridge = bridge;
+
+    connect(_bridge, &TACDeviceBridge::logLine,
+            this,    &TACPinFrame::onLogLine,
+            Qt::UniqueConnection);
+    connect(_bridge, &TACDeviceBridge::pinStateChanged,
+            this,    &TACPinFrame::updatePinState,
+            Qt::UniqueConnection);
+
+    auto* dev = bridge->device().get();
+    dev->buildMapping();
+    Pins pins = dev->getPins();
+
+    buildPins(pins);
+}
+
+void TACPinFrame::clearDevice()
+{
+    _terminalLog = nullptr;
+    _bridge = nullptr;
+    clearPins();
+    showNotice();
+}
+
+void TACPinFrame::clearPins()
+{
+    _pinButtons.clear();
+    _pinInverted.clear();
+
+    QLayout* l = layout();
+    while (QLayoutItem* item = l->takeAt(0))
+    {
+        delete item->widget();
+        delete item;
+    }
+}
+
+// ---------------------------------------------------------------------------
+// Pre-connection notice
+// ---------------------------------------------------------------------------
+
+void TACPinFrame::showNotice()
+{
+    auto* tabs = new QTabWidget(this);
+    layout()->addWidget(tabs);
+
+    // --- General tab ---
+    auto* genWidget = new QWidget;
+    auto* genLayout = new QVBoxLayout(genWidget);
+    genLayout->setAlignment(Qt::AlignTop);
+
+    // Notice message
+    auto* noticeBox = new QGroupBox(genWidget);
+    auto* noticeLayout = new QVBoxLayout(noticeBox);
+    auto* noticeLabel = new QLabel(
+        "Open a device to begin. The UI will <span style='color:#ff4444;'><b>not</b></span> "
+        "be constructed until a device has been opened. TAC is now configuration driven."
+        "<br><br>"
+        "Your firmware must be at 15 or greater on a PSOC device. If your firmware is 8 or less, "
+        "TAC will just crash. Firmware 9-14 will result in a dialog asking you to update your firmware.",
+        noticeBox);
+    noticeLabel->setWordWrap(true);
+    noticeLabel->setTextFormat(Qt::RichText);
+    noticeLayout->addWidget(noticeLabel);
+    genLayout->addWidget(noticeBox);
+
+    // Empty placeholder group boxes
+    for (const QString& name : { "Connections", "Buttons", "Switches", "Quick Settings", "Variables" })
+    {
+        auto* box = new QGroupBox(name, genWidget);
+        (void)new QVBoxLayout(box);
+        genLayout->addWidget(box);
+    }
+
+    tabs->addTab(genWidget, "General");
+
+    // --- Device Info tab (placeholder — all dashes until connected) ---
+    auto* infoWidget = new QWidget;
+    auto* infoOuter  = new QVBoxLayout(infoWidget);
+    infoOuter->setAlignment(Qt::AlignTop);
+
+    auto* infoBox  = new QGroupBox("Alpaca Device Information", infoWidget);
+    auto* infoForm = new QFormLayout(infoBox);
+    infoForm->setLabelAlignment(Qt::AlignRight);
+
+    // Name row gets an extra Rename... button
+    static const char* kDash = "-";
+    auto addDash = [&](const QString& label) {
+        auto* val = new QLabel(kDash, infoBox);
+        val->setTextInteractionFlags(Qt::TextSelectableByMouse);
+        infoForm->addRow(label + ":", val);
+    };
+
+    addDash("Hardware Type");
+    addDash("HW Version");
+    addDash("Firmware Version");
+    addDash("Chipset");
+
+    // Name row with Rename button
+    {
+        auto* row    = new QWidget(infoBox);
+        auto* rowLay = new QHBoxLayout(row);
+        rowLay->setContentsMargins(0, 0, 0, 0);
+        auto* nameVal = new QLabel(kDash, row);
+        nameVal->setTextInteractionFlags(Qt::TextSelectableByMouse);
+        auto* renameBtn = new QPushButton("Rename...", row);
+        renameBtn->setEnabled(false);
+        rowLay->addWidget(nameVal);
+        rowLay->addWidget(renameBtn);
+        rowLay->addStretch();
+        infoForm->addRow("Name:", row);
+    }
+
+    addDash("UUID");
+    addDash("Serial Number");
+    addDash("Platform ID");
+    addDash("MAC Address");
+    addDash("Configuration File");
+    addDash("Configuration Date");
+    addDash("Configuration File Version");
+
+    infoOuter->addWidget(infoBox);
+    tabs->addTab(infoWidget, "Device Info");
+}
+
+// ---------------------------------------------------------------------------
+// Device Info tab
+// ---------------------------------------------------------------------------
+
+QWidget* TACPinFrame::buildDeviceInfoTab(QWidget* parent)
+{
+    auto* w      = new QWidget(parent);
+    auto* outer  = new QVBoxLayout(w);
+    outer->setAlignment(Qt::AlignTop);
+
+    auto* box    = new QGroupBox("Alpaca Device Information", w);
+    auto* form   = new QFormLayout(box);
+    form->setLabelAlignment(Qt::AlignRight);
+
+    auto addRow = [&](const QString& label, const QString& value) {
+        auto* val = new QLabel(value, box);
+        val->setTextInteractionFlags(Qt::TextSelectableByMouse);
+        form->addRow(label + ":", val);
+    };
+
+    qtac::TACDriveThread* dt = _bridge->driveThread();
+    if (dt)
+    {
+        addRow("Hardware Type",     QtAdapter::toQString(dt->debugBoardTypeString()));
+        addRow("HW Version",        QtAdapter::toQString(dt->hardwareVersionString()));
+        addRow("Firmware Version",  QtAdapter::toQString(dt->firmwareVersion()));
+        addRow("Chipset",           QString::number(dt->chipVersion()));
+
+        // Name row with Rename button
+        {
+            auto* row    = new QWidget(box);
+            auto* rowLay = new QHBoxLayout(row);
+            rowLay->setContentsMargins(0, 0, 0, 0);
+            auto* nameVal = new QLabel(QString(dt->name().constData()), row);
+            nameVal->setTextInteractionFlags(Qt::TextSelectableByMouse);
+            auto* renameBtn = new QPushButton("Rename...", row);
+            renameBtn->setEnabled(_bridge->supportsRename());
+            rowLay->addWidget(nameVal);
+            rowLay->addWidget(renameBtn);
+            rowLay->addStretch();
+            form->addRow("Name:", row);
+
+            if (_bridge->supportsRename())
+            {
+                connect(renameBtn, &QPushButton::clicked, this, [this, nameVal]() {
+                    bool ok = false;
+                    QString current = nameVal->text();
+                    QString newName = QInputDialog::getText(
+                        this, "Rename Device", "New name (alphanumeric, max 32 chars):",
+                        QLineEdit::Normal, current, &ok);
+                    if (ok && !newName.isEmpty() && newName != current)
+                    {
+                        _bridge->renameDevice(newName);
+                        nameVal->setText(newName);
+                    }
+                });
+            }
+        }
+
+        addRow("UUID",          QtAdapter::toQString(dt->uuid()));
+        addRow("Serial Number", QtAdapter::toQString(dt->serialNumber()));
+        addRow("Platform ID",   QString::number(static_cast<int>(dt->platformID())));
+        addRow("MAC Address",   QString(dt->macAddress().constData()));
+    }
+
+    // Config file path, date, and version from the platform registry + device.
+    auto* dev = _bridge->device().get();
+    PlatformIDList entries = PlatformContainer::getEntries();
+    for (const auto& entry : entries)
+    {
+        if (dt && entry && entry->_platformID == dt->platformID())
+        {
+            addRow("Configuration File", QtAdapter::toQString(entry->_path));
+            break;
+        }
+    }
+
+    {
+        QString date = QtAdapter::toQString(dev->configModificationDate());
+        addRow("Configuration Date",         date.isEmpty() ? "-" : date);
+        int ver = dev->configFileVersion();
+        addRow("Configuration File Version", ver > 0 ? QString::number(ver) : "-");
+    }
+
+    outer->addWidget(box);
+    return w;
+}
+
+// ---------------------------------------------------------------------------
+// Terminal tab
+// ---------------------------------------------------------------------------
+
+QWidget* TACPinFrame::buildTerminalTab(QWidget* parent)
+{
+    auto* w      = new QWidget(parent);
+    auto* layout = new QVBoxLayout(w);
+    layout->setContentsMargins(4, 4, 4, 4);
+
+    _terminalLog = new QPlainTextEdit(w);
+    _terminalLog->setReadOnly(true);
+    _terminalLog->setMaximumBlockCount(2000);
+    _terminalLog->setFont(QFont("Courier New", 8));
+    layout->addWidget(_terminalLog);
+
+    return w;
+}
+
+// ---------------------------------------------------------------------------
+// Quick Settings / Variables helpers
+// ---------------------------------------------------------------------------
+
+void TACPinFrame::appendQuickSettings(QVBoxLayout*                 tabLayout,
+                                       QWidget*                    parent,
+                                       const QString&              tabName,
+                                       const qtac::ButtonEntries&  buttons,
+                                       const qtac::VariableEntries& variables)
+{
+    // --- Quick Settings group box ---
+    // Collect buttons for this tab with command_group == 4 (eQuickSettingsGroup)
+    std::vector<const qtac::ButtonEntry*> tabButtons;
+    for (const auto& btn : buttons)
+    {
+        QString btnTab = QtAdapter::toQString(btn._tab);
+        if (btnTab.isEmpty()) btnTab = "General";
+        if (btnTab == tabName && btn._commandGroup == 4)
+            tabButtons.push_back(&btn);
+    }
+
+    if (!tabButtons.empty())
+    {
+        auto* box  = new QGroupBox("Quick Settings", parent);
+        auto* grid = new QGridLayout(box);
+
+        int autoRow = 0, autoCol = 0;
+        for (const auto* btnEntry : tabButtons)
+        {
+            int row = (btnEntry->_cellY >= 0) ? btnEntry->_cellY : autoRow;
+            int col = (btnEntry->_cellX >= 0) ? btnEntry->_cellX : autoCol;
+
+            QString label = QtAdapter::toQString(btnEntry->_name);
+            auto* btn = new QPushButton(label, box);
+            btn->setCheckable(false);  // momentary, not toggle
+            btn->setToolTip(QtAdapter::toQString(btnEntry->_tooltip));
+
+            // Store the script command name in the object name so the slot
+            // can retrieve it.
+            btn->setObjectName(QtAdapter::toQString(btnEntry->_command));
+
+            connect(btn, &QPushButton::clicked,
+                    this, &TACPinFrame::onQuickButtonClicked);
+
+            grid->addWidget(btn, row, col);
+
+            ++autoCol;
+            if (autoCol >= 4) { autoCol = 0; ++autoRow; }
+        }
+        tabLayout->addWidget(box);
+    }
+
+    // --- Variables group box ---
+    // Variables have no tab assignment — show them only on "General".
+    if (tabName == "General" && !variables.isEmpty())
+    {
+        auto* box  = new QGroupBox("Variables", parent);
+        auto* form = new QFormLayout(box);
+        form->setLabelAlignment(Qt::AlignRight);
+
+        for (const auto& kv : variables)
+        {
+            const qtac::VariableEntry& var = kv.second;
+            QString label = QtAdapter::toQString(var._label);
+            if (label.isEmpty()) label = QtAdapter::toQString(var._name);
+            QString varName = QtAdapter::toQString(var._name);
+
+            if (var._type == qtac::VariableType::Boolean)
+            {
+                auto* cb = new QCheckBox(box);
+                cb->setChecked(var._defaultValue.toBool());
+                cb->setToolTip(QtAdapter::toQString(var._tooltip));
+                cb->setObjectName(varName);
+                connect(cb, &QCheckBox::toggled, this, [this, varName](bool checked) {
+                    if (_bridge) _bridge->setVariableValue(varName, checked);
+                });
+                form->addRow(label + ":", cb);
+            }
+            else
+            {
+                // Integer or Float — use a QSpinBox (floats rounded to int for now)
+                auto* sb = new QSpinBox(box);
+                sb->setRange(0, 30000);
+                sb->setValue(static_cast<int>(var._defaultValue.toUInt()));
+                sb->setToolTip(QtAdapter::toQString(var._tooltip));
+                sb->setObjectName(varName);
+                connect(sb, QOverload<int>::of(&QSpinBox::valueChanged),
+                        this, [this, varName](int val) {
+                    if (_bridge) _bridge->setVariableValue(varName, val);
+                });
+                form->addRow(label + ":", sb);
+            }
+        }
+        tabLayout->addWidget(box);
+    }
+}
+
+// ---------------------------------------------------------------------------
+// Build pin grid
+// ---------------------------------------------------------------------------
+
+void TACPinFrame::buildPins(const Pins& pins)
+{
+    // Collect buttons and variables from the device's platform config.
+    const qtac::ButtonEntries&   allButtons   = _bridge->device()->getButtons();
+    const qtac::VariableEntries& allVariables = _bridge->device()->getVariables();
+
+    if (pins.isEmpty() && allButtons.empty() && allVariables.isEmpty())
+    {
+        layout()->addWidget(new QLabel("No active pins for this device.", this));
+        return;
+    }
+
+    // Collect unique tab names in display order.
+    // For FTDI devices, the tcnf "tabs" array defines the canonical tab list
+    // (ordinal-sorted, visible-only, excluding the fixed General/Device Info/Terminal).
+    // For other device types, fall back to organic discovery from pins and buttons.
+    // "General" is always first; "Device Info" is always second; "Terminal" is always last.
+    QList<QString> dynamicTabs;
+    qtac::StringList deviceTabs = _bridge->device()->getTabs();
+    if (!deviceTabs.isEmpty())
+    {
+        for (const auto& t : deviceTabs)
+            dynamicTabs.append(QtAdapter::toQString(t));
+    }
+    else
+    {
+        for (const auto& pin : pins)
+        {
+            QString tab = QtAdapter::toQString(pin._tabName);
+            if (tab.isEmpty() || tab.startsWith('<')) tab = "General";
+            if (tab != "General" && tab != "Device Info" && tab != "Terminal"
+                && !dynamicTabs.contains(tab))
+                dynamicTabs.append(tab);
+        }
+        for (const auto& btn : allButtons)
+        {
+            QString tab = QtAdapter::toQString(btn._tab);
+            if (tab.isEmpty() || tab.startsWith('<')) tab = "General";
+            if (tab != "General" && tab != "Device Info" && tab != "Terminal"
+                && !dynamicTabs.contains(tab))
+                dynamicTabs.append(tab);
+        }
+        std::sort(dynamicTabs.begin(), dynamicTabs.end());
+    }
+
+    QList<QString> tabOrder;
+    tabOrder.append("General");
+    tabOrder.append("Device Info");
+    tabOrder += dynamicTabs;
+    tabOrder.append("Terminal");
+
+    auto* tabs = new QTabWidget(this);
+    layout()->addWidget(tabs);
+
+    static const CommandGroups kGroupOrder[] = {
+        eConnectionGroup, eButtonGroup, eSwitchGroup
+    };
+
+    for (const QString& tabName : tabOrder)
+    {
+        if (tabName == "Device Info")
+        {
+            tabs->addTab(buildDeviceInfoTab(tabs), tabName);
+            continue;
+        }
+
+        if (tabName == "Terminal")
+        {
+            tabs->addTab(buildTerminalTab(tabs), tabName);
+            continue;
+        }
+
+        auto* tabWidget = new QWidget;
+        auto* tabLayout = new QVBoxLayout(tabWidget);
+        tabLayout->setAlignment(Qt::AlignTop);
+
+        // Group pins by command group within this tab.
+        QMap<CommandGroups, QList<PinEntry>> grouped;
+        for (const auto& pin : pins)
+        {
+            QString t = QtAdapter::toQString(pin._tabName);
+            if (t.isEmpty() || t.startsWith('<')) t = "General";
+            if (t == tabName)
+                grouped[pin._commandGroup].append(pin);
+        }
+
+        for (CommandGroups grp : kGroupOrder)
+        {
+            if (!grouped.contains(grp)) continue;
+
+            const auto& groupPins = grouped[grp];
+            auto* box  = new QGroupBox(groupBoxTitle(grp), tabWidget);
+            auto* grid = new QGridLayout(box);
+
+            for (int i = 0; i < groupPins.size(); ++i)
+            {
+                const PinEntry& pe = groupPins[i];
+
+                int row = (pe._cellLocation.y() >= 0) ? pe._cellLocation.y() : i / 4;
+                int col = (pe._cellLocation.x() >= 0) ? pe._cellLocation.x() : i % 4;
+
+                QString label = QtAdapter::toQString(pe._pinLabel);
+                if (label.isEmpty())
+                    label = QtAdapter::toQString(pe._pinCommand);
+                if (label.isEmpty())
+                    label = QString("Pin %1").arg(pe._pin);
+
+                // Logical display state accounts for inverted pins:
+                // inverted pin with initial_value:false is logically "on" (e.g. battery connected).
+                bool displayState = pe._inverted ? !pe._initialValue : pe._initialValue;
+
+                auto* btn = new QPushButton(label, box);
+                btn->setCheckable(true);
+                btn->setChecked(displayState);
+                btn->setEnabled(pe._enabled);
+                btn->setToolTip(QtAdapter::toQString(pe._pinTooltip));
+
+                // Store the hash so the slot can look it up.
+                btn->setObjectName(QString::number(static_cast<quint64>(pe._hash)));
+
+                connect(btn, &QPushButton::toggled,
+                        this, &TACPinFrame::onPinButtonToggled);
+
+                grid->addWidget(btn, row, col);
+                _pinButtons.insert(static_cast<quint64>(pe._hash), btn);
+                _pinInverted.insert(static_cast<quint64>(pe._hash), pe._inverted);
+
+                if (displayState)
+                    btn->setStyleSheet("QPushButton { background-color: #4CAF50; color: white; }");
+            }
+
+            tabLayout->addWidget(box);
+        }
+
+        // Append Quick Settings buttons and Variables for this tab
+        appendQuickSettings(tabLayout, tabWidget, tabName, allButtons, allVariables);
+
+        tabs->addTab(tabWidget, tabName);
+    }
+}
+
+// ---------------------------------------------------------------------------
+
+void TACPinFrame::onPinButtonToggled(bool checked)
+{
+    if (!_bridge) return;
+
+    auto* btn = qobject_cast<QPushButton*>(sender());
+    if (!btn) return;
+
+    quint64 hash = btn->objectName().toULongLong();
+
+    btn->setStyleSheet(checked
+        ? "QPushButton { background-color: #4CAF50; color: white; }"
+        : "");
+
+    bool inverted = _pinInverted.value(hash, false);
+    bool hwState  = inverted ? !checked : checked;
+    _bridge->device()->setPinState(static_cast<PinID>(hash), hwState);
+}
+
+void TACPinFrame::onQuickButtonClicked()
+{
+    if (!_bridge) return;
+
+    auto* btn = qobject_cast<QPushButton*>(sender());
+    if (!btn) return;
+
+    QByteArray cmd = btn->objectName().toLatin1();
+    _bridge->quickCommand(cmd);
+}
+
+void TACPinFrame::onLogLine(const QByteArray& line)
+{
+    if (!_terminalLog) return;
+    if (line.trimmed().isEmpty()) return;
+
+    _terminalLog->appendPlainText(QString(line));
+    _terminalLog->verticalScrollBar()->setValue(
+        _terminalLog->verticalScrollBar()->maximum());
+}
+
+void TACPinFrame::updatePinState(quint64 pin, bool state)
+{
+    auto it = _pinButtons.find(pin);
+    if (it == _pinButtons.end()) return;
+
+    bool inverted    = _pinInverted.value(pin, false);
+    bool displayState = inverted ? !state : state;
+
+    QPushButton* btn = it.value();
+    btn->blockSignals(true);
+    btn->setChecked(displayState);
+    btn->setStyleSheet(displayState
+        ? "QPushButton { background-color: #4CAF50; color: white; }"
+        : "");
+    btn->blockSignals(false);
+}
diff --git a/source/app/TACPinFrame.h b/source/app/TACPinFrame.h
new file mode 100644
index 00000000..49883dd2
--- /dev/null
+++ b/source/app/TACPinFrame.h
@@ -0,0 +1,104 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#pragma once
+
+#include <TACDeviceBridge.h>
+
+#include <qtac/PinEntry.h>
+#include <qtac/CommandGroup.h>
+#include <qtac/AlpacaScript.h>
+
+#include <QWidget>
+#include <QMap>
+#include <QPushButton>
+#include <QLabel>
+#include <QPlainTextEdit>
+#include <QSpinBox>
+#include <QCheckBox>
+#include <QVBoxLayout>
+
+// ---------------------------------------------------------------------------
+// TACPinFrame — pin button panel.
+//
+// Reads the active Pins from the device's platform configuration and builds
+// a grid of toggle buttons (one per pin), grouped by command group and tab.
+// Pin-state updates from TACDeviceBridge are reflected by colouring the
+// button.
+//
+// This replaces ui-common/TACFrame and ui-common/PinLED for the parallel GUI.
+// ---------------------------------------------------------------------------
+class TACPinFrame : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit TACPinFrame(QWidget* parent = nullptr);
+    ~TACPinFrame() override = default;
+
+    void setDevice(TACDeviceBridge* bridge);
+    void clearDevice();
+
+    // Called by TACWindow when pinStateChanged arrives.
+    void updatePinState(quint64 pin, bool state);
+
+private slots:
+    void onPinButtonToggled(bool checked);
+    void onQuickButtonClicked();
+    void onLogLine(const QByteArray& line);
+
+private:
+    void buildPins(const Pins& pins);
+    void clearPins();
+    void showNotice();
+
+    QWidget* buildDeviceInfoTab(QWidget* parent);
+    QWidget* buildTerminalTab(QWidget* parent);
+
+    // Appends Quick Settings and Variables group boxes to tabLayout if the
+    // device has buttons/variables for this tab.
+    void appendQuickSettings(QVBoxLayout*                        tabLayout,
+                             QWidget*                            parent,
+                             const QString&                      tabName,
+                             const qtac::ButtonEntries&          buttons,
+                             const qtac::VariableEntries&        variables);
+
+    TACDeviceBridge*             _bridge{nullptr};
+
+    // pin hash → toggle button
+    QMap<quint64, QPushButton*>  _pinButtons;
+    // pin hash → inverted flag (logical state is opposite of hardware state)
+    QMap<quint64, bool>          _pinInverted;
+
+    // Terminal tab log widget (nullptr when no device connected)
+    QPlainTextEdit*              _terminalLog{nullptr};
+};
diff --git a/source/app/TACPreferences.cpp b/source/app/TACPreferences.cpp
new file mode 100644
index 00000000..412fff47
--- /dev/null
+++ b/source/app/TACPreferences.cpp
@@ -0,0 +1,113 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "TACPreferences.h"
+
+#include <QSettings>
+
+// QSettings key names — all stored under group "Preferences"
+static constexpr char kGroup[]            = "Preferences";
+static constexpr char kOpenLastDevice[]   = "openLastDevice";
+static constexpr char kLastDevice[]       = "lastDevice";
+static constexpr char kAutoShutdown[]     = "autoShutdown";
+static constexpr char kAutoShutdownHours[]= "autoShutdownHours";
+
+// Defaults
+static constexpr bool   kDefaultOpenLastDevice    = false;
+static constexpr double kDefaultAutoShutdownHours = 24.0;
+static constexpr bool   kDefaultAutoShutdown      = false;
+
+bool TACPreferences::openLastDevice() const
+{
+    QSettings s;
+    s.beginGroup(kGroup);
+    return s.value(kOpenLastDevice, kDefaultOpenLastDevice).toBool();
+}
+
+void TACPreferences::setOpenLastDevice(bool value)
+{
+    QSettings s;
+    s.beginGroup(kGroup);
+    s.setValue(kOpenLastDevice, value);
+}
+
+QString TACPreferences::lastDevice() const
+{
+    QSettings s;
+    s.beginGroup(kGroup);
+    return s.value(kLastDevice, QString()).toString();
+}
+
+void TACPreferences::setLastDevice(const QString& portName)
+{
+    QSettings s;
+    s.beginGroup(kGroup);
+    s.setValue(kLastDevice, portName);
+}
+
+bool TACPreferences::autoShutdown() const
+{
+    QSettings s;
+    s.beginGroup(kGroup);
+    return s.value(kAutoShutdown, kDefaultAutoShutdown).toBool();
+}
+
+void TACPreferences::setAutoShutdown(bool value)
+{
+    QSettings s;
+    s.beginGroup(kGroup);
+    s.setValue(kAutoShutdown, value);
+}
+
+double TACPreferences::autoShutdownHours() const
+{
+    QSettings s;
+    s.beginGroup(kGroup);
+    return s.value(kAutoShutdownHours, kDefaultAutoShutdownHours).toDouble();
+}
+
+void TACPreferences::setAutoShutdownHours(double hours)
+{
+    QSettings s;
+    s.beginGroup(kGroup);
+    s.setValue(kAutoShutdownHours, hours);
+}
+
+void TACPreferences::resetToDefaults()
+{
+    QSettings s;
+    s.beginGroup(kGroup);
+    s.setValue(kOpenLastDevice,    kDefaultOpenLastDevice);
+    s.setValue(kLastDevice,        QString());
+    s.setValue(kAutoShutdown,      kDefaultAutoShutdown);
+    s.setValue(kAutoShutdownHours, kDefaultAutoShutdownHours);
+}
diff --git a/source/app/TACPreferences.h b/source/app/TACPreferences.h
new file mode 100644
index 00000000..53366c7c
--- /dev/null
+++ b/source/app/TACPreferences.h
@@ -0,0 +1,58 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#pragma once
+
+#include <QString>
+
+// ---------------------------------------------------------------------------
+// TACPreferences — thin QSettings wrapper for per-user application settings.
+// Uses the default QSettings constructor which picks up org/app name from
+// TACApplication (QApplication::setOrganizationName / setApplicationName).
+// ---------------------------------------------------------------------------
+class TACPreferences
+{
+public:
+    bool    openLastDevice() const;
+    void    setOpenLastDevice(bool value);
+
+    QString lastDevice() const;
+    void    setLastDevice(const QString& portName);
+
+    bool    autoShutdown() const;
+    void    setAutoShutdown(bool value);
+
+    double  autoShutdownHours() const;
+    void    setAutoShutdownHours(double hours);
+
+    void    resetToDefaults();
+};
diff --git a/source/app/TACWindow.cpp b/source/app/TACWindow.cpp
new file mode 100644
index 00000000..28ad37a6
--- /dev/null
+++ b/source/app/TACWindow.cpp
@@ -0,0 +1,467 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "TACWindow.h"
+#include "ui_TACWindow.h"
+
+#include "TACApplication.h"
+#include "TACDeviceSelection.h"
+#include "TACPinFrame.h"
+#include "PreferencesDialog.h"
+
+#include <qt_string_convert.h>
+
+#include <qtac/FTDIDevice.h>
+#include <qtac/PSOCDevice.h>
+#include <qtac/PIC32CXDevice.h>
+#include <qtac/AlpacaDevice.h>
+#include <qtac/TACLiteDriveThread.h>
+#include <qtac/TACPSOCDriveThread.h>
+#include <qtac/TACPIC32CXDriveThread.h>
+
+#include <QDateTime>
+#include <QDir>
+#include <QMessageBox>
+#include <QStandardPaths>
+#include <QVBoxLayout>
+#include <QDesktopServices>
+#include <QUrl>
+
+#include <cstdio>
+#include <thread>
+extern FILE* gCrashLog;
+static inline void twCrashLog(const char* msg)
+{
+    if (gCrashLog) { fputs(msg, gCrashLog); fputc('\n', gCrashLog); fflush(gCrashLog); }
+}
+
+static const QString kWindowTitle = QStringLiteral("Test Automation Controller%1");
+
+// ---------------------------------------------------------------------------
+// File logging helpers
+// ---------------------------------------------------------------------------
+
+void TACWindow::openLogFile()
+{
+    // Mirror the legacy TAC.exe log path:
+    //   %USERPROFILE%\Documents\QTAC\qtac-app\logs\qtac_MMDD_HHmmss.log
+    QString docs = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
+#ifdef Q_OS_WIN
+    // Avoid OneDrive redirection — same workaround as legacy AppCore.cpp.
+    docs = QDir::homePath() + "/Documents";
+#endif
+    QString logDir = QDir::cleanPath(docs + "/QTAC/qtac-app/logs");
+    QDir().mkpath(logDir);
+
+    QString ts = QDateTime::currentDateTime().toString("MMdd_HHmmss");
+    QString path = logDir + "/qtac_" + ts + ".log";
+
+    _logFile.setFileName(path);
+    if (_logFile.open(QIODevice::WriteOnly | QIODevice::Text))
+    {
+        _logStream.setDevice(&_logFile);
+        QString header = QString("[%1]: qtac-app log started\n")
+            .arg(QDateTime::currentDateTime().toString("hh:mm:ss:zzz"));
+        _logStream << header;
+        _logStream.flush();
+    }
+}
+
+void TACWindow::closeLogFile()
+{
+    if (_logFile.isOpen())
+    {
+        _logStream.flush();
+        _logStream.setDevice(nullptr);
+        _logFile.close();
+    }
+}
+
+void TACWindow::writeLogLine(const QByteArray& line)
+{
+    if (!_logFile.isOpen()) return;
+    QString ts = QDateTime::currentDateTime().toString("hh:mm:ss:zzz");
+    _logStream << "[" << ts << "]: " << QString(line) << "\n";
+    _logStream.flush();
+}
+
+TACWindow::TACWindow(QWidget* parent)
+    : QMainWindow(parent)
+    , _ui(new Ui::TACWindowClass)
+{
+    _ui->setupUi(this);
+
+    _pinFrame = new TACPinFrame(this);
+
+    // Insert TACPinFrame into the scroll area's inner layout.
+    if (auto* l = qobject_cast<QVBoxLayout*>(_ui->_pinScrollContents->layout()))
+        l->addWidget(_pinFrame);
+
+    connect(_ui->_connectButton,    &QPushButton::clicked, this, &TACWindow::onConnectClicked);
+    connect(_ui->_disconnectButton, &QPushButton::clicked, this, &TACWindow::onDisconnectClicked);
+    connect(_ui->_actionConnect,    &QAction::triggered,   this, &TACWindow::onConnectClicked);
+    connect(_ui->_actionDisconnect, &QAction::triggered,   this, &TACWindow::onDisconnectClicked);
+    connect(_ui->_actionQuit,       &QAction::triggered,   this, []{ TACApplication::instance()->quit(); });
+    connect(_ui->_actionContents,   &QAction::triggered,   this, &TACWindow::onContentsTriggered);
+    connect(_ui->_actionAbout,      &QAction::triggered,   this, &TACWindow::onAboutTriggered);
+    connect(_ui->_actionPreferences,&QAction::triggered,   this, &TACWindow::onPreferencesTriggered);
+    connect(&_autoShutdownTimer,    &QTimer::timeout,      this, &TACWindow::onAutoShutdownTimeout);
+
+    setupAutoShutdownTimer();
+
+    setWindowTitle(kWindowTitle.arg(""));
+}
+
+TACWindow::~TACWindow()
+{
+    shutDown();
+    TACApplication::disconnectTACWindow(this);
+    delete _ui;
+}
+
+// ---------------------------------------------------------------------------
+// openPort
+// ---------------------------------------------------------------------------
+
+void TACWindow::openPort(const QByteArray& portName)
+{
+    // Ensure device list is current for all device types.
+    FTDIDevice::updateAlpacaDevices();
+    PSOCDevice::updateAlpacaDevices();
+    PIC32CXDevice::updateAlpacaDevices();
+
+    AlpacaDevice dev = _AlpacaDevice::findAlpacaDevice(
+        qtac::ByteArray(portName.constData(), portName.size()));
+
+    if (!dev)
+    {
+        _ui->_statusBar->showMessage("Device not found: " + QString(portName));
+        return;
+    }
+
+    // Create and inject the concrete drive thread based on board type.
+    switch (dev->debugBoardType())
+    {
+    case ePSOC:
+        _driveThread = new qtac::TACPSOCDriveThread(dev->hash());
+        break;
+    case ePIC32CXAuto:
+        _driveThread = new qtac::TACPIC32CXDriveThread(dev->hash());
+        break;
+    case eFTDI:
+    default:
+        _driveThread = new qtac::TACLiteDriveThread(dev->hash());
+        break;
+    }
+    dev->setDriveThread(_driveThread);
+
+    // Route drive-thread log lines to crash log only (called on drive thread — crash log is file-safe).
+    _driveThread->onLogLine.connect([](const qtac::ByteArray& line) {
+        twCrashLog(line.constData());
+    });
+
+    twCrashLog(("openPort: " + portName.toStdString()).c_str());
+    twCrashLog(("  usbDescriptor: \"" + dev->usbDescriptor().toStdString() + "\"").c_str());
+    twCrashLog(("  platformID: " + std::to_string(static_cast<int>(dev->platformID()))).c_str());
+    twCrashLog(("  description: " + dev->description().toStdString()).c_str());
+
+    // Create the bridge and connect its Qt signals BEFORE calling open().
+    // The drive thread's run() fires onDeviceConnected (via setupConnected) immediately
+    // after startRunning() — which can happen before open() even returns. If the bridge
+    // is created after open(), those signals fire into the void and "Opening..." persists.
+    _bridge = new TACDeviceBridge(dev, _driveThread, this);
+
+    connect(_bridge, &TACDeviceBridge::deviceConnected,
+            this,    &TACWindow::onDeviceConnected);
+    connect(_bridge, &TACDeviceBridge::deviceDisconnected,
+            this,    &TACWindow::onDeviceDisconnected);
+    connect(_bridge, &TACDeviceBridge::firmwareVersionUpdated,
+            this,    &TACWindow::onFirmwareVersionUpdated);
+    connect(_bridge, &TACDeviceBridge::hardwareTypeUpdated,
+            this,    &TACWindow::onHardwareTypeUpdated);
+    connect(_bridge, &TACDeviceBridge::nameUpdated,
+            this,    &TACWindow::onNameUpdated);
+    connect(_bridge, &TACDeviceBridge::pinStateChanged,
+            this,    &TACWindow::onPinStateChanged);
+    connect(_bridge, &TACDeviceBridge::errorEvent,
+            this,    &TACWindow::onError);
+    connect(_bridge, &TACDeviceBridge::logLine,
+            this,    &TACWindow::onLogLine);
+
+    if (!dev->open())
+    {
+        twCrashLog(("open() failed: " + dev->getLastError().toStdString()).c_str());
+        _ui->_statusBar->showMessage("Failed to open: " + QString(portName)
+            + " — " + QString::fromStdString(dev->getLastError().toStdString()));
+
+        // The drive thread was started but failed. Give it a moment to exit cleanly.
+        bool threadExited = false;
+        if (_driveThread && _driveThread->isRunning())
+        {
+            // Wait up to 500ms for the thread to exit
+            for (int i = 0; i < 50 && _driveThread->isRunning(); ++i)
+            {
+                std::this_thread::sleep_for(std::chrono::milliseconds(10));
+            }
+
+            if (_driveThread->isRunning())
+            {
+                _driveThread->detachThread();
+                // Don't delete a detached thread - just leak it
+                dev->setDriveThread(nullptr);
+                _driveThread = nullptr;
+                threadExited = false;
+            }
+            else
+            {
+                threadExited = true;
+            }
+        }
+        else
+        {
+            threadExited = true;
+        }
+
+        if (threadExited)
+        {
+            dev->setDriveThread(nullptr);  // clear dangling pointer before deleting
+            if (_driveThread)
+            {
+                delete _driveThread;
+                _driveThread = nullptr;
+            }
+        }
+
+        delete _bridge;
+        _bridge = nullptr;
+        return;
+    }
+
+    // Remember this port for "open last device" feature.
+    _prefs.setLastDevice(QString(portName));
+
+    openLogFile();
+
+    setWindowTitle(kWindowTitle.arg(" — " + QString(portName)));
+    _ui->_deviceStatusLabel->setText("Opening…");
+    _ui->_connectButton->setEnabled(false);
+    _ui->_disconnectButton->setEnabled(true);
+}
+
+QByteArray TACWindow::portName() const
+{
+    if (_bridge)
+        return QtAdapter::toQByteArray(_bridge->device()->portName());
+    return {};
+}
+
+// ---------------------------------------------------------------------------
+// shutDown
+// ---------------------------------------------------------------------------
+
+void TACWindow::shutDown()
+{
+    if (!_bridge)
+        return;
+
+    _pinFrame->clearDevice();
+
+    // Disconnect all bridge signals now so the drive thread cannot post new
+    // Qt callbacks after this point.
+    _bridge->disconnectSignals();
+
+    closeLogFile();
+
+    // Update UI immediately — do not wait for the drive thread to exit.
+    _ui->_deviceStatusLabel->setText("Disconnected");
+    _ui->_connectButton->setEnabled(true);
+    _ui->_disconnectButton->setEnabled(false);
+    setWindowTitle(kWindowTitle.arg(""));
+
+    TACDeviceBridge*      bridge      = _bridge;
+    qtac::TACDriveThread* driveThread = _driveThread;
+    _bridge      = nullptr;
+    _driveThread = nullptr;
+
+    // Signal the drive thread to stop (non-blocking, returns immediately).
+    // The thread will exit within one waitForReadyRead timeout (~10 ms).
+    if (driveThread)
+        driveThread->stopRunning();
+
+    // Close the device synchronously on the UI thread.  This resets the
+    // device's internal drive-thread pointers so it is safe to reconnect
+    // immediately after shutDown() returns.  Because stopRunning() was
+    // called above, the shutDown() calls inside close() are no-ops
+    // (stopRunning() returns false → no join), so this is instant.
+    bridge->device()->close();
+
+    // Orphan the bridge (remove from TACWindow parent) before scheduling
+    // deletion so Qt's parent-child cleanup does not double-delete it.
+    // deleteLater() lets any already-queued Qt events that reference the
+    // bridge be processed before the bridge is destroyed.
+    bridge->setParent(nullptr);
+    bridge->deleteLater();
+
+    // Join the drive thread on a background thread so the UI stays
+    // responsive while the serial port winds down (~10 ms in practice).
+    // Join *before* delete so derived-class destructors (which free the
+    // serial port and other resources) only run after the thread has exited.
+    std::thread([driveThread]() {
+        driveThread->joinThread();   // wait for run() to return
+        delete driveThread;          // safe: thread is done, no more resource access
+    }).detach();
+}
+
+// ---------------------------------------------------------------------------
+// Slots
+// ---------------------------------------------------------------------------
+
+void TACWindow::onConnectClicked()
+{
+    TACDeviceSelection dlg(this);
+    int result = dlg.exec();
+    if (result != QDialog::Accepted)
+        return;
+
+    QByteArray port = dlg.selectedPortName();
+    if (port.isEmpty())
+    {
+        return;
+    }
+
+    if (TACApplication::isPortInUse(port))
+    {
+        QMessageBox::critical(this, "Port In Use",
+            "Port " + QString(port) + " is already open in another window.");
+        return;
+    }
+
+    if (inUse())
+        TACApplication::createTACWindow()->openPort(port);
+    else
+        openPort(port);
+}
+
+void TACWindow::onDisconnectClicked()
+{
+    shutDown();
+}
+
+void TACWindow::onDeviceConnected()
+{
+    _ui->_deviceStatusLabel->setText("Connected");
+    _ui->_statusBar->showMessage("Device connected.");
+    // Rebuild pin panel now that device is fully initialised.
+    _pinFrame->setDevice(_bridge);
+    _autoShutdownDeadline.restart();
+}
+
+void TACWindow::onDeviceDisconnected()
+{
+    _ui->_deviceStatusLabel->setText("Disconnected");
+    _ui->_statusBar->showMessage("Device disconnected.");
+}
+
+void TACWindow::onFirmwareVersionUpdated(const QString& version)
+{
+    _ui->_statusBar->showMessage("FW: " + version);
+}
+
+void TACWindow::onHardwareTypeUpdated(const QString& hwType)
+{
+    _ui->_statusBar->showMessage("HW: " + hwType);
+}
+
+void TACWindow::onNameUpdated(const QString& name)
+{
+    setWindowTitle(kWindowTitle.arg(" — " + name));
+}
+
+void TACWindow::onPinStateChanged(quint64 pin, bool state)
+{
+    _pinFrame->updatePinState(pin, state);
+    _autoShutdownDeadline.restart();
+}
+
+void TACWindow::onError(const QByteArray& message)
+{
+    _ui->_statusBar->showMessage("Error: " + QString(message));
+}
+
+void TACWindow::onLogLine(const QByteArray& line)
+{
+    writeLogLine(line);
+}
+
+void TACWindow::onContentsTriggered()
+{
+    QDesktopServices::openUrl(QUrl("https://confluence.qualcomm.com/confluence/display/QTAC"));
+}
+
+void TACWindow::onAboutTriggered()
+{
+    QMessageBox::about(this,
+        "About Test Automation Controller",
+        "<b>Test Automation Controller</b><br>"
+        "Qt-free refactor build<br><br>"
+        "Copyright &copy; Qualcomm Technologies, Inc. and/or its subsidiaries.");
+}
+
+void TACWindow::onPreferencesTriggered()
+{
+    PreferencesDialog dlg(&_prefs, this);
+    if (dlg.exec() == QDialog::Accepted)
+        setupAutoShutdownTimer();
+}
+
+void TACWindow::setupAutoShutdownTimer()
+{
+    if (_prefs.autoShutdown())
+    {
+        _autoShutdownTimer.start(60000);   // check every 60s
+        _autoShutdownDeadline.restart();
+    }
+    else
+    {
+        _autoShutdownTimer.stop();
+    }
+}
+
+void TACWindow::onAutoShutdownTimeout()
+{
+    qint64 limitMs = static_cast<qint64>(_prefs.autoShutdownHours() * 3600000.0);
+    if (_autoShutdownDeadline.elapsed() > limitMs)
+    {
+        shutDown();
+        deleteLater();
+    }
+}
diff --git a/source/app/TACWindow.h b/source/app/TACWindow.h
new file mode 100644
index 00000000..bd599536
--- /dev/null
+++ b/source/app/TACWindow.h
@@ -0,0 +1,107 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#pragma once
+
+#include "TACPreferences.h"
+
+#include <TACDeviceBridge.h>
+
+#include <QByteArray>
+#include <QElapsedTimer>
+#include <QFile>
+#include <QMainWindow>
+#include <QTextStream>
+#include <QTimer>
+
+QT_BEGIN_NAMESPACE
+namespace Ui { class TACWindowClass; } // nosemgrep
+QT_END_NAMESPACE
+
+namespace qtac { class TACDriveThread; }
+class TACPinFrame;
+
+// ---------------------------------------------------------------------------
+// TACWindow — main window.
+//
+// Uses TACDeviceBridge (wraps qtac-core _AlpacaDevice + TACLiteDriveThread)
+// rather than the Qt-based _AlpacaDevice from QCommonConsole.
+// ---------------------------------------------------------------------------
+class TACWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    explicit TACWindow(QWidget* parent = nullptr);
+    ~TACWindow() override;
+
+    void openPort(const QByteArray& portName);
+    QByteArray portName() const;
+    bool inUse() const { return _bridge != nullptr; }
+    void shutDown();
+
+private slots:
+    void onConnectClicked();
+    void onDisconnectClicked();
+
+    void onDeviceConnected();
+    void onDeviceDisconnected();
+    void onFirmwareVersionUpdated(const QString& version);
+    void onHardwareTypeUpdated(const QString& hwType);
+    void onNameUpdated(const QString& name);
+    void onPinStateChanged(quint64 pin, bool state);
+    void onError(const QByteArray& message);
+    void onLogLine(const QByteArray& line);
+
+    void onContentsTriggered();
+    void onAboutTriggered();
+    void onPreferencesTriggered();
+    void onAutoShutdownTimeout();
+
+private:
+    void setupAutoShutdownTimer();
+    void openLogFile();
+    void closeLogFile();
+    void writeLogLine(const QByteArray& line);
+
+    Ui::TACWindowClass*          _ui{nullptr};
+    TACPinFrame*                 _pinFrame{nullptr};
+    TACDeviceBridge*             _bridge{nullptr};
+    qtac::TACDriveThread*        _driveThread{nullptr};
+
+    TACPreferences               _prefs;
+    QTimer                       _autoShutdownTimer;
+    QElapsedTimer                _autoShutdownDeadline;
+
+    QFile                        _logFile;
+    QTextStream                  _logStream;
+};
diff --git a/source/app/TACWindow.ui b/source/app/TACWindow.ui
new file mode 100644
index 00000000..bd4b0a4a
--- /dev/null
+++ b/source/app/TACWindow.ui
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TACWindowClass</class>
+ <widget class="QMainWindow" name="TACWindowClass">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>560</width>
+    <height>750</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>555</width>
+    <height>725</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>%1 Test Automation Controller</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="resources/TAC.qrc">
+    <normaloff>:/TAC.png</normaloff>:/TAC.png</iconset>
+  </property>
+  <widget class="QWidget" name="_centralWidget">
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QPushButton" name="_connectButton">
+        <property name="text">
+         <string>Connect</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="_disconnectButton">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="text">
+         <string>Disconnect</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="_statusTitleLabel">
+        <property name="text">
+         <string>&lt;b&gt;Status:&lt;/b&gt;</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="_deviceStatusLabel">
+        <property name="text">
+         <string>Disconnected</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </item>
+    <item>
+     <widget class="QScrollArea" name="_pinScrollArea">
+      <property name="widgetResizable">
+       <bool>true</bool>
+      </property>
+      <widget class="QWidget" name="_pinScrollContents">
+       <property name="geometry">
+        <rect>
+         <x>0</x>
+         <y>0</y>
+         <width>540</width>
+         <height>690</height>
+        </rect>
+       </property>
+       <layout class="QVBoxLayout" name="_pinScrollLayout"/>
+      </widget>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="_menuBar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>560</width>
+     <height>22</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="_fileMenu">
+    <property name="title">
+     <string>File</string>
+    </property>
+    <addaction name="_actionConnect"/>
+    <addaction name="_actionDisconnect"/>
+    <addaction name="_actionPreferences"/>
+    <addaction name="separator"/>
+    <addaction name="_actionQuit"/>
+   </widget>
+   <widget class="QMenu" name="_helpMenu">
+    <property name="title">
+     <string>Help</string>
+    </property>
+    <addaction name="_actionContents"/>
+    <addaction name="separator"/>
+    <addaction name="_actionAbout"/>
+   </widget>
+   <addaction name="_fileMenu"/>
+   <addaction name="_helpMenu"/>
+  </widget>
+  <widget class="QStatusBar" name="_statusBar"/>
+  <action name="_actionPreferences">
+   <property name="text">
+    <string>Preferences…</string>
+   </property>
+  </action>
+  <action name="_actionConnect">
+   <property name="text">
+    <string>Connect</string>
+   </property>
+  </action>
+  <action name="_actionDisconnect">
+   <property name="text">
+    <string>Disconnect</string>
+   </property>
+  </action>
+  <action name="_actionQuit">
+   <property name="text">
+    <string>Quit</string>
+   </property>
+  </action>
+  <action name="_actionContents">
+   <property name="text">
+    <string>Contents</string>
+   </property>
+  </action>
+  <action name="_actionAbout">
+   <property name="text">
+    <string>About...</string>
+   </property>
+  </action>
+ </widget>
+ <resources>
+  <include location="resources/TAC.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/source/app/main.cpp b/source/app/main.cpp
new file mode 100644
index 00000000..0c9138eb
--- /dev/null
+++ b/source/app/main.cpp
@@ -0,0 +1,179 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "TACApplication.h"
+
+#include <QApplication>
+
+// ---------------------------------------------------------------------------
+// Crash / diagnostic logger
+// ---------------------------------------------------------------------------
+#ifdef _WIN32
+#include <windows.h>
+#include <dbghelp.h>
+#include <cstdio>
+#include <ctime>
+
+#pragma comment(lib, "dbghelp.lib")
+
+FILE* gCrashLog = nullptr;
+#else
+// Stub for non-Windows platforms
+#include <cstdio>
+#include <ctime>
+FILE* gCrashLog = nullptr;
+#endif
+
+static void crashLogOpen()
+{
+    gCrashLog = fopen("qtac_crash.log", "w");
+    if (!gCrashLog) return;
+    std::time_t t = std::time(nullptr);
+    fprintf(gCrashLog, "qtac-app started: %s\n", std::ctime(&t));
+    fflush(gCrashLog);
+}
+
+static void crashLog(const char* msg)
+{
+    if (!gCrashLog) return;
+    fputs(msg, gCrashLog);
+    fputc('\n', gCrashLog);
+    fflush(gCrashLog);
+}
+
+#ifdef _WIN32
+static LONG CALLBACK vectoredExceptionHandler(PEXCEPTION_POINTERS ep)
+{
+    if (!gCrashLog) return EXCEPTION_CONTINUE_SEARCH;
+
+    DWORD code = ep->ExceptionRecord->ExceptionCode;
+    // Skip C++ exceptions and non-fatal codes
+    if (code == 0xE06D7363 /*C++ exception*/ || code == EXCEPTION_BREAKPOINT)
+        return EXCEPTION_CONTINUE_SEARCH;
+
+    fprintf(gCrashLog, "\n=== CRASH: ExceptionCode=0x%08X Address=%p ===\n",
+            (unsigned)code, ep->ExceptionRecord->ExceptionAddress);
+
+    // Stack walk
+    SymInitialize(GetCurrentProcess(), nullptr, TRUE);
+
+    CONTEXT ctx = *ep->ContextRecord;
+#if defined(_M_ARM64)
+    // StackWalk64 does not support ARM64; log the PC only.
+    fprintf(gCrashLog, "  PC=%p  (stack walk not supported on ARM64)\n",
+            reinterpret_cast<void*>(static_cast<uintptr_t>(ctx.Pc)));
+    char symBuf[sizeof(SYMBOL_INFO) + 256];
+    SYMBOL_INFO* sym = reinterpret_cast<SYMBOL_INFO*>(symBuf);
+    sym->SizeOfStruct = sizeof(SYMBOL_INFO);
+    sym->MaxNameLen   = 255;
+    DWORD64 disp = 0;
+    if (SymFromAddr(GetCurrentProcess(),
+                    static_cast<DWORD64>(ctx.Pc), &disp, sym))
+    {
+        fprintf(gCrashLog, "  %s + 0x%llx\n",
+                sym->Name, (unsigned long long)disp);
+    }
+#else
+    STACKFRAME64 sf = {};
+# ifdef _WIN64
+    sf.AddrPC.Offset    = ctx.Rip;
+    sf.AddrFrame.Offset = ctx.Rbp;
+    sf.AddrStack.Offset = ctx.Rsp;
+    DWORD machType = IMAGE_FILE_MACHINE_AMD64;
+# else
+    sf.AddrPC.Offset    = ctx.Eip;
+    sf.AddrFrame.Offset = ctx.Ebp;
+    sf.AddrStack.Offset = ctx.Esp;
+    DWORD machType = IMAGE_FILE_MACHINE_I386;
+# endif
+    sf.AddrPC.Mode = sf.AddrFrame.Mode = sf.AddrStack.Mode = AddrModeFlat;
+
+    char symBuf[sizeof(SYMBOL_INFO) + 256];
+    SYMBOL_INFO* sym = reinterpret_cast<SYMBOL_INFO*>(symBuf);
+    sym->SizeOfStruct = sizeof(SYMBOL_INFO);
+    sym->MaxNameLen   = 255;
+
+    for (int frame = 0; frame < 32; ++frame)
+    {
+        if (!StackWalk64(machType, GetCurrentProcess(), GetCurrentThread(),
+                         &sf, &ctx, nullptr, SymFunctionTableAccess64,
+                         SymGetModuleBase64, nullptr))
+            break;
+        if (sf.AddrPC.Offset == 0) break;
+
+        DWORD64 disp = 0;
+        if (SymFromAddr(GetCurrentProcess(),
+                        static_cast<DWORD64>(sf.AddrPC.Offset), &disp, sym))
+        {
+            fprintf(gCrashLog, "  #%02d %p  %s + 0x%llx\n",
+                    frame,
+                    reinterpret_cast<void*>(sf.AddrPC.Offset),
+                    sym->Name, (unsigned long long)disp);
+        }
+        else
+        {
+            fprintf(gCrashLog, "  #%02d %p  <unknown>\n",
+                    frame,
+                    reinterpret_cast<void*>(sf.AddrPC.Offset));
+        }
+    }
+#endif // _M_ARM64
+
+    SymCleanup(GetCurrentProcess());
+    fflush(gCrashLog);
+    return EXCEPTION_CONTINUE_SEARCH; // let Windows handle it normally
+}
+#endif // _WIN32
+
+// ---------------------------------------------------------------------------
+
+int main(int argc, char* argv[])
+{
+    crashLogOpen();
+#ifdef _WIN32
+    AddVectoredExceptionHandler(1, vectoredExceptionHandler);
+#endif
+
+    TACApplication app(argc, argv);
+
+    TACApplication::createTACWindow();
+    TACApplication::instance()->tryOpenLastDevice();
+
+    int ret = app.exec();
+
+    if (gCrashLog)
+    {
+        crashLog("=== clean exit ===");
+        fclose(gCrashLog);
+    }
+    return ret;
+}
diff --git a/source/app/resources/TAC.bmp b/source/app/resources/TAC.bmp
new file mode 100644
index 00000000..0e788eaa
Binary files /dev/null and b/source/app/resources/TAC.bmp differ
diff --git a/source/app/resources/TAC.ico b/source/app/resources/TAC.ico
new file mode 100644
index 00000000..7ecd8dc1
Binary files /dev/null and b/source/app/resources/TAC.ico differ
diff --git a/source/app/resources/TAC.png b/source/app/resources/TAC.png
new file mode 100644
index 00000000..7d1b34ae
Binary files /dev/null and b/source/app/resources/TAC.png differ
diff --git a/source/app/resources/TAC.qrc b/source/app/resources/TAC.qrc
new file mode 100644
index 00000000..dac6737c
--- /dev/null
+++ b/source/app/resources/TAC.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/">
+        <file>TAC.png</file>
+        <file>TAC.bmp</file>
+    </qresource>
+</RCC>
diff --git a/source/app/resources/TAC.rc b/source/app/resources/TAC.rc
new file mode 100644
index 00000000..8e6fa823
--- /dev/null
+++ b/source/app/resources/TAC.rc
@@ -0,0 +1,37 @@
+/*
+	Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. 
+	
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted (subject to the limitations in the
+	disclaimer below) provided that the following conditions are met:
+		
+		* Redistributions of source code must retain the above copyright
+			notice, this list of conditions and the following disclaimer.
+		
+		* Redistributions in binary form must reproduce the above
+			copyright notice, this list of conditions and the following
+			disclaimer in the documentation and/or other materials provided
+			with the distribution.
+		
+		* Neither the name of Qualcomm Technologies, Inc. nor the names of its
+			contributors may be used to endorse or promote products derived
+			from this software without specific prior written permission.
+		
+	NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+	GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+	HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+	WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+	MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+	IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+	ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+	DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+	GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+	IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+	OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+	IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	
+	Author: Biswajit Roy (biswroy@qti.qualcomm.com)
+*/
+
+IDI_MAIN_ICON ICON "TAC.ico"
diff --git a/source/libraries/qt-adapter/CMakeLists.txt b/source/libraries/qt-adapter/CMakeLists.txt
new file mode 100644
index 00000000..08ed62c4
--- /dev/null
+++ b/source/libraries/qt-adapter/CMakeLists.txt
@@ -0,0 +1,62 @@
+# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted (subject to the limitations in the
+# disclaimer below) provided that the following conditions are met:
+#
+#     * Redistributions of source code must retain the above copyright
+#         notice, this list of conditions and the following disclaimer.
+#
+#     * Redistributions in binary form must reproduce the above
+#         copyright notice, this list of conditions and the following
+#         disclaimer in the documentation and/or other materials provided
+#         with the distribution.
+#
+#     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+#         contributors may be used to endorse or promote products derived
+#         from this software without specific prior written permission.
+#
+# NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+# GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+# HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cmake_minimum_required(VERSION 3.16)
+project(qt-adapter VERSION 0.1.0 LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(Qt6 REQUIRED COMPONENTS Core)
+qt_standard_project_setup()
+
+add_library(qt-adapter STATIC
+    src/TACDeviceBridge.cpp
+    include/TACDeviceBridge.h
+)
+
+target_include_directories(qt-adapter
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:include>
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/src
+)
+
+# Bring in the Qt-free core library and its public headers (qtac:: types, Signal<>, etc.)
+target_link_libraries(qt-adapter
+    PUBLIC
+        Qt6::Core
+        qtac-core
+)
+
+target_compile_features(qt-adapter PUBLIC cxx_std_11)
diff --git a/source/libraries/qt-adapter/include/QtAdapterGlobal.h b/source/libraries/qt-adapter/include/QtAdapterGlobal.h
new file mode 100644
index 00000000..52e5d009
--- /dev/null
+++ b/source/libraries/qt-adapter/include/QtAdapterGlobal.h
@@ -0,0 +1,38 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#pragma once
+
+#include <QtCore/QtGlobal>
+
+// qt-adapter is built as a static library; no dllexport/dllimport needed.
+#define QT_ADAPTER_EXPORT
diff --git a/source/libraries/qt-adapter/include/TACDeviceBridge.h b/source/libraries/qt-adapter/include/TACDeviceBridge.h
new file mode 100644
index 00000000..f5cb5ea7
--- /dev/null
+++ b/source/libraries/qt-adapter/include/TACDeviceBridge.h
@@ -0,0 +1,133 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// TACDeviceBridge — Qt bridge for _AlpacaDevice + TACDriveThread.
+//
+// Wraps a shared_ptr<_AlpacaDevice> and its drive thread, forwarding all
+// qtac::Signal<> callbacks to Qt signals via QMetaObject::invokeMethod with
+// Qt::QueuedConnection so they arrive safely on the GUI thread.
+//
+// Usage:
+//   auto dev = _AlpacaDevice::findAlpacaDevice(portName);
+//   auto* dt = new qtac::TACLiteDriveThread(dev->hash());
+//   dev->setDriveThread(dt);
+//   dev->open();                                // starts drive thread
+//   auto* bridge = new TACDeviceBridge(dev, dt, parent);
+//   connect(bridge, &TACDeviceBridge::deviceConnected, ...);
+//   connect(bridge, &TACDeviceBridge::pinStateChanged, ...);
+
+#pragma once
+
+#include <QtAdapterGlobal.h>
+#include <qt_string_convert.h>
+
+#include <qtac/AlpacaDevice.h>
+#include <qtac/AlpacaScript.h>
+#include <qtac/TACDriveThread.h>
+
+#include <QByteArray>
+#include <QObject>
+#include <QString>
+
+#include <memory>
+
+class QT_ADAPTER_EXPORT TACDeviceBridge : public QObject
+{
+    Q_OBJECT
+
+public:
+    // Construct with device only (no drive thread signals).
+    explicit TACDeviceBridge(std::shared_ptr<_AlpacaDevice> device,
+                             QObject* parent = nullptr);
+
+    // Construct with device + drive thread (full signal set).
+    TACDeviceBridge(std::shared_ptr<_AlpacaDevice> device,
+                    qtac::TACDriveThread* driveThread,
+                    QObject* parent = nullptr);
+
+    ~TACDeviceBridge() override;
+
+    void disconnectSignals();
+
+    std::shared_ptr<_AlpacaDevice> device() const { return _device; }
+    qtac::TACDriveThread* driveThread() const { return _driveThread; }
+
+    // Execute a Quick Settings script command by name.
+    void quickCommand(const QByteArray& command)
+    {
+        _device->quickCommand(qtac::ByteArray(command.data(), command.size()));
+    }
+
+    // Update a variable value (called from UI widgets before running a command).
+    void setVariableValue(const QString& name, int value);
+    void setVariableValue(const QString& name, bool value);
+
+    // Rename the device (PSoC/PIC32CX only; no-op for FTDI).
+    bool supportsRename() const;
+    void renameDevice(const QString& newName);
+
+signals:
+    // _AlpacaDevice signals
+    void pinStateChanged(quint64 pin, bool state);
+    void progress(quint8 value, int level);
+    void errorEvent(const QByteArray& message);
+
+    // TACDriveThread signals (only emitted when a drive thread was provided)
+    void deviceConnected();
+    void deviceDisconnected();
+    void firmwareVersionUpdated(const QString& version);
+    void hardwareTypeUpdated(const QString& hwType);
+    void nameUpdated(const QString& name);
+    void serialNumberUpdated(const QString& sn);
+    void logLine(const QByteArray& line);
+
+private:
+    void connectDeviceSignals();
+    void connectDriveThreadSignals();
+
+    std::shared_ptr<_AlpacaDevice> _device;
+    qtac::TACDriveThread*          _driveThread{nullptr};
+
+    // Connection IDs for device signals (disconnected in destructor)
+    int _connPinState{0};
+    int _connProgress{0};
+    int _connError{0};
+
+    // Connection IDs for drive thread signals (disconnected in destructor)
+    int _connDeviceConnected{0};
+    int _connDeviceDisconnected{0};
+    int _connFirmwareVersion{0};
+    int _connHardwareType{0};
+    int _connName{0};
+    int _connSerialNum{0};
+    int _connLogLine{0};
+};
diff --git a/source/libraries/qt-adapter/include/qt_container_convert.h b/source/libraries/qt-adapter/include/qt_container_convert.h
new file mode 100644
index 00000000..20a13f4a
--- /dev/null
+++ b/source/libraries/qt-adapter/include/qt_container_convert.h
@@ -0,0 +1,64 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Conversion utilities between qtac::List and QList.
+
+#pragma once
+
+#include <qtac/List.h>
+
+#include <QList>
+
+namespace QtAdapter {
+
+template<typename QtacT, typename QtT>
+QList<QtT> toQList(const qtac::List<QtacT>& in,
+                   QtT (*convert)(const QtacT&))
+{
+    QList<QtT> out;
+    out.reserve(static_cast<qsizetype>(in.size()));
+    for (const auto& item : in)
+        out.append(convert(item));
+    return out;
+}
+
+template<typename QtT, typename QtacT>
+qtac::List<QtacT> toQtacList(const QList<QtT>& in,
+                              QtacT (*convert)(const QtT&))
+{
+    qtac::List<QtacT> out;
+    for (const auto& item : in)
+        out.append(convert(item));
+    return out;
+}
+
+} // namespace QtAdapter
diff --git a/source/libraries/qt-adapter/include/qt_string_convert.h b/source/libraries/qt-adapter/include/qt_string_convert.h
new file mode 100644
index 00000000..d3bdba4f
--- /dev/null
+++ b/source/libraries/qt-adapter/include/qt_string_convert.h
@@ -0,0 +1,81 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Conversion utilities between qtac:: string types and Qt string types.
+
+#pragma once
+
+#include <qtac/ByteArray.h>
+#include <qtac/String.h>
+
+#include <QByteArray>
+#include <QString>
+
+namespace QtAdapter {
+
+inline QString toQString(const qtac::String& s)
+{
+    return QString::fromStdString(s.toStdString());
+}
+
+inline QString toQString(const qtac::ByteArray& b)
+{
+    return QString::fromLatin1(b.toStdString());
+}
+
+inline QByteArray toQByteArray(const qtac::ByteArray& b)
+{
+    const std::string s = b.toStdString();
+    return QByteArray(s.data(), static_cast<qsizetype>(s.size()));
+}
+
+inline QByteArray toQByteArray(const qtac::String& s)
+{
+    return toQByteArray(qtac::ByteArray(s.toStdString()));
+}
+
+inline qtac::String toQtacString(const QString& s)
+{
+    return qtac::String(s.toStdString());
+}
+
+inline qtac::ByteArray toQtacByteArray(const QByteArray& b)
+{
+    return qtac::ByteArray(b.toStdString().c_str());
+}
+
+inline qtac::ByteArray toQtacByteArray(const QString& s)
+{
+    return qtac::ByteArray(s.toLatin1().toStdString().c_str());
+}
+
+} // namespace QtAdapter
diff --git a/source/libraries/qt-adapter/src/TACDeviceBridge.cpp b/source/libraries/qt-adapter/src/TACDeviceBridge.cpp
new file mode 100644
index 00000000..6874867a
--- /dev/null
+++ b/source/libraries/qt-adapter/src/TACDeviceBridge.cpp
@@ -0,0 +1,178 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#define QT_ADAPTER_LIBRARY
+#include "TACDeviceBridge.h"
+
+#include <QMetaObject>
+
+// ---------------------------------------------------------------------------
+
+TACDeviceBridge::TACDeviceBridge(std::shared_ptr<_AlpacaDevice> device,
+                                 QObject* parent)
+    : QObject(parent)
+    , _device(std::move(device))
+{
+    connectDeviceSignals();
+}
+
+TACDeviceBridge::TACDeviceBridge(std::shared_ptr<_AlpacaDevice> device,
+                                 qtac::TACDriveThread* driveThread,
+                                 QObject* parent)
+    : QObject(parent)
+    , _device(std::move(device))
+    , _driveThread(driveThread)
+{
+    connectDeviceSignals();
+    if (_driveThread)
+        connectDriveThreadSignals();
+}
+
+// ---------------------------------------------------------------------------
+
+TACDeviceBridge::~TACDeviceBridge()
+{
+    disconnectSignals();
+}
+
+void TACDeviceBridge::disconnectSignals()
+{
+    if (_device)
+    {
+        if (_connPinState)       { _device->onPinStateChanged.disconnect(_connPinState); _connPinState = 0; }
+        if (_connProgress)       { _device->onProgress.disconnect(_connProgress);        _connProgress = 0; }
+        if (_connError)          { _device->onError.disconnect(_connError);              _connError = 0; }
+    }
+    if (_driveThread)
+    {
+        if (_connDeviceConnected)    { _driveThread->onDeviceConnected.disconnect(_connDeviceConnected);       _connDeviceConnected = 0; }
+        if (_connDeviceDisconnected) { _driveThread->onDeviceDisconnected.disconnect(_connDeviceDisconnected); _connDeviceDisconnected = 0; }
+        if (_connFirmwareVersion)    { _driveThread->onFirmwareVersionUpdate.disconnect(_connFirmwareVersion); _connFirmwareVersion = 0; }
+        if (_connHardwareType)       { _driveThread->onHardwareTypeUpdate.disconnect(_connHardwareType);       _connHardwareType = 0; }
+        if (_connName)               { _driveThread->onNameUpdate.disconnect(_connName);                       _connName = 0; }
+        if (_connSerialNum)          { _driveThread->onSerialNumUpdate.disconnect(_connSerialNum);             _connSerialNum = 0; }
+        if (_connLogLine)            { _driveThread->onLogLine.disconnect(_connLogLine);                       _connLogLine = 0; }
+    }
+}
+
+void TACDeviceBridge::connectDeviceSignals()
+{
+    _connPinState = _device->onPinStateChanged.connect([this](uint64_t pin, bool state) {
+        QMetaObject::invokeMethod(this, [this, pin, state]() {
+            emit pinStateChanged(static_cast<quint64>(pin), state);
+        }, Qt::QueuedConnection);
+    });
+
+    _connProgress = _device->onProgress.connect([this](uint8_t value, int level) {
+        QMetaObject::invokeMethod(this, [this, value, level]() {
+            emit progress(static_cast<quint8>(value), level);
+        }, Qt::QueuedConnection);
+    });
+
+    _connError = _device->onError.connect([this](const qtac::ByteArray& message) {
+        QByteArray msg = QtAdapter::toQByteArray(message);
+        QMetaObject::invokeMethod(this, [this, msg]() {
+            emit errorEvent(msg);
+        }, Qt::QueuedConnection);
+    });
+}
+
+void TACDeviceBridge::connectDriveThreadSignals()
+{
+    _connDeviceConnected = _driveThread->onDeviceConnected.connect([this]() {
+        QMetaObject::invokeMethod(this, [this]() {
+            emit deviceConnected();
+        }, Qt::QueuedConnection);
+    });
+
+    _connDeviceDisconnected = _driveThread->onDeviceDisconnected.connect([this]() {
+        QMetaObject::invokeMethod(this, [this]() {
+            emit deviceDisconnected();
+        }, Qt::QueuedConnection);
+    });
+
+    _connFirmwareVersion = _driveThread->onFirmwareVersionUpdate.connect([this](const qtac::String& v) {
+        QString s = QtAdapter::toQString(v);
+        QMetaObject::invokeMethod(this, [this, s]() {
+            emit firmwareVersionUpdated(s);
+        }, Qt::QueuedConnection);
+    });
+
+    _connHardwareType = _driveThread->onHardwareTypeUpdate.connect([this](const qtac::String& v) {
+        QString s = QtAdapter::toQString(v);
+        QMetaObject::invokeMethod(this, [this, s]() {
+            emit hardwareTypeUpdated(s);
+        }, Qt::QueuedConnection);
+    });
+
+    _connName = _driveThread->onNameUpdate.connect([this](const qtac::String& v) {
+        QString s = QtAdapter::toQString(v);
+        QMetaObject::invokeMethod(this, [this, s]() {
+            emit nameUpdated(s);
+        }, Qt::QueuedConnection);
+    });
+
+    _connSerialNum = _driveThread->onSerialNumUpdate.connect([this](const qtac::String& v) {
+        QString s = QtAdapter::toQString(v);
+        QMetaObject::invokeMethod(this, [this, s]() {
+            emit serialNumberUpdated(s);
+        }, Qt::QueuedConnection);
+    });
+
+    _connLogLine = _driveThread->onLogLine.connect([this](const qtac::ByteArray& line) {
+        QByteArray ba = QtAdapter::toQByteArray(line);
+        QMetaObject::invokeMethod(this, [this, ba]() {
+            emit logLine(ba);
+        }, Qt::QueuedConnection);
+    });
+}
+
+void TACDeviceBridge::setVariableValue(const QString& name, int value)
+{
+    _device->setVariableValue(QtAdapter::toQtacString(name), qtac::Variant(value));
+}
+
+void TACDeviceBridge::setVariableValue(const QString& name, bool value)
+{
+    _device->setVariableValue(QtAdapter::toQtacString(name), qtac::Variant(value));
+}
+
+bool TACDeviceBridge::supportsRename() const
+{
+    return _driveThread && _device->debugBoardType() != eFTDI;
+}
+
+void TACDeviceBridge::renameDevice(const QString& newName)
+{
+    if (!_driveThread) return;
+    _driveThread->setName(QtAdapter::toQtacByteArray(newName));
+}
diff --git a/source/library/CMakeLists.txt b/source/library/CMakeLists.txt
new file mode 100644
index 00000000..ad91298a
--- /dev/null
+++ b/source/library/CMakeLists.txt
@@ -0,0 +1,234 @@
+# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted (subject to the limitations in the
+# disclaimer below) provided that the following conditions are met:
+#
+#     * Redistributions of source code must retain the above copyright
+#         notice, this list of conditions and the following disclaimer.
+#
+#     * Redistributions in binary form must reproduce the above
+#         copyright notice, this list of conditions and the following
+#         disclaimer in the documentation and/or other materials provided
+#         with the distribution.
+#
+#     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+#         contributors may be used to endorse or promote products derived
+#         from this software without specific prior written permission.
+#
+# NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+# GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+# HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cmake_minimum_required(VERSION 3.16)
+project(qtac-core VERSION 0.1.0 LANGUAGES CXX)
+
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/QtacCommon.cmake)
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# -----------------------------------------------------------------------
+# libserialport — compiled from source for PSoC/PIC32CX serial communication.
+# libserialport uses autotools, not CMake, so we fetch the sources and compile
+# the relevant .c files directly (same approach as tac-core).
+# -----------------------------------------------------------------------
+include(FetchContent)
+enable_language(C)
+
+FetchContent_Declare(
+    libserialport
+    GIT_REPOSITORY https://github.com/sigrokproject/libserialport.git
+    GIT_TAG        master
+    GIT_SHALLOW    TRUE
+)
+FetchContent_GetProperties(libserialport)
+if(NOT libserialport_POPULATED)
+    FetchContent_Populate(libserialport)
+endif()
+
+set(LIBSERIALPORT_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}/libserialport_config")
+file(MAKE_DIRECTORY "${LIBSERIALPORT_CONFIG_DIR}")
+
+if(NOT WIN32)
+    file(WRITE "${LIBSERIALPORT_CONFIG_DIR}/config.h" [=[
+/* Generated config.h for libserialport on Linux/macOS */
+#define SP_PRIV __attribute__((visibility("hidden")))
+#define SP_API  __attribute__((visibility("default")))
+#define HAVE_STRUCT_SERIAL_STRUCT 1
+#define HAVE_STRUCT_TERMIOS2 1
+#define HAVE_DECL_BOTHER 1
+#define HAVE_REALPATH 1
+#define HAVE_FLOCK 1
+]=])
+endif()
+
+set(LIBSERIALPORT_SOURCES
+    "${libserialport_SOURCE_DIR}/serialport.c"
+    "${libserialport_SOURCE_DIR}/timing.c"
+)
+if(WIN32)
+    list(APPEND LIBSERIALPORT_SOURCES "${libserialport_SOURCE_DIR}/windows.c")
+else()
+    list(APPEND LIBSERIALPORT_SOURCES
+        "${libserialport_SOURCE_DIR}/linux.c"
+        "${libserialport_SOURCE_DIR}/linux_termios.c"
+    )
+endif()
+
+add_library(serialport STATIC ${LIBSERIALPORT_SOURCES})
+set_target_properties(serialport PROPERTIES POSITION_INDEPENDENT_CODE ON)
+target_include_directories(serialport PUBLIC "${libserialport_SOURCE_DIR}")
+if(NOT WIN32)
+    target_include_directories(serialport PRIVATE "${LIBSERIALPORT_CONFIG_DIR}")
+endif()
+target_compile_definitions(serialport
+    PUBLIC  $<$<PLATFORM_ID:Windows>:LIBSERIALPORT_MSBUILD>
+    PRIVATE $<$<PLATFORM_ID:Windows>:_WIN32>
+    PRIVATE $<$<NOT:$<PLATFORM_ID:Windows>>:LIBSERIALPORT_ATBUILD>
+)
+if(WIN32)
+    target_link_libraries(serialport PRIVATE setupapi)
+else()
+    target_link_libraries(serialport PRIVATE pthread)
+endif()
+if(MSVC)
+    target_compile_options(serialport PRIVATE /W0)
+else()
+    target_compile_options(serialport PRIVATE -w)
+endif()
+
+add_library(qtac-core STATIC
+    src/qtac_core.cpp
+    src/String.cpp
+    src/StringList.cpp
+    src/Variant.cpp
+    # FTDI stack (Qt-free)
+    src/StringUtilities.cpp
+    src/AlpacaDevice.cpp
+    src/FTDIPlatformConfiguration.cpp
+    src/FTDIChipset.cpp
+    src/FTDIDevice.cpp
+    # Serial port (W2)
+    src/SerialPort.cpp
+    src/SerialPortInfo.cpp
+    # Drive thread base (W2)
+    src/DriveThread.cpp
+    src/FrameCoder.cpp
+    src/ProtocolInterface.cpp
+    src/ThreadedLog.cpp
+    src/TACDriveThread.cpp
+    # TAC Lite (FTDI) drive thread (W2)
+    src/TACLiteCommand.cpp
+    src/TACLiteCoder.cpp
+    src/TACLiteProtocol.cpp
+    src/TACLiteDriveThread.cpp
+    # TAC PSOC (serial) drive thread (W2)
+    src/TACPSOCCommand.cpp
+    src/TACPSOCCoder.cpp
+    src/TACPSOCProtocol.cpp
+    src/TACPSOCDriveThread.cpp
+    # TAC PIC32CX (serial) drive thread (W2)
+    src/TACPIC32CXCommand.cpp
+    src/TACPIC32CXCoder.cpp
+    src/TACPIC32CXProtocol.cpp
+    src/TACPIC32CXDriveThread.cpp
+    # PSoC/PIC32CX devices and platform configurations (W1)
+    src/PSOCPlatformConfiguration.cpp
+    src/PIC32CXPlatformConfiguration.cpp
+    src/PSOCDevice.cpp
+    src/PIC32CXDevice.cpp
+    # Platform registry / devicelist.json loader (Phase 4)
+    src/PlatformID.cpp
+    src/TcnfLoader.cpp
+    # AlpacaScript engine (Qt-free port of qcommon-console AlpacaScript)
+    src/AlpacaScript.cpp
+    # boost::json header-only compilation unit
+    src/boost_json_src.cpp
+    # STM32 (BugHopper V2) drive thread — HID transport
+    src/TACSTM32Command.cpp
+    src/TACSTM32Coder.cpp
+    src/TACSTM32Protocol.cpp
+    src/TACSTM32DriveThread.cpp
+    # STM32 device and platform configuration
+    src/STM32PlatformConfiguration.cpp
+    src/STM32Device.cpp
+)
+
+# Platform-specific SerialPortInfo enumeration
+if(WIN32)
+    target_sources(qtac-core PRIVATE src/platform/SerialPortInfo_win32.cpp)
+else()
+    target_sources(qtac-core PRIVATE src/platform/SerialPortInfo_posix.cpp)
+endif()
+
+target_include_directories(qtac-core PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    $<INSTALL_INTERFACE:include>
+)
+
+target_compile_features(qtac-core PUBLIC cxx_std_11)
+QtacCoreSettings(qtac-core)
+
+# Boost — fetched via FetchContent in source/CMakeLists.txt
+# BOOST_ALL_NO_LIB disables Boost's Windows auto-link pragmas so the linker
+# does not try to find a precompiled libboost_json-*.lib.
+target_link_libraries(qtac-core PUBLIC boost_headers)
+target_compile_definitions(qtac-core PUBLIC BOOST_ALL_NO_LIB)
+
+target_link_libraries(qtac-core PUBLIC serialport hidapi::hidapi)
+
+# -----------------------------------------------------------------------
+# FTDI D2XX library
+# The link_ftd2xx() helper is provided by the parent project
+# (source/CMakeLists.txt or third-party/CMakeLists.txt), which handles
+# downloading and staging the library before this file is processed.
+# -----------------------------------------------------------------------
+option(QTAC_BUILD_FTDI "Include FTDI hardware support in qtac-core" ON)
+
+if(QTAC_BUILD_FTDI)
+    if(COMMAND link_ftd2xx)
+        link_ftd2xx(qtac-core)
+    else()
+        # Fallback for standalone builds where the parent hasn't run yet
+        find_library(FTD2XX_LIB ftd2xx
+            HINTS
+                "${CMAKE_CURRENT_SOURCE_DIR}/../../__Builds/x64/Release/lib"
+                "${CMAKE_CURRENT_SOURCE_DIR}/../../__Builds/x64/Debug/lib"
+                "${CMAKE_CURRENT_SOURCE_DIR}/../../__Builds/Linux/Release/lib"
+                "${CMAKE_CURRENT_SOURCE_DIR}/../../__Builds/Linux/Debug/lib"
+                "/usr/local/lib"
+        )
+        if(FTD2XX_LIB)
+            if(UNIX)
+                target_link_libraries(qtac-core PUBLIC ${FTD2XX_LIB} dl pthread)
+            else()
+                target_link_libraries(qtac-core PUBLIC ${FTD2XX_LIB})
+            endif()
+        else()
+            message(WARNING "ftd2xx library not found; FTDI hardware support disabled")
+        endif()
+    endif()
+
+    # ftd2xx.h lives alongside this CMakeLists.txt (copied from the FTDI SDK).
+    target_include_directories(qtac-core PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+
+    # ARM64 ships FTD2XXstatic.lib (no import lib / no DLL), so the header
+    # must not use __declspec(dllimport).  Define FTD2XX_STATIC only when the
+    # static lib is actually being linked (ARM64 Windows).
+    if(WIN32 AND (CMAKE_SYSTEM_PROCESSOR MATCHES "ARM64|aarch64" OR CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64"))
+        target_compile_definitions(qtac-core PUBLIC FTD2XX_STATIC)
+    endif()
+endif()
diff --git a/source/library/README.md b/source/library/README.md
new file mode 100644
index 00000000..499b3541
--- /dev/null
+++ b/source/library/README.md
@@ -0,0 +1,111 @@
+# qtac-core Library
+
+Qt-free C++11 static library providing drop-in replacements for Qt types and
+a complete hardware abstraction stack (FTDI, PSoC, PIC32CX, STM32/BugHopper V2).
+Used by `TACDev.dll` and `qtac-app` to eliminate the Qt dependency from core logic.
+
+## Directory Structure
+
+```
+source/library/
+├── cmake/
+│   └── QtacCommon.cmake       # Shared build settings (platform flags, output paths)
+├── include/qtac/
+│   ├── ByteArray.h            # QByteArray replacement (header-only)
+│   ├── String.h               # QString replacement
+│   ├── StringList.h           # QStringList replacement
+│   ├── Variant.h              # QVariant replacement
+│   ├── Map.h                  # QMap replacement (header-only template)
+│   ├── List.h                 # QList replacement (header-only template)
+│   ├── Pair.h                 # QPair replacement (header-only alias)
+│   ├── Signal.h               # Lightweight callback (replaces Qt signals)
+│   ├── AlpacaDevice.h         # Device registry base
+│   ├── AlpacaScript.h         # Script engine (Qt-free port)
+│   ├── FTDIDevice.h           # FTDI/TACLite device
+│   ├── FTDIPlatformConfiguration.h
+│   ├── PSOCDevice.h           # PSoC TAC device
+│   ├── PSOCPlatformConfiguration.h
+│   ├── PIC32CXDevice.h        # PIC32CX TAC device
+│   ├── PIC32CXPlatformConfiguration.h
+│   ├── STM32Device.h          # BugHopper V2 (HID/hidapi)
+│   ├── STM32PlatformConfiguration.h
+│   ├── Notification.h         # Notification value type
+│   └── ...                    # Protocol stack headers (TACLite, TACPSOC, etc.)
+└── src/
+    ├── qtac_core.cpp          # Library version info
+    ├── String.cpp
+    ├── StringList.cpp
+    ├── Variant.cpp
+    ├── AlpacaDevice.cpp
+    ├── FTDIDevice.cpp
+    ├── FTDIPlatformConfiguration.cpp
+    ├── PSOCDevice.cpp / PSOCPlatformConfiguration.cpp
+    ├── PIC32CXDevice.cpp / PIC32CXPlatformConfiguration.cpp
+    ├── STM32Device.cpp / STM32PlatformConfiguration.cpp
+    ├── TACSTM32*.cpp          # STM32 protocol stack (Coder/Protocol/Command/DriveThread)
+    ├── TACLite*.cpp           # FTDI protocol stack
+    ├── TACPSOC*.cpp           # PSoC protocol stack
+    ├── TACPIC32CX*.cpp        # PIC32CX protocol stack
+    └── ...
+```
+
+## Building
+
+`qtac-core` is built as part of the root CMake project — it cannot be built
+standalone. See [`source/BUILD.md`](../BUILD.md) for full instructions.
+
+```bat
+cmake -S C:\ProdTools\qcom-test-automation-controller ^
+      -B build\Release ^
+      -DCMAKE_PREFIX_PATH=C:\Qt\6.11.1\msvc2022_64 ^
+      -G Ninja -DCMAKE_BUILD_TYPE=Release
+
+cmake --build build\Release --target qtac-core
+```
+
+### External dependencies (fetched automatically by CMake)
+
+| Dependency | Source | Usage |
+|------------|--------|-------|
+| `hidapi` | FetchContent (GitHub) | HID transport for STM32/BugHopper V2 |
+| `libserialport` | FetchContent (GitHub sigrokproject) | Serial port for PSoC/PIC32CX |
+| `boost` | vendored in `third-party/` | `boost::json` for tcnf/devicelist parsing |
+
+## Qt-free Types
+
+### `qtac::ByteArray` (replaces `QByteArray`)
+Header-only. Wraps `std::string` with Qt-compatible API: append, prepend, insert, remove, hex/base64 encoding, numeric conversions, split, search, and comparison.
+
+### `qtac::String` (replaces `QString`)
+UTF-8 string class wrapping `std::string`. Key features:
+- **`arg()`** — Qt-style `%1`..`%9` placeholder substitution
+- **`split()`** — split by character or string separator
+- **`number()`** — static int/double-to-string conversion
+- **`toInt()`, `toUInt()`, `toULongLong()`** — numeric parsing
+- **`toUpper()`, `toLower()`, `simplified()`, `trimmed()`** — text transforms
+- **`toLatin1()`, `toUtf8()`** — conversion to `ByteArray`
+- **`fromStdWString()`** — Windows wide-string conversion
+- **`startsWith()`, `endsWith()`, `contains()`, `indexOf()`** — search
+
+### `qtac::StringList` (replaces `QStringList`)
+Wraps `std::vector<String>`. Provides `join()`, `filter()`, append, insert, remove, contains, indexOf.
+
+### `qtac::Variant` (replaces `QVariant`)
+Uses `std::variant` internally. Stores: `bool`, `int`, `unsigned int`, `long long`, `unsigned long long`, `double`, `String`, `ByteArray`.
+
+### `qtac::Map<K, V>` (replaces `QMap`)
+Header-only template wrapping `std::map`. Provides `value()`, `insert()`, `remove()`, `contains()`, `keys()`, `values()`.
+
+### `qtac::List<T>` (replaces `QList`)
+Header-only template wrapping `std::vector`. Provides `append()`, `prepend()`, `insert()`, `removeAt()`, `at()`, `contains()`, `indexOf()`, `first()`, `last()`.
+
+### `qtac::Notification`
+Value type carrying a message, severity level, id, timestamp (`std::chrono::system_clock`), and occurrence count. Defined in `namespace qtac` to avoid collision with `winrt::Windows::UI::Notifications::Notification`.
+
+## Design Principles
+
+1. **API compatibility** — Method names and signatures match Qt equivalents for easy migration
+2. **No Qt headers** — Zero Qt includes; pure C++11
+3. **Header-only where possible** — Templates (Map, List, Pair) and ByteArray are header-only
+4. **Namespace isolation** — Everything in `namespace qtac` to avoid conflicts during migration
+5. **Minimal footprint** — Only implements methods actually used in the codebase
diff --git a/source/library/WinTypes.h b/source/library/WinTypes.h
new file mode 100755
index 00000000..88e500e1
--- /dev/null
+++ b/source/library/WinTypes.h
@@ -0,0 +1,154 @@
+#ifndef __WINDOWS_TYPES__
+#define __WINDOWS_TYPES__
+
+#define WINAPI
+
+typedef unsigned int            DWORD;
+typedef unsigned int            ULONG;
+typedef unsigned short            USHORT;
+typedef unsigned short            SHORT;
+typedef unsigned char            UCHAR;
+typedef unsigned short            WORD;
+typedef unsigned short            WCHAR;
+typedef unsigned char            BYTE;
+typedef BYTE                    *LPBYTE;
+typedef unsigned int            BOOL;
+typedef unsigned char            BOOLEAN;
+typedef unsigned char            CHAR;
+typedef BOOL                    *LPBOOL;
+typedef UCHAR                    *PUCHAR;
+typedef const char                *LPCSTR;
+typedef char                    *PCHAR;
+typedef void                    *PVOID;
+typedef void                    *HANDLE;
+typedef unsigned int            LONG;
+typedef int                        INT;
+typedef unsigned int            UINT;
+typedef char                    *LPSTR;
+typedef char                    *LPTSTR;
+typedef const char                *LPCTSTR;
+typedef DWORD                    *LPDWORD;
+typedef WORD                    *LPWORD;
+typedef ULONG                    *PULONG;
+typedef LONG                    *LPLONG;
+typedef PVOID                    LPVOID;
+typedef void                    VOID;
+typedef USHORT                  *PUSHORT;
+typedef unsigned long long int    ULONGLONG;
+
+typedef struct _OVERLAPPED {
+    DWORD Internal;
+    DWORD InternalHigh;
+    union {
+        struct{
+            DWORD Offset;
+            DWORD OffsetHigh;
+        };
+        PVOID  Pointer;
+    };
+    HANDLE hEvent;
+} OVERLAPPED, *LPOVERLAPPED;
+
+typedef struct _SECURITY_ATTRIBUTES {
+    DWORD nLength;
+    LPVOID lpSecurityDescriptor;
+    BOOL bInheritHandle;
+} SECURITY_ATTRIBUTES , *LPSECURITY_ATTRIBUTES;
+
+#include <pthread.h>
+// Substitute for HANDLE returned by Windows CreateEvent API.
+// FT_SetEventNotification expects parameter 3 to be the address
+// of one of these structures.
+typedef struct _EVENT_HANDLE
+{
+    pthread_cond_t  eCondVar;
+    pthread_mutex_t eMutex;
+    int             iVar;
+} EVENT_HANDLE;
+
+typedef struct timeval SYSTEMTIME;
+typedef struct timeval FILETIME;
+
+// WaitForSingleObject return values.
+#define WAIT_ABANDONED      0x00000080L
+#define WAIT_OBJECT_0       0x00000000L
+#define WAIT_TIMEOUT        0x00000102L
+#define WAIT_FAILED         0xFFFFFFFF
+// Special value for WaitForSingleObject dwMilliseconds parameter
+#define INFINITE            0xFFFFFFFF  // Infinite timeout
+
+#ifndef TRUE
+#define TRUE    1
+#endif
+#ifndef FALSE
+#define FALSE    0
+#endif
+#ifndef CONST
+#define CONST const
+#endif
+//
+// Modem Status Flags
+//
+#define MS_CTS_ON           ((DWORD)0x0010)
+#define MS_DSR_ON           ((DWORD)0x0020)
+#define MS_RING_ON          ((DWORD)0x0040)
+#define MS_RLSD_ON          ((DWORD)0x0080)
+
+//
+// Error Flags
+//
+#define CE_RXOVER           0x0001  // Receive Queue overflow
+#define CE_OVERRUN          0x0002  // Receive Overrun Error
+#define CE_RXPARITY         0x0004  // Receive Parity Error
+#define CE_FRAME            0x0008  // Receive Framing error
+#define CE_BREAK            0x0010  // Break Detected
+#define CE_TXFULL           0x0100  // TX Queue is full
+#define CE_PTO              0x0200  // LPTx Timeout
+#define CE_IOE              0x0400  // LPTx I/O Error
+#define CE_DNS              0x0800  // LPTx Device not selected
+#define CE_OOP              0x1000  // LPTx Out-Of-Paper
+#define CE_MODE             0x8000  // Requested mode unsupported
+
+//
+// Events
+//
+#define EV_RXCHAR           0x0001  // Any Character received
+#define EV_RXFLAG           0x0002  // Received certain character
+#define EV_TXEMPTY          0x0004  // Transmit Queue Empty
+#define EV_CTS              0x0008  // CTS changed state
+#define EV_DSR              0x0010  // DSR changed state
+#define EV_RLSD             0x0020  // RLSD changed state
+#define EV_BREAK            0x0040  // BREAK received
+#define EV_ERR              0x0080  // Line status error occurred
+#define EV_RING             0x0100  // Ring signal detected
+#define EV_PERR             0x0200  // Printer error occured
+#define EV_RX80FULL         0x0400  // Receive buffer is 80 percent full
+#define EV_EVENT1           0x0800  // Provider specific event 1
+#define EV_EVENT2           0x1000  // Provider specific event 2
+
+//
+// Escape Functions
+//
+#define SETXOFF             1       // Simulate XOFF received
+#define SETXON              2       // Simulate XON received
+#define SETRTS              3       // Set RTS high
+#define CLRRTS              4       // Set RTS low
+#define SETDTR              5       // Set DTR high
+#define CLRDTR              6       // Set DTR low
+#define RESETDEV            7       // Reset device if possible
+#define SETBREAK            8       // Set the device break line.
+#define CLRBREAK            9       // Clear the device break line.
+
+//
+// PURGE function flags.
+//
+#define PURGE_TXABORT       0x0001  // Kill the pending/current writes to the comm port.
+#define PURGE_RXABORT       0x0002  // Kill the pending/current reads to the comm port.
+#define PURGE_TXCLEAR       0x0004  // Kill the transmit queue if there.
+#define PURGE_RXCLEAR       0x0008  // Kill the typeahead buffer if there.
+
+#ifndef INVALID_HANDLE_VALUE
+#define INVALID_HANDLE_VALUE 0xFFFFFFFF
+#endif
+
+#endif /* __WINDOWS_TYPES__ */
diff --git a/source/library/cmake/QtacCommon.cmake b/source/library/cmake/QtacCommon.cmake
new file mode 100644
index 00000000..525bf165
--- /dev/null
+++ b/source/library/cmake/QtacCommon.cmake
@@ -0,0 +1,127 @@
+# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted (subject to the limitations in the
+# disclaimer below) provided that the following conditions are met:
+#
+#     * Redistributions of source code must retain the above copyright
+#         notice, this list of conditions and the following disclaimer.
+#
+#     * Redistributions in binary form must reproduce the above
+#         copyright notice, this list of conditions and the following
+#         disclaimer in the documentation and/or other materials provided
+#         with the distribution.
+#
+#     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+#         contributors may be used to endorse or promote products derived
+#         from this software without specific prior written permission.
+#
+# NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+# GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+# HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Platform-specific settings
+set(QTAC_CORE_DEFINITIONS QTAC_STATIC)
+
+if(WIN32)
+    list(APPEND QTAC_CORE_DEFINITIONS _WIN32)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL:NO")
+endif()
+
+if(UNIX)
+    list(APPEND QTAC_CORE_DEFINITIONS __X86_64__)
+
+    set(QTAC_CORE_CXX_FLAGS
+        -Werror
+        -Wno-unused-result
+        -Wno-write-strings
+        -Wno-comment
+        -Wno-unused-function
+        -Wno-reorder
+        -Wno-unknown-pragmas
+        -Wno-conversion-null
+        -Wno-unused-parameter
+        -Wno-overloaded-virtual
+        -Wno-unused-variable
+        -Wno-date-time
+        -Wno-pragmas
+        -fPIC
+    )
+
+    set(QTAC_CORE_LINK_FLAGS
+        -Wl,--rpath=$ORIGIN
+        -Wl,--rpath=$ORIGIN/lib
+        -Wl,--rpath=$ORIGIN/../lib
+        -fPIC
+    )
+endif()
+
+# Architecture-specific definitions
+if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+    message(STATUS "qtac-core: Building 32 bit")
+    if(WIN32)
+        list(APPEND QTAC_CORE_DEFINITIONS _WIN32)
+    elseif(UNIX)
+        list(APPEND QTAC_CORE_DEFINITIONS __i386__)
+    endif()
+    set(QTAC_WINTARGET "Win32")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "ARM64|aarch64" OR CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64")
+    message(STATUS "qtac-core: Building ARM64")
+    set(QTAC_WINTARGET "ARM64")
+else()
+    message(STATUS "qtac-core: Building 64 bit")
+    if(UNIX)
+        list(APPEND QTAC_CORE_DEFINITIONS __X86_64__)
+    endif()
+    set(QTAC_WINTARGET "x64")
+endif()
+
+# Build configuration
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    list(APPEND QTAC_CORE_DEFINITIONS _DEBUG DEBUG)
+    if(WIN32)
+        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Zi")
+        set(QTAC_CONFIGURATION "${QTAC_WINTARGET}/Debug")
+    else()
+        set(QTAC_CONFIGURATION "Linux/Debug")
+    endif()
+else()
+    list(APPEND QTAC_CORE_DEFINITIONS _NDEBUG NDEBUG)
+    if(WIN32)
+        set(QTAC_CONFIGURATION "${QTAC_WINTARGET}/Release")
+    else()
+        set(QTAC_CONFIGURATION "Linux/Release")
+    endif()
+endif()
+
+# Build paths
+set(QTAC_BUILDROOT ${CMAKE_SOURCE_DIR}/__Builds/${QTAC_CONFIGURATION})
+set(QTAC_BINPATH ${QTAC_BUILDROOT}/bin)
+set(QTAC_STATIC_LIBPATH ${QTAC_BUILDROOT}/lib)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${QTAC_BINPATH})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${QTAC_STATIC_LIBPATH})
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${QTAC_STATIC_LIBPATH})
+
+# Function to apply common settings to a target
+function(QtacCoreSettings target_name)
+    target_compile_definitions(${target_name} PRIVATE ${QTAC_CORE_DEFINITIONS})
+
+    if(UNIX AND QTAC_CORE_CXX_FLAGS)
+        target_compile_options(${target_name} PRIVATE ${QTAC_CORE_CXX_FLAGS})
+    endif()
+
+    if(UNIX AND QTAC_CORE_LINK_FLAGS)
+        target_link_options(${target_name} PRIVATE ${QTAC_CORE_LINK_FLAGS})
+    endif()
+endfunction()
diff --git a/source/library/ftd2xx.h b/source/library/ftd2xx.h
new file mode 100644
index 00000000..ab1046de
--- /dev/null
+++ b/source/library/ftd2xx.h
@@ -0,0 +1,1667 @@
+/*++
+
+Copyright © 2001-2021 Future Technology Devices International Limited
+
+THIS SOFTWARE IS PROVIDED BY FUTURE TECHNOLOGY DEVICES INTERNATIONAL LIMITED "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+FUTURE TECHNOLOGY DEVICES INTERNATIONAL LIMITED BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+OF SUBSTITUTE GOODS OR SERVICES LOSS OF USE, DATA, OR PROFITS OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+FTDI DRIVERS MAY BE USED ONLY IN CONJUNCTION WITH PRODUCTS BASED ON FTDI PARTS.
+
+FTDI DRIVERS MAY BE DISTRIBUTED IN ANY FORM AS LONG AS LICENSE INFORMATION IS NOT MODIFIED.
+
+IF A CUSTOM VENDOR ID AND/OR PRODUCT ID OR DESCRIPTION STRING ARE USED, IT IS THE
+RESPONSIBILITY OF THE PRODUCT MANUFACTURER TO MAINTAIN ANY CHANGES AND SUBSEQUENT WHQL
+RE-CERTIFICATION AS A RESULT OF MAKING THESE CHANGES.
+
+
+Module Name:
+
+ftd2xx.h
+
+Abstract:
+
+Native USB device driver for FTDI FT232x, FT245x, FT2232x, FT4232x, FT2233H and FT4233H devices
+FTD2XX library definitions
+
+Environment:
+
+kernel & user mode
+
+
+--*/
+
+
+#ifndef FTD2XX_H
+#define FTD2XX_H
+
+#ifdef _WIN32
+// Compiling on Windows
+#include <windows.h>
+
+// The following ifdef block is the standard way of creating macros
+// which make exporting from a DLL simpler.  All files within this DLL
+// are compiled with the FTD2XX_EXPORTS symbol defined on the command line.
+// This symbol should not be defined on any project that uses this DLL.
+// This way any other project whose source files include this file see
+// FTD2XX_API functions as being imported from a DLL, whereas this DLL
+// sees symbols defined with this macro as being exported.
+
+#ifdef FTD2XX_EXPORTS
+#define FTD2XX_API __declspec(dllexport)
+#elif defined(FTD2XX_STATIC)
+// Avoid decorations when linking statically to D2XX.
+#define FTD2XX_API
+// Static D2XX depends on these Windows libs:
+#pragma comment(lib, "setupapi.lib")
+#pragma comment(lib, "advapi32.lib")
+#pragma comment(lib, "user32.lib")
+#else
+#define FTD2XX_API __declspec(dllimport)
+#endif
+
+#else // _WIN32
+// Compiling on non-Windows platform.
+#include "WinTypes.h"
+// No decorations needed.
+#define FTD2XX_API
+
+#endif // _WIN32
+
+typedef PVOID	FT_HANDLE;
+typedef ULONG	FT_STATUS;
+
+//
+// Device status
+//
+enum {
+	FT_OK,
+	FT_INVALID_HANDLE,
+	FT_DEVICE_NOT_FOUND,
+	FT_DEVICE_NOT_OPENED,
+	FT_IO_ERROR,
+	FT_INSUFFICIENT_RESOURCES,
+	FT_INVALID_PARAMETER,
+	FT_INVALID_BAUD_RATE,
+
+	FT_DEVICE_NOT_OPENED_FOR_ERASE,
+	FT_DEVICE_NOT_OPENED_FOR_WRITE,
+	FT_FAILED_TO_WRITE_DEVICE,
+	FT_EEPROM_READ_FAILED,
+	FT_EEPROM_WRITE_FAILED,
+	FT_EEPROM_ERASE_FAILED,
+	FT_EEPROM_NOT_PRESENT,
+	FT_EEPROM_NOT_PROGRAMMED,
+	FT_INVALID_ARGS,
+	FT_NOT_SUPPORTED,
+	FT_OTHER_ERROR,
+	FT_DEVICE_LIST_NOT_READY,
+};
+
+
+#define FT_SUCCESS(status) ((status) == FT_OK)
+
+//
+// FT_OpenEx Flags
+//
+
+#define FT_OPEN_BY_SERIAL_NUMBER	1
+#define FT_OPEN_BY_DESCRIPTION		2
+#define FT_OPEN_BY_LOCATION			4
+
+#define FT_OPEN_MASK (FT_OPEN_BY_SERIAL_NUMBER | \
+                      FT_OPEN_BY_DESCRIPTION | \
+                      FT_OPEN_BY_LOCATION)
+
+//
+// FT_ListDevices Flags (used in conjunction with FT_OpenEx Flags
+//
+
+#define FT_LIST_NUMBER_ONLY			0x80000000
+#define FT_LIST_BY_INDEX			0x40000000
+#define FT_LIST_ALL					0x20000000
+
+#define FT_LIST_MASK (FT_LIST_NUMBER_ONLY|FT_LIST_BY_INDEX|FT_LIST_ALL)
+
+//
+// Baud Rates
+//
+
+#define FT_BAUD_300			300
+#define FT_BAUD_600			600
+#define FT_BAUD_1200		1200
+#define FT_BAUD_2400		2400
+#define FT_BAUD_4800		4800
+#define FT_BAUD_9600		9600
+#define FT_BAUD_14400		14400
+#define FT_BAUD_19200		19200
+#define FT_BAUD_38400		38400
+#define FT_BAUD_57600		57600
+#define FT_BAUD_115200		115200
+#define FT_BAUD_230400		230400
+#define FT_BAUD_460800		460800
+#define FT_BAUD_921600		921600
+
+//
+// Word Lengths
+//
+
+#define FT_BITS_8			(UCHAR) 8
+#define FT_BITS_7			(UCHAR) 7
+
+//
+// Stop Bits
+//
+
+#define FT_STOP_BITS_1		(UCHAR) 0
+#define FT_STOP_BITS_2		(UCHAR) 2
+
+//
+// Parity
+//
+
+#define FT_PARITY_NONE		(UCHAR) 0
+#define FT_PARITY_ODD		(UCHAR) 1
+#define FT_PARITY_EVEN		(UCHAR) 2
+#define FT_PARITY_MARK		(UCHAR) 3
+#define FT_PARITY_SPACE		(UCHAR) 4
+
+//
+// Flow Control
+//
+
+#define FT_FLOW_NONE		0x0000
+#define FT_FLOW_RTS_CTS		0x0100
+#define FT_FLOW_DTR_DSR		0x0200
+#define FT_FLOW_XON_XOFF	0x0400
+
+//
+// Purge rx and tx buffers
+//
+#define FT_PURGE_RX			1
+#define FT_PURGE_TX			2
+
+//
+// Events
+//
+
+typedef void(*PFT_EVENT_HANDLER)(DWORD, DWORD);
+
+#define FT_EVENT_RXCHAR			1
+#define FT_EVENT_MODEM_STATUS	2
+#define FT_EVENT_LINE_STATUS	4
+
+//
+// Timeouts
+//
+
+#define FT_DEFAULT_RX_TIMEOUT	300
+#define FT_DEFAULT_TX_TIMEOUT	300
+
+//
+// Device types
+//
+
+typedef ULONG	FT_DEVICE;
+
+enum {
+	FT_DEVICE_BM,
+	FT_DEVICE_AM,
+	FT_DEVICE_100AX,
+	FT_DEVICE_UNKNOWN,
+	FT_DEVICE_2232C,
+	FT_DEVICE_232R,
+	FT_DEVICE_2232H,
+	FT_DEVICE_4232H,
+	FT_DEVICE_232H,
+	FT_DEVICE_X_SERIES,
+	FT_DEVICE_4222H_0,
+	FT_DEVICE_4222H_1_2,
+	FT_DEVICE_4222H_3,
+	FT_DEVICE_4222_PROG,
+	FT_DEVICE_900,
+	FT_DEVICE_930,
+	FT_DEVICE_UMFTPD3A,
+	FT_DEVICE_2233HP,
+	FT_DEVICE_4233HP,
+	FT_DEVICE_2232HP,
+	FT_DEVICE_4232HP,
+	FT_DEVICE_233HP,
+	FT_DEVICE_232HP,
+	FT_DEVICE_2232HA,
+	FT_DEVICE_4232HA,
+	FT_DEVICE_232RN,
+};
+
+//
+// Bit Modes
+//
+
+#define FT_BITMODE_RESET					0x00
+#define FT_BITMODE_ASYNC_BITBANG			0x01
+#define FT_BITMODE_MPSSE					0x02
+#define FT_BITMODE_SYNC_BITBANG				0x04
+#define FT_BITMODE_MCU_HOST					0x08
+#define FT_BITMODE_FAST_SERIAL				0x10
+#define FT_BITMODE_CBUS_BITBANG				0x20
+#define FT_BITMODE_SYNC_FIFO				0x40
+
+//
+// FT232R CBUS Options EEPROM values
+//
+
+#define FT_232R_CBUS_TXDEN					0x00	//	Tx Data Enable
+#define FT_232R_CBUS_PWRON					0x01	//	Power On
+#define FT_232R_CBUS_RXLED					0x02	//	Rx LED
+#define FT_232R_CBUS_TXLED					0x03	//	Tx LED
+#define FT_232R_CBUS_TXRXLED				0x04	//	Tx and Rx LED
+#define FT_232R_CBUS_SLEEP					0x05	//	Sleep
+#define FT_232R_CBUS_CLK48					0x06	//	48MHz clock
+#define FT_232R_CBUS_CLK24					0x07	//	24MHz clock
+#define FT_232R_CBUS_CLK12					0x08	//	12MHz clock
+#define FT_232R_CBUS_CLK6					0x09	//	6MHz clock
+#define FT_232R_CBUS_IOMODE					0x0A	//	IO Mode for CBUS bit-bang
+#define FT_232R_CBUS_BITBANG_WR				0x0B	//	Bit-bang write strobe
+#define FT_232R_CBUS_BITBANG_RD				0x0C	//	Bit-bang read strobe
+
+//
+// FT232H CBUS Options EEPROM values
+//
+
+#define FT_232H_CBUS_TRISTATE				0x00	//	Tristate
+#define FT_232H_CBUS_TXLED					0x01	//	Tx LED
+#define FT_232H_CBUS_RXLED					0x02	//	Rx LED
+#define FT_232H_CBUS_TXRXLED				0x03	//	Tx and Rx LED
+#define FT_232H_CBUS_PWREN					0x04	//	Power Enable
+#define FT_232H_CBUS_SLEEP					0x05	//	Sleep
+#define FT_232H_CBUS_DRIVE_0				0x06	//	Drive pin to logic 0
+#define FT_232H_CBUS_DRIVE_1				0x07	//	Drive pin to logic 1
+#define FT_232H_CBUS_IOMODE					0x08	//	IO Mode for CBUS bit-bang
+#define FT_232H_CBUS_TXDEN					0x09	//	Tx Data Enable
+#define FT_232H_CBUS_CLK30					0x0A	//	30MHz clock
+#define FT_232H_CBUS_CLK15					0x0B	//	15MHz clock
+#define FT_232H_CBUS_CLK7_5					0x0C	//	7.5MHz clock
+
+//
+// FT X Series CBUS Options EEPROM values
+//
+
+#define FT_X_SERIES_CBUS_TRISTATE			0x00	//	Tristate
+#define FT_X_SERIES_CBUS_TXLED				0x01	//	Tx LED
+#define FT_X_SERIES_CBUS_RXLED				0x02	//	Rx LED
+#define FT_X_SERIES_CBUS_TXRXLED			0x03	//	Tx and Rx LED
+#define FT_X_SERIES_CBUS_PWREN				0x04	//	Power Enable
+#define FT_X_SERIES_CBUS_SLEEP				0x05	//	Sleep
+#define FT_X_SERIES_CBUS_DRIVE_0			0x06	//	Drive pin to logic 0
+#define FT_X_SERIES_CBUS_DRIVE_1			0x07	//	Drive pin to logic 1
+#define FT_X_SERIES_CBUS_IOMODE				0x08	//	IO Mode for CBUS bit-bang
+#define FT_X_SERIES_CBUS_TXDEN				0x09	//	Tx Data Enable
+#define FT_X_SERIES_CBUS_CLK24				0x0A	//	24MHz clock
+#define FT_X_SERIES_CBUS_CLK12				0x0B	//	12MHz clock
+#define FT_X_SERIES_CBUS_CLK6				0x0C	//	6MHz clock
+#define FT_X_SERIES_CBUS_BCD_CHARGER		0x0D	//	Battery charger detected
+#define FT_X_SERIES_CBUS_BCD_CHARGER_N		0x0E	//	Battery charger detected inverted
+#define FT_X_SERIES_CBUS_I2C_TXE			0x0F	//	I2C Tx empty
+#define FT_X_SERIES_CBUS_I2C_RXF			0x10	//	I2C Rx full
+#define FT_X_SERIES_CBUS_VBUS_SENSE			0x11	//	Detect VBUS
+#define FT_X_SERIES_CBUS_BITBANG_WR			0x12	//	Bit-bang write strobe
+#define FT_X_SERIES_CBUS_BITBANG_RD			0x13	//	Bit-bang read strobe
+#define FT_X_SERIES_CBUS_TIMESTAMP			0x14	//	Toggle output when a USB SOF token is received
+#define FT_X_SERIES_CBUS_KEEP_AWAKE			0x15	//	
+
+
+// Driver types
+#define FT_DRIVER_TYPE_D2XX		0
+#define FT_DRIVER_TYPE_VCP		1
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#ifdef FTD2XX_STATIC
+	FTD2XX_API
+		FT_STATUS WINAPI FT_Initialise(
+		void
+		);
+
+	FTD2XX_API
+		void WINAPI FT_Finalise(
+		void
+		);
+#endif // FTD2XX_STATIC
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_Open(
+		int deviceNumber,
+		FT_HANDLE *pHandle
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_OpenEx(
+		PVOID pArg1,
+		DWORD Flags,
+		FT_HANDLE *pHandle
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_ListDevices(
+		PVOID pArg1,
+		PVOID pArg2,
+		DWORD Flags
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_Close(
+		FT_HANDLE ftHandle
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_Read(
+		FT_HANDLE ftHandle,
+		LPVOID lpBuffer,
+		DWORD dwBytesToRead,
+		LPDWORD lpBytesReturned
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_Write(
+		FT_HANDLE ftHandle,
+		LPVOID lpBuffer,
+		DWORD dwBytesToWrite,
+		LPDWORD lpBytesWritten
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_IoCtl(
+		FT_HANDLE ftHandle,
+		DWORD dwIoControlCode,
+		LPVOID lpInBuf,
+		DWORD nInBufSize,
+		LPVOID lpOutBuf,
+		DWORD nOutBufSize,
+		LPDWORD lpBytesReturned,
+		LPOVERLAPPED lpOverlapped
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_SetBaudRate(
+		FT_HANDLE ftHandle,
+		ULONG BaudRate
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_SetDivisor(
+		FT_HANDLE ftHandle,
+		USHORT Divisor
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_SetDataCharacteristics(
+		FT_HANDLE ftHandle,
+		UCHAR WordLength,
+		UCHAR StopBits,
+		UCHAR Parity
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_SetFlowControl(
+		FT_HANDLE ftHandle,
+		USHORT FlowControl,
+		UCHAR XonChar,
+		UCHAR XoffChar
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_ResetDevice(
+		FT_HANDLE ftHandle
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_SetDtr(
+		FT_HANDLE ftHandle
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_ClrDtr(
+		FT_HANDLE ftHandle
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_SetRts(
+		FT_HANDLE ftHandle
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_ClrRts(
+		FT_HANDLE ftHandle
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_GetModemStatus(
+		FT_HANDLE ftHandle,
+		ULONG *pModemStatus
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_SetChars(
+		FT_HANDLE ftHandle,
+		UCHAR EventChar,
+		UCHAR EventCharEnabled,
+		UCHAR ErrorChar,
+		UCHAR ErrorCharEnabled
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_Purge(
+		FT_HANDLE ftHandle,
+		ULONG Mask
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_SetTimeouts(
+		FT_HANDLE ftHandle,
+		ULONG ReadTimeout,
+		ULONG WriteTimeout
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_GetQueueStatus(
+		FT_HANDLE ftHandle,
+		DWORD *dwRxBytes
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_SetEventNotification(
+		FT_HANDLE ftHandle,
+		DWORD Mask,
+		PVOID Param
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_GetStatus(
+		FT_HANDLE ftHandle,
+		DWORD *dwRxBytes,
+		DWORD *dwTxBytes,
+		DWORD *dwEventDWord
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_SetBreakOn(
+		FT_HANDLE ftHandle
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_SetBreakOff(
+		FT_HANDLE ftHandle
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_SetWaitMask(
+		FT_HANDLE ftHandle,
+		DWORD Mask
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_WaitOnMask(
+		FT_HANDLE ftHandle,
+		DWORD *Mask
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_GetEventStatus(
+		FT_HANDLE ftHandle,
+		DWORD *dwEventDWord
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_ReadEE(
+		FT_HANDLE ftHandle,
+		DWORD dwWordOffset,
+		LPWORD lpwValue
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_WriteEE(
+		FT_HANDLE ftHandle,
+		DWORD dwWordOffset,
+		WORD wValue
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_EraseEE(
+		FT_HANDLE ftHandle
+		);
+
+	//
+	// structure to hold program data for FT_EE_Program, FT_EE_ProgramEx, FT_EE_Read 
+	// and FT_EE_ReadEx functions
+	//
+	typedef struct ft_program_data {
+
+		DWORD Signature1;			// Header - must be 0x00000000 
+		DWORD Signature2;			// Header - must be 0xffffffff
+		DWORD Version;				// Header - FT_PROGRAM_DATA version
+		//			0 = original
+		//			1 = FT2232 extensions
+		//			2 = FT232R extensions
+		//			3 = FT2232H extensions
+		//			4 = FT4232H extensions
+		//			5 = FT232H extensions
+
+		WORD VendorId;				// 0x0403
+		WORD ProductId;				// 0x6001
+		char *Manufacturer;			// "FTDI"
+		char *ManufacturerId;		// "FT"
+		char *Description;			// "USB HS Serial Converter"
+		char *SerialNumber;			// "FT000001" if fixed, or NULL
+		WORD MaxPower;				// 0 < MaxPower <= 500
+		WORD PnP;					// 0 = disabled, 1 = enabled
+		WORD SelfPowered;			// 0 = bus powered, 1 = self powered
+		WORD RemoteWakeup;			// 0 = not capable, 1 = capable
+		//
+		// Rev4 (FT232B) extensions
+		//
+		UCHAR Rev4;					// non-zero if Rev4 chip, zero otherwise
+		UCHAR IsoIn;				// non-zero if in endpoint is isochronous
+		UCHAR IsoOut;				// non-zero if out endpoint is isochronous
+		UCHAR PullDownEnable;		// non-zero if pull down enabled
+		UCHAR SerNumEnable;			// non-zero if serial number to be used
+		UCHAR USBVersionEnable;		// non-zero if chip uses USBVersion
+		WORD USBVersion;			// BCD (0x0200 => USB2)
+		//
+		// Rev 5 (FT2232) extensions
+		//
+		UCHAR Rev5;					// non-zero if Rev5 chip, zero otherwise
+		UCHAR IsoInA;				// non-zero if in endpoint is isochronous
+		UCHAR IsoInB;				// non-zero if in endpoint is isochronous
+		UCHAR IsoOutA;				// non-zero if out endpoint is isochronous
+		UCHAR IsoOutB;				// non-zero if out endpoint is isochronous
+		UCHAR PullDownEnable5;		// non-zero if pull down enabled
+		UCHAR SerNumEnable5;		// non-zero if serial number to be used
+		UCHAR USBVersionEnable5;	// non-zero if chip uses USBVersion
+		WORD USBVersion5;			// BCD (0x0200 => USB2)
+		UCHAR AIsHighCurrent;		// non-zero if interface is high current
+		UCHAR BIsHighCurrent;		// non-zero if interface is high current
+		UCHAR IFAIsFifo;			// non-zero if interface is 245 FIFO
+		UCHAR IFAIsFifoTar;			// non-zero if interface is 245 FIFO CPU target
+		UCHAR IFAIsFastSer;			// non-zero if interface is Fast serial
+		UCHAR AIsVCP;				// non-zero if interface is to use VCP drivers
+		UCHAR IFBIsFifo;			// non-zero if interface is 245 FIFO
+		UCHAR IFBIsFifoTar;			// non-zero if interface is 245 FIFO CPU target
+		UCHAR IFBIsFastSer;			// non-zero if interface is Fast serial
+		UCHAR BIsVCP;				// non-zero if interface is to use VCP drivers
+		//
+		// Rev 6 (FT232R) extensions
+		//
+		UCHAR UseExtOsc;			// Use External Oscillator
+		UCHAR HighDriveIOs;			// High Drive I/Os
+		UCHAR EndpointSize;			// Endpoint size
+		UCHAR PullDownEnableR;		// non-zero if pull down enabled
+		UCHAR SerNumEnableR;		// non-zero if serial number to be used
+		UCHAR InvertTXD;			// non-zero if invert TXD
+		UCHAR InvertRXD;			// non-zero if invert RXD
+		UCHAR InvertRTS;			// non-zero if invert RTS
+		UCHAR InvertCTS;			// non-zero if invert CTS
+		UCHAR InvertDTR;			// non-zero if invert DTR
+		UCHAR InvertDSR;			// non-zero if invert DSR
+		UCHAR InvertDCD;			// non-zero if invert DCD
+		UCHAR InvertRI;				// non-zero if invert RI
+		UCHAR Cbus0;				// Cbus Mux control
+		UCHAR Cbus1;				// Cbus Mux control
+		UCHAR Cbus2;				// Cbus Mux control
+		UCHAR Cbus3;				// Cbus Mux control
+		UCHAR Cbus4;				// Cbus Mux control
+		UCHAR RIsD2XX;				// non-zero if using D2XX driver
+		//
+		// Rev 7 (FT2232H) Extensions
+		//
+		UCHAR PullDownEnable7;		// non-zero if pull down enabled
+		UCHAR SerNumEnable7;		// non-zero if serial number to be used
+		UCHAR ALSlowSlew;			// non-zero if AL pins have slow slew
+		UCHAR ALSchmittInput;		// non-zero if AL pins are Schmitt input
+		UCHAR ALDriveCurrent;		// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR AHSlowSlew;			// non-zero if AH pins have slow slew
+		UCHAR AHSchmittInput;		// non-zero if AH pins are Schmitt input
+		UCHAR AHDriveCurrent;		// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR BLSlowSlew;			// non-zero if BL pins have slow slew
+		UCHAR BLSchmittInput;		// non-zero if BL pins are Schmitt input
+		UCHAR BLDriveCurrent;		// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR BHSlowSlew;			// non-zero if BH pins have slow slew
+		UCHAR BHSchmittInput;		// non-zero if BH pins are Schmitt input
+		UCHAR BHDriveCurrent;		// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR IFAIsFifo7;			// non-zero if interface is 245 FIFO
+		UCHAR IFAIsFifoTar7;		// non-zero if interface is 245 FIFO CPU target
+		UCHAR IFAIsFastSer7;		// non-zero if interface is Fast serial
+		UCHAR AIsVCP7;				// non-zero if interface is to use VCP drivers
+		UCHAR IFBIsFifo7;			// non-zero if interface is 245 FIFO
+		UCHAR IFBIsFifoTar7;		// non-zero if interface is 245 FIFO CPU target
+		UCHAR IFBIsFastSer7;		// non-zero if interface is Fast serial
+		UCHAR BIsVCP7;				// non-zero if interface is to use VCP drivers
+		UCHAR PowerSaveEnable;		// non-zero if using BCBUS7 to save power for self-powered designs
+		//
+		// Rev 8 (FT4232H) Extensions
+		//
+		UCHAR PullDownEnable8;		// non-zero if pull down enabled
+		UCHAR SerNumEnable8;		// non-zero if serial number to be used
+		UCHAR ASlowSlew;			// non-zero if A pins have slow slew
+		UCHAR ASchmittInput;		// non-zero if A pins are Schmitt input
+		UCHAR ADriveCurrent;		// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR BSlowSlew;			// non-zero if B pins have slow slew
+		UCHAR BSchmittInput;		// non-zero if B pins are Schmitt input
+		UCHAR BDriveCurrent;		// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR CSlowSlew;			// non-zero if C pins have slow slew
+		UCHAR CSchmittInput;		// non-zero if C pins are Schmitt input
+		UCHAR CDriveCurrent;		// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR DSlowSlew;			// non-zero if D pins have slow slew
+		UCHAR DSchmittInput;		// non-zero if D pins are Schmitt input
+		UCHAR DDriveCurrent;		// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR ARIIsTXDEN;			// non-zero if port A uses RI as RS485 TXDEN
+		UCHAR BRIIsTXDEN;			// non-zero if port B uses RI as RS485 TXDEN
+		UCHAR CRIIsTXDEN;			// non-zero if port C uses RI as RS485 TXDEN
+		UCHAR DRIIsTXDEN;			// non-zero if port D uses RI as RS485 TXDEN
+		UCHAR AIsVCP8;				// non-zero if interface is to use VCP drivers
+		UCHAR BIsVCP8;				// non-zero if interface is to use VCP drivers
+		UCHAR CIsVCP8;				// non-zero if interface is to use VCP drivers
+		UCHAR DIsVCP8;				// non-zero if interface is to use VCP drivers
+		//
+		// Rev 9 (FT232H) Extensions
+		//
+		UCHAR PullDownEnableH;		// non-zero if pull down enabled
+		UCHAR SerNumEnableH;		// non-zero if serial number to be used
+		UCHAR ACSlowSlewH;			// non-zero if AC pins have slow slew
+		UCHAR ACSchmittInputH;		// non-zero if AC pins are Schmitt input
+		UCHAR ACDriveCurrentH;		// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR ADSlowSlewH;			// non-zero if AD pins have slow slew
+		UCHAR ADSchmittInputH;		// non-zero if AD pins are Schmitt input
+		UCHAR ADDriveCurrentH;		// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR Cbus0H;				// Cbus Mux control
+		UCHAR Cbus1H;				// Cbus Mux control
+		UCHAR Cbus2H;				// Cbus Mux control
+		UCHAR Cbus3H;				// Cbus Mux control
+		UCHAR Cbus4H;				// Cbus Mux control
+		UCHAR Cbus5H;				// Cbus Mux control
+		UCHAR Cbus6H;				// Cbus Mux control
+		UCHAR Cbus7H;				// Cbus Mux control
+		UCHAR Cbus8H;				// Cbus Mux control
+		UCHAR Cbus9H;				// Cbus Mux control
+		UCHAR IsFifoH;				// non-zero if interface is 245 FIFO
+		UCHAR IsFifoTarH;			// non-zero if interface is 245 FIFO CPU target
+		UCHAR IsFastSerH;			// non-zero if interface is Fast serial
+		UCHAR IsFT1248H;			// non-zero if interface is FT1248
+		UCHAR FT1248CpolH;			// FT1248 clock polarity - clock idle high (1) or clock idle low (0)
+		UCHAR FT1248LsbH;			// FT1248 data is LSB (1) or MSB (0)
+		UCHAR FT1248FlowControlH;	// FT1248 flow control enable
+		UCHAR IsVCPH;				// non-zero if interface is to use VCP drivers
+		UCHAR PowerSaveEnableH;		// non-zero if using ACBUS7 to save power for self-powered designs
+
+	} FT_PROGRAM_DATA, *PFT_PROGRAM_DATA;
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_EE_Program(
+		FT_HANDLE ftHandle,
+		PFT_PROGRAM_DATA pData
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_EE_ProgramEx(
+		FT_HANDLE ftHandle,
+		PFT_PROGRAM_DATA pData,
+		char *Manufacturer,
+		char *ManufacturerId,
+		char *Description,
+		char *SerialNumber
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_EE_Read(
+		FT_HANDLE ftHandle,
+		PFT_PROGRAM_DATA pData
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_EE_ReadEx(
+		FT_HANDLE ftHandle,
+		PFT_PROGRAM_DATA pData,
+		char *Manufacturer,
+		char *ManufacturerId,
+		char *Description,
+		char *SerialNumber
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_EE_UASize(
+		FT_HANDLE ftHandle,
+		LPDWORD lpdwSize
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_EE_UAWrite(
+		FT_HANDLE ftHandle,
+		PUCHAR pucData,
+		DWORD dwDataLen
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_EE_UARead(
+		FT_HANDLE ftHandle,
+		PUCHAR pucData,
+		DWORD dwDataLen,
+		LPDWORD lpdwBytesRead
+		);
+
+
+	typedef struct ft_eeprom_header {
+		FT_DEVICE deviceType;		// FTxxxx device type to be programmed
+		// Device descriptor options
+		WORD VendorId;				// 0x0403
+		WORD ProductId;				// 0x6001
+		UCHAR SerNumEnable;			// non-zero if serial number to be used
+		// Config descriptor options
+		WORD MaxPower;				// 0 < MaxPower <= 500
+		UCHAR SelfPowered;			// 0 = bus powered, 1 = self powered
+		UCHAR RemoteWakeup;			// 0 = not capable, 1 = capable
+		// Hardware options
+		UCHAR PullDownEnable;		// non-zero if pull down in suspend enabled
+	} FT_EEPROM_HEADER, *PFT_EEPROM_HEADER;
+
+
+	// FT232B EEPROM structure for use with FT_EEPROM_Read and FT_EEPROM_Program
+	typedef struct ft_eeprom_232b {
+		// Common header
+		FT_EEPROM_HEADER common;	// common elements for all device EEPROMs
+	} FT_EEPROM_232B, *PFT_EEPROM_232B;
+
+
+	// FT2232 EEPROM structure for use with FT_EEPROM_Read and FT_EEPROM_Program
+	typedef struct ft_eeprom_2232 {
+		// Common header
+		FT_EEPROM_HEADER common;	// common elements for all device EEPROMs
+		// Drive options
+		UCHAR AIsHighCurrent;		// non-zero if interface is high current
+		UCHAR BIsHighCurrent;		// non-zero if interface is high current
+		// Hardware options
+		UCHAR AIsFifo;				// non-zero if interface is 245 FIFO
+		UCHAR AIsFifoTar;			// non-zero if interface is 245 FIFO CPU target
+		UCHAR AIsFastSer;			// non-zero if interface is Fast serial
+		UCHAR BIsFifo;				// non-zero if interface is 245 FIFO
+		UCHAR BIsFifoTar;			// non-zero if interface is 245 FIFO CPU target
+		UCHAR BIsFastSer;			// non-zero if interface is Fast serial
+		// Driver option
+		UCHAR ADriverType;			// non-zero if interface is to use VCP drivers
+		UCHAR BDriverType;			// non-zero if interface is to use VCP drivers
+	} FT_EEPROM_2232, *PFT_EEPROM_2232;
+
+
+	// FT232R EEPROM structure for use with FT_EEPROM_Read and FT_EEPROM_Program
+	typedef struct ft_eeprom_232r {
+		// Common header
+		FT_EEPROM_HEADER common;	// common elements for all device EEPROMs
+		// Drive options
+		UCHAR IsHighCurrent;		// non-zero if interface is high current
+		// Hardware options
+		UCHAR UseExtOsc;			// Use External Oscillator
+		UCHAR InvertTXD;			// non-zero if invert TXD
+		UCHAR InvertRXD;			// non-zero if invert RXD
+		UCHAR InvertRTS;			// non-zero if invert RTS
+		UCHAR InvertCTS;			// non-zero if invert CTS
+		UCHAR InvertDTR;			// non-zero if invert DTR
+		UCHAR InvertDSR;			// non-zero if invert DSR
+		UCHAR InvertDCD;			// non-zero if invert DCD
+		UCHAR InvertRI;				// non-zero if invert RI
+		UCHAR Cbus0;				// Cbus Mux control
+		UCHAR Cbus1;				// Cbus Mux control
+		UCHAR Cbus2;				// Cbus Mux control
+		UCHAR Cbus3;				// Cbus Mux control
+		UCHAR Cbus4;				// Cbus Mux control
+		// Driver option
+		UCHAR DriverType;			// non-zero if using D2XX driver
+	} FT_EEPROM_232R, *PFT_EEPROM_232R;
+
+
+	// FT2232H EEPROM structure for use with FT_EEPROM_Read and FT_EEPROM_Program
+	typedef struct ft_eeprom_2232h {
+		// Common header
+		FT_EEPROM_HEADER common;	// common elements for all device EEPROMs
+		// Drive options
+		UCHAR ALSlowSlew;			// non-zero if AL pins have slow slew
+		UCHAR ALSchmittInput;		// non-zero if AL pins are Schmitt input
+		UCHAR ALDriveCurrent;		// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR AHSlowSlew;			// non-zero if AH pins have slow slew
+		UCHAR AHSchmittInput;		// non-zero if AH pins are Schmitt input
+		UCHAR AHDriveCurrent;		// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR BLSlowSlew;			// non-zero if BL pins have slow slew
+		UCHAR BLSchmittInput;		// non-zero if BL pins are Schmitt input
+		UCHAR BLDriveCurrent;		// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR BHSlowSlew;			// non-zero if BH pins have slow slew
+		UCHAR BHSchmittInput;		// non-zero if BH pins are Schmitt input
+		UCHAR BHDriveCurrent;		// valid values are 4mA, 8mA, 12mA, 16mA
+		// Hardware options
+		UCHAR AIsFifo;				// non-zero if interface is 245 FIFO
+		UCHAR AIsFifoTar;			// non-zero if interface is 245 FIFO CPU target
+		UCHAR AIsFastSer;			// non-zero if interface is Fast serial
+		UCHAR BIsFifo;				// non-zero if interface is 245 FIFO
+		UCHAR BIsFifoTar;			// non-zero if interface is 245 FIFO CPU target
+		UCHAR BIsFastSer;			// non-zero if interface is Fast serial
+		UCHAR PowerSaveEnable;		// non-zero if using BCBUS7 to save power for self-powered designs
+		// Driver option
+		UCHAR ADriverType;			// non-zero if interface is to use VCP drivers
+		UCHAR BDriverType;			// non-zero if interface is to use VCP drivers
+	} FT_EEPROM_2232H, *PFT_EEPROM_2232H;
+
+
+	// FT4232H EEPROM structure for use with FT_EEPROM_Read and FT_EEPROM_Program
+	typedef struct ft_eeprom_4232h {
+		// Common header
+		FT_EEPROM_HEADER common;	// common elements for all device EEPROMs
+		// Drive options
+		UCHAR ASlowSlew;			// non-zero if A pins have slow slew
+		UCHAR ASchmittInput;		// non-zero if A pins are Schmitt input
+		UCHAR ADriveCurrent;		// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR BSlowSlew;			// non-zero if B pins have slow slew
+		UCHAR BSchmittInput;		// non-zero if B pins are Schmitt input
+		UCHAR BDriveCurrent;		// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR CSlowSlew;			// non-zero if C pins have slow slew
+		UCHAR CSchmittInput;		// non-zero if C pins are Schmitt input
+		UCHAR CDriveCurrent;		// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR DSlowSlew;			// non-zero if D pins have slow slew
+		UCHAR DSchmittInput;		// non-zero if D pins are Schmitt input
+		UCHAR DDriveCurrent;		// valid values are 4mA, 8mA, 12mA, 16mA
+		// Hardware options
+		UCHAR ARIIsTXDEN;			// non-zero if port A uses RI as RS485 TXDEN
+		UCHAR BRIIsTXDEN;			// non-zero if port B uses RI as RS485 TXDEN
+		UCHAR CRIIsTXDEN;			// non-zero if port C uses RI as RS485 TXDEN
+		UCHAR DRIIsTXDEN;			// non-zero if port D uses RI as RS485 TXDEN
+		// Driver option
+		UCHAR ADriverType;			// non-zero if interface is to use VCP drivers
+		UCHAR BDriverType;			// non-zero if interface is to use VCP drivers
+		UCHAR CDriverType;			// non-zero if interface is to use VCP drivers
+		UCHAR DDriverType;			// non-zero if interface is to use VCP drivers
+	} FT_EEPROM_4232H, *PFT_EEPROM_4232H;
+
+
+	// FT232H EEPROM structure for use with FT_EEPROM_Read and FT_EEPROM_Program
+	typedef struct ft_eeprom_232h {
+		// Common header
+		FT_EEPROM_HEADER common;	// common elements for all device EEPROMs
+		// Drive options
+		UCHAR ACSlowSlew;			// non-zero if AC bus pins have slow slew
+		UCHAR ACSchmittInput;		// non-zero if AC bus pins are Schmitt input
+		UCHAR ACDriveCurrent;		// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR ADSlowSlew;			// non-zero if AD bus pins have slow slew
+		UCHAR ADSchmittInput;		// non-zero if AD bus pins are Schmitt input
+		UCHAR ADDriveCurrent;		// valid values are 4mA, 8mA, 12mA, 16mA
+		// CBUS options
+		UCHAR Cbus0;				// Cbus Mux control
+		UCHAR Cbus1;				// Cbus Mux control
+		UCHAR Cbus2;				// Cbus Mux control
+		UCHAR Cbus3;				// Cbus Mux control
+		UCHAR Cbus4;				// Cbus Mux control
+		UCHAR Cbus5;				// Cbus Mux control
+		UCHAR Cbus6;				// Cbus Mux control
+		UCHAR Cbus7;				// Cbus Mux control
+		UCHAR Cbus8;				// Cbus Mux control
+		UCHAR Cbus9;				// Cbus Mux control
+		// FT1248 options
+		UCHAR FT1248Cpol;			// FT1248 clock polarity - clock idle high (1) or clock idle low (0)
+		UCHAR FT1248Lsb;			// FT1248 data is LSB (1) or MSB (0)
+		UCHAR FT1248FlowControl;	// FT1248 flow control enable
+		// Hardware options
+		UCHAR IsFifo;				// non-zero if interface is 245 FIFO
+		UCHAR IsFifoTar;			// non-zero if interface is 245 FIFO CPU target
+		UCHAR IsFastSer;			// non-zero if interface is Fast serial
+		UCHAR IsFT1248;			// non-zero if interface is FT1248
+		UCHAR PowerSaveEnable;		// 
+		// Driver option
+		UCHAR DriverType;			// non-zero if interface is to use VCP drivers
+	} FT_EEPROM_232H, *PFT_EEPROM_232H;
+
+
+	// FT X Series EEPROM structure for use with FT_EEPROM_Read and FT_EEPROM_Program
+	typedef struct ft_eeprom_x_series {
+		// Common header
+		FT_EEPROM_HEADER common;	// common elements for all device EEPROMs
+		// Drive options
+		UCHAR ACSlowSlew;			// non-zero if AC bus pins have slow slew
+		UCHAR ACSchmittInput;		// non-zero if AC bus pins are Schmitt input
+		UCHAR ACDriveCurrent;		// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR ADSlowSlew;			// non-zero if AD bus pins have slow slew
+		UCHAR ADSchmittInput;		// non-zero if AD bus pins are Schmitt input
+		UCHAR ADDriveCurrent;		// valid values are 4mA, 8mA, 12mA, 16mA
+		// CBUS options
+		UCHAR Cbus0;				// Cbus Mux control
+		UCHAR Cbus1;				// Cbus Mux control
+		UCHAR Cbus2;				// Cbus Mux control
+		UCHAR Cbus3;				// Cbus Mux control
+		UCHAR Cbus4;				// Cbus Mux control
+		UCHAR Cbus5;				// Cbus Mux control
+		UCHAR Cbus6;				// Cbus Mux control
+		// UART signal options
+		UCHAR InvertTXD;			// non-zero if invert TXD
+		UCHAR InvertRXD;			// non-zero if invert RXD
+		UCHAR InvertRTS;			// non-zero if invert RTS
+		UCHAR InvertCTS;			// non-zero if invert CTS
+		UCHAR InvertDTR;			// non-zero if invert DTR
+		UCHAR InvertDSR;			// non-zero if invert DSR
+		UCHAR InvertDCD;			// non-zero if invert DCD
+		UCHAR InvertRI;				// non-zero if invert RI
+		// Battery Charge Detect options
+		UCHAR BCDEnable;			// Enable Battery Charger Detection
+		UCHAR BCDForceCbusPWREN;	// asserts the power enable signal on CBUS when charging port detected
+		UCHAR BCDDisableSleep;		// forces the device never to go into sleep mode
+		// I2C options
+		WORD I2CSlaveAddress;		// I2C slave device address
+		DWORD I2CDeviceId;			// I2C device ID
+		UCHAR I2CDisableSchmitt;	// Disable I2C Schmitt trigger
+		// FT1248 options
+		UCHAR FT1248Cpol;			// FT1248 clock polarity - clock idle high (1) or clock idle low (0)
+		UCHAR FT1248Lsb;			// FT1248 data is LSB (1) or MSB (0)
+		UCHAR FT1248FlowControl;	// FT1248 flow control enable
+		// Hardware options
+		UCHAR RS485EchoSuppress;	// 
+		UCHAR PowerSaveEnable;		// 
+		// Driver option
+		UCHAR DriverType;			// non-zero if interface is to use VCP drivers
+	} FT_EEPROM_X_SERIES, *PFT_EEPROM_X_SERIES;
+
+
+	// FT4222H EEPROM structure for use with FT_EEPROM_Read and FT_EEPROM_Program
+	typedef struct ft_eeprom_4222h {
+		// Common header
+		FT_EEPROM_HEADER common;	// common elements for all device EEPROMs
+		CHAR Revision;				// 'A', 'B', 'C', or 'D'.
+		UCHAR I2C_Slave_Address;
+		// Suspend
+		UCHAR SPISuspend;			// 0 for "Disable SPI, tristate pins", 2 for "Keep SPI pin status", 3 for "Enable SPI pin control"
+		UCHAR SuspendOutPol;		// 0 for negative, 1 for positive (not implemented on Rev A)
+		UCHAR EnableSuspendOut;		// non-zero to enable (not implemented on Rev A)
+		// QSPI
+		UCHAR Clock_SlowSlew;		// non-zero if clock pin has slow slew
+		UCHAR Clock_Drive;			// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR IO0_SlowSlew;			// non-zero if IO0 pin has slow slew
+		UCHAR IO1_SlowSlew;			// non-zero if IO1 pin has slow slew
+		UCHAR IO2_SlowSlew;			// non-zero if IO2 pin has slow slew
+		UCHAR IO3_SlowSlew;			// non-zero if IO3 pin has slow slew
+		UCHAR IO_Drive; 			// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR SlaveSelect_PullUp;	// non-zero to enable pull up
+		UCHAR SlaveSelect_PullDown;	// non-zero to enable pull down
+		UCHAR SlaveSelect_Drive;	// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR SlaveSelect_SlowSlew;	// non-zero if slave select pin has slow slew
+		UCHAR MISO_Suspend;			// 2 for push-low, 3 for push high, 0 and 1 reserved
+		UCHAR SIMO_Suspend;			// 2 for push-low, 3 for push high, 0 and 1 reserved
+		UCHAR IO2_IO3_Suspend;		// 2 for push-low, 3 for push high, 0 and 1 reserved
+		UCHAR SlaveSelect_Suspend;	// 0 for no-change (not implemented on Rev A), 2 for push-low, 3 for push high, 1 reserved
+		// GPIO
+		UCHAR GPIO0_Drive;			// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR GPIO1_Drive;			// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR GPIO2_Drive;			// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR GPIO3_Drive;			// valid values are 4mA, 8mA, 12mA, 16mA
+		UCHAR GPIO0_SlowSlew;		// non-zero if IO0 pin has slow slew
+		UCHAR GPIO1_SlowSlew;		// non-zero if IO0 pin has slow slew
+		UCHAR GPIO2_SlowSlew;		// non-zero if IO0 pin has slow slew
+		UCHAR GPIO3_SlowSlew;		// non-zero if IO0 pin has slow slew
+		UCHAR GPIO0_PullDown;		// non-zero to enable pull down
+		UCHAR GPIO1_PullDown;		// non-zero to enable pull down
+		UCHAR GPIO2_PullDown;		// non-zero to enable pull down
+		UCHAR GPIO3_PullDown;		// non-zero to enable pull down
+		UCHAR GPIO0_PullUp;			// non-zero to enable pull up
+		UCHAR GPIO1_PullUp;			// non-zero to enable pull up
+		UCHAR GPIO2_PullUp;			// non-zero to enable pull up
+		UCHAR GPIO3_PullUp;			// non-zero to enable pull up
+		UCHAR GPIO0_OpenDrain;		// non-zero to enable open drain
+		UCHAR GPIO1_OpenDrain;		// non-zero to enable open drain
+		UCHAR GPIO2_OpenDrain;		// non-zero to enable open drain
+		UCHAR GPIO3_OpenDrain;		// non-zero to enable open drain
+		UCHAR GPIO0_Suspend;		// 0 for no-change, 1 for input (not implemented on Rev A), 2 for push-low, 3 for push high
+		UCHAR GPIO1_Suspend;		// 0 for no-change, 1 for input (not implemented on Rev A), 2 for push-low, 3 for push high
+		UCHAR GPIO2_Suspend;		// 0 for no-change, 1 for input (not implemented on Rev A), 2 for push-low, 3 for push high
+		UCHAR GPIO3_Suspend;		// 0 for no-change, 1 for input (not implemented on Rev A), 2 for push-low, 3 for push high
+		UCHAR FallingEdge;			// non-zero to change GPIO on falling edge
+		// BCD
+		UCHAR BCD_Disable;			// non-zero to disable BCD
+		UCHAR BCD_OutputActiveLow;	// non-zero to set BCD output active low
+		UCHAR BCD_Drive;			// valid values are 4mA, 8mA, 12mA, 16mA
+	} FT_EEPROM_4222H, *PFT_EEPROM_4222H;
+
+
+	// Power Delivery structures for use with FT_EEPROM_Read and FT_EEPROM_Program
+	// PDO Configuration structure, mA supported values 0 to 10230mA, mV supported values 0 to 51100mV
+	// This is part of the FT_EEPROM_PD structure.
+	typedef struct ft_eeprom_PD_PDO_mv_ma {
+		USHORT PDO1ma;	// PDO1 mA
+		USHORT PDO1mv;	// PDO1 mV
+		USHORT PDO2ma;	// PDO2 mA
+		USHORT PDO2mv;	// PDO2 mV
+		USHORT PDO3ma;	// PDO3 mA
+		USHORT PDO3mv;	// PDO3 mV
+		USHORT PDO4ma;	// PDO4 mA
+		USHORT PDO4mv;	// PDO4 mV
+		USHORT PDO5ma;	// PDO5 mA (FTx233HP only)
+		USHORT PDO5mv;	// PDO5 mV (FTx233HP only)
+		USHORT PDO6ma;	// PDO6 mA (FTx233HP only)
+		USHORT PDO6mv;	// PDO6 mV (FTx233HP only)
+		USHORT PDO7ma;	// PDO7 mA (FTx233HP only)
+		USHORT PDO7mv;	// PDO7 mV (FTx233HP only)
+	} FT_EEPROM_PD_PDO_mv_ma;
+
+	// PD EEPROM structure for use with FT_EEPROM_Read and FT_EEPROM_Program
+	// This is appended to the end of the base device structure. e_g. 
+	//		struct {
+	//			FT_EEPROM_xxx base;
+	//			FT_EEPROM_PD pd;
+	//		};
+	// Device GPIO values are:
+	//	FTx233HP - 0 to 7, 15 for N/A
+	//	FTx232HP - 0 to 3, 15 for N/A
+	typedef struct ft_eeprom_pd {
+		// Configuration
+		UCHAR srprs;		// non-zero to enable Sink Request Power Role Swap
+		UCHAR sraprs;		// non-zero to enable Sink Accept PR Swap
+		UCHAR srrprs;		// non-zero to enable Source Request PR SWAP
+		UCHAR saprs;		// non-zero to enable Source Accept PR SWAP
+		UCHAR vconns;		// non-zero to enable vConn Swap
+		UCHAR passthru;		// non-zero to enable Pass Through (FTx233HP only)
+		UCHAR extmcu;		// non-zero to enable External MCU
+		UCHAR pd2en;		// non-zero to enable PD2 (FTx233HP only)
+		UCHAR pd1autoclk;	// non-zero to enable PD1 Auto Clock
+		UCHAR pd2autoclk;	// non-zero to enable PD2 Auto Clock (FTx233HP only)
+		UCHAR useefuse;		// non-zero to Use EFUSE
+		UCHAR extvconn;		// non-zero to enable External vConn
+
+		// GPIO Configuration
+		UCHAR count;		// GPIO Count, supported values are 0 to 7 
+		UCHAR gpio1;		// GPIO Number 1, supports device GPIO values
+		UCHAR gpio2;		// GPIO Number 2, supports device GPIO values
+		UCHAR gpio3;		// GPIO Number 3, supports device GPIO values
+		UCHAR gpio4;		// GPIO Number 4, supports device GPIO values
+		UCHAR gpio5;		// GPIO Number 5, supports device GPIO values (FTx233HP only)
+		UCHAR gpio6;		// GPIO Number 6, supports device GPIO values (FTx233HP only)
+		UCHAR gpio7;		// GPIO Number 7, supports device GPIO values (FTx233HP only)
+		UCHAR pd1lden;		// PD1 Load Enable, supports device GPIO values
+		UCHAR pd2lden;		// PD2 Load Enable, supports device GPIO values (FTx233HP only)
+		UCHAR dispin;		// Discharge Pin, supports device GPIO values
+		UCHAR disenbm;		// Discharge Enable BM, 0 for "Drive Hi", 1 for "Drive Low", 2 for "Input Mode", 3 for "Don't Care"
+		UCHAR disdisbm;		// Discharge Disable BM, 0 for "Drive Hi", 1 for "Drive Low", 2 for "Input Mode", 3 for "Don't Care"
+		UCHAR ccselect;		// CC Select Indicator, supports device GPIO values
+
+		// ISET Configuration
+		UCHAR iset1;		// ISET1, supports device GPIO values
+		UCHAR iset2;		// ISET2, supports device GPIO values
+		UCHAR iset3;		// ISET3, supports device GPIO values
+		UCHAR extiset;		// non-zero to enable EXTEND_ISET
+		UCHAR isetpd2;		// non-zero to enable ISET_PD2
+		UCHAR iseten;		// non-zero to set ISET_ENABLED
+
+		// BM Configuration, 0 for "Drive Hi", 1 for "Drive Low", 2 for "Input Mode", 3 for "Don't Care"
+		UCHAR PDO1_GPIO[7];		// PDO1 GPIO1 to GPIO7
+		UCHAR PDO2_GPIO[7];		// PDO2 GPIO1 to GPIO7
+		UCHAR PDO3_GPIO[7];		// PDO3 GPIO1 to GPIO7
+		UCHAR PDO4_GPIO[7];		// PDO4 GPIO1 to GPIO7
+		UCHAR PDO5_GPIO[7];		// PDO5 GPIO1 to GPIO7 (FTx233HP only)
+		UCHAR PDO6_GPIO[7];		// PDO6 GPIO1 to GPIO7 (FTx233HP only)
+		UCHAR PDO7_GPIO[7];		// PDO7 GPIO1 to GPIO7 (FTx233HP only)
+		UCHAR VSET0V_GPIO[7];	// PDO7 GPIO1 to GPIO7
+		UCHAR VSAFE5V_GPIO[7];	// PDO7 GPIO1 to GPIO7
+
+		FT_EEPROM_PD_PDO_mv_ma BM_PDO_Sink;
+		FT_EEPROM_PD_PDO_mv_ma BM_PDO_Source;
+		FT_EEPROM_PD_PDO_mv_ma BM_PDO_Sink_2; // (FTx233HP only)
+
+		// PD Timers
+		UCHAR srt;			// Sender Response Timer
+		UCHAR hrt;			// Hard Reset Timer
+		UCHAR sct;			// Source Capability Timer
+		UCHAR dit;			// Discover Identity Timer
+		USHORT srcrt;		// Source Recover Timer
+		USHORT trt;			// Transition Timer
+		USHORT sofft;		// Source off timer
+		USHORT nrt;			// No Response Timer
+		USHORT swct;		// Sink Wait Capability Timer
+		USHORT snkrt;		// Sink Request Timer
+		UCHAR dt;			// Discharge Timer
+		UCHAR cnst;			// Chunk not supported timer
+		USHORT it;			// Idle Timer
+
+		// PD Control
+		UCHAR i2caddr;		// I2C Address (hex)
+		UINT prou;			// Power Reserved for OWN use
+		UINT trim1;			// TRIM1
+		UINT trim2;			// TRIM2
+		UCHAR extdc;		// non-zero to enable ETERNAL_DC_POWER
+	} FT_EEPROM_PD, *PFT_EEPROM_PD;
+
+	// FT2233HP EEPROM structure for use with FT_EEPROM_Read and FT_EEPROM_Program
+	// FT2232H with power delivery
+	typedef struct _ft_eeprom_2233hp
+	{
+		FT_EEPROM_2232H	ft2232h;
+		FT_EEPROM_PD	pd;
+	} FT_EEPROM_2233HP, *PFT_EEPROM_2233HP;
+
+	// FT4233HP EEPROM structure for use with FT_EEPROM_Read and FT_EEPROM_Program
+	// FT4232H with power delivery
+	typedef struct _ft_eeprom_4233hp
+	{
+		FT_EEPROM_4232H	ft4232h;
+		FT_EEPROM_PD	pd;
+	} FT_EEPROM_4233HP, *PFT_EEPROM_4233HP;
+
+	// FT2232HP EEPROM structure for use with FT_EEPROM_Read and FT_EEPROM_Program
+	// FT2232H with power delivery
+	typedef struct _ft_eeprom_2232hp
+	{
+		FT_EEPROM_2232H	ft2232h;
+		FT_EEPROM_PD	pd;
+	} FT_EEPROM_2232HP, *PFT_EEPROM_2232HP;
+
+	// FT4232HP EEPROM structure for use with FT_EEPROM_Read and FT_EEPROM_Program
+	// FT4232H with power delivery
+	typedef struct _ft_eeprom_4232hp
+	{
+		FT_EEPROM_4232H	ft4232h;
+		FT_EEPROM_PD	pd;
+	} FT_EEPROM_4232HP, *PFT_EEPROM_4232HP;
+
+	// FT233HP EEPROM structure for use with FT_EEPROM_Read and FT_EEPROM_Program
+	// FT233H with power delivery
+	typedef struct _ft_eeprom_233hp
+	{
+		FT_EEPROM_232H	ft232h;
+		FT_EEPROM_PD	pd;
+	} FT_EEPROM_233HP, *PFT_EEPROM_233HP;
+
+	// FT232HP EEPROM structure for use with FT_EEPROM_Read and FT_EEPROM_Program
+	// FT232H with power delivery
+	typedef struct _ft_eeprom_232hp
+	{
+		FT_EEPROM_232H	ft232h;
+		FT_EEPROM_PD	pd;
+	} FT_EEPROM_232HP, *PFT_EEPROM_232HP;
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_EEPROM_Read(
+		FT_HANDLE ftHandle,
+		void *eepromData,
+		DWORD eepromDataSize,
+		char *Manufacturer,
+		char *ManufacturerId,
+		char *Description,
+		char *SerialNumber
+		);
+
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_EEPROM_Program(
+		FT_HANDLE ftHandle,
+		void *eepromData,
+		DWORD eepromDataSize,
+		char *Manufacturer,
+		char *ManufacturerId,
+		char *Description,
+		char *SerialNumber
+		);
+
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_SetLatencyTimer(
+		FT_HANDLE ftHandle,
+		UCHAR ucLatency
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_GetLatencyTimer(
+		FT_HANDLE ftHandle,
+		PUCHAR pucLatency
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_SetBitMode(
+		FT_HANDLE ftHandle,
+		UCHAR ucMask,
+		UCHAR ucEnable
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_GetBitMode(
+		FT_HANDLE ftHandle,
+		PUCHAR pucMode
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_SetUSBParameters(
+		FT_HANDLE ftHandle,
+		ULONG ulInTransferSize,
+		ULONG ulOutTransferSize
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_SetDeadmanTimeout(
+		FT_HANDLE ftHandle,
+		ULONG ulDeadmanTimeout
+		);
+
+#ifndef _WIN32
+	// Extra functions for non-Windows platforms to compensate
+	// for lack of .INF file to specify Vendor and Product IDs.
+
+	FTD2XX_API
+		FT_STATUS FT_SetVIDPID(
+		DWORD dwVID,
+		DWORD dwPID
+		);
+
+	FTD2XX_API
+		FT_STATUS FT_GetVIDPID(
+		DWORD * pdwVID,
+		DWORD * pdwPID
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_GetDeviceLocId(
+		FT_HANDLE ftHandle,
+		LPDWORD lpdwLocId
+		);
+#endif // _WIN32        
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_GetDeviceInfo(
+		FT_HANDLE ftHandle,
+		FT_DEVICE *lpftDevice,
+		LPDWORD lpdwID,
+		PCHAR SerialNumber,
+		PCHAR Description,
+		LPVOID Dummy
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_StopInTask(
+		FT_HANDLE ftHandle
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_RestartInTask(
+		FT_HANDLE ftHandle
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_SetResetPipeRetryCount(
+		FT_HANDLE ftHandle,
+		DWORD dwCount
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_ResetPort(
+		FT_HANDLE ftHandle
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_CyclePort(
+		FT_HANDLE ftHandle
+		);
+
+
+	//
+	// Win32-type functions
+	//
+
+	FTD2XX_API
+		FT_HANDLE WINAPI FT_W32_CreateFile(
+		LPCTSTR					lpszName,
+		DWORD					dwAccess,
+		DWORD					dwShareMode,
+		LPSECURITY_ATTRIBUTES	lpSecurityAttributes,
+		DWORD					dwCreate,
+		DWORD					dwAttrsAndFlags,
+		HANDLE					hTemplate
+		);
+
+	FTD2XX_API
+		BOOL WINAPI FT_W32_CloseHandle(
+		FT_HANDLE ftHandle
+		);
+
+	FTD2XX_API
+		BOOL WINAPI FT_W32_ReadFile(
+		FT_HANDLE ftHandle,
+		LPVOID lpBuffer,
+		DWORD nBufferSize,
+		LPDWORD lpBytesReturned,
+		LPOVERLAPPED lpOverlapped
+		);
+
+	FTD2XX_API
+		BOOL WINAPI FT_W32_WriteFile(
+		FT_HANDLE ftHandle,
+		LPVOID lpBuffer,
+		DWORD nBufferSize,
+		LPDWORD lpBytesWritten,
+		LPOVERLAPPED lpOverlapped
+		);
+
+	FTD2XX_API
+		DWORD WINAPI FT_W32_GetLastError(
+		FT_HANDLE ftHandle
+		);
+
+	FTD2XX_API
+		BOOL WINAPI FT_W32_GetOverlappedResult(
+		FT_HANDLE ftHandle,
+		LPOVERLAPPED lpOverlapped,
+		LPDWORD lpdwBytesTransferred,
+		BOOL bWait
+		);
+
+	FTD2XX_API
+		BOOL WINAPI FT_W32_CancelIo(
+		FT_HANDLE ftHandle
+		);
+
+
+	//
+	// Win32 COMM API type functions
+	//
+	typedef struct _FTCOMSTAT {
+		DWORD fCtsHold : 1;
+		DWORD fDsrHold : 1;
+		DWORD fRlsdHold : 1;
+		DWORD fXoffHold : 1;
+		DWORD fXoffSent : 1;
+		DWORD fEof : 1;
+		DWORD fTxim : 1;
+		DWORD fReserved : 25;
+		DWORD cbInQue;
+		DWORD cbOutQue;
+	} FTCOMSTAT, *LPFTCOMSTAT;
+
+	typedef struct _FTDCB {
+		DWORD DCBlength;			/* sizeof(FTDCB)						*/
+		DWORD BaudRate;				/* Baudrate at which running			*/
+		DWORD fBinary : 1;			/* Binary Mode (skip EOF check)			*/
+		DWORD fParity : 1;			/* Enable parity checking				*/
+		DWORD fOutxCtsFlow : 1;		/* CTS handshaking on output			*/
+		DWORD fOutxDsrFlow : 1;		/* DSR handshaking on output			*/
+		DWORD fDtrControl : 2;		/* DTR Flow control						*/
+		DWORD fDsrSensitivity : 1;	/* DSR Sensitivity						*/
+		DWORD fTXContinueOnXoff : 1;	/* Continue TX when Xoff sent			*/
+		DWORD fOutX : 1;				/* Enable output X-ON/X-OFF				*/
+		DWORD fInX : 1;				/* Enable input X-ON/X-OFF				*/
+		DWORD fErrorChar : 1;		/* Enable Err Replacement				*/
+		DWORD fNull : 1;				/* Enable Null stripping				*/
+		DWORD fRtsControl : 2;		/* Rts Flow control						*/
+		DWORD fAbortOnError : 1;		/* Abort all reads and writes on Error	*/
+		DWORD fDummy2 : 17;			/* Reserved								*/
+		WORD wReserved;				/* Not currently used					*/
+		WORD XonLim;				/* Transmit X-ON threshold				*/
+		WORD XoffLim;				/* Transmit X-OFF threshold				*/
+		BYTE ByteSize;				/* Number of bits/byte, 4-8				*/
+		BYTE Parity;				/* 0-4=None,Odd,Even,Mark,Space			*/
+		BYTE StopBits;				/* FT_STOP_BITS_1 or FT_STOP_BITS_2		*/
+		char XonChar;				/* Tx and Rx X-ON character				*/
+		char XoffChar;				/* Tx and Rx X-OFF character			*/
+		char ErrorChar;				/* Error replacement char				*/
+		char EofChar;				/* End of Input character				*/
+		char EvtChar;				/* Received Event character				*/
+		WORD wReserved1;			/* Fill for now.						*/
+	} FTDCB, *LPFTDCB;
+
+	typedef struct _FTTIMEOUTS {
+		DWORD ReadIntervalTimeout;			/* Maximum time between read chars.	*/
+		DWORD ReadTotalTimeoutMultiplier;	/* Multiplier of characters.		*/
+		DWORD ReadTotalTimeoutConstant;		/* Constant in milliseconds.		*/
+		DWORD WriteTotalTimeoutMultiplier;	/* Multiplier of characters.		*/
+		DWORD WriteTotalTimeoutConstant;	/* Constant in milliseconds.		*/
+	} FTTIMEOUTS, *LPFTTIMEOUTS;
+
+
+	FTD2XX_API
+		BOOL WINAPI FT_W32_ClearCommBreak(
+		FT_HANDLE ftHandle
+		);
+
+	FTD2XX_API
+		BOOL WINAPI FT_W32_ClearCommError(
+		FT_HANDLE ftHandle,
+		LPDWORD lpdwErrors,
+		LPFTCOMSTAT lpftComstat
+		);
+
+	FTD2XX_API
+		BOOL WINAPI FT_W32_EscapeCommFunction(
+		FT_HANDLE ftHandle,
+		DWORD dwFunc
+		);
+
+	FTD2XX_API
+		BOOL WINAPI FT_W32_GetCommModemStatus(
+		FT_HANDLE ftHandle,
+		LPDWORD lpdwModemStatus
+		);
+
+	FTD2XX_API
+		BOOL WINAPI FT_W32_GetCommState(
+		FT_HANDLE ftHandle,
+		LPFTDCB lpftDcb
+		);
+
+	FTD2XX_API
+		BOOL WINAPI FT_W32_GetCommTimeouts(
+		FT_HANDLE ftHandle,
+		FTTIMEOUTS *pTimeouts
+		);
+
+	FTD2XX_API
+		BOOL WINAPI FT_W32_PurgeComm(
+		FT_HANDLE ftHandle,
+		DWORD dwMask
+		);
+
+	FTD2XX_API
+		BOOL WINAPI FT_W32_SetCommBreak(
+		FT_HANDLE ftHandle
+		);
+
+	FTD2XX_API
+		BOOL WINAPI FT_W32_SetCommMask(
+		FT_HANDLE ftHandle,
+		ULONG ulEventMask
+		);
+
+	FTD2XX_API
+		BOOL WINAPI FT_W32_GetCommMask(
+		FT_HANDLE ftHandle,
+		LPDWORD lpdwEventMask
+		);
+
+	FTD2XX_API
+		BOOL WINAPI FT_W32_SetCommState(
+		FT_HANDLE ftHandle,
+		LPFTDCB lpftDcb
+		);
+
+	FTD2XX_API
+		BOOL WINAPI FT_W32_SetCommTimeouts(
+		FT_HANDLE ftHandle,
+		FTTIMEOUTS *pTimeouts
+		);
+
+	FTD2XX_API
+		BOOL WINAPI FT_W32_SetupComm(
+		FT_HANDLE ftHandle,
+		DWORD dwReadBufferSize,
+		DWORD dwWriteBufferSize
+		);
+
+	FTD2XX_API
+		BOOL WINAPI FT_W32_WaitCommEvent(
+		FT_HANDLE ftHandle,
+		PULONG pulEvent,
+		LPOVERLAPPED lpOverlapped
+		);
+
+
+	//
+	// Device information
+	//
+
+	typedef struct _ft_device_list_info_node {
+		ULONG Flags;
+		ULONG Type;
+		ULONG ID;
+		DWORD LocId;
+		char SerialNumber[16];
+		char Description[64];
+		FT_HANDLE ftHandle;
+	} FT_DEVICE_LIST_INFO_NODE;
+
+	// Device information flags
+	enum {
+		FT_FLAGS_OPENED = 1,
+		FT_FLAGS_HISPEED = 2
+	};
+
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_CreateDeviceInfoList(
+		LPDWORD lpdwNumDevs
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_GetDeviceInfoList(
+		FT_DEVICE_LIST_INFO_NODE *pDest,
+		LPDWORD lpdwNumDevs
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_GetDeviceInfoDetail(
+		DWORD dwIndex,
+		LPDWORD lpdwFlags,
+		LPDWORD lpdwType,
+		LPDWORD lpdwID,
+		LPDWORD lpdwLocId,
+		LPVOID lpSerialNumber,
+		LPVOID lpDescription,
+		FT_HANDLE *pftHandle
+		);
+
+
+	//
+	// Version information
+	//
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_GetDriverVersion(
+		FT_HANDLE ftHandle,
+		LPDWORD lpdwVersion
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_GetLibraryVersion(
+		LPDWORD lpdwVersion
+		);
+
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_Rescan(
+		void
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_Reload(
+		WORD wVid,
+		WORD wPid
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_GetComPortNumber(
+		FT_HANDLE ftHandle,
+		LPLONG	lpdwComPortNumber
+		);
+
+
+	//
+	// FT232H additional EEPROM functions
+	//
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_EE_ReadConfig(
+		FT_HANDLE ftHandle,
+		UCHAR ucAddress,
+		PUCHAR pucValue
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_EE_WriteConfig(
+		FT_HANDLE ftHandle,
+		UCHAR ucAddress,
+		UCHAR ucValue
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_EE_ReadECC(
+		FT_HANDLE ftHandle,
+		UCHAR ucOption,
+		LPWORD lpwValue
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_GetQueueStatusEx(
+		FT_HANDLE ftHandle,
+		DWORD *dwRxBytes
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_ComPortIdle(
+		FT_HANDLE ftHandle
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_ComPortCancelIdle(
+		FT_HANDLE ftHandle
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_VendorCmdGet(
+		FT_HANDLE ftHandle,
+		UCHAR Request,
+		UCHAR *Buf,
+		USHORT Len
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_VendorCmdSet(
+		FT_HANDLE ftHandle,
+		UCHAR Request,
+		UCHAR *Buf,
+		USHORT Len
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_VendorCmdGetEx(
+		FT_HANDLE ftHandle,
+		USHORT wValue,
+		UCHAR *Buf,
+		USHORT Len
+		);
+
+	FTD2XX_API
+		FT_STATUS WINAPI FT_VendorCmdSetEx(
+		FT_HANDLE ftHandle,
+		USHORT wValue,
+		UCHAR *Buf,
+		USHORT Len
+		);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/* FTD2XX_H */
diff --git a/source/library/include/nlohmann/json.hpp b/source/library/include/nlohmann/json.hpp
new file mode 100644
index 00000000..8b72ea65
--- /dev/null
+++ b/source/library/include/nlohmann/json.hpp
@@ -0,0 +1,24765 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+/****************************************************************************\
+ * Note on documentation: The source files contain links to the online      *
+ * documentation of the public API at https://json.nlohmann.me. This URL    *
+ * contains the most recent documentation and should also be applicable to  *
+ * previous versions; documentation for deprecated functions is not         *
+ * removed, but marked deprecated. See "Generate documentation" section in  *
+ * file docs/README.md.                                                     *
+\****************************************************************************/
+
+#ifndef INCLUDE_NLOHMANN_JSON_HPP_
+#define INCLUDE_NLOHMANN_JSON_HPP_
+
+#include <algorithm> // all_of, find, for_each
+#include <cstddef> // nullptr_t, ptrdiff_t, size_t
+#include <functional> // hash, less
+#include <initializer_list> // initializer_list
+#ifndef JSON_NO_IO
+    #include <iosfwd> // istream, ostream
+#endif  // JSON_NO_IO
+#include <iterator> // random_access_iterator_tag
+#include <memory> // unique_ptr
+#include <string> // string, stoi, to_string
+#include <utility> // declval, forward, move, pair, swap
+#include <vector> // vector
+
+// #include <nlohmann/adl_serializer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <utility>
+
+// #include <nlohmann/detail/abi_macros.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// This file contains all macro definitions affecting or depending on the ABI
+
+#ifndef JSON_SKIP_LIBRARY_VERSION_CHECK
+    #if defined(NLOHMANN_JSON_VERSION_MAJOR) && defined(NLOHMANN_JSON_VERSION_MINOR) && defined(NLOHMANN_JSON_VERSION_PATCH)
+        #if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 11 || NLOHMANN_JSON_VERSION_PATCH != 3
+            #warning "Already included a different version of the library!"
+        #endif
+    #endif
+#endif
+
+#define NLOHMANN_JSON_VERSION_MAJOR 3   // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_MINOR 11  // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_PATCH 3   // NOLINT(modernize-macro-to-enum)
+
+#ifndef JSON_DIAGNOSTICS
+    #define JSON_DIAGNOSTICS 0
+#endif
+
+#ifndef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    #define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON 0
+#endif
+
+#if JSON_DIAGNOSTICS
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS _diag
+#else
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS
+#endif
+
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON _ldvcmp
+#else
+    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION
+    #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0
+#endif
+
+// Construct the namespace ABI tags component
+#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b) json_abi ## a ## b
+#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b) \
+    NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b)
+
+#define NLOHMANN_JSON_ABI_TAGS                                       \
+    NLOHMANN_JSON_ABI_TAGS_CONCAT(                                   \
+            NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS,                       \
+            NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON)
+
+// Construct the namespace version component
+#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \
+    _v ## major ## _ ## minor ## _ ## patch
+#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(major, minor, patch) \
+    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch)
+
+#if NLOHMANN_JSON_NAMESPACE_NO_VERSION
+#define NLOHMANN_JSON_NAMESPACE_VERSION
+#else
+#define NLOHMANN_JSON_NAMESPACE_VERSION                                 \
+    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(NLOHMANN_JSON_VERSION_MAJOR, \
+                                           NLOHMANN_JSON_VERSION_MINOR, \
+                                           NLOHMANN_JSON_VERSION_PATCH)
+#endif
+
+// Combine namespace components
+#define NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) a ## b
+#define NLOHMANN_JSON_NAMESPACE_CONCAT(a, b) \
+    NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b)
+
+#ifndef NLOHMANN_JSON_NAMESPACE
+#define NLOHMANN_JSON_NAMESPACE               \
+    nlohmann::NLOHMANN_JSON_NAMESPACE_CONCAT( \
+            NLOHMANN_JSON_ABI_TAGS,           \
+            NLOHMANN_JSON_NAMESPACE_VERSION)
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_BEGIN
+#define NLOHMANN_JSON_NAMESPACE_BEGIN                \
+    namespace nlohmann                               \
+    {                                                \
+    inline namespace NLOHMANN_JSON_NAMESPACE_CONCAT( \
+                NLOHMANN_JSON_ABI_TAGS,              \
+                NLOHMANN_JSON_NAMESPACE_VERSION)     \
+    {
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_END
+#define NLOHMANN_JSON_NAMESPACE_END                                     \
+    }  /* namespace (inline namespace) NOLINT(readability/namespace) */ \
+    }  // namespace nlohmann
+#endif
+
+// #include <nlohmann/detail/conversions/from_json.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // transform
+#include <array> // array
+#include <forward_list> // forward_list
+#include <iterator> // inserter, front_inserter, end
+#include <map> // map
+#include <string> // string
+#include <tuple> // tuple, make_tuple
+#include <type_traits> // is_arithmetic, is_same, is_enum, underlying_type, is_convertible
+#include <unordered_map> // unordered_map
+#include <utility> // pair, declval
+#include <valarray> // valarray
+
+// #include <nlohmann/detail/exceptions.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef> // nullptr_t
+#include <exception> // exception
+#if JSON_DIAGNOSTICS
+    #include <numeric> // accumulate
+#endif
+#include <stdexcept> // runtime_error
+#include <string> // to_string
+#include <vector> // vector
+
+// #include <nlohmann/detail/value_t.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <array> // array
+#include <cstddef> // size_t
+#include <cstdint> // uint8_t
+#include <string> // string
+
+// #include <nlohmann/detail/macro_scope.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <utility> // declval, pair
+// #include <nlohmann/detail/meta/detected.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <type_traits>
+
+// #include <nlohmann/detail/meta/void_t.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename ...Ts> struct make_void
+{
+    using type = void;
+};
+template<typename ...Ts> using void_t = typename make_void<Ts...>::type;
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+// https://en.cppreference.com/w/cpp/experimental/is_detected
+struct nonesuch
+{
+    nonesuch() = delete;
+    ~nonesuch() = delete;
+    nonesuch(nonesuch const&) = delete;
+    nonesuch(nonesuch const&&) = delete;
+    void operator=(nonesuch const&) = delete;
+    void operator=(nonesuch&&) = delete;
+};
+
+template<class Default,
+         class AlwaysVoid,
+         template<class...> class Op,
+         class... Args>
+struct detector
+{
+    using value_t = std::false_type;
+    using type = Default;
+};
+
+template<class Default, template<class...> class Op, class... Args>
+struct detector<Default, void_t<Op<Args...>>, Op, Args...>
+{
+    using value_t = std::true_type;
+    using type = Op<Args...>;
+};
+
+template<template<class...> class Op, class... Args>
+using is_detected = typename detector<nonesuch, void, Op, Args...>::value_t;
+
+template<template<class...> class Op, class... Args>
+struct is_detected_lazy : is_detected<Op, Args...> { };
+
+template<template<class...> class Op, class... Args>
+using detected_t = typename detector<nonesuch, void, Op, Args...>::type;
+
+template<class Default, template<class...> class Op, class... Args>
+using detected_or = detector<Default, void, Op, Args...>;
+
+template<class Default, template<class...> class Op, class... Args>
+using detected_or_t = typename detected_or<Default, Op, Args...>::type;
+
+template<class Expected, template<class...> class Op, class... Args>
+using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
+
+template<class To, template<class...> class Op, class... Args>
+using is_detected_convertible =
+    std::is_convertible<detected_t<Op, Args...>, To>;
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/thirdparty/hedley/hedley.hpp>
+
+
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-FileCopyrightText: 2016-2021 Evan Nemerson <evan@nemerson.com>
+// SPDX-License-Identifier: MIT
+
+/* Hedley - https://nemequ.github.io/hedley
+ * Created by Evan Nemerson <evan@nemerson.com>
+ */
+
+#if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 15)
+#if defined(JSON_HEDLEY_VERSION)
+    #undef JSON_HEDLEY_VERSION
+#endif
+#define JSON_HEDLEY_VERSION 15
+
+#if defined(JSON_HEDLEY_STRINGIFY_EX)
+    #undef JSON_HEDLEY_STRINGIFY_EX
+#endif
+#define JSON_HEDLEY_STRINGIFY_EX(x) #x
+
+#if defined(JSON_HEDLEY_STRINGIFY)
+    #undef JSON_HEDLEY_STRINGIFY
+#endif
+#define JSON_HEDLEY_STRINGIFY(x) JSON_HEDLEY_STRINGIFY_EX(x)
+
+#if defined(JSON_HEDLEY_CONCAT_EX)
+    #undef JSON_HEDLEY_CONCAT_EX
+#endif
+#define JSON_HEDLEY_CONCAT_EX(a,b) a##b
+
+#if defined(JSON_HEDLEY_CONCAT)
+    #undef JSON_HEDLEY_CONCAT
+#endif
+#define JSON_HEDLEY_CONCAT(a,b) JSON_HEDLEY_CONCAT_EX(a,b)
+
+#if defined(JSON_HEDLEY_CONCAT3_EX)
+    #undef JSON_HEDLEY_CONCAT3_EX
+#endif
+#define JSON_HEDLEY_CONCAT3_EX(a,b,c) a##b##c
+
+#if defined(JSON_HEDLEY_CONCAT3)
+    #undef JSON_HEDLEY_CONCAT3
+#endif
+#define JSON_HEDLEY_CONCAT3(a,b,c) JSON_HEDLEY_CONCAT3_EX(a,b,c)
+
+#if defined(JSON_HEDLEY_VERSION_ENCODE)
+    #undef JSON_HEDLEY_VERSION_ENCODE
+#endif
+#define JSON_HEDLEY_VERSION_ENCODE(major,minor,revision) (((major) * 1000000) + ((minor) * 1000) + (revision))
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_MAJOR)
+    #undef JSON_HEDLEY_VERSION_DECODE_MAJOR
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_MAJOR(version) ((version) / 1000000)
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_MINOR)
+    #undef JSON_HEDLEY_VERSION_DECODE_MINOR
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_MINOR(version) (((version) % 1000000) / 1000)
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_REVISION)
+    #undef JSON_HEDLEY_VERSION_DECODE_REVISION
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_REVISION(version) ((version) % 1000)
+
+#if defined(JSON_HEDLEY_GNUC_VERSION)
+    #undef JSON_HEDLEY_GNUC_VERSION
+#endif
+#if defined(__GNUC__) && defined(__GNUC_PATCHLEVEL__)
+    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
+#elif defined(__GNUC__)
+    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, 0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_VERSION_CHECK)
+    #undef JSON_HEDLEY_GNUC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_GNUC_VERSION)
+    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GNUC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_MSVC_VERSION)
+    #undef JSON_HEDLEY_MSVC_VERSION
+#endif
+#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 140000000) && !defined(__ICL)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 10000000, (_MSC_FULL_VER % 10000000) / 100000, (_MSC_FULL_VER % 100000) / 100)
+#elif defined(_MSC_FULL_VER) && !defined(__ICL)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 1000000, (_MSC_FULL_VER % 1000000) / 10000, (_MSC_FULL_VER % 10000) / 10)
+#elif defined(_MSC_VER) && !defined(__ICL)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_VER / 100, _MSC_VER % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_MSVC_VERSION_CHECK)
+    #undef JSON_HEDLEY_MSVC_VERSION_CHECK
+#endif
+#if !defined(JSON_HEDLEY_MSVC_VERSION)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (0)
+#elif defined(_MSC_VER) && (_MSC_VER >= 1400)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 10000000) + (minor * 100000) + (patch)))
+#elif defined(_MSC_VER) && (_MSC_VER >= 1200)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 1000000) + (minor * 10000) + (patch)))
+#else
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_VER >= ((major * 100) + (minor)))
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_VERSION)
+    #undef JSON_HEDLEY_INTEL_VERSION
+#endif
+#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && !defined(__ICL)
+    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, __INTEL_COMPILER_UPDATE)
+#elif defined(__INTEL_COMPILER) && !defined(__ICL)
+    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_VERSION_CHECK)
+    #undef JSON_HEDLEY_INTEL_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_INTEL_VERSION)
+    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_CL_VERSION)
+    #undef JSON_HEDLEY_INTEL_CL_VERSION
+#endif
+#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && defined(__ICL)
+    #define JSON_HEDLEY_INTEL_CL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER, __INTEL_COMPILER_UPDATE, 0)
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_CL_VERSION_CHECK)
+    #undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_INTEL_CL_VERSION)
+    #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_CL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_PGI_VERSION)
+    #undef JSON_HEDLEY_PGI_VERSION
+#endif
+#if defined(__PGI) && defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__)
+    #define JSON_HEDLEY_PGI_VERSION JSON_HEDLEY_VERSION_ENCODE(__PGIC__, __PGIC_MINOR__, __PGIC_PATCHLEVEL__)
+#endif
+
+#if defined(JSON_HEDLEY_PGI_VERSION_CHECK)
+    #undef JSON_HEDLEY_PGI_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_PGI_VERSION)
+    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PGI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_SUNPRO_VERSION)
+    #undef JSON_HEDLEY_SUNPRO_VERSION
+#endif
+#if defined(__SUNPRO_C) && (__SUNPRO_C > 0x1000)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_C >> 16) & 0xf) * 10) + ((__SUNPRO_C >> 12) & 0xf), (((__SUNPRO_C >> 8) & 0xf) * 10) + ((__SUNPRO_C >> 4) & 0xf), (__SUNPRO_C & 0xf) * 10)
+#elif defined(__SUNPRO_C)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_C >> 8) & 0xf, (__SUNPRO_C >> 4) & 0xf, (__SUNPRO_C) & 0xf)
+#elif defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x1000)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_CC >> 16) & 0xf) * 10) + ((__SUNPRO_CC >> 12) & 0xf), (((__SUNPRO_CC >> 8) & 0xf) * 10) + ((__SUNPRO_CC >> 4) & 0xf), (__SUNPRO_CC & 0xf) * 10)
+#elif defined(__SUNPRO_CC)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_CC >> 8) & 0xf, (__SUNPRO_CC >> 4) & 0xf, (__SUNPRO_CC) & 0xf)
+#endif
+
+#if defined(JSON_HEDLEY_SUNPRO_VERSION_CHECK)
+    #undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_SUNPRO_VERSION)
+    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_SUNPRO_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
+    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION
+#endif
+#if defined(__EMSCRIPTEN__)
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION JSON_HEDLEY_VERSION_ENCODE(__EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__)
+#endif
+
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK)
+    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_EMSCRIPTEN_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_ARM_VERSION)
+    #undef JSON_HEDLEY_ARM_VERSION
+#endif
+#if defined(__CC_ARM) && defined(__ARMCOMPILER_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCOMPILER_VERSION / 1000000, (__ARMCOMPILER_VERSION % 1000000) / 10000, (__ARMCOMPILER_VERSION % 10000) / 100)
+#elif defined(__CC_ARM) && defined(__ARMCC_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCC_VERSION / 1000000, (__ARMCC_VERSION % 1000000) / 10000, (__ARMCC_VERSION % 10000) / 100)
+#endif
+
+#if defined(JSON_HEDLEY_ARM_VERSION_CHECK)
+    #undef JSON_HEDLEY_ARM_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_ARM_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_ARM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_IBM_VERSION)
+    #undef JSON_HEDLEY_IBM_VERSION
+#endif
+#if defined(__ibmxl__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ibmxl_version__, __ibmxl_release__, __ibmxl_modification__)
+#elif defined(__xlC__) && defined(__xlC_ver__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, (__xlC_ver__ >> 8) & 0xff)
+#elif defined(__xlC__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, 0)
+#endif
+
+#if defined(JSON_HEDLEY_IBM_VERSION_CHECK)
+    #undef JSON_HEDLEY_IBM_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_IBM_VERSION)
+    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IBM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_VERSION)
+    #undef JSON_HEDLEY_TI_VERSION
+#endif
+#if \
+    defined(__TI_COMPILER_VERSION__) && \
+    ( \
+      defined(__TMS470__) || defined(__TI_ARM__) || \
+      defined(__MSP430__) || \
+      defined(__TMS320C2000__) \
+    )
+#if (__TI_COMPILER_VERSION__ >= 16000000)
+    #define JSON_HEDLEY_TI_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+#endif
+
+#if defined(JSON_HEDLEY_TI_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_VERSION)
+    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL2000_VERSION)
+    #undef JSON_HEDLEY_TI_CL2000_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C2000__)
+    #define JSON_HEDLEY_TI_CL2000_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL2000_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL2000_VERSION)
+    #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL2000_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL430_VERSION)
+    #undef JSON_HEDLEY_TI_CL430_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__MSP430__)
+    #define JSON_HEDLEY_TI_CL430_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL430_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL430_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL430_VERSION)
+    #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL430_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_ARMCL_VERSION)
+    #undef JSON_HEDLEY_TI_ARMCL_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && (defined(__TMS470__) || defined(__TI_ARM__))
+    #define JSON_HEDLEY_TI_ARMCL_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_ARMCL_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_ARMCL_VERSION)
+    #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_ARMCL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL6X_VERSION)
+    #undef JSON_HEDLEY_TI_CL6X_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C6X__)
+    #define JSON_HEDLEY_TI_CL6X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL6X_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL6X_VERSION)
+    #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL6X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL7X_VERSION)
+    #undef JSON_HEDLEY_TI_CL7X_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__C7000__)
+    #define JSON_HEDLEY_TI_CL7X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL7X_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL7X_VERSION)
+    #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL7X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CLPRU_VERSION)
+    #undef JSON_HEDLEY_TI_CLPRU_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__PRU__)
+    #define JSON_HEDLEY_TI_CLPRU_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CLPRU_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CLPRU_VERSION)
+    #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CLPRU_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_CRAY_VERSION)
+    #undef JSON_HEDLEY_CRAY_VERSION
+#endif
+#if defined(_CRAYC)
+    #if defined(_RELEASE_PATCHLEVEL)
+        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, _RELEASE_PATCHLEVEL)
+    #else
+        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, 0)
+    #endif
+#endif
+
+#if defined(JSON_HEDLEY_CRAY_VERSION_CHECK)
+    #undef JSON_HEDLEY_CRAY_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_CRAY_VERSION)
+    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_CRAY_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_IAR_VERSION)
+    #undef JSON_HEDLEY_IAR_VERSION
+#endif
+#if defined(__IAR_SYSTEMS_ICC__)
+    #if __VER__ > 1000
+        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE((__VER__ / 1000000), ((__VER__ / 1000) % 1000), (__VER__ % 1000))
+    #else
+        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE(__VER__ / 100, __VER__ % 100, 0)
+    #endif
+#endif
+
+#if defined(JSON_HEDLEY_IAR_VERSION_CHECK)
+    #undef JSON_HEDLEY_IAR_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_IAR_VERSION)
+    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IAR_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TINYC_VERSION)
+    #undef JSON_HEDLEY_TINYC_VERSION
+#endif
+#if defined(__TINYC__)
+    #define JSON_HEDLEY_TINYC_VERSION JSON_HEDLEY_VERSION_ENCODE(__TINYC__ / 1000, (__TINYC__ / 100) % 10, __TINYC__ % 100)
+#endif
+
+#if defined(JSON_HEDLEY_TINYC_VERSION_CHECK)
+    #undef JSON_HEDLEY_TINYC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TINYC_VERSION)
+    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TINYC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_DMC_VERSION)
+    #undef JSON_HEDLEY_DMC_VERSION
+#endif
+#if defined(__DMC__)
+    #define JSON_HEDLEY_DMC_VERSION JSON_HEDLEY_VERSION_ENCODE(__DMC__ >> 8, (__DMC__ >> 4) & 0xf, __DMC__ & 0xf)
+#endif
+
+#if defined(JSON_HEDLEY_DMC_VERSION_CHECK)
+    #undef JSON_HEDLEY_DMC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_DMC_VERSION)
+    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_DMC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_COMPCERT_VERSION)
+    #undef JSON_HEDLEY_COMPCERT_VERSION
+#endif
+#if defined(__COMPCERT_VERSION__)
+    #define JSON_HEDLEY_COMPCERT_VERSION JSON_HEDLEY_VERSION_ENCODE(__COMPCERT_VERSION__ / 10000, (__COMPCERT_VERSION__ / 100) % 100, __COMPCERT_VERSION__ % 100)
+#endif
+
+#if defined(JSON_HEDLEY_COMPCERT_VERSION_CHECK)
+    #undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_COMPCERT_VERSION)
+    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_COMPCERT_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_PELLES_VERSION)
+    #undef JSON_HEDLEY_PELLES_VERSION
+#endif
+#if defined(__POCC__)
+    #define JSON_HEDLEY_PELLES_VERSION JSON_HEDLEY_VERSION_ENCODE(__POCC__ / 100, __POCC__ % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_PELLES_VERSION_CHECK)
+    #undef JSON_HEDLEY_PELLES_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_PELLES_VERSION)
+    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PELLES_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_MCST_LCC_VERSION)
+    #undef JSON_HEDLEY_MCST_LCC_VERSION
+#endif
+#if defined(__LCC__) && defined(__LCC_MINOR__)
+    #define JSON_HEDLEY_MCST_LCC_VERSION JSON_HEDLEY_VERSION_ENCODE(__LCC__ / 100, __LCC__ % 100, __LCC_MINOR__)
+#endif
+
+#if defined(JSON_HEDLEY_MCST_LCC_VERSION_CHECK)
+    #undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_MCST_LCC_VERSION)
+    #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_MCST_LCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_VERSION)
+    #undef JSON_HEDLEY_GCC_VERSION
+#endif
+#if \
+    defined(JSON_HEDLEY_GNUC_VERSION) && \
+    !defined(__clang__) && \
+    !defined(JSON_HEDLEY_INTEL_VERSION) && \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_ARM_VERSION) && \
+    !defined(JSON_HEDLEY_CRAY_VERSION) && \
+    !defined(JSON_HEDLEY_TI_VERSION) && \
+    !defined(JSON_HEDLEY_TI_ARMCL_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL430_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL2000_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL6X_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL7X_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CLPRU_VERSION) && \
+    !defined(__COMPCERT__) && \
+    !defined(JSON_HEDLEY_MCST_LCC_VERSION)
+    #define JSON_HEDLEY_GCC_VERSION JSON_HEDLEY_GNUC_VERSION
+#endif
+
+#if defined(JSON_HEDLEY_GCC_VERSION_CHECK)
+    #undef JSON_HEDLEY_GCC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_GCC_VERSION)
+    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_ATTRIBUTE
+#endif
+#if \
+  defined(__has_attribute) && \
+  ( \
+    (!defined(JSON_HEDLEY_IAR_VERSION) || JSON_HEDLEY_IAR_VERSION_CHECK(8,5,9)) \
+  )
+#  define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) __has_attribute(attribute)
+#else
+#  define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
+#endif
+#if \
+    defined(__has_cpp_attribute) && \
+    defined(__cplusplus) && \
+    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0))
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS)
+    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
+#endif
+#if !defined(__cplusplus) || !defined(__has_cpp_attribute)
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
+#elif \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_IAR_VERSION) && \
+    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) && \
+    (!defined(JSON_HEDLEY_MSVC_VERSION) || JSON_HEDLEY_MSVC_VERSION_CHECK(19,20,0))
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(ns::attribute)
+#else
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
+#endif
+#if defined(__has_cpp_attribute) && defined(__cplusplus)
+    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
+#endif
+#if defined(__has_cpp_attribute) && defined(__cplusplus)
+    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_BUILTIN)
+    #undef JSON_HEDLEY_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_HAS_BUILTIN(builtin) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_HAS_BUILTIN(builtin) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_BUILTIN)
+    #undef JSON_HEDLEY_GNUC_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_BUILTIN)
+    #undef JSON_HEDLEY_GCC_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_FEATURE)
+    #undef JSON_HEDLEY_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_HAS_FEATURE(feature) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_HAS_FEATURE(feature) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_FEATURE)
+    #undef JSON_HEDLEY_GNUC_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_FEATURE)
+    #undef JSON_HEDLEY_GCC_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_EXTENSION)
+    #undef JSON_HEDLEY_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_HAS_EXTENSION(extension) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_HAS_EXTENSION(extension) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_EXTENSION)
+    #undef JSON_HEDLEY_GNUC_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_EXTENSION)
+    #undef JSON_HEDLEY_GCC_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_WARNING)
+    #undef JSON_HEDLEY_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_HAS_WARNING(warning) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_HAS_WARNING(warning) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_WARNING)
+    #undef JSON_HEDLEY_GNUC_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_WARNING)
+    #undef JSON_HEDLEY_GCC_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if \
+    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
+    defined(__clang__) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,0,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) || \
+    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,17) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) && defined(__C99_PRAGMA_OPERATOR))
+    #define JSON_HEDLEY_PRAGMA(value) _Pragma(#value)
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_PRAGMA(value) __pragma(value)
+#else
+    #define JSON_HEDLEY_PRAGMA(value)
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_PUSH)
+    #undef JSON_HEDLEY_DIAGNOSTIC_PUSH
+#endif
+#if defined(JSON_HEDLEY_DIAGNOSTIC_POP)
+    #undef JSON_HEDLEY_DIAGNOSTIC_POP
+#endif
+#if defined(__clang__)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("clang diagnostic pop")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop")
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(push))
+    #define JSON_HEDLEY_DIAGNOSTIC_POP __pragma(warning(pop))
+#elif JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("pop")
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,4,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop")
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH
+    #define JSON_HEDLEY_DIAGNOSTIC_POP
+#endif
+
+/* JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ is for
+   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
+#endif
+#if defined(__cplusplus)
+#  if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat")
+#    if JSON_HEDLEY_HAS_WARNING("-Wc++17-extensions")
+#      if JSON_HEDLEY_HAS_WARNING("-Wc++1z-extensions")
+#        define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
+    _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \
+    _Pragma("clang diagnostic ignored \"-Wc++1z-extensions\"") \
+    xpr \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#      else
+#        define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
+    _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \
+    xpr \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#      endif
+#    else
+#      define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
+    xpr \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#    endif
+#  endif
+#endif
+#if !defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(x) x
+#endif
+
+#if defined(JSON_HEDLEY_CONST_CAST)
+    #undef JSON_HEDLEY_CONST_CAST
+#endif
+#if defined(__cplusplus)
+#  define JSON_HEDLEY_CONST_CAST(T, expr) (const_cast<T>(expr))
+#elif \
+  JSON_HEDLEY_HAS_WARNING("-Wcast-qual") || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_CONST_CAST(T, expr) (__extension__ ({ \
+        JSON_HEDLEY_DIAGNOSTIC_PUSH \
+        JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL \
+        ((T) (expr)); \
+        JSON_HEDLEY_DIAGNOSTIC_POP \
+    }))
+#else
+#  define JSON_HEDLEY_CONST_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_REINTERPRET_CAST)
+    #undef JSON_HEDLEY_REINTERPRET_CAST
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) (reinterpret_cast<T>(expr))
+#else
+    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_STATIC_CAST)
+    #undef JSON_HEDLEY_STATIC_CAST
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_STATIC_CAST(T, expr) (static_cast<T>(expr))
+#else
+    #define JSON_HEDLEY_STATIC_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_CPP_CAST)
+    #undef JSON_HEDLEY_CPP_CAST
+#endif
+#if defined(__cplusplus)
+#  if JSON_HEDLEY_HAS_WARNING("-Wold-style-cast")
+#    define JSON_HEDLEY_CPP_CAST(T, expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wold-style-cast\"") \
+    ((T) (expr)) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#  elif JSON_HEDLEY_IAR_VERSION_CHECK(8,3,0)
+#    define JSON_HEDLEY_CPP_CAST(T, expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("diag_suppress=Pe137") \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#  else
+#    define JSON_HEDLEY_CPP_CAST(T, expr) ((T) (expr))
+#  endif
+#else
+#  define JSON_HEDLEY_CPP_CAST(T, expr) (expr)
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wdeprecated-declarations")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warning(disable:1478 1786)")
+#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:1478 1786))
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1216,1444,1445")
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:4996))
+#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444")
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1291,1718")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && !defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,E_DEPRECATED_ATT,E_DEPRECATED_ATT_MESS)")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,symdeprecated,symdeprecated2)")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress=Pe1444,Pe1215")
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warn(disable:2241)")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("clang diagnostic ignored \"-Wunknown-pragmas\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("warning(disable:161)")
+#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:161))
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 1675")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("GCC diagnostic ignored \"-Wunknown-pragmas\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:4068))
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(16,9,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
+#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress=Pe161")
+#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 161")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-attributes")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("clang diagnostic ignored \"-Wunknown-attributes\"")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("warning(disable:1292)")
+#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:1292))
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:5030))
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097,1098")
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("error_messages(off,attrskipunsup)")
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1173")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress=Pe1097")
+#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wcast-qual")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("clang diagnostic ignored \"-Wcast-qual\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("warning(disable:2203 2331)")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunused-function")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("clang diagnostic ignored \"-Wunused-function\"")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("GCC diagnostic ignored \"-Wunused-function\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(1,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION __pragma(warning(disable:4505))
+#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("diag_suppress 3142")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
+#endif
+
+#if defined(JSON_HEDLEY_DEPRECATED)
+    #undef JSON_HEDLEY_DEPRECATED
+#endif
+#if defined(JSON_HEDLEY_DEPRECATED_FOR)
+    #undef JSON_HEDLEY_DEPRECATED_FOR
+#endif
+#if \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated("Since " # since))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated("Since " #since "; use " #replacement))
+#elif \
+    (JSON_HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) && !defined(JSON_HEDLEY_IAR_VERSION)) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(18,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__("Since " #since)))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__("Since " #since "; use " #replacement)))
+#elif defined(__cplusplus) && (__cplusplus >= 201402L)
+    #define JSON_HEDLEY_DEPRECATED(since) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since)]])
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since "; use " #replacement)]])
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(deprecated) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_PELLES_VERSION_CHECK(6,50,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated)
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated)
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DEPRECATED(since) _Pragma("deprecated")
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) _Pragma("deprecated")
+#else
+    #define JSON_HEDLEY_DEPRECATED(since)
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement)
+#endif
+
+#if defined(JSON_HEDLEY_UNAVAILABLE)
+    #undef JSON_HEDLEY_UNAVAILABLE
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(warning) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_UNAVAILABLE(available_since) __attribute__((__warning__("Not available until " #available_since)))
+#else
+    #define JSON_HEDLEY_UNAVAILABLE(available_since)
+#endif
+
+#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT)
+    #undef JSON_HEDLEY_WARN_UNUSED_RESULT
+#endif
+#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT_MSG)
+    #undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(warn_unused_result) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) __attribute__((__warn_unused_result__))
+#elif (JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) >= 201907L)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard(msg)]])
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+#elif defined(_Check_return_) /* SAL */
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT _Check_return_
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) _Check_return_
+#else
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg)
+#endif
+
+#if defined(JSON_HEDLEY_SENTINEL)
+    #undef JSON_HEDLEY_SENTINEL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(sentinel) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_SENTINEL(position) __attribute__((__sentinel__(position)))
+#else
+    #define JSON_HEDLEY_SENTINEL(position)
+#endif
+
+#if defined(JSON_HEDLEY_NO_RETURN)
+    #undef JSON_HEDLEY_NO_RETURN
+#endif
+#if JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_NO_RETURN __noreturn
+#elif \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
+    #define JSON_HEDLEY_NO_RETURN _Noreturn
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+    #define JSON_HEDLEY_NO_RETURN JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[noreturn]])
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(noreturn) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,2,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
+    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_NO_RETURN _Pragma("does_not_return")
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
+#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_NO_RETURN _Pragma("FUNC_NEVER_RETURNS;")
+#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
+    #define JSON_HEDLEY_NO_RETURN __attribute((noreturn))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
+    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
+#else
+    #define JSON_HEDLEY_NO_RETURN
+#endif
+
+#if defined(JSON_HEDLEY_NO_ESCAPE)
+    #undef JSON_HEDLEY_NO_ESCAPE
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(noescape)
+    #define JSON_HEDLEY_NO_ESCAPE __attribute__((__noescape__))
+#else
+    #define JSON_HEDLEY_NO_ESCAPE
+#endif
+
+#if defined(JSON_HEDLEY_UNREACHABLE)
+    #undef JSON_HEDLEY_UNREACHABLE
+#endif
+#if defined(JSON_HEDLEY_UNREACHABLE_RETURN)
+    #undef JSON_HEDLEY_UNREACHABLE_RETURN
+#endif
+#if defined(JSON_HEDLEY_ASSUME)
+    #undef JSON_HEDLEY_ASSUME
+#endif
+#if \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_ASSUME(expr) __assume(expr)
+#elif JSON_HEDLEY_HAS_BUILTIN(__builtin_assume)
+    #define JSON_HEDLEY_ASSUME(expr) __builtin_assume(expr)
+#elif \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0)
+    #if defined(__cplusplus)
+        #define JSON_HEDLEY_ASSUME(expr) std::_nassert(expr)
+    #else
+        #define JSON_HEDLEY_ASSUME(expr) _nassert(expr)
+    #endif
+#endif
+#if \
+    (JSON_HEDLEY_HAS_BUILTIN(__builtin_unreachable) && (!defined(JSON_HEDLEY_ARM_VERSION))) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(18,10,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(10,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_UNREACHABLE() __builtin_unreachable()
+#elif defined(JSON_HEDLEY_ASSUME)
+    #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0)
+#endif
+#if !defined(JSON_HEDLEY_ASSUME)
+    #if defined(JSON_HEDLEY_UNREACHABLE)
+        #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, ((expr) ? 1 : (JSON_HEDLEY_UNREACHABLE(), 1)))
+    #else
+        #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, expr)
+    #endif
+#endif
+#if defined(JSON_HEDLEY_UNREACHABLE)
+    #if  \
+        JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
+        JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0)
+        #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (JSON_HEDLEY_STATIC_CAST(void, JSON_HEDLEY_ASSUME(0)), (value))
+    #else
+        #define JSON_HEDLEY_UNREACHABLE_RETURN(value) JSON_HEDLEY_UNREACHABLE()
+    #endif
+#else
+    #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (value)
+#endif
+#if !defined(JSON_HEDLEY_UNREACHABLE)
+    #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0)
+#endif
+
+JSON_HEDLEY_DIAGNOSTIC_PUSH
+#if JSON_HEDLEY_HAS_WARNING("-Wpedantic")
+    #pragma clang diagnostic ignored "-Wpedantic"
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat-pedantic") && defined(__cplusplus)
+    #pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
+#endif
+#if JSON_HEDLEY_GCC_HAS_WARNING("-Wvariadic-macros",4,0,0)
+    #if defined(__clang__)
+        #pragma clang diagnostic ignored "-Wvariadic-macros"
+    #elif defined(JSON_HEDLEY_GCC_VERSION)
+        #pragma GCC diagnostic ignored "-Wvariadic-macros"
+    #endif
+#endif
+#if defined(JSON_HEDLEY_NON_NULL)
+    #undef JSON_HEDLEY_NON_NULL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(nonnull) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
+    #define JSON_HEDLEY_NON_NULL(...) __attribute__((__nonnull__(__VA_ARGS__)))
+#else
+    #define JSON_HEDLEY_NON_NULL(...)
+#endif
+JSON_HEDLEY_DIAGNOSTIC_POP
+
+#if defined(JSON_HEDLEY_PRINTF_FORMAT)
+    #undef JSON_HEDLEY_PRINTF_FORMAT
+#endif
+#if defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && !defined(__USE_MINGW_ANSI_STDIO)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(ms_printf, string_idx, first_to_check)))
+#elif defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && defined(__USE_MINGW_ANSI_STDIO)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(gnu_printf, string_idx, first_to_check)))
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(format) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(__printf__, string_idx, first_to_check)))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(6,0,0)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __declspec(vaformat(printf,string_idx,first_to_check))
+#else
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check)
+#endif
+
+#if defined(JSON_HEDLEY_CONSTEXPR)
+    #undef JSON_HEDLEY_CONSTEXPR
+#endif
+#if defined(__cplusplus)
+    #if __cplusplus >= 201103L
+        #define JSON_HEDLEY_CONSTEXPR JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(constexpr)
+    #endif
+#endif
+#if !defined(JSON_HEDLEY_CONSTEXPR)
+    #define JSON_HEDLEY_CONSTEXPR
+#endif
+
+#if defined(JSON_HEDLEY_PREDICT)
+    #undef JSON_HEDLEY_PREDICT
+#endif
+#if defined(JSON_HEDLEY_LIKELY)
+    #undef JSON_HEDLEY_LIKELY
+#endif
+#if defined(JSON_HEDLEY_UNLIKELY)
+    #undef JSON_HEDLEY_UNLIKELY
+#endif
+#if defined(JSON_HEDLEY_UNPREDICTABLE)
+    #undef JSON_HEDLEY_UNPREDICTABLE
+#endif
+#if JSON_HEDLEY_HAS_BUILTIN(__builtin_unpredictable)
+    #define JSON_HEDLEY_UNPREDICTABLE(expr) __builtin_unpredictable((expr))
+#endif
+#if \
+  (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) && !defined(JSON_HEDLEY_PGI_VERSION)) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(9,0,0) || \
+  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+#  define JSON_HEDLEY_PREDICT(expr, value, probability) __builtin_expect_with_probability(  (expr), (value), (probability))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability)   __builtin_expect_with_probability(!!(expr),    1   , (probability))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability)  __builtin_expect_with_probability(!!(expr),    0   , (probability))
+#  define JSON_HEDLEY_LIKELY(expr)                      __builtin_expect                 (!!(expr),    1                  )
+#  define JSON_HEDLEY_UNLIKELY(expr)                    __builtin_expect                 (!!(expr),    0                  )
+#elif \
+  (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \
+  JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \
+  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \
+  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
+  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+  JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,27) || \
+  JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
+  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+#  define JSON_HEDLEY_PREDICT(expr, expected, probability) \
+    (((probability) >= 0.9) ? __builtin_expect((expr), (expected)) : (JSON_HEDLEY_STATIC_CAST(void, expected), (expr)))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) \
+    (__extension__ ({ \
+        double hedley_probability_ = (probability); \
+        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 1) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 0) : !!(expr))); \
+    }))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) \
+    (__extension__ ({ \
+        double hedley_probability_ = (probability); \
+        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 0) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 1) : !!(expr))); \
+    }))
+#  define JSON_HEDLEY_LIKELY(expr)   __builtin_expect(!!(expr), 1)
+#  define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0)
+#else
+#  define JSON_HEDLEY_PREDICT(expr, expected, probability) (JSON_HEDLEY_STATIC_CAST(void, expected), (expr))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) (!!(expr))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) (!!(expr))
+#  define JSON_HEDLEY_LIKELY(expr) (!!(expr))
+#  define JSON_HEDLEY_UNLIKELY(expr) (!!(expr))
+#endif
+#if !defined(JSON_HEDLEY_UNPREDICTABLE)
+    #define JSON_HEDLEY_UNPREDICTABLE(expr) JSON_HEDLEY_PREDICT(expr, 1, 0.5)
+#endif
+
+#if defined(JSON_HEDLEY_MALLOC)
+    #undef JSON_HEDLEY_MALLOC
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(malloc) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_MALLOC __attribute__((__malloc__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_MALLOC _Pragma("returns_new_memory")
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_MALLOC __declspec(restrict)
+#else
+    #define JSON_HEDLEY_MALLOC
+#endif
+
+#if defined(JSON_HEDLEY_PURE)
+    #undef JSON_HEDLEY_PURE
+#endif
+#if \
+  JSON_HEDLEY_HAS_ATTRIBUTE(pure) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(2,96,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+  (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+  (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+  (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+  (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+  JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+#  define JSON_HEDLEY_PURE __attribute__((__pure__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+#  define JSON_HEDLEY_PURE _Pragma("does_not_write_global_data")
+#elif defined(__cplusplus) && \
+    ( \
+      JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \
+      JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) || \
+      JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) \
+    )
+#  define JSON_HEDLEY_PURE _Pragma("FUNC_IS_PURE;")
+#else
+#  define JSON_HEDLEY_PURE
+#endif
+
+#if defined(JSON_HEDLEY_CONST)
+    #undef JSON_HEDLEY_CONST
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(const) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(2,5,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_CONST __attribute__((__const__))
+#elif \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_CONST _Pragma("no_side_effect")
+#else
+    #define JSON_HEDLEY_CONST JSON_HEDLEY_PURE
+#endif
+
+#if defined(JSON_HEDLEY_RESTRICT)
+    #undef JSON_HEDLEY_RESTRICT
+#endif
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && !defined(__cplusplus)
+    #define JSON_HEDLEY_RESTRICT restrict
+#elif \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,4) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
+    defined(__clang__) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_RESTRICT __restrict
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,3,0) && !defined(__cplusplus)
+    #define JSON_HEDLEY_RESTRICT _Restrict
+#else
+    #define JSON_HEDLEY_RESTRICT
+#endif
+
+#if defined(JSON_HEDLEY_INLINE)
+    #undef JSON_HEDLEY_INLINE
+#endif
+#if \
+    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
+    (defined(__cplusplus) && (__cplusplus >= 199711L))
+    #define JSON_HEDLEY_INLINE inline
+#elif \
+    defined(JSON_HEDLEY_GCC_VERSION) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(6,2,0)
+    #define JSON_HEDLEY_INLINE __inline__
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,1,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_INLINE __inline
+#else
+    #define JSON_HEDLEY_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_ALWAYS_INLINE)
+    #undef JSON_HEDLEY_ALWAYS_INLINE
+#endif
+#if \
+  JSON_HEDLEY_HAS_ATTRIBUTE(always_inline) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+  (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+  (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+  (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+  (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
+  JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
+#  define JSON_HEDLEY_ALWAYS_INLINE __attribute__((__always_inline__)) JSON_HEDLEY_INLINE
+#elif \
+  JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \
+  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+#  define JSON_HEDLEY_ALWAYS_INLINE __forceinline
+#elif defined(__cplusplus) && \
+    ( \
+      JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+      JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+      JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+      JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
+      JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+      JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) \
+    )
+#  define JSON_HEDLEY_ALWAYS_INLINE _Pragma("FUNC_ALWAYS_INLINE;")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+#  define JSON_HEDLEY_ALWAYS_INLINE _Pragma("inline=forced")
+#else
+#  define JSON_HEDLEY_ALWAYS_INLINE JSON_HEDLEY_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_NEVER_INLINE)
+    #undef JSON_HEDLEY_NEVER_INLINE
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(noinline) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
+    #define JSON_HEDLEY_NEVER_INLINE __attribute__((__noinline__))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(10,2,0)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("noinline")
+#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("FUNC_CANNOT_INLINE;")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("inline=never")
+#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
+    #define JSON_HEDLEY_NEVER_INLINE __attribute((noinline))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
+    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
+#else
+    #define JSON_HEDLEY_NEVER_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_PRIVATE)
+    #undef JSON_HEDLEY_PRIVATE
+#endif
+#if defined(JSON_HEDLEY_PUBLIC)
+    #undef JSON_HEDLEY_PUBLIC
+#endif
+#if defined(JSON_HEDLEY_IMPORT)
+    #undef JSON_HEDLEY_IMPORT
+#endif
+#if defined(_WIN32) || defined(__CYGWIN__)
+#  define JSON_HEDLEY_PRIVATE
+#  define JSON_HEDLEY_PUBLIC   __declspec(dllexport)
+#  define JSON_HEDLEY_IMPORT   __declspec(dllimport)
+#else
+#  if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(visibility) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+    ( \
+      defined(__TI_EABI__) && \
+      ( \
+        (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+        JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) \
+      ) \
+    ) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+#    define JSON_HEDLEY_PRIVATE __attribute__((__visibility__("hidden")))
+#    define JSON_HEDLEY_PUBLIC  __attribute__((__visibility__("default")))
+#  else
+#    define JSON_HEDLEY_PRIVATE
+#    define JSON_HEDLEY_PUBLIC
+#  endif
+#  define JSON_HEDLEY_IMPORT    extern
+#endif
+
+#if defined(JSON_HEDLEY_NO_THROW)
+    #undef JSON_HEDLEY_NO_THROW
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(nothrow) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_NO_THROW __attribute__((__nothrow__))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,1,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
+    #define JSON_HEDLEY_NO_THROW __declspec(nothrow)
+#else
+    #define JSON_HEDLEY_NO_THROW
+#endif
+
+#if defined(JSON_HEDLEY_FALL_THROUGH)
+    #undef JSON_HEDLEY_FALL_THROUGH
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(fallthrough) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(7,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_FALL_THROUGH __attribute__((__fallthrough__))
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(clang,fallthrough)
+    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[clang::fallthrough]])
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(fallthrough)
+    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[fallthrough]])
+#elif defined(__fallthrough) /* SAL */
+    #define JSON_HEDLEY_FALL_THROUGH __fallthrough
+#else
+    #define JSON_HEDLEY_FALL_THROUGH
+#endif
+
+#if defined(JSON_HEDLEY_RETURNS_NON_NULL)
+    #undef JSON_HEDLEY_RETURNS_NON_NULL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(returns_nonnull) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_RETURNS_NON_NULL __attribute__((__returns_nonnull__))
+#elif defined(_Ret_notnull_) /* SAL */
+    #define JSON_HEDLEY_RETURNS_NON_NULL _Ret_notnull_
+#else
+    #define JSON_HEDLEY_RETURNS_NON_NULL
+#endif
+
+#if defined(JSON_HEDLEY_ARRAY_PARAM)
+    #undef JSON_HEDLEY_ARRAY_PARAM
+#endif
+#if \
+    defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \
+    !defined(__STDC_NO_VLA__) && \
+    !defined(__cplusplus) && \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_TINYC_VERSION)
+    #define JSON_HEDLEY_ARRAY_PARAM(name) (name)
+#else
+    #define JSON_HEDLEY_ARRAY_PARAM(name)
+#endif
+
+#if defined(JSON_HEDLEY_IS_CONSTANT)
+    #undef JSON_HEDLEY_IS_CONSTANT
+#endif
+#if defined(JSON_HEDLEY_REQUIRE_CONSTEXPR)
+    #undef JSON_HEDLEY_REQUIRE_CONSTEXPR
+#endif
+/* JSON_HEDLEY_IS_CONSTEXPR_ is for
+   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
+#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
+    #undef JSON_HEDLEY_IS_CONSTEXPR_
+#endif
+#if \
+    JSON_HEDLEY_HAS_BUILTIN(__builtin_constant_p) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,19) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) && !defined(__cplusplus)) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_IS_CONSTANT(expr) __builtin_constant_p(expr)
+#endif
+#if !defined(__cplusplus)
+#  if \
+       JSON_HEDLEY_HAS_BUILTIN(__builtin_types_compatible_p) || \
+       JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+       JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+       JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+       JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
+       JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \
+       JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,24)
+#if defined(__INTPTR_TYPE__)
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0)), int*)
+#else
+    #include <stdint.h>
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((intptr_t) ((expr) * 0)) : (int*) 0)), int*)
+#endif
+#  elif \
+       ( \
+          defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) && \
+          !defined(JSON_HEDLEY_SUNPRO_VERSION) && \
+          !defined(JSON_HEDLEY_PGI_VERSION) && \
+          !defined(JSON_HEDLEY_IAR_VERSION)) || \
+       (JSON_HEDLEY_HAS_EXTENSION(c_generic_selections) && !defined(JSON_HEDLEY_IAR_VERSION)) || \
+       JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \
+       JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) || \
+       JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
+       JSON_HEDLEY_ARM_VERSION_CHECK(5,3,0)
+#if defined(__INTPTR_TYPE__)
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0), int*: 1, void*: 0)
+#else
+    #include <stdint.h>
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((intptr_t) * 0) : (int*) 0), int*: 1, void*: 0)
+#endif
+#  elif \
+       defined(JSON_HEDLEY_GCC_VERSION) || \
+       defined(JSON_HEDLEY_INTEL_VERSION) || \
+       defined(JSON_HEDLEY_TINYC_VERSION) || \
+       defined(JSON_HEDLEY_TI_ARMCL_VERSION) || \
+       JSON_HEDLEY_TI_CL430_VERSION_CHECK(18,12,0) || \
+       defined(JSON_HEDLEY_TI_CL2000_VERSION) || \
+       defined(JSON_HEDLEY_TI_CL6X_VERSION) || \
+       defined(JSON_HEDLEY_TI_CL7X_VERSION) || \
+       defined(JSON_HEDLEY_TI_CLPRU_VERSION) || \
+       defined(__clang__)
+#    define JSON_HEDLEY_IS_CONSTEXPR_(expr) ( \
+        sizeof(void) != \
+        sizeof(*( \
+                  1 ? \
+                  ((void*) ((expr) * 0L) ) : \
+((struct { char v[sizeof(void) * 2]; } *) 1) \
+                ) \
+              ) \
+                                            )
+#  endif
+#endif
+#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
+    #if !defined(JSON_HEDLEY_IS_CONSTANT)
+        #define JSON_HEDLEY_IS_CONSTANT(expr) JSON_HEDLEY_IS_CONSTEXPR_(expr)
+    #endif
+    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (JSON_HEDLEY_IS_CONSTEXPR_(expr) ? (expr) : (-1))
+#else
+    #if !defined(JSON_HEDLEY_IS_CONSTANT)
+        #define JSON_HEDLEY_IS_CONSTANT(expr) (0)
+    #endif
+    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (expr)
+#endif
+
+#if defined(JSON_HEDLEY_BEGIN_C_DECLS)
+    #undef JSON_HEDLEY_BEGIN_C_DECLS
+#endif
+#if defined(JSON_HEDLEY_END_C_DECLS)
+    #undef JSON_HEDLEY_END_C_DECLS
+#endif
+#if defined(JSON_HEDLEY_C_DECL)
+    #undef JSON_HEDLEY_C_DECL
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_BEGIN_C_DECLS extern "C" {
+    #define JSON_HEDLEY_END_C_DECLS }
+    #define JSON_HEDLEY_C_DECL extern "C"
+#else
+    #define JSON_HEDLEY_BEGIN_C_DECLS
+    #define JSON_HEDLEY_END_C_DECLS
+    #define JSON_HEDLEY_C_DECL
+#endif
+
+#if defined(JSON_HEDLEY_STATIC_ASSERT)
+    #undef JSON_HEDLEY_STATIC_ASSERT
+#endif
+#if \
+  !defined(__cplusplus) && ( \
+      (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \
+      (JSON_HEDLEY_HAS_FEATURE(c_static_assert) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \
+      JSON_HEDLEY_GCC_VERSION_CHECK(6,0,0) || \
+      JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+      defined(_Static_assert) \
+    )
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) _Static_assert(expr, message)
+#elif \
+  (defined(__cplusplus) && (__cplusplus >= 201103L)) || \
+  JSON_HEDLEY_MSVC_VERSION_CHECK(16,0,0) || \
+  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(static_assert(expr, message))
+#else
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message)
+#endif
+
+#if defined(JSON_HEDLEY_NULL)
+    #undef JSON_HEDLEY_NULL
+#endif
+#if defined(__cplusplus)
+    #if __cplusplus >= 201103L
+        #define JSON_HEDLEY_NULL JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(nullptr)
+    #elif defined(NULL)
+        #define JSON_HEDLEY_NULL NULL
+    #else
+        #define JSON_HEDLEY_NULL JSON_HEDLEY_STATIC_CAST(void*, 0)
+    #endif
+#elif defined(NULL)
+    #define JSON_HEDLEY_NULL NULL
+#else
+    #define JSON_HEDLEY_NULL ((void*) 0)
+#endif
+
+#if defined(JSON_HEDLEY_MESSAGE)
+    #undef JSON_HEDLEY_MESSAGE
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+#  define JSON_HEDLEY_MESSAGE(msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
+    JSON_HEDLEY_PRAGMA(message msg) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#elif \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,4,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message msg)
+#elif JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(_CRI message msg)
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#else
+#  define JSON_HEDLEY_MESSAGE(msg)
+#endif
+
+#if defined(JSON_HEDLEY_WARNING)
+    #undef JSON_HEDLEY_WARNING
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+#  define JSON_HEDLEY_WARNING(msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
+    JSON_HEDLEY_PRAGMA(clang warning msg) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#elif \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,8,0) || \
+  JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(GCC warning msg)
+#elif \
+  JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \
+  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#else
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_MESSAGE(msg)
+#endif
+
+#if defined(JSON_HEDLEY_REQUIRE)
+    #undef JSON_HEDLEY_REQUIRE
+#endif
+#if defined(JSON_HEDLEY_REQUIRE_MSG)
+    #undef JSON_HEDLEY_REQUIRE_MSG
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(diagnose_if)
+#  if JSON_HEDLEY_HAS_WARNING("-Wgcc-compat")
+#    define JSON_HEDLEY_REQUIRE(expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
+    __attribute__((diagnose_if(!(expr), #expr, "error"))) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
+    __attribute__((diagnose_if(!(expr), msg, "error"))) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#  else
+#    define JSON_HEDLEY_REQUIRE(expr) __attribute__((diagnose_if(!(expr), #expr, "error")))
+#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) __attribute__((diagnose_if(!(expr), msg, "error")))
+#  endif
+#else
+#  define JSON_HEDLEY_REQUIRE(expr)
+#  define JSON_HEDLEY_REQUIRE_MSG(expr,msg)
+#endif
+
+#if defined(JSON_HEDLEY_FLAGS)
+    #undef JSON_HEDLEY_FLAGS
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(flag_enum) && (!defined(__cplusplus) || JSON_HEDLEY_HAS_WARNING("-Wbitfield-enum-conversion"))
+    #define JSON_HEDLEY_FLAGS __attribute__((__flag_enum__))
+#else
+    #define JSON_HEDLEY_FLAGS
+#endif
+
+#if defined(JSON_HEDLEY_FLAGS_CAST)
+    #undef JSON_HEDLEY_FLAGS_CAST
+#endif
+#if JSON_HEDLEY_INTEL_VERSION_CHECK(19,0,0)
+#  define JSON_HEDLEY_FLAGS_CAST(T, expr) (__extension__ ({ \
+        JSON_HEDLEY_DIAGNOSTIC_PUSH \
+        _Pragma("warning(disable:188)") \
+        ((T) (expr)); \
+        JSON_HEDLEY_DIAGNOSTIC_POP \
+    }))
+#else
+#  define JSON_HEDLEY_FLAGS_CAST(T, expr) JSON_HEDLEY_STATIC_CAST(T, expr)
+#endif
+
+#if defined(JSON_HEDLEY_EMPTY_BASES)
+    #undef JSON_HEDLEY_EMPTY_BASES
+#endif
+#if \
+    (JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,23918) && !JSON_HEDLEY_MSVC_VERSION_CHECK(20,0,0)) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_EMPTY_BASES __declspec(empty_bases)
+#else
+    #define JSON_HEDLEY_EMPTY_BASES
+#endif
+
+/* Remaining macros are deprecated. */
+
+#if defined(JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK)
+    #undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
+#endif
+#if defined(__clang__)
+    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) (0)
+#else
+    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_CLANG_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_BUILTIN)
+    #undef JSON_HEDLEY_CLANG_HAS_BUILTIN
+#endif
+#define JSON_HEDLEY_CLANG_HAS_BUILTIN(builtin) JSON_HEDLEY_HAS_BUILTIN(builtin)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_FEATURE)
+    #undef JSON_HEDLEY_CLANG_HAS_FEATURE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_FEATURE(feature) JSON_HEDLEY_HAS_FEATURE(feature)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_EXTENSION)
+    #undef JSON_HEDLEY_CLANG_HAS_EXTENSION
+#endif
+#define JSON_HEDLEY_CLANG_HAS_EXTENSION(extension) JSON_HEDLEY_HAS_EXTENSION(extension)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_WARNING)
+    #undef JSON_HEDLEY_CLANG_HAS_WARNING
+#endif
+#define JSON_HEDLEY_CLANG_HAS_WARNING(warning) JSON_HEDLEY_HAS_WARNING(warning)
+
+#endif /* !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < X) */
+
+
+// This file contains all internal macro definitions (except those affecting ABI)
+// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+// exclude unsupported compilers
+#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
+    #if defined(__clang__)
+        #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
+            #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
+        #endif
+    #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
+        #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800
+            #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
+        #endif
+    #endif
+#endif
+
+// C++ language standard detection
+// if the user manually specified the used c++ version this is skipped
+#if !defined(JSON_HAS_CPP_20) && !defined(JSON_HAS_CPP_17) && !defined(JSON_HAS_CPP_14) && !defined(JSON_HAS_CPP_11)
+    #if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)
+        #define JSON_HAS_CPP_20
+        #define JSON_HAS_CPP_17
+        #define JSON_HAS_CPP_14
+    #elif (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
+        #define JSON_HAS_CPP_17
+        #define JSON_HAS_CPP_14
+    #elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
+        #define JSON_HAS_CPP_14
+    #endif
+    // the cpp 11 flag is always specified because it is the minimal required version
+    #define JSON_HAS_CPP_11
+#endif
+
+#ifdef __has_include
+    #if __has_include(<version>)
+        #include <version>
+    #endif
+#endif
+
+#if !defined(JSON_HAS_FILESYSTEM) && !defined(JSON_HAS_EXPERIMENTAL_FILESYSTEM)
+    #ifdef JSON_HAS_CPP_17
+        #if defined(__cpp_lib_filesystem)
+            #define JSON_HAS_FILESYSTEM 1
+        #elif defined(__cpp_lib_experimental_filesystem)
+            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
+        #elif !defined(__has_include)
+            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
+        #elif __has_include(<filesystem>)
+            #define JSON_HAS_FILESYSTEM 1
+        #elif __has_include(<experimental/filesystem>)
+            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
+        #endif
+
+        // std::filesystem does not work on MinGW GCC 8: https://sourceforge.net/p/mingw-w64/bugs/737/
+        #if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before GCC 8: https://en.cppreference.com/w/cpp/compiler_support
+        #if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 8
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before Clang 7: https://en.cppreference.com/w/cpp/compiler_support
+        #if defined(__clang_major__) && __clang_major__ < 7
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before MSVC 19.14: https://en.cppreference.com/w/cpp/compiler_support
+        #if defined(_MSC_VER) && _MSC_VER < 1914
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before iOS 13
+        #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before macOS Catalina
+        #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+    #endif
+#endif
+
+#ifndef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+    #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 0
+#endif
+
+#ifndef JSON_HAS_FILESYSTEM
+    #define JSON_HAS_FILESYSTEM 0
+#endif
+
+#ifndef JSON_HAS_THREE_WAY_COMPARISON
+    #if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison >= 201907L \
+        && defined(__cpp_lib_three_way_comparison) && __cpp_lib_three_way_comparison >= 201907L
+        #define JSON_HAS_THREE_WAY_COMPARISON 1
+    #else
+        #define JSON_HAS_THREE_WAY_COMPARISON 0
+    #endif
+#endif
+
+#ifndef JSON_HAS_RANGES
+    // ranges header shipping in GCC 11.1.0 (released 2021-04-27) has syntax error
+    #if defined(__GLIBCXX__) && __GLIBCXX__ == 20210427
+        #define JSON_HAS_RANGES 0
+    #elif defined(__cpp_lib_ranges)
+        #define JSON_HAS_RANGES 1
+    #else
+        #define JSON_HAS_RANGES 0
+    #endif
+#endif
+
+#ifndef JSON_HAS_STATIC_RTTI
+    #if !defined(_HAS_STATIC_RTTI) || _HAS_STATIC_RTTI != 0
+        #define JSON_HAS_STATIC_RTTI 1
+    #else
+        #define JSON_HAS_STATIC_RTTI 0
+    #endif
+#endif
+
+#ifdef JSON_HAS_CPP_17
+    #define JSON_INLINE_VARIABLE inline
+#else
+    #define JSON_INLINE_VARIABLE
+#endif
+
+#if JSON_HEDLEY_HAS_ATTRIBUTE(no_unique_address)
+    #define JSON_NO_UNIQUE_ADDRESS [[no_unique_address]]
+#else
+    #define JSON_NO_UNIQUE_ADDRESS
+#endif
+
+// disable documentation warnings on clang
+#if defined(__clang__)
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wdocumentation"
+    #pragma clang diagnostic ignored "-Wdocumentation-unknown-command"
+#endif
+
+// allow disabling exceptions
+#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION)
+    #define JSON_THROW(exception) throw exception
+    #define JSON_TRY try
+    #define JSON_CATCH(exception) catch(exception)
+    #define JSON_INTERNAL_CATCH(exception) catch(exception)
+#else
+    #include <cstdlib>
+    #define JSON_THROW(exception) std::abort()
+    #define JSON_TRY if(true)
+    #define JSON_CATCH(exception) if(false)
+    #define JSON_INTERNAL_CATCH(exception) if(false)
+#endif
+
+// override exception macros
+#if defined(JSON_THROW_USER)
+    #undef JSON_THROW
+    #define JSON_THROW JSON_THROW_USER
+#endif
+#if defined(JSON_TRY_USER)
+    #undef JSON_TRY
+    #define JSON_TRY JSON_TRY_USER
+#endif
+#if defined(JSON_CATCH_USER)
+    #undef JSON_CATCH
+    #define JSON_CATCH JSON_CATCH_USER
+    #undef JSON_INTERNAL_CATCH
+    #define JSON_INTERNAL_CATCH JSON_CATCH_USER
+#endif
+#if defined(JSON_INTERNAL_CATCH_USER)
+    #undef JSON_INTERNAL_CATCH
+    #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER
+#endif
+
+// allow overriding assert
+#if !defined(JSON_ASSERT)
+    #include <cassert> // assert
+    #define JSON_ASSERT(x) assert(x)
+#endif
+
+// allow to access some private functions (needed by the test suite)
+#if defined(JSON_TESTS_PRIVATE)
+    #define JSON_PRIVATE_UNLESS_TESTED public
+#else
+    #define JSON_PRIVATE_UNLESS_TESTED private
+#endif
+
+/*!
+@brief macro to briefly define a mapping between an enum and JSON
+@def NLOHMANN_JSON_SERIALIZE_ENUM
+@since version 3.4.0
+*/
+#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...)                                            \
+    template<typename BasicJsonType>                                                            \
+    inline void to_json(BasicJsonType& j, const ENUM_TYPE& e)                                   \
+    {                                                                                           \
+        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
+        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
+        auto it = std::find_if(std::begin(m), std::end(m),                                      \
+                               [e](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool  \
+        {                                                                                       \
+            return ej_pair.first == e;                                                          \
+        });                                                                                     \
+        j = ((it != std::end(m)) ? it : std::begin(m))->second;                                 \
+    }                                                                                           \
+    template<typename BasicJsonType>                                                            \
+    inline void from_json(const BasicJsonType& j, ENUM_TYPE& e)                                 \
+    {                                                                                           \
+        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
+        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
+        auto it = std::find_if(std::begin(m), std::end(m),                                      \
+                               [&j](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool \
+        {                                                                                       \
+            return ej_pair.second == j;                                                         \
+        });                                                                                     \
+        e = ((it != std::end(m)) ? it : std::begin(m))->first;                                  \
+    }
+
+// Ugly macros to avoid uglier copy-paste when specializing basic_json. They
+// may be removed in the future once the class is split.
+
+#define NLOHMANN_BASIC_JSON_TPL_DECLARATION                                \
+    template<template<typename, typename, typename...> class ObjectType,   \
+             template<typename, typename...> class ArrayType,              \
+             class StringType, class BooleanType, class NumberIntegerType, \
+             class NumberUnsignedType, class NumberFloatType,              \
+             template<typename> class AllocatorType,                       \
+             template<typename, typename = void> class JSONSerializer,     \
+             class BinaryType,                                             \
+             class CustomBaseClass>
+
+#define NLOHMANN_BASIC_JSON_TPL                                            \
+    basic_json<ObjectType, ArrayType, StringType, BooleanType,             \
+    NumberIntegerType, NumberUnsignedType, NumberFloatType,                \
+    AllocatorType, JSONSerializer, BinaryType, CustomBaseClass>
+
+// Macros to simplify conversion from/to types
+
+#define NLOHMANN_JSON_EXPAND( x ) x
+#define NLOHMANN_JSON_GET_MACRO(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, NAME,...) NAME
+#define NLOHMANN_JSON_PASTE(...) NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_GET_MACRO(__VA_ARGS__, \
+        NLOHMANN_JSON_PASTE64, \
+        NLOHMANN_JSON_PASTE63, \
+        NLOHMANN_JSON_PASTE62, \
+        NLOHMANN_JSON_PASTE61, \
+        NLOHMANN_JSON_PASTE60, \
+        NLOHMANN_JSON_PASTE59, \
+        NLOHMANN_JSON_PASTE58, \
+        NLOHMANN_JSON_PASTE57, \
+        NLOHMANN_JSON_PASTE56, \
+        NLOHMANN_JSON_PASTE55, \
+        NLOHMANN_JSON_PASTE54, \
+        NLOHMANN_JSON_PASTE53, \
+        NLOHMANN_JSON_PASTE52, \
+        NLOHMANN_JSON_PASTE51, \
+        NLOHMANN_JSON_PASTE50, \
+        NLOHMANN_JSON_PASTE49, \
+        NLOHMANN_JSON_PASTE48, \
+        NLOHMANN_JSON_PASTE47, \
+        NLOHMANN_JSON_PASTE46, \
+        NLOHMANN_JSON_PASTE45, \
+        NLOHMANN_JSON_PASTE44, \
+        NLOHMANN_JSON_PASTE43, \
+        NLOHMANN_JSON_PASTE42, \
+        NLOHMANN_JSON_PASTE41, \
+        NLOHMANN_JSON_PASTE40, \
+        NLOHMANN_JSON_PASTE39, \
+        NLOHMANN_JSON_PASTE38, \
+        NLOHMANN_JSON_PASTE37, \
+        NLOHMANN_JSON_PASTE36, \
+        NLOHMANN_JSON_PASTE35, \
+        NLOHMANN_JSON_PASTE34, \
+        NLOHMANN_JSON_PASTE33, \
+        NLOHMANN_JSON_PASTE32, \
+        NLOHMANN_JSON_PASTE31, \
+        NLOHMANN_JSON_PASTE30, \
+        NLOHMANN_JSON_PASTE29, \
+        NLOHMANN_JSON_PASTE28, \
+        NLOHMANN_JSON_PASTE27, \
+        NLOHMANN_JSON_PASTE26, \
+        NLOHMANN_JSON_PASTE25, \
+        NLOHMANN_JSON_PASTE24, \
+        NLOHMANN_JSON_PASTE23, \
+        NLOHMANN_JSON_PASTE22, \
+        NLOHMANN_JSON_PASTE21, \
+        NLOHMANN_JSON_PASTE20, \
+        NLOHMANN_JSON_PASTE19, \
+        NLOHMANN_JSON_PASTE18, \
+        NLOHMANN_JSON_PASTE17, \
+        NLOHMANN_JSON_PASTE16, \
+        NLOHMANN_JSON_PASTE15, \
+        NLOHMANN_JSON_PASTE14, \
+        NLOHMANN_JSON_PASTE13, \
+        NLOHMANN_JSON_PASTE12, \
+        NLOHMANN_JSON_PASTE11, \
+        NLOHMANN_JSON_PASTE10, \
+        NLOHMANN_JSON_PASTE9, \
+        NLOHMANN_JSON_PASTE8, \
+        NLOHMANN_JSON_PASTE7, \
+        NLOHMANN_JSON_PASTE6, \
+        NLOHMANN_JSON_PASTE5, \
+        NLOHMANN_JSON_PASTE4, \
+        NLOHMANN_JSON_PASTE3, \
+        NLOHMANN_JSON_PASTE2, \
+        NLOHMANN_JSON_PASTE1)(__VA_ARGS__))
+#define NLOHMANN_JSON_PASTE2(func, v1) func(v1)
+#define NLOHMANN_JSON_PASTE3(func, v1, v2) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE2(func, v2)
+#define NLOHMANN_JSON_PASTE4(func, v1, v2, v3) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE3(func, v2, v3)
+#define NLOHMANN_JSON_PASTE5(func, v1, v2, v3, v4) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE4(func, v2, v3, v4)
+#define NLOHMANN_JSON_PASTE6(func, v1, v2, v3, v4, v5) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE5(func, v2, v3, v4, v5)
+#define NLOHMANN_JSON_PASTE7(func, v1, v2, v3, v4, v5, v6) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE6(func, v2, v3, v4, v5, v6)
+#define NLOHMANN_JSON_PASTE8(func, v1, v2, v3, v4, v5, v6, v7) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE7(func, v2, v3, v4, v5, v6, v7)
+#define NLOHMANN_JSON_PASTE9(func, v1, v2, v3, v4, v5, v6, v7, v8) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE8(func, v2, v3, v4, v5, v6, v7, v8)
+#define NLOHMANN_JSON_PASTE10(func, v1, v2, v3, v4, v5, v6, v7, v8, v9) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE9(func, v2, v3, v4, v5, v6, v7, v8, v9)
+#define NLOHMANN_JSON_PASTE11(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE10(func, v2, v3, v4, v5, v6, v7, v8, v9, v10)
+#define NLOHMANN_JSON_PASTE12(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE11(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11)
+#define NLOHMANN_JSON_PASTE13(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE12(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12)
+#define NLOHMANN_JSON_PASTE14(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE13(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13)
+#define NLOHMANN_JSON_PASTE15(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE14(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14)
+#define NLOHMANN_JSON_PASTE16(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE15(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15)
+#define NLOHMANN_JSON_PASTE17(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE16(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16)
+#define NLOHMANN_JSON_PASTE18(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE17(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17)
+#define NLOHMANN_JSON_PASTE19(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE18(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18)
+#define NLOHMANN_JSON_PASTE20(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE19(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19)
+#define NLOHMANN_JSON_PASTE21(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE20(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20)
+#define NLOHMANN_JSON_PASTE22(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE21(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21)
+#define NLOHMANN_JSON_PASTE23(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE22(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22)
+#define NLOHMANN_JSON_PASTE24(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE23(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23)
+#define NLOHMANN_JSON_PASTE25(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE24(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24)
+#define NLOHMANN_JSON_PASTE26(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE25(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25)
+#define NLOHMANN_JSON_PASTE27(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE26(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26)
+#define NLOHMANN_JSON_PASTE28(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE27(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27)
+#define NLOHMANN_JSON_PASTE29(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE28(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28)
+#define NLOHMANN_JSON_PASTE30(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE29(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29)
+#define NLOHMANN_JSON_PASTE31(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE30(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30)
+#define NLOHMANN_JSON_PASTE32(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE31(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31)
+#define NLOHMANN_JSON_PASTE33(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE32(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32)
+#define NLOHMANN_JSON_PASTE34(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE33(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33)
+#define NLOHMANN_JSON_PASTE35(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE34(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34)
+#define NLOHMANN_JSON_PASTE36(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE35(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35)
+#define NLOHMANN_JSON_PASTE37(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE36(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36)
+#define NLOHMANN_JSON_PASTE38(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE37(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37)
+#define NLOHMANN_JSON_PASTE39(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE38(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38)
+#define NLOHMANN_JSON_PASTE40(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE39(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39)
+#define NLOHMANN_JSON_PASTE41(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE40(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40)
+#define NLOHMANN_JSON_PASTE42(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE41(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41)
+#define NLOHMANN_JSON_PASTE43(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE42(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42)
+#define NLOHMANN_JSON_PASTE44(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE43(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43)
+#define NLOHMANN_JSON_PASTE45(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE44(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44)
+#define NLOHMANN_JSON_PASTE46(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE45(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45)
+#define NLOHMANN_JSON_PASTE47(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE46(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46)
+#define NLOHMANN_JSON_PASTE48(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE47(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47)
+#define NLOHMANN_JSON_PASTE49(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE48(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48)
+#define NLOHMANN_JSON_PASTE50(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE49(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49)
+#define NLOHMANN_JSON_PASTE51(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE50(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50)
+#define NLOHMANN_JSON_PASTE52(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE51(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51)
+#define NLOHMANN_JSON_PASTE53(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE52(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52)
+#define NLOHMANN_JSON_PASTE54(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE53(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53)
+#define NLOHMANN_JSON_PASTE55(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE54(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54)
+#define NLOHMANN_JSON_PASTE56(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE55(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55)
+#define NLOHMANN_JSON_PASTE57(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE56(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56)
+#define NLOHMANN_JSON_PASTE58(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE57(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57)
+#define NLOHMANN_JSON_PASTE59(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE58(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58)
+#define NLOHMANN_JSON_PASTE60(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE59(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59)
+#define NLOHMANN_JSON_PASTE61(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE60(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60)
+#define NLOHMANN_JSON_PASTE62(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE61(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61)
+#define NLOHMANN_JSON_PASTE63(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE62(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62)
+#define NLOHMANN_JSON_PASTE64(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE63(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63)
+
+#define NLOHMANN_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.v1;
+#define NLOHMANN_JSON_FROM(v1) nlohmann_json_j.at(#v1).get_to(nlohmann_json_t.v1);
+#define NLOHMANN_JSON_FROM_WITH_DEFAULT(v1) nlohmann_json_t.v1 = nlohmann_json_j.value(#v1, nlohmann_json_default_obj.v1);
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_TYPE_INTRUSIVE
+@since version 3.9.0
+*/
+#define NLOHMANN_DEFINE_TYPE_INTRUSIVE(Type, ...)  \
+    friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
+
+#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(Type, ...)  \
+    friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { const Type nlohmann_json_default_obj{}; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) }
+
+#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_ONLY_SERIALIZE(Type, ...)  \
+    friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE
+@since version 3.9.0
+*/
+#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Type, ...)  \
+    inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
+
+#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE(Type, ...)  \
+    inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) }
+
+#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(Type, ...)  \
+    inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { const Type nlohmann_json_default_obj{}; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) }
+
+// inspired from https://stackoverflow.com/a/26745591
+// allows to call any std function as if (e.g. with begin):
+// using std::begin; begin(x);
+//
+// it allows using the detected idiom to retrieve the return type
+// of such an expression
+#define NLOHMANN_CAN_CALL_STD_FUNC_IMPL(std_name)                                 \
+    namespace detail {                                                            \
+    using std::std_name;                                                          \
+    \
+    template<typename... T>                                                       \
+    using result_of_##std_name = decltype(std_name(std::declval<T>()...));        \
+    }                                                                             \
+    \
+    namespace detail2 {                                                           \
+    struct std_name##_tag                                                         \
+    {                                                                             \
+    };                                                                            \
+    \
+    template<typename... T>                                                       \
+    std_name##_tag std_name(T&&...);                                              \
+    \
+    template<typename... T>                                                       \
+    using result_of_##std_name = decltype(std_name(std::declval<T>()...));        \
+    \
+    template<typename... T>                                                       \
+    struct would_call_std_##std_name                                              \
+    {                                                                             \
+        static constexpr auto const value = ::nlohmann::detail::                  \
+                                            is_detected_exact<std_name##_tag, result_of_##std_name, T...>::value; \
+    };                                                                            \
+    } /* namespace detail2 */ \
+    \
+    template<typename... T>                                                       \
+    struct would_call_std_##std_name : detail2::would_call_std_##std_name<T...>   \
+    {                                                                             \
+    }
+
+#ifndef JSON_USE_IMPLICIT_CONVERSIONS
+    #define JSON_USE_IMPLICIT_CONVERSIONS 1
+#endif
+
+#if JSON_USE_IMPLICIT_CONVERSIONS
+    #define JSON_EXPLICIT
+#else
+    #define JSON_EXPLICIT explicit
+#endif
+
+#ifndef JSON_DISABLE_ENUM_SERIALIZATION
+    #define JSON_DISABLE_ENUM_SERIALIZATION 0
+#endif
+
+#ifndef JSON_USE_GLOBAL_UDLS
+    #define JSON_USE_GLOBAL_UDLS 1
+#endif
+
+#if JSON_HAS_THREE_WAY_COMPARISON
+    #include <compare> // partial_ordering
+#endif
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+///////////////////////////
+// JSON type enumeration //
+///////////////////////////
+
+/*!
+@brief the JSON type enumeration
+
+This enumeration collects the different JSON types. It is internally used to
+distinguish the stored values, and the functions @ref basic_json::is_null(),
+@ref basic_json::is_object(), @ref basic_json::is_array(),
+@ref basic_json::is_string(), @ref basic_json::is_boolean(),
+@ref basic_json::is_number() (with @ref basic_json::is_number_integer(),
+@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()),
+@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and
+@ref basic_json::is_structured() rely on it.
+
+@note There are three enumeration entries (number_integer, number_unsigned, and
+number_float), because the library distinguishes these three types for numbers:
+@ref basic_json::number_unsigned_t is used for unsigned integers,
+@ref basic_json::number_integer_t is used for signed integers, and
+@ref basic_json::number_float_t is used for floating-point numbers or to
+approximate integers which do not fit in the limits of their respective type.
+
+@sa see @ref basic_json::basic_json(const value_t value_type) -- create a JSON
+value with the default value for a given type
+
+@since version 1.0.0
+*/
+enum class value_t : std::uint8_t
+{
+    null,             ///< null value
+    object,           ///< object (unordered set of name/value pairs)
+    array,            ///< array (ordered collection of values)
+    string,           ///< string value
+    boolean,          ///< boolean value
+    number_integer,   ///< number value (signed integer)
+    number_unsigned,  ///< number value (unsigned integer)
+    number_float,     ///< number value (floating-point)
+    binary,           ///< binary array (ordered collection of bytes)
+    discarded         ///< discarded by the parser callback function
+};
+
+/*!
+@brief comparison operator for JSON types
+
+Returns an ordering that is similar to Python:
+- order: null < boolean < number < object < array < string < binary
+- furthermore, each type is not smaller than itself
+- discarded values are not comparable
+- binary is represented as a b"" string in python and directly comparable to a
+  string; however, making a binary array directly comparable with a string would
+  be surprising behavior in a JSON file.
+
+@since version 1.0.0
+*/
+#if JSON_HAS_THREE_WAY_COMPARISON
+    inline std::partial_ordering operator<=>(const value_t lhs, const value_t rhs) noexcept // *NOPAD*
+#else
+    inline bool operator<(const value_t lhs, const value_t rhs) noexcept
+#endif
+{
+    static constexpr std::array<std::uint8_t, 9> order = {{
+            0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */,
+            1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */,
+            6 /* binary */
+        }
+    };
+
+    const auto l_index = static_cast<std::size_t>(lhs);
+    const auto r_index = static_cast<std::size_t>(rhs);
+#if JSON_HAS_THREE_WAY_COMPARISON
+    if (l_index < order.size() && r_index < order.size())
+    {
+        return order[l_index] <=> order[r_index]; // *NOPAD*
+    }
+    return std::partial_ordering::unordered;
+#else
+    return l_index < order.size() && r_index < order.size() && order[l_index] < order[r_index];
+#endif
+}
+
+// GCC selects the built-in operator< over an operator rewritten from
+// a user-defined spaceship operator
+// Clang, MSVC, and ICC select the rewritten candidate
+// (see GCC bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105200)
+#if JSON_HAS_THREE_WAY_COMPARISON && defined(__GNUC__)
+inline bool operator<(const value_t lhs, const value_t rhs) noexcept
+{
+    return std::is_lt(lhs <=> rhs); // *NOPAD*
+}
+#endif
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/string_escape.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*!
+@brief replace all occurrences of a substring by another string
+
+@param[in,out] s  the string to manipulate; changed so that all
+               occurrences of @a f are replaced with @a t
+@param[in]     f  the substring to replace with @a t
+@param[in]     t  the string to replace @a f
+
+@pre The search string @a f must not be empty. **This precondition is
+enforced with an assertion.**
+
+@since version 2.0.0
+*/
+template<typename StringType>
+inline void replace_substring(StringType& s, const StringType& f,
+                              const StringType& t)
+{
+    JSON_ASSERT(!f.empty());
+    for (auto pos = s.find(f);                // find first occurrence of f
+            pos != StringType::npos;          // make sure f was found
+            s.replace(pos, f.size(), t),      // replace with t, and
+            pos = s.find(f, pos + t.size()))  // find next occurrence of f
+    {}
+}
+
+/*!
+ * @brief string escaping as described in RFC 6901 (Sect. 4)
+ * @param[in] s string to escape
+ * @return    escaped string
+ *
+ * Note the order of escaping "~" to "~0" and "/" to "~1" is important.
+ */
+template<typename StringType>
+inline StringType escape(StringType s)
+{
+    replace_substring(s, StringType{"~"}, StringType{"~0"});
+    replace_substring(s, StringType{"/"}, StringType{"~1"});
+    return s;
+}
+
+/*!
+ * @brief string unescaping as described in RFC 6901 (Sect. 4)
+ * @param[in] s string to unescape
+ * @return    unescaped string
+ *
+ * Note the order of escaping "~1" to "/" and "~0" to "~" is important.
+ */
+template<typename StringType>
+static void unescape(StringType& s)
+{
+    replace_substring(s, StringType{"~1"}, StringType{"/"});
+    replace_substring(s, StringType{"~0"}, StringType{"~"});
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/input/position_t.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef> // size_t
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/// struct to capture the start position of the current token
+struct position_t
+{
+    /// the total number of characters read
+    std::size_t chars_read_total = 0;
+    /// the number of characters read in the current line
+    std::size_t chars_read_current_line = 0;
+    /// the number of lines read
+    std::size_t lines_read = 0;
+
+    /// conversion to size_t to preserve SAX interface
+    constexpr operator size_t() const
+    {
+        return chars_read_total;
+    }
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-FileCopyrightText: 2018 The Abseil Authors
+// SPDX-License-Identifier: MIT
+
+
+
+#include <array> // array
+#include <cstddef> // size_t
+#include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
+#include <utility> // index_sequence, make_index_sequence, index_sequence_for
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename T>
+using uncvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
+
+#ifdef JSON_HAS_CPP_14
+
+// the following utilities are natively available in C++14
+using std::enable_if_t;
+using std::index_sequence;
+using std::make_index_sequence;
+using std::index_sequence_for;
+
+#else
+
+// alias templates to reduce boilerplate
+template<bool B, typename T = void>
+using enable_if_t = typename std::enable_if<B, T>::type;
+
+// The following code is taken from https://github.com/abseil/abseil-cpp/blob/10cb35e459f5ecca5b2ff107635da0bfa41011b4/absl/utility/utility.h
+// which is part of Google Abseil (https://github.com/abseil/abseil-cpp), licensed under the Apache License 2.0.
+
+//// START OF CODE FROM GOOGLE ABSEIL
+
+// integer_sequence
+//
+// Class template representing a compile-time integer sequence. An instantiation
+// of `integer_sequence<T, Ints...>` has a sequence of integers encoded in its
+// type through its template arguments (which is a common need when
+// working with C++11 variadic templates). `absl::integer_sequence` is designed
+// to be a drop-in replacement for C++14's `std::integer_sequence`.
+//
+// Example:
+//
+//   template< class T, T... Ints >
+//   void user_function(integer_sequence<T, Ints...>);
+//
+//   int main()
+//   {
+//     // user_function's `T` will be deduced to `int` and `Ints...`
+//     // will be deduced to `0, 1, 2, 3, 4`.
+//     user_function(make_integer_sequence<int, 5>());
+//   }
+template <typename T, T... Ints>
+struct integer_sequence
+{
+    using value_type = T;
+    static constexpr std::size_t size() noexcept
+    {
+        return sizeof...(Ints);
+    }
+};
+
+// index_sequence
+//
+// A helper template for an `integer_sequence` of `size_t`,
+// `absl::index_sequence` is designed to be a drop-in replacement for C++14's
+// `std::index_sequence`.
+template <size_t... Ints>
+using index_sequence = integer_sequence<size_t, Ints...>;
+
+namespace utility_internal
+{
+
+template <typename Seq, size_t SeqSize, size_t Rem>
+struct Extend;
+
+// Note that SeqSize == sizeof...(Ints). It's passed explicitly for efficiency.
+template <typename T, T... Ints, size_t SeqSize>
+struct Extend<integer_sequence<T, Ints...>, SeqSize, 0>
+{
+    using type = integer_sequence < T, Ints..., (Ints + SeqSize)... >;
+};
+
+template <typename T, T... Ints, size_t SeqSize>
+struct Extend<integer_sequence<T, Ints...>, SeqSize, 1>
+{
+    using type = integer_sequence < T, Ints..., (Ints + SeqSize)..., 2 * SeqSize >;
+};
+
+// Recursion helper for 'make_integer_sequence<T, N>'.
+// 'Gen<T, N>::type' is an alias for 'integer_sequence<T, 0, 1, ... N-1>'.
+template <typename T, size_t N>
+struct Gen
+{
+    using type =
+        typename Extend < typename Gen < T, N / 2 >::type, N / 2, N % 2 >::type;
+};
+
+template <typename T>
+struct Gen<T, 0>
+{
+    using type = integer_sequence<T>;
+};
+
+}  // namespace utility_internal
+
+// Compile-time sequences of integers
+
+// make_integer_sequence
+//
+// This template alias is equivalent to
+// `integer_sequence<int, 0, 1, ..., N-1>`, and is designed to be a drop-in
+// replacement for C++14's `std::make_integer_sequence`.
+template <typename T, T N>
+using make_integer_sequence = typename utility_internal::Gen<T, N>::type;
+
+// make_index_sequence
+//
+// This template alias is equivalent to `index_sequence<0, 1, ..., N-1>`,
+// and is designed to be a drop-in replacement for C++14's
+// `std::make_index_sequence`.
+template <size_t N>
+using make_index_sequence = make_integer_sequence<size_t, N>;
+
+// index_sequence_for
+//
+// Converts a typename pack into an index sequence of the same length, and
+// is designed to be a drop-in replacement for C++14's
+// `std::index_sequence_for()`
+template <typename... Ts>
+using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
+
+//// END OF CODE FROM GOOGLE ABSEIL
+
+#endif
+
+// dispatch utility (taken from ranges-v3)
+template<unsigned N> struct priority_tag : priority_tag < N - 1 > {};
+template<> struct priority_tag<0> {};
+
+// taken from ranges-v3
+template<typename T>
+struct static_const
+{
+    static JSON_INLINE_VARIABLE constexpr T value{};
+};
+
+#ifndef JSON_HAS_CPP_17
+    template<typename T>
+    constexpr T static_const<T>::value;
+#endif
+
+template<typename T, typename... Args>
+inline constexpr std::array<T, sizeof...(Args)> make_array(Args&& ... args)
+{
+    return std::array<T, sizeof...(Args)> {{static_cast<T>(std::forward<Args>(args))...}};
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <limits> // numeric_limits
+#include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
+#include <utility> // declval
+#include <tuple> // tuple
+#include <string> // char_traits
+
+// #include <nlohmann/detail/iterators/iterator_traits.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <iterator> // random_access_iterator_tag
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/meta/void_t.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename It, typename = void>
+struct iterator_types {};
+
+template<typename It>
+struct iterator_types <
+    It,
+    void_t<typename It::difference_type, typename It::value_type, typename It::pointer,
+    typename It::reference, typename It::iterator_category >>
+{
+    using difference_type = typename It::difference_type;
+    using value_type = typename It::value_type;
+    using pointer = typename It::pointer;
+    using reference = typename It::reference;
+    using iterator_category = typename It::iterator_category;
+};
+
+// This is required as some compilers implement std::iterator_traits in a way that
+// doesn't work with SFINAE. See https://github.com/nlohmann/json/issues/1341.
+template<typename T, typename = void>
+struct iterator_traits
+{
+};
+
+template<typename T>
+struct iterator_traits < T, enable_if_t < !std::is_pointer<T>::value >>
+            : iterator_types<T>
+{
+};
+
+template<typename T>
+struct iterator_traits<T*, enable_if_t<std::is_object<T>::value>>
+{
+    using iterator_category = std::random_access_iterator_tag;
+    using value_type = T;
+    using difference_type = ptrdiff_t;
+    using pointer = T*;
+    using reference = T&;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/call_std/begin.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+NLOHMANN_CAN_CALL_STD_FUNC_IMPL(begin);
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/call_std/end.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+NLOHMANN_CAN_CALL_STD_FUNC_IMPL(end);
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+// #include <nlohmann/json_fwd.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
+    #define INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+    #include <cstdint> // int64_t, uint64_t
+    #include <map> // map
+    #include <memory> // allocator
+    #include <string> // string
+    #include <vector> // vector
+
+    // #include <nlohmann/detail/abi_macros.hpp>
+
+
+    /*!
+    @brief namespace for Niels Lohmann
+    @see https://github.com/nlohmann
+    @since version 1.0.0
+    */
+    NLOHMANN_JSON_NAMESPACE_BEGIN
+
+    /*!
+    @brief default JSONSerializer template argument
+
+    This serializer ignores the template arguments and uses ADL
+    ([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
+    for serialization.
+    */
+    template<typename T = void, typename SFINAE = void>
+    struct adl_serializer;
+
+    /// a class to store JSON values
+    /// @sa https://json.nlohmann.me/api/basic_json/
+    template<template<typename U, typename V, typename... Args> class ObjectType =
+    std::map,
+    template<typename U, typename... Args> class ArrayType = std::vector,
+    class StringType = std::string, class BooleanType = bool,
+    class NumberIntegerType = std::int64_t,
+    class NumberUnsignedType = std::uint64_t,
+    class NumberFloatType = double,
+    template<typename U> class AllocatorType = std::allocator,
+    template<typename T, typename SFINAE = void> class JSONSerializer =
+    adl_serializer,
+    class BinaryType = std::vector<std::uint8_t>, // cppcheck-suppress syntaxError
+    class CustomBaseClass = void>
+    class basic_json;
+
+    /// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
+    /// @sa https://json.nlohmann.me/api/json_pointer/
+    template<typename RefStringType>
+    class json_pointer;
+
+    /*!
+    @brief default specialization
+    @sa https://json.nlohmann.me/api/json/
+    */
+    using json = basic_json<>;
+
+    /// @brief a minimal map-like container that preserves insertion order
+    /// @sa https://json.nlohmann.me/api/ordered_map/
+    template<class Key, class T, class IgnoredLess, class Allocator>
+    struct ordered_map;
+
+    /// @brief specialization that maintains the insertion order of object keys
+    /// @sa https://json.nlohmann.me/api/ordered_json/
+    using ordered_json = basic_json<nlohmann::ordered_map>;
+
+    NLOHMANN_JSON_NAMESPACE_END
+
+#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+/*!
+@brief detail namespace with internal helper functions
+
+This namespace collects functions that should not be exposed,
+implementations of some @ref basic_json methods, and meta-programming helpers.
+
+@since version 2.1.0
+*/
+namespace detail
+{
+
+/////////////
+// helpers //
+/////////////
+
+// Note to maintainers:
+//
+// Every trait in this file expects a non CV-qualified type.
+// The only exceptions are in the 'aliases for detected' section
+// (i.e. those of the form: decltype(T::member_function(std::declval<T>())))
+//
+// In this case, T has to be properly CV-qualified to constraint the function arguments
+// (e.g. to_json(BasicJsonType&, const T&))
+
+template<typename> struct is_basic_json : std::false_type {};
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
+
+// used by exceptions create() member functions
+// true_type for pointer to possibly cv-qualified basic_json or std::nullptr_t
+// false_type otherwise
+template<typename BasicJsonContext>
+struct is_basic_json_context :
+    std::integral_constant < bool,
+    is_basic_json<typename std::remove_cv<typename std::remove_pointer<BasicJsonContext>::type>::type>::value
+    || std::is_same<BasicJsonContext, std::nullptr_t>::value >
+{};
+
+//////////////////////
+// json_ref helpers //
+//////////////////////
+
+template<typename>
+class json_ref;
+
+template<typename>
+struct is_json_ref : std::false_type {};
+
+template<typename T>
+struct is_json_ref<json_ref<T>> : std::true_type {};
+
+//////////////////////////
+// aliases for detected //
+//////////////////////////
+
+template<typename T>
+using mapped_type_t = typename T::mapped_type;
+
+template<typename T>
+using key_type_t = typename T::key_type;
+
+template<typename T>
+using value_type_t = typename T::value_type;
+
+template<typename T>
+using difference_type_t = typename T::difference_type;
+
+template<typename T>
+using pointer_t = typename T::pointer;
+
+template<typename T>
+using reference_t = typename T::reference;
+
+template<typename T>
+using iterator_category_t = typename T::iterator_category;
+
+template<typename T, typename... Args>
+using to_json_function = decltype(T::to_json(std::declval<Args>()...));
+
+template<typename T, typename... Args>
+using from_json_function = decltype(T::from_json(std::declval<Args>()...));
+
+template<typename T, typename U>
+using get_template_function = decltype(std::declval<T>().template get<U>());
+
+// trait checking if JSONSerializer<T>::from_json(json const&, udt&) exists
+template<typename BasicJsonType, typename T, typename = void>
+struct has_from_json : std::false_type {};
+
+// trait checking if j.get<T> is valid
+// use this trait instead of std::is_constructible or std::is_convertible,
+// both rely on, or make use of implicit conversions, and thus fail when T
+// has several constructors/operator= (see https://github.com/nlohmann/json/issues/958)
+template <typename BasicJsonType, typename T>
+struct is_getable
+{
+    static constexpr bool value = is_detected<get_template_function, const BasicJsonType&, T>::value;
+};
+
+template<typename BasicJsonType, typename T>
+struct has_from_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<void, from_json_function, serializer,
+        const BasicJsonType&, T&>::value;
+};
+
+// This trait checks if JSONSerializer<T>::from_json(json const&) exists
+// this overload is used for non-default-constructible user-defined-types
+template<typename BasicJsonType, typename T, typename = void>
+struct has_non_default_from_json : std::false_type {};
+
+template<typename BasicJsonType, typename T>
+struct has_non_default_from_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<T, from_json_function, serializer,
+        const BasicJsonType&>::value;
+};
+
+// This trait checks if BasicJsonType::json_serializer<T>::to_json exists
+// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion.
+template<typename BasicJsonType, typename T, typename = void>
+struct has_to_json : std::false_type {};
+
+template<typename BasicJsonType, typename T>
+struct has_to_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<void, to_json_function, serializer, BasicJsonType&,
+        T>::value;
+};
+
+template<typename T>
+using detect_key_compare = typename T::key_compare;
+
+template<typename T>
+struct has_key_compare : std::integral_constant<bool, is_detected<detect_key_compare, T>::value> {};
+
+// obtains the actual object key comparator
+template<typename BasicJsonType>
+struct actual_object_comparator
+{
+    using object_t = typename BasicJsonType::object_t;
+    using object_comparator_t = typename BasicJsonType::default_object_comparator_t;
+    using type = typename std::conditional < has_key_compare<object_t>::value,
+          typename object_t::key_compare, object_comparator_t>::type;
+};
+
+template<typename BasicJsonType>
+using actual_object_comparator_t = typename actual_object_comparator<BasicJsonType>::type;
+
+/////////////////
+// char_traits //
+/////////////////
+
+// Primary template of char_traits calls std char_traits
+template<typename T>
+struct char_traits : std::char_traits<T>
+{};
+
+// Explicitly define char traits for unsigned char since it is not standard
+template<>
+struct char_traits<unsigned char> : std::char_traits<char>
+{
+    using char_type = unsigned char;
+    using int_type = uint64_t;
+
+    // Redefine to_int_type function
+    static int_type to_int_type(char_type c) noexcept
+    {
+        return static_cast<int_type>(c);
+    }
+
+    static char_type to_char_type(int_type i) noexcept
+    {
+        return static_cast<char_type>(i);
+    }
+
+    static constexpr int_type eof() noexcept
+    {
+        return static_cast<int_type>(EOF);
+    }
+};
+
+// Explicitly define char traits for signed char since it is not standard
+template<>
+struct char_traits<signed char> : std::char_traits<char>
+{
+    using char_type = signed char;
+    using int_type = uint64_t;
+
+    // Redefine to_int_type function
+    static int_type to_int_type(char_type c) noexcept
+    {
+        return static_cast<int_type>(c);
+    }
+
+    static char_type to_char_type(int_type i) noexcept
+    {
+        return static_cast<char_type>(i);
+    }
+
+    static constexpr int_type eof() noexcept
+    {
+        return static_cast<int_type>(EOF);
+    }
+};
+
+///////////////////
+// is_ functions //
+///////////////////
+
+// https://en.cppreference.com/w/cpp/types/conjunction
+template<class...> struct conjunction : std::true_type { };
+template<class B> struct conjunction<B> : B { };
+template<class B, class... Bn>
+struct conjunction<B, Bn...>
+: std::conditional<static_cast<bool>(B::value), conjunction<Bn...>, B>::type {};
+
+// https://en.cppreference.com/w/cpp/types/negation
+template<class B> struct negation : std::integral_constant < bool, !B::value > { };
+
+// Reimplementation of is_constructible and is_default_constructible, due to them being broken for
+// std::pair and std::tuple until LWG 2367 fix (see https://cplusplus.github.io/LWG/lwg-defects.html#2367).
+// This causes compile errors in e.g. clang 3.5 or gcc 4.9.
+template <typename T>
+struct is_default_constructible : std::is_default_constructible<T> {};
+
+template <typename T1, typename T2>
+struct is_default_constructible<std::pair<T1, T2>>
+            : conjunction<is_default_constructible<T1>, is_default_constructible<T2>> {};
+
+template <typename T1, typename T2>
+struct is_default_constructible<const std::pair<T1, T2>>
+            : conjunction<is_default_constructible<T1>, is_default_constructible<T2>> {};
+
+template <typename... Ts>
+struct is_default_constructible<std::tuple<Ts...>>
+            : conjunction<is_default_constructible<Ts>...> {};
+
+template <typename... Ts>
+struct is_default_constructible<const std::tuple<Ts...>>
+            : conjunction<is_default_constructible<Ts>...> {};
+
+template <typename T, typename... Args>
+struct is_constructible : std::is_constructible<T, Args...> {};
+
+template <typename T1, typename T2>
+struct is_constructible<std::pair<T1, T2>> : is_default_constructible<std::pair<T1, T2>> {};
+
+template <typename T1, typename T2>
+struct is_constructible<const std::pair<T1, T2>> : is_default_constructible<const std::pair<T1, T2>> {};
+
+template <typename... Ts>
+struct is_constructible<std::tuple<Ts...>> : is_default_constructible<std::tuple<Ts...>> {};
+
+template <typename... Ts>
+struct is_constructible<const std::tuple<Ts...>> : is_default_constructible<const std::tuple<Ts...>> {};
+
+template<typename T, typename = void>
+struct is_iterator_traits : std::false_type {};
+
+template<typename T>
+struct is_iterator_traits<iterator_traits<T>>
+{
+  private:
+    using traits = iterator_traits<T>;
+
+  public:
+    static constexpr auto value =
+        is_detected<value_type_t, traits>::value &&
+        is_detected<difference_type_t, traits>::value &&
+        is_detected<pointer_t, traits>::value &&
+        is_detected<iterator_category_t, traits>::value &&
+        is_detected<reference_t, traits>::value;
+};
+
+template<typename T>
+struct is_range
+{
+  private:
+    using t_ref = typename std::add_lvalue_reference<T>::type;
+
+    using iterator = detected_t<result_of_begin, t_ref>;
+    using sentinel = detected_t<result_of_end, t_ref>;
+
+    // to be 100% correct, it should use https://en.cppreference.com/w/cpp/iterator/input_or_output_iterator
+    // and https://en.cppreference.com/w/cpp/iterator/sentinel_for
+    // but reimplementing these would be too much work, as a lot of other concepts are used underneath
+    static constexpr auto is_iterator_begin =
+        is_iterator_traits<iterator_traits<iterator>>::value;
+
+  public:
+    static constexpr bool value = !std::is_same<iterator, nonesuch>::value && !std::is_same<sentinel, nonesuch>::value && is_iterator_begin;
+};
+
+template<typename R>
+using iterator_t = enable_if_t<is_range<R>::value, result_of_begin<decltype(std::declval<R&>())>>;
+
+template<typename T>
+using range_value_t = value_type_t<iterator_traits<iterator_t<T>>>;
+
+// The following implementation of is_complete_type is taken from
+// https://blogs.msdn.microsoft.com/vcblog/2015/12/02/partial-support-for-expression-sfinae-in-vs-2015-update-1/
+// and is written by Xiang Fan who agreed to using it in this library.
+
+template<typename T, typename = void>
+struct is_complete_type : std::false_type {};
+
+template<typename T>
+struct is_complete_type<T, decltype(void(sizeof(T)))> : std::true_type {};
+
+template<typename BasicJsonType, typename CompatibleObjectType,
+         typename = void>
+struct is_compatible_object_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename CompatibleObjectType>
+struct is_compatible_object_type_impl <
+    BasicJsonType, CompatibleObjectType,
+    enable_if_t < is_detected<mapped_type_t, CompatibleObjectType>::value&&
+    is_detected<key_type_t, CompatibleObjectType>::value >>
+{
+    using object_t = typename BasicJsonType::object_t;
+
+    // macOS's is_constructible does not play well with nonesuch...
+    static constexpr bool value =
+        is_constructible<typename object_t::key_type,
+        typename CompatibleObjectType::key_type>::value &&
+        is_constructible<typename object_t::mapped_type,
+        typename CompatibleObjectType::mapped_type>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleObjectType>
+struct is_compatible_object_type
+    : is_compatible_object_type_impl<BasicJsonType, CompatibleObjectType> {};
+
+template<typename BasicJsonType, typename ConstructibleObjectType,
+         typename = void>
+struct is_constructible_object_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename ConstructibleObjectType>
+struct is_constructible_object_type_impl <
+    BasicJsonType, ConstructibleObjectType,
+    enable_if_t < is_detected<mapped_type_t, ConstructibleObjectType>::value&&
+    is_detected<key_type_t, ConstructibleObjectType>::value >>
+{
+    using object_t = typename BasicJsonType::object_t;
+
+    static constexpr bool value =
+        (is_default_constructible<ConstructibleObjectType>::value &&
+         (std::is_move_assignable<ConstructibleObjectType>::value ||
+          std::is_copy_assignable<ConstructibleObjectType>::value) &&
+         (is_constructible<typename ConstructibleObjectType::key_type,
+          typename object_t::key_type>::value &&
+          std::is_same <
+          typename object_t::mapped_type,
+          typename ConstructibleObjectType::mapped_type >::value)) ||
+        (has_from_json<BasicJsonType,
+         typename ConstructibleObjectType::mapped_type>::value ||
+         has_non_default_from_json <
+         BasicJsonType,
+         typename ConstructibleObjectType::mapped_type >::value);
+};
+
+template<typename BasicJsonType, typename ConstructibleObjectType>
+struct is_constructible_object_type
+    : is_constructible_object_type_impl<BasicJsonType,
+      ConstructibleObjectType> {};
+
+template<typename BasicJsonType, typename CompatibleStringType>
+struct is_compatible_string_type
+{
+    static constexpr auto value =
+        is_constructible<typename BasicJsonType::string_t, CompatibleStringType>::value;
+};
+
+template<typename BasicJsonType, typename ConstructibleStringType>
+struct is_constructible_string_type
+{
+    // launder type through decltype() to fix compilation failure on ICPC
+#ifdef __INTEL_COMPILER
+    using laundered_type = decltype(std::declval<ConstructibleStringType>());
+#else
+    using laundered_type = ConstructibleStringType;
+#endif
+
+    static constexpr auto value =
+        conjunction <
+        is_constructible<laundered_type, typename BasicJsonType::string_t>,
+        is_detected_exact<typename BasicJsonType::string_t::value_type,
+        value_type_t, laundered_type >>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleArrayType, typename = void>
+struct is_compatible_array_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename CompatibleArrayType>
+struct is_compatible_array_type_impl <
+    BasicJsonType, CompatibleArrayType,
+    enable_if_t <
+    is_detected<iterator_t, CompatibleArrayType>::value&&
+    is_iterator_traits<iterator_traits<detected_t<iterator_t, CompatibleArrayType>>>::value&&
+// special case for types like std::filesystem::path whose iterator's value_type are themselves
+// c.f. https://github.com/nlohmann/json/pull/3073
+    !std::is_same<CompatibleArrayType, detected_t<range_value_t, CompatibleArrayType>>::value >>
+{
+    static constexpr bool value =
+        is_constructible<BasicJsonType,
+        range_value_t<CompatibleArrayType>>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleArrayType>
+struct is_compatible_array_type
+    : is_compatible_array_type_impl<BasicJsonType, CompatibleArrayType> {};
+
+template<typename BasicJsonType, typename ConstructibleArrayType, typename = void>
+struct is_constructible_array_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type_impl <
+    BasicJsonType, ConstructibleArrayType,
+    enable_if_t<std::is_same<ConstructibleArrayType,
+    typename BasicJsonType::value_type>::value >>
+            : std::true_type {};
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type_impl <
+    BasicJsonType, ConstructibleArrayType,
+    enable_if_t < !std::is_same<ConstructibleArrayType,
+    typename BasicJsonType::value_type>::value&&
+    !is_compatible_string_type<BasicJsonType, ConstructibleArrayType>::value&&
+    is_default_constructible<ConstructibleArrayType>::value&&
+(std::is_move_assignable<ConstructibleArrayType>::value ||
+ std::is_copy_assignable<ConstructibleArrayType>::value)&&
+is_detected<iterator_t, ConstructibleArrayType>::value&&
+is_iterator_traits<iterator_traits<detected_t<iterator_t, ConstructibleArrayType>>>::value&&
+is_detected<range_value_t, ConstructibleArrayType>::value&&
+// special case for types like std::filesystem::path whose iterator's value_type are themselves
+// c.f. https://github.com/nlohmann/json/pull/3073
+!std::is_same<ConstructibleArrayType, detected_t<range_value_t, ConstructibleArrayType>>::value&&
+        is_complete_type <
+        detected_t<range_value_t, ConstructibleArrayType >>::value >>
+{
+    using value_type = range_value_t<ConstructibleArrayType>;
+
+    static constexpr bool value =
+        std::is_same<value_type,
+        typename BasicJsonType::array_t::value_type>::value ||
+        has_from_json<BasicJsonType,
+        value_type>::value ||
+        has_non_default_from_json <
+        BasicJsonType,
+        value_type >::value;
+};
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type
+    : is_constructible_array_type_impl<BasicJsonType, ConstructibleArrayType> {};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType,
+         typename = void>
+struct is_compatible_integer_type_impl : std::false_type {};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type_impl <
+    RealIntegerType, CompatibleNumberIntegerType,
+    enable_if_t < std::is_integral<RealIntegerType>::value&&
+    std::is_integral<CompatibleNumberIntegerType>::value&&
+    !std::is_same<bool, CompatibleNumberIntegerType>::value >>
+{
+    // is there an assert somewhere on overflows?
+    using RealLimits = std::numeric_limits<RealIntegerType>;
+    using CompatibleLimits = std::numeric_limits<CompatibleNumberIntegerType>;
+
+    static constexpr auto value =
+        is_constructible<RealIntegerType,
+        CompatibleNumberIntegerType>::value &&
+        CompatibleLimits::is_integer &&
+        RealLimits::is_signed == CompatibleLimits::is_signed;
+};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type
+    : is_compatible_integer_type_impl<RealIntegerType,
+      CompatibleNumberIntegerType> {};
+
+template<typename BasicJsonType, typename CompatibleType, typename = void>
+struct is_compatible_type_impl: std::false_type {};
+
+template<typename BasicJsonType, typename CompatibleType>
+struct is_compatible_type_impl <
+    BasicJsonType, CompatibleType,
+    enable_if_t<is_complete_type<CompatibleType>::value >>
+{
+    static constexpr bool value =
+        has_to_json<BasicJsonType, CompatibleType>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleType>
+struct is_compatible_type
+    : is_compatible_type_impl<BasicJsonType, CompatibleType> {};
+
+template<typename T1, typename T2>
+struct is_constructible_tuple : std::false_type {};
+
+template<typename T1, typename... Args>
+struct is_constructible_tuple<T1, std::tuple<Args...>> : conjunction<is_constructible<T1, Args>...> {};
+
+template<typename BasicJsonType, typename T>
+struct is_json_iterator_of : std::false_type {};
+
+template<typename BasicJsonType>
+struct is_json_iterator_of<BasicJsonType, typename BasicJsonType::iterator> : std::true_type {};
+
+template<typename BasicJsonType>
+struct is_json_iterator_of<BasicJsonType, typename BasicJsonType::const_iterator> : std::true_type
+{};
+
+// checks if a given type T is a template specialization of Primary
+template<template <typename...> class Primary, typename T>
+struct is_specialization_of : std::false_type {};
+
+template<template <typename...> class Primary, typename... Args>
+struct is_specialization_of<Primary, Primary<Args...>> : std::true_type {};
+
+template<typename T>
+using is_json_pointer = is_specialization_of<::nlohmann::json_pointer, uncvref_t<T>>;
+
+// checks if A and B are comparable using Compare functor
+template<typename Compare, typename A, typename B, typename = void>
+struct is_comparable : std::false_type {};
+
+template<typename Compare, typename A, typename B>
+struct is_comparable<Compare, A, B, void_t<
+decltype(std::declval<Compare>()(std::declval<A>(), std::declval<B>())),
+decltype(std::declval<Compare>()(std::declval<B>(), std::declval<A>()))
+>> : std::true_type {};
+
+template<typename T>
+using detect_is_transparent = typename T::is_transparent;
+
+// type trait to check if KeyType can be used as object key (without a BasicJsonType)
+// see is_usable_as_basic_json_key_type below
+template<typename Comparator, typename ObjectKeyType, typename KeyTypeCVRef, bool RequireTransparentComparator = true,
+         bool ExcludeObjectKeyType = RequireTransparentComparator, typename KeyType = uncvref_t<KeyTypeCVRef>>
+using is_usable_as_key_type = typename std::conditional <
+                              is_comparable<Comparator, ObjectKeyType, KeyTypeCVRef>::value
+                              && !(ExcludeObjectKeyType && std::is_same<KeyType,
+                                   ObjectKeyType>::value)
+                              && (!RequireTransparentComparator
+                                  || is_detected <detect_is_transparent, Comparator>::value)
+                              && !is_json_pointer<KeyType>::value,
+                              std::true_type,
+                              std::false_type >::type;
+
+// type trait to check if KeyType can be used as object key
+// true if:
+//   - KeyType is comparable with BasicJsonType::object_t::key_type
+//   - if ExcludeObjectKeyType is true, KeyType is not BasicJsonType::object_t::key_type
+//   - the comparator is transparent or RequireTransparentComparator is false
+//   - KeyType is not a JSON iterator or json_pointer
+template<typename BasicJsonType, typename KeyTypeCVRef, bool RequireTransparentComparator = true,
+         bool ExcludeObjectKeyType = RequireTransparentComparator, typename KeyType = uncvref_t<KeyTypeCVRef>>
+using is_usable_as_basic_json_key_type = typename std::conditional <
+        is_usable_as_key_type<typename BasicJsonType::object_comparator_t,
+        typename BasicJsonType::object_t::key_type, KeyTypeCVRef,
+        RequireTransparentComparator, ExcludeObjectKeyType>::value
+        && !is_json_iterator_of<BasicJsonType, KeyType>::value,
+        std::true_type,
+        std::false_type >::type;
+
+template<typename ObjectType, typename KeyType>
+using detect_erase_with_key_type = decltype(std::declval<ObjectType&>().erase(std::declval<KeyType>()));
+
+// type trait to check if object_t has an erase() member functions accepting KeyType
+template<typename BasicJsonType, typename KeyType>
+using has_erase_with_key_type = typename std::conditional <
+                                is_detected <
+                                detect_erase_with_key_type,
+                                typename BasicJsonType::object_t, KeyType >::value,
+                                std::true_type,
+                                std::false_type >::type;
+
+// a naive helper to check if a type is an ordered_map (exploits the fact that
+// ordered_map inherits capacity() from std::vector)
+template <typename T>
+struct is_ordered_map
+{
+    using one = char;
+
+    struct two
+    {
+        char x[2]; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+    };
+
+    template <typename C> static one test( decltype(&C::capacity) ) ;
+    template <typename C> static two test(...);
+
+    enum { value = sizeof(test<T>(nullptr)) == sizeof(char) }; // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+};
+
+// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324)
+template < typename T, typename U, enable_if_t < !std::is_same<T, U>::value, int > = 0 >
+T conditional_static_cast(U value)
+{
+    return static_cast<T>(value);
+}
+
+template<typename T, typename U, enable_if_t<std::is_same<T, U>::value, int> = 0>
+T conditional_static_cast(U value)
+{
+    return value;
+}
+
+template<typename... Types>
+using all_integral = conjunction<std::is_integral<Types>...>;
+
+template<typename... Types>
+using all_signed = conjunction<std::is_signed<Types>...>;
+
+template<typename... Types>
+using all_unsigned = conjunction<std::is_unsigned<Types>...>;
+
+// there's a disjunction trait in another PR; replace when merged
+template<typename... Types>
+using same_sign = std::integral_constant < bool,
+      all_signed<Types...>::value || all_unsigned<Types...>::value >;
+
+template<typename OfType, typename T>
+using never_out_of_range = std::integral_constant < bool,
+      (std::is_signed<OfType>::value && (sizeof(T) < sizeof(OfType)))
+      || (same_sign<OfType, T>::value && sizeof(OfType) == sizeof(T)) >;
+
+template<typename OfType, typename T,
+         bool OfTypeSigned = std::is_signed<OfType>::value,
+         bool TSigned = std::is_signed<T>::value>
+struct value_in_range_of_impl2;
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, false, false>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, true, false>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, false, true>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return val >= 0 && static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, true, true>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return static_cast<CommonType>(val) >= static_cast<CommonType>((std::numeric_limits<OfType>::min)())
+               && static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T,
+         bool NeverOutOfRange = never_out_of_range<OfType, T>::value,
+         typename = detail::enable_if_t<all_integral<OfType, T>::value>>
+struct value_in_range_of_impl1;
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl1<OfType, T, false>
+{
+    static constexpr bool test(T val)
+    {
+        return value_in_range_of_impl2<OfType, T>::test(val);
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl1<OfType, T, true>
+{
+    static constexpr bool test(T /*val*/)
+    {
+        return true;
+    }
+};
+
+template<typename OfType, typename T>
+inline constexpr bool value_in_range_of(T val)
+{
+    return value_in_range_of_impl1<OfType, T>::test(val);
+}
+
+template<bool Value>
+using bool_constant = std::integral_constant<bool, Value>;
+
+///////////////////////////////////////////////////////////////////////////////
+// is_c_string
+///////////////////////////////////////////////////////////////////////////////
+
+namespace impl
+{
+
+template<typename T>
+inline constexpr bool is_c_string()
+{
+    using TUnExt = typename std::remove_extent<T>::type;
+    using TUnCVExt = typename std::remove_cv<TUnExt>::type;
+    using TUnPtr = typename std::remove_pointer<T>::type;
+    using TUnCVPtr = typename std::remove_cv<TUnPtr>::type;
+    return
+        (std::is_array<T>::value && std::is_same<TUnCVExt, char>::value)
+        || (std::is_pointer<T>::value && std::is_same<TUnCVPtr, char>::value);
+}
+
+}  // namespace impl
+
+// checks whether T is a [cv] char */[cv] char[] C string
+template<typename T>
+struct is_c_string : bool_constant<impl::is_c_string<T>()> {};
+
+template<typename T>
+using is_c_string_uncvref = is_c_string<uncvref_t<T>>;
+
+///////////////////////////////////////////////////////////////////////////////
+// is_transparent
+///////////////////////////////////////////////////////////////////////////////
+
+namespace impl
+{
+
+template<typename T>
+inline constexpr bool is_transparent()
+{
+    return is_detected<detect_is_transparent, T>::value;
+}
+
+}  // namespace impl
+
+// checks whether T has a member named is_transparent
+template<typename T>
+struct is_transparent : bool_constant<impl::is_transparent<T>()> {};
+
+///////////////////////////////////////////////////////////////////////////////
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/string_concat.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstring> // strlen
+#include <string> // string
+#include <utility> // forward
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+inline std::size_t concat_length()
+{
+    return 0;
+}
+
+template<typename... Args>
+inline std::size_t concat_length(const char* cstr, const Args& ... rest);
+
+template<typename StringType, typename... Args>
+inline std::size_t concat_length(const StringType& str, const Args& ... rest);
+
+template<typename... Args>
+inline std::size_t concat_length(const char /*c*/, const Args& ... rest)
+{
+    return 1 + concat_length(rest...);
+}
+
+template<typename... Args>
+inline std::size_t concat_length(const char* cstr, const Args& ... rest)
+{
+    // cppcheck-suppress ignoredReturnValue
+    return ::strlen(cstr) + concat_length(rest...);
+}
+
+template<typename StringType, typename... Args>
+inline std::size_t concat_length(const StringType& str, const Args& ... rest)
+{
+    return str.size() + concat_length(rest...);
+}
+
+template<typename OutStringType>
+inline void concat_into(OutStringType& /*out*/)
+{}
+
+template<typename StringType, typename Arg>
+using string_can_append = decltype(std::declval<StringType&>().append(std::declval < Arg && > ()));
+
+template<typename StringType, typename Arg>
+using detect_string_can_append = is_detected<string_can_append, StringType, Arg>;
+
+template<typename StringType, typename Arg>
+using string_can_append_op = decltype(std::declval<StringType&>() += std::declval < Arg && > ());
+
+template<typename StringType, typename Arg>
+using detect_string_can_append_op = is_detected<string_can_append_op, StringType, Arg>;
+
+template<typename StringType, typename Arg>
+using string_can_append_iter = decltype(std::declval<StringType&>().append(std::declval<const Arg&>().begin(), std::declval<const Arg&>().end()));
+
+template<typename StringType, typename Arg>
+using detect_string_can_append_iter = is_detected<string_can_append_iter, StringType, Arg>;
+
+template<typename StringType, typename Arg>
+using string_can_append_data = decltype(std::declval<StringType&>().append(std::declval<const Arg&>().data(), std::declval<const Arg&>().size()));
+
+template<typename StringType, typename Arg>
+using detect_string_can_append_data = is_detected<string_can_append_data, StringType, Arg>;
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && detect_string_can_append_op<OutStringType, Arg>::value, int > = 0 >
+inline void concat_into(OutStringType& out, Arg && arg, Args && ... rest);
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && detect_string_can_append_iter<OutStringType, Arg>::value, int > = 0 >
+inline void concat_into(OutStringType& out, const Arg& arg, Args && ... rest);
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && !detect_string_can_append_iter<OutStringType, Arg>::value
+                         && detect_string_can_append_data<OutStringType, Arg>::value, int > = 0 >
+inline void concat_into(OutStringType& out, const Arg& arg, Args && ... rest);
+
+template<typename OutStringType, typename Arg, typename... Args,
+         enable_if_t<detect_string_can_append<OutStringType, Arg>::value, int> = 0>
+inline void concat_into(OutStringType& out, Arg && arg, Args && ... rest)
+{
+    out.append(std::forward<Arg>(arg));
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && detect_string_can_append_op<OutStringType, Arg>::value, int > >
+inline void concat_into(OutStringType& out, Arg&& arg, Args&& ... rest)
+{
+    out += std::forward<Arg>(arg);
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && detect_string_can_append_iter<OutStringType, Arg>::value, int > >
+inline void concat_into(OutStringType& out, const Arg& arg, Args&& ... rest)
+{
+    out.append(arg.begin(), arg.end());
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && !detect_string_can_append_iter<OutStringType, Arg>::value
+                         && detect_string_can_append_data<OutStringType, Arg>::value, int > >
+inline void concat_into(OutStringType& out, const Arg& arg, Args&& ... rest)
+{
+    out.append(arg.data(), arg.size());
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template<typename OutStringType = std::string, typename... Args>
+inline OutStringType concat(Args && ... args)
+{
+    OutStringType str;
+    str.reserve(concat_length(args...));
+    concat_into(str, std::forward<Args>(args)...);
+    return str;
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+////////////////
+// exceptions //
+////////////////
+
+/// @brief general exception of the @ref basic_json class
+/// @sa https://json.nlohmann.me/api/basic_json/exception/
+class exception : public std::exception
+{
+  public:
+    /// returns the explanatory string
+    const char* what() const noexcept override
+    {
+        return m.what();
+    }
+
+    /// the id of the exception
+    const int id; // NOLINT(cppcoreguidelines-non-private-member-variables-in-classes)
+
+  protected:
+    JSON_HEDLEY_NON_NULL(3)
+    exception(int id_, const char* what_arg) : id(id_), m(what_arg) {} // NOLINT(bugprone-throw-keyword-missing)
+
+    static std::string name(const std::string& ename, int id_)
+    {
+        return concat("[json.exception.", ename, '.', std::to_string(id_), "] ");
+    }
+
+    static std::string diagnostics(std::nullptr_t /*leaf_element*/)
+    {
+        return "";
+    }
+
+    template<typename BasicJsonType>
+    static std::string diagnostics(const BasicJsonType* leaf_element)
+    {
+#if JSON_DIAGNOSTICS
+        std::vector<std::string> tokens;
+        for (const auto* current = leaf_element; current != nullptr && current->m_parent != nullptr; current = current->m_parent)
+        {
+            switch (current->m_parent->type())
+            {
+                case value_t::array:
+                {
+                    for (std::size_t i = 0; i < current->m_parent->m_data.m_value.array->size(); ++i)
+                    {
+                        if (&current->m_parent->m_data.m_value.array->operator[](i) == current)
+                        {
+                            tokens.emplace_back(std::to_string(i));
+                            break;
+                        }
+                    }
+                    break;
+                }
+
+                case value_t::object:
+                {
+                    for (const auto& element : *current->m_parent->m_data.m_value.object)
+                    {
+                        if (&element.second == current)
+                        {
+                            tokens.emplace_back(element.first.c_str());
+                            break;
+                        }
+                    }
+                    break;
+                }
+
+                case value_t::null: // LCOV_EXCL_LINE
+                case value_t::string: // LCOV_EXCL_LINE
+                case value_t::boolean: // LCOV_EXCL_LINE
+                case value_t::number_integer: // LCOV_EXCL_LINE
+                case value_t::number_unsigned: // LCOV_EXCL_LINE
+                case value_t::number_float: // LCOV_EXCL_LINE
+                case value_t::binary: // LCOV_EXCL_LINE
+                case value_t::discarded: // LCOV_EXCL_LINE
+                default:   // LCOV_EXCL_LINE
+                    break; // LCOV_EXCL_LINE
+            }
+        }
+
+        if (tokens.empty())
+        {
+            return "";
+        }
+
+        auto str = std::accumulate(tokens.rbegin(), tokens.rend(), std::string{},
+                                   [](const std::string & a, const std::string & b)
+        {
+            return concat(a, '/', detail::escape(b));
+        });
+        return concat('(', str, ") ");
+#else
+        static_cast<void>(leaf_element);
+        return "";
+#endif
+    }
+
+  private:
+    /// an exception object as storage for error messages
+    std::runtime_error m;
+};
+
+/// @brief exception indicating a parse error
+/// @sa https://json.nlohmann.me/api/basic_json/parse_error/
+class parse_error : public exception
+{
+  public:
+    /*!
+    @brief create a parse error exception
+    @param[in] id_       the id of the exception
+    @param[in] pos       the position where the error occurred (or with
+                         chars_read_total=0 if the position cannot be
+                         determined)
+    @param[in] what_arg  the explanatory string
+    @return parse_error object
+    */
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static parse_error create(int id_, const position_t& pos, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("parse_error", id_), "parse error",
+                                     position_string(pos), ": ", exception::diagnostics(context), what_arg);
+        return {id_, pos.chars_read_total, w.c_str()};
+    }
+
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static parse_error create(int id_, std::size_t byte_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("parse_error", id_), "parse error",
+                                     (byte_ != 0 ? (concat(" at byte ", std::to_string(byte_))) : ""),
+                                     ": ", exception::diagnostics(context), what_arg);
+        return {id_, byte_, w.c_str()};
+    }
+
+    /*!
+    @brief byte index of the parse error
+
+    The byte index of the last read character in the input file.
+
+    @note For an input with n bytes, 1 is the index of the first character and
+          n+1 is the index of the terminating null byte or the end of file.
+          This also holds true when reading a byte vector (CBOR or MessagePack).
+    */
+    const std::size_t byte;
+
+  private:
+    parse_error(int id_, std::size_t byte_, const char* what_arg)
+        : exception(id_, what_arg), byte(byte_) {}
+
+    static std::string position_string(const position_t& pos)
+    {
+        return concat(" at line ", std::to_string(pos.lines_read + 1),
+                      ", column ", std::to_string(pos.chars_read_current_line));
+    }
+};
+
+/// @brief exception indicating errors with iterators
+/// @sa https://json.nlohmann.me/api/basic_json/invalid_iterator/
+class invalid_iterator : public exception
+{
+  public:
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static invalid_iterator create(int id_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("invalid_iterator", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    invalid_iterator(int id_, const char* what_arg)
+        : exception(id_, what_arg) {}
+};
+
+/// @brief exception indicating executing a member function with a wrong type
+/// @sa https://json.nlohmann.me/api/basic_json/type_error/
+class type_error : public exception
+{
+  public:
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static type_error create(int id_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("type_error", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    type_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/// @brief exception indicating access out of the defined range
+/// @sa https://json.nlohmann.me/api/basic_json/out_of_range/
+class out_of_range : public exception
+{
+  public:
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static out_of_range create(int id_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("out_of_range", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/// @brief exception indicating other library errors
+/// @sa https://json.nlohmann.me/api/basic_json/other_error/
+class other_error : public exception
+{
+  public:
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static other_error create(int id_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("other_error", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    other_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/identity_tag.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+// dispatching helper struct
+template <class T> struct identity_tag {};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/std_fs.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+#if JSON_HAS_EXPERIMENTAL_FILESYSTEM
+#include <experimental/filesystem>
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+namespace std_fs = std::experimental::filesystem;
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+#elif JSON_HAS_FILESYSTEM
+#include <filesystem>
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+namespace std_fs = std::filesystem;
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+#endif
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename std::nullptr_t& n)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_null()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be null, but is ", j.type_name()), &j));
+    }
+    n = nullptr;
+}
+
+// overloads for basic_json template parameters
+template < typename BasicJsonType, typename ArithmeticType,
+           enable_if_t < std::is_arithmetic<ArithmeticType>::value&&
+                         !std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+                         int > = 0 >
+void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
+{
+    switch (static_cast<value_t>(j))
+    {
+        case value_t::number_unsigned:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
+            break;
+        }
+        case value_t::number_integer:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
+            break;
+        }
+        case value_t::number_float:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
+            break;
+        }
+
+        case value_t::null:
+        case value_t::object:
+        case value_t::array:
+        case value_t::string:
+        case value_t::boolean:
+        case value_t::binary:
+        case value_t::discarded:
+        default:
+            JSON_THROW(type_error::create(302, concat("type must be number, but is ", j.type_name()), &j));
+    }
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_boolean()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be boolean, but is ", j.type_name()), &j));
+    }
+    b = *j.template get_ptr<const typename BasicJsonType::boolean_t*>();
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be string, but is ", j.type_name()), &j));
+    }
+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+
+template <
+    typename BasicJsonType, typename StringType,
+    enable_if_t <
+        std::is_assignable<StringType&, const typename BasicJsonType::string_t>::value
+        && is_detected_exact<typename BasicJsonType::string_t::value_type, value_type_t, StringType>::value
+        && !std::is_same<typename BasicJsonType::string_t, StringType>::value
+        && !is_json_ref<StringType>::value, int > = 0 >
+inline void from_json(const BasicJsonType& j, StringType& s)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be string, but is ", j.type_name()), &j));
+    }
+
+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+#if !JSON_DISABLE_ENUM_SERIALIZATION
+template<typename BasicJsonType, typename EnumType,
+         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
+inline void from_json(const BasicJsonType& j, EnumType& e)
+{
+    typename std::underlying_type<EnumType>::type val;
+    get_arithmetic_value(j, val);
+    e = static_cast<EnumType>(val);
+}
+#endif  // JSON_DISABLE_ENUM_SERIALIZATION
+
+// forward_list doesn't have an insert method
+template<typename BasicJsonType, typename T, typename Allocator,
+         enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
+inline void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+    l.clear();
+    std::transform(j.rbegin(), j.rend(),
+                   std::front_inserter(l), [](const BasicJsonType & i)
+    {
+        return i.template get<T>();
+    });
+}
+
+// valarray doesn't have an insert method
+template<typename BasicJsonType, typename T,
+         enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
+inline void from_json(const BasicJsonType& j, std::valarray<T>& l)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+    l.resize(j.size());
+    std::transform(j.begin(), j.end(), std::begin(l),
+                   [](const BasicJsonType & elem)
+    {
+        return elem.template get<T>();
+    });
+}
+
+template<typename BasicJsonType, typename T, std::size_t N>
+auto from_json(const BasicJsonType& j, T (&arr)[N])  // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i = 0; i < N; ++i)
+    {
+        arr[i] = j.at(i).template get<T>();
+    }
+}
+
+template<typename BasicJsonType>
+inline void from_json_array_impl(const BasicJsonType& j, typename BasicJsonType::array_t& arr, priority_tag<3> /*unused*/)
+{
+    arr = *j.template get_ptr<const typename BasicJsonType::array_t*>();
+}
+
+template<typename BasicJsonType, typename T, std::size_t N>
+auto from_json_array_impl(const BasicJsonType& j, std::array<T, N>& arr,
+                          priority_tag<2> /*unused*/)
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i = 0; i < N; ++i)
+    {
+        arr[i] = j.at(i).template get<T>();
+    }
+}
+
+template<typename BasicJsonType, typename ConstructibleArrayType,
+         enable_if_t<
+             std::is_assignable<ConstructibleArrayType&, ConstructibleArrayType>::value,
+             int> = 0>
+auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, priority_tag<1> /*unused*/)
+-> decltype(
+    arr.reserve(std::declval<typename ConstructibleArrayType::size_type>()),
+    j.template get<typename ConstructibleArrayType::value_type>(),
+    void())
+{
+    using std::end;
+
+    ConstructibleArrayType ret;
+    ret.reserve(j.size());
+    std::transform(j.begin(), j.end(),
+                   std::inserter(ret, end(ret)), [](const BasicJsonType & i)
+    {
+        // get<BasicJsonType>() returns *this, this won't call a from_json
+        // method when value_type is BasicJsonType
+        return i.template get<typename ConstructibleArrayType::value_type>();
+    });
+    arr = std::move(ret);
+}
+
+template<typename BasicJsonType, typename ConstructibleArrayType,
+         enable_if_t<
+             std::is_assignable<ConstructibleArrayType&, ConstructibleArrayType>::value,
+             int> = 0>
+inline void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr,
+                                 priority_tag<0> /*unused*/)
+{
+    using std::end;
+
+    ConstructibleArrayType ret;
+    std::transform(
+        j.begin(), j.end(), std::inserter(ret, end(ret)),
+        [](const BasicJsonType & i)
+    {
+        // get<BasicJsonType>() returns *this, this won't call a from_json
+        // method when value_type is BasicJsonType
+        return i.template get<typename ConstructibleArrayType::value_type>();
+    });
+    arr = std::move(ret);
+}
+
+template < typename BasicJsonType, typename ConstructibleArrayType,
+           enable_if_t <
+               is_constructible_array_type<BasicJsonType, ConstructibleArrayType>::value&&
+               !is_constructible_object_type<BasicJsonType, ConstructibleArrayType>::value&&
+               !is_constructible_string_type<BasicJsonType, ConstructibleArrayType>::value&&
+               !std::is_same<ConstructibleArrayType, typename BasicJsonType::binary_t>::value&&
+               !is_basic_json<ConstructibleArrayType>::value,
+               int > = 0 >
+auto from_json(const BasicJsonType& j, ConstructibleArrayType& arr)
+-> decltype(from_json_array_impl(j, arr, priority_tag<3> {}),
+j.template get<typename ConstructibleArrayType::value_type>(),
+void())
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+
+    from_json_array_impl(j, arr, priority_tag<3> {});
+}
+
+template < typename BasicJsonType, typename T, std::size_t... Idx >
+std::array<T, sizeof...(Idx)> from_json_inplace_array_impl(BasicJsonType&& j,
+        identity_tag<std::array<T, sizeof...(Idx)>> /*unused*/, index_sequence<Idx...> /*unused*/)
+{
+    return { { std::forward<BasicJsonType>(j).at(Idx).template get<T>()... } };
+}
+
+template < typename BasicJsonType, typename T, std::size_t N >
+auto from_json(BasicJsonType&& j, identity_tag<std::array<T, N>> tag)
+-> decltype(from_json_inplace_array_impl(std::forward<BasicJsonType>(j), tag, make_index_sequence<N> {}))
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+
+    return from_json_inplace_array_impl(std::forward<BasicJsonType>(j), tag, make_index_sequence<N> {});
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::binary_t& bin)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_binary()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be binary, but is ", j.type_name()), &j));
+    }
+
+    bin = *j.template get_ptr<const typename BasicJsonType::binary_t*>();
+}
+
+template<typename BasicJsonType, typename ConstructibleObjectType,
+         enable_if_t<is_constructible_object_type<BasicJsonType, ConstructibleObjectType>::value, int> = 0>
+inline void from_json(const BasicJsonType& j, ConstructibleObjectType& obj)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_object()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be object, but is ", j.type_name()), &j));
+    }
+
+    ConstructibleObjectType ret;
+    const auto* inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
+    using value_type = typename ConstructibleObjectType::value_type;
+    std::transform(
+        inner_object->begin(), inner_object->end(),
+        std::inserter(ret, ret.begin()),
+        [](typename BasicJsonType::object_t::value_type const & p)
+    {
+        return value_type(p.first, p.second.template get<typename ConstructibleObjectType::mapped_type>());
+    });
+    obj = std::move(ret);
+}
+
+// overload for arithmetic types, not chosen for basic_json template arguments
+// (BooleanType, etc..); note: Is it really necessary to provide explicit
+// overloads for boolean_t etc. in case of a custom BooleanType which is not
+// an arithmetic type?
+template < typename BasicJsonType, typename ArithmeticType,
+           enable_if_t <
+               std::is_arithmetic<ArithmeticType>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::number_unsigned_t>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::number_integer_t>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::number_float_t>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+               int > = 0 >
+inline void from_json(const BasicJsonType& j, ArithmeticType& val)
+{
+    switch (static_cast<value_t>(j))
+    {
+        case value_t::number_unsigned:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
+            break;
+        }
+        case value_t::number_integer:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
+            break;
+        }
+        case value_t::number_float:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
+            break;
+        }
+        case value_t::boolean:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::boolean_t*>());
+            break;
+        }
+
+        case value_t::null:
+        case value_t::object:
+        case value_t::array:
+        case value_t::string:
+        case value_t::binary:
+        case value_t::discarded:
+        default:
+            JSON_THROW(type_error::create(302, concat("type must be number, but is ", j.type_name()), &j));
+    }
+}
+
+template<typename BasicJsonType, typename... Args, std::size_t... Idx>
+std::tuple<Args...> from_json_tuple_impl_base(BasicJsonType&& j, index_sequence<Idx...> /*unused*/)
+{
+    return std::make_tuple(std::forward<BasicJsonType>(j).at(Idx).template get<Args>()...);
+}
+
+template < typename BasicJsonType, class A1, class A2 >
+std::pair<A1, A2> from_json_tuple_impl(BasicJsonType&& j, identity_tag<std::pair<A1, A2>> /*unused*/, priority_tag<0> /*unused*/)
+{
+    return {std::forward<BasicJsonType>(j).at(0).template get<A1>(),
+            std::forward<BasicJsonType>(j).at(1).template get<A2>()};
+}
+
+template<typename BasicJsonType, typename A1, typename A2>
+inline void from_json_tuple_impl(BasicJsonType&& j, std::pair<A1, A2>& p, priority_tag<1> /*unused*/)
+{
+    p = from_json_tuple_impl(std::forward<BasicJsonType>(j), identity_tag<std::pair<A1, A2>> {}, priority_tag<0> {});
+}
+
+template<typename BasicJsonType, typename... Args>
+std::tuple<Args...> from_json_tuple_impl(BasicJsonType&& j, identity_tag<std::tuple<Args...>> /*unused*/, priority_tag<2> /*unused*/)
+{
+    return from_json_tuple_impl_base<BasicJsonType, Args...>(std::forward<BasicJsonType>(j), index_sequence_for<Args...> {});
+}
+
+template<typename BasicJsonType, typename... Args>
+inline void from_json_tuple_impl(BasicJsonType&& j, std::tuple<Args...>& t, priority_tag<3> /*unused*/)
+{
+    t = from_json_tuple_impl_base<BasicJsonType, Args...>(std::forward<BasicJsonType>(j), index_sequence_for<Args...> {});
+}
+
+template<typename BasicJsonType, typename TupleRelated>
+auto from_json(BasicJsonType&& j, TupleRelated&& t)
+-> decltype(from_json_tuple_impl(std::forward<BasicJsonType>(j), std::forward<TupleRelated>(t), priority_tag<3> {}))
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+
+    return from_json_tuple_impl(std::forward<BasicJsonType>(j), std::forward<TupleRelated>(t), priority_tag<3> {});
+}
+
+template < typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator,
+           typename = enable_if_t < !std::is_constructible <
+                                        typename BasicJsonType::string_t, Key >::value >>
+inline void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+    m.clear();
+    for (const auto& p : j)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
+        {
+            JSON_THROW(type_error::create(302, concat("type must be array, but is ", p.type_name()), &j));
+        }
+        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
+    }
+}
+
+template < typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator,
+           typename = enable_if_t < !std::is_constructible <
+                                        typename BasicJsonType::string_t, Key >::value >>
+inline void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+    m.clear();
+    for (const auto& p : j)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
+        {
+            JSON_THROW(type_error::create(302, concat("type must be array, but is ", p.type_name()), &j));
+        }
+        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
+    }
+}
+
+#if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, std_fs::path& p)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be string, but is ", j.type_name()), &j));
+    }
+    p = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+#endif
+
+struct from_json_fn
+{
+    template<typename BasicJsonType, typename T>
+    auto operator()(const BasicJsonType& j, T&& val) const
+    noexcept(noexcept(from_json(j, std::forward<T>(val))))
+    -> decltype(from_json(j, std::forward<T>(val)))
+    {
+        return from_json(j, std::forward<T>(val));
+    }
+};
+
+}  // namespace detail
+
+#ifndef JSON_HAS_CPP_17
+/// namespace to hold default `from_json` function
+/// to see why this is required:
+/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
+namespace // NOLINT(cert-dcl59-cpp,fuchsia-header-anon-namespaces,google-build-namespaces)
+{
+#endif
+JSON_INLINE_VARIABLE constexpr const auto& from_json = // NOLINT(misc-definitions-in-headers)
+    detail::static_const<detail::from_json_fn>::value;
+#ifndef JSON_HAS_CPP_17
+}  // namespace
+#endif
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/conversions/to_json.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // copy
+#include <iterator> // begin, end
+#include <string> // string
+#include <tuple> // tuple, get
+#include <type_traits> // is_same, is_constructible, is_floating_point, is_enum, underlying_type
+#include <utility> // move, forward, declval, pair
+#include <valarray> // valarray
+#include <vector> // vector
+
+// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef> // size_t
+#include <iterator> // input_iterator_tag
+#include <string> // string, to_string
+#include <tuple> // tuple_size, get, tuple_element
+#include <utility> // move
+
+#if JSON_HAS_RANGES
+    #include <ranges> // enable_borrowed_range
+#endif
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename string_type>
+void int_to_string( string_type& target, std::size_t value )
+{
+    // For ADL
+    using std::to_string;
+    target = to_string(value);
+}
+template<typename IteratorType> class iteration_proxy_value
+{
+  public:
+    using difference_type = std::ptrdiff_t;
+    using value_type = iteration_proxy_value;
+    using pointer = value_type *;
+    using reference = value_type &;
+    using iterator_category = std::input_iterator_tag;
+    using string_type = typename std::remove_cv< typename std::remove_reference<decltype( std::declval<IteratorType>().key() ) >::type >::type;
+
+  private:
+    /// the iterator
+    IteratorType anchor{};
+    /// an index for arrays (used to create key names)
+    std::size_t array_index = 0;
+    /// last stringified array index
+    mutable std::size_t array_index_last = 0;
+    /// a string representation of the array index
+    mutable string_type array_index_str = "0";
+    /// an empty string (to return a reference for primitive values)
+    string_type empty_str{};
+
+  public:
+    explicit iteration_proxy_value() = default;
+    explicit iteration_proxy_value(IteratorType it, std::size_t array_index_ = 0)
+    noexcept(std::is_nothrow_move_constructible<IteratorType>::value
+             && std::is_nothrow_default_constructible<string_type>::value)
+        : anchor(std::move(it))
+        , array_index(array_index_)
+    {}
+
+    iteration_proxy_value(iteration_proxy_value const&) = default;
+    iteration_proxy_value& operator=(iteration_proxy_value const&) = default;
+    // older GCCs are a bit fussy and require explicit noexcept specifiers on defaulted functions
+    iteration_proxy_value(iteration_proxy_value&&)
+    noexcept(std::is_nothrow_move_constructible<IteratorType>::value
+             && std::is_nothrow_move_constructible<string_type>::value) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor,cppcoreguidelines-noexcept-move-operations)
+    iteration_proxy_value& operator=(iteration_proxy_value&&)
+    noexcept(std::is_nothrow_move_assignable<IteratorType>::value
+             && std::is_nothrow_move_assignable<string_type>::value) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor,cppcoreguidelines-noexcept-move-operations)
+    ~iteration_proxy_value() = default;
+
+    /// dereference operator (needed for range-based for)
+    const iteration_proxy_value& operator*() const
+    {
+        return *this;
+    }
+
+    /// increment operator (needed for range-based for)
+    iteration_proxy_value& operator++()
+    {
+        ++anchor;
+        ++array_index;
+
+        return *this;
+    }
+
+    iteration_proxy_value operator++(int)& // NOLINT(cert-dcl21-cpp)
+    {
+        auto tmp = iteration_proxy_value(anchor, array_index);
+        ++anchor;
+        ++array_index;
+        return tmp;
+    }
+
+    /// equality operator (needed for InputIterator)
+    bool operator==(const iteration_proxy_value& o) const
+    {
+        return anchor == o.anchor;
+    }
+
+    /// inequality operator (needed for range-based for)
+    bool operator!=(const iteration_proxy_value& o) const
+    {
+        return anchor != o.anchor;
+    }
+
+    /// return key of the iterator
+    const string_type& key() const
+    {
+        JSON_ASSERT(anchor.m_object != nullptr);
+
+        switch (anchor.m_object->type())
+        {
+            // use integer array index as key
+            case value_t::array:
+            {
+                if (array_index != array_index_last)
+                {
+                    int_to_string( array_index_str, array_index );
+                    array_index_last = array_index;
+                }
+                return array_index_str;
+            }
+
+            // use key from the object
+            case value_t::object:
+                return anchor.key();
+
+            // use an empty key for all primitive types
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                return empty_str;
+        }
+    }
+
+    /// return value of the iterator
+    typename IteratorType::reference value() const
+    {
+        return anchor.value();
+    }
+};
+
+/// proxy class for the items() function
+template<typename IteratorType> class iteration_proxy
+{
+  private:
+    /// the container to iterate
+    typename IteratorType::pointer container = nullptr;
+
+  public:
+    explicit iteration_proxy() = default;
+
+    /// construct iteration proxy from a container
+    explicit iteration_proxy(typename IteratorType::reference cont) noexcept
+        : container(&cont) {}
+
+    iteration_proxy(iteration_proxy const&) = default;
+    iteration_proxy& operator=(iteration_proxy const&) = default;
+    iteration_proxy(iteration_proxy&&) noexcept = default;
+    iteration_proxy& operator=(iteration_proxy&&) noexcept = default;
+    ~iteration_proxy() = default;
+
+    /// return iterator begin (needed for range-based for)
+    iteration_proxy_value<IteratorType> begin() const noexcept
+    {
+        return iteration_proxy_value<IteratorType>(container->begin());
+    }
+
+    /// return iterator end (needed for range-based for)
+    iteration_proxy_value<IteratorType> end() const noexcept
+    {
+        return iteration_proxy_value<IteratorType>(container->end());
+    }
+};
+
+// Structured Bindings Support
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+template<std::size_t N, typename IteratorType, enable_if_t<N == 0, int> = 0>
+auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.key())
+{
+    return i.key();
+}
+// Structured Bindings Support
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+template<std::size_t N, typename IteratorType, enable_if_t<N == 1, int> = 0>
+auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.value())
+{
+    return i.value();
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// The Addition to the STD Namespace is required to add
+// Structured Bindings Support to the iteration_proxy_value class
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+namespace std
+{
+
+#if defined(__clang__)
+    // Fix: https://github.com/nlohmann/json/issues/1401
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wmismatched-tags"
+#endif
+template<typename IteratorType>
+class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>> // NOLINT(cert-dcl58-cpp)
+            : public std::integral_constant<std::size_t, 2> {};
+
+template<std::size_t N, typename IteratorType>
+class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >> // NOLINT(cert-dcl58-cpp)
+{
+  public:
+    using type = decltype(
+                     get<N>(std::declval <
+                            ::nlohmann::detail::iteration_proxy_value<IteratorType >> ()));
+};
+#if defined(__clang__)
+    #pragma clang diagnostic pop
+#endif
+
+}  // namespace std
+
+#if JSON_HAS_RANGES
+    template <typename IteratorType>
+    inline constexpr bool ::std::ranges::enable_borrowed_range<::nlohmann::detail::iteration_proxy<IteratorType>> = true;
+#endif
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/std_fs.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+//////////////////
+// constructors //
+//////////////////
+
+/*
+ * Note all external_constructor<>::construct functions need to call
+ * j.m_data.m_value.destroy(j.m_data.m_type) to avoid a memory leak in case j contains an
+ * allocated value (e.g., a string). See bug issue
+ * https://github.com/nlohmann/json/issues/2865 for more information.
+ */
+
+template<value_t> struct external_constructor;
+
+template<>
+struct external_constructor<value_t::boolean>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::boolean_t b) noexcept
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::boolean;
+        j.m_data.m_value = b;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::string>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::string_t& s)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::string;
+        j.m_data.m_value = s;
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::string;
+        j.m_data.m_value = std::move(s);
+        j.assert_invariant();
+    }
+
+    template < typename BasicJsonType, typename CompatibleStringType,
+               enable_if_t < !std::is_same<CompatibleStringType, typename BasicJsonType::string_t>::value,
+                             int > = 0 >
+    static void construct(BasicJsonType& j, const CompatibleStringType& str)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::string;
+        j.m_data.m_value.string = j.template create<typename BasicJsonType::string_t>(str);
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::binary>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::binary_t& b)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::binary;
+        j.m_data.m_value = typename BasicJsonType::binary_t(b);
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::binary_t&& b)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::binary;
+        j.m_data.m_value = typename BasicJsonType::binary_t(std::move(b));
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_float>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_float_t val) noexcept
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::number_float;
+        j.m_data.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_unsigned>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_unsigned_t val) noexcept
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::number_unsigned;
+        j.m_data.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_integer>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_integer_t val) noexcept
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::number_integer;
+        j.m_data.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::array>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::array_t& arr)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value = arr;
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value = std::move(arr);
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template < typename BasicJsonType, typename CompatibleArrayType,
+               enable_if_t < !std::is_same<CompatibleArrayType, typename BasicJsonType::array_t>::value,
+                             int > = 0 >
+    static void construct(BasicJsonType& j, const CompatibleArrayType& arr)
+    {
+        using std::begin;
+        using std::end;
+
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const std::vector<bool>& arr)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value = value_t::array;
+        j.m_data.m_value.array->reserve(arr.size());
+        for (const bool x : arr)
+        {
+            j.m_data.m_value.array->push_back(x);
+            j.set_parent(j.m_data.m_value.array->back());
+        }
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType, typename T,
+             enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
+    static void construct(BasicJsonType& j, const std::valarray<T>& arr)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value = value_t::array;
+        j.m_data.m_value.array->resize(arr.size());
+        if (arr.size() > 0)
+        {
+            std::copy(std::begin(arr), std::end(arr), j.m_data.m_value.array->begin());
+        }
+        j.set_parents();
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::object>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::object_t& obj)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::object;
+        j.m_data.m_value = obj;
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::object;
+        j.m_data.m_value = std::move(obj);
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template < typename BasicJsonType, typename CompatibleObjectType,
+               enable_if_t < !std::is_same<CompatibleObjectType, typename BasicJsonType::object_t>::value, int > = 0 >
+    static void construct(BasicJsonType& j, const CompatibleObjectType& obj)
+    {
+        using std::begin;
+        using std::end;
+
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::object;
+        j.m_data.m_value.object = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
+        j.set_parents();
+        j.assert_invariant();
+    }
+};
+
+/////////////
+// to_json //
+/////////////
+
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_same<T, typename BasicJsonType::boolean_t>::value, int> = 0>
+inline void to_json(BasicJsonType& j, T b) noexcept
+{
+    external_constructor<value_t::boolean>::construct(j, b);
+}
+
+template < typename BasicJsonType, typename BoolRef,
+           enable_if_t <
+               ((std::is_same<std::vector<bool>::reference, BoolRef>::value
+                 && !std::is_same <std::vector<bool>::reference, typename BasicJsonType::boolean_t&>::value)
+                || (std::is_same<std::vector<bool>::const_reference, BoolRef>::value
+                    && !std::is_same <detail::uncvref_t<std::vector<bool>::const_reference>,
+                                      typename BasicJsonType::boolean_t >::value))
+               && std::is_convertible<const BoolRef&, typename BasicJsonType::boolean_t>::value, int > = 0 >
+inline void to_json(BasicJsonType& j, const BoolRef& b) noexcept
+{
+    external_constructor<value_t::boolean>::construct(j, static_cast<typename BasicJsonType::boolean_t>(b));
+}
+
+template<typename BasicJsonType, typename CompatibleString,
+         enable_if_t<std::is_constructible<typename BasicJsonType::string_t, CompatibleString>::value, int> = 0>
+inline void to_json(BasicJsonType& j, const CompatibleString& s)
+{
+    external_constructor<value_t::string>::construct(j, s);
+}
+
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+{
+    external_constructor<value_t::string>::construct(j, std::move(s));
+}
+
+template<typename BasicJsonType, typename FloatType,
+         enable_if_t<std::is_floating_point<FloatType>::value, int> = 0>
+inline void to_json(BasicJsonType& j, FloatType val) noexcept
+{
+    external_constructor<value_t::number_float>::construct(j, static_cast<typename BasicJsonType::number_float_t>(val));
+}
+
+template<typename BasicJsonType, typename CompatibleNumberUnsignedType,
+         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_unsigned_t, CompatibleNumberUnsignedType>::value, int> = 0>
+inline void to_json(BasicJsonType& j, CompatibleNumberUnsignedType val) noexcept
+{
+    external_constructor<value_t::number_unsigned>::construct(j, static_cast<typename BasicJsonType::number_unsigned_t>(val));
+}
+
+template<typename BasicJsonType, typename CompatibleNumberIntegerType,
+         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_integer_t, CompatibleNumberIntegerType>::value, int> = 0>
+inline void to_json(BasicJsonType& j, CompatibleNumberIntegerType val) noexcept
+{
+    external_constructor<value_t::number_integer>::construct(j, static_cast<typename BasicJsonType::number_integer_t>(val));
+}
+
+#if !JSON_DISABLE_ENUM_SERIALIZATION
+template<typename BasicJsonType, typename EnumType,
+         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
+inline void to_json(BasicJsonType& j, EnumType e) noexcept
+{
+    using underlying_type = typename std::underlying_type<EnumType>::type;
+    external_constructor<value_t::number_integer>::construct(j, static_cast<underlying_type>(e));
+}
+#endif  // JSON_DISABLE_ENUM_SERIALIZATION
+
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, const std::vector<bool>& e)
+{
+    external_constructor<value_t::array>::construct(j, e);
+}
+
+template < typename BasicJsonType, typename CompatibleArrayType,
+           enable_if_t < is_compatible_array_type<BasicJsonType,
+                         CompatibleArrayType>::value&&
+                         !is_compatible_object_type<BasicJsonType, CompatibleArrayType>::value&&
+                         !is_compatible_string_type<BasicJsonType, CompatibleArrayType>::value&&
+                         !std::is_same<typename BasicJsonType::binary_t, CompatibleArrayType>::value&&
+                         !is_basic_json<CompatibleArrayType>::value,
+                         int > = 0 >
+inline void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
+{
+    external_constructor<value_t::array>::construct(j, arr);
+}
+
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, const typename BasicJsonType::binary_t& bin)
+{
+    external_constructor<value_t::binary>::construct(j, bin);
+}
+
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
+inline void to_json(BasicJsonType& j, const std::valarray<T>& arr)
+{
+    external_constructor<value_t::array>::construct(j, std::move(arr));
+}
+
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+{
+    external_constructor<value_t::array>::construct(j, std::move(arr));
+}
+
+template < typename BasicJsonType, typename CompatibleObjectType,
+           enable_if_t < is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value&& !is_basic_json<CompatibleObjectType>::value, int > = 0 >
+inline void to_json(BasicJsonType& j, const CompatibleObjectType& obj)
+{
+    external_constructor<value_t::object>::construct(j, obj);
+}
+
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+{
+    external_constructor<value_t::object>::construct(j, std::move(obj));
+}
+
+template <
+    typename BasicJsonType, typename T, std::size_t N,
+    enable_if_t < !std::is_constructible<typename BasicJsonType::string_t,
+                  const T(&)[N]>::value, // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+                  int > = 0 >
+inline void to_json(BasicJsonType& j, const T(&arr)[N]) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+{
+    external_constructor<value_t::array>::construct(j, arr);
+}
+
+template < typename BasicJsonType, typename T1, typename T2, enable_if_t < std::is_constructible<BasicJsonType, T1>::value&& std::is_constructible<BasicJsonType, T2>::value, int > = 0 >
+inline void to_json(BasicJsonType& j, const std::pair<T1, T2>& p)
+{
+    j = { p.first, p.second };
+}
+
+// for https://github.com/nlohmann/json/pull/1134
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_same<T, iteration_proxy_value<typename BasicJsonType::iterator>>::value, int> = 0>
+inline void to_json(BasicJsonType& j, const T& b)
+{
+    j = { {b.key(), b.value()} };
+}
+
+template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
+inline void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence<Idx...> /*unused*/)
+{
+    j = { std::get<Idx>(t)... };
+}
+
+template<typename BasicJsonType, typename T, enable_if_t<is_constructible_tuple<BasicJsonType, T>::value, int > = 0>
+inline void to_json(BasicJsonType& j, const T& t)
+{
+    to_json_tuple_impl(j, t, make_index_sequence<std::tuple_size<T>::value> {});
+}
+
+#if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, const std_fs::path& p)
+{
+    j = p.string();
+}
+#endif
+
+struct to_json_fn
+{
+    template<typename BasicJsonType, typename T>
+    auto operator()(BasicJsonType& j, T&& val) const noexcept(noexcept(to_json(j, std::forward<T>(val))))
+    -> decltype(to_json(j, std::forward<T>(val)), void())
+    {
+        return to_json(j, std::forward<T>(val));
+    }
+};
+}  // namespace detail
+
+#ifndef JSON_HAS_CPP_17
+/// namespace to hold default `to_json` function
+/// to see why this is required:
+/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
+namespace // NOLINT(cert-dcl59-cpp,fuchsia-header-anon-namespaces,google-build-namespaces)
+{
+#endif
+JSON_INLINE_VARIABLE constexpr const auto& to_json = // NOLINT(misc-definitions-in-headers)
+    detail::static_const<detail::to_json_fn>::value;
+#ifndef JSON_HAS_CPP_17
+}  // namespace
+#endif
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/identity_tag.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/// @sa https://json.nlohmann.me/api/adl_serializer/
+template<typename ValueType, typename>
+struct adl_serializer
+{
+    /// @brief convert a JSON value to any value type
+    /// @sa https://json.nlohmann.me/api/adl_serializer/from_json/
+    template<typename BasicJsonType, typename TargetType = ValueType>
+    static auto from_json(BasicJsonType && j, TargetType& val) noexcept(
+        noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val)))
+    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), val), void())
+    {
+        ::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
+    }
+
+    /// @brief convert a JSON value to any value type
+    /// @sa https://json.nlohmann.me/api/adl_serializer/from_json/
+    template<typename BasicJsonType, typename TargetType = ValueType>
+    static auto from_json(BasicJsonType && j) noexcept(
+    noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {})))
+    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {}))
+    {
+        return ::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {});
+    }
+
+    /// @brief convert any value type to a JSON value
+    /// @sa https://json.nlohmann.me/api/adl_serializer/to_json/
+    template<typename BasicJsonType, typename TargetType = ValueType>
+    static auto to_json(BasicJsonType& j, TargetType && val) noexcept(
+        noexcept(::nlohmann::to_json(j, std::forward<TargetType>(val))))
+    -> decltype(::nlohmann::to_json(j, std::forward<TargetType>(val)), void())
+    {
+        ::nlohmann::to_json(j, std::forward<TargetType>(val));
+    }
+};
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/byte_container_with_subtype.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstdint> // uint8_t, uint64_t
+#include <tuple> // tie
+#include <utility> // move
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/// @brief an internal type for a backed binary type
+/// @sa https://json.nlohmann.me/api/byte_container_with_subtype/
+template<typename BinaryType>
+class byte_container_with_subtype : public BinaryType
+{
+  public:
+    using container_type = BinaryType;
+    using subtype_type = std::uint64_t;
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype() noexcept(noexcept(container_type()))
+        : container_type()
+    {}
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(const container_type& b) noexcept(noexcept(container_type(b)))
+        : container_type(b)
+    {}
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(container_type&& b) noexcept(noexcept(container_type(std::move(b))))
+        : container_type(std::move(b))
+    {}
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(const container_type& b, subtype_type subtype_) noexcept(noexcept(container_type(b)))
+        : container_type(b)
+        , m_subtype(subtype_)
+        , m_has_subtype(true)
+    {}
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(container_type&& b, subtype_type subtype_) noexcept(noexcept(container_type(std::move(b))))
+        : container_type(std::move(b))
+        , m_subtype(subtype_)
+        , m_has_subtype(true)
+    {}
+
+    bool operator==(const byte_container_with_subtype& rhs) const
+    {
+        return std::tie(static_cast<const BinaryType&>(*this), m_subtype, m_has_subtype) ==
+               std::tie(static_cast<const BinaryType&>(rhs), rhs.m_subtype, rhs.m_has_subtype);
+    }
+
+    bool operator!=(const byte_container_with_subtype& rhs) const
+    {
+        return !(rhs == *this);
+    }
+
+    /// @brief sets the binary subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/set_subtype/
+    void set_subtype(subtype_type subtype_) noexcept
+    {
+        m_subtype = subtype_;
+        m_has_subtype = true;
+    }
+
+    /// @brief return the binary subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/subtype/
+    constexpr subtype_type subtype() const noexcept
+    {
+        return m_has_subtype ? m_subtype : static_cast<subtype_type>(-1);
+    }
+
+    /// @brief return whether the value has a subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/has_subtype/
+    constexpr bool has_subtype() const noexcept
+    {
+        return m_has_subtype;
+    }
+
+    /// @brief clears the binary subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/clear_subtype/
+    void clear_subtype() noexcept
+    {
+        m_subtype = 0;
+        m_has_subtype = false;
+    }
+
+  private:
+    subtype_type m_subtype = 0;
+    bool m_has_subtype = false;
+};
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/conversions/from_json.hpp>
+
+// #include <nlohmann/detail/conversions/to_json.hpp>
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/hash.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstdint> // uint8_t
+#include <cstddef> // size_t
+#include <functional> // hash
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+// boost::hash_combine
+inline std::size_t combine(std::size_t seed, std::size_t h) noexcept
+{
+    seed ^= h + 0x9e3779b9 + (seed << 6U) + (seed >> 2U);
+    return seed;
+}
+
+/*!
+@brief hash a JSON value
+
+The hash function tries to rely on std::hash where possible. Furthermore, the
+type of the JSON value is taken into account to have different hash values for
+null, 0, 0U, and false, etc.
+
+@tparam BasicJsonType basic_json specialization
+@param j JSON value to hash
+@return hash value of j
+*/
+template<typename BasicJsonType>
+std::size_t hash(const BasicJsonType& j)
+{
+    using string_t = typename BasicJsonType::string_t;
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+
+    const auto type = static_cast<std::size_t>(j.type());
+    switch (j.type())
+    {
+        case BasicJsonType::value_t::null:
+        case BasicJsonType::value_t::discarded:
+        {
+            return combine(type, 0);
+        }
+
+        case BasicJsonType::value_t::object:
+        {
+            auto seed = combine(type, j.size());
+            for (const auto& element : j.items())
+            {
+                const auto h = std::hash<string_t> {}(element.key());
+                seed = combine(seed, h);
+                seed = combine(seed, hash(element.value()));
+            }
+            return seed;
+        }
+
+        case BasicJsonType::value_t::array:
+        {
+            auto seed = combine(type, j.size());
+            for (const auto& element : j)
+            {
+                seed = combine(seed, hash(element));
+            }
+            return seed;
+        }
+
+        case BasicJsonType::value_t::string:
+        {
+            const auto h = std::hash<string_t> {}(j.template get_ref<const string_t&>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::boolean:
+        {
+            const auto h = std::hash<bool> {}(j.template get<bool>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::number_integer:
+        {
+            const auto h = std::hash<number_integer_t> {}(j.template get<number_integer_t>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::number_unsigned:
+        {
+            const auto h = std::hash<number_unsigned_t> {}(j.template get<number_unsigned_t>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::number_float:
+        {
+            const auto h = std::hash<number_float_t> {}(j.template get<number_float_t>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::binary:
+        {
+            auto seed = combine(type, j.get_binary().size());
+            const auto h = std::hash<bool> {}(j.get_binary().has_subtype());
+            seed = combine(seed, h);
+            seed = combine(seed, static_cast<std::size_t>(j.get_binary().subtype()));
+            for (const auto byte : j.get_binary())
+            {
+                seed = combine(seed, std::hash<std::uint8_t> {}(byte));
+            }
+            return seed;
+        }
+
+        default:                   // LCOV_EXCL_LINE
+            JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+            return 0;              // LCOV_EXCL_LINE
+    }
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/input/binary_reader.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // generate_n
+#include <array> // array
+#include <cmath> // ldexp
+#include <cstddef> // size_t
+#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
+#include <cstdio> // snprintf
+#include <cstring> // memcpy
+#include <iterator> // back_inserter
+#include <limits> // numeric_limits
+#include <string> // char_traits, string
+#include <utility> // make_pair, move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <array> // array
+#include <cstddef> // size_t
+#include <cstring> // strlen
+#include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
+#include <memory> // shared_ptr, make_shared, addressof
+#include <numeric> // accumulate
+#include <string> // string, char_traits
+#include <type_traits> // enable_if, is_base_of, is_pointer, is_integral, remove_pointer
+#include <utility> // pair, declval
+
+#ifndef JSON_NO_IO
+    #include <cstdio>   // FILE *
+    #include <istream>  // istream
+#endif                  // JSON_NO_IO
+
+// #include <nlohmann/detail/iterators/iterator_traits.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/// the supported input formats
+enum class input_format_t { json, cbor, msgpack, ubjson, bson, bjdata };
+
+////////////////////
+// input adapters //
+////////////////////
+
+#ifndef JSON_NO_IO
+/*!
+Input adapter for stdio file access. This adapter read only 1 byte and do not use any
+ buffer. This adapter is a very low level adapter.
+*/
+class file_input_adapter
+{
+  public:
+    using char_type = char;
+
+    JSON_HEDLEY_NON_NULL(2)
+    explicit file_input_adapter(std::FILE* f) noexcept
+        : m_file(f)
+    {
+        JSON_ASSERT(m_file != nullptr);
+    }
+
+    // make class move-only
+    file_input_adapter(const file_input_adapter&) = delete;
+    file_input_adapter(file_input_adapter&&) noexcept = default;
+    file_input_adapter& operator=(const file_input_adapter&) = delete;
+    file_input_adapter& operator=(file_input_adapter&&) = delete;
+    ~file_input_adapter() = default;
+
+    std::char_traits<char>::int_type get_character() noexcept
+    {
+        return std::fgetc(m_file);
+    }
+
+  private:
+    /// the file pointer to read from
+    std::FILE* m_file;
+};
+
+/*!
+Input adapter for a (caching) istream. Ignores a UFT Byte Order Mark at
+beginning of input. Does not support changing the underlying std::streambuf
+in mid-input. Maintains underlying std::istream and std::streambuf to support
+subsequent use of standard std::istream operations to process any input
+characters following those used in parsing the JSON input.  Clears the
+std::istream flags; any input errors (e.g., EOF) will be detected by the first
+subsequent call for input from the std::istream.
+*/
+class input_stream_adapter
+{
+  public:
+    using char_type = char;
+
+    ~input_stream_adapter()
+    {
+        // clear stream flags; we use underlying streambuf I/O, do not
+        // maintain ifstream flags, except eof
+        if (is != nullptr)
+        {
+            is->clear(is->rdstate() & std::ios::eofbit);
+        }
+    }
+
+    explicit input_stream_adapter(std::istream& i)
+        : is(&i), sb(i.rdbuf())
+    {}
+
+    // delete because of pointer members
+    input_stream_adapter(const input_stream_adapter&) = delete;
+    input_stream_adapter& operator=(input_stream_adapter&) = delete;
+    input_stream_adapter& operator=(input_stream_adapter&&) = delete;
+
+    input_stream_adapter(input_stream_adapter&& rhs) noexcept
+        : is(rhs.is), sb(rhs.sb)
+    {
+        rhs.is = nullptr;
+        rhs.sb = nullptr;
+    }
+
+    // std::istream/std::streambuf use std::char_traits<char>::to_int_type, to
+    // ensure that std::char_traits<char>::eof() and the character 0xFF do not
+    // end up as the same value, e.g. 0xFFFFFFFF.
+    std::char_traits<char>::int_type get_character()
+    {
+        auto res = sb->sbumpc();
+        // set eof manually, as we don't use the istream interface.
+        if (JSON_HEDLEY_UNLIKELY(res == std::char_traits<char>::eof()))
+        {
+            is->clear(is->rdstate() | std::ios::eofbit);
+        }
+        return res;
+    }
+
+  private:
+    /// the associated input stream
+    std::istream* is = nullptr;
+    std::streambuf* sb = nullptr;
+};
+#endif  // JSON_NO_IO
+
+// General-purpose iterator-based adapter. It might not be as fast as
+// theoretically possible for some containers, but it is extremely versatile.
+template<typename IteratorType>
+class iterator_input_adapter
+{
+  public:
+    using char_type = typename std::iterator_traits<IteratorType>::value_type;
+
+    iterator_input_adapter(IteratorType first, IteratorType last)
+        : current(std::move(first)), end(std::move(last))
+    {}
+
+    typename char_traits<char_type>::int_type get_character()
+    {
+        if (JSON_HEDLEY_LIKELY(current != end))
+        {
+            auto result = char_traits<char_type>::to_int_type(*current);
+            std::advance(current, 1);
+            return result;
+        }
+
+        return char_traits<char_type>::eof();
+    }
+
+  private:
+    IteratorType current;
+    IteratorType end;
+
+    template<typename BaseInputAdapter, size_t T>
+    friend struct wide_string_input_helper;
+
+    bool empty() const
+    {
+        return current == end;
+    }
+};
+
+template<typename BaseInputAdapter, size_t T>
+struct wide_string_input_helper;
+
+template<typename BaseInputAdapter>
+struct wide_string_input_helper<BaseInputAdapter, 4>
+{
+    // UTF-32
+    static void fill_buffer(BaseInputAdapter& input,
+                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
+                            size_t& utf8_bytes_index,
+                            size_t& utf8_bytes_filled)
+    {
+        utf8_bytes_index = 0;
+
+        if (JSON_HEDLEY_UNLIKELY(input.empty()))
+        {
+            utf8_bytes[0] = std::char_traits<char>::eof();
+            utf8_bytes_filled = 1;
+        }
+        else
+        {
+            // get the current character
+            const auto wc = input.get_character();
+
+            // UTF-32 to UTF-8 encoding
+            if (wc < 0x80)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+            else if (wc <= 0x7FF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((static_cast<unsigned int>(wc) >> 6u) & 0x1Fu));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 2;
+            }
+            else if (wc <= 0xFFFF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((static_cast<unsigned int>(wc) >> 12u) & 0x0Fu));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 3;
+            }
+            else if (wc <= 0x10FFFF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | ((static_cast<unsigned int>(wc) >> 18u) & 0x07u));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 12u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
+                utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 4;
+            }
+            else
+            {
+                // unknown character
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+        }
+    }
+};
+
+template<typename BaseInputAdapter>
+struct wide_string_input_helper<BaseInputAdapter, 2>
+{
+    // UTF-16
+    static void fill_buffer(BaseInputAdapter& input,
+                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
+                            size_t& utf8_bytes_index,
+                            size_t& utf8_bytes_filled)
+    {
+        utf8_bytes_index = 0;
+
+        if (JSON_HEDLEY_UNLIKELY(input.empty()))
+        {
+            utf8_bytes[0] = std::char_traits<char>::eof();
+            utf8_bytes_filled = 1;
+        }
+        else
+        {
+            // get the current character
+            const auto wc = input.get_character();
+
+            // UTF-16 to UTF-8 encoding
+            if (wc < 0x80)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+            else if (wc <= 0x7FF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((static_cast<unsigned int>(wc) >> 6u)));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 2;
+            }
+            else if (0xD800 > wc || wc >= 0xE000)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((static_cast<unsigned int>(wc) >> 12u)));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 3;
+            }
+            else
+            {
+                if (JSON_HEDLEY_UNLIKELY(!input.empty()))
+                {
+                    const auto wc2 = static_cast<unsigned int>(input.get_character());
+                    const auto charcode = 0x10000u + (((static_cast<unsigned int>(wc) & 0x3FFu) << 10u) | (wc2 & 0x3FFu));
+                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | (charcode >> 18u));
+                    utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 12u) & 0x3Fu));
+                    utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 6u) & 0x3Fu));
+                    utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (charcode & 0x3Fu));
+                    utf8_bytes_filled = 4;
+                }
+                else
+                {
+                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                    utf8_bytes_filled = 1;
+                }
+            }
+        }
+    }
+};
+
+// Wraps another input adapter to convert wide character types into individual bytes.
+template<typename BaseInputAdapter, typename WideCharType>
+class wide_string_input_adapter
+{
+  public:
+    using char_type = char;
+
+    wide_string_input_adapter(BaseInputAdapter base)
+        : base_adapter(base) {}
+
+    typename std::char_traits<char>::int_type get_character() noexcept
+    {
+        // check if buffer needs to be filled
+        if (utf8_bytes_index == utf8_bytes_filled)
+        {
+            fill_buffer<sizeof(WideCharType)>();
+
+            JSON_ASSERT(utf8_bytes_filled > 0);
+            JSON_ASSERT(utf8_bytes_index == 0);
+        }
+
+        // use buffer
+        JSON_ASSERT(utf8_bytes_filled > 0);
+        JSON_ASSERT(utf8_bytes_index < utf8_bytes_filled);
+        return utf8_bytes[utf8_bytes_index++];
+    }
+
+  private:
+    BaseInputAdapter base_adapter;
+
+    template<size_t T>
+    void fill_buffer()
+    {
+        wide_string_input_helper<BaseInputAdapter, T>::fill_buffer(base_adapter, utf8_bytes, utf8_bytes_index, utf8_bytes_filled);
+    }
+
+    /// a buffer for UTF-8 bytes
+    std::array<std::char_traits<char>::int_type, 4> utf8_bytes = {{0, 0, 0, 0}};
+
+    /// index to the utf8_codes array for the next valid byte
+    std::size_t utf8_bytes_index = 0;
+    /// number of valid bytes in the utf8_codes array
+    std::size_t utf8_bytes_filled = 0;
+};
+
+template<typename IteratorType, typename Enable = void>
+struct iterator_input_adapter_factory
+{
+    using iterator_type = IteratorType;
+    using char_type = typename std::iterator_traits<iterator_type>::value_type;
+    using adapter_type = iterator_input_adapter<iterator_type>;
+
+    static adapter_type create(IteratorType first, IteratorType last)
+    {
+        return adapter_type(std::move(first), std::move(last));
+    }
+};
+
+template<typename T>
+struct is_iterator_of_multibyte
+{
+    using value_type = typename std::iterator_traits<T>::value_type;
+    enum
+    {
+        value = sizeof(value_type) > 1
+    };
+};
+
+template<typename IteratorType>
+struct iterator_input_adapter_factory<IteratorType, enable_if_t<is_iterator_of_multibyte<IteratorType>::value>>
+{
+    using iterator_type = IteratorType;
+    using char_type = typename std::iterator_traits<iterator_type>::value_type;
+    using base_adapter_type = iterator_input_adapter<iterator_type>;
+    using adapter_type = wide_string_input_adapter<base_adapter_type, char_type>;
+
+    static adapter_type create(IteratorType first, IteratorType last)
+    {
+        return adapter_type(base_adapter_type(std::move(first), std::move(last)));
+    }
+};
+
+// General purpose iterator-based input
+template<typename IteratorType>
+typename iterator_input_adapter_factory<IteratorType>::adapter_type input_adapter(IteratorType first, IteratorType last)
+{
+    using factory_type = iterator_input_adapter_factory<IteratorType>;
+    return factory_type::create(first, last);
+}
+
+// Convenience shorthand from container to iterator
+// Enables ADL on begin(container) and end(container)
+// Encloses the using declarations in namespace for not to leak them to outside scope
+
+namespace container_input_adapter_factory_impl
+{
+
+using std::begin;
+using std::end;
+
+template<typename ContainerType, typename Enable = void>
+struct container_input_adapter_factory {};
+
+template<typename ContainerType>
+struct container_input_adapter_factory< ContainerType,
+       void_t<decltype(begin(std::declval<ContainerType>()), end(std::declval<ContainerType>()))>>
+       {
+           using adapter_type = decltype(input_adapter(begin(std::declval<ContainerType>()), end(std::declval<ContainerType>())));
+
+           static adapter_type create(const ContainerType& container)
+{
+    return input_adapter(begin(container), end(container));
+}
+       };
+
+}  // namespace container_input_adapter_factory_impl
+
+template<typename ContainerType>
+typename container_input_adapter_factory_impl::container_input_adapter_factory<ContainerType>::adapter_type input_adapter(const ContainerType& container)
+{
+    return container_input_adapter_factory_impl::container_input_adapter_factory<ContainerType>::create(container);
+}
+
+#ifndef JSON_NO_IO
+// Special cases with fast paths
+inline file_input_adapter input_adapter(std::FILE* file)
+{
+    return file_input_adapter(file);
+}
+
+inline input_stream_adapter input_adapter(std::istream& stream)
+{
+    return input_stream_adapter(stream);
+}
+
+inline input_stream_adapter input_adapter(std::istream&& stream)
+{
+    return input_stream_adapter(stream);
+}
+#endif  // JSON_NO_IO
+
+using contiguous_bytes_input_adapter = decltype(input_adapter(std::declval<const char*>(), std::declval<const char*>()));
+
+// Null-delimited strings, and the like.
+template < typename CharT,
+           typename std::enable_if <
+               std::is_pointer<CharT>::value&&
+               !std::is_array<CharT>::value&&
+               std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
+               sizeof(typename std::remove_pointer<CharT>::type) == 1,
+               int >::type = 0 >
+contiguous_bytes_input_adapter input_adapter(CharT b)
+{
+    auto length = std::strlen(reinterpret_cast<const char*>(b));
+    const auto* ptr = reinterpret_cast<const char*>(b);
+    return input_adapter(ptr, ptr + length);
+}
+
+template<typename T, std::size_t N>
+auto input_adapter(T (&array)[N]) -> decltype(input_adapter(array, array + N)) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+{
+    return input_adapter(array, array + N);
+}
+
+// This class only handles inputs of input_buffer_adapter type.
+// It's required so that expressions like {ptr, len} can be implicitly cast
+// to the correct adapter.
+class span_input_adapter
+{
+  public:
+    template < typename CharT,
+               typename std::enable_if <
+                   std::is_pointer<CharT>::value&&
+                   std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
+                   sizeof(typename std::remove_pointer<CharT>::type) == 1,
+                   int >::type = 0 >
+    span_input_adapter(CharT b, std::size_t l)
+        : ia(reinterpret_cast<const char*>(b), reinterpret_cast<const char*>(b) + l) {}
+
+    template<class IteratorType,
+             typename std::enable_if<
+                 std::is_same<typename iterator_traits<IteratorType>::iterator_category, std::random_access_iterator_tag>::value,
+                 int>::type = 0>
+    span_input_adapter(IteratorType first, IteratorType last)
+        : ia(input_adapter(first, last)) {}
+
+    contiguous_bytes_input_adapter&& get()
+    {
+        return std::move(ia); // NOLINT(hicpp-move-const-arg,performance-move-const-arg)
+    }
+
+  private:
+    contiguous_bytes_input_adapter ia;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/input/json_sax.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef>
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/*!
+@brief SAX interface
+
+This class describes the SAX interface used by @ref nlohmann::json::sax_parse.
+Each function is called in different situations while the input is parsed. The
+boolean return value informs the parser whether to continue processing the
+input.
+*/
+template<typename BasicJsonType>
+struct json_sax
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+
+    /*!
+    @brief a null value was read
+    @return whether parsing should proceed
+    */
+    virtual bool null() = 0;
+
+    /*!
+    @brief a boolean value was read
+    @param[in] val  boolean value
+    @return whether parsing should proceed
+    */
+    virtual bool boolean(bool val) = 0;
+
+    /*!
+    @brief an integer number was read
+    @param[in] val  integer value
+    @return whether parsing should proceed
+    */
+    virtual bool number_integer(number_integer_t val) = 0;
+
+    /*!
+    @brief an unsigned integer number was read
+    @param[in] val  unsigned integer value
+    @return whether parsing should proceed
+    */
+    virtual bool number_unsigned(number_unsigned_t val) = 0;
+
+    /*!
+    @brief a floating-point number was read
+    @param[in] val  floating-point value
+    @param[in] s    raw token value
+    @return whether parsing should proceed
+    */
+    virtual bool number_float(number_float_t val, const string_t& s) = 0;
+
+    /*!
+    @brief a string value was read
+    @param[in] val  string value
+    @return whether parsing should proceed
+    @note It is safe to move the passed string value.
+    */
+    virtual bool string(string_t& val) = 0;
+
+    /*!
+    @brief a binary value was read
+    @param[in] val  binary value
+    @return whether parsing should proceed
+    @note It is safe to move the passed binary value.
+    */
+    virtual bool binary(binary_t& val) = 0;
+
+    /*!
+    @brief the beginning of an object was read
+    @param[in] elements  number of object elements or -1 if unknown
+    @return whether parsing should proceed
+    @note binary formats may report the number of elements
+    */
+    virtual bool start_object(std::size_t elements) = 0;
+
+    /*!
+    @brief an object key was read
+    @param[in] val  object key
+    @return whether parsing should proceed
+    @note It is safe to move the passed string.
+    */
+    virtual bool key(string_t& val) = 0;
+
+    /*!
+    @brief the end of an object was read
+    @return whether parsing should proceed
+    */
+    virtual bool end_object() = 0;
+
+    /*!
+    @brief the beginning of an array was read
+    @param[in] elements  number of array elements or -1 if unknown
+    @return whether parsing should proceed
+    @note binary formats may report the number of elements
+    */
+    virtual bool start_array(std::size_t elements) = 0;
+
+    /*!
+    @brief the end of an array was read
+    @return whether parsing should proceed
+    */
+    virtual bool end_array() = 0;
+
+    /*!
+    @brief a parse error occurred
+    @param[in] position    the position in the input where the error occurs
+    @param[in] last_token  the last read token
+    @param[in] ex          an exception object describing the error
+    @return whether parsing should proceed (must return false)
+    */
+    virtual bool parse_error(std::size_t position,
+                             const std::string& last_token,
+                             const detail::exception& ex) = 0;
+
+    json_sax() = default;
+    json_sax(const json_sax&) = default;
+    json_sax(json_sax&&) noexcept = default;
+    json_sax& operator=(const json_sax&) = default;
+    json_sax& operator=(json_sax&&) noexcept = default;
+    virtual ~json_sax() = default;
+};
+
+namespace detail
+{
+/*!
+@brief SAX implementation to create a JSON value from SAX events
+
+This class implements the @ref json_sax interface and processes the SAX events
+to create a JSON value which makes it basically a DOM parser. The structure or
+hierarchy of the JSON value is managed by the stack `ref_stack` which contains
+a pointer to the respective array or object for each recursion depth.
+
+After successful parsing, the value that is passed by reference to the
+constructor contains the parsed value.
+
+@tparam BasicJsonType  the JSON type
+*/
+template<typename BasicJsonType>
+class json_sax_dom_parser
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+
+    /*!
+    @param[in,out] r  reference to a JSON value that is manipulated while
+                       parsing
+    @param[in] allow_exceptions_  whether parse errors yield exceptions
+    */
+    explicit json_sax_dom_parser(BasicJsonType& r, const bool allow_exceptions_ = true)
+        : root(r), allow_exceptions(allow_exceptions_)
+    {}
+
+    // make class move-only
+    json_sax_dom_parser(const json_sax_dom_parser&) = delete;
+    json_sax_dom_parser(json_sax_dom_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete;
+    json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    ~json_sax_dom_parser() = default;
+
+    bool null()
+    {
+        handle_value(nullptr);
+        return true;
+    }
+
+    bool boolean(bool val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_integer(number_integer_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_float(number_float_t val, const string_t& /*unused*/)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool string(string_t& val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool binary(binary_t& val)
+    {
+        handle_value(std::move(val));
+        return true;
+    }
+
+    bool start_object(std::size_t len)
+    {
+        ref_stack.push_back(handle_value(BasicJsonType::value_t::object));
+
+        if (JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, concat("excessive object size: ", std::to_string(len)), ref_stack.back()));
+        }
+
+        return true;
+    }
+
+    bool key(string_t& val)
+    {
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(ref_stack.back()->is_object());
+
+        // add null at given key and store the reference for later
+        object_element = &(ref_stack.back()->m_data.m_value.object->operator[](val));
+        return true;
+    }
+
+    bool end_object()
+    {
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(ref_stack.back()->is_object());
+
+        ref_stack.back()->set_parents();
+        ref_stack.pop_back();
+        return true;
+    }
+
+    bool start_array(std::size_t len)
+    {
+        ref_stack.push_back(handle_value(BasicJsonType::value_t::array));
+
+        if (JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, concat("excessive array size: ", std::to_string(len)), ref_stack.back()));
+        }
+
+        return true;
+    }
+
+    bool end_array()
+    {
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(ref_stack.back()->is_array());
+
+        ref_stack.back()->set_parents();
+        ref_stack.pop_back();
+        return true;
+    }
+
+    template<class Exception>
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
+                     const Exception& ex)
+    {
+        errored = true;
+        static_cast<void>(ex);
+        if (allow_exceptions)
+        {
+            JSON_THROW(ex);
+        }
+        return false;
+    }
+
+    constexpr bool is_errored() const
+    {
+        return errored;
+    }
+
+  private:
+    /*!
+    @invariant If the ref stack is empty, then the passed value will be the new
+               root.
+    @invariant If the ref stack contains a value, then it is an array or an
+               object to which we can add elements
+    */
+    template<typename Value>
+    JSON_HEDLEY_RETURNS_NON_NULL
+    BasicJsonType* handle_value(Value&& v)
+    {
+        if (ref_stack.empty())
+        {
+            root = BasicJsonType(std::forward<Value>(v));
+            return &root;
+        }
+
+        JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object());
+
+        if (ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_data.m_value.array->emplace_back(std::forward<Value>(v));
+            return &(ref_stack.back()->m_data.m_value.array->back());
+        }
+
+        JSON_ASSERT(ref_stack.back()->is_object());
+        JSON_ASSERT(object_element);
+        *object_element = BasicJsonType(std::forward<Value>(v));
+        return object_element;
+    }
+
+    /// the parsed JSON value
+    BasicJsonType& root;
+    /// stack to model hierarchy of values
+    std::vector<BasicJsonType*> ref_stack {};
+    /// helper to hold the reference for the next object element
+    BasicJsonType* object_element = nullptr;
+    /// whether a syntax error occurred
+    bool errored = false;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+};
+
+template<typename BasicJsonType>
+class json_sax_dom_callback_parser
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using parser_callback_t = typename BasicJsonType::parser_callback_t;
+    using parse_event_t = typename BasicJsonType::parse_event_t;
+
+    json_sax_dom_callback_parser(BasicJsonType& r,
+                                 const parser_callback_t cb,
+                                 const bool allow_exceptions_ = true)
+        : root(r), callback(cb), allow_exceptions(allow_exceptions_)
+    {
+        keep_stack.push_back(true);
+    }
+
+    // make class move-only
+    json_sax_dom_callback_parser(const json_sax_dom_callback_parser&) = delete;
+    json_sax_dom_callback_parser(json_sax_dom_callback_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    json_sax_dom_callback_parser& operator=(const json_sax_dom_callback_parser&) = delete;
+    json_sax_dom_callback_parser& operator=(json_sax_dom_callback_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    ~json_sax_dom_callback_parser() = default;
+
+    bool null()
+    {
+        handle_value(nullptr);
+        return true;
+    }
+
+    bool boolean(bool val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_integer(number_integer_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_float(number_float_t val, const string_t& /*unused*/)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool string(string_t& val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool binary(binary_t& val)
+    {
+        handle_value(std::move(val));
+        return true;
+    }
+
+    bool start_object(std::size_t len)
+    {
+        // check callback for object start
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::object_start, discarded);
+        keep_stack.push_back(keep);
+
+        auto val = handle_value(BasicJsonType::value_t::object, true);
+        ref_stack.push_back(val.second);
+
+        // check object limit
+        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, concat("excessive object size: ", std::to_string(len)), ref_stack.back()));
+        }
+
+        return true;
+    }
+
+    bool key(string_t& val)
+    {
+        BasicJsonType k = BasicJsonType(val);
+
+        // check callback for key
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::key, k);
+        key_keep_stack.push_back(keep);
+
+        // add discarded value at given key and store the reference for later
+        if (keep && ref_stack.back())
+        {
+            object_element = &(ref_stack.back()->m_data.m_value.object->operator[](val) = discarded);
+        }
+
+        return true;
+    }
+
+    bool end_object()
+    {
+        if (ref_stack.back())
+        {
+            if (!callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::object_end, *ref_stack.back()))
+            {
+                // discard object
+                *ref_stack.back() = discarded;
+            }
+            else
+            {
+                ref_stack.back()->set_parents();
+            }
+        }
+
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(!keep_stack.empty());
+        ref_stack.pop_back();
+        keep_stack.pop_back();
+
+        if (!ref_stack.empty() && ref_stack.back() && ref_stack.back()->is_structured())
+        {
+            // remove discarded value
+            for (auto it = ref_stack.back()->begin(); it != ref_stack.back()->end(); ++it)
+            {
+                if (it->is_discarded())
+                {
+                    ref_stack.back()->erase(it);
+                    break;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    bool start_array(std::size_t len)
+    {
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::array_start, discarded);
+        keep_stack.push_back(keep);
+
+        auto val = handle_value(BasicJsonType::value_t::array, true);
+        ref_stack.push_back(val.second);
+
+        // check array limit
+        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, concat("excessive array size: ", std::to_string(len)), ref_stack.back()));
+        }
+
+        return true;
+    }
+
+    bool end_array()
+    {
+        bool keep = true;
+
+        if (ref_stack.back())
+        {
+            keep = callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::array_end, *ref_stack.back());
+            if (keep)
+            {
+                ref_stack.back()->set_parents();
+            }
+            else
+            {
+                // discard array
+                *ref_stack.back() = discarded;
+            }
+        }
+
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(!keep_stack.empty());
+        ref_stack.pop_back();
+        keep_stack.pop_back();
+
+        // remove discarded value
+        if (!keep && !ref_stack.empty() && ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_data.m_value.array->pop_back();
+        }
+
+        return true;
+    }
+
+    template<class Exception>
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
+                     const Exception& ex)
+    {
+        errored = true;
+        static_cast<void>(ex);
+        if (allow_exceptions)
+        {
+            JSON_THROW(ex);
+        }
+        return false;
+    }
+
+    constexpr bool is_errored() const
+    {
+        return errored;
+    }
+
+  private:
+    /*!
+    @param[in] v  value to add to the JSON value we build during parsing
+    @param[in] skip_callback  whether we should skip calling the callback
+               function; this is required after start_array() and
+               start_object() SAX events, because otherwise we would call the
+               callback function with an empty array or object, respectively.
+
+    @invariant If the ref stack is empty, then the passed value will be the new
+               root.
+    @invariant If the ref stack contains a value, then it is an array or an
+               object to which we can add elements
+
+    @return pair of boolean (whether value should be kept) and pointer (to the
+            passed value in the ref_stack hierarchy; nullptr if not kept)
+    */
+    template<typename Value>
+    std::pair<bool, BasicJsonType*> handle_value(Value&& v, const bool skip_callback = false)
+    {
+        JSON_ASSERT(!keep_stack.empty());
+
+        // do not handle this value if we know it would be added to a discarded
+        // container
+        if (!keep_stack.back())
+        {
+            return {false, nullptr};
+        }
+
+        // create value
+        auto value = BasicJsonType(std::forward<Value>(v));
+
+        // check callback
+        const bool keep = skip_callback || callback(static_cast<int>(ref_stack.size()), parse_event_t::value, value);
+
+        // do not handle this value if we just learnt it shall be discarded
+        if (!keep)
+        {
+            return {false, nullptr};
+        }
+
+        if (ref_stack.empty())
+        {
+            root = std::move(value);
+            return {true, & root};
+        }
+
+        // skip this value if we already decided to skip the parent
+        // (https://github.com/nlohmann/json/issues/971#issuecomment-413678360)
+        if (!ref_stack.back())
+        {
+            return {false, nullptr};
+        }
+
+        // we now only expect arrays and objects
+        JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object());
+
+        // array
+        if (ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_data.m_value.array->emplace_back(std::move(value));
+            return {true, & (ref_stack.back()->m_data.m_value.array->back())};
+        }
+
+        // object
+        JSON_ASSERT(ref_stack.back()->is_object());
+        // check if we should store an element for the current key
+        JSON_ASSERT(!key_keep_stack.empty());
+        const bool store_element = key_keep_stack.back();
+        key_keep_stack.pop_back();
+
+        if (!store_element)
+        {
+            return {false, nullptr};
+        }
+
+        JSON_ASSERT(object_element);
+        *object_element = std::move(value);
+        return {true, object_element};
+    }
+
+    /// the parsed JSON value
+    BasicJsonType& root;
+    /// stack to model hierarchy of values
+    std::vector<BasicJsonType*> ref_stack {};
+    /// stack to manage which values to keep
+    std::vector<bool> keep_stack {};
+    /// stack to manage which object keys to keep
+    std::vector<bool> key_keep_stack {};
+    /// helper to hold the reference for the next object element
+    BasicJsonType* object_element = nullptr;
+    /// whether a syntax error occurred
+    bool errored = false;
+    /// callback function
+    const parser_callback_t callback = nullptr;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+    /// a discarded value for the callback
+    BasicJsonType discarded = BasicJsonType::value_t::discarded;
+};
+
+template<typename BasicJsonType>
+class json_sax_acceptor
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+
+    bool null()
+    {
+        return true;
+    }
+
+    bool boolean(bool /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_integer(number_integer_t /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_float(number_float_t /*unused*/, const string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool string(string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool binary(binary_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool start_object(std::size_t /*unused*/ = static_cast<std::size_t>(-1))
+    {
+        return true;
+    }
+
+    bool key(string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool end_object()
+    {
+        return true;
+    }
+
+    bool start_array(std::size_t /*unused*/ = static_cast<std::size_t>(-1))
+    {
+        return true;
+    }
+
+    bool end_array()
+    {
+        return true;
+    }
+
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& /*unused*/)
+    {
+        return false;
+    }
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/input/lexer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <array> // array
+#include <clocale> // localeconv
+#include <cstddef> // size_t
+#include <cstdio> // snprintf
+#include <cstdlib> // strtof, strtod, strtold, strtoll, strtoull
+#include <initializer_list> // initializer_list
+#include <string> // char_traits, string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/position_t.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+///////////
+// lexer //
+///////////
+
+template<typename BasicJsonType>
+class lexer_base
+{
+  public:
+    /// token types for the parser
+    enum class token_type
+    {
+        uninitialized,    ///< indicating the scanner is uninitialized
+        literal_true,     ///< the `true` literal
+        literal_false,    ///< the `false` literal
+        literal_null,     ///< the `null` literal
+        value_string,     ///< a string -- use get_string() for actual value
+        value_unsigned,   ///< an unsigned integer -- use get_number_unsigned() for actual value
+        value_integer,    ///< a signed integer -- use get_number_integer() for actual value
+        value_float,      ///< an floating point number -- use get_number_float() for actual value
+        begin_array,      ///< the character for array begin `[`
+        begin_object,     ///< the character for object begin `{`
+        end_array,        ///< the character for array end `]`
+        end_object,       ///< the character for object end `}`
+        name_separator,   ///< the name separator `:`
+        value_separator,  ///< the value separator `,`
+        parse_error,      ///< indicating a parse error
+        end_of_input,     ///< indicating the end of the input buffer
+        literal_or_value  ///< a literal or the begin of a value (only for diagnostics)
+    };
+
+    /// return name of values of type token_type (only used for errors)
+    JSON_HEDLEY_RETURNS_NON_NULL
+    JSON_HEDLEY_CONST
+    static const char* token_type_name(const token_type t) noexcept
+    {
+        switch (t)
+        {
+            case token_type::uninitialized:
+                return "<uninitialized>";
+            case token_type::literal_true:
+                return "true literal";
+            case token_type::literal_false:
+                return "false literal";
+            case token_type::literal_null:
+                return "null literal";
+            case token_type::value_string:
+                return "string literal";
+            case token_type::value_unsigned:
+            case token_type::value_integer:
+            case token_type::value_float:
+                return "number literal";
+            case token_type::begin_array:
+                return "'['";
+            case token_type::begin_object:
+                return "'{'";
+            case token_type::end_array:
+                return "']'";
+            case token_type::end_object:
+                return "'}'";
+            case token_type::name_separator:
+                return "':'";
+            case token_type::value_separator:
+                return "','";
+            case token_type::parse_error:
+                return "<parse error>";
+            case token_type::end_of_input:
+                return "end of input";
+            case token_type::literal_or_value:
+                return "'[', '{', or a literal";
+            // LCOV_EXCL_START
+            default: // catch non-enum values
+                return "unknown token";
+                // LCOV_EXCL_STOP
+        }
+    }
+};
+/*!
+@brief lexical analysis
+
+This class organizes the lexical analysis during JSON deserialization.
+*/
+template<typename BasicJsonType, typename InputAdapterType>
+class lexer : public lexer_base<BasicJsonType>
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using char_type = typename InputAdapterType::char_type;
+    using char_int_type = typename char_traits<char_type>::int_type;
+
+  public:
+    using token_type = typename lexer_base<BasicJsonType>::token_type;
+
+    explicit lexer(InputAdapterType&& adapter, bool ignore_comments_ = false) noexcept
+        : ia(std::move(adapter))
+        , ignore_comments(ignore_comments_)
+        , decimal_point_char(static_cast<char_int_type>(get_decimal_point()))
+    {}
+
+    // delete because of pointer members
+    lexer(const lexer&) = delete;
+    lexer(lexer&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    lexer& operator=(lexer&) = delete;
+    lexer& operator=(lexer&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    ~lexer() = default;
+
+  private:
+    /////////////////////
+    // locales
+    /////////////////////
+
+    /// return the locale-dependent decimal point
+    JSON_HEDLEY_PURE
+    static char get_decimal_point() noexcept
+    {
+        const auto* loc = localeconv();
+        JSON_ASSERT(loc != nullptr);
+        return (loc->decimal_point == nullptr) ? '.' : *(loc->decimal_point);
+    }
+
+    /////////////////////
+    // scan functions
+    /////////////////////
+
+    /*!
+    @brief get codepoint from 4 hex characters following `\u`
+
+    For input "\u c1 c2 c3 c4" the codepoint is:
+      (c1 * 0x1000) + (c2 * 0x0100) + (c3 * 0x0010) + c4
+    = (c1 << 12) + (c2 << 8) + (c3 << 4) + (c4 << 0)
+
+    Furthermore, the possible characters '0'..'9', 'A'..'F', and 'a'..'f'
+    must be converted to the integers 0x0..0x9, 0xA..0xF, 0xA..0xF, resp. The
+    conversion is done by subtracting the offset (0x30, 0x37, and 0x57)
+    between the ASCII value of the character and the desired integer value.
+
+    @return codepoint (0x0000..0xFFFF) or -1 in case of an error (e.g. EOF or
+            non-hex character)
+    */
+    int get_codepoint()
+    {
+        // this function only makes sense after reading `\u`
+        JSON_ASSERT(current == 'u');
+        int codepoint = 0;
+
+        const auto factors = { 12u, 8u, 4u, 0u };
+        for (const auto factor : factors)
+        {
+            get();
+
+            if (current >= '0' && current <= '9')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x30u) << factor);
+            }
+            else if (current >= 'A' && current <= 'F')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x37u) << factor);
+            }
+            else if (current >= 'a' && current <= 'f')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x57u) << factor);
+            }
+            else
+            {
+                return -1;
+            }
+        }
+
+        JSON_ASSERT(0x0000 <= codepoint && codepoint <= 0xFFFF);
+        return codepoint;
+    }
+
+    /*!
+    @brief check if the next byte(s) are inside a given range
+
+    Adds the current byte and, for each passed range, reads a new byte and
+    checks if it is inside the range. If a violation was detected, set up an
+    error message and return false. Otherwise, return true.
+
+    @param[in] ranges  list of integers; interpreted as list of pairs of
+                       inclusive lower and upper bound, respectively
+
+    @pre The passed list @a ranges must have 2, 4, or 6 elements; that is,
+         1, 2, or 3 pairs. This precondition is enforced by an assertion.
+
+    @return true if and only if no range violation was detected
+    */
+    bool next_byte_in_range(std::initializer_list<char_int_type> ranges)
+    {
+        JSON_ASSERT(ranges.size() == 2 || ranges.size() == 4 || ranges.size() == 6);
+        add(current);
+
+        for (auto range = ranges.begin(); range != ranges.end(); ++range)
+        {
+            get();
+            if (JSON_HEDLEY_LIKELY(*range <= current && current <= *(++range))) // NOLINT(bugprone-inc-dec-in-conditions)
+            {
+                add(current);
+            }
+            else
+            {
+                error_message = "invalid string: ill-formed UTF-8 byte";
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief scan a string literal
+
+    This function scans a string according to Sect. 7 of RFC 8259. While
+    scanning, bytes are escaped and copied into buffer token_buffer. Then the
+    function returns successfully, token_buffer is *not* null-terminated (as it
+    may contain \0 bytes), and token_buffer.size() is the number of bytes in the
+    string.
+
+    @return token_type::value_string if string could be successfully scanned,
+            token_type::parse_error otherwise
+
+    @note In case of errors, variable error_message contains a textual
+          description.
+    */
+    token_type scan_string()
+    {
+        // reset token_buffer (ignore opening quote)
+        reset();
+
+        // we entered the function by reading an open quote
+        JSON_ASSERT(current == '\"');
+
+        while (true)
+        {
+            // get next character
+            switch (get())
+            {
+                // end of file while parsing string
+                case char_traits<char_type>::eof():
+                {
+                    error_message = "invalid string: missing closing quote";
+                    return token_type::parse_error;
+                }
+
+                // closing quote
+                case '\"':
+                {
+                    return token_type::value_string;
+                }
+
+                // escapes
+                case '\\':
+                {
+                    switch (get())
+                    {
+                        // quotation mark
+                        case '\"':
+                            add('\"');
+                            break;
+                        // reverse solidus
+                        case '\\':
+                            add('\\');
+                            break;
+                        // solidus
+                        case '/':
+                            add('/');
+                            break;
+                        // backspace
+                        case 'b':
+                            add('\b');
+                            break;
+                        // form feed
+                        case 'f':
+                            add('\f');
+                            break;
+                        // line feed
+                        case 'n':
+                            add('\n');
+                            break;
+                        // carriage return
+                        case 'r':
+                            add('\r');
+                            break;
+                        // tab
+                        case 't':
+                            add('\t');
+                            break;
+
+                        // unicode escapes
+                        case 'u':
+                        {
+                            const int codepoint1 = get_codepoint();
+                            int codepoint = codepoint1; // start with codepoint1
+
+                            if (JSON_HEDLEY_UNLIKELY(codepoint1 == -1))
+                            {
+                                error_message = "invalid string: '\\u' must be followed by 4 hex digits";
+                                return token_type::parse_error;
+                            }
+
+                            // check if code point is a high surrogate
+                            if (0xD800 <= codepoint1 && codepoint1 <= 0xDBFF)
+                            {
+                                // expect next \uxxxx entry
+                                if (JSON_HEDLEY_LIKELY(get() == '\\' && get() == 'u'))
+                                {
+                                    const int codepoint2 = get_codepoint();
+
+                                    if (JSON_HEDLEY_UNLIKELY(codepoint2 == -1))
+                                    {
+                                        error_message = "invalid string: '\\u' must be followed by 4 hex digits";
+                                        return token_type::parse_error;
+                                    }
+
+                                    // check if codepoint2 is a low surrogate
+                                    if (JSON_HEDLEY_LIKELY(0xDC00 <= codepoint2 && codepoint2 <= 0xDFFF))
+                                    {
+                                        // overwrite codepoint
+                                        codepoint = static_cast<int>(
+                                                        // high surrogate occupies the most significant 22 bits
+                                                        (static_cast<unsigned int>(codepoint1) << 10u)
+                                                        // low surrogate occupies the least significant 15 bits
+                                                        + static_cast<unsigned int>(codepoint2)
+                                                        // there is still the 0xD800, 0xDC00 and 0x10000 noise
+                                                        // in the result, so we have to subtract with:
+                                                        // (0xD800 << 10) + DC00 - 0x10000 = 0x35FDC00
+                                                        - 0x35FDC00u);
+                                    }
+                                    else
+                                    {
+                                        error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF";
+                                        return token_type::parse_error;
+                                    }
+                                }
+                                else
+                                {
+                                    error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF";
+                                    return token_type::parse_error;
+                                }
+                            }
+                            else
+                            {
+                                if (JSON_HEDLEY_UNLIKELY(0xDC00 <= codepoint1 && codepoint1 <= 0xDFFF))
+                                {
+                                    error_message = "invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF";
+                                    return token_type::parse_error;
+                                }
+                            }
+
+                            // result of the above calculation yields a proper codepoint
+                            JSON_ASSERT(0x00 <= codepoint && codepoint <= 0x10FFFF);
+
+                            // translate codepoint into bytes
+                            if (codepoint < 0x80)
+                            {
+                                // 1-byte characters: 0xxxxxxx (ASCII)
+                                add(static_cast<char_int_type>(codepoint));
+                            }
+                            else if (codepoint <= 0x7FF)
+                            {
+                                // 2-byte characters: 110xxxxx 10xxxxxx
+                                add(static_cast<char_int_type>(0xC0u | (static_cast<unsigned int>(codepoint) >> 6u)));
+                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+                            else if (codepoint <= 0xFFFF)
+                            {
+                                // 3-byte characters: 1110xxxx 10xxxxxx 10xxxxxx
+                                add(static_cast<char_int_type>(0xE0u | (static_cast<unsigned int>(codepoint) >> 12u)));
+                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+                            else
+                            {
+                                // 4-byte characters: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+                                add(static_cast<char_int_type>(0xF0u | (static_cast<unsigned int>(codepoint) >> 18u)));
+                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 12u) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+
+                            break;
+                        }
+
+                        // other characters after escape
+                        default:
+                            error_message = "invalid string: forbidden character after backslash";
+                            return token_type::parse_error;
+                    }
+
+                    break;
+                }
+
+                // invalid control characters
+                case 0x00:
+                {
+                    error_message = "invalid string: control character U+0000 (NUL) must be escaped to \\u0000";
+                    return token_type::parse_error;
+                }
+
+                case 0x01:
+                {
+                    error_message = "invalid string: control character U+0001 (SOH) must be escaped to \\u0001";
+                    return token_type::parse_error;
+                }
+
+                case 0x02:
+                {
+                    error_message = "invalid string: control character U+0002 (STX) must be escaped to \\u0002";
+                    return token_type::parse_error;
+                }
+
+                case 0x03:
+                {
+                    error_message = "invalid string: control character U+0003 (ETX) must be escaped to \\u0003";
+                    return token_type::parse_error;
+                }
+
+                case 0x04:
+                {
+                    error_message = "invalid string: control character U+0004 (EOT) must be escaped to \\u0004";
+                    return token_type::parse_error;
+                }
+
+                case 0x05:
+                {
+                    error_message = "invalid string: control character U+0005 (ENQ) must be escaped to \\u0005";
+                    return token_type::parse_error;
+                }
+
+                case 0x06:
+                {
+                    error_message = "invalid string: control character U+0006 (ACK) must be escaped to \\u0006";
+                    return token_type::parse_error;
+                }
+
+                case 0x07:
+                {
+                    error_message = "invalid string: control character U+0007 (BEL) must be escaped to \\u0007";
+                    return token_type::parse_error;
+                }
+
+                case 0x08:
+                {
+                    error_message = "invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b";
+                    return token_type::parse_error;
+                }
+
+                case 0x09:
+                {
+                    error_message = "invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t";
+                    return token_type::parse_error;
+                }
+
+                case 0x0A:
+                {
+                    error_message = "invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n";
+                    return token_type::parse_error;
+                }
+
+                case 0x0B:
+                {
+                    error_message = "invalid string: control character U+000B (VT) must be escaped to \\u000B";
+                    return token_type::parse_error;
+                }
+
+                case 0x0C:
+                {
+                    error_message = "invalid string: control character U+000C (FF) must be escaped to \\u000C or \\f";
+                    return token_type::parse_error;
+                }
+
+                case 0x0D:
+                {
+                    error_message = "invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r";
+                    return token_type::parse_error;
+                }
+
+                case 0x0E:
+                {
+                    error_message = "invalid string: control character U+000E (SO) must be escaped to \\u000E";
+                    return token_type::parse_error;
+                }
+
+                case 0x0F:
+                {
+                    error_message = "invalid string: control character U+000F (SI) must be escaped to \\u000F";
+                    return token_type::parse_error;
+                }
+
+                case 0x10:
+                {
+                    error_message = "invalid string: control character U+0010 (DLE) must be escaped to \\u0010";
+                    return token_type::parse_error;
+                }
+
+                case 0x11:
+                {
+                    error_message = "invalid string: control character U+0011 (DC1) must be escaped to \\u0011";
+                    return token_type::parse_error;
+                }
+
+                case 0x12:
+                {
+                    error_message = "invalid string: control character U+0012 (DC2) must be escaped to \\u0012";
+                    return token_type::parse_error;
+                }
+
+                case 0x13:
+                {
+                    error_message = "invalid string: control character U+0013 (DC3) must be escaped to \\u0013";
+                    return token_type::parse_error;
+                }
+
+                case 0x14:
+                {
+                    error_message = "invalid string: control character U+0014 (DC4) must be escaped to \\u0014";
+                    return token_type::parse_error;
+                }
+
+                case 0x15:
+                {
+                    error_message = "invalid string: control character U+0015 (NAK) must be escaped to \\u0015";
+                    return token_type::parse_error;
+                }
+
+                case 0x16:
+                {
+                    error_message = "invalid string: control character U+0016 (SYN) must be escaped to \\u0016";
+                    return token_type::parse_error;
+                }
+
+                case 0x17:
+                {
+                    error_message = "invalid string: control character U+0017 (ETB) must be escaped to \\u0017";
+                    return token_type::parse_error;
+                }
+
+                case 0x18:
+                {
+                    error_message = "invalid string: control character U+0018 (CAN) must be escaped to \\u0018";
+                    return token_type::parse_error;
+                }
+
+                case 0x19:
+                {
+                    error_message = "invalid string: control character U+0019 (EM) must be escaped to \\u0019";
+                    return token_type::parse_error;
+                }
+
+                case 0x1A:
+                {
+                    error_message = "invalid string: control character U+001A (SUB) must be escaped to \\u001A";
+                    return token_type::parse_error;
+                }
+
+                case 0x1B:
+                {
+                    error_message = "invalid string: control character U+001B (ESC) must be escaped to \\u001B";
+                    return token_type::parse_error;
+                }
+
+                case 0x1C:
+                {
+                    error_message = "invalid string: control character U+001C (FS) must be escaped to \\u001C";
+                    return token_type::parse_error;
+                }
+
+                case 0x1D:
+                {
+                    error_message = "invalid string: control character U+001D (GS) must be escaped to \\u001D";
+                    return token_type::parse_error;
+                }
+
+                case 0x1E:
+                {
+                    error_message = "invalid string: control character U+001E (RS) must be escaped to \\u001E";
+                    return token_type::parse_error;
+                }
+
+                case 0x1F:
+                {
+                    error_message = "invalid string: control character U+001F (US) must be escaped to \\u001F";
+                    return token_type::parse_error;
+                }
+
+                // U+0020..U+007F (except U+0022 (quote) and U+005C (backspace))
+                case 0x20:
+                case 0x21:
+                case 0x23:
+                case 0x24:
+                case 0x25:
+                case 0x26:
+                case 0x27:
+                case 0x28:
+                case 0x29:
+                case 0x2A:
+                case 0x2B:
+                case 0x2C:
+                case 0x2D:
+                case 0x2E:
+                case 0x2F:
+                case 0x30:
+                case 0x31:
+                case 0x32:
+                case 0x33:
+                case 0x34:
+                case 0x35:
+                case 0x36:
+                case 0x37:
+                case 0x38:
+                case 0x39:
+                case 0x3A:
+                case 0x3B:
+                case 0x3C:
+                case 0x3D:
+                case 0x3E:
+                case 0x3F:
+                case 0x40:
+                case 0x41:
+                case 0x42:
+                case 0x43:
+                case 0x44:
+                case 0x45:
+                case 0x46:
+                case 0x47:
+                case 0x48:
+                case 0x49:
+                case 0x4A:
+                case 0x4B:
+                case 0x4C:
+                case 0x4D:
+                case 0x4E:
+                case 0x4F:
+                case 0x50:
+                case 0x51:
+                case 0x52:
+                case 0x53:
+                case 0x54:
+                case 0x55:
+                case 0x56:
+                case 0x57:
+                case 0x58:
+                case 0x59:
+                case 0x5A:
+                case 0x5B:
+                case 0x5D:
+                case 0x5E:
+                case 0x5F:
+                case 0x60:
+                case 0x61:
+                case 0x62:
+                case 0x63:
+                case 0x64:
+                case 0x65:
+                case 0x66:
+                case 0x67:
+                case 0x68:
+                case 0x69:
+                case 0x6A:
+                case 0x6B:
+                case 0x6C:
+                case 0x6D:
+                case 0x6E:
+                case 0x6F:
+                case 0x70:
+                case 0x71:
+                case 0x72:
+                case 0x73:
+                case 0x74:
+                case 0x75:
+                case 0x76:
+                case 0x77:
+                case 0x78:
+                case 0x79:
+                case 0x7A:
+                case 0x7B:
+                case 0x7C:
+                case 0x7D:
+                case 0x7E:
+                case 0x7F:
+                {
+                    add(current);
+                    break;
+                }
+
+                // U+0080..U+07FF: bytes C2..DF 80..BF
+                case 0xC2:
+                case 0xC3:
+                case 0xC4:
+                case 0xC5:
+                case 0xC6:
+                case 0xC7:
+                case 0xC8:
+                case 0xC9:
+                case 0xCA:
+                case 0xCB:
+                case 0xCC:
+                case 0xCD:
+                case 0xCE:
+                case 0xCF:
+                case 0xD0:
+                case 0xD1:
+                case 0xD2:
+                case 0xD3:
+                case 0xD4:
+                case 0xD5:
+                case 0xD6:
+                case 0xD7:
+                case 0xD8:
+                case 0xD9:
+                case 0xDA:
+                case 0xDB:
+                case 0xDC:
+                case 0xDD:
+                case 0xDE:
+                case 0xDF:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!next_byte_in_range({0x80, 0xBF})))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+0800..U+0FFF: bytes E0 A0..BF 80..BF
+                case 0xE0:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0xA0, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+1000..U+CFFF: bytes E1..EC 80..BF 80..BF
+                // U+E000..U+FFFF: bytes EE..EF 80..BF 80..BF
+                case 0xE1:
+                case 0xE2:
+                case 0xE3:
+                case 0xE4:
+                case 0xE5:
+                case 0xE6:
+                case 0xE7:
+                case 0xE8:
+                case 0xE9:
+                case 0xEA:
+                case 0xEB:
+                case 0xEC:
+                case 0xEE:
+                case 0xEF:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+D000..U+D7FF: bytes ED 80..9F 80..BF
+                case 0xED:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x9F, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+10000..U+3FFFF F0 90..BF 80..BF 80..BF
+                case 0xF0:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x90, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+40000..U+FFFFF F1..F3 80..BF 80..BF 80..BF
+                case 0xF1:
+                case 0xF2:
+                case 0xF3:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+100000..U+10FFFF F4 80..8F 80..BF 80..BF
+                case 0xF4:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x8F, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // remaining bytes (80..C1 and F5..FF) are ill-formed
+                default:
+                {
+                    error_message = "invalid string: ill-formed UTF-8 byte";
+                    return token_type::parse_error;
+                }
+            }
+        }
+    }
+
+    /*!
+     * @brief scan a comment
+     * @return whether comment could be scanned successfully
+     */
+    bool scan_comment()
+    {
+        switch (get())
+        {
+            // single-line comments skip input until a newline or EOF is read
+            case '/':
+            {
+                while (true)
+                {
+                    switch (get())
+                    {
+                        case '\n':
+                        case '\r':
+                        case char_traits<char_type>::eof():
+                        case '\0':
+                            return true;
+
+                        default:
+                            break;
+                    }
+                }
+            }
+
+            // multi-line comments skip input until */ is read
+            case '*':
+            {
+                while (true)
+                {
+                    switch (get())
+                    {
+                        case char_traits<char_type>::eof():
+                        case '\0':
+                        {
+                            error_message = "invalid comment; missing closing '*/'";
+                            return false;
+                        }
+
+                        case '*':
+                        {
+                            switch (get())
+                            {
+                                case '/':
+                                    return true;
+
+                                default:
+                                {
+                                    unget();
+                                    continue;
+                                }
+                            }
+                        }
+
+                        default:
+                            continue;
+                    }
+                }
+            }
+
+            // unexpected character after reading '/'
+            default:
+            {
+                error_message = "invalid comment; expecting '/' or '*' after '/'";
+                return false;
+            }
+        }
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(float& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtof(str, endptr);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(double& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtod(str, endptr);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(long double& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtold(str, endptr);
+    }
+
+    /*!
+    @brief scan a number literal
+
+    This function scans a string according to Sect. 6 of RFC 8259.
+
+    The function is realized with a deterministic finite state machine derived
+    from the grammar described in RFC 8259. Starting in state "init", the
+    input is read and used to determined the next state. Only state "done"
+    accepts the number. State "error" is a trap state to model errors. In the
+    table below, "anything" means any character but the ones listed before.
+
+    state    | 0        | 1-9      | e E      | +       | -       | .        | anything
+    ---------|----------|----------|----------|---------|---------|----------|-----------
+    init     | zero     | any1     | [error]  | [error] | minus   | [error]  | [error]
+    minus    | zero     | any1     | [error]  | [error] | [error] | [error]  | [error]
+    zero     | done     | done     | exponent | done    | done    | decimal1 | done
+    any1     | any1     | any1     | exponent | done    | done    | decimal1 | done
+    decimal1 | decimal2 | decimal2 | [error]  | [error] | [error] | [error]  | [error]
+    decimal2 | decimal2 | decimal2 | exponent | done    | done    | done     | done
+    exponent | any2     | any2     | [error]  | sign    | sign    | [error]  | [error]
+    sign     | any2     | any2     | [error]  | [error] | [error] | [error]  | [error]
+    any2     | any2     | any2     | done     | done    | done    | done     | done
+
+    The state machine is realized with one label per state (prefixed with
+    "scan_number_") and `goto` statements between them. The state machine
+    contains cycles, but any cycle can be left when EOF is read. Therefore,
+    the function is guaranteed to terminate.
+
+    During scanning, the read bytes are stored in token_buffer. This string is
+    then converted to a signed integer, an unsigned integer, or a
+    floating-point number.
+
+    @return token_type::value_unsigned, token_type::value_integer, or
+            token_type::value_float if number could be successfully scanned,
+            token_type::parse_error otherwise
+
+    @note The scanner is independent of the current locale. Internally, the
+          locale's decimal point is used instead of `.` to work with the
+          locale-dependent converters.
+    */
+    token_type scan_number()  // lgtm [cpp/use-of-goto]
+    {
+        // reset token_buffer to store the number's bytes
+        reset();
+
+        // the type of the parsed number; initially set to unsigned; will be
+        // changed if minus sign, decimal point or exponent is read
+        token_type number_type = token_type::value_unsigned;
+
+        // state (init): we just found out we need to scan a number
+        switch (current)
+        {
+            case '-':
+            {
+                add(current);
+                goto scan_number_minus;
+            }
+
+            case '0':
+            {
+                add(current);
+                goto scan_number_zero;
+            }
+
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            // all other characters are rejected outside scan_number()
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+
+scan_number_minus:
+        // state: we just parsed a leading minus sign
+        number_type = token_type::value_integer;
+        switch (get())
+        {
+            case '0':
+            {
+                add(current);
+                goto scan_number_zero;
+            }
+
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after '-'";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_zero:
+        // state: we just parse a zero (maybe with a leading minus sign)
+        switch (get())
+        {
+            case '.':
+            {
+                add(decimal_point_char);
+                goto scan_number_decimal1;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_any1:
+        // state: we just parsed a number 0-9 (maybe with a leading minus sign)
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            case '.':
+            {
+                add(decimal_point_char);
+                goto scan_number_decimal1;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_decimal1:
+        // state: we just parsed a decimal point
+        number_type = token_type::value_float;
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_decimal2;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after '.'";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_decimal2:
+        // we just parsed at least one number after a decimal point
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_decimal2;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_exponent:
+        // we just parsed an exponent
+        number_type = token_type::value_float;
+        switch (get())
+        {
+            case '+':
+            case '-':
+            {
+                add(current);
+                goto scan_number_sign;
+            }
+
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+            {
+                error_message =
+                    "invalid number; expected '+', '-', or digit after exponent";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_sign:
+        // we just parsed an exponent sign
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after exponent sign";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_any2:
+        // we just parsed a number after the exponent or exponent sign
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_done:
+        // unget the character after the number (we only read it to know that
+        // we are done scanning a number)
+        unget();
+
+        char* endptr = nullptr; // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+        errno = 0;
+
+        // try to parse integers first and fall back to floats
+        if (number_type == token_type::value_unsigned)
+        {
+            const auto x = std::strtoull(token_buffer.data(), &endptr, 10);
+
+            // we checked the number format before
+            JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
+
+            if (errno == 0)
+            {
+                value_unsigned = static_cast<number_unsigned_t>(x);
+                if (value_unsigned == x)
+                {
+                    return token_type::value_unsigned;
+                }
+            }
+        }
+        else if (number_type == token_type::value_integer)
+        {
+            const auto x = std::strtoll(token_buffer.data(), &endptr, 10);
+
+            // we checked the number format before
+            JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
+
+            if (errno == 0)
+            {
+                value_integer = static_cast<number_integer_t>(x);
+                if (value_integer == x)
+                {
+                    return token_type::value_integer;
+                }
+            }
+        }
+
+        // this code is reached if we parse a floating-point number or if an
+        // integer conversion above failed
+        strtof(value_float, token_buffer.data(), &endptr);
+
+        // we checked the number format before
+        JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
+
+        return token_type::value_float;
+    }
+
+    /*!
+    @param[in] literal_text  the literal text to expect
+    @param[in] length        the length of the passed literal text
+    @param[in] return_type   the token type to return on success
+    */
+    JSON_HEDLEY_NON_NULL(2)
+    token_type scan_literal(const char_type* literal_text, const std::size_t length,
+                            token_type return_type)
+    {
+        JSON_ASSERT(char_traits<char_type>::to_char_type(current) == literal_text[0]);
+        for (std::size_t i = 1; i < length; ++i)
+        {
+            if (JSON_HEDLEY_UNLIKELY(char_traits<char_type>::to_char_type(get()) != literal_text[i]))
+            {
+                error_message = "invalid literal";
+                return token_type::parse_error;
+            }
+        }
+        return return_type;
+    }
+
+    /////////////////////
+    // input management
+    /////////////////////
+
+    /// reset token_buffer; current character is beginning of token
+    void reset() noexcept
+    {
+        token_buffer.clear();
+        token_string.clear();
+        token_string.push_back(char_traits<char_type>::to_char_type(current));
+    }
+
+    /*
+    @brief get next character from the input
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns a
+    `char_traits<char>::eof()` in that case.  Stores the scanned characters
+    for use in error messages.
+
+    @return character read from the input
+    */
+    char_int_type get()
+    {
+        ++position.chars_read_total;
+        ++position.chars_read_current_line;
+
+        if (next_unget)
+        {
+            // just reset the next_unget variable and work with current
+            next_unget = false;
+        }
+        else
+        {
+            current = ia.get_character();
+        }
+
+        if (JSON_HEDLEY_LIKELY(current != char_traits<char_type>::eof()))
+        {
+            token_string.push_back(char_traits<char_type>::to_char_type(current));
+        }
+
+        if (current == '\n')
+        {
+            ++position.lines_read;
+            position.chars_read_current_line = 0;
+        }
+
+        return current;
+    }
+
+    /*!
+    @brief unget current character (read it again on next get)
+
+    We implement unget by setting variable next_unget to true. The input is not
+    changed - we just simulate ungetting by modifying chars_read_total,
+    chars_read_current_line, and token_string. The next call to get() will
+    behave as if the unget character is read again.
+    */
+    void unget()
+    {
+        next_unget = true;
+
+        --position.chars_read_total;
+
+        // in case we "unget" a newline, we have to also decrement the lines_read
+        if (position.chars_read_current_line == 0)
+        {
+            if (position.lines_read > 0)
+            {
+                --position.lines_read;
+            }
+        }
+        else
+        {
+            --position.chars_read_current_line;
+        }
+
+        if (JSON_HEDLEY_LIKELY(current != char_traits<char_type>::eof()))
+        {
+            JSON_ASSERT(!token_string.empty());
+            token_string.pop_back();
+        }
+    }
+
+    /// add a character to token_buffer
+    void add(char_int_type c)
+    {
+        token_buffer.push_back(static_cast<typename string_t::value_type>(c));
+    }
+
+  public:
+    /////////////////////
+    // value getters
+    /////////////////////
+
+    /// return integer value
+    constexpr number_integer_t get_number_integer() const noexcept
+    {
+        return value_integer;
+    }
+
+    /// return unsigned integer value
+    constexpr number_unsigned_t get_number_unsigned() const noexcept
+    {
+        return value_unsigned;
+    }
+
+    /// return floating-point value
+    constexpr number_float_t get_number_float() const noexcept
+    {
+        return value_float;
+    }
+
+    /// return current string value (implicitly resets the token; useful only once)
+    string_t& get_string()
+    {
+        return token_buffer;
+    }
+
+    /////////////////////
+    // diagnostics
+    /////////////////////
+
+    /// return position of last read token
+    constexpr position_t get_position() const noexcept
+    {
+        return position;
+    }
+
+    /// return the last read token (for errors only).  Will never contain EOF
+    /// (an arbitrary value that is not a valid char value, often -1), because
+    /// 255 may legitimately occur.  May contain NUL, which should be escaped.
+    std::string get_token_string() const
+    {
+        // escape control characters
+        std::string result;
+        for (const auto c : token_string)
+        {
+            if (static_cast<unsigned char>(c) <= '\x1F')
+            {
+                // escape control characters
+                std::array<char, 9> cs{{}};
+                static_cast<void>((std::snprintf)(cs.data(), cs.size(), "<U+%.4X>", static_cast<unsigned char>(c))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                result += cs.data();
+            }
+            else
+            {
+                // add character as is
+                result.push_back(static_cast<std::string::value_type>(c));
+            }
+        }
+
+        return result;
+    }
+
+    /// return syntax error message
+    JSON_HEDLEY_RETURNS_NON_NULL
+    constexpr const char* get_error_message() const noexcept
+    {
+        return error_message;
+    }
+
+    /////////////////////
+    // actual scanner
+    /////////////////////
+
+    /*!
+    @brief skip the UTF-8 byte order mark
+    @return true iff there is no BOM or the correct BOM has been skipped
+    */
+    bool skip_bom()
+    {
+        if (get() == 0xEF)
+        {
+            // check if we completely parse the BOM
+            return get() == 0xBB && get() == 0xBF;
+        }
+
+        // the first character is not the beginning of the BOM; unget it to
+        // process is later
+        unget();
+        return true;
+    }
+
+    void skip_whitespace()
+    {
+        do
+        {
+            get();
+        }
+        while (current == ' ' || current == '\t' || current == '\n' || current == '\r');
+    }
+
+    token_type scan()
+    {
+        // initially, skip the BOM
+        if (position.chars_read_total == 0 && !skip_bom())
+        {
+            error_message = "invalid BOM; must be 0xEF 0xBB 0xBF if given";
+            return token_type::parse_error;
+        }
+
+        // read next character and ignore whitespace
+        skip_whitespace();
+
+        // ignore comments
+        while (ignore_comments && current == '/')
+        {
+            if (!scan_comment())
+            {
+                return token_type::parse_error;
+            }
+
+            // skip following whitespace
+            skip_whitespace();
+        }
+
+        switch (current)
+        {
+            // structural characters
+            case '[':
+                return token_type::begin_array;
+            case ']':
+                return token_type::end_array;
+            case '{':
+                return token_type::begin_object;
+            case '}':
+                return token_type::end_object;
+            case ':':
+                return token_type::name_separator;
+            case ',':
+                return token_type::value_separator;
+
+            // literals
+            case 't':
+            {
+                std::array<char_type, 4> true_literal = {{static_cast<char_type>('t'), static_cast<char_type>('r'), static_cast<char_type>('u'), static_cast<char_type>('e')}};
+                return scan_literal(true_literal.data(), true_literal.size(), token_type::literal_true);
+            }
+            case 'f':
+            {
+                std::array<char_type, 5> false_literal = {{static_cast<char_type>('f'), static_cast<char_type>('a'), static_cast<char_type>('l'), static_cast<char_type>('s'), static_cast<char_type>('e')}};
+                return scan_literal(false_literal.data(), false_literal.size(), token_type::literal_false);
+            }
+            case 'n':
+            {
+                std::array<char_type, 4> null_literal = {{static_cast<char_type>('n'), static_cast<char_type>('u'), static_cast<char_type>('l'), static_cast<char_type>('l')}};
+                return scan_literal(null_literal.data(), null_literal.size(), token_type::literal_null);
+            }
+
+            // string
+            case '\"':
+                return scan_string();
+
+            // number
+            case '-':
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+                return scan_number();
+
+            // end of input (the null byte is needed when parsing from
+            // string literals)
+            case '\0':
+            case char_traits<char_type>::eof():
+                return token_type::end_of_input;
+
+            // error
+            default:
+                error_message = "invalid literal";
+                return token_type::parse_error;
+        }
+    }
+
+  private:
+    /// input adapter
+    InputAdapterType ia;
+
+    /// whether comments should be ignored (true) or signaled as errors (false)
+    const bool ignore_comments = false;
+
+    /// the current character
+    char_int_type current = char_traits<char_type>::eof();
+
+    /// whether the next get() call should just return current
+    bool next_unget = false;
+
+    /// the start position of the current token
+    position_t position {};
+
+    /// raw input token string (for error messages)
+    std::vector<char_type> token_string {};
+
+    /// buffer for variable-length tokens (numbers, strings)
+    string_t token_buffer {};
+
+    /// a description of occurred lexer errors
+    const char* error_message = "";
+
+    // number values
+    number_integer_t value_integer = 0;
+    number_unsigned_t value_unsigned = 0;
+    number_float_t value_float = 0;
+
+    /// the decimal point
+    const char_int_type decimal_point_char = '.';
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/is_sax.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstdint> // size_t
+#include <utility> // declval
+#include <string> // string
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename T>
+using null_function_t = decltype(std::declval<T&>().null());
+
+template<typename T>
+using boolean_function_t =
+    decltype(std::declval<T&>().boolean(std::declval<bool>()));
+
+template<typename T, typename Integer>
+using number_integer_function_t =
+    decltype(std::declval<T&>().number_integer(std::declval<Integer>()));
+
+template<typename T, typename Unsigned>
+using number_unsigned_function_t =
+    decltype(std::declval<T&>().number_unsigned(std::declval<Unsigned>()));
+
+template<typename T, typename Float, typename String>
+using number_float_function_t = decltype(std::declval<T&>().number_float(
+                                    std::declval<Float>(), std::declval<const String&>()));
+
+template<typename T, typename String>
+using string_function_t =
+    decltype(std::declval<T&>().string(std::declval<String&>()));
+
+template<typename T, typename Binary>
+using binary_function_t =
+    decltype(std::declval<T&>().binary(std::declval<Binary&>()));
+
+template<typename T>
+using start_object_function_t =
+    decltype(std::declval<T&>().start_object(std::declval<std::size_t>()));
+
+template<typename T, typename String>
+using key_function_t =
+    decltype(std::declval<T&>().key(std::declval<String&>()));
+
+template<typename T>
+using end_object_function_t = decltype(std::declval<T&>().end_object());
+
+template<typename T>
+using start_array_function_t =
+    decltype(std::declval<T&>().start_array(std::declval<std::size_t>()));
+
+template<typename T>
+using end_array_function_t = decltype(std::declval<T&>().end_array());
+
+template<typename T, typename Exception>
+using parse_error_function_t = decltype(std::declval<T&>().parse_error(
+        std::declval<std::size_t>(), std::declval<const std::string&>(),
+        std::declval<const Exception&>()));
+
+template<typename SAX, typename BasicJsonType>
+struct is_sax
+{
+  private:
+    static_assert(is_basic_json<BasicJsonType>::value,
+                  "BasicJsonType must be of type basic_json<...>");
+
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using exception_t = typename BasicJsonType::exception;
+
+  public:
+    static constexpr bool value =
+        is_detected_exact<bool, null_function_t, SAX>::value &&
+        is_detected_exact<bool, boolean_function_t, SAX>::value &&
+        is_detected_exact<bool, number_integer_function_t, SAX, number_integer_t>::value &&
+        is_detected_exact<bool, number_unsigned_function_t, SAX, number_unsigned_t>::value &&
+        is_detected_exact<bool, number_float_function_t, SAX, number_float_t, string_t>::value &&
+        is_detected_exact<bool, string_function_t, SAX, string_t>::value &&
+        is_detected_exact<bool, binary_function_t, SAX, binary_t>::value &&
+        is_detected_exact<bool, start_object_function_t, SAX>::value &&
+        is_detected_exact<bool, key_function_t, SAX, string_t>::value &&
+        is_detected_exact<bool, end_object_function_t, SAX>::value &&
+        is_detected_exact<bool, start_array_function_t, SAX>::value &&
+        is_detected_exact<bool, end_array_function_t, SAX>::value &&
+        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value;
+};
+
+template<typename SAX, typename BasicJsonType>
+struct is_sax_static_asserts
+{
+  private:
+    static_assert(is_basic_json<BasicJsonType>::value,
+                  "BasicJsonType must be of type basic_json<...>");
+
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using exception_t = typename BasicJsonType::exception;
+
+  public:
+    static_assert(is_detected_exact<bool, null_function_t, SAX>::value,
+                  "Missing/invalid function: bool null()");
+    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
+                  "Missing/invalid function: bool boolean(bool)");
+    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
+                  "Missing/invalid function: bool boolean(bool)");
+    static_assert(
+        is_detected_exact<bool, number_integer_function_t, SAX,
+        number_integer_t>::value,
+        "Missing/invalid function: bool number_integer(number_integer_t)");
+    static_assert(
+        is_detected_exact<bool, number_unsigned_function_t, SAX,
+        number_unsigned_t>::value,
+        "Missing/invalid function: bool number_unsigned(number_unsigned_t)");
+    static_assert(is_detected_exact<bool, number_float_function_t, SAX,
+                  number_float_t, string_t>::value,
+                  "Missing/invalid function: bool number_float(number_float_t, const string_t&)");
+    static_assert(
+        is_detected_exact<bool, string_function_t, SAX, string_t>::value,
+        "Missing/invalid function: bool string(string_t&)");
+    static_assert(
+        is_detected_exact<bool, binary_function_t, SAX, binary_t>::value,
+        "Missing/invalid function: bool binary(binary_t&)");
+    static_assert(is_detected_exact<bool, start_object_function_t, SAX>::value,
+                  "Missing/invalid function: bool start_object(std::size_t)");
+    static_assert(is_detected_exact<bool, key_function_t, SAX, string_t>::value,
+                  "Missing/invalid function: bool key(string_t&)");
+    static_assert(is_detected_exact<bool, end_object_function_t, SAX>::value,
+                  "Missing/invalid function: bool end_object()");
+    static_assert(is_detected_exact<bool, start_array_function_t, SAX>::value,
+                  "Missing/invalid function: bool start_array(std::size_t)");
+    static_assert(is_detected_exact<bool, end_array_function_t, SAX>::value,
+                  "Missing/invalid function: bool end_array()");
+    static_assert(
+        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value,
+        "Missing/invalid function: bool parse_error(std::size_t, const "
+        "std::string&, const exception&)");
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/// how to treat CBOR tags
+enum class cbor_tag_handler_t
+{
+    error,   ///< throw a parse_error exception in case of a tag
+    ignore,  ///< ignore tags
+    store    ///< store tags as binary type
+};
+
+/*!
+@brief determine system byte order
+
+@return true if and only if system's byte order is little endian
+
+@note from https://stackoverflow.com/a/1001328/266378
+*/
+static inline bool little_endianness(int num = 1) noexcept
+{
+    return *reinterpret_cast<char*>(&num) == 1;
+}
+
+///////////////////
+// binary reader //
+///////////////////
+
+/*!
+@brief deserialization of CBOR, MessagePack, and UBJSON values
+*/
+template<typename BasicJsonType, typename InputAdapterType, typename SAX = json_sax_dom_parser<BasicJsonType>>
+class binary_reader
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using json_sax_t = SAX;
+    using char_type = typename InputAdapterType::char_type;
+    using char_int_type = typename char_traits<char_type>::int_type;
+
+  public:
+    /*!
+    @brief create a binary reader
+
+    @param[in] adapter  input adapter to read from
+    */
+    explicit binary_reader(InputAdapterType&& adapter, const input_format_t format = input_format_t::json) noexcept : ia(std::move(adapter)), input_format(format)
+    {
+        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
+    }
+
+    // make class move-only
+    binary_reader(const binary_reader&) = delete;
+    binary_reader(binary_reader&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    binary_reader& operator=(const binary_reader&) = delete;
+    binary_reader& operator=(binary_reader&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    ~binary_reader() = default;
+
+    /*!
+    @param[in] format  the binary format to parse
+    @param[in] sax_    a SAX event processor
+    @param[in] strict  whether to expect the input to be consumed completed
+    @param[in] tag_handler  how to treat CBOR tags
+
+    @return whether parsing was successful
+    */
+    JSON_HEDLEY_NON_NULL(3)
+    bool sax_parse(const input_format_t format,
+                   json_sax_t* sax_,
+                   const bool strict = true,
+                   const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        sax = sax_;
+        bool result = false;
+
+        switch (format)
+        {
+            case input_format_t::bson:
+                result = parse_bson_internal();
+                break;
+
+            case input_format_t::cbor:
+                result = parse_cbor_internal(true, tag_handler);
+                break;
+
+            case input_format_t::msgpack:
+                result = parse_msgpack_internal();
+                break;
+
+            case input_format_t::ubjson:
+            case input_format_t::bjdata:
+                result = parse_ubjson_internal();
+                break;
+
+            case input_format_t::json: // LCOV_EXCL_LINE
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+
+        // strict mode: next byte must be EOF
+        if (result && strict)
+        {
+            if (input_format == input_format_t::ubjson || input_format == input_format_t::bjdata)
+            {
+                get_ignore_noop();
+            }
+            else
+            {
+                get();
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(current != char_traits<char_type>::eof()))
+            {
+                return sax->parse_error(chars_read, get_token_string(), parse_error::create(110, chars_read,
+                                        exception_message(input_format, concat("expected end of input; last byte: 0x", get_token_string()), "value"), nullptr));
+            }
+        }
+
+        return result;
+    }
+
+  private:
+    //////////
+    // BSON //
+    //////////
+
+    /*!
+    @brief Reads in a BSON-object and passes it to the SAX-parser.
+    @return whether a valid BSON-value was passed to the SAX parser
+    */
+    bool parse_bson_internal()
+    {
+        std::int32_t document_size{};
+        get_number<std::int32_t, true>(input_format_t::bson, document_size);
+
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(static_cast<std::size_t>(-1))))
+        {
+            return false;
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/false)))
+        {
+            return false;
+        }
+
+        return sax->end_object();
+    }
+
+    /*!
+    @brief Parses a C-style string from the BSON input.
+    @param[in,out] result  A reference to the string variable where the read
+                            string is to be stored.
+    @return `true` if the \x00-byte indicating the end of the string was
+             encountered before the EOF; false` indicates an unexpected EOF.
+    */
+    bool get_bson_cstr(string_t& result)
+    {
+        auto out = std::back_inserter(result);
+        while (true)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "cstring")))
+            {
+                return false;
+            }
+            if (current == 0x00)
+            {
+                return true;
+            }
+            *out++ = static_cast<typename string_t::value_type>(current);
+        }
+    }
+
+    /*!
+    @brief Parses a zero-terminated string of length @a len from the BSON
+           input.
+    @param[in] len  The length (including the zero-byte at the end) of the
+                    string to be read.
+    @param[in,out] result  A reference to the string variable where the read
+                            string is to be stored.
+    @tparam NumberType The type of the length @a len
+    @pre len >= 1
+    @return `true` if the string was successfully parsed
+    */
+    template<typename NumberType>
+    bool get_bson_string(const NumberType len, string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(len < 1))
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                    exception_message(input_format_t::bson, concat("string length must be at least 1, is ", std::to_string(len)), "string"), nullptr));
+        }
+
+        return get_string(input_format_t::bson, len - static_cast<NumberType>(1), result) && get() != char_traits<char_type>::eof();
+    }
+
+    /*!
+    @brief Parses a byte array input of length @a len from the BSON input.
+    @param[in] len  The length of the byte array to be read.
+    @param[in,out] result  A reference to the binary variable where the read
+                            array is to be stored.
+    @tparam NumberType The type of the length @a len
+    @pre len >= 0
+    @return `true` if the byte array was successfully parsed
+    */
+    template<typename NumberType>
+    bool get_bson_binary(const NumberType len, binary_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(len < 0))
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                    exception_message(input_format_t::bson, concat("byte array length cannot be negative, is ", std::to_string(len)), "binary"), nullptr));
+        }
+
+        // All BSON binary values have a subtype
+        std::uint8_t subtype{};
+        get_number<std::uint8_t>(input_format_t::bson, subtype);
+        result.set_subtype(subtype);
+
+        return get_binary(input_format_t::bson, len, result);
+    }
+
+    /*!
+    @brief Read a BSON document element of the given @a element_type.
+    @param[in] element_type The BSON element type, c.f. http://bsonspec.org/spec.html
+    @param[in] element_type_parse_position The position in the input stream,
+               where the `element_type` was read.
+    @warning Not all BSON element types are supported yet. An unsupported
+             @a element_type will give rise to a parse_error.114:
+             Unsupported BSON record type 0x...
+    @return whether a valid BSON-object/array was passed to the SAX parser
+    */
+    bool parse_bson_element_internal(const char_int_type element_type,
+                                     const std::size_t element_type_parse_position)
+    {
+        switch (element_type)
+        {
+            case 0x01: // double
+            {
+                double number{};
+                return get_number<double, true>(input_format_t::bson, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0x02: // string
+            {
+                std::int32_t len{};
+                string_t value;
+                return get_number<std::int32_t, true>(input_format_t::bson, len) && get_bson_string(len, value) && sax->string(value);
+            }
+
+            case 0x03: // object
+            {
+                return parse_bson_internal();
+            }
+
+            case 0x04: // array
+            {
+                return parse_bson_array();
+            }
+
+            case 0x05: // binary
+            {
+                std::int32_t len{};
+                binary_t value;
+                return get_number<std::int32_t, true>(input_format_t::bson, len) && get_bson_binary(len, value) && sax->binary(value);
+            }
+
+            case 0x08: // boolean
+            {
+                return sax->boolean(get() != 0);
+            }
+
+            case 0x0A: // null
+            {
+                return sax->null();
+            }
+
+            case 0x10: // int32
+            {
+                std::int32_t value{};
+                return get_number<std::int32_t, true>(input_format_t::bson, value) && sax->number_integer(value);
+            }
+
+            case 0x12: // int64
+            {
+                std::int64_t value{};
+                return get_number<std::int64_t, true>(input_format_t::bson, value) && sax->number_integer(value);
+            }
+
+            default: // anything else not supported (yet)
+            {
+                std::array<char, 3> cr{{}};
+                static_cast<void>((std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(element_type))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                const std::string cr_str{cr.data()};
+                return sax->parse_error(element_type_parse_position, cr_str,
+                                        parse_error::create(114, element_type_parse_position, concat("Unsupported BSON record type 0x", cr_str), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @brief Read a BSON element list (as specified in the BSON-spec)
+
+    The same binary layout is used for objects and arrays, hence it must be
+    indicated with the argument @a is_array which one is expected
+    (true --> array, false --> object).
+
+    @param[in] is_array Determines if the element list being read is to be
+                        treated as an object (@a is_array == false), or as an
+                        array (@a is_array == true).
+    @return whether a valid BSON-object/array was passed to the SAX parser
+    */
+    bool parse_bson_element_list(const bool is_array)
+    {
+        string_t key;
+
+        while (auto element_type = get())
+        {
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "element list")))
+            {
+                return false;
+            }
+
+            const std::size_t element_type_parse_position = chars_read;
+            if (JSON_HEDLEY_UNLIKELY(!get_bson_cstr(key)))
+            {
+                return false;
+            }
+
+            if (!is_array && !sax->key(key))
+            {
+                return false;
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_internal(element_type, element_type_parse_position)))
+            {
+                return false;
+            }
+
+            // get_bson_cstr only appends
+            key.clear();
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief Reads an array from the BSON input and passes it to the SAX-parser.
+    @return whether a valid BSON-array was passed to the SAX parser
+    */
+    bool parse_bson_array()
+    {
+        std::int32_t document_size{};
+        get_number<std::int32_t, true>(input_format_t::bson, document_size);
+
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(static_cast<std::size_t>(-1))))
+        {
+            return false;
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/true)))
+        {
+            return false;
+        }
+
+        return sax->end_array();
+    }
+
+    //////////
+    // CBOR //
+    //////////
+
+    /*!
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true) or whether the last read character should
+                         be considered instead (false)
+    @param[in] tag_handler how CBOR tags should be treated
+
+    @return whether a valid CBOR value was passed to the SAX parser
+    */
+    bool parse_cbor_internal(const bool get_char,
+                             const cbor_tag_handler_t tag_handler)
+    {
+        switch (get_char ? get() : current)
+        {
+            // EOF
+            case char_traits<char_type>::eof():
+                return unexpect_eof(input_format_t::cbor, "value");
+
+            // Integer 0x00..0x17 (0..23)
+            case 0x00:
+            case 0x01:
+            case 0x02:
+            case 0x03:
+            case 0x04:
+            case 0x05:
+            case 0x06:
+            case 0x07:
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x0B:
+            case 0x0C:
+            case 0x0D:
+            case 0x0E:
+            case 0x0F:
+            case 0x10:
+            case 0x11:
+            case 0x12:
+            case 0x13:
+            case 0x14:
+            case 0x15:
+            case 0x16:
+            case 0x17:
+                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
+
+            case 0x18: // Unsigned integer (one-byte uint8_t follows)
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            case 0x19: // Unsigned integer (two-byte uint16_t follows)
+            {
+                std::uint16_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            case 0x1A: // Unsigned integer (four-byte uint32_t follows)
+            {
+                std::uint32_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            case 0x1B: // Unsigned integer (eight-byte uint64_t follows)
+            {
+                std::uint64_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            // Negative integer -1-0x00..-1-0x17 (-1..-24)
+            case 0x20:
+            case 0x21:
+            case 0x22:
+            case 0x23:
+            case 0x24:
+            case 0x25:
+            case 0x26:
+            case 0x27:
+            case 0x28:
+            case 0x29:
+            case 0x2A:
+            case 0x2B:
+            case 0x2C:
+            case 0x2D:
+            case 0x2E:
+            case 0x2F:
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+                return sax->number_integer(static_cast<std::int8_t>(0x20 - 1 - current));
+
+            case 0x38: // Negative integer (one-byte uint8_t follows)
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
+            {
+                std::uint16_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x3A: // Negative integer -1-n (four-byte uint32_t follows)
+            {
+                std::uint32_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x3B: // Negative integer -1-n (eight-byte uint64_t follows)
+            {
+                std::uint64_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1)
+                        - static_cast<number_integer_t>(number));
+            }
+
+            // Binary data (0x00..0x17 bytes follow)
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            case 0x58: // Binary data (one-byte uint8_t for n follows)
+            case 0x59: // Binary data (two-byte uint16_t for n follow)
+            case 0x5A: // Binary data (four-byte uint32_t for n follow)
+            case 0x5B: // Binary data (eight-byte uint64_t for n follow)
+            case 0x5F: // Binary data (indefinite length)
+            {
+                binary_t b;
+                return get_cbor_binary(b) && sax->binary(b);
+            }
+
+            // UTF-8 string (0x00..0x17 bytes follow)
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
+            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+            case 0x7F: // UTF-8 string (indefinite length)
+            {
+                string_t s;
+                return get_cbor_string(s) && sax->string(s);
+            }
+
+            // array (0x00..0x17 data items follow)
+            case 0x80:
+            case 0x81:
+            case 0x82:
+            case 0x83:
+            case 0x84:
+            case 0x85:
+            case 0x86:
+            case 0x87:
+            case 0x88:
+            case 0x89:
+            case 0x8A:
+            case 0x8B:
+            case 0x8C:
+            case 0x8D:
+            case 0x8E:
+            case 0x8F:
+            case 0x90:
+            case 0x91:
+            case 0x92:
+            case 0x93:
+            case 0x94:
+            case 0x95:
+            case 0x96:
+            case 0x97:
+                return get_cbor_array(
+                           conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
+
+            case 0x98: // array (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x99: // array (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x9A: // array (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(conditional_static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x9B: // array (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(conditional_static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x9F: // array (indefinite length)
+                return get_cbor_array(static_cast<std::size_t>(-1), tag_handler);
+
+            // map (0x00..0x17 pairs of data items follow)
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+                return get_cbor_object(conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
+
+            case 0xB8: // map (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xB9: // map (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xBA: // map (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(conditional_static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xBB: // map (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(conditional_static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xBF: // map (indefinite length)
+                return get_cbor_object(static_cast<std::size_t>(-1), tag_handler);
+
+            case 0xC6: // tagged item
+            case 0xC7:
+            case 0xC8:
+            case 0xC9:
+            case 0xCA:
+            case 0xCB:
+            case 0xCC:
+            case 0xCD:
+            case 0xCE:
+            case 0xCF:
+            case 0xD0:
+            case 0xD1:
+            case 0xD2:
+            case 0xD3:
+            case 0xD4:
+            case 0xD8: // tagged item (1 bytes follow)
+            case 0xD9: // tagged item (2 bytes follow)
+            case 0xDA: // tagged item (4 bytes follow)
+            case 0xDB: // tagged item (8 bytes follow)
+            {
+                switch (tag_handler)
+                {
+                    case cbor_tag_handler_t::error:
+                    {
+                        auto last_token = get_token_string();
+                        return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                                exception_message(input_format_t::cbor, concat("invalid byte: 0x", last_token), "value"), nullptr));
+                    }
+
+                    case cbor_tag_handler_t::ignore:
+                    {
+                        // ignore binary subtype
+                        switch (current)
+                        {
+                            case 0xD8:
+                            {
+                                std::uint8_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
+                                break;
+                            }
+                            case 0xD9:
+                            {
+                                std::uint16_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
+                                break;
+                            }
+                            case 0xDA:
+                            {
+                                std::uint32_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
+                                break;
+                            }
+                            case 0xDB:
+                            {
+                                std::uint64_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
+                                break;
+                            }
+                            default:
+                                break;
+                        }
+                        return parse_cbor_internal(true, tag_handler);
+                    }
+
+                    case cbor_tag_handler_t::store:
+                    {
+                        binary_t b;
+                        // use binary subtype and store in binary container
+                        switch (current)
+                        {
+                            case 0xD8:
+                            {
+                                std::uint8_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            case 0xD9:
+                            {
+                                std::uint16_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            case 0xDA:
+                            {
+                                std::uint32_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            case 0xDB:
+                            {
+                                std::uint64_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            default:
+                                return parse_cbor_internal(true, tag_handler);
+                        }
+                        get();
+                        return get_cbor_binary(b) && sax->binary(b);
+                    }
+
+                    default:                 // LCOV_EXCL_LINE
+                        JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+                        return false;        // LCOV_EXCL_LINE
+                }
+            }
+
+            case 0xF4: // false
+                return sax->boolean(false);
+
+            case 0xF5: // true
+                return sax->boolean(true);
+
+            case 0xF6: // null
+                return sax->null();
+
+            case 0xF9: // Half-Precision Float (two-byte IEEE 754)
+            {
+                const auto byte1_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number")))
+                {
+                    return false;
+                }
+                const auto byte2_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number")))
+                {
+                    return false;
+                }
+
+                const auto byte1 = static_cast<unsigned char>(byte1_raw);
+                const auto byte2 = static_cast<unsigned char>(byte2_raw);
+
+                // code from RFC 7049, Appendix D, Figure 3:
+                // As half-precision floating-point numbers were only added
+                // to IEEE 754 in 2008, today's programming platforms often
+                // still only have limited support for them. It is very
+                // easy to include at least decoding support for them even
+                // without such support. An example of a small decoder for
+                // half-precision floating-point numbers in the C language
+                // is shown in Fig. 3.
+                const auto half = static_cast<unsigned int>((byte1 << 8u) + byte2);
+                const double val = [&half]
+                {
+                    const int exp = (half >> 10u) & 0x1Fu;
+                    const unsigned int mant = half & 0x3FFu;
+                    JSON_ASSERT(0 <= exp&& exp <= 32);
+                    JSON_ASSERT(mant <= 1024);
+                    switch (exp)
+                    {
+                        case 0:
+                            return std::ldexp(mant, -24);
+                        case 31:
+                            return (mant == 0)
+                            ? std::numeric_limits<double>::infinity()
+                            : std::numeric_limits<double>::quiet_NaN();
+                        default:
+                            return std::ldexp(mant + 1024, exp - 25);
+                    }
+                }();
+                return sax->number_float((half & 0x8000u) != 0
+                                         ? static_cast<number_float_t>(-val)
+                                         : static_cast<number_float_t>(val), "");
+            }
+
+            case 0xFA: // Single-Precision Float (four-byte IEEE 754)
+            {
+                float number{};
+                return get_number(input_format_t::cbor, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xFB: // Double-Precision Float (eight-byte IEEE 754)
+            {
+                double number{};
+                return get_number(input_format_t::cbor, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            default: // anything else (0xFF is handled inside the other types)
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format_t::cbor, concat("invalid byte: 0x", last_token), "value"), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a CBOR string
+
+    This function first reads starting bytes to determine the expected
+    string length and then copies this number of bytes into a string.
+    Additionally, CBOR's strings with indefinite lengths are supported.
+
+    @param[out] result  created string
+
+    @return whether string creation completed
+    */
+    bool get_cbor_string(string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "string")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // UTF-8 string (0x00..0x17 bytes follow)
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            {
+                return get_string(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7F: // UTF-8 string (indefinite length)
+            {
+                while (get() != 0xFF)
+                {
+                    string_t chunk;
+                    if (!get_cbor_string(chunk))
+                    {
+                        return false;
+                    }
+                    result.append(chunk);
+                }
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                        exception_message(input_format_t::cbor, concat("expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x", last_token), "string"), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a CBOR byte array
+
+    This function first reads starting bytes to determine the expected
+    byte array length and then copies this number of bytes into the byte array.
+    Additionally, CBOR's byte arrays with indefinite lengths are supported.
+
+    @param[out] result  created byte array
+
+    @return whether byte array creation completed
+    */
+    bool get_cbor_binary(binary_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "binary")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // Binary data (0x00..0x17 bytes follow)
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            {
+                return get_binary(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0x58: // Binary data (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x59: // Binary data (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x5A: // Binary data (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x5B: // Binary data (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x5F: // Binary data (indefinite length)
+            {
+                while (get() != 0xFF)
+                {
+                    binary_t chunk;
+                    if (!get_cbor_binary(chunk))
+                    {
+                        return false;
+                    }
+                    result.insert(result.end(), chunk.begin(), chunk.end());
+                }
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                        exception_message(input_format_t::cbor, concat("expected length specification (0x40-0x5B) or indefinite binary array type (0x5F); last byte: 0x", last_token), "binary"), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @param[in] len  the length of the array or static_cast<std::size_t>(-1) for an
+                    array of indefinite size
+    @param[in] tag_handler how CBOR tags should be treated
+    @return whether array creation completed
+    */
+    bool get_cbor_array(const std::size_t len,
+                        const cbor_tag_handler_t tag_handler)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len)))
+        {
+            return false;
+        }
+
+        if (len != static_cast<std::size_t>(-1))
+        {
+            for (std::size_t i = 0; i < len; ++i)
+            {
+                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                {
+                    return false;
+                }
+            }
+        }
+        else
+        {
+            while (get() != 0xFF)
+            {
+                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(false, tag_handler)))
+                {
+                    return false;
+                }
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @param[in] len  the length of the object or static_cast<std::size_t>(-1) for an
+                    object of indefinite size
+    @param[in] tag_handler how CBOR tags should be treated
+    @return whether object creation completed
+    */
+    bool get_cbor_object(const std::size_t len,
+                         const cbor_tag_handler_t tag_handler)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len)))
+        {
+            return false;
+        }
+
+        if (len != 0)
+        {
+            string_t key;
+            if (len != static_cast<std::size_t>(-1))
+            {
+                for (std::size_t i = 0; i < len; ++i)
+                {
+                    get();
+                    if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+
+                    if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+            else
+            {
+                while (get() != 0xFF)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+
+                    if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+        }
+
+        return sax->end_object();
+    }
+
+    /////////////
+    // MsgPack //
+    /////////////
+
+    /*!
+    @return whether a valid MessagePack value was passed to the SAX parser
+    */
+    bool parse_msgpack_internal()
+    {
+        switch (get())
+        {
+            // EOF
+            case char_traits<char_type>::eof():
+                return unexpect_eof(input_format_t::msgpack, "value");
+
+            // positive fixint
+            case 0x00:
+            case 0x01:
+            case 0x02:
+            case 0x03:
+            case 0x04:
+            case 0x05:
+            case 0x06:
+            case 0x07:
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x0B:
+            case 0x0C:
+            case 0x0D:
+            case 0x0E:
+            case 0x0F:
+            case 0x10:
+            case 0x11:
+            case 0x12:
+            case 0x13:
+            case 0x14:
+            case 0x15:
+            case 0x16:
+            case 0x17:
+            case 0x18:
+            case 0x19:
+            case 0x1A:
+            case 0x1B:
+            case 0x1C:
+            case 0x1D:
+            case 0x1E:
+            case 0x1F:
+            case 0x20:
+            case 0x21:
+            case 0x22:
+            case 0x23:
+            case 0x24:
+            case 0x25:
+            case 0x26:
+            case 0x27:
+            case 0x28:
+            case 0x29:
+            case 0x2A:
+            case 0x2B:
+            case 0x2C:
+            case 0x2D:
+            case 0x2E:
+            case 0x2F:
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+            case 0x38:
+            case 0x39:
+            case 0x3A:
+            case 0x3B:
+            case 0x3C:
+            case 0x3D:
+            case 0x3E:
+            case 0x3F:
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            case 0x58:
+            case 0x59:
+            case 0x5A:
+            case 0x5B:
+            case 0x5C:
+            case 0x5D:
+            case 0x5E:
+            case 0x5F:
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            case 0x78:
+            case 0x79:
+            case 0x7A:
+            case 0x7B:
+            case 0x7C:
+            case 0x7D:
+            case 0x7E:
+            case 0x7F:
+                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
+
+            // fixmap
+            case 0x80:
+            case 0x81:
+            case 0x82:
+            case 0x83:
+            case 0x84:
+            case 0x85:
+            case 0x86:
+            case 0x87:
+            case 0x88:
+            case 0x89:
+            case 0x8A:
+            case 0x8B:
+            case 0x8C:
+            case 0x8D:
+            case 0x8E:
+            case 0x8F:
+                return get_msgpack_object(conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+
+            // fixarray
+            case 0x90:
+            case 0x91:
+            case 0x92:
+            case 0x93:
+            case 0x94:
+            case 0x95:
+            case 0x96:
+            case 0x97:
+            case 0x98:
+            case 0x99:
+            case 0x9A:
+            case 0x9B:
+            case 0x9C:
+            case 0x9D:
+            case 0x9E:
+            case 0x9F:
+                return get_msgpack_array(conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+
+            // fixstr
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+            case 0xB8:
+            case 0xB9:
+            case 0xBA:
+            case 0xBB:
+            case 0xBC:
+            case 0xBD:
+            case 0xBE:
+            case 0xBF:
+            case 0xD9: // str 8
+            case 0xDA: // str 16
+            case 0xDB: // str 32
+            {
+                string_t s;
+                return get_msgpack_string(s) && sax->string(s);
+            }
+
+            case 0xC0: // nil
+                return sax->null();
+
+            case 0xC2: // false
+                return sax->boolean(false);
+
+            case 0xC3: // true
+                return sax->boolean(true);
+
+            case 0xC4: // bin 8
+            case 0xC5: // bin 16
+            case 0xC6: // bin 32
+            case 0xC7: // ext 8
+            case 0xC8: // ext 16
+            case 0xC9: // ext 32
+            case 0xD4: // fixext 1
+            case 0xD5: // fixext 2
+            case 0xD6: // fixext 4
+            case 0xD7: // fixext 8
+            case 0xD8: // fixext 16
+            {
+                binary_t b;
+                return get_msgpack_binary(b) && sax->binary(b);
+            }
+
+            case 0xCA: // float 32
+            {
+                float number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xCB: // float 64
+            {
+                double number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xCC: // uint 8
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xCD: // uint 16
+            {
+                std::uint16_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xCE: // uint 32
+            {
+                std::uint32_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xCF: // uint 64
+            {
+                std::uint64_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xD0: // int 8
+            {
+                std::int8_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xD1: // int 16
+            {
+                std::int16_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xD2: // int 32
+            {
+                std::int32_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xD3: // int 64
+            {
+                std::int64_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xDC: // array 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_array(static_cast<std::size_t>(len));
+            }
+
+            case 0xDD: // array 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_array(conditional_static_cast<std::size_t>(len));
+            }
+
+            case 0xDE: // map 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_object(static_cast<std::size_t>(len));
+            }
+
+            case 0xDF: // map 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_object(conditional_static_cast<std::size_t>(len));
+            }
+
+            // negative fixint
+            case 0xE0:
+            case 0xE1:
+            case 0xE2:
+            case 0xE3:
+            case 0xE4:
+            case 0xE5:
+            case 0xE6:
+            case 0xE7:
+            case 0xE8:
+            case 0xE9:
+            case 0xEA:
+            case 0xEB:
+            case 0xEC:
+            case 0xED:
+            case 0xEE:
+            case 0xEF:
+            case 0xF0:
+            case 0xF1:
+            case 0xF2:
+            case 0xF3:
+            case 0xF4:
+            case 0xF5:
+            case 0xF6:
+            case 0xF7:
+            case 0xF8:
+            case 0xF9:
+            case 0xFA:
+            case 0xFB:
+            case 0xFC:
+            case 0xFD:
+            case 0xFE:
+            case 0xFF:
+                return sax->number_integer(static_cast<std::int8_t>(current));
+
+            default: // anything else
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format_t::msgpack, concat("invalid byte: 0x", last_token), "value"), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a MessagePack string
+
+    This function first reads starting bytes to determine the expected
+    string length and then copies this number of bytes into a string.
+
+    @param[out] result  created string
+
+    @return whether string creation completed
+    */
+    bool get_msgpack_string(string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::msgpack, "string")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // fixstr
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+            case 0xB8:
+            case 0xB9:
+            case 0xBA:
+            case 0xBB:
+            case 0xBC:
+            case 0xBD:
+            case 0xBE:
+            case 0xBF:
+            {
+                return get_string(input_format_t::msgpack, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0xD9: // str 8
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
+            }
+
+            case 0xDA: // str 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
+            }
+
+            case 0xDB: // str 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                        exception_message(input_format_t::msgpack, concat("expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x", last_token), "string"), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a MessagePack byte array
+
+    This function first reads starting bytes to determine the expected
+    byte array length and then copies this number of bytes into a byte array.
+
+    @param[out] result  created byte array
+
+    @return whether byte array creation completed
+    */
+    bool get_msgpack_binary(binary_t& result)
+    {
+        // helper function to set the subtype
+        auto assign_and_return_true = [&result](std::int8_t subtype)
+        {
+            result.set_subtype(static_cast<std::uint8_t>(subtype));
+            return true;
+        };
+
+        switch (current)
+        {
+            case 0xC4: // bin 8
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_binary(input_format_t::msgpack, len, result);
+            }
+
+            case 0xC5: // bin 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_binary(input_format_t::msgpack, len, result);
+            }
+
+            case 0xC6: // bin 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_binary(input_format_t::msgpack, len, result);
+            }
+
+            case 0xC7: // ext 8
+            {
+                std::uint8_t len{};
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, len, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xC8: // ext 16
+            {
+                std::uint16_t len{};
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, len, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xC9: // ext 32
+            {
+                std::uint32_t len{};
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, len, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD4: // fixext 1
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 1, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD5: // fixext 2
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 2, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD6: // fixext 4
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 4, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD7: // fixext 8
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 8, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD8: // fixext 16
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 16, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            default:           // LCOV_EXCL_LINE
+                return false;  // LCOV_EXCL_LINE
+        }
+    }
+
+    /*!
+    @param[in] len  the length of the array
+    @return whether array creation completed
+    */
+    bool get_msgpack_array(const std::size_t len)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len)))
+        {
+            return false;
+        }
+
+        for (std::size_t i = 0; i < len; ++i)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal()))
+            {
+                return false;
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @param[in] len  the length of the object
+    @return whether object creation completed
+    */
+    bool get_msgpack_object(const std::size_t len)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len)))
+        {
+            return false;
+        }
+
+        string_t key;
+        for (std::size_t i = 0; i < len; ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!get_msgpack_string(key) || !sax->key(key)))
+            {
+                return false;
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal()))
+            {
+                return false;
+            }
+            key.clear();
+        }
+
+        return sax->end_object();
+    }
+
+    ////////////
+    // UBJSON //
+    ////////////
+
+    /*!
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether a valid UBJSON value was passed to the SAX parser
+    */
+    bool parse_ubjson_internal(const bool get_char = true)
+    {
+        return get_ubjson_value(get_char ? get_ignore_noop() : current);
+    }
+
+    /*!
+    @brief reads a UBJSON string
+
+    This function is either called after reading the 'S' byte explicitly
+    indicating a string, or in case of an object key where the 'S' byte can be
+    left out.
+
+    @param[out] result   created string
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether string creation completed
+    */
+    bool get_ubjson_string(string_t& result, const bool get_char = true)
+    {
+        if (get_char)
+        {
+            get();  // TODO(niels): may we ignore N here?
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "value")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            case 'U':
+            {
+                std::uint8_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'i':
+            {
+                std::int8_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'I':
+            {
+                std::int16_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'l':
+            {
+                std::int32_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'L':
+            {
+                std::int64_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'u':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint16_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'm':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint32_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'M':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint64_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            default:
+                break;
+        }
+        auto last_token = get_token_string();
+        std::string message;
+
+        if (input_format != input_format_t::bjdata)
+        {
+            message = "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token;
+        }
+        else
+        {
+            message = "expected length type specification (U, i, u, I, m, l, M, L); last byte: 0x" + last_token;
+        }
+        return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format, message, "string"), nullptr));
+    }
+
+    /*!
+    @param[out] dim  an integer vector storing the ND array dimensions
+    @return whether reading ND array size vector is successful
+    */
+    bool get_ubjson_ndarray_size(std::vector<size_t>& dim)
+    {
+        std::pair<std::size_t, char_int_type> size_and_type;
+        size_t dimlen = 0;
+        bool no_ndarray = true;
+
+        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type, no_ndarray)))
+        {
+            return false;
+        }
+
+        if (size_and_type.first != npos)
+        {
+            if (size_and_type.second != 0)
+            {
+                if (size_and_type.second != 'N')
+                {
+                    for (std::size_t i = 0; i < size_and_type.first; ++i)
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_value(dimlen, no_ndarray, size_and_type.second)))
+                        {
+                            return false;
+                        }
+                        dim.push_back(dimlen);
+                    }
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_value(dimlen, no_ndarray)))
+                    {
+                        return false;
+                    }
+                    dim.push_back(dimlen);
+                }
+            }
+        }
+        else
+        {
+            while (current != ']')
+            {
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_value(dimlen, no_ndarray, current)))
+                {
+                    return false;
+                }
+                dim.push_back(dimlen);
+                get_ignore_noop();
+            }
+        }
+        return true;
+    }
+
+    /*!
+    @param[out] result  determined size
+    @param[in,out] is_ndarray  for input, `true` means already inside an ndarray vector
+                               or ndarray dimension is not allowed; `false` means ndarray
+                               is allowed; for output, `true` means an ndarray is found;
+                               is_ndarray can only return `true` when its initial value
+                               is `false`
+    @param[in] prefix  type marker if already read, otherwise set to 0
+
+    @return whether size determination completed
+    */
+    bool get_ubjson_size_value(std::size_t& result, bool& is_ndarray, char_int_type prefix = 0)
+    {
+        if (prefix == 0)
+        {
+            prefix = get_ignore_noop();
+        }
+
+        switch (prefix)
+        {
+            case 'U':
+            {
+                std::uint8_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'i':
+            {
+                std::int8_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
+                result = static_cast<std::size_t>(number); // NOLINT(bugprone-signed-char-misuse,cert-str34-c): number is not a char
+                return true;
+            }
+
+            case 'I':
+            {
+                std::int16_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'l':
+            {
+                std::int32_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'L':
+            {
+                std::int64_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
+                if (!value_in_range_of<std::size_t>(number))
+                {
+                    return sax->parse_error(chars_read, get_token_string(), out_of_range::create(408,
+                                            exception_message(input_format, "integer value overflow", "size"), nullptr));
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'u':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint16_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'm':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint32_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                result = conditional_static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'M':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint64_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (!value_in_range_of<std::size_t>(number))
+                {
+                    return sax->parse_error(chars_read, get_token_string(), out_of_range::create(408,
+                                            exception_message(input_format, "integer value overflow", "size"), nullptr));
+                }
+                result = detail::conditional_static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case '[':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                if (is_ndarray) // ndarray dimensional vector can only contain integers, and can not embed another array
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read, exception_message(input_format, "ndarray dimensional vector is not allowed", "size"), nullptr));
+                }
+                std::vector<size_t> dim;
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_ndarray_size(dim)))
+                {
+                    return false;
+                }
+                if (dim.size() == 1 || (dim.size() == 2 && dim.at(0) == 1)) // return normal array size if 1D row vector
+                {
+                    result = dim.at(dim.size() - 1);
+                    return true;
+                }
+                if (!dim.empty())  // if ndarray, convert to an object in JData annotated array format
+                {
+                    for (auto i : dim) // test if any dimension in an ndarray is 0, if so, return a 1D empty container
+                    {
+                        if ( i == 0 )
+                        {
+                            result = 0;
+                            return true;
+                        }
+                    }
+
+                    string_t key = "_ArraySize_";
+                    if (JSON_HEDLEY_UNLIKELY(!sax->start_object(3) || !sax->key(key) || !sax->start_array(dim.size())))
+                    {
+                        return false;
+                    }
+                    result = 1;
+                    for (auto i : dim)
+                    {
+                        result *= i;
+                        if (result == 0 || result == npos) // because dim elements shall not have zeros, result = 0 means overflow happened; it also can't be npos as it is used to initialize size in get_ubjson_size_type()
+                        {
+                            return sax->parse_error(chars_read, get_token_string(), out_of_range::create(408, exception_message(input_format, "excessive ndarray size caused overflow", "size"), nullptr));
+                        }
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_unsigned(static_cast<number_unsigned_t>(i))))
+                        {
+                            return false;
+                        }
+                    }
+                    is_ndarray = true;
+                    return sax->end_array();
+                }
+                result = 0;
+                return true;
+            }
+
+            default:
+                break;
+        }
+        auto last_token = get_token_string();
+        std::string message;
+
+        if (input_format != input_format_t::bjdata)
+        {
+            message = "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token;
+        }
+        else
+        {
+            message = "expected length type specification (U, i, u, I, m, l, M, L) after '#'; last byte: 0x" + last_token;
+        }
+        return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format, message, "size"), nullptr));
+    }
+
+    /*!
+    @brief determine the type and size for a container
+
+    In the optimized UBJSON format, a type and a size can be provided to allow
+    for a more compact representation.
+
+    @param[out] result  pair of the size and the type
+    @param[in] inside_ndarray  whether the parser is parsing an ND array dimensional vector
+
+    @return whether pair creation completed
+    */
+    bool get_ubjson_size_type(std::pair<std::size_t, char_int_type>& result, bool inside_ndarray = false)
+    {
+        result.first = npos; // size
+        result.second = 0; // type
+        bool is_ndarray = false;
+
+        get_ignore_noop();
+
+        if (current == '$')
+        {
+            result.second = get();  // must not ignore 'N', because 'N' maybe the type
+            if (input_format == input_format_t::bjdata
+                    && JSON_HEDLEY_UNLIKELY(std::binary_search(bjd_optimized_type_markers.begin(), bjd_optimized_type_markers.end(), result.second)))
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format, concat("marker 0x", last_token, " is not a permitted optimized array type"), "type"), nullptr));
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "type")))
+            {
+                return false;
+            }
+
+            get_ignore_noop();
+            if (JSON_HEDLEY_UNLIKELY(current != '#'))
+            {
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "value")))
+                {
+                    return false;
+                }
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format, concat("expected '#' after type information; last byte: 0x", last_token), "size"), nullptr));
+            }
+
+            const bool is_error = get_ubjson_size_value(result.first, is_ndarray);
+            if (input_format == input_format_t::bjdata && is_ndarray)
+            {
+                if (inside_ndarray)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(112, chars_read,
+                                            exception_message(input_format, "ndarray can not be recursive", "size"), nullptr));
+                }
+                result.second |= (1 << 8); // use bit 8 to indicate ndarray, all UBJSON and BJData markers should be ASCII letters
+            }
+            return is_error;
+        }
+
+        if (current == '#')
+        {
+            const bool is_error = get_ubjson_size_value(result.first, is_ndarray);
+            if (input_format == input_format_t::bjdata && is_ndarray)
+            {
+                return sax->parse_error(chars_read, get_token_string(), parse_error::create(112, chars_read,
+                                        exception_message(input_format, "ndarray requires both type and size", "size"), nullptr));
+            }
+            return is_error;
+        }
+
+        return true;
+    }
+
+    /*!
+    @param prefix  the previously read or set type prefix
+    @return whether value creation completed
+    */
+    bool get_ubjson_value(const char_int_type prefix)
+    {
+        switch (prefix)
+        {
+            case char_traits<char_type>::eof():  // EOF
+                return unexpect_eof(input_format, "value");
+
+            case 'T':  // true
+                return sax->boolean(true);
+            case 'F':  // false
+                return sax->boolean(false);
+
+            case 'Z':  // null
+                return sax->null();
+
+            case 'U':
+            {
+                std::uint8_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'i':
+            {
+                std::int8_t number{};
+                return get_number(input_format, number) && sax->number_integer(number);
+            }
+
+            case 'I':
+            {
+                std::int16_t number{};
+                return get_number(input_format, number) && sax->number_integer(number);
+            }
+
+            case 'l':
+            {
+                std::int32_t number{};
+                return get_number(input_format, number) && sax->number_integer(number);
+            }
+
+            case 'L':
+            {
+                std::int64_t number{};
+                return get_number(input_format, number) && sax->number_integer(number);
+            }
+
+            case 'u':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint16_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'm':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint32_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'M':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint64_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'h':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                const auto byte1_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "number")))
+                {
+                    return false;
+                }
+                const auto byte2_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "number")))
+                {
+                    return false;
+                }
+
+                const auto byte1 = static_cast<unsigned char>(byte1_raw);
+                const auto byte2 = static_cast<unsigned char>(byte2_raw);
+
+                // code from RFC 7049, Appendix D, Figure 3:
+                // As half-precision floating-point numbers were only added
+                // to IEEE 754 in 2008, today's programming platforms often
+                // still only have limited support for them. It is very
+                // easy to include at least decoding support for them even
+                // without such support. An example of a small decoder for
+                // half-precision floating-point numbers in the C language
+                // is shown in Fig. 3.
+                const auto half = static_cast<unsigned int>((byte2 << 8u) + byte1);
+                const double val = [&half]
+                {
+                    const int exp = (half >> 10u) & 0x1Fu;
+                    const unsigned int mant = half & 0x3FFu;
+                    JSON_ASSERT(0 <= exp&& exp <= 32);
+                    JSON_ASSERT(mant <= 1024);
+                    switch (exp)
+                    {
+                        case 0:
+                            return std::ldexp(mant, -24);
+                        case 31:
+                            return (mant == 0)
+                            ? std::numeric_limits<double>::infinity()
+                            : std::numeric_limits<double>::quiet_NaN();
+                        default:
+                            return std::ldexp(mant + 1024, exp - 25);
+                    }
+                }();
+                return sax->number_float((half & 0x8000u) != 0
+                                         ? static_cast<number_float_t>(-val)
+                                         : static_cast<number_float_t>(val), "");
+            }
+
+            case 'd':
+            {
+                float number{};
+                return get_number(input_format, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 'D':
+            {
+                double number{};
+                return get_number(input_format, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 'H':
+            {
+                return get_ubjson_high_precision_number();
+            }
+
+            case 'C':  // char
+            {
+                get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "char")))
+                {
+                    return false;
+                }
+                if (JSON_HEDLEY_UNLIKELY(current > 127))
+                {
+                    auto last_token = get_token_string();
+                    return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                            exception_message(input_format, concat("byte after 'C' must be in range 0x00..0x7F; last byte: 0x", last_token), "char"), nullptr));
+                }
+                string_t s(1, static_cast<typename string_t::value_type>(current));
+                return sax->string(s);
+            }
+
+            case 'S':  // string
+            {
+                string_t s;
+                return get_ubjson_string(s) && sax->string(s);
+            }
+
+            case '[':  // array
+                return get_ubjson_array();
+
+            case '{':  // object
+                return get_ubjson_object();
+
+            default: // anything else
+                break;
+        }
+        auto last_token = get_token_string();
+        return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format, "invalid byte: 0x" + last_token, "value"), nullptr));
+    }
+
+    /*!
+    @return whether array creation completed
+    */
+    bool get_ubjson_array()
+    {
+        std::pair<std::size_t, char_int_type> size_and_type;
+        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type)))
+        {
+            return false;
+        }
+
+        // if bit-8 of size_and_type.second is set to 1, encode bjdata ndarray as an object in JData annotated array format (https://github.com/NeuroJSON/jdata):
+        // {"_ArrayType_" : "typeid", "_ArraySize_" : [n1, n2, ...], "_ArrayData_" : [v1, v2, ...]}
+
+        if (input_format == input_format_t::bjdata && size_and_type.first != npos && (size_and_type.second & (1 << 8)) != 0)
+        {
+            size_and_type.second &= ~(static_cast<char_int_type>(1) << 8);  // use bit 8 to indicate ndarray, here we remove the bit to restore the type marker
+            auto it = std::lower_bound(bjd_types_map.begin(), bjd_types_map.end(), size_and_type.second, [](const bjd_type & p, char_int_type t)
+            {
+                return p.first < t;
+            });
+            string_t key = "_ArrayType_";
+            if (JSON_HEDLEY_UNLIKELY(it == bjd_types_map.end() || it->first != size_and_type.second))
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format, "invalid byte: 0x" + last_token, "type"), nullptr));
+            }
+
+            string_t type = it->second; // sax->string() takes a reference
+            if (JSON_HEDLEY_UNLIKELY(!sax->key(key) || !sax->string(type)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second == 'C')
+            {
+                size_and_type.second = 'U';
+            }
+
+            key = "_ArrayData_";
+            if (JSON_HEDLEY_UNLIKELY(!sax->key(key) || !sax->start_array(size_and_type.first) ))
+            {
+                return false;
+            }
+
+            for (std::size_t i = 0; i < size_and_type.first; ++i)
+            {
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
+                {
+                    return false;
+                }
+            }
+
+            return (sax->end_array() && sax->end_object());
+        }
+
+        if (size_and_type.first != npos)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(size_and_type.first)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second != 0)
+            {
+                if (size_and_type.second != 'N')
+                {
+                    for (std::size_t i = 0; i < size_and_type.first; ++i)
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
+                    {
+                        return false;
+                    }
+                }
+            }
+        }
+        else
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(static_cast<std::size_t>(-1))))
+            {
+                return false;
+            }
+
+            while (current != ']')
+            {
+                if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal(false)))
+                {
+                    return false;
+                }
+                get_ignore_noop();
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @return whether object creation completed
+    */
+    bool get_ubjson_object()
+    {
+        std::pair<std::size_t, char_int_type> size_and_type;
+        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type)))
+        {
+            return false;
+        }
+
+        // do not accept ND-array size in objects in BJData
+        if (input_format == input_format_t::bjdata && size_and_type.first != npos && (size_and_type.second & (1 << 8)) != 0)
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                    exception_message(input_format, "BJData object does not support ND-array size in optimized format", "object"), nullptr));
+        }
+
+        string_t key;
+        if (size_and_type.first != npos)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(size_and_type.first)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second != 0)
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+        }
+        else
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(static_cast<std::size_t>(-1))))
+            {
+                return false;
+            }
+
+            while (current != '}')
+            {
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key, false) || !sax->key(key)))
+                {
+                    return false;
+                }
+                if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
+                {
+                    return false;
+                }
+                get_ignore_noop();
+                key.clear();
+            }
+        }
+
+        return sax->end_object();
+    }
+
+    // Note, no reader for UBJSON binary types is implemented because they do
+    // not exist
+
+    bool get_ubjson_high_precision_number()
+    {
+        // get size of following number string
+        std::size_t size{};
+        bool no_ndarray = true;
+        auto res = get_ubjson_size_value(size, no_ndarray);
+        if (JSON_HEDLEY_UNLIKELY(!res))
+        {
+            return res;
+        }
+
+        // get number string
+        std::vector<char> number_vector;
+        for (std::size_t i = 0; i < size; ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "number")))
+            {
+                return false;
+            }
+            number_vector.push_back(static_cast<char>(current));
+        }
+
+        // parse number string
+        using ia_type = decltype(detail::input_adapter(number_vector));
+        auto number_lexer = detail::lexer<BasicJsonType, ia_type>(detail::input_adapter(number_vector), false);
+        const auto result_number = number_lexer.scan();
+        const auto number_string = number_lexer.get_token_string();
+        const auto result_remainder = number_lexer.scan();
+
+        using token_type = typename detail::lexer_base<BasicJsonType>::token_type;
+
+        if (JSON_HEDLEY_UNLIKELY(result_remainder != token_type::end_of_input))
+        {
+            return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read,
+                                    exception_message(input_format, concat("invalid number text: ", number_lexer.get_token_string()), "high-precision number"), nullptr));
+        }
+
+        switch (result_number)
+        {
+            case token_type::value_integer:
+                return sax->number_integer(number_lexer.get_number_integer());
+            case token_type::value_unsigned:
+                return sax->number_unsigned(number_lexer.get_number_unsigned());
+            case token_type::value_float:
+                return sax->number_float(number_lexer.get_number_float(), std::move(number_string));
+            case token_type::uninitialized:
+            case token_type::literal_true:
+            case token_type::literal_false:
+            case token_type::literal_null:
+            case token_type::value_string:
+            case token_type::begin_array:
+            case token_type::begin_object:
+            case token_type::end_array:
+            case token_type::end_object:
+            case token_type::name_separator:
+            case token_type::value_separator:
+            case token_type::parse_error:
+            case token_type::end_of_input:
+            case token_type::literal_or_value:
+            default:
+                return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read,
+                                        exception_message(input_format, concat("invalid number text: ", number_lexer.get_token_string()), "high-precision number"), nullptr));
+        }
+    }
+
+    ///////////////////////
+    // Utility functions //
+    ///////////////////////
+
+    /*!
+    @brief get next character from the input
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns a -'ve valued
+    `char_traits<char_type>::eof()` in that case.
+
+    @return character read from the input
+    */
+    char_int_type get()
+    {
+        ++chars_read;
+        return current = ia.get_character();
+    }
+
+    /*!
+    @return character read from the input after ignoring all 'N' entries
+    */
+    char_int_type get_ignore_noop()
+    {
+        do
+        {
+            get();
+        }
+        while (current == 'N');
+
+        return current;
+    }
+
+    /*
+    @brief read a number from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format   the current format (for diagnostics)
+    @param[out] result  number of type @a NumberType
+
+    @return whether conversion completed
+
+    @note This function needs to respect the system's endianness, because
+          bytes in CBOR, MessagePack, and UBJSON are stored in network order
+          (big endian) and therefore need reordering on little endian systems.
+          On the other hand, BSON and BJData use little endian and should reorder
+          on big endian systems.
+    */
+    template<typename NumberType, bool InputIsLittleEndian = false>
+    bool get_number(const input_format_t format, NumberType& result)
+    {
+        // step 1: read input into array with system's byte order
+        std::array<std::uint8_t, sizeof(NumberType)> vec{};
+        for (std::size_t i = 0; i < sizeof(NumberType); ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "number")))
+            {
+                return false;
+            }
+
+            // reverse byte order prior to conversion if necessary
+            if (is_little_endian != (InputIsLittleEndian || format == input_format_t::bjdata))
+            {
+                vec[sizeof(NumberType) - i - 1] = static_cast<std::uint8_t>(current);
+            }
+            else
+            {
+                vec[i] = static_cast<std::uint8_t>(current); // LCOV_EXCL_LINE
+            }
+        }
+
+        // step 2: convert array into number of type T and return
+        std::memcpy(&result, vec.data(), sizeof(NumberType));
+        return true;
+    }
+
+    /*!
+    @brief create a string by reading characters from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format the current format (for diagnostics)
+    @param[in] len number of characters to read
+    @param[out] result string created by reading @a len bytes
+
+    @return whether string creation completed
+
+    @note We can not reserve @a len bytes for the result, because @a len
+          may be too large. Usually, @ref unexpect_eof() detects the end of
+          the input before we run out of string memory.
+    */
+    template<typename NumberType>
+    bool get_string(const input_format_t format,
+                    const NumberType len,
+                    string_t& result)
+    {
+        bool success = true;
+        for (NumberType i = 0; i < len; i++)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "string")))
+            {
+                success = false;
+                break;
+            }
+            result.push_back(static_cast<typename string_t::value_type>(current));
+        }
+        return success;
+    }
+
+    /*!
+    @brief create a byte array by reading bytes from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format the current format (for diagnostics)
+    @param[in] len number of bytes to read
+    @param[out] result byte array created by reading @a len bytes
+
+    @return whether byte array creation completed
+
+    @note We can not reserve @a len bytes for the result, because @a len
+          may be too large. Usually, @ref unexpect_eof() detects the end of
+          the input before we run out of memory.
+    */
+    template<typename NumberType>
+    bool get_binary(const input_format_t format,
+                    const NumberType len,
+                    binary_t& result)
+    {
+        bool success = true;
+        for (NumberType i = 0; i < len; i++)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "binary")))
+            {
+                success = false;
+                break;
+            }
+            result.push_back(static_cast<std::uint8_t>(current));
+        }
+        return success;
+    }
+
+    /*!
+    @param[in] format   the current format (for diagnostics)
+    @param[in] context  further context information (for diagnostics)
+    @return whether the last read character is not EOF
+    */
+    JSON_HEDLEY_NON_NULL(3)
+    bool unexpect_eof(const input_format_t format, const char* context) const
+    {
+        if (JSON_HEDLEY_UNLIKELY(current == char_traits<char_type>::eof()))
+        {
+            return sax->parse_error(chars_read, "<end of file>",
+                                    parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context), nullptr));
+        }
+        return true;
+    }
+
+    /*!
+    @return a string representation of the last read byte
+    */
+    std::string get_token_string() const
+    {
+        std::array<char, 3> cr{{}};
+        static_cast<void>((std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(current))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+        return std::string{cr.data()};
+    }
+
+    /*!
+    @param[in] format   the current format
+    @param[in] detail   a detailed error message
+    @param[in] context  further context information
+    @return a message string to use in the parse_error exceptions
+    */
+    std::string exception_message(const input_format_t format,
+                                  const std::string& detail,
+                                  const std::string& context) const
+    {
+        std::string error_msg = "syntax error while parsing ";
+
+        switch (format)
+        {
+            case input_format_t::cbor:
+                error_msg += "CBOR";
+                break;
+
+            case input_format_t::msgpack:
+                error_msg += "MessagePack";
+                break;
+
+            case input_format_t::ubjson:
+                error_msg += "UBJSON";
+                break;
+
+            case input_format_t::bson:
+                error_msg += "BSON";
+                break;
+
+            case input_format_t::bjdata:
+                error_msg += "BJData";
+                break;
+
+            case input_format_t::json: // LCOV_EXCL_LINE
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+
+        return concat(error_msg, ' ', context, ": ", detail);
+    }
+
+  private:
+    static JSON_INLINE_VARIABLE constexpr std::size_t npos = static_cast<std::size_t>(-1);
+
+    /// input adapter
+    InputAdapterType ia;
+
+    /// the current character
+    char_int_type current = char_traits<char_type>::eof();
+
+    /// the number of characters read
+    std::size_t chars_read = 0;
+
+    /// whether we can assume little endianness
+    const bool is_little_endian = little_endianness();
+
+    /// input format
+    const input_format_t input_format = input_format_t::json;
+
+    /// the SAX parser
+    json_sax_t* sax = nullptr;
+
+    // excluded markers in bjdata optimized type
+#define JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_ \
+    make_array<char_int_type>('F', 'H', 'N', 'S', 'T', 'Z', '[', '{')
+
+#define JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_ \
+    make_array<bjd_type>(                      \
+    bjd_type{'C', "char"},                     \
+    bjd_type{'D', "double"},                   \
+    bjd_type{'I', "int16"},                    \
+    bjd_type{'L', "int64"},                    \
+    bjd_type{'M', "uint64"},                   \
+    bjd_type{'U', "uint8"},                    \
+    bjd_type{'d', "single"},                   \
+    bjd_type{'i', "int8"},                     \
+    bjd_type{'l', "int32"},                    \
+    bjd_type{'m', "uint32"},                   \
+    bjd_type{'u', "uint16"})
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    // lookup tables
+    // NOLINTNEXTLINE(cppcoreguidelines-non-private-member-variables-in-classes)
+    const decltype(JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_) bjd_optimized_type_markers =
+        JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_;
+
+    using bjd_type = std::pair<char_int_type, string_t>;
+    // NOLINTNEXTLINE(cppcoreguidelines-non-private-member-variables-in-classes)
+    const decltype(JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_) bjd_types_map =
+        JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_;
+
+#undef JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_
+#undef JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_
+};
+
+#ifndef JSON_HAS_CPP_17
+    template<typename BasicJsonType, typename InputAdapterType, typename SAX>
+    constexpr std::size_t binary_reader<BasicJsonType, InputAdapterType, SAX>::npos;
+#endif
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+// #include <nlohmann/detail/input/parser.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cmath> // isfinite
+#include <cstdint> // uint8_t
+#include <functional> // function
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/json_sax.hpp>
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/is_sax.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+////////////
+// parser //
+////////////
+
+enum class parse_event_t : std::uint8_t
+{
+    /// the parser read `{` and started to process a JSON object
+    object_start,
+    /// the parser read `}` and finished processing a JSON object
+    object_end,
+    /// the parser read `[` and started to process a JSON array
+    array_start,
+    /// the parser read `]` and finished processing a JSON array
+    array_end,
+    /// the parser read a key of a value in an object
+    key,
+    /// the parser finished reading a JSON value
+    value
+};
+
+template<typename BasicJsonType>
+using parser_callback_t =
+    std::function<bool(int /*depth*/, parse_event_t /*event*/, BasicJsonType& /*parsed*/)>;
+
+/*!
+@brief syntax analysis
+
+This class implements a recursive descent parser.
+*/
+template<typename BasicJsonType, typename InputAdapterType>
+class parser
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using lexer_t = lexer<BasicJsonType, InputAdapterType>;
+    using token_type = typename lexer_t::token_type;
+
+  public:
+    /// a parser reading from an input adapter
+    explicit parser(InputAdapterType&& adapter,
+                    const parser_callback_t<BasicJsonType> cb = nullptr,
+                    const bool allow_exceptions_ = true,
+                    const bool skip_comments = false)
+        : callback(cb)
+        , m_lexer(std::move(adapter), skip_comments)
+        , allow_exceptions(allow_exceptions_)
+    {
+        // read first token
+        get_token();
+    }
+
+    /*!
+    @brief public parser interface
+
+    @param[in] strict      whether to expect the last token to be EOF
+    @param[in,out] result  parsed JSON value
+
+    @throw parse_error.101 in case of an unexpected token
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+    */
+    void parse(const bool strict, BasicJsonType& result)
+    {
+        if (callback)
+        {
+            json_sax_dom_callback_parser<BasicJsonType> sdp(result, callback, allow_exceptions);
+            sax_parse_internal(&sdp);
+
+            // in strict mode, input must be completely read
+            if (strict && (get_token() != token_type::end_of_input))
+            {
+                sdp.parse_error(m_lexer.get_position(),
+                                m_lexer.get_token_string(),
+                                parse_error::create(101, m_lexer.get_position(),
+                                                    exception_message(token_type::end_of_input, "value"), nullptr));
+            }
+
+            // in case of an error, return discarded value
+            if (sdp.is_errored())
+            {
+                result = value_t::discarded;
+                return;
+            }
+
+            // set top-level value to null if it was discarded by the callback
+            // function
+            if (result.is_discarded())
+            {
+                result = nullptr;
+            }
+        }
+        else
+        {
+            json_sax_dom_parser<BasicJsonType> sdp(result, allow_exceptions);
+            sax_parse_internal(&sdp);
+
+            // in strict mode, input must be completely read
+            if (strict && (get_token() != token_type::end_of_input))
+            {
+                sdp.parse_error(m_lexer.get_position(),
+                                m_lexer.get_token_string(),
+                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), nullptr));
+            }
+
+            // in case of an error, return discarded value
+            if (sdp.is_errored())
+            {
+                result = value_t::discarded;
+                return;
+            }
+        }
+
+        result.assert_invariant();
+    }
+
+    /*!
+    @brief public accept interface
+
+    @param[in] strict  whether to expect the last token to be EOF
+    @return whether the input is a proper JSON text
+    */
+    bool accept(const bool strict = true)
+    {
+        json_sax_acceptor<BasicJsonType> sax_acceptor;
+        return sax_parse(&sax_acceptor, strict);
+    }
+
+    template<typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    bool sax_parse(SAX* sax, const bool strict = true)
+    {
+        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
+        const bool result = sax_parse_internal(sax);
+
+        // strict mode: next byte must be EOF
+        if (result && strict && (get_token() != token_type::end_of_input))
+        {
+            return sax->parse_error(m_lexer.get_position(),
+                                    m_lexer.get_token_string(),
+                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), nullptr));
+        }
+
+        return result;
+    }
+
+  private:
+    template<typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    bool sax_parse_internal(SAX* sax)
+    {
+        // stack to remember the hierarchy of structured values we are parsing
+        // true = array; false = object
+        std::vector<bool> states;
+        // value to avoid a goto (see comment where set to true)
+        bool skip_to_state_evaluation = false;
+
+        while (true)
+        {
+            if (!skip_to_state_evaluation)
+            {
+                // invariant: get_token() was called before each iteration
+                switch (last_token)
+                {
+                    case token_type::begin_object:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(static_cast<std::size_t>(-1))))
+                        {
+                            return false;
+                        }
+
+                        // closing } -> we are done
+                        if (get_token() == token_type::end_object)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(!sax->end_object()))
+                            {
+                                return false;
+                            }
+                            break;
+                        }
+
+                        // parse key
+                        if (JSON_HEDLEY_UNLIKELY(last_token != token_type::value_string))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), nullptr));
+                        }
+                        if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+
+                        // parse separator (:)
+                        if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), nullptr));
+                        }
+
+                        // remember we are now inside an object
+                        states.push_back(false);
+
+                        // parse values
+                        get_token();
+                        continue;
+                    }
+
+                    case token_type::begin_array:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(static_cast<std::size_t>(-1))))
+                        {
+                            return false;
+                        }
+
+                        // closing ] -> we are done
+                        if (get_token() == token_type::end_array)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(!sax->end_array()))
+                            {
+                                return false;
+                            }
+                            break;
+                        }
+
+                        // remember we are now inside an array
+                        states.push_back(true);
+
+                        // parse values (no need to call get_token)
+                        continue;
+                    }
+
+                    case token_type::value_float:
+                    {
+                        const auto res = m_lexer.get_number_float();
+
+                        if (JSON_HEDLEY_UNLIKELY(!std::isfinite(res)))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    out_of_range::create(406, concat("number overflow parsing '", m_lexer.get_token_string(), '\''), nullptr));
+                        }
+
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_float(res, m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+
+                        break;
+                    }
+
+                    case token_type::literal_false:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->boolean(false)))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::literal_null:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->null()))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::literal_true:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->boolean(true)))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_integer:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_integer(m_lexer.get_number_integer())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_string:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->string(m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_unsigned:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_unsigned(m_lexer.get_number_unsigned())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::parse_error:
+                    {
+                        // using "uninitialized" to avoid "expected" message
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::uninitialized, "value"), nullptr));
+                    }
+                    case token_type::end_of_input:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(m_lexer.get_position().chars_read_total == 1))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(),
+                                                            "attempting to parse an empty input; check that your input string or stream contains the expected JSON", nullptr));
+                        }
+
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::literal_or_value, "value"), nullptr));
+                    }
+                    case token_type::uninitialized:
+                    case token_type::end_array:
+                    case token_type::end_object:
+                    case token_type::name_separator:
+                    case token_type::value_separator:
+                    case token_type::literal_or_value:
+                    default: // the last token was unexpected
+                    {
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::literal_or_value, "value"), nullptr));
+                    }
+                }
+            }
+            else
+            {
+                skip_to_state_evaluation = false;
+            }
+
+            // we reached this line after we successfully parsed a value
+            if (states.empty())
+            {
+                // empty stack: we reached the end of the hierarchy: done
+                return true;
+            }
+
+            if (states.back())  // array
+            {
+                // comma -> next value
+                if (get_token() == token_type::value_separator)
+                {
+                    // parse a new value
+                    get_token();
+                    continue;
+                }
+
+                // closing ]
+                if (JSON_HEDLEY_LIKELY(last_token == token_type::end_array))
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!sax->end_array()))
+                    {
+                        return false;
+                    }
+
+                    // We are done with this array. Before we can parse a
+                    // new value, we need to evaluate the new state first.
+                    // By setting skip_to_state_evaluation to false, we
+                    // are effectively jumping to the beginning of this if.
+                    JSON_ASSERT(!states.empty());
+                    states.pop_back();
+                    skip_to_state_evaluation = true;
+                    continue;
+                }
+
+                return sax->parse_error(m_lexer.get_position(),
+                                        m_lexer.get_token_string(),
+                                        parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_array, "array"), nullptr));
+            }
+
+            // states.back() is false -> object
+
+            // comma -> next value
+            if (get_token() == token_type::value_separator)
+            {
+                // parse key
+                if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::value_string))
+                {
+                    return sax->parse_error(m_lexer.get_position(),
+                                            m_lexer.get_token_string(),
+                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), nullptr));
+                }
+
+                if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
+                {
+                    return false;
+                }
+
+                // parse separator (:)
+                if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
+                {
+                    return sax->parse_error(m_lexer.get_position(),
+                                            m_lexer.get_token_string(),
+                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), nullptr));
+                }
+
+                // parse values
+                get_token();
+                continue;
+            }
+
+            // closing }
+            if (JSON_HEDLEY_LIKELY(last_token == token_type::end_object))
+            {
+                if (JSON_HEDLEY_UNLIKELY(!sax->end_object()))
+                {
+                    return false;
+                }
+
+                // We are done with this object. Before we can parse a
+                // new value, we need to evaluate the new state first.
+                // By setting skip_to_state_evaluation to false, we
+                // are effectively jumping to the beginning of this if.
+                JSON_ASSERT(!states.empty());
+                states.pop_back();
+                skip_to_state_evaluation = true;
+                continue;
+            }
+
+            return sax->parse_error(m_lexer.get_position(),
+                                    m_lexer.get_token_string(),
+                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_object, "object"), nullptr));
+        }
+    }
+
+    /// get next token from lexer
+    token_type get_token()
+    {
+        return last_token = m_lexer.scan();
+    }
+
+    std::string exception_message(const token_type expected, const std::string& context)
+    {
+        std::string error_msg = "syntax error ";
+
+        if (!context.empty())
+        {
+            error_msg += concat("while parsing ", context, ' ');
+        }
+
+        error_msg += "- ";
+
+        if (last_token == token_type::parse_error)
+        {
+            error_msg += concat(m_lexer.get_error_message(), "; last read: '",
+                                m_lexer.get_token_string(), '\'');
+        }
+        else
+        {
+            error_msg += concat("unexpected ", lexer_t::token_type_name(last_token));
+        }
+
+        if (expected != token_type::uninitialized)
+        {
+            error_msg += concat("; expected ", lexer_t::token_type_name(expected));
+        }
+
+        return error_msg;
+    }
+
+  private:
+    /// callback function
+    const parser_callback_t<BasicJsonType> callback = nullptr;
+    /// the type of the last read token
+    token_type last_token = token_type::uninitialized;
+    /// the lexer
+    lexer_t m_lexer;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/iterators/internal_iterator.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef> // ptrdiff_t
+#include <limits>  // numeric_limits
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*
+@brief an iterator for primitive JSON types
+
+This class models an iterator for primitive JSON types (boolean, number,
+string). It's only purpose is to allow the iterator/const_iterator classes
+to "iterate" over primitive values. Internally, the iterator is modeled by
+a `difference_type` variable. Value begin_value (`0`) models the begin,
+end_value (`1`) models past the end.
+*/
+class primitive_iterator_t
+{
+  private:
+    using difference_type = std::ptrdiff_t;
+    static constexpr difference_type begin_value = 0;
+    static constexpr difference_type end_value = begin_value + 1;
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /// iterator as signed integer type
+    difference_type m_it = (std::numeric_limits<std::ptrdiff_t>::min)();
+
+  public:
+    constexpr difference_type get_value() const noexcept
+    {
+        return m_it;
+    }
+
+    /// set iterator to a defined beginning
+    void set_begin() noexcept
+    {
+        m_it = begin_value;
+    }
+
+    /// set iterator to a defined past the end
+    void set_end() noexcept
+    {
+        m_it = end_value;
+    }
+
+    /// return whether the iterator can be dereferenced
+    constexpr bool is_begin() const noexcept
+    {
+        return m_it == begin_value;
+    }
+
+    /// return whether the iterator is at end
+    constexpr bool is_end() const noexcept
+    {
+        return m_it == end_value;
+    }
+
+    friend constexpr bool operator==(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it == rhs.m_it;
+    }
+
+    friend constexpr bool operator<(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it < rhs.m_it;
+    }
+
+    primitive_iterator_t operator+(difference_type n) noexcept
+    {
+        auto result = *this;
+        result += n;
+        return result;
+    }
+
+    friend constexpr difference_type operator-(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it - rhs.m_it;
+    }
+
+    primitive_iterator_t& operator++() noexcept
+    {
+        ++m_it;
+        return *this;
+    }
+
+    primitive_iterator_t operator++(int)& noexcept // NOLINT(cert-dcl21-cpp)
+    {
+        auto result = *this;
+        ++m_it;
+        return result;
+    }
+
+    primitive_iterator_t& operator--() noexcept
+    {
+        --m_it;
+        return *this;
+    }
+
+    primitive_iterator_t operator--(int)& noexcept // NOLINT(cert-dcl21-cpp)
+    {
+        auto result = *this;
+        --m_it;
+        return result;
+    }
+
+    primitive_iterator_t& operator+=(difference_type n) noexcept
+    {
+        m_it += n;
+        return *this;
+    }
+
+    primitive_iterator_t& operator-=(difference_type n) noexcept
+    {
+        m_it -= n;
+        return *this;
+    }
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*!
+@brief an iterator value
+
+@note This structure could easily be a union, but MSVC currently does not allow
+unions members with complex constructors, see https://github.com/nlohmann/json/pull/105.
+*/
+template<typename BasicJsonType> struct internal_iterator
+{
+    /// iterator for JSON objects
+    typename BasicJsonType::object_t::iterator object_iterator {};
+    /// iterator for JSON arrays
+    typename BasicJsonType::array_t::iterator array_iterator {};
+    /// generic iterator for all other types
+    primitive_iterator_t primitive_iterator {};
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/iterators/iter_impl.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
+#include <type_traits> // conditional, is_const, remove_const
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/iterators/internal_iterator.hpp>
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+// forward declare, to be able to friend it later on
+template<typename IteratorType> class iteration_proxy;
+template<typename IteratorType> class iteration_proxy_value;
+
+/*!
+@brief a template for a bidirectional iterator for the @ref basic_json class
+This class implements a both iterators (iterator and const_iterator) for the
+@ref basic_json class.
+@note An iterator is called *initialized* when a pointer to a JSON value has
+      been set (e.g., by a constructor or a copy assignment). If the iterator is
+      default-constructed, it is *uninitialized* and most methods are undefined.
+      **The library uses assertions to detect calls on uninitialized iterators.**
+@requirement The class satisfies the following concept requirements:
+-
+[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
+  The iterator that can be moved can be moved in both directions (i.e.
+  incremented and decremented).
+@since version 1.0.0, simplified in version 2.0.9, change to bidirectional
+       iterators in version 3.0.0 (see https://github.com/nlohmann/json/issues/593)
+*/
+template<typename BasicJsonType>
+class iter_impl // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
+{
+    /// the iterator with BasicJsonType of different const-ness
+    using other_iter_impl = iter_impl<typename std::conditional<std::is_const<BasicJsonType>::value, typename std::remove_const<BasicJsonType>::type, const BasicJsonType>::type>;
+    /// allow basic_json to access private members
+    friend other_iter_impl;
+    friend BasicJsonType;
+    friend iteration_proxy<iter_impl>;
+    friend iteration_proxy_value<iter_impl>;
+
+    using object_t = typename BasicJsonType::object_t;
+    using array_t = typename BasicJsonType::array_t;
+    // make sure BasicJsonType is basic_json or const basic_json
+    static_assert(is_basic_json<typename std::remove_const<BasicJsonType>::type>::value,
+                  "iter_impl only accepts (const) basic_json");
+    // superficial check for the LegacyBidirectionalIterator named requirement
+    static_assert(std::is_base_of<std::bidirectional_iterator_tag, std::bidirectional_iterator_tag>::value
+                  &&  std::is_base_of<std::bidirectional_iterator_tag, typename std::iterator_traits<typename array_t::iterator>::iterator_category>::value,
+                  "basic_json iterator assumes array and object type iterators satisfy the LegacyBidirectionalIterator named requirement.");
+
+  public:
+    /// The std::iterator class template (used as a base class to provide typedefs) is deprecated in C++17.
+    /// The C++ Standard has never required user-defined iterators to derive from std::iterator.
+    /// A user-defined iterator should provide publicly accessible typedefs named
+    /// iterator_category, value_type, difference_type, pointer, and reference.
+    /// Note that value_type is required to be non-const, even for constant iterators.
+    using iterator_category = std::bidirectional_iterator_tag;
+
+    /// the type of the values when the iterator is dereferenced
+    using value_type = typename BasicJsonType::value_type;
+    /// a type to represent differences between iterators
+    using difference_type = typename BasicJsonType::difference_type;
+    /// defines a pointer to the type iterated over (value_type)
+    using pointer = typename std::conditional<std::is_const<BasicJsonType>::value,
+          typename BasicJsonType::const_pointer,
+          typename BasicJsonType::pointer>::type;
+    /// defines a reference to the type iterated over (value_type)
+    using reference =
+        typename std::conditional<std::is_const<BasicJsonType>::value,
+        typename BasicJsonType::const_reference,
+        typename BasicJsonType::reference>::type;
+
+    iter_impl() = default;
+    ~iter_impl() = default;
+    iter_impl(iter_impl&&) noexcept = default;
+    iter_impl& operator=(iter_impl&&) noexcept = default;
+
+    /*!
+    @brief constructor for a given JSON instance
+    @param[in] object  pointer to a JSON object for this iterator
+    @pre object != nullptr
+    @post The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    explicit iter_impl(pointer object) noexcept : m_object(object)
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = typename object_t::iterator();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = typename array_t::iterator();
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                m_it.primitive_iterator = primitive_iterator_t();
+                break;
+            }
+        }
+    }
+
+    /*!
+    @note The conventional copy constructor and copy assignment are implicitly
+          defined. Combined with the following converting constructor and
+          assignment, they support: (1) copy from iterator to iterator, (2)
+          copy from const iterator to const iterator, and (3) conversion from
+          iterator to const iterator. However conversion from const iterator
+          to iterator is not defined.
+    */
+
+    /*!
+    @brief const copy constructor
+    @param[in] other const iterator to copy from
+    @note This copy constructor had to be defined explicitly to circumvent a bug
+          occurring on msvc v19.0 compiler (VS 2015) debug build. For more
+          information refer to: https://github.com/nlohmann/json/issues/1608
+    */
+    iter_impl(const iter_impl<const BasicJsonType>& other) noexcept
+        : m_object(other.m_object), m_it(other.m_it)
+    {}
+
+    /*!
+    @brief converting assignment
+    @param[in] other const iterator to copy from
+    @return const/non-const iterator
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl& operator=(const iter_impl<const BasicJsonType>& other) noexcept
+    {
+        if (&other != this)
+        {
+            m_object = other.m_object;
+            m_it = other.m_it;
+        }
+        return *this;
+    }
+
+    /*!
+    @brief converting constructor
+    @param[in] other  non-const iterator to copy from
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
+        : m_object(other.m_object), m_it(other.m_it)
+    {}
+
+    /*!
+    @brief converting assignment
+    @param[in] other  non-const iterator to copy from
+    @return const/non-const iterator
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl& operator=(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept // NOLINT(cert-oop54-cpp)
+    {
+        m_object = other.m_object;
+        m_it = other.m_it;
+        return *this;
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /*!
+    @brief set the iterator to the first value
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    void set_begin() noexcept
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = m_object->m_data.m_value.object->begin();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = m_object->m_data.m_value.array->begin();
+                break;
+            }
+
+            case value_t::null:
+            {
+                // set to end so begin()==end() is true: null is empty
+                m_it.primitive_iterator.set_end();
+                break;
+            }
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                m_it.primitive_iterator.set_begin();
+                break;
+            }
+        }
+    }
+
+    /*!
+    @brief set the iterator past the last value
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    void set_end() noexcept
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = m_object->m_data.m_value.object->end();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = m_object->m_data.m_value.array->end();
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                m_it.primitive_iterator.set_end();
+                break;
+            }
+        }
+    }
+
+  public:
+    /*!
+    @brief return a reference to the value pointed to by the iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference operator*() const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+            {
+                JSON_ASSERT(m_it.object_iterator != m_object->m_data.m_value.object->end());
+                return m_it.object_iterator->second;
+            }
+
+            case value_t::array:
+            {
+                JSON_ASSERT(m_it.array_iterator != m_object->m_data.m_value.array->end());
+                return *m_it.array_iterator;
+            }
+
+            case value_t::null:
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
+                {
+                    return *m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
+            }
+        }
+    }
+
+    /*!
+    @brief dereference the iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    pointer operator->() const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+            {
+                JSON_ASSERT(m_it.object_iterator != m_object->m_data.m_value.object->end());
+                return &(m_it.object_iterator->second);
+            }
+
+            case value_t::array:
+            {
+                JSON_ASSERT(m_it.array_iterator != m_object->m_data.m_value.array->end());
+                return &*m_it.array_iterator;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
+                {
+                    return m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
+            }
+        }
+    }
+
+    /*!
+    @brief post-increment (it++)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator++(int)& // NOLINT(cert-dcl21-cpp)
+    {
+        auto result = *this;
+        ++(*this);
+        return result;
+    }
+
+    /*!
+    @brief pre-increment (++it)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator++()
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+            {
+                std::advance(m_it.object_iterator, 1);
+                break;
+            }
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, 1);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                ++m_it.primitive_iterator;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief post-decrement (it--)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator--(int)& // NOLINT(cert-dcl21-cpp)
+    {
+        auto result = *this;
+        --(*this);
+        return result;
+    }
+
+    /*!
+    @brief pre-decrement (--it)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator--()
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+            {
+                std::advance(m_it.object_iterator, -1);
+                break;
+            }
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, -1);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                --m_it.primitive_iterator;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief comparison: equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    template < typename IterImpl, detail::enable_if_t < (std::is_same<IterImpl, iter_impl>::value || std::is_same<IterImpl, other_iter_impl>::value), std::nullptr_t > = nullptr >
+    bool operator==(const IterImpl& other) const
+    {
+        // if objects are not the same, the comparison is undefined
+        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", m_object));
+        }
+
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+                return (m_it.object_iterator == other.m_it.object_iterator);
+
+            case value_t::array:
+                return (m_it.array_iterator == other.m_it.array_iterator);
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                return (m_it.primitive_iterator == other.m_it.primitive_iterator);
+        }
+    }
+
+    /*!
+    @brief comparison: not equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    template < typename IterImpl, detail::enable_if_t < (std::is_same<IterImpl, iter_impl>::value || std::is_same<IterImpl, other_iter_impl>::value), std::nullptr_t > = nullptr >
+    bool operator!=(const IterImpl& other) const
+    {
+        return !operator==(other);
+    }
+
+    /*!
+    @brief comparison: smaller
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator<(const iter_impl& other) const
+    {
+        // if objects are not the same, the comparison is undefined
+        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", m_object));
+        }
+
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(213, "cannot compare order of object iterators", m_object));
+
+            case value_t::array:
+                return (m_it.array_iterator < other.m_it.array_iterator);
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                return (m_it.primitive_iterator < other.m_it.primitive_iterator);
+        }
+    }
+
+    /*!
+    @brief comparison: less than or equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator<=(const iter_impl& other) const
+    {
+        return !other.operator < (*this);
+    }
+
+    /*!
+    @brief comparison: greater than
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator>(const iter_impl& other) const
+    {
+        return !operator<=(other);
+    }
+
+    /*!
+    @brief comparison: greater than or equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator>=(const iter_impl& other) const
+    {
+        return !operator<(other);
+    }
+
+    /*!
+    @brief add to iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator+=(difference_type i)
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", m_object));
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, i);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                m_it.primitive_iterator += i;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief subtract from iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator-=(difference_type i)
+    {
+        return operator+=(-i);
+    }
+
+    /*!
+    @brief add to iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator+(difference_type i) const
+    {
+        auto result = *this;
+        result += i;
+        return result;
+    }
+
+    /*!
+    @brief addition of distance and iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    friend iter_impl operator+(difference_type i, const iter_impl& it)
+    {
+        auto result = it;
+        result += i;
+        return result;
+    }
+
+    /*!
+    @brief subtract from iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator-(difference_type i) const
+    {
+        auto result = *this;
+        result -= i;
+        return result;
+    }
+
+    /*!
+    @brief return difference
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    difference_type operator-(const iter_impl& other) const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", m_object));
+
+            case value_t::array:
+                return m_it.array_iterator - other.m_it.array_iterator;
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                return m_it.primitive_iterator - other.m_it.primitive_iterator;
+        }
+    }
+
+    /*!
+    @brief access to successor
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference operator[](difference_type n) const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators", m_object));
+
+            case value_t::array:
+                return *std::next(m_it.array_iterator, n);
+
+            case value_t::null:
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.get_value() == -n))
+                {
+                    return *m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
+            }
+        }
+    }
+
+    /*!
+    @brief return the key of an object iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    const typename object_t::key_type& key() const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        if (JSON_HEDLEY_LIKELY(m_object->is_object()))
+        {
+            return m_it.object_iterator->first;
+        }
+
+        JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators", m_object));
+    }
+
+    /*!
+    @brief return the value of an iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference value() const
+    {
+        return operator*();
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /// associated JSON instance
+    pointer m_object = nullptr;
+    /// the actual iterator of the associated instance
+    internal_iterator<typename std::remove_const<BasicJsonType>::type> m_it {};
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
+
+// #include <nlohmann/detail/iterators/json_reverse_iterator.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef> // ptrdiff_t
+#include <iterator> // reverse_iterator
+#include <utility> // declval
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+//////////////////////
+// reverse_iterator //
+//////////////////////
+
+/*!
+@brief a template for a reverse iterator class
+
+@tparam Base the base iterator type to reverse. Valid types are @ref
+iterator (to create @ref reverse_iterator) and @ref const_iterator (to
+create @ref const_reverse_iterator).
+
+@requirement The class satisfies the following concept requirements:
+-
+[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
+  The iterator that can be moved can be moved in both directions (i.e.
+  incremented and decremented).
+- [OutputIterator](https://en.cppreference.com/w/cpp/named_req/OutputIterator):
+  It is possible to write to the pointed-to element (only if @a Base is
+  @ref iterator).
+
+@since version 1.0.0
+*/
+template<typename Base>
+class json_reverse_iterator : public std::reverse_iterator<Base>
+{
+  public:
+    using difference_type = std::ptrdiff_t;
+    /// shortcut to the reverse iterator adapter
+    using base_iterator = std::reverse_iterator<Base>;
+    /// the reference type for the pointed-to element
+    using reference = typename Base::reference;
+
+    /// create reverse iterator from iterator
+    explicit json_reverse_iterator(const typename base_iterator::iterator_type& it) noexcept
+        : base_iterator(it) {}
+
+    /// create reverse iterator from base class
+    explicit json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {}
+
+    /// post-increment (it++)
+    json_reverse_iterator operator++(int)& // NOLINT(cert-dcl21-cpp)
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator++(1));
+    }
+
+    /// pre-increment (++it)
+    json_reverse_iterator& operator++()
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator++());
+    }
+
+    /// post-decrement (it--)
+    json_reverse_iterator operator--(int)& // NOLINT(cert-dcl21-cpp)
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator--(1));
+    }
+
+    /// pre-decrement (--it)
+    json_reverse_iterator& operator--()
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator--());
+    }
+
+    /// add to iterator
+    json_reverse_iterator& operator+=(difference_type i)
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator+=(i));
+    }
+
+    /// add to iterator
+    json_reverse_iterator operator+(difference_type i) const
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator+(i));
+    }
+
+    /// subtract from iterator
+    json_reverse_iterator operator-(difference_type i) const
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator-(i));
+    }
+
+    /// return difference
+    difference_type operator-(const json_reverse_iterator& other) const
+    {
+        return base_iterator(*this) - base_iterator(other);
+    }
+
+    /// access to successor
+    reference operator[](difference_type n) const
+    {
+        return *(this->operator+(n));
+    }
+
+    /// return the key of an object iterator
+    auto key() const -> decltype(std::declval<Base>().key())
+    {
+        auto it = --this->base();
+        return it.key();
+    }
+
+    /// return the value of an iterator
+    reference value() const
+    {
+        auto it = --this->base();
+        return it.operator * ();
+    }
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+// #include <nlohmann/detail/json_custom_base_class.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <type_traits> // conditional, is_same
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*!
+@brief Default base class of the @ref basic_json class.
+
+So that the correct implementations of the copy / move ctors / assign operators
+of @ref basic_json do not require complex case distinctions
+(no base class / custom base class used as customization point),
+@ref basic_json always has a base class.
+By default, this class is used because it is empty and thus has no effect
+on the behavior of @ref basic_json.
+*/
+struct json_default_base {};
+
+template<class T>
+using json_base_class = typename std::conditional <
+                        std::is_same<T, void>::value,
+                        json_default_base,
+                        T
+                        >::type;
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/json_pointer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // all_of
+#include <cctype> // isdigit
+#include <cerrno> // errno, ERANGE
+#include <cstdlib> // strtoull
+#ifndef JSON_NO_IO
+    #include <iosfwd> // ostream
+#endif  // JSON_NO_IO
+#include <limits> // max
+#include <numeric> // accumulate
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/string_escape.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
+/// @sa https://json.nlohmann.me/api/json_pointer/
+template<typename RefStringType>
+class json_pointer
+{
+    // allow basic_json to access private members
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    friend class basic_json;
+
+    template<typename>
+    friend class json_pointer;
+
+    template<typename T>
+    struct string_t_helper
+    {
+        using type = T;
+    };
+
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    struct string_t_helper<NLOHMANN_BASIC_JSON_TPL>
+    {
+        using type = StringType;
+    };
+
+  public:
+    // for backwards compatibility accept BasicJsonType
+    using string_t = typename string_t_helper<RefStringType>::type;
+
+    /// @brief create JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/json_pointer/
+    explicit json_pointer(const string_t& s = "")
+        : reference_tokens(split(s))
+    {}
+
+    /// @brief return a string representation of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/to_string/
+    string_t to_string() const
+    {
+        return std::accumulate(reference_tokens.begin(), reference_tokens.end(),
+                               string_t{},
+                               [](const string_t& a, const string_t& b)
+        {
+            return detail::concat(a, '/', detail::escape(b));
+        });
+    }
+
+    /// @brief return a string representation of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_string/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, to_string())
+    operator string_t() const
+    {
+        return to_string();
+    }
+
+#ifndef JSON_NO_IO
+    /// @brief write string representation of the JSON pointer to stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
+    friend std::ostream& operator<<(std::ostream& o, const json_pointer& ptr)
+    {
+        o << ptr.to_string();
+        return o;
+    }
+#endif
+
+    /// @brief append another JSON pointer at the end of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
+    json_pointer& operator/=(const json_pointer& ptr)
+    {
+        reference_tokens.insert(reference_tokens.end(),
+                                ptr.reference_tokens.begin(),
+                                ptr.reference_tokens.end());
+        return *this;
+    }
+
+    /// @brief append an unescaped reference token at the end of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
+    json_pointer& operator/=(string_t token)
+    {
+        push_back(std::move(token));
+        return *this;
+    }
+
+    /// @brief append an array index at the end of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
+    json_pointer& operator/=(std::size_t array_idx)
+    {
+        return *this /= std::to_string(array_idx);
+    }
+
+    /// @brief create a new JSON pointer by appending the right JSON pointer at the end of the left JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
+    friend json_pointer operator/(const json_pointer& lhs,
+                                  const json_pointer& rhs)
+    {
+        return json_pointer(lhs) /= rhs;
+    }
+
+    /// @brief create a new JSON pointer by appending the unescaped token at the end of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
+    friend json_pointer operator/(const json_pointer& lhs, string_t token) // NOLINT(performance-unnecessary-value-param)
+    {
+        return json_pointer(lhs) /= std::move(token);
+    }
+
+    /// @brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
+    friend json_pointer operator/(const json_pointer& lhs, std::size_t array_idx)
+    {
+        return json_pointer(lhs) /= array_idx;
+    }
+
+    /// @brief returns the parent of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/parent_pointer/
+    json_pointer parent_pointer() const
+    {
+        if (empty())
+        {
+            return *this;
+        }
+
+        json_pointer res = *this;
+        res.pop_back();
+        return res;
+    }
+
+    /// @brief remove last reference token
+    /// @sa https://json.nlohmann.me/api/json_pointer/pop_back/
+    void pop_back()
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", nullptr));
+        }
+
+        reference_tokens.pop_back();
+    }
+
+    /// @brief return last reference token
+    /// @sa https://json.nlohmann.me/api/json_pointer/back/
+    const string_t& back() const
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", nullptr));
+        }
+
+        return reference_tokens.back();
+    }
+
+    /// @brief append an unescaped token at the end of the reference pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/push_back/
+    void push_back(const string_t& token)
+    {
+        reference_tokens.push_back(token);
+    }
+
+    /// @brief append an unescaped token at the end of the reference pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/push_back/
+    void push_back(string_t&& token)
+    {
+        reference_tokens.push_back(std::move(token));
+    }
+
+    /// @brief return whether pointer points to the root document
+    /// @sa https://json.nlohmann.me/api/json_pointer/empty/
+    bool empty() const noexcept
+    {
+        return reference_tokens.empty();
+    }
+
+  private:
+    /*!
+    @param[in] s  reference token to be converted into an array index
+
+    @return integer representation of @a s
+
+    @throw parse_error.106  if an array index begins with '0'
+    @throw parse_error.109  if an array index begins not with a digit
+    @throw out_of_range.404 if string @a s could not be converted to an integer
+    @throw out_of_range.410 if an array index exceeds size_type
+    */
+    template<typename BasicJsonType>
+    static typename BasicJsonType::size_type array_index(const string_t& s)
+    {
+        using size_type = typename BasicJsonType::size_type;
+
+        // error condition (cf. RFC 6901, Sect. 4)
+        if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && s[0] == '0'))
+        {
+            JSON_THROW(detail::parse_error::create(106, 0, detail::concat("array index '", s, "' must not begin with '0'"), nullptr));
+        }
+
+        // error condition (cf. RFC 6901, Sect. 4)
+        if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && !(s[0] >= '1' && s[0] <= '9')))
+        {
+            JSON_THROW(detail::parse_error::create(109, 0, detail::concat("array index '", s, "' is not a number"), nullptr));
+        }
+
+        const char* p = s.c_str();
+        char* p_end = nullptr;
+        errno = 0; // strtoull doesn't reset errno
+        const unsigned long long res = std::strtoull(p, &p_end, 10); // NOLINT(runtime/int)
+        if (p == p_end // invalid input or empty string
+                || errno == ERANGE // out of range
+                || JSON_HEDLEY_UNLIKELY(static_cast<std::size_t>(p_end - p) != s.size())) // incomplete read
+        {
+            JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", s, "'"), nullptr));
+        }
+
+        // only triggered on special platforms (like 32bit), see also
+        // https://github.com/nlohmann/json/pull/2203
+        if (res >= static_cast<unsigned long long>((std::numeric_limits<size_type>::max)()))  // NOLINT(runtime/int)
+        {
+            JSON_THROW(detail::out_of_range::create(410, detail::concat("array index ", s, " exceeds size_type"), nullptr));   // LCOV_EXCL_LINE
+        }
+
+        return static_cast<size_type>(res);
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    json_pointer top() const
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", nullptr));
+        }
+
+        json_pointer result = *this;
+        result.reference_tokens = {reference_tokens[0]};
+        return result;
+    }
+
+  private:
+    /*!
+    @brief create and return a reference to the pointed to value
+
+    @complexity Linear in the number of reference tokens.
+
+    @throw parse_error.109 if array index is not a number
+    @throw type_error.313 if value cannot be unflattened
+    */
+    template<typename BasicJsonType>
+    BasicJsonType& get_and_create(BasicJsonType& j) const
+    {
+        auto* result = &j;
+
+        // in case no reference tokens exist, return a reference to the JSON value
+        // j which will be overwritten by a primitive value
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (result->type())
+            {
+                case detail::value_t::null:
+                {
+                    if (reference_token == "0")
+                    {
+                        // start a new array if reference token is 0
+                        result = &result->operator[](0);
+                    }
+                    else
+                    {
+                        // start a new object otherwise
+                        result = &result->operator[](reference_token);
+                    }
+                    break;
+                }
+
+                case detail::value_t::object:
+                {
+                    // create an entry in the object
+                    result = &result->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    // create an entry in the array
+                    result = &result->operator[](array_index<BasicJsonType>(reference_token));
+                    break;
+                }
+
+                /*
+                The following code is only reached if there exists a reference
+                token _and_ the current value is primitive. In this case, we have
+                an error situation, because primitive values may only occur as
+                single value; that is, with an empty list of reference tokens.
+                */
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::type_error::create(313, "invalid value to unflatten", &j));
+            }
+        }
+
+        return *result;
+    }
+
+    /*!
+    @brief return a reference to the pointed to value
+
+    @note This version does not throw if a value is not present, but tries to
+          create nested values instead. For instance, calling this function
+          with pointer `"/this/that"` on a null value is equivalent to calling
+          `operator[]("this").operator[]("that")` on that value, effectively
+          changing the null value to an object.
+
+    @param[in] ptr  a JSON value
+
+    @return reference to the JSON value pointed to by the JSON pointer
+
+    @complexity Linear in the length of the JSON pointer.
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    template<typename BasicJsonType>
+    BasicJsonType& get_unchecked(BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            // convert null values to arrays or objects before continuing
+            if (ptr->is_null())
+            {
+                // check if reference token is a number
+                const bool nums =
+                    std::all_of(reference_token.begin(), reference_token.end(),
+                                [](const unsigned char x)
+                {
+                    return std::isdigit(x);
+                });
+
+                // change value to array for numbers or "-" or to object otherwise
+                *ptr = (nums || reference_token == "-")
+                       ? detail::value_t::array
+                       : detail::value_t::object;
+            }
+
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // use unchecked object access
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (reference_token == "-")
+                    {
+                        // explicitly treat "-" as index beyond the end
+                        ptr = &ptr->operator[](ptr->m_data.m_value.array->size());
+                    }
+                    else
+                    {
+                        // convert array index to number; unchecked access
+                        ptr = &ptr->operator[](array_index<BasicJsonType>(reference_token));
+                    }
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    template<typename BasicJsonType>
+    BasicJsonType& get_checked(BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // note: at performs range check
+                    ptr = &ptr->at(reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        JSON_THROW(detail::out_of_range::create(402, detail::concat(
+                                "array index '-' (", std::to_string(ptr->m_data.m_value.array->size()),
+                                ") is out of range"), ptr));
+                    }
+
+                    // note: at performs range check
+                    ptr = &ptr->at(array_index<BasicJsonType>(reference_token));
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @brief return a const reference to the pointed to value
+
+    @param[in] ptr  a JSON value
+
+    @return const reference to the JSON value pointed to by the JSON
+    pointer
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    template<typename BasicJsonType>
+    const BasicJsonType& get_unchecked(const BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // use unchecked object access
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" cannot be used for const access
+                        JSON_THROW(detail::out_of_range::create(402, detail::concat("array index '-' (", std::to_string(ptr->m_data.m_value.array->size()), ") is out of range"), ptr));
+                    }
+
+                    // use unchecked array access
+                    ptr = &ptr->operator[](array_index<BasicJsonType>(reference_token));
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    template<typename BasicJsonType>
+    const BasicJsonType& get_checked(const BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // note: at performs range check
+                    ptr = &ptr->at(reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        JSON_THROW(detail::out_of_range::create(402, detail::concat(
+                                "array index '-' (", std::to_string(ptr->m_data.m_value.array->size()),
+                                ") is out of range"), ptr));
+                    }
+
+                    // note: at performs range check
+                    ptr = &ptr->at(array_index<BasicJsonType>(reference_token));
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    */
+    template<typename BasicJsonType>
+    bool contains(const BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    if (!ptr->contains(reference_token))
+                    {
+                        // we did not find the key in the object
+                        return false;
+                    }
+
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() == 1 && !("0" <= reference_token && reference_token <= "9")))
+                    {
+                        // invalid char
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1))
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!('1' <= reference_token[0] && reference_token[0] <= '9')))
+                        {
+                            // first char should be between '1' and '9'
+                            return false;
+                        }
+                        for (std::size_t i = 1; i < reference_token.size(); i++)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(!('0' <= reference_token[i] && reference_token[i] <= '9')))
+                            {
+                                // other char should be between '0' and '9'
+                                return false;
+                            }
+                        }
+                    }
+
+                    const auto idx = array_index<BasicJsonType>(reference_token);
+                    if (idx >= ptr->size())
+                    {
+                        // index out of range
+                        return false;
+                    }
+
+                    ptr = &ptr->operator[](idx);
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                {
+                    // we do not expect primitive values if there is still a
+                    // reference token to process
+                    return false;
+                }
+            }
+        }
+
+        // no reference token left means we found a primitive value
+        return true;
+    }
+
+    /*!
+    @brief split the string input to reference tokens
+
+    @note This function is only called by the json_pointer constructor.
+          All exceptions below are documented there.
+
+    @throw parse_error.107  if the pointer is not empty or begins with '/'
+    @throw parse_error.108  if character '~' is not followed by '0' or '1'
+    */
+    static std::vector<string_t> split(const string_t& reference_string)
+    {
+        std::vector<string_t> result;
+
+        // special case: empty reference string -> no reference tokens
+        if (reference_string.empty())
+        {
+            return result;
+        }
+
+        // check if nonempty reference string begins with slash
+        if (JSON_HEDLEY_UNLIKELY(reference_string[0] != '/'))
+        {
+            JSON_THROW(detail::parse_error::create(107, 1, detail::concat("JSON pointer must be empty or begin with '/' - was: '", reference_string, "'"), nullptr));
+        }
+
+        // extract the reference tokens:
+        // - slash: position of the last read slash (or end of string)
+        // - start: position after the previous slash
+        for (
+            // search for the first slash after the first character
+            std::size_t slash = reference_string.find_first_of('/', 1),
+            // set the beginning of the first reference token
+            start = 1;
+            // we can stop if start == 0 (if slash == string_t::npos)
+            start != 0;
+            // set the beginning of the next reference token
+            // (will eventually be 0 if slash == string_t::npos)
+            start = (slash == string_t::npos) ? 0 : slash + 1,
+            // find next slash
+            slash = reference_string.find_first_of('/', start))
+        {
+            // use the text between the beginning of the reference token
+            // (start) and the last slash (slash).
+            auto reference_token = reference_string.substr(start, slash - start);
+
+            // check reference tokens are properly escaped
+            for (std::size_t pos = reference_token.find_first_of('~');
+                    pos != string_t::npos;
+                    pos = reference_token.find_first_of('~', pos + 1))
+            {
+                JSON_ASSERT(reference_token[pos] == '~');
+
+                // ~ must be followed by 0 or 1
+                if (JSON_HEDLEY_UNLIKELY(pos == reference_token.size() - 1 ||
+                                         (reference_token[pos + 1] != '0' &&
+                                          reference_token[pos + 1] != '1')))
+                {
+                    JSON_THROW(detail::parse_error::create(108, 0, "escape character '~' must be followed with '0' or '1'", nullptr));
+                }
+            }
+
+            // finally, store the reference token
+            detail::unescape(reference_token);
+            result.push_back(reference_token);
+        }
+
+        return result;
+    }
+
+  private:
+    /*!
+    @param[in] reference_string  the reference string to the current value
+    @param[in] value             the value to consider
+    @param[in,out] result        the result object to insert values to
+
+    @note Empty objects or arrays are flattened to `null`.
+    */
+    template<typename BasicJsonType>
+    static void flatten(const string_t& reference_string,
+                        const BasicJsonType& value,
+                        BasicJsonType& result)
+    {
+        switch (value.type())
+        {
+            case detail::value_t::array:
+            {
+                if (value.m_data.m_value.array->empty())
+                {
+                    // flatten empty array as null
+                    result[reference_string] = nullptr;
+                }
+                else
+                {
+                    // iterate array and use index as reference string
+                    for (std::size_t i = 0; i < value.m_data.m_value.array->size(); ++i)
+                    {
+                        flatten(detail::concat(reference_string, '/', std::to_string(i)),
+                                value.m_data.m_value.array->operator[](i), result);
+                    }
+                }
+                break;
+            }
+
+            case detail::value_t::object:
+            {
+                if (value.m_data.m_value.object->empty())
+                {
+                    // flatten empty object as null
+                    result[reference_string] = nullptr;
+                }
+                else
+                {
+                    // iterate object and use keys as reference string
+                    for (const auto& element : *value.m_data.m_value.object)
+                    {
+                        flatten(detail::concat(reference_string, '/', detail::escape(element.first)), element.second, result);
+                    }
+                }
+                break;
+            }
+
+            case detail::value_t::null:
+            case detail::value_t::string:
+            case detail::value_t::boolean:
+            case detail::value_t::number_integer:
+            case detail::value_t::number_unsigned:
+            case detail::value_t::number_float:
+            case detail::value_t::binary:
+            case detail::value_t::discarded:
+            default:
+            {
+                // add primitive value with its reference string
+                result[reference_string] = value;
+                break;
+            }
+        }
+    }
+
+    /*!
+    @param[in] value  flattened JSON
+
+    @return unflattened JSON
+
+    @throw parse_error.109 if array index is not a number
+    @throw type_error.314  if value is not an object
+    @throw type_error.315  if object values are not primitive
+    @throw type_error.313  if value cannot be unflattened
+    */
+    template<typename BasicJsonType>
+    static BasicJsonType
+    unflatten(const BasicJsonType& value)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!value.is_object()))
+        {
+            JSON_THROW(detail::type_error::create(314, "only objects can be unflattened", &value));
+        }
+
+        BasicJsonType result;
+
+        // iterate the JSON object values
+        for (const auto& element : *value.m_data.m_value.object)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!element.second.is_primitive()))
+            {
+                JSON_THROW(detail::type_error::create(315, "values in object must be primitive", &element.second));
+            }
+
+            // assign value to reference pointed to by JSON pointer; Note that if
+            // the JSON pointer is "" (i.e., points to the whole value), function
+            // get_and_create returns a reference to result itself. An assignment
+            // will then create a primitive value.
+            json_pointer(element.first).get_and_create(result) = element.second;
+        }
+
+        return result;
+    }
+
+    // can't use conversion operator because of ambiguity
+    json_pointer<string_t> convert() const&
+    {
+        json_pointer<string_t> result;
+        result.reference_tokens = reference_tokens;
+        return result;
+    }
+
+    json_pointer<string_t> convert()&&
+    {
+        json_pointer<string_t> result;
+        result.reference_tokens = std::move(reference_tokens);
+        return result;
+    }
+
+  public:
+#if JSON_HAS_THREE_WAY_COMPARISON
+    /// @brief compares two JSON pointers for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeRhs>
+    bool operator==(const json_pointer<RefStringTypeRhs>& rhs) const noexcept
+    {
+        return reference_tokens == rhs.reference_tokens;
+    }
+
+    /// @brief compares JSON pointer and string for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer))
+    bool operator==(const string_t& rhs) const
+    {
+        return *this == json_pointer(rhs);
+    }
+
+    /// @brief 3-way compares two JSON pointers
+    template<typename RefStringTypeRhs>
+    std::strong_ordering operator<=>(const json_pointer<RefStringTypeRhs>& rhs) const noexcept // *NOPAD*
+    {
+        return  reference_tokens <=> rhs.reference_tokens; // *NOPAD*
+    }
+#else
+    /// @brief compares two JSON pointers for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs) noexcept;
+
+    /// @brief compares JSON pointer and string for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeLhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                           const StringType& rhs);
+
+    /// @brief compares string and JSON pointer for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeRhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator==(const StringType& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs);
+
+    /// @brief compares two JSON pointers for inequality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_ne/
+    template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs) noexcept;
+
+    /// @brief compares JSON pointer and string for inequality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_ne/
+    template<typename RefStringTypeLhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                           const StringType& rhs);
+
+    /// @brief compares string and JSON pointer for inequality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_ne/
+    template<typename RefStringTypeRhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator!=(const StringType& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs);
+
+    /// @brief compares two JSON pointer for less-than
+    template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator<(const json_pointer<RefStringTypeLhs>& lhs,
+                          const json_pointer<RefStringTypeRhs>& rhs) noexcept;
+#endif
+
+  private:
+    /// the reference tokens
+    std::vector<string_t> reference_tokens;
+};
+
+#if !JSON_HAS_THREE_WAY_COMPARISON
+// functions cannot be defined inside class due to ODR violations
+template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+inline bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs) noexcept
+{
+    return lhs.reference_tokens == rhs.reference_tokens;
+}
+
+template<typename RefStringTypeLhs,
+         typename StringType = typename json_pointer<RefStringTypeLhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer, json_pointer))
+inline bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                       const StringType& rhs)
+{
+    return lhs == json_pointer<RefStringTypeLhs>(rhs);
+}
+
+template<typename RefStringTypeRhs,
+         typename StringType = typename json_pointer<RefStringTypeRhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer, json_pointer))
+inline bool operator==(const StringType& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs)
+{
+    return json_pointer<RefStringTypeRhs>(lhs) == rhs;
+}
+
+template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+inline bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs) noexcept
+{
+    return !(lhs == rhs);
+}
+
+template<typename RefStringTypeLhs,
+         typename StringType = typename json_pointer<RefStringTypeLhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator!=(json_pointer, json_pointer))
+inline bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                       const StringType& rhs)
+{
+    return !(lhs == rhs);
+}
+
+template<typename RefStringTypeRhs,
+         typename StringType = typename json_pointer<RefStringTypeRhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator!=(json_pointer, json_pointer))
+inline bool operator!=(const StringType& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs)
+{
+    return !(lhs == rhs);
+}
+
+template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+inline bool operator<(const json_pointer<RefStringTypeLhs>& lhs,
+                      const json_pointer<RefStringTypeRhs>& rhs) noexcept
+{
+    return lhs.reference_tokens < rhs.reference_tokens;
+}
+#endif
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/json_ref.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <initializer_list>
+#include <utility>
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename BasicJsonType>
+class json_ref
+{
+  public:
+    using value_type = BasicJsonType;
+
+    json_ref(value_type&& value)
+        : owned_value(std::move(value))
+    {}
+
+    json_ref(const value_type& value)
+        : value_ref(&value)
+    {}
+
+    json_ref(std::initializer_list<json_ref> init)
+        : owned_value(init)
+    {}
+
+    template <
+        class... Args,
+        enable_if_t<std::is_constructible<value_type, Args...>::value, int> = 0 >
+    json_ref(Args && ... args)
+        : owned_value(std::forward<Args>(args)...)
+    {}
+
+    // class should be movable only
+    json_ref(json_ref&&) noexcept = default;
+    json_ref(const json_ref&) = delete;
+    json_ref& operator=(const json_ref&) = delete;
+    json_ref& operator=(json_ref&&) = delete;
+    ~json_ref() = default;
+
+    value_type moved_or_copied() const
+    {
+        if (value_ref == nullptr)
+        {
+            return std::move(owned_value);
+        }
+        return *value_ref;
+    }
+
+    value_type const& operator*() const
+    {
+        return value_ref ? *value_ref : owned_value;
+    }
+
+    value_type const* operator->() const
+    {
+        return &** this;
+    }
+
+  private:
+    mutable value_type owned_value = nullptr;
+    value_type const* value_ref = nullptr;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/string_escape.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/output/binary_writer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // reverse
+#include <array> // array
+#include <map> // map
+#include <cmath> // isnan, isinf
+#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
+#include <cstring> // memcpy
+#include <limits> // numeric_limits
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/input/binary_reader.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // copy
+#include <cstddef> // size_t
+#include <iterator> // back_inserter
+#include <memory> // shared_ptr, make_shared
+#include <string> // basic_string
+#include <vector> // vector
+
+#ifndef JSON_NO_IO
+    #include <ios>      // streamsize
+    #include <ostream>  // basic_ostream
+#endif  // JSON_NO_IO
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/// abstract output adapter interface
+template<typename CharType> struct output_adapter_protocol
+{
+    virtual void write_character(CharType c) = 0;
+    virtual void write_characters(const CharType* s, std::size_t length) = 0;
+    virtual ~output_adapter_protocol() = default;
+
+    output_adapter_protocol() = default;
+    output_adapter_protocol(const output_adapter_protocol&) = default;
+    output_adapter_protocol(output_adapter_protocol&&) noexcept = default;
+    output_adapter_protocol& operator=(const output_adapter_protocol&) = default;
+    output_adapter_protocol& operator=(output_adapter_protocol&&) noexcept = default;
+};
+
+/// a type to simplify interfaces
+template<typename CharType>
+using output_adapter_t = std::shared_ptr<output_adapter_protocol<CharType>>;
+
+/// output adapter for byte vectors
+template<typename CharType, typename AllocatorType = std::allocator<CharType>>
+class output_vector_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_vector_adapter(std::vector<CharType, AllocatorType>& vec) noexcept
+        : v(vec)
+    {}
+
+    void write_character(CharType c) override
+    {
+        v.push_back(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        v.insert(v.end(), s, s + length);
+    }
+
+  private:
+    std::vector<CharType, AllocatorType>& v;
+};
+
+#ifndef JSON_NO_IO
+/// output adapter for output streams
+template<typename CharType>
+class output_stream_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_stream_adapter(std::basic_ostream<CharType>& s) noexcept
+        : stream(s)
+    {}
+
+    void write_character(CharType c) override
+    {
+        stream.put(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        stream.write(s, static_cast<std::streamsize>(length));
+    }
+
+  private:
+    std::basic_ostream<CharType>& stream;
+};
+#endif  // JSON_NO_IO
+
+/// output adapter for basic_string
+template<typename CharType, typename StringType = std::basic_string<CharType>>
+class output_string_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_string_adapter(StringType& s) noexcept
+        : str(s)
+    {}
+
+    void write_character(CharType c) override
+    {
+        str.push_back(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        str.append(s, length);
+    }
+
+  private:
+    StringType& str;
+};
+
+template<typename CharType, typename StringType = std::basic_string<CharType>>
+class output_adapter
+{
+  public:
+    template<typename AllocatorType = std::allocator<CharType>>
+    output_adapter(std::vector<CharType, AllocatorType>& vec)
+        : oa(std::make_shared<output_vector_adapter<CharType, AllocatorType>>(vec)) {}
+
+#ifndef JSON_NO_IO
+    output_adapter(std::basic_ostream<CharType>& s)
+        : oa(std::make_shared<output_stream_adapter<CharType>>(s)) {}
+#endif  // JSON_NO_IO
+
+    output_adapter(StringType& s)
+        : oa(std::make_shared<output_string_adapter<CharType, StringType>>(s)) {}
+
+    operator output_adapter_t<CharType>()
+    {
+        return oa;
+    }
+
+  private:
+    output_adapter_t<CharType> oa = nullptr;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+///////////////////
+// binary writer //
+///////////////////
+
+/*!
+@brief serialization to CBOR and MessagePack values
+*/
+template<typename BasicJsonType, typename CharType>
+class binary_writer
+{
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+
+  public:
+    /*!
+    @brief create a binary writer
+
+    @param[in] adapter  output adapter to write to
+    */
+    explicit binary_writer(output_adapter_t<CharType> adapter) : oa(std::move(adapter))
+    {
+        JSON_ASSERT(oa);
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    @pre       j.type() == value_t::object
+    */
+    void write_bson(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::object:
+            {
+                write_bson_object(*j.m_data.m_value.object);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::array:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                JSON_THROW(type_error::create(317, concat("to serialize to BSON, top-level type must be object, but is ", j.type_name()), &j));
+            }
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    */
+    void write_cbor(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+            {
+                oa->write_character(to_char_type(0xF6));
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                oa->write_character(j.m_data.m_value.boolean
+                                    ? to_char_type(0xF5)
+                                    : to_char_type(0xF4));
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                if (j.m_data.m_value.number_integer >= 0)
+                {
+                    // CBOR does not differentiate between positive signed
+                    // integers and unsigned integers. Therefore, we used the
+                    // code from the value_t::number_unsigned case here.
+                    if (j.m_data.m_value.number_integer <= 0x17)
+                    {
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x18));
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x19));
+                        write_number(static_cast<std::uint16_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x1A));
+                        write_number(static_cast<std::uint32_t>(j.m_data.m_value.number_integer));
+                    }
+                    else
+                    {
+                        oa->write_character(to_char_type(0x1B));
+                        write_number(static_cast<std::uint64_t>(j.m_data.m_value.number_integer));
+                    }
+                }
+                else
+                {
+                    // The conversions below encode the sign in the first
+                    // byte, and the value is converted to a positive number.
+                    const auto positive_number = -1 - j.m_data.m_value.number_integer;
+                    if (j.m_data.m_value.number_integer >= -24)
+                    {
+                        write_number(static_cast<std::uint8_t>(0x20 + positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x38));
+                        write_number(static_cast<std::uint8_t>(positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x39));
+                        write_number(static_cast<std::uint16_t>(positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x3A));
+                        write_number(static_cast<std::uint32_t>(positive_number));
+                    }
+                    else
+                    {
+                        oa->write_character(to_char_type(0x3B));
+                        write_number(static_cast<std::uint64_t>(positive_number));
+                    }
+                }
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_data.m_value.number_unsigned <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_unsigned));
+                }
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x18));
+                    write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_unsigned));
+                }
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x19));
+                    write_number(static_cast<std::uint16_t>(j.m_data.m_value.number_unsigned));
+                }
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x1A));
+                    write_number(static_cast<std::uint32_t>(j.m_data.m_value.number_unsigned));
+                }
+                else
+                {
+                    oa->write_character(to_char_type(0x1B));
+                    write_number(static_cast<std::uint64_t>(j.m_data.m_value.number_unsigned));
+                }
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                if (std::isnan(j.m_data.m_value.number_float))
+                {
+                    // NaN is 0xf97e00 in CBOR
+                    oa->write_character(to_char_type(0xF9));
+                    oa->write_character(to_char_type(0x7E));
+                    oa->write_character(to_char_type(0x00));
+                }
+                else if (std::isinf(j.m_data.m_value.number_float))
+                {
+                    // Infinity is 0xf97c00, -Infinity is 0xf9fc00
+                    oa->write_character(to_char_type(0xf9));
+                    oa->write_character(j.m_data.m_value.number_float > 0 ? to_char_type(0x7C) : to_char_type(0xFC));
+                    oa->write_character(to_char_type(0x00));
+                }
+                else
+                {
+                    write_compact_float(j.m_data.m_value.number_float, detail::input_format_t::cbor);
+                }
+                break;
+            }
+
+            case value_t::string:
+            {
+                // step 1: write control byte and the string length
+                const auto N = j.m_data.m_value.string->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x60 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x78));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x79));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x7A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x7B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write the string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.string->c_str()),
+                    j.m_data.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                // step 1: write control byte and the array size
+                const auto N = j.m_data.m_value.array->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x80 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x98));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x99));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x9A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x9B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                for (const auto& el : *j.m_data.m_value.array)
+                {
+                    write_cbor(el);
+                }
+                break;
+            }
+
+            case value_t::binary:
+            {
+                if (j.m_data.m_value.binary->has_subtype())
+                {
+                    if (j.m_data.m_value.binary->subtype() <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xd8));
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.binary->subtype()));
+                    }
+                    else if (j.m_data.m_value.binary->subtype() <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xd9));
+                        write_number(static_cast<std::uint16_t>(j.m_data.m_value.binary->subtype()));
+                    }
+                    else if (j.m_data.m_value.binary->subtype() <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xda));
+                        write_number(static_cast<std::uint32_t>(j.m_data.m_value.binary->subtype()));
+                    }
+                    else if (j.m_data.m_value.binary->subtype() <= (std::numeric_limits<std::uint64_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xdb));
+                        write_number(static_cast<std::uint64_t>(j.m_data.m_value.binary->subtype()));
+                    }
+                }
+
+                // step 1: write control byte and the binary array size
+                const auto N = j.m_data.m_value.binary->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x40 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x58));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x59));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x5A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x5B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.binary->data()),
+                    N);
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                // step 1: write control byte and the object size
+                const auto N = j.m_data.m_value.object->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0xA0 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xB8));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xB9));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xBA));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xBB));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                for (const auto& el : *j.m_data.m_value.object)
+                {
+                    write_cbor(el.first);
+                    write_cbor(el.second);
+                }
+                break;
+            }
+
+            case value_t::discarded:
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    */
+    void write_msgpack(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::null: // nil
+            {
+                oa->write_character(to_char_type(0xC0));
+                break;
+            }
+
+            case value_t::boolean: // true and false
+            {
+                oa->write_character(j.m_data.m_value.boolean
+                                    ? to_char_type(0xC3)
+                                    : to_char_type(0xC2));
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                if (j.m_data.m_value.number_integer >= 0)
+                {
+                    // MessagePack does not differentiate between positive
+                    // signed integers and unsigned integers. Therefore, we used
+                    // the code from the value_t::number_unsigned case here.
+                    if (j.m_data.m_value.number_unsigned < 128)
+                    {
+                        // positive fixnum
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        // uint 8
+                        oa->write_character(to_char_type(0xCC));
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        // uint 16
+                        oa->write_character(to_char_type(0xCD));
+                        write_number(static_cast<std::uint16_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        // uint 32
+                        oa->write_character(to_char_type(0xCE));
+                        write_number(static_cast<std::uint32_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                    {
+                        // uint 64
+                        oa->write_character(to_char_type(0xCF));
+                        write_number(static_cast<std::uint64_t>(j.m_data.m_value.number_integer));
+                    }
+                }
+                else
+                {
+                    if (j.m_data.m_value.number_integer >= -32)
+                    {
+                        // negative fixnum
+                        write_number(static_cast<std::int8_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_integer >= (std::numeric_limits<std::int8_t>::min)() &&
+                             j.m_data.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                    {
+                        // int 8
+                        oa->write_character(to_char_type(0xD0));
+                        write_number(static_cast<std::int8_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_integer >= (std::numeric_limits<std::int16_t>::min)() &&
+                             j.m_data.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                    {
+                        // int 16
+                        oa->write_character(to_char_type(0xD1));
+                        write_number(static_cast<std::int16_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_integer >= (std::numeric_limits<std::int32_t>::min)() &&
+                             j.m_data.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                    {
+                        // int 32
+                        oa->write_character(to_char_type(0xD2));
+                        write_number(static_cast<std::int32_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_integer >= (std::numeric_limits<std::int64_t>::min)() &&
+                             j.m_data.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
+                    {
+                        // int 64
+                        oa->write_character(to_char_type(0xD3));
+                        write_number(static_cast<std::int64_t>(j.m_data.m_value.number_integer));
+                    }
+                }
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_data.m_value.number_unsigned < 128)
+                {
+                    // positive fixnum
+                    write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
+                }
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    // uint 8
+                    oa->write_character(to_char_type(0xCC));
+                    write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
+                }
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // uint 16
+                    oa->write_character(to_char_type(0xCD));
+                    write_number(static_cast<std::uint16_t>(j.m_data.m_value.number_integer));
+                }
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // uint 32
+                    oa->write_character(to_char_type(0xCE));
+                    write_number(static_cast<std::uint32_t>(j.m_data.m_value.number_integer));
+                }
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    // uint 64
+                    oa->write_character(to_char_type(0xCF));
+                    write_number(static_cast<std::uint64_t>(j.m_data.m_value.number_integer));
+                }
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                write_compact_float(j.m_data.m_value.number_float, detail::input_format_t::msgpack);
+                break;
+            }
+
+            case value_t::string:
+            {
+                // step 1: write control byte and the string length
+                const auto N = j.m_data.m_value.string->size();
+                if (N <= 31)
+                {
+                    // fixstr
+                    write_number(static_cast<std::uint8_t>(0xA0 | N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    // str 8
+                    oa->write_character(to_char_type(0xD9));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // str 16
+                    oa->write_character(to_char_type(0xDA));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // str 32
+                    oa->write_character(to_char_type(0xDB));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write the string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.string->c_str()),
+                    j.m_data.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                // step 1: write control byte and the array size
+                const auto N = j.m_data.m_value.array->size();
+                if (N <= 15)
+                {
+                    // fixarray
+                    write_number(static_cast<std::uint8_t>(0x90 | N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // array 16
+                    oa->write_character(to_char_type(0xDC));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // array 32
+                    oa->write_character(to_char_type(0xDD));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write each element
+                for (const auto& el : *j.m_data.m_value.array)
+                {
+                    write_msgpack(el);
+                }
+                break;
+            }
+
+            case value_t::binary:
+            {
+                // step 0: determine if the binary type has a set subtype to
+                // determine whether or not to use the ext or fixext types
+                const bool use_ext = j.m_data.m_value.binary->has_subtype();
+
+                // step 1: write control byte and the byte string length
+                const auto N = j.m_data.m_value.binary->size();
+                if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    std::uint8_t output_type{};
+                    bool fixed = true;
+                    if (use_ext)
+                    {
+                        switch (N)
+                        {
+                            case 1:
+                                output_type = 0xD4; // fixext 1
+                                break;
+                            case 2:
+                                output_type = 0xD5; // fixext 2
+                                break;
+                            case 4:
+                                output_type = 0xD6; // fixext 4
+                                break;
+                            case 8:
+                                output_type = 0xD7; // fixext 8
+                                break;
+                            case 16:
+                                output_type = 0xD8; // fixext 16
+                                break;
+                            default:
+                                output_type = 0xC7; // ext 8
+                                fixed = false;
+                                break;
+                        }
+
+                    }
+                    else
+                    {
+                        output_type = 0xC4; // bin 8
+                        fixed = false;
+                    }
+
+                    oa->write_character(to_char_type(output_type));
+                    if (!fixed)
+                    {
+                        write_number(static_cast<std::uint8_t>(N));
+                    }
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    const std::uint8_t output_type = use_ext
+                                                     ? 0xC8 // ext 16
+                                                     : 0xC5; // bin 16
+
+                    oa->write_character(to_char_type(output_type));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    const std::uint8_t output_type = use_ext
+                                                     ? 0xC9 // ext 32
+                                                     : 0xC6; // bin 32
+
+                    oa->write_character(to_char_type(output_type));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 1.5: if this is an ext type, write the subtype
+                if (use_ext)
+                {
+                    write_number(static_cast<std::int8_t>(j.m_data.m_value.binary->subtype()));
+                }
+
+                // step 2: write the byte string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.binary->data()),
+                    N);
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                // step 1: write control byte and the object size
+                const auto N = j.m_data.m_value.object->size();
+                if (N <= 15)
+                {
+                    // fixmap
+                    write_number(static_cast<std::uint8_t>(0x80 | (N & 0xF)));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // map 16
+                    oa->write_character(to_char_type(0xDE));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // map 32
+                    oa->write_character(to_char_type(0xDF));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write each element
+                for (const auto& el : *j.m_data.m_value.object)
+                {
+                    write_msgpack(el.first);
+                    write_msgpack(el.second);
+                }
+                break;
+            }
+
+            case value_t::discarded:
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    @param[in] use_count   whether to use '#' prefixes (optimized format)
+    @param[in] use_type    whether to use '$' prefixes (optimized format)
+    @param[in] add_prefix  whether prefixes need to be used for this value
+    @param[in] use_bjdata  whether write in BJData format, default is false
+    */
+    void write_ubjson(const BasicJsonType& j, const bool use_count,
+                      const bool use_type, const bool add_prefix = true,
+                      const bool use_bjdata = false)
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('Z'));
+                }
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(j.m_data.m_value.boolean
+                                        ? to_char_type('T')
+                                        : to_char_type('F'));
+                }
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                write_number_with_ubjson_prefix(j.m_data.m_value.number_integer, add_prefix, use_bjdata);
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                write_number_with_ubjson_prefix(j.m_data.m_value.number_unsigned, add_prefix, use_bjdata);
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                write_number_with_ubjson_prefix(j.m_data.m_value.number_float, add_prefix, use_bjdata);
+                break;
+            }
+
+            case value_t::string:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('S'));
+                }
+                write_number_with_ubjson_prefix(j.m_data.m_value.string->size(), true, use_bjdata);
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.string->c_str()),
+                    j.m_data.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('['));
+                }
+
+                bool prefix_required = true;
+                if (use_type && !j.m_data.m_value.array->empty())
+                {
+                    JSON_ASSERT(use_count);
+                    const CharType first_prefix = ubjson_prefix(j.front(), use_bjdata);
+                    const bool same_prefix = std::all_of(j.begin() + 1, j.end(),
+                                                         [this, first_prefix, use_bjdata](const BasicJsonType & v)
+                    {
+                        return ubjson_prefix(v, use_bjdata) == first_prefix;
+                    });
+
+                    std::vector<CharType> bjdx = {'[', '{', 'S', 'H', 'T', 'F', 'N', 'Z'}; // excluded markers in bjdata optimized type
+
+                    if (same_prefix && !(use_bjdata && std::find(bjdx.begin(), bjdx.end(), first_prefix) != bjdx.end()))
+                    {
+                        prefix_required = false;
+                        oa->write_character(to_char_type('$'));
+                        oa->write_character(first_prefix);
+                    }
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_data.m_value.array->size(), true, use_bjdata);
+                }
+
+                for (const auto& el : *j.m_data.m_value.array)
+                {
+                    write_ubjson(el, use_count, use_type, prefix_required, use_bjdata);
+                }
+
+                if (!use_count)
+                {
+                    oa->write_character(to_char_type(']'));
+                }
+
+                break;
+            }
+
+            case value_t::binary:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('['));
+                }
+
+                if (use_type && !j.m_data.m_value.binary->empty())
+                {
+                    JSON_ASSERT(use_count);
+                    oa->write_character(to_char_type('$'));
+                    oa->write_character('U');
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_data.m_value.binary->size(), true, use_bjdata);
+                }
+
+                if (use_type)
+                {
+                    oa->write_characters(
+                        reinterpret_cast<const CharType*>(j.m_data.m_value.binary->data()),
+                        j.m_data.m_value.binary->size());
+                }
+                else
+                {
+                    for (size_t i = 0; i < j.m_data.m_value.binary->size(); ++i)
+                    {
+                        oa->write_character(to_char_type('U'));
+                        oa->write_character(j.m_data.m_value.binary->data()[i]);
+                    }
+                }
+
+                if (!use_count)
+                {
+                    oa->write_character(to_char_type(']'));
+                }
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                if (use_bjdata && j.m_data.m_value.object->size() == 3 && j.m_data.m_value.object->find("_ArrayType_") != j.m_data.m_value.object->end() && j.m_data.m_value.object->find("_ArraySize_") != j.m_data.m_value.object->end() && j.m_data.m_value.object->find("_ArrayData_") != j.m_data.m_value.object->end())
+                {
+                    if (!write_bjdata_ndarray(*j.m_data.m_value.object, use_count, use_type))  // decode bjdata ndarray in the JData format (https://github.com/NeuroJSON/jdata)
+                    {
+                        break;
+                    }
+                }
+
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('{'));
+                }
+
+                bool prefix_required = true;
+                if (use_type && !j.m_data.m_value.object->empty())
+                {
+                    JSON_ASSERT(use_count);
+                    const CharType first_prefix = ubjson_prefix(j.front(), use_bjdata);
+                    const bool same_prefix = std::all_of(j.begin(), j.end(),
+                                                         [this, first_prefix, use_bjdata](const BasicJsonType & v)
+                    {
+                        return ubjson_prefix(v, use_bjdata) == first_prefix;
+                    });
+
+                    std::vector<CharType> bjdx = {'[', '{', 'S', 'H', 'T', 'F', 'N', 'Z'}; // excluded markers in bjdata optimized type
+
+                    if (same_prefix && !(use_bjdata && std::find(bjdx.begin(), bjdx.end(), first_prefix) != bjdx.end()))
+                    {
+                        prefix_required = false;
+                        oa->write_character(to_char_type('$'));
+                        oa->write_character(first_prefix);
+                    }
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_data.m_value.object->size(), true, use_bjdata);
+                }
+
+                for (const auto& el : *j.m_data.m_value.object)
+                {
+                    write_number_with_ubjson_prefix(el.first.size(), true, use_bjdata);
+                    oa->write_characters(
+                        reinterpret_cast<const CharType*>(el.first.c_str()),
+                        el.first.size());
+                    write_ubjson(el.second, use_count, use_type, prefix_required, use_bjdata);
+                }
+
+                if (!use_count)
+                {
+                    oa->write_character(to_char_type('}'));
+                }
+
+                break;
+            }
+
+            case value_t::discarded:
+            default:
+                break;
+        }
+    }
+
+  private:
+    //////////
+    // BSON //
+    //////////
+
+    /*!
+    @return The size of a BSON document entry header, including the id marker
+            and the entry name size (and its null-terminator).
+    */
+    static std::size_t calc_bson_entry_header_size(const string_t& name, const BasicJsonType& j)
+    {
+        const auto it = name.find(static_cast<typename string_t::value_type>(0));
+        if (JSON_HEDLEY_UNLIKELY(it != BasicJsonType::string_t::npos))
+        {
+            JSON_THROW(out_of_range::create(409, concat("BSON key cannot contain code point U+0000 (at byte ", std::to_string(it), ")"), &j));
+            static_cast<void>(j);
+        }
+
+        return /*id*/ 1ul + name.size() + /*zero-terminator*/1u;
+    }
+
+    /*!
+    @brief Writes the given @a element_type and @a name to the output adapter
+    */
+    void write_bson_entry_header(const string_t& name,
+                                 const std::uint8_t element_type)
+    {
+        oa->write_character(to_char_type(element_type)); // boolean
+        oa->write_characters(
+            reinterpret_cast<const CharType*>(name.c_str()),
+            name.size() + 1u);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and boolean value @a value
+    */
+    void write_bson_boolean(const string_t& name,
+                            const bool value)
+    {
+        write_bson_entry_header(name, 0x08);
+        oa->write_character(value ? to_char_type(0x01) : to_char_type(0x00));
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and double value @a value
+    */
+    void write_bson_double(const string_t& name,
+                           const double value)
+    {
+        write_bson_entry_header(name, 0x01);
+        write_number<double>(value, true);
+    }
+
+    /*!
+    @return The size of the BSON-encoded string in @a value
+    */
+    static std::size_t calc_bson_string_size(const string_t& value)
+    {
+        return sizeof(std::int32_t) + value.size() + 1ul;
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and string value @a value
+    */
+    void write_bson_string(const string_t& name,
+                           const string_t& value)
+    {
+        write_bson_entry_header(name, 0x02);
+
+        write_number<std::int32_t>(static_cast<std::int32_t>(value.size() + 1ul), true);
+        oa->write_characters(
+            reinterpret_cast<const CharType*>(value.c_str()),
+            value.size() + 1);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and null value
+    */
+    void write_bson_null(const string_t& name)
+    {
+        write_bson_entry_header(name, 0x0A);
+    }
+
+    /*!
+    @return The size of the BSON-encoded integer @a value
+    */
+    static std::size_t calc_bson_integer_size(const std::int64_t value)
+    {
+        return (std::numeric_limits<std::int32_t>::min)() <= value && value <= (std::numeric_limits<std::int32_t>::max)()
+               ? sizeof(std::int32_t)
+               : sizeof(std::int64_t);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and integer @a value
+    */
+    void write_bson_integer(const string_t& name,
+                            const std::int64_t value)
+    {
+        if ((std::numeric_limits<std::int32_t>::min)() <= value && value <= (std::numeric_limits<std::int32_t>::max)())
+        {
+            write_bson_entry_header(name, 0x10); // int32
+            write_number<std::int32_t>(static_cast<std::int32_t>(value), true);
+        }
+        else
+        {
+            write_bson_entry_header(name, 0x12); // int64
+            write_number<std::int64_t>(static_cast<std::int64_t>(value), true);
+        }
+    }
+
+    /*!
+    @return The size of the BSON-encoded unsigned integer in @a j
+    */
+    static constexpr std::size_t calc_bson_unsigned_size(const std::uint64_t value) noexcept
+    {
+        return (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+               ? sizeof(std::int32_t)
+               : sizeof(std::int64_t);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and unsigned @a value
+    */
+    void write_bson_unsigned(const string_t& name,
+                             const BasicJsonType& j)
+    {
+        if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+        {
+            write_bson_entry_header(name, 0x10 /* int32 */);
+            write_number<std::int32_t>(static_cast<std::int32_t>(j.m_data.m_value.number_unsigned), true);
+        }
+        else if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+        {
+            write_bson_entry_header(name, 0x12 /* int64 */);
+            write_number<std::int64_t>(static_cast<std::int64_t>(j.m_data.m_value.number_unsigned), true);
+        }
+        else
+        {
+            JSON_THROW(out_of_range::create(407, concat("integer number ", std::to_string(j.m_data.m_value.number_unsigned), " cannot be represented by BSON as it does not fit int64"), &j));
+        }
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and object @a value
+    */
+    void write_bson_object_entry(const string_t& name,
+                                 const typename BasicJsonType::object_t& value)
+    {
+        write_bson_entry_header(name, 0x03); // object
+        write_bson_object(value);
+    }
+
+    /*!
+    @return The size of the BSON-encoded array @a value
+    */
+    static std::size_t calc_bson_array_size(const typename BasicJsonType::array_t& value)
+    {
+        std::size_t array_index = 0ul;
+
+        const std::size_t embedded_document_size = std::accumulate(std::begin(value), std::end(value), static_cast<std::size_t>(0), [&array_index](std::size_t result, const typename BasicJsonType::array_t::value_type & el)
+        {
+            return result + calc_bson_element_size(std::to_string(array_index++), el);
+        });
+
+        return sizeof(std::int32_t) + embedded_document_size + 1ul;
+    }
+
+    /*!
+    @return The size of the BSON-encoded binary array @a value
+    */
+    static std::size_t calc_bson_binary_size(const typename BasicJsonType::binary_t& value)
+    {
+        return sizeof(std::int32_t) + value.size() + 1ul;
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and array @a value
+    */
+    void write_bson_array(const string_t& name,
+                          const typename BasicJsonType::array_t& value)
+    {
+        write_bson_entry_header(name, 0x04); // array
+        write_number<std::int32_t>(static_cast<std::int32_t>(calc_bson_array_size(value)), true);
+
+        std::size_t array_index = 0ul;
+
+        for (const auto& el : value)
+        {
+            write_bson_element(std::to_string(array_index++), el);
+        }
+
+        oa->write_character(to_char_type(0x00));
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and binary value @a value
+    */
+    void write_bson_binary(const string_t& name,
+                           const binary_t& value)
+    {
+        write_bson_entry_header(name, 0x05);
+
+        write_number<std::int32_t>(static_cast<std::int32_t>(value.size()), true);
+        write_number(value.has_subtype() ? static_cast<std::uint8_t>(value.subtype()) : static_cast<std::uint8_t>(0x00));
+
+        oa->write_characters(reinterpret_cast<const CharType*>(value.data()), value.size());
+    }
+
+    /*!
+    @brief Calculates the size necessary to serialize the JSON value @a j with its @a name
+    @return The calculated size for the BSON document entry for @a j with the given @a name.
+    */
+    static std::size_t calc_bson_element_size(const string_t& name,
+            const BasicJsonType& j)
+    {
+        const auto header_size = calc_bson_entry_header_size(name, j);
+        switch (j.type())
+        {
+            case value_t::object:
+                return header_size + calc_bson_object_size(*j.m_data.m_value.object);
+
+            case value_t::array:
+                return header_size + calc_bson_array_size(*j.m_data.m_value.array);
+
+            case value_t::binary:
+                return header_size + calc_bson_binary_size(*j.m_data.m_value.binary);
+
+            case value_t::boolean:
+                return header_size + 1ul;
+
+            case value_t::number_float:
+                return header_size + 8ul;
+
+            case value_t::number_integer:
+                return header_size + calc_bson_integer_size(j.m_data.m_value.number_integer);
+
+            case value_t::number_unsigned:
+                return header_size + calc_bson_unsigned_size(j.m_data.m_value.number_unsigned);
+
+            case value_t::string:
+                return header_size + calc_bson_string_size(*j.m_data.m_value.string);
+
+            case value_t::null:
+                return header_size + 0ul;
+
+            // LCOV_EXCL_START
+            case value_t::discarded:
+            default:
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert)
+                return 0ul;
+                // LCOV_EXCL_STOP
+        }
+    }
+
+    /*!
+    @brief Serializes the JSON value @a j to BSON and associates it with the
+           key @a name.
+    @param name The name to associate with the JSON entity @a j within the
+                current BSON document
+    */
+    void write_bson_element(const string_t& name,
+                            const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::object:
+                return write_bson_object_entry(name, *j.m_data.m_value.object);
+
+            case value_t::array:
+                return write_bson_array(name, *j.m_data.m_value.array);
+
+            case value_t::binary:
+                return write_bson_binary(name, *j.m_data.m_value.binary);
+
+            case value_t::boolean:
+                return write_bson_boolean(name, j.m_data.m_value.boolean);
+
+            case value_t::number_float:
+                return write_bson_double(name, j.m_data.m_value.number_float);
+
+            case value_t::number_integer:
+                return write_bson_integer(name, j.m_data.m_value.number_integer);
+
+            case value_t::number_unsigned:
+                return write_bson_unsigned(name, j);
+
+            case value_t::string:
+                return write_bson_string(name, *j.m_data.m_value.string);
+
+            case value_t::null:
+                return write_bson_null(name);
+
+            // LCOV_EXCL_START
+            case value_t::discarded:
+            default:
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert)
+                return;
+                // LCOV_EXCL_STOP
+        }
+    }
+
+    /*!
+    @brief Calculates the size of the BSON serialization of the given
+           JSON-object @a j.
+    @param[in] value  JSON value to serialize
+    @pre       value.type() == value_t::object
+    */
+    static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value)
+    {
+        const std::size_t document_size = std::accumulate(value.begin(), value.end(), static_cast<std::size_t>(0),
+                                          [](size_t result, const typename BasicJsonType::object_t::value_type & el)
+        {
+            return result += calc_bson_element_size(el.first, el.second);
+        });
+
+        return sizeof(std::int32_t) + document_size + 1ul;
+    }
+
+    /*!
+    @param[in] value  JSON value to serialize
+    @pre       value.type() == value_t::object
+    */
+    void write_bson_object(const typename BasicJsonType::object_t& value)
+    {
+        write_number<std::int32_t>(static_cast<std::int32_t>(calc_bson_object_size(value)), true);
+
+        for (const auto& el : value)
+        {
+            write_bson_element(el.first, el.second);
+        }
+
+        oa->write_character(to_char_type(0x00));
+    }
+
+    //////////
+    // CBOR //
+    //////////
+
+    static constexpr CharType get_cbor_float_prefix(float /*unused*/)
+    {
+        return to_char_type(0xFA);  // Single-Precision Float
+    }
+
+    static constexpr CharType get_cbor_float_prefix(double /*unused*/)
+    {
+        return to_char_type(0xFB);  // Double-Precision Float
+    }
+
+    /////////////
+    // MsgPack //
+    /////////////
+
+    static constexpr CharType get_msgpack_float_prefix(float /*unused*/)
+    {
+        return to_char_type(0xCA);  // float 32
+    }
+
+    static constexpr CharType get_msgpack_float_prefix(double /*unused*/)
+    {
+        return to_char_type(0xCB);  // float 64
+    }
+
+    ////////////
+    // UBJSON //
+    ////////////
+
+    // UBJSON: write number (floating point)
+    template<typename NumberType, typename std::enable_if<
+                 std::is_floating_point<NumberType>::value, int>::type = 0>
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix,
+                                         const bool use_bjdata)
+    {
+        if (add_prefix)
+        {
+            oa->write_character(get_ubjson_float_prefix(n));
+        }
+        write_number(n, use_bjdata);
+    }
+
+    // UBJSON: write number (unsigned integer)
+    template<typename NumberType, typename std::enable_if<
+                 std::is_unsigned<NumberType>::value, int>::type = 0>
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix,
+                                         const bool use_bjdata)
+    {
+        if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('i'));  // int8
+            }
+            write_number(static_cast<std::uint8_t>(n), use_bjdata);
+        }
+        else if (n <= (std::numeric_limits<std::uint8_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('U'));  // uint8
+            }
+            write_number(static_cast<std::uint8_t>(n), use_bjdata);
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('I'));  // int16
+            }
+            write_number(static_cast<std::int16_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && n <= static_cast<uint64_t>((std::numeric_limits<uint16_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('u'));  // uint16 - bjdata only
+            }
+            write_number(static_cast<std::uint16_t>(n), use_bjdata);
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('l'));  // int32
+            }
+            write_number(static_cast<std::int32_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && n <= static_cast<uint64_t>((std::numeric_limits<uint32_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('m'));  // uint32 - bjdata only
+            }
+            write_number(static_cast<std::uint32_t>(n), use_bjdata);
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('L'));  // int64
+            }
+            write_number(static_cast<std::int64_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && n <= (std::numeric_limits<uint64_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('M'));  // uint64 - bjdata only
+            }
+            write_number(static_cast<std::uint64_t>(n), use_bjdata);
+        }
+        else
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('H'));  // high-precision number
+            }
+
+            const auto number = BasicJsonType(n).dump();
+            write_number_with_ubjson_prefix(number.size(), true, use_bjdata);
+            for (std::size_t i = 0; i < number.size(); ++i)
+            {
+                oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
+            }
+        }
+    }
+
+    // UBJSON: write number (signed integer)
+    template < typename NumberType, typename std::enable_if <
+                   std::is_signed<NumberType>::value&&
+                   !std::is_floating_point<NumberType>::value, int >::type = 0 >
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix,
+                                         const bool use_bjdata)
+    {
+        if ((std::numeric_limits<std::int8_t>::min)() <= n && n <= (std::numeric_limits<std::int8_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('i'));  // int8
+            }
+            write_number(static_cast<std::int8_t>(n), use_bjdata);
+        }
+        else if (static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('U'));  // uint8
+            }
+            write_number(static_cast<std::uint8_t>(n), use_bjdata);
+        }
+        else if ((std::numeric_limits<std::int16_t>::min)() <= n && n <= (std::numeric_limits<std::int16_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('I'));  // int16
+            }
+            write_number(static_cast<std::int16_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && (static_cast<std::int64_t>((std::numeric_limits<std::uint16_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint16_t>::max)())))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('u'));  // uint16 - bjdata only
+            }
+            write_number(static_cast<uint16_t>(n), use_bjdata);
+        }
+        else if ((std::numeric_limits<std::int32_t>::min)() <= n && n <= (std::numeric_limits<std::int32_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('l'));  // int32
+            }
+            write_number(static_cast<std::int32_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && (static_cast<std::int64_t>((std::numeric_limits<std::uint32_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint32_t>::max)())))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('m'));  // uint32 - bjdata only
+            }
+            write_number(static_cast<uint32_t>(n), use_bjdata);
+        }
+        else if ((std::numeric_limits<std::int64_t>::min)() <= n && n <= (std::numeric_limits<std::int64_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('L'));  // int64
+            }
+            write_number(static_cast<std::int64_t>(n), use_bjdata);
+        }
+        // LCOV_EXCL_START
+        else
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('H'));  // high-precision number
+            }
+
+            const auto number = BasicJsonType(n).dump();
+            write_number_with_ubjson_prefix(number.size(), true, use_bjdata);
+            for (std::size_t i = 0; i < number.size(); ++i)
+            {
+                oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
+            }
+        }
+        // LCOV_EXCL_STOP
+    }
+
+    /*!
+    @brief determine the type prefix of container values
+    */
+    CharType ubjson_prefix(const BasicJsonType& j, const bool use_bjdata) const noexcept
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+                return 'Z';
+
+            case value_t::boolean:
+                return j.m_data.m_value.boolean ? 'T' : 'F';
+
+            case value_t::number_integer:
+            {
+                if ((std::numeric_limits<std::int8_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                {
+                    return 'i';
+                }
+                if ((std::numeric_limits<std::uint8_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    return 'U';
+                }
+                if ((std::numeric_limits<std::int16_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                {
+                    return 'I';
+                }
+                if (use_bjdata && ((std::numeric_limits<std::uint16_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)()))
+                {
+                    return 'u';
+                }
+                if ((std::numeric_limits<std::int32_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                {
+                    return 'l';
+                }
+                if (use_bjdata && ((std::numeric_limits<std::uint32_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)()))
+                {
+                    return 'm';
+                }
+                if ((std::numeric_limits<std::int64_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
+                {
+                    return 'L';
+                }
+                // anything else is treated as high-precision number
+                return 'H'; // LCOV_EXCL_LINE
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
+                {
+                    return 'i';
+                }
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint8_t>::max)()))
+                {
+                    return 'U';
+                }
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
+                {
+                    return 'I';
+                }
+                if (use_bjdata && j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint16_t>::max)()))
+                {
+                    return 'u';
+                }
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+                {
+                    return 'l';
+                }
+                if (use_bjdata && j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint32_t>::max)()))
+                {
+                    return 'm';
+                }
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+                {
+                    return 'L';
+                }
+                if (use_bjdata && j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    return 'M';
+                }
+                // anything else is treated as high-precision number
+                return 'H'; // LCOV_EXCL_LINE
+            }
+
+            case value_t::number_float:
+                return get_ubjson_float_prefix(j.m_data.m_value.number_float);
+
+            case value_t::string:
+                return 'S';
+
+            case value_t::array: // fallthrough
+            case value_t::binary:
+                return '[';
+
+            case value_t::object:
+                return '{';
+
+            case value_t::discarded:
+            default:  // discarded values
+                return 'N';
+        }
+    }
+
+    static constexpr CharType get_ubjson_float_prefix(float /*unused*/)
+    {
+        return 'd';  // float 32
+    }
+
+    static constexpr CharType get_ubjson_float_prefix(double /*unused*/)
+    {
+        return 'D';  // float 64
+    }
+
+    /*!
+    @return false if the object is successfully converted to a bjdata ndarray, true if the type or size is invalid
+    */
+    bool write_bjdata_ndarray(const typename BasicJsonType::object_t& value, const bool use_count, const bool use_type)
+    {
+        std::map<string_t, CharType> bjdtype = {{"uint8", 'U'},  {"int8", 'i'},  {"uint16", 'u'}, {"int16", 'I'},
+            {"uint32", 'm'}, {"int32", 'l'}, {"uint64", 'M'}, {"int64", 'L'}, {"single", 'd'}, {"double", 'D'}, {"char", 'C'}
+        };
+
+        string_t key = "_ArrayType_";
+        auto it = bjdtype.find(static_cast<string_t>(value.at(key)));
+        if (it == bjdtype.end())
+        {
+            return true;
+        }
+        CharType dtype = it->second;
+
+        key = "_ArraySize_";
+        std::size_t len = (value.at(key).empty() ? 0 : 1);
+        for (const auto& el : value.at(key))
+        {
+            len *= static_cast<std::size_t>(el.m_data.m_value.number_unsigned);
+        }
+
+        key = "_ArrayData_";
+        if (value.at(key).size() != len)
+        {
+            return true;
+        }
+
+        oa->write_character('[');
+        oa->write_character('$');
+        oa->write_character(dtype);
+        oa->write_character('#');
+
+        key = "_ArraySize_";
+        write_ubjson(value.at(key), use_count, use_type, true,  true);
+
+        key = "_ArrayData_";
+        if (dtype == 'U' || dtype == 'C')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint8_t>(el.m_data.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'i')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int8_t>(el.m_data.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'u')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint16_t>(el.m_data.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'I')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int16_t>(el.m_data.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'm')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint32_t>(el.m_data.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'l')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int32_t>(el.m_data.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'M')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint64_t>(el.m_data.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'L')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int64_t>(el.m_data.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'd')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<float>(el.m_data.m_value.number_float), true);
+            }
+        }
+        else if (dtype == 'D')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<double>(el.m_data.m_value.number_float), true);
+            }
+        }
+        return false;
+    }
+
+    ///////////////////////
+    // Utility functions //
+    ///////////////////////
+
+    /*
+    @brief write a number to output input
+    @param[in] n number of type @a NumberType
+    @param[in] OutputIsLittleEndian Set to true if output data is
+                                 required to be little endian
+    @tparam NumberType the type of the number
+
+    @note This function needs to respect the system's endianness, because bytes
+          in CBOR, MessagePack, and UBJSON are stored in network order (big
+          endian) and therefore need reordering on little endian systems.
+          On the other hand, BSON and BJData use little endian and should reorder
+          on big endian systems.
+    */
+    template<typename NumberType>
+    void write_number(const NumberType n, const bool OutputIsLittleEndian = false)
+    {
+        // step 1: write number to array of length NumberType
+        std::array<CharType, sizeof(NumberType)> vec{};
+        std::memcpy(vec.data(), &n, sizeof(NumberType));
+
+        // step 2: write array to output (with possible reordering)
+        if (is_little_endian != OutputIsLittleEndian)
+        {
+            // reverse byte order prior to conversion if necessary
+            std::reverse(vec.begin(), vec.end());
+        }
+
+        oa->write_characters(vec.data(), sizeof(NumberType));
+    }
+
+    void write_compact_float(const number_float_t n, detail::input_format_t format)
+    {
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        if (static_cast<double>(n) >= static_cast<double>(std::numeric_limits<float>::lowest()) &&
+                static_cast<double>(n) <= static_cast<double>((std::numeric_limits<float>::max)()) &&
+                static_cast<double>(static_cast<float>(n)) == static_cast<double>(n))
+        {
+            oa->write_character(format == detail::input_format_t::cbor
+                                ? get_cbor_float_prefix(static_cast<float>(n))
+                                : get_msgpack_float_prefix(static_cast<float>(n)));
+            write_number(static_cast<float>(n));
+        }
+        else
+        {
+            oa->write_character(format == detail::input_format_t::cbor
+                                ? get_cbor_float_prefix(n)
+                                : get_msgpack_float_prefix(n));
+            write_number(n);
+        }
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+    }
+
+  public:
+    // The following to_char_type functions are implement the conversion
+    // between uint8_t and CharType. In case CharType is not unsigned,
+    // such a conversion is required to allow values greater than 128.
+    // See <https://github.com/nlohmann/json/issues/1286> for a discussion.
+    template < typename C = CharType,
+               enable_if_t < std::is_signed<C>::value && std::is_signed<char>::value > * = nullptr >
+    static constexpr CharType to_char_type(std::uint8_t x) noexcept
+    {
+        return *reinterpret_cast<char*>(&x);
+    }
+
+    template < typename C = CharType,
+               enable_if_t < std::is_signed<C>::value && std::is_unsigned<char>::value > * = nullptr >
+    static CharType to_char_type(std::uint8_t x) noexcept
+    {
+        static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t");
+        static_assert(std::is_trivial<CharType>::value, "CharType must be trivial");
+        CharType result;
+        std::memcpy(&result, &x, sizeof(x));
+        return result;
+    }
+
+    template<typename C = CharType,
+             enable_if_t<std::is_unsigned<C>::value>* = nullptr>
+    static constexpr CharType to_char_type(std::uint8_t x) noexcept
+    {
+        return x;
+    }
+
+    template < typename InputCharType, typename C = CharType,
+               enable_if_t <
+                   std::is_signed<C>::value &&
+                   std::is_signed<char>::value &&
+                   std::is_same<char, typename std::remove_cv<InputCharType>::type>::value
+                   > * = nullptr >
+    static constexpr CharType to_char_type(InputCharType x) noexcept
+    {
+        return x;
+    }
+
+  private:
+    /// whether we can assume little endianness
+    const bool is_little_endian = little_endianness();
+
+    /// the output
+    output_adapter_t<CharType> oa = nullptr;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+// #include <nlohmann/detail/output/serializer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2008-2009 Björn Hoehrmann <bjoern@hoehrmann.de>
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // reverse, remove, fill, find, none_of
+#include <array> // array
+#include <clocale> // localeconv, lconv
+#include <cmath> // labs, isfinite, isnan, signbit
+#include <cstddef> // size_t, ptrdiff_t
+#include <cstdint> // uint8_t
+#include <cstdio> // snprintf
+#include <limits> // numeric_limits
+#include <string> // string, char_traits
+#include <iomanip> // setfill, setw
+#include <type_traits> // is_same
+#include <utility> // move
+
+// #include <nlohmann/detail/conversions/to_chars.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2009 Florian Loitsch <https://florian.loitsch.com/>
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <array> // array
+#include <cmath>   // signbit, isfinite
+#include <cstdint> // intN_t, uintN_t
+#include <cstring> // memcpy, memmove
+#include <limits> // numeric_limits
+#include <type_traits> // conditional
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*!
+@brief implements the Grisu2 algorithm for binary to decimal floating-point
+conversion.
+
+This implementation is a slightly modified version of the reference
+implementation which may be obtained from
+http://florian.loitsch.com/publications (bench.tar.gz).
+
+The code is distributed under the MIT license, Copyright (c) 2009 Florian Loitsch.
+
+For a detailed description of the algorithm see:
+
+[1] Loitsch, "Printing Floating-Point Numbers Quickly and Accurately with
+    Integers", Proceedings of the ACM SIGPLAN 2010 Conference on Programming
+    Language Design and Implementation, PLDI 2010
+[2] Burger, Dybvig, "Printing Floating-Point Numbers Quickly and Accurately",
+    Proceedings of the ACM SIGPLAN 1996 Conference on Programming Language
+    Design and Implementation, PLDI 1996
+*/
+namespace dtoa_impl
+{
+
+template<typename Target, typename Source>
+Target reinterpret_bits(const Source source)
+{
+    static_assert(sizeof(Target) == sizeof(Source), "size mismatch");
+
+    Target target;
+    std::memcpy(&target, &source, sizeof(Source));
+    return target;
+}
+
+struct diyfp // f * 2^e
+{
+    static constexpr int kPrecision = 64; // = q
+
+    std::uint64_t f = 0;
+    int e = 0;
+
+    constexpr diyfp(std::uint64_t f_, int e_) noexcept : f(f_), e(e_) {}
+
+    /*!
+    @brief returns x - y
+    @pre x.e == y.e and x.f >= y.f
+    */
+    static diyfp sub(const diyfp& x, const diyfp& y) noexcept
+    {
+        JSON_ASSERT(x.e == y.e);
+        JSON_ASSERT(x.f >= y.f);
+
+        return {x.f - y.f, x.e};
+    }
+
+    /*!
+    @brief returns x * y
+    @note The result is rounded. (Only the upper q bits are returned.)
+    */
+    static diyfp mul(const diyfp& x, const diyfp& y) noexcept
+    {
+        static_assert(kPrecision == 64, "internal error");
+
+        // Computes:
+        //  f = round((x.f * y.f) / 2^q)
+        //  e = x.e + y.e + q
+
+        // Emulate the 64-bit * 64-bit multiplication:
+        //
+        // p = u * v
+        //   = (u_lo + 2^32 u_hi) (v_lo + 2^32 v_hi)
+        //   = (u_lo v_lo         ) + 2^32 ((u_lo v_hi         ) + (u_hi v_lo         )) + 2^64 (u_hi v_hi         )
+        //   = (p0                ) + 2^32 ((p1                ) + (p2                )) + 2^64 (p3                )
+        //   = (p0_lo + 2^32 p0_hi) + 2^32 ((p1_lo + 2^32 p1_hi) + (p2_lo + 2^32 p2_hi)) + 2^64 (p3                )
+        //   = (p0_lo             ) + 2^32 (p0_hi + p1_lo + p2_lo                      ) + 2^64 (p1_hi + p2_hi + p3)
+        //   = (p0_lo             ) + 2^32 (Q                                          ) + 2^64 (H                 )
+        //   = (p0_lo             ) + 2^32 (Q_lo + 2^32 Q_hi                           ) + 2^64 (H                 )
+        //
+        // (Since Q might be larger than 2^32 - 1)
+        //
+        //   = (p0_lo + 2^32 Q_lo) + 2^64 (Q_hi + H)
+        //
+        // (Q_hi + H does not overflow a 64-bit int)
+        //
+        //   = p_lo + 2^64 p_hi
+
+        const std::uint64_t u_lo = x.f & 0xFFFFFFFFu;
+        const std::uint64_t u_hi = x.f >> 32u;
+        const std::uint64_t v_lo = y.f & 0xFFFFFFFFu;
+        const std::uint64_t v_hi = y.f >> 32u;
+
+        const std::uint64_t p0 = u_lo * v_lo;
+        const std::uint64_t p1 = u_lo * v_hi;
+        const std::uint64_t p2 = u_hi * v_lo;
+        const std::uint64_t p3 = u_hi * v_hi;
+
+        const std::uint64_t p0_hi = p0 >> 32u;
+        const std::uint64_t p1_lo = p1 & 0xFFFFFFFFu;
+        const std::uint64_t p1_hi = p1 >> 32u;
+        const std::uint64_t p2_lo = p2 & 0xFFFFFFFFu;
+        const std::uint64_t p2_hi = p2 >> 32u;
+
+        std::uint64_t Q = p0_hi + p1_lo + p2_lo;
+
+        // The full product might now be computed as
+        //
+        // p_hi = p3 + p2_hi + p1_hi + (Q >> 32)
+        // p_lo = p0_lo + (Q << 32)
+        //
+        // But in this particular case here, the full p_lo is not required.
+        // Effectively we only need to add the highest bit in p_lo to p_hi (and
+        // Q_hi + 1 does not overflow).
+
+        Q += std::uint64_t{1} << (64u - 32u - 1u); // round, ties up
+
+        const std::uint64_t h = p3 + p2_hi + p1_hi + (Q >> 32u);
+
+        return {h, x.e + y.e + 64};
+    }
+
+    /*!
+    @brief normalize x such that the significand is >= 2^(q-1)
+    @pre x.f != 0
+    */
+    static diyfp normalize(diyfp x) noexcept
+    {
+        JSON_ASSERT(x.f != 0);
+
+        while ((x.f >> 63u) == 0)
+        {
+            x.f <<= 1u;
+            x.e--;
+        }
+
+        return x;
+    }
+
+    /*!
+    @brief normalize x such that the result has the exponent E
+    @pre e >= x.e and the upper e - x.e bits of x.f must be zero.
+    */
+    static diyfp normalize_to(const diyfp& x, const int target_exponent) noexcept
+    {
+        const int delta = x.e - target_exponent;
+
+        JSON_ASSERT(delta >= 0);
+        JSON_ASSERT(((x.f << delta) >> delta) == x.f);
+
+        return {x.f << delta, target_exponent};
+    }
+};
+
+struct boundaries
+{
+    diyfp w;
+    diyfp minus;
+    diyfp plus;
+};
+
+/*!
+Compute the (normalized) diyfp representing the input number 'value' and its
+boundaries.
+
+@pre value must be finite and positive
+*/
+template<typename FloatType>
+boundaries compute_boundaries(FloatType value)
+{
+    JSON_ASSERT(std::isfinite(value));
+    JSON_ASSERT(value > 0);
+
+    // Convert the IEEE representation into a diyfp.
+    //
+    // If v is denormal:
+    //      value = 0.F * 2^(1 - bias) = (          F) * 2^(1 - bias - (p-1))
+    // If v is normalized:
+    //      value = 1.F * 2^(E - bias) = (2^(p-1) + F) * 2^(E - bias - (p-1))
+
+    static_assert(std::numeric_limits<FloatType>::is_iec559,
+                  "internal error: dtoa_short requires an IEEE-754 floating-point implementation");
+
+    constexpr int      kPrecision = std::numeric_limits<FloatType>::digits; // = p (includes the hidden bit)
+    constexpr int      kBias      = std::numeric_limits<FloatType>::max_exponent - 1 + (kPrecision - 1);
+    constexpr int      kMinExp    = 1 - kBias;
+    constexpr std::uint64_t kHiddenBit = std::uint64_t{1} << (kPrecision - 1); // = 2^(p-1)
+
+    using bits_type = typename std::conditional<kPrecision == 24, std::uint32_t, std::uint64_t >::type;
+
+    const auto bits = static_cast<std::uint64_t>(reinterpret_bits<bits_type>(value));
+    const std::uint64_t E = bits >> (kPrecision - 1);
+    const std::uint64_t F = bits & (kHiddenBit - 1);
+
+    const bool is_denormal = E == 0;
+    const diyfp v = is_denormal
+                    ? diyfp(F, kMinExp)
+                    : diyfp(F + kHiddenBit, static_cast<int>(E) - kBias);
+
+    // Compute the boundaries m- and m+ of the floating-point value
+    // v = f * 2^e.
+    //
+    // Determine v- and v+, the floating-point predecessor and successor if v,
+    // respectively.
+    //
+    //      v- = v - 2^e        if f != 2^(p-1) or e == e_min                (A)
+    //         = v - 2^(e-1)    if f == 2^(p-1) and e > e_min                (B)
+    //
+    //      v+ = v + 2^e
+    //
+    // Let m- = (v- + v) / 2 and m+ = (v + v+) / 2. All real numbers _strictly_
+    // between m- and m+ round to v, regardless of how the input rounding
+    // algorithm breaks ties.
+    //
+    //      ---+-------------+-------------+-------------+-------------+---  (A)
+    //         v-            m-            v             m+            v+
+    //
+    //      -----------------+------+------+-------------+-------------+---  (B)
+    //                       v-     m-     v             m+            v+
+
+    const bool lower_boundary_is_closer = F == 0 && E > 1;
+    const diyfp m_plus = diyfp(2 * v.f + 1, v.e - 1);
+    const diyfp m_minus = lower_boundary_is_closer
+                          ? diyfp(4 * v.f - 1, v.e - 2)  // (B)
+                          : diyfp(2 * v.f - 1, v.e - 1); // (A)
+
+    // Determine the normalized w+ = m+.
+    const diyfp w_plus = diyfp::normalize(m_plus);
+
+    // Determine w- = m- such that e_(w-) = e_(w+).
+    const diyfp w_minus = diyfp::normalize_to(m_minus, w_plus.e);
+
+    return {diyfp::normalize(v), w_minus, w_plus};
+}
+
+// Given normalized diyfp w, Grisu needs to find a (normalized) cached
+// power-of-ten c, such that the exponent of the product c * w = f * 2^e lies
+// within a certain range [alpha, gamma] (Definition 3.2 from [1])
+//
+//      alpha <= e = e_c + e_w + q <= gamma
+//
+// or
+//
+//      f_c * f_w * 2^alpha <= f_c 2^(e_c) * f_w 2^(e_w) * 2^q
+//                          <= f_c * f_w * 2^gamma
+//
+// Since c and w are normalized, i.e. 2^(q-1) <= f < 2^q, this implies
+//
+//      2^(q-1) * 2^(q-1) * 2^alpha <= c * w * 2^q < 2^q * 2^q * 2^gamma
+//
+// or
+//
+//      2^(q - 2 + alpha) <= c * w < 2^(q + gamma)
+//
+// The choice of (alpha,gamma) determines the size of the table and the form of
+// the digit generation procedure. Using (alpha,gamma)=(-60,-32) works out well
+// in practice:
+//
+// The idea is to cut the number c * w = f * 2^e into two parts, which can be
+// processed independently: An integral part p1, and a fractional part p2:
+//
+//      f * 2^e = ( (f div 2^-e) * 2^-e + (f mod 2^-e) ) * 2^e
+//              = (f div 2^-e) + (f mod 2^-e) * 2^e
+//              = p1 + p2 * 2^e
+//
+// The conversion of p1 into decimal form requires a series of divisions and
+// modulos by (a power of) 10. These operations are faster for 32-bit than for
+// 64-bit integers, so p1 should ideally fit into a 32-bit integer. This can be
+// achieved by choosing
+//
+//      -e >= 32   or   e <= -32 := gamma
+//
+// In order to convert the fractional part
+//
+//      p2 * 2^e = p2 / 2^-e = d[-1] / 10^1 + d[-2] / 10^2 + ...
+//
+// into decimal form, the fraction is repeatedly multiplied by 10 and the digits
+// d[-i] are extracted in order:
+//
+//      (10 * p2) div 2^-e = d[-1]
+//      (10 * p2) mod 2^-e = d[-2] / 10^1 + ...
+//
+// The multiplication by 10 must not overflow. It is sufficient to choose
+//
+//      10 * p2 < 16 * p2 = 2^4 * p2 <= 2^64.
+//
+// Since p2 = f mod 2^-e < 2^-e,
+//
+//      -e <= 60   or   e >= -60 := alpha
+
+constexpr int kAlpha = -60;
+constexpr int kGamma = -32;
+
+struct cached_power // c = f * 2^e ~= 10^k
+{
+    std::uint64_t f;
+    int e;
+    int k;
+};
+
+/*!
+For a normalized diyfp w = f * 2^e, this function returns a (normalized) cached
+power-of-ten c = f_c * 2^e_c, such that the exponent of the product w * c
+satisfies (Definition 3.2 from [1])
+
+     alpha <= e_c + e + q <= gamma.
+*/
+inline cached_power get_cached_power_for_binary_exponent(int e)
+{
+    // Now
+    //
+    //      alpha <= e_c + e + q <= gamma                                    (1)
+    //      ==> f_c * 2^alpha <= c * 2^e * 2^q
+    //
+    // and since the c's are normalized, 2^(q-1) <= f_c,
+    //
+    //      ==> 2^(q - 1 + alpha) <= c * 2^(e + q)
+    //      ==> 2^(alpha - e - 1) <= c
+    //
+    // If c were an exact power of ten, i.e. c = 10^k, one may determine k as
+    //
+    //      k = ceil( log_10( 2^(alpha - e - 1) ) )
+    //        = ceil( (alpha - e - 1) * log_10(2) )
+    //
+    // From the paper:
+    // "In theory the result of the procedure could be wrong since c is rounded,
+    //  and the computation itself is approximated [...]. In practice, however,
+    //  this simple function is sufficient."
+    //
+    // For IEEE double precision floating-point numbers converted into
+    // normalized diyfp's w = f * 2^e, with q = 64,
+    //
+    //      e >= -1022      (min IEEE exponent)
+    //           -52        (p - 1)
+    //           -52        (p - 1, possibly normalize denormal IEEE numbers)
+    //           -11        (normalize the diyfp)
+    //         = -1137
+    //
+    // and
+    //
+    //      e <= +1023      (max IEEE exponent)
+    //           -52        (p - 1)
+    //           -11        (normalize the diyfp)
+    //         = 960
+    //
+    // This binary exponent range [-1137,960] results in a decimal exponent
+    // range [-307,324]. One does not need to store a cached power for each
+    // k in this range. For each such k it suffices to find a cached power
+    // such that the exponent of the product lies in [alpha,gamma].
+    // This implies that the difference of the decimal exponents of adjacent
+    // table entries must be less than or equal to
+    //
+    //      floor( (gamma - alpha) * log_10(2) ) = 8.
+    //
+    // (A smaller distance gamma-alpha would require a larger table.)
+
+    // NB:
+    // Actually this function returns c, such that -60 <= e_c + e + 64 <= -34.
+
+    constexpr int kCachedPowersMinDecExp = -300;
+    constexpr int kCachedPowersDecStep = 8;
+
+    static constexpr std::array<cached_power, 79> kCachedPowers =
+    {
+        {
+            { 0xAB70FE17C79AC6CA, -1060, -300 },
+            { 0xFF77B1FCBEBCDC4F, -1034, -292 },
+            { 0xBE5691EF416BD60C, -1007, -284 },
+            { 0x8DD01FAD907FFC3C,  -980, -276 },
+            { 0xD3515C2831559A83,  -954, -268 },
+            { 0x9D71AC8FADA6C9B5,  -927, -260 },
+            { 0xEA9C227723EE8BCB,  -901, -252 },
+            { 0xAECC49914078536D,  -874, -244 },
+            { 0x823C12795DB6CE57,  -847, -236 },
+            { 0xC21094364DFB5637,  -821, -228 },
+            { 0x9096EA6F3848984F,  -794, -220 },
+            { 0xD77485CB25823AC7,  -768, -212 },
+            { 0xA086CFCD97BF97F4,  -741, -204 },
+            { 0xEF340A98172AACE5,  -715, -196 },
+            { 0xB23867FB2A35B28E,  -688, -188 },
+            { 0x84C8D4DFD2C63F3B,  -661, -180 },
+            { 0xC5DD44271AD3CDBA,  -635, -172 },
+            { 0x936B9FCEBB25C996,  -608, -164 },
+            { 0xDBAC6C247D62A584,  -582, -156 },
+            { 0xA3AB66580D5FDAF6,  -555, -148 },
+            { 0xF3E2F893DEC3F126,  -529, -140 },
+            { 0xB5B5ADA8AAFF80B8,  -502, -132 },
+            { 0x87625F056C7C4A8B,  -475, -124 },
+            { 0xC9BCFF6034C13053,  -449, -116 },
+            { 0x964E858C91BA2655,  -422, -108 },
+            { 0xDFF9772470297EBD,  -396, -100 },
+            { 0xA6DFBD9FB8E5B88F,  -369,  -92 },
+            { 0xF8A95FCF88747D94,  -343,  -84 },
+            { 0xB94470938FA89BCF,  -316,  -76 },
+            { 0x8A08F0F8BF0F156B,  -289,  -68 },
+            { 0xCDB02555653131B6,  -263,  -60 },
+            { 0x993FE2C6D07B7FAC,  -236,  -52 },
+            { 0xE45C10C42A2B3B06,  -210,  -44 },
+            { 0xAA242499697392D3,  -183,  -36 },
+            { 0xFD87B5F28300CA0E,  -157,  -28 },
+            { 0xBCE5086492111AEB,  -130,  -20 },
+            { 0x8CBCCC096F5088CC,  -103,  -12 },
+            { 0xD1B71758E219652C,   -77,   -4 },
+            { 0x9C40000000000000,   -50,    4 },
+            { 0xE8D4A51000000000,   -24,   12 },
+            { 0xAD78EBC5AC620000,     3,   20 },
+            { 0x813F3978F8940984,    30,   28 },
+            { 0xC097CE7BC90715B3,    56,   36 },
+            { 0x8F7E32CE7BEA5C70,    83,   44 },
+            { 0xD5D238A4ABE98068,   109,   52 },
+            { 0x9F4F2726179A2245,   136,   60 },
+            { 0xED63A231D4C4FB27,   162,   68 },
+            { 0xB0DE65388CC8ADA8,   189,   76 },
+            { 0x83C7088E1AAB65DB,   216,   84 },
+            { 0xC45D1DF942711D9A,   242,   92 },
+            { 0x924D692CA61BE758,   269,  100 },
+            { 0xDA01EE641A708DEA,   295,  108 },
+            { 0xA26DA3999AEF774A,   322,  116 },
+            { 0xF209787BB47D6B85,   348,  124 },
+            { 0xB454E4A179DD1877,   375,  132 },
+            { 0x865B86925B9BC5C2,   402,  140 },
+            { 0xC83553C5C8965D3D,   428,  148 },
+            { 0x952AB45CFA97A0B3,   455,  156 },
+            { 0xDE469FBD99A05FE3,   481,  164 },
+            { 0xA59BC234DB398C25,   508,  172 },
+            { 0xF6C69A72A3989F5C,   534,  180 },
+            { 0xB7DCBF5354E9BECE,   561,  188 },
+            { 0x88FCF317F22241E2,   588,  196 },
+            { 0xCC20CE9BD35C78A5,   614,  204 },
+            { 0x98165AF37B2153DF,   641,  212 },
+            { 0xE2A0B5DC971F303A,   667,  220 },
+            { 0xA8D9D1535CE3B396,   694,  228 },
+            { 0xFB9B7CD9A4A7443C,   720,  236 },
+            { 0xBB764C4CA7A44410,   747,  244 },
+            { 0x8BAB8EEFB6409C1A,   774,  252 },
+            { 0xD01FEF10A657842C,   800,  260 },
+            { 0x9B10A4E5E9913129,   827,  268 },
+            { 0xE7109BFBA19C0C9D,   853,  276 },
+            { 0xAC2820D9623BF429,   880,  284 },
+            { 0x80444B5E7AA7CF85,   907,  292 },
+            { 0xBF21E44003ACDD2D,   933,  300 },
+            { 0x8E679C2F5E44FF8F,   960,  308 },
+            { 0xD433179D9C8CB841,   986,  316 },
+            { 0x9E19DB92B4E31BA9,  1013,  324 },
+        }
+    };
+
+    // This computation gives exactly the same results for k as
+    //      k = ceil((kAlpha - e - 1) * 0.30102999566398114)
+    // for |e| <= 1500, but doesn't require floating-point operations.
+    // NB: log_10(2) ~= 78913 / 2^18
+    JSON_ASSERT(e >= -1500);
+    JSON_ASSERT(e <=  1500);
+    const int f = kAlpha - e - 1;
+    const int k = (f * 78913) / (1 << 18) + static_cast<int>(f > 0);
+
+    const int index = (-kCachedPowersMinDecExp + k + (kCachedPowersDecStep - 1)) / kCachedPowersDecStep;
+    JSON_ASSERT(index >= 0);
+    JSON_ASSERT(static_cast<std::size_t>(index) < kCachedPowers.size());
+
+    const cached_power cached = kCachedPowers[static_cast<std::size_t>(index)];
+    JSON_ASSERT(kAlpha <= cached.e + e + 64);
+    JSON_ASSERT(kGamma >= cached.e + e + 64);
+
+    return cached;
+}
+
+/*!
+For n != 0, returns k, such that pow10 := 10^(k-1) <= n < 10^k.
+For n == 0, returns 1 and sets pow10 := 1.
+*/
+inline int find_largest_pow10(const std::uint32_t n, std::uint32_t& pow10)
+{
+    // LCOV_EXCL_START
+    if (n >= 1000000000)
+    {
+        pow10 = 1000000000;
+        return 10;
+    }
+    // LCOV_EXCL_STOP
+    if (n >= 100000000)
+    {
+        pow10 = 100000000;
+        return  9;
+    }
+    if (n >= 10000000)
+    {
+        pow10 = 10000000;
+        return  8;
+    }
+    if (n >= 1000000)
+    {
+        pow10 = 1000000;
+        return  7;
+    }
+    if (n >= 100000)
+    {
+        pow10 = 100000;
+        return  6;
+    }
+    if (n >= 10000)
+    {
+        pow10 = 10000;
+        return  5;
+    }
+    if (n >= 1000)
+    {
+        pow10 = 1000;
+        return  4;
+    }
+    if (n >= 100)
+    {
+        pow10 = 100;
+        return  3;
+    }
+    if (n >= 10)
+    {
+        pow10 = 10;
+        return  2;
+    }
+
+    pow10 = 1;
+    return 1;
+}
+
+inline void grisu2_round(char* buf, int len, std::uint64_t dist, std::uint64_t delta,
+                         std::uint64_t rest, std::uint64_t ten_k)
+{
+    JSON_ASSERT(len >= 1);
+    JSON_ASSERT(dist <= delta);
+    JSON_ASSERT(rest <= delta);
+    JSON_ASSERT(ten_k > 0);
+
+    //               <--------------------------- delta ---->
+    //                                  <---- dist --------->
+    // --------------[------------------+-------------------]--------------
+    //               M-                 w                   M+
+    //
+    //                                  ten_k
+    //                                <------>
+    //                                       <---- rest ---->
+    // --------------[------------------+----+--------------]--------------
+    //                                  w    V
+    //                                       = buf * 10^k
+    //
+    // ten_k represents a unit-in-the-last-place in the decimal representation
+    // stored in buf.
+    // Decrement buf by ten_k while this takes buf closer to w.
+
+    // The tests are written in this order to avoid overflow in unsigned
+    // integer arithmetic.
+
+    while (rest < dist
+            && delta - rest >= ten_k
+            && (rest + ten_k < dist || dist - rest > rest + ten_k - dist))
+    {
+        JSON_ASSERT(buf[len - 1] != '0');
+        buf[len - 1]--;
+        rest += ten_k;
+    }
+}
+
+/*!
+Generates V = buffer * 10^decimal_exponent, such that M- <= V <= M+.
+M- and M+ must be normalized and share the same exponent -60 <= e <= -32.
+*/
+inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
+                             diyfp M_minus, diyfp w, diyfp M_plus)
+{
+    static_assert(kAlpha >= -60, "internal error");
+    static_assert(kGamma <= -32, "internal error");
+
+    // Generates the digits (and the exponent) of a decimal floating-point
+    // number V = buffer * 10^decimal_exponent in the range [M-, M+]. The diyfp's
+    // w, M- and M+ share the same exponent e, which satisfies alpha <= e <= gamma.
+    //
+    //               <--------------------------- delta ---->
+    //                                  <---- dist --------->
+    // --------------[------------------+-------------------]--------------
+    //               M-                 w                   M+
+    //
+    // Grisu2 generates the digits of M+ from left to right and stops as soon as
+    // V is in [M-,M+].
+
+    JSON_ASSERT(M_plus.e >= kAlpha);
+    JSON_ASSERT(M_plus.e <= kGamma);
+
+    std::uint64_t delta = diyfp::sub(M_plus, M_minus).f; // (significand of (M+ - M-), implicit exponent is e)
+    std::uint64_t dist  = diyfp::sub(M_plus, w      ).f; // (significand of (M+ - w ), implicit exponent is e)
+
+    // Split M+ = f * 2^e into two parts p1 and p2 (note: e < 0):
+    //
+    //      M+ = f * 2^e
+    //         = ((f div 2^-e) * 2^-e + (f mod 2^-e)) * 2^e
+    //         = ((p1        ) * 2^-e + (p2        )) * 2^e
+    //         = p1 + p2 * 2^e
+
+    const diyfp one(std::uint64_t{1} << -M_plus.e, M_plus.e);
+
+    auto p1 = static_cast<std::uint32_t>(M_plus.f >> -one.e); // p1 = f div 2^-e (Since -e >= 32, p1 fits into a 32-bit int.)
+    std::uint64_t p2 = M_plus.f & (one.f - 1);                    // p2 = f mod 2^-e
+
+    // 1)
+    //
+    // Generate the digits of the integral part p1 = d[n-1]...d[1]d[0]
+
+    JSON_ASSERT(p1 > 0);
+
+    std::uint32_t pow10{};
+    const int k = find_largest_pow10(p1, pow10);
+
+    //      10^(k-1) <= p1 < 10^k, pow10 = 10^(k-1)
+    //
+    //      p1 = (p1 div 10^(k-1)) * 10^(k-1) + (p1 mod 10^(k-1))
+    //         = (d[k-1]         ) * 10^(k-1) + (p1 mod 10^(k-1))
+    //
+    //      M+ = p1                                             + p2 * 2^e
+    //         = d[k-1] * 10^(k-1) + (p1 mod 10^(k-1))          + p2 * 2^e
+    //         = d[k-1] * 10^(k-1) + ((p1 mod 10^(k-1)) * 2^-e + p2) * 2^e
+    //         = d[k-1] * 10^(k-1) + (                         rest) * 2^e
+    //
+    // Now generate the digits d[n] of p1 from left to right (n = k-1,...,0)
+    //
+    //      p1 = d[k-1]...d[n] * 10^n + d[n-1]...d[0]
+    //
+    // but stop as soon as
+    //
+    //      rest * 2^e = (d[n-1]...d[0] * 2^-e + p2) * 2^e <= delta * 2^e
+
+    int n = k;
+    while (n > 0)
+    {
+        // Invariants:
+        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)    (buffer = 0 for n = k)
+        //      pow10 = 10^(n-1) <= p1 < 10^n
+        //
+        const std::uint32_t d = p1 / pow10;  // d = p1 div 10^(n-1)
+        const std::uint32_t r = p1 % pow10;  // r = p1 mod 10^(n-1)
+        //
+        //      M+ = buffer * 10^n + (d * 10^(n-1) + r) + p2 * 2^e
+        //         = (buffer * 10 + d) * 10^(n-1) + (r + p2 * 2^e)
+        //
+        JSON_ASSERT(d <= 9);
+        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
+        //
+        //      M+ = buffer * 10^(n-1) + (r + p2 * 2^e)
+        //
+        p1 = r;
+        n--;
+        //
+        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)
+        //      pow10 = 10^n
+        //
+
+        // Now check if enough digits have been generated.
+        // Compute
+        //
+        //      p1 + p2 * 2^e = (p1 * 2^-e + p2) * 2^e = rest * 2^e
+        //
+        // Note:
+        // Since rest and delta share the same exponent e, it suffices to
+        // compare the significands.
+        const std::uint64_t rest = (std::uint64_t{p1} << -one.e) + p2;
+        if (rest <= delta)
+        {
+            // V = buffer * 10^n, with M- <= V <= M+.
+
+            decimal_exponent += n;
+
+            // We may now just stop. But instead look if the buffer could be
+            // decremented to bring V closer to w.
+            //
+            // pow10 = 10^n is now 1 ulp in the decimal representation V.
+            // The rounding procedure works with diyfp's with an implicit
+            // exponent of e.
+            //
+            //      10^n = (10^n * 2^-e) * 2^e = ulp * 2^e
+            //
+            const std::uint64_t ten_n = std::uint64_t{pow10} << -one.e;
+            grisu2_round(buffer, length, dist, delta, rest, ten_n);
+
+            return;
+        }
+
+        pow10 /= 10;
+        //
+        //      pow10 = 10^(n-1) <= p1 < 10^n
+        // Invariants restored.
+    }
+
+    // 2)
+    //
+    // The digits of the integral part have been generated:
+    //
+    //      M+ = d[k-1]...d[1]d[0] + p2 * 2^e
+    //         = buffer            + p2 * 2^e
+    //
+    // Now generate the digits of the fractional part p2 * 2^e.
+    //
+    // Note:
+    // No decimal point is generated: the exponent is adjusted instead.
+    //
+    // p2 actually represents the fraction
+    //
+    //      p2 * 2^e
+    //          = p2 / 2^-e
+    //          = d[-1] / 10^1 + d[-2] / 10^2 + ...
+    //
+    // Now generate the digits d[-m] of p1 from left to right (m = 1,2,...)
+    //
+    //      p2 * 2^e = d[-1]d[-2]...d[-m] * 10^-m
+    //                      + 10^-m * (d[-m-1] / 10^1 + d[-m-2] / 10^2 + ...)
+    //
+    // using
+    //
+    //      10^m * p2 = ((10^m * p2) div 2^-e) * 2^-e + ((10^m * p2) mod 2^-e)
+    //                = (                   d) * 2^-e + (                   r)
+    //
+    // or
+    //      10^m * p2 * 2^e = d + r * 2^e
+    //
+    // i.e.
+    //
+    //      M+ = buffer + p2 * 2^e
+    //         = buffer + 10^-m * (d + r * 2^e)
+    //         = (buffer * 10^m + d) * 10^-m + 10^-m * r * 2^e
+    //
+    // and stop as soon as 10^-m * r * 2^e <= delta * 2^e
+
+    JSON_ASSERT(p2 > delta);
+
+    int m = 0;
+    for (;;)
+    {
+        // Invariant:
+        //      M+ = buffer * 10^-m + 10^-m * (d[-m-1] / 10 + d[-m-2] / 10^2 + ...) * 2^e
+        //         = buffer * 10^-m + 10^-m * (p2                                 ) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * (10 * p2)                   ) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * ((10*p2 div 2^-e) * 2^-e + (10*p2 mod 2^-e)) * 2^e
+        //
+        JSON_ASSERT(p2 <= (std::numeric_limits<std::uint64_t>::max)() / 10);
+        p2 *= 10;
+        const std::uint64_t d = p2 >> -one.e;     // d = (10 * p2) div 2^-e
+        const std::uint64_t r = p2 & (one.f - 1); // r = (10 * p2) mod 2^-e
+        //
+        //      M+ = buffer * 10^-m + 10^-m * (1/10 * (d * 2^-e + r) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * (d + r * 2^e))
+        //         = (buffer * 10 + d) * 10^(-m-1) + 10^(-m-1) * r * 2^e
+        //
+        JSON_ASSERT(d <= 9);
+        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
+        //
+        //      M+ = buffer * 10^(-m-1) + 10^(-m-1) * r * 2^e
+        //
+        p2 = r;
+        m++;
+        //
+        //      M+ = buffer * 10^-m + 10^-m * p2 * 2^e
+        // Invariant restored.
+
+        // Check if enough digits have been generated.
+        //
+        //      10^-m * p2 * 2^e <= delta * 2^e
+        //              p2 * 2^e <= 10^m * delta * 2^e
+        //                    p2 <= 10^m * delta
+        delta *= 10;
+        dist  *= 10;
+        if (p2 <= delta)
+        {
+            break;
+        }
+    }
+
+    // V = buffer * 10^-m, with M- <= V <= M+.
+
+    decimal_exponent -= m;
+
+    // 1 ulp in the decimal representation is now 10^-m.
+    // Since delta and dist are now scaled by 10^m, we need to do the
+    // same with ulp in order to keep the units in sync.
+    //
+    //      10^m * 10^-m = 1 = 2^-e * 2^e = ten_m * 2^e
+    //
+    const std::uint64_t ten_m = one.f;
+    grisu2_round(buffer, length, dist, delta, p2, ten_m);
+
+    // By construction this algorithm generates the shortest possible decimal
+    // number (Loitsch, Theorem 6.2) which rounds back to w.
+    // For an input number of precision p, at least
+    //
+    //      N = 1 + ceil(p * log_10(2))
+    //
+    // decimal digits are sufficient to identify all binary floating-point
+    // numbers (Matula, "In-and-Out conversions").
+    // This implies that the algorithm does not produce more than N decimal
+    // digits.
+    //
+    //      N = 17 for p = 53 (IEEE double precision)
+    //      N = 9  for p = 24 (IEEE single precision)
+}
+
+/*!
+v = buf * 10^decimal_exponent
+len is the length of the buffer (number of decimal digits)
+The buffer must be large enough, i.e. >= max_digits10.
+*/
+JSON_HEDLEY_NON_NULL(1)
+inline void grisu2(char* buf, int& len, int& decimal_exponent,
+                   diyfp m_minus, diyfp v, diyfp m_plus)
+{
+    JSON_ASSERT(m_plus.e == m_minus.e);
+    JSON_ASSERT(m_plus.e == v.e);
+
+    //  --------(-----------------------+-----------------------)--------    (A)
+    //          m-                      v                       m+
+    //
+    //  --------------------(-----------+-----------------------)--------    (B)
+    //                      m-          v                       m+
+    //
+    // First scale v (and m- and m+) such that the exponent is in the range
+    // [alpha, gamma].
+
+    const cached_power cached = get_cached_power_for_binary_exponent(m_plus.e);
+
+    const diyfp c_minus_k(cached.f, cached.e); // = c ~= 10^-k
+
+    // The exponent of the products is = v.e + c_minus_k.e + q and is in the range [alpha,gamma]
+    const diyfp w       = diyfp::mul(v,       c_minus_k);
+    const diyfp w_minus = diyfp::mul(m_minus, c_minus_k);
+    const diyfp w_plus  = diyfp::mul(m_plus,  c_minus_k);
+
+    //  ----(---+---)---------------(---+---)---------------(---+---)----
+    //          w-                      w                       w+
+    //          = c*m-                  = c*v                   = c*m+
+    //
+    // diyfp::mul rounds its result and c_minus_k is approximated too. w, w- and
+    // w+ are now off by a small amount.
+    // In fact:
+    //
+    //      w - v * 10^k < 1 ulp
+    //
+    // To account for this inaccuracy, add resp. subtract 1 ulp.
+    //
+    //  --------+---[---------------(---+---)---------------]---+--------
+    //          w-  M-                  w                   M+  w+
+    //
+    // Now any number in [M-, M+] (bounds included) will round to w when input,
+    // regardless of how the input rounding algorithm breaks ties.
+    //
+    // And digit_gen generates the shortest possible such number in [M-, M+].
+    // Note that this does not mean that Grisu2 always generates the shortest
+    // possible number in the interval (m-, m+).
+    const diyfp M_minus(w_minus.f + 1, w_minus.e);
+    const diyfp M_plus (w_plus.f  - 1, w_plus.e );
+
+    decimal_exponent = -cached.k; // = -(-k) = k
+
+    grisu2_digit_gen(buf, len, decimal_exponent, M_minus, w, M_plus);
+}
+
+/*!
+v = buf * 10^decimal_exponent
+len is the length of the buffer (number of decimal digits)
+The buffer must be large enough, i.e. >= max_digits10.
+*/
+template<typename FloatType>
+JSON_HEDLEY_NON_NULL(1)
+void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value)
+{
+    static_assert(diyfp::kPrecision >= std::numeric_limits<FloatType>::digits + 3,
+                  "internal error: not enough precision");
+
+    JSON_ASSERT(std::isfinite(value));
+    JSON_ASSERT(value > 0);
+
+    // If the neighbors (and boundaries) of 'value' are always computed for double-precision
+    // numbers, all float's can be recovered using strtod (and strtof). However, the resulting
+    // decimal representations are not exactly "short".
+    //
+    // The documentation for 'std::to_chars' (https://en.cppreference.com/w/cpp/utility/to_chars)
+    // says "value is converted to a string as if by std::sprintf in the default ("C") locale"
+    // and since sprintf promotes floats to doubles, I think this is exactly what 'std::to_chars'
+    // does.
+    // On the other hand, the documentation for 'std::to_chars' requires that "parsing the
+    // representation using the corresponding std::from_chars function recovers value exactly". That
+    // indicates that single precision floating-point numbers should be recovered using
+    // 'std::strtof'.
+    //
+    // NB: If the neighbors are computed for single-precision numbers, there is a single float
+    //     (7.0385307e-26f) which can't be recovered using strtod. The resulting double precision
+    //     value is off by 1 ulp.
+#if 0 // NOLINT(readability-avoid-unconditional-preprocessor-if)
+    const boundaries w = compute_boundaries(static_cast<double>(value));
+#else
+    const boundaries w = compute_boundaries(value);
+#endif
+
+    grisu2(buf, len, decimal_exponent, w.minus, w.w, w.plus);
+}
+
+/*!
+@brief appends a decimal representation of e to buf
+@return a pointer to the element following the exponent.
+@pre -1000 < e < 1000
+*/
+JSON_HEDLEY_NON_NULL(1)
+JSON_HEDLEY_RETURNS_NON_NULL
+inline char* append_exponent(char* buf, int e)
+{
+    JSON_ASSERT(e > -1000);
+    JSON_ASSERT(e <  1000);
+
+    if (e < 0)
+    {
+        e = -e;
+        *buf++ = '-';
+    }
+    else
+    {
+        *buf++ = '+';
+    }
+
+    auto k = static_cast<std::uint32_t>(e);
+    if (k < 10)
+    {
+        // Always print at least two digits in the exponent.
+        // This is for compatibility with printf("%g").
+        *buf++ = '0';
+        *buf++ = static_cast<char>('0' + k);
+    }
+    else if (k < 100)
+    {
+        *buf++ = static_cast<char>('0' + k / 10);
+        k %= 10;
+        *buf++ = static_cast<char>('0' + k);
+    }
+    else
+    {
+        *buf++ = static_cast<char>('0' + k / 100);
+        k %= 100;
+        *buf++ = static_cast<char>('0' + k / 10);
+        k %= 10;
+        *buf++ = static_cast<char>('0' + k);
+    }
+
+    return buf;
+}
+
+/*!
+@brief prettify v = buf * 10^decimal_exponent
+
+If v is in the range [10^min_exp, 10^max_exp) it will be printed in fixed-point
+notation. Otherwise it will be printed in exponential notation.
+
+@pre min_exp < 0
+@pre max_exp > 0
+*/
+JSON_HEDLEY_NON_NULL(1)
+JSON_HEDLEY_RETURNS_NON_NULL
+inline char* format_buffer(char* buf, int len, int decimal_exponent,
+                           int min_exp, int max_exp)
+{
+    JSON_ASSERT(min_exp < 0);
+    JSON_ASSERT(max_exp > 0);
+
+    const int k = len;
+    const int n = len + decimal_exponent;
+
+    // v = buf * 10^(n-k)
+    // k is the length of the buffer (number of decimal digits)
+    // n is the position of the decimal point relative to the start of the buffer.
+
+    if (k <= n && n <= max_exp)
+    {
+        // digits[000]
+        // len <= max_exp + 2
+
+        std::memset(buf + k, '0', static_cast<size_t>(n) - static_cast<size_t>(k));
+        // Make it look like a floating-point number (#362, #378)
+        buf[n + 0] = '.';
+        buf[n + 1] = '0';
+        return buf + (static_cast<size_t>(n) + 2);
+    }
+
+    if (0 < n && n <= max_exp)
+    {
+        // dig.its
+        // len <= max_digits10 + 1
+
+        JSON_ASSERT(k > n);
+
+        std::memmove(buf + (static_cast<size_t>(n) + 1), buf + n, static_cast<size_t>(k) - static_cast<size_t>(n));
+        buf[n] = '.';
+        return buf + (static_cast<size_t>(k) + 1U);
+    }
+
+    if (min_exp < n && n <= 0)
+    {
+        // 0.[000]digits
+        // len <= 2 + (-min_exp - 1) + max_digits10
+
+        std::memmove(buf + (2 + static_cast<size_t>(-n)), buf, static_cast<size_t>(k));
+        buf[0] = '0';
+        buf[1] = '.';
+        std::memset(buf + 2, '0', static_cast<size_t>(-n));
+        return buf + (2U + static_cast<size_t>(-n) + static_cast<size_t>(k));
+    }
+
+    if (k == 1)
+    {
+        // dE+123
+        // len <= 1 + 5
+
+        buf += 1;
+    }
+    else
+    {
+        // d.igitsE+123
+        // len <= max_digits10 + 1 + 5
+
+        std::memmove(buf + 2, buf + 1, static_cast<size_t>(k) - 1);
+        buf[1] = '.';
+        buf += 1 + static_cast<size_t>(k);
+    }
+
+    *buf++ = 'e';
+    return append_exponent(buf, n - 1);
+}
+
+}  // namespace dtoa_impl
+
+/*!
+@brief generates a decimal representation of the floating-point number value in [first, last).
+
+The format of the resulting decimal representation is similar to printf's %g
+format. Returns an iterator pointing past-the-end of the decimal representation.
+
+@note The input number must be finite, i.e. NaN's and Inf's are not supported.
+@note The buffer must be large enough.
+@note The result is NOT null-terminated.
+*/
+template<typename FloatType>
+JSON_HEDLEY_NON_NULL(1, 2)
+JSON_HEDLEY_RETURNS_NON_NULL
+char* to_chars(char* first, const char* last, FloatType value)
+{
+    static_cast<void>(last); // maybe unused - fix warning
+    JSON_ASSERT(std::isfinite(value));
+
+    // Use signbit(value) instead of (value < 0) since signbit works for -0.
+    if (std::signbit(value))
+    {
+        value = -value;
+        *first++ = '-';
+    }
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+    if (value == 0) // +-0
+    {
+        *first++ = '0';
+        // Make it look like a floating-point number (#362, #378)
+        *first++ = '.';
+        *first++ = '0';
+        return first;
+    }
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
+    JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10);
+
+    // Compute v = buffer * 10^decimal_exponent.
+    // The decimal digits are stored in the buffer, which needs to be interpreted
+    // as an unsigned decimal integer.
+    // len is the length of the buffer, i.e. the number of decimal digits.
+    int len = 0;
+    int decimal_exponent = 0;
+    dtoa_impl::grisu2(first, len, decimal_exponent, value);
+
+    JSON_ASSERT(len <= std::numeric_limits<FloatType>::max_digits10);
+
+    // Format the buffer like printf("%.*g", prec, value)
+    constexpr int kMinExp = -4;
+    // Use digits10 here to increase compatibility with version 2.
+    constexpr int kMaxExp = std::numeric_limits<FloatType>::digits10;
+
+    JSON_ASSERT(last - first >= kMaxExp + 2);
+    JSON_ASSERT(last - first >= 2 + (-kMinExp - 1) + std::numeric_limits<FloatType>::max_digits10);
+    JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10 + 6);
+
+    return dtoa_impl::format_buffer(first, len, decimal_exponent, kMinExp, kMaxExp);
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/output/binary_writer.hpp>
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+///////////////////
+// serialization //
+///////////////////
+
+/// how to treat decoding errors
+enum class error_handler_t
+{
+    strict,  ///< throw a type_error exception in case of invalid UTF-8
+    replace, ///< replace invalid UTF-8 sequences with U+FFFD
+    ignore   ///< ignore invalid UTF-8 sequences
+};
+
+template<typename BasicJsonType>
+class serializer
+{
+    using string_t = typename BasicJsonType::string_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using binary_char_t = typename BasicJsonType::binary_t::value_type;
+    static constexpr std::uint8_t UTF8_ACCEPT = 0;
+    static constexpr std::uint8_t UTF8_REJECT = 1;
+
+  public:
+    /*!
+    @param[in] s  output stream to serialize to
+    @param[in] ichar  indentation character to use
+    @param[in] error_handler_  how to react on decoding errors
+    */
+    serializer(output_adapter_t<char> s, const char ichar,
+               error_handler_t error_handler_ = error_handler_t::strict)
+        : o(std::move(s))
+        , loc(std::localeconv())
+        , thousands_sep(loc->thousands_sep == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->thousands_sep)))
+        , decimal_point(loc->decimal_point == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->decimal_point)))
+        , indent_char(ichar)
+        , indent_string(512, indent_char)
+        , error_handler(error_handler_)
+    {}
+
+    // delete because of pointer members
+    serializer(const serializer&) = delete;
+    serializer& operator=(const serializer&) = delete;
+    serializer(serializer&&) = delete;
+    serializer& operator=(serializer&&) = delete;
+    ~serializer() = default;
+
+    /*!
+    @brief internal implementation of the serialization function
+
+    This function is called by the public member function dump and organizes
+    the serialization internally. The indentation level is propagated as
+    additional parameter. In case of arrays and objects, the function is
+    called recursively.
+
+    - strings and object keys are escaped using `escape_string()`
+    - integer numbers are converted implicitly via `operator<<`
+    - floating-point numbers are converted to a string using `"%g"` format
+    - binary values are serialized as objects containing the subtype and the
+      byte array
+
+    @param[in] val               value to serialize
+    @param[in] pretty_print      whether the output shall be pretty-printed
+    @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters
+    in the output are escaped with `\uXXXX` sequences, and the result consists
+    of ASCII characters only.
+    @param[in] indent_step       the indent level
+    @param[in] current_indent    the current indent level (only used internally)
+    */
+    void dump(const BasicJsonType& val,
+              const bool pretty_print,
+              const bool ensure_ascii,
+              const unsigned int indent_step,
+              const unsigned int current_indent = 0)
+    {
+        switch (val.m_data.m_type)
+        {
+            case value_t::object:
+            {
+                if (val.m_data.m_value.object->empty())
+                {
+                    o->write_characters("{}", 2);
+                    return;
+                }
+
+                if (pretty_print)
+                {
+                    o->write_characters("{\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    // first n-1 elements
+                    auto i = val.m_data.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_data.m_value.object->size() - 1; ++cnt, ++i)
+                    {
+                        o->write_characters(indent_string.c_str(), new_indent);
+                        o->write_character('\"');
+                        dump_escaped(i->first, ensure_ascii);
+                        o->write_characters("\": ", 3);
+                        dump(i->second, true, ensure_ascii, indent_step, new_indent);
+                        o->write_characters(",\n", 2);
+                    }
+
+                    // last element
+                    JSON_ASSERT(i != val.m_data.m_value.object->cend());
+                    JSON_ASSERT(std::next(i) == val.m_data.m_value.object->cend());
+                    o->write_characters(indent_string.c_str(), new_indent);
+                    o->write_character('\"');
+                    dump_escaped(i->first, ensure_ascii);
+                    o->write_characters("\": ", 3);
+                    dump(i->second, true, ensure_ascii, indent_step, new_indent);
+
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character('}');
+                }
+                else
+                {
+                    o->write_character('{');
+
+                    // first n-1 elements
+                    auto i = val.m_data.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_data.m_value.object->size() - 1; ++cnt, ++i)
+                    {
+                        o->write_character('\"');
+                        dump_escaped(i->first, ensure_ascii);
+                        o->write_characters("\":", 2);
+                        dump(i->second, false, ensure_ascii, indent_step, current_indent);
+                        o->write_character(',');
+                    }
+
+                    // last element
+                    JSON_ASSERT(i != val.m_data.m_value.object->cend());
+                    JSON_ASSERT(std::next(i) == val.m_data.m_value.object->cend());
+                    o->write_character('\"');
+                    dump_escaped(i->first, ensure_ascii);
+                    o->write_characters("\":", 2);
+                    dump(i->second, false, ensure_ascii, indent_step, current_indent);
+
+                    o->write_character('}');
+                }
+
+                return;
+            }
+
+            case value_t::array:
+            {
+                if (val.m_data.m_value.array->empty())
+                {
+                    o->write_characters("[]", 2);
+                    return;
+                }
+
+                if (pretty_print)
+                {
+                    o->write_characters("[\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    // first n-1 elements
+                    for (auto i = val.m_data.m_value.array->cbegin();
+                            i != val.m_data.m_value.array->cend() - 1; ++i)
+                    {
+                        o->write_characters(indent_string.c_str(), new_indent);
+                        dump(*i, true, ensure_ascii, indent_step, new_indent);
+                        o->write_characters(",\n", 2);
+                    }
+
+                    // last element
+                    JSON_ASSERT(!val.m_data.m_value.array->empty());
+                    o->write_characters(indent_string.c_str(), new_indent);
+                    dump(val.m_data.m_value.array->back(), true, ensure_ascii, indent_step, new_indent);
+
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character(']');
+                }
+                else
+                {
+                    o->write_character('[');
+
+                    // first n-1 elements
+                    for (auto i = val.m_data.m_value.array->cbegin();
+                            i != val.m_data.m_value.array->cend() - 1; ++i)
+                    {
+                        dump(*i, false, ensure_ascii, indent_step, current_indent);
+                        o->write_character(',');
+                    }
+
+                    // last element
+                    JSON_ASSERT(!val.m_data.m_value.array->empty());
+                    dump(val.m_data.m_value.array->back(), false, ensure_ascii, indent_step, current_indent);
+
+                    o->write_character(']');
+                }
+
+                return;
+            }
+
+            case value_t::string:
+            {
+                o->write_character('\"');
+                dump_escaped(*val.m_data.m_value.string, ensure_ascii);
+                o->write_character('\"');
+                return;
+            }
+
+            case value_t::binary:
+            {
+                if (pretty_print)
+                {
+                    o->write_characters("{\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    o->write_characters(indent_string.c_str(), new_indent);
+
+                    o->write_characters("\"bytes\": [", 10);
+
+                    if (!val.m_data.m_value.binary->empty())
+                    {
+                        for (auto i = val.m_data.m_value.binary->cbegin();
+                                i != val.m_data.m_value.binary->cend() - 1; ++i)
+                        {
+                            dump_integer(*i);
+                            o->write_characters(", ", 2);
+                        }
+                        dump_integer(val.m_data.m_value.binary->back());
+                    }
+
+                    o->write_characters("],\n", 3);
+                    o->write_characters(indent_string.c_str(), new_indent);
+
+                    o->write_characters("\"subtype\": ", 11);
+                    if (val.m_data.m_value.binary->has_subtype())
+                    {
+                        dump_integer(val.m_data.m_value.binary->subtype());
+                    }
+                    else
+                    {
+                        o->write_characters("null", 4);
+                    }
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character('}');
+                }
+                else
+                {
+                    o->write_characters("{\"bytes\":[", 10);
+
+                    if (!val.m_data.m_value.binary->empty())
+                    {
+                        for (auto i = val.m_data.m_value.binary->cbegin();
+                                i != val.m_data.m_value.binary->cend() - 1; ++i)
+                        {
+                            dump_integer(*i);
+                            o->write_character(',');
+                        }
+                        dump_integer(val.m_data.m_value.binary->back());
+                    }
+
+                    o->write_characters("],\"subtype\":", 12);
+                    if (val.m_data.m_value.binary->has_subtype())
+                    {
+                        dump_integer(val.m_data.m_value.binary->subtype());
+                        o->write_character('}');
+                    }
+                    else
+                    {
+                        o->write_characters("null}", 5);
+                    }
+                }
+                return;
+            }
+
+            case value_t::boolean:
+            {
+                if (val.m_data.m_value.boolean)
+                {
+                    o->write_characters("true", 4);
+                }
+                else
+                {
+                    o->write_characters("false", 5);
+                }
+                return;
+            }
+
+            case value_t::number_integer:
+            {
+                dump_integer(val.m_data.m_value.number_integer);
+                return;
+            }
+
+            case value_t::number_unsigned:
+            {
+                dump_integer(val.m_data.m_value.number_unsigned);
+                return;
+            }
+
+            case value_t::number_float:
+            {
+                dump_float(val.m_data.m_value.number_float);
+                return;
+            }
+
+            case value_t::discarded:
+            {
+                o->write_characters("<discarded>", 11);
+                return;
+            }
+
+            case value_t::null:
+            {
+                o->write_characters("null", 4);
+                return;
+            }
+
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /*!
+    @brief dump escaped string
+
+    Escape a string by replacing certain special characters by a sequence of an
+    escape character (backslash) and another character and other control
+    characters by a sequence of "\u" followed by a four-digit hex
+    representation. The escaped string is written to output stream @a o.
+
+    @param[in] s  the string to escape
+    @param[in] ensure_ascii  whether to escape non-ASCII characters with
+                             \uXXXX sequences
+
+    @complexity Linear in the length of string @a s.
+    */
+    void dump_escaped(const string_t& s, const bool ensure_ascii)
+    {
+        std::uint32_t codepoint{};
+        std::uint8_t state = UTF8_ACCEPT;
+        std::size_t bytes = 0;  // number of bytes written to string_buffer
+
+        // number of bytes written at the point of the last valid byte
+        std::size_t bytes_after_last_accept = 0;
+        std::size_t undumped_chars = 0;
+
+        for (std::size_t i = 0; i < s.size(); ++i)
+        {
+            const auto byte = static_cast<std::uint8_t>(s[i]);
+
+            switch (decode(state, codepoint, byte))
+            {
+                case UTF8_ACCEPT:  // decode found a new code point
+                {
+                    switch (codepoint)
+                    {
+                        case 0x08: // backspace
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'b';
+                            break;
+                        }
+
+                        case 0x09: // horizontal tab
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 't';
+                            break;
+                        }
+
+                        case 0x0A: // newline
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'n';
+                            break;
+                        }
+
+                        case 0x0C: // formfeed
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'f';
+                            break;
+                        }
+
+                        case 0x0D: // carriage return
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'r';
+                            break;
+                        }
+
+                        case 0x22: // quotation mark
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = '\"';
+                            break;
+                        }
+
+                        case 0x5C: // reverse solidus
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = '\\';
+                            break;
+                        }
+
+                        default:
+                        {
+                            // escape control characters (0x00..0x1F) or, if
+                            // ensure_ascii parameter is used, non-ASCII characters
+                            if ((codepoint <= 0x1F) || (ensure_ascii && (codepoint >= 0x7F)))
+                            {
+                                if (codepoint <= 0xFFFF)
+                                {
+                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                                    static_cast<void>((std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x",
+                                                                      static_cast<std::uint16_t>(codepoint)));
+                                    bytes += 6;
+                                }
+                                else
+                                {
+                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                                    static_cast<void>((std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x",
+                                                                      static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)),
+                                                                      static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu))));
+                                    bytes += 12;
+                                }
+                            }
+                            else
+                            {
+                                // copy byte to buffer (all previous bytes
+                                // been copied have in default case above)
+                                string_buffer[bytes++] = s[i];
+                            }
+                            break;
+                        }
+                    }
+
+                    // write buffer and reset index; there must be 13 bytes
+                    // left, as this is the maximal number of bytes to be
+                    // written ("\uxxxx\uxxxx\0") for one code point
+                    if (string_buffer.size() - bytes < 13)
+                    {
+                        o->write_characters(string_buffer.data(), bytes);
+                        bytes = 0;
+                    }
+
+                    // remember the byte position of this accept
+                    bytes_after_last_accept = bytes;
+                    undumped_chars = 0;
+                    break;
+                }
+
+                case UTF8_REJECT:  // decode found invalid UTF-8 byte
+                {
+                    switch (error_handler)
+                    {
+                        case error_handler_t::strict:
+                        {
+                            JSON_THROW(type_error::create(316, concat("invalid UTF-8 byte at index ", std::to_string(i), ": 0x", hex_bytes(byte | 0)), nullptr));
+                        }
+
+                        case error_handler_t::ignore:
+                        case error_handler_t::replace:
+                        {
+                            // in case we saw this character the first time, we
+                            // would like to read it again, because the byte
+                            // may be OK for itself, but just not OK for the
+                            // previous sequence
+                            if (undumped_chars > 0)
+                            {
+                                --i;
+                            }
+
+                            // reset length buffer to the last accepted index;
+                            // thus removing/ignoring the invalid characters
+                            bytes = bytes_after_last_accept;
+
+                            if (error_handler == error_handler_t::replace)
+                            {
+                                // add a replacement character
+                                if (ensure_ascii)
+                                {
+                                    string_buffer[bytes++] = '\\';
+                                    string_buffer[bytes++] = 'u';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'd';
+                                }
+                                else
+                                {
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xEF');
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBF');
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBD');
+                                }
+
+                                // write buffer and reset index; there must be 13 bytes
+                                // left, as this is the maximal number of bytes to be
+                                // written ("\uxxxx\uxxxx\0") for one code point
+                                if (string_buffer.size() - bytes < 13)
+                                {
+                                    o->write_characters(string_buffer.data(), bytes);
+                                    bytes = 0;
+                                }
+
+                                bytes_after_last_accept = bytes;
+                            }
+
+                            undumped_chars = 0;
+
+                            // continue processing the string
+                            state = UTF8_ACCEPT;
+                            break;
+                        }
+
+                        default:            // LCOV_EXCL_LINE
+                            JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+                    }
+                    break;
+                }
+
+                default:  // decode found yet incomplete multi-byte code point
+                {
+                    if (!ensure_ascii)
+                    {
+                        // code point will not be escaped - copy byte to buffer
+                        string_buffer[bytes++] = s[i];
+                    }
+                    ++undumped_chars;
+                    break;
+                }
+            }
+        }
+
+        // we finished processing the string
+        if (JSON_HEDLEY_LIKELY(state == UTF8_ACCEPT))
+        {
+            // write buffer
+            if (bytes > 0)
+            {
+                o->write_characters(string_buffer.data(), bytes);
+            }
+        }
+        else
+        {
+            // we finish reading, but do not accept: string was incomplete
+            switch (error_handler)
+            {
+                case error_handler_t::strict:
+                {
+                    JSON_THROW(type_error::create(316, concat("incomplete UTF-8 string; last byte: 0x", hex_bytes(static_cast<std::uint8_t>(s.back() | 0))), nullptr));
+                }
+
+                case error_handler_t::ignore:
+                {
+                    // write all accepted bytes
+                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
+                    break;
+                }
+
+                case error_handler_t::replace:
+                {
+                    // write all accepted bytes
+                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
+                    // add a replacement character
+                    if (ensure_ascii)
+                    {
+                        o->write_characters("\\ufffd", 6);
+                    }
+                    else
+                    {
+                        o->write_characters("\xEF\xBF\xBD", 3);
+                    }
+                    break;
+                }
+
+                default:            // LCOV_EXCL_LINE
+                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+            }
+        }
+    }
+
+  private:
+    /*!
+    @brief count digits
+
+    Count the number of decimal (base 10) digits for an input unsigned integer.
+
+    @param[in] x  unsigned integer number to count its digits
+    @return    number of decimal digits
+    */
+    inline unsigned int count_digits(number_unsigned_t x) noexcept
+    {
+        unsigned int n_digits = 1;
+        for (;;)
+        {
+            if (x < 10)
+            {
+                return n_digits;
+            }
+            if (x < 100)
+            {
+                return n_digits + 1;
+            }
+            if (x < 1000)
+            {
+                return n_digits + 2;
+            }
+            if (x < 10000)
+            {
+                return n_digits + 3;
+            }
+            x = x / 10000u;
+            n_digits += 4;
+        }
+    }
+
+    /*!
+     * @brief convert a byte to a uppercase hex representation
+     * @param[in] byte byte to represent
+     * @return representation ("00".."FF")
+     */
+    static std::string hex_bytes(std::uint8_t byte)
+    {
+        std::string result = "FF";
+        constexpr const char* nibble_to_hex = "0123456789ABCDEF";
+        result[0] = nibble_to_hex[byte / 16];
+        result[1] = nibble_to_hex[byte % 16];
+        return result;
+    }
+
+    // templates to avoid warnings about useless casts
+    template <typename NumberType, enable_if_t<std::is_signed<NumberType>::value, int> = 0>
+    bool is_negative_number(NumberType x)
+    {
+        return x < 0;
+    }
+
+    template < typename NumberType, enable_if_t <std::is_unsigned<NumberType>::value, int > = 0 >
+    bool is_negative_number(NumberType /*unused*/)
+    {
+        return false;
+    }
+
+    /*!
+    @brief dump an integer
+
+    Dump a given integer to output stream @a o. Works internally with
+    @a number_buffer.
+
+    @param[in] x  integer number (signed or unsigned) to dump
+    @tparam NumberType either @a number_integer_t or @a number_unsigned_t
+    */
+    template < typename NumberType, detail::enable_if_t <
+                   std::is_integral<NumberType>::value ||
+                   std::is_same<NumberType, number_unsigned_t>::value ||
+                   std::is_same<NumberType, number_integer_t>::value ||
+                   std::is_same<NumberType, binary_char_t>::value,
+                   int > = 0 >
+    void dump_integer(NumberType x)
+    {
+        static constexpr std::array<std::array<char, 2>, 100> digits_to_99
+        {
+            {
+                {{'0', '0'}}, {{'0', '1'}}, {{'0', '2'}}, {{'0', '3'}}, {{'0', '4'}}, {{'0', '5'}}, {{'0', '6'}}, {{'0', '7'}}, {{'0', '8'}}, {{'0', '9'}},
+                {{'1', '0'}}, {{'1', '1'}}, {{'1', '2'}}, {{'1', '3'}}, {{'1', '4'}}, {{'1', '5'}}, {{'1', '6'}}, {{'1', '7'}}, {{'1', '8'}}, {{'1', '9'}},
+                {{'2', '0'}}, {{'2', '1'}}, {{'2', '2'}}, {{'2', '3'}}, {{'2', '4'}}, {{'2', '5'}}, {{'2', '6'}}, {{'2', '7'}}, {{'2', '8'}}, {{'2', '9'}},
+                {{'3', '0'}}, {{'3', '1'}}, {{'3', '2'}}, {{'3', '3'}}, {{'3', '4'}}, {{'3', '5'}}, {{'3', '6'}}, {{'3', '7'}}, {{'3', '8'}}, {{'3', '9'}},
+                {{'4', '0'}}, {{'4', '1'}}, {{'4', '2'}}, {{'4', '3'}}, {{'4', '4'}}, {{'4', '5'}}, {{'4', '6'}}, {{'4', '7'}}, {{'4', '8'}}, {{'4', '9'}},
+                {{'5', '0'}}, {{'5', '1'}}, {{'5', '2'}}, {{'5', '3'}}, {{'5', '4'}}, {{'5', '5'}}, {{'5', '6'}}, {{'5', '7'}}, {{'5', '8'}}, {{'5', '9'}},
+                {{'6', '0'}}, {{'6', '1'}}, {{'6', '2'}}, {{'6', '3'}}, {{'6', '4'}}, {{'6', '5'}}, {{'6', '6'}}, {{'6', '7'}}, {{'6', '8'}}, {{'6', '9'}},
+                {{'7', '0'}}, {{'7', '1'}}, {{'7', '2'}}, {{'7', '3'}}, {{'7', '4'}}, {{'7', '5'}}, {{'7', '6'}}, {{'7', '7'}}, {{'7', '8'}}, {{'7', '9'}},
+                {{'8', '0'}}, {{'8', '1'}}, {{'8', '2'}}, {{'8', '3'}}, {{'8', '4'}}, {{'8', '5'}}, {{'8', '6'}}, {{'8', '7'}}, {{'8', '8'}}, {{'8', '9'}},
+                {{'9', '0'}}, {{'9', '1'}}, {{'9', '2'}}, {{'9', '3'}}, {{'9', '4'}}, {{'9', '5'}}, {{'9', '6'}}, {{'9', '7'}}, {{'9', '8'}}, {{'9', '9'}},
+            }
+        };
+
+        // special case for "0"
+        if (x == 0)
+        {
+            o->write_character('0');
+            return;
+        }
+
+        // use a pointer to fill the buffer
+        auto buffer_ptr = number_buffer.begin(); // NOLINT(llvm-qualified-auto,readability-qualified-auto,cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+
+        number_unsigned_t abs_value;
+
+        unsigned int n_chars{};
+
+        if (is_negative_number(x))
+        {
+            *buffer_ptr = '-';
+            abs_value = remove_sign(static_cast<number_integer_t>(x));
+
+            // account one more byte for the minus sign
+            n_chars = 1 + count_digits(abs_value);
+        }
+        else
+        {
+            abs_value = static_cast<number_unsigned_t>(x);
+            n_chars = count_digits(abs_value);
+        }
+
+        // spare 1 byte for '\0'
+        JSON_ASSERT(n_chars < number_buffer.size() - 1);
+
+        // jump to the end to generate the string from backward,
+        // so we later avoid reversing the result
+        buffer_ptr += n_chars;
+
+        // Fast int2ascii implementation inspired by "Fastware" talk by Andrei Alexandrescu
+        // See: https://www.youtube.com/watch?v=o4-CwDo2zpg
+        while (abs_value >= 100)
+        {
+            const auto digits_index = static_cast<unsigned>((abs_value % 100));
+            abs_value /= 100;
+            *(--buffer_ptr) = digits_to_99[digits_index][1];
+            *(--buffer_ptr) = digits_to_99[digits_index][0];
+        }
+
+        if (abs_value >= 10)
+        {
+            const auto digits_index = static_cast<unsigned>(abs_value);
+            *(--buffer_ptr) = digits_to_99[digits_index][1];
+            *(--buffer_ptr) = digits_to_99[digits_index][0];
+        }
+        else
+        {
+            *(--buffer_ptr) = static_cast<char>('0' + abs_value);
+        }
+
+        o->write_characters(number_buffer.data(), n_chars);
+    }
+
+    /*!
+    @brief dump a floating-point number
+
+    Dump a given floating-point number to output stream @a o. Works internally
+    with @a number_buffer.
+
+    @param[in] x  floating-point number to dump
+    */
+    void dump_float(number_float_t x)
+    {
+        // NaN / inf
+        if (!std::isfinite(x))
+        {
+            o->write_characters("null", 4);
+            return;
+        }
+
+        // If number_float_t is an IEEE-754 single or double precision number,
+        // use the Grisu2 algorithm to produce short numbers which are
+        // guaranteed to round-trip, using strtof and strtod, resp.
+        //
+        // NB: The test below works if <long double> == <double>.
+        static constexpr bool is_ieee_single_or_double
+            = (std::numeric_limits<number_float_t>::is_iec559 && std::numeric_limits<number_float_t>::digits == 24 && std::numeric_limits<number_float_t>::max_exponent == 128) ||
+              (std::numeric_limits<number_float_t>::is_iec559 && std::numeric_limits<number_float_t>::digits == 53 && std::numeric_limits<number_float_t>::max_exponent == 1024);
+
+        dump_float(x, std::integral_constant<bool, is_ieee_single_or_double>());
+    }
+
+    void dump_float(number_float_t x, std::true_type /*is_ieee_single_or_double*/)
+    {
+        auto* begin = number_buffer.data();
+        auto* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x);
+
+        o->write_characters(begin, static_cast<size_t>(end - begin));
+    }
+
+    void dump_float(number_float_t x, std::false_type /*is_ieee_single_or_double*/)
+    {
+        // get number of digits for a float -> text -> float round-trip
+        static constexpr auto d = std::numeric_limits<number_float_t>::max_digits10;
+
+        // the actual conversion
+        // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+        std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x);
+
+        // negative value indicates an error
+        JSON_ASSERT(len > 0);
+        // check if buffer was large enough
+        JSON_ASSERT(static_cast<std::size_t>(len) < number_buffer.size());
+
+        // erase thousands separator
+        if (thousands_sep != '\0')
+        {
+            // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::remove returns an iterator, see https://github.com/nlohmann/json/issues/3081
+            const auto end = std::remove(number_buffer.begin(), number_buffer.begin() + len, thousands_sep);
+            std::fill(end, number_buffer.end(), '\0');
+            JSON_ASSERT((end - number_buffer.begin()) <= len);
+            len = (end - number_buffer.begin());
+        }
+
+        // convert decimal point to '.'
+        if (decimal_point != '\0' && decimal_point != '.')
+        {
+            // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::find returns an iterator, see https://github.com/nlohmann/json/issues/3081
+            const auto dec_pos = std::find(number_buffer.begin(), number_buffer.end(), decimal_point);
+            if (dec_pos != number_buffer.end())
+            {
+                *dec_pos = '.';
+            }
+        }
+
+        o->write_characters(number_buffer.data(), static_cast<std::size_t>(len));
+
+        // determine if we need to append ".0"
+        const bool value_is_int_like =
+            std::none_of(number_buffer.begin(), number_buffer.begin() + len + 1,
+                         [](char c)
+        {
+            return c == '.' || c == 'e';
+        });
+
+        if (value_is_int_like)
+        {
+            o->write_characters(".0", 2);
+        }
+    }
+
+    /*!
+    @brief check whether a string is UTF-8 encoded
+
+    The function checks each byte of a string whether it is UTF-8 encoded. The
+    result of the check is stored in the @a state parameter. The function must
+    be called initially with state 0 (accept). State 1 means the string must
+    be rejected, because the current byte is not allowed. If the string is
+    completely processed, but the state is non-zero, the string ended
+    prematurely; that is, the last byte indicated more bytes should have
+    followed.
+
+    @param[in,out] state  the state of the decoding
+    @param[in,out] codep  codepoint (valid only if resulting state is UTF8_ACCEPT)
+    @param[in] byte       next byte to decode
+    @return               new state
+
+    @note The function has been edited: a std::array is used.
+
+    @copyright Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
+    @sa http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
+    */
+    static std::uint8_t decode(std::uint8_t& state, std::uint32_t& codep, const std::uint8_t byte) noexcept
+    {
+        static const std::array<std::uint8_t, 400> utf8d =
+        {
+            {
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 00..1F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 20..3F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 40..5F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 60..7F
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, // 80..9F
+                7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // A0..BF
+                8, 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // C0..DF
+                0xA, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x3, 0x3, // E0..EF
+                0xB, 0x6, 0x6, 0x6, 0x5, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, // F0..FF
+                0x0, 0x1, 0x2, 0x3, 0x5, 0x8, 0x7, 0x1, 0x1, 0x1, 0x4, 0x6, 0x1, 0x1, 0x1, 0x1, // s0..s0
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, // s1..s2
+                1, 2, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, // s3..s4
+                1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, // s5..s6
+                1, 3, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 // s7..s8
+            }
+        };
+
+        JSON_ASSERT(byte < utf8d.size());
+        const std::uint8_t type = utf8d[byte];
+
+        codep = (state != UTF8_ACCEPT)
+                ? (byte & 0x3fu) | (codep << 6u)
+                : (0xFFu >> type) & (byte);
+
+        const std::size_t index = 256u + static_cast<size_t>(state) * 16u + static_cast<size_t>(type);
+        JSON_ASSERT(index < utf8d.size());
+        state = utf8d[index];
+        return state;
+    }
+
+    /*
+     * Overload to make the compiler happy while it is instantiating
+     * dump_integer for number_unsigned_t.
+     * Must never be called.
+     */
+    number_unsigned_t remove_sign(number_unsigned_t x)
+    {
+        JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        return x; // LCOV_EXCL_LINE
+    }
+
+    /*
+     * Helper function for dump_integer
+     *
+     * This function takes a negative signed integer and returns its absolute
+     * value as unsigned integer. The plus/minus shuffling is necessary as we can
+     * not directly remove the sign of an arbitrary signed integer as the
+     * absolute values of INT_MIN and INT_MAX are usually not the same. See
+     * #1708 for details.
+     */
+    inline number_unsigned_t remove_sign(number_integer_t x) noexcept
+    {
+        JSON_ASSERT(x < 0 && x < (std::numeric_limits<number_integer_t>::max)()); // NOLINT(misc-redundant-expression)
+        return static_cast<number_unsigned_t>(-(x + 1)) + 1;
+    }
+
+  private:
+    /// the output of the serializer
+    output_adapter_t<char> o = nullptr;
+
+    /// a (hopefully) large enough character buffer
+    std::array<char, 64> number_buffer{{}};
+
+    /// the locale
+    const std::lconv* loc = nullptr;
+    /// the locale's thousand separator character
+    const char thousands_sep = '\0';
+    /// the locale's decimal point character
+    const char decimal_point = '\0';
+
+    /// string buffer
+    std::array<char, 512> string_buffer{{}};
+
+    /// the indentation character
+    const char indent_char;
+    /// the indentation string
+    string_t indent_string;
+
+    /// error_handler how to react on decoding errors
+    const error_handler_t error_handler;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/value_t.hpp>
+
+// #include <nlohmann/json_fwd.hpp>
+
+// #include <nlohmann/ordered_map.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <functional> // equal_to, less
+#include <initializer_list> // initializer_list
+#include <iterator> // input_iterator_tag, iterator_traits
+#include <memory> // allocator
+#include <stdexcept> // for out_of_range
+#include <type_traits> // enable_if, is_convertible
+#include <utility> // pair
+#include <vector> // vector
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/// ordered_map: a minimal map-like container that preserves insertion order
+/// for use within nlohmann::basic_json<ordered_map>
+template <class Key, class T, class IgnoredLess = std::less<Key>,
+          class Allocator = std::allocator<std::pair<const Key, T>>>
+                  struct ordered_map : std::vector<std::pair<const Key, T>, Allocator>
+{
+    using key_type = Key;
+    using mapped_type = T;
+    using Container = std::vector<std::pair<const Key, T>, Allocator>;
+    using iterator = typename Container::iterator;
+    using const_iterator = typename Container::const_iterator;
+    using size_type = typename Container::size_type;
+    using value_type = typename Container::value_type;
+#ifdef JSON_HAS_CPP_14
+    using key_compare = std::equal_to<>;
+#else
+    using key_compare = std::equal_to<Key>;
+#endif
+
+    // Explicit constructors instead of `using Container::Container`
+    // otherwise older compilers choke on it (GCC <= 5.5, xcode <= 9.4)
+    ordered_map() noexcept(noexcept(Container())) : Container{} {}
+    explicit ordered_map(const Allocator& alloc) noexcept(noexcept(Container(alloc))) : Container{alloc} {}
+    template <class It>
+    ordered_map(It first, It last, const Allocator& alloc = Allocator())
+        : Container{first, last, alloc} {}
+    ordered_map(std::initializer_list<value_type> init, const Allocator& alloc = Allocator() )
+        : Container{init, alloc} {}
+
+    std::pair<iterator, bool> emplace(const key_type& key, T&& t)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return {it, false};
+            }
+        }
+        Container::emplace_back(key, std::forward<T>(t));
+        return {std::prev(this->end()), true};
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    std::pair<iterator, bool> emplace(KeyType && key, T && t)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return {it, false};
+            }
+        }
+        Container::emplace_back(std::forward<KeyType>(key), std::forward<T>(t));
+        return {std::prev(this->end()), true};
+    }
+
+    T& operator[](const key_type& key)
+    {
+        return emplace(key, T{}).first->second;
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    T & operator[](KeyType && key)
+    {
+        return emplace(std::forward<KeyType>(key), T{}).first->second;
+    }
+
+    const T& operator[](const key_type& key) const
+    {
+        return at(key);
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    const T & operator[](KeyType && key) const
+    {
+        return at(std::forward<KeyType>(key));
+    }
+
+    T& at(const key_type& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    T & at(KeyType && key) // NOLINT(cppcoreguidelines-missing-std-forward)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    const T& at(const key_type& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    const T & at(KeyType && key) const // NOLINT(cppcoreguidelines-missing-std-forward)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    size_type erase(const key_type& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                // Since we cannot move const Keys, re-construct them in place
+                for (auto next = it; ++next != this->end(); ++it)
+                {
+                    it->~value_type(); // Destroy but keep allocation
+                    new (&*it) value_type{std::move(*next)};
+                }
+                Container::pop_back();
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    size_type erase(KeyType && key) // NOLINT(cppcoreguidelines-missing-std-forward)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                // Since we cannot move const Keys, re-construct them in place
+                for (auto next = it; ++next != this->end(); ++it)
+                {
+                    it->~value_type(); // Destroy but keep allocation
+                    new (&*it) value_type{std::move(*next)};
+                }
+                Container::pop_back();
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    iterator erase(iterator pos)
+    {
+        return erase(pos, std::next(pos));
+    }
+
+    iterator erase(iterator first, iterator last)
+    {
+        if (first == last)
+        {
+            return first;
+        }
+
+        const auto elements_affected = std::distance(first, last);
+        const auto offset = std::distance(Container::begin(), first);
+
+        // This is the start situation. We need to delete elements_affected
+        // elements (3 in this example: e, f, g), and need to return an
+        // iterator past the last deleted element (h in this example).
+        // Note that offset is the distance from the start of the vector
+        // to first. We will need this later.
+
+        // [ a, b, c, d, e, f, g, h, i, j ]
+        //               ^        ^
+        //             first    last
+
+        // Since we cannot move const Keys, we re-construct them in place.
+        // We start at first and re-construct (viz. copy) the elements from
+        // the back of the vector. Example for first iteration:
+
+        //               ,--------.
+        //               v        |   destroy e and re-construct with h
+        // [ a, b, c, d, e, f, g, h, i, j ]
+        //               ^        ^
+        //               it       it + elements_affected
+
+        for (auto it = first; std::next(it, elements_affected) != Container::end(); ++it)
+        {
+            it->~value_type(); // destroy but keep allocation
+            new (&*it) value_type{std::move(*std::next(it, elements_affected))}; // "move" next element to it
+        }
+
+        // [ a, b, c, d, h, i, j, h, i, j ]
+        //               ^        ^
+        //             first    last
+
+        // remove the unneeded elements at the end of the vector
+        Container::resize(this->size() - static_cast<size_type>(elements_affected));
+
+        // [ a, b, c, d, h, i, j ]
+        //               ^        ^
+        //             first    last
+
+        // first is now pointing past the last deleted element, but we cannot
+        // use this iterator, because it may have been invalidated by the
+        // resize call. Instead, we can return begin() + offset.
+        return Container::begin() + offset;
+    }
+
+    size_type count(const key_type& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    size_type count(KeyType && key) const // NOLINT(cppcoreguidelines-missing-std-forward)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    iterator find(const key_type& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it;
+            }
+        }
+        return Container::end();
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    iterator find(KeyType && key) // NOLINT(cppcoreguidelines-missing-std-forward)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it;
+            }
+        }
+        return Container::end();
+    }
+
+    const_iterator find(const key_type& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it;
+            }
+        }
+        return Container::end();
+    }
+
+    std::pair<iterator, bool> insert( value_type&& value )
+    {
+        return emplace(value.first, std::move(value.second));
+    }
+
+    std::pair<iterator, bool> insert( const value_type& value )
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, value.first))
+            {
+                return {it, false};
+            }
+        }
+        Container::push_back(value);
+        return {--this->end(), true};
+    }
+
+    template<typename InputIt>
+    using require_input_iter = typename std::enable_if<std::is_convertible<typename std::iterator_traits<InputIt>::iterator_category,
+            std::input_iterator_tag>::value>::type;
+
+    template<typename InputIt, typename = require_input_iter<InputIt>>
+    void insert(InputIt first, InputIt last)
+    {
+        for (auto it = first; it != last; ++it)
+        {
+            insert(*it);
+        }
+    }
+
+private:
+    JSON_NO_UNIQUE_ADDRESS key_compare m_compare = key_compare();
+};
+
+NLOHMANN_JSON_NAMESPACE_END
+
+
+#if defined(JSON_HAS_CPP_17)
+    #if JSON_HAS_STATIC_RTTI
+        #include <any>
+    #endif
+    #include <string_view>
+#endif
+
+/*!
+@brief namespace for Niels Lohmann
+@see https://github.com/nlohmann
+@since version 1.0.0
+*/
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/*!
+@brief a class to store JSON values
+
+@internal
+@invariant The member variables @a m_value and @a m_type have the following
+relationship:
+- If `m_type == value_t::object`, then `m_value.object != nullptr`.
+- If `m_type == value_t::array`, then `m_value.array != nullptr`.
+- If `m_type == value_t::string`, then `m_value.string != nullptr`.
+The invariants are checked by member function assert_invariant().
+
+@note ObjectType trick from https://stackoverflow.com/a/9860911
+@endinternal
+
+@since version 1.0.0
+
+@nosubgrouping
+*/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
+    : public ::nlohmann::detail::json_base_class<CustomBaseClass>
+{
+  private:
+    template<detail::value_t> friend struct detail::external_constructor;
+
+    template<typename>
+    friend class ::nlohmann::json_pointer;
+    // can be restored when json_pointer backwards compatibility is removed
+    // friend ::nlohmann::json_pointer<StringType>;
+
+    template<typename BasicJsonType, typename InputType>
+    friend class ::nlohmann::detail::parser;
+    friend ::nlohmann::detail::serializer<basic_json>;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::iter_impl;
+    template<typename BasicJsonType, typename CharType>
+    friend class ::nlohmann::detail::binary_writer;
+    template<typename BasicJsonType, typename InputType, typename SAX>
+    friend class ::nlohmann::detail::binary_reader;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::json_sax_dom_parser;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::json_sax_dom_callback_parser;
+    friend class ::nlohmann::detail::exception;
+
+    /// workaround type for MSVC
+    using basic_json_t = NLOHMANN_BASIC_JSON_TPL;
+    using json_base_class_t = ::nlohmann::detail::json_base_class<CustomBaseClass>;
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    // convenience aliases for types residing in namespace detail;
+    using lexer = ::nlohmann::detail::lexer_base<basic_json>;
+
+    template<typename InputAdapterType>
+    static ::nlohmann::detail::parser<basic_json, InputAdapterType> parser(
+        InputAdapterType adapter,
+        detail::parser_callback_t<basic_json>cb = nullptr,
+        const bool allow_exceptions = true,
+        const bool ignore_comments = false
+                                 )
+    {
+        return ::nlohmann::detail::parser<basic_json, InputAdapterType>(std::move(adapter),
+                std::move(cb), allow_exceptions, ignore_comments);
+    }
+
+  private:
+    using primitive_iterator_t = ::nlohmann::detail::primitive_iterator_t;
+    template<typename BasicJsonType>
+    using internal_iterator = ::nlohmann::detail::internal_iterator<BasicJsonType>;
+    template<typename BasicJsonType>
+    using iter_impl = ::nlohmann::detail::iter_impl<BasicJsonType>;
+    template<typename Iterator>
+    using iteration_proxy = ::nlohmann::detail::iteration_proxy<Iterator>;
+    template<typename Base> using json_reverse_iterator = ::nlohmann::detail::json_reverse_iterator<Base>;
+
+    template<typename CharType>
+    using output_adapter_t = ::nlohmann::detail::output_adapter_t<CharType>;
+
+    template<typename InputType>
+    using binary_reader = ::nlohmann::detail::binary_reader<basic_json, InputType>;
+    template<typename CharType> using binary_writer = ::nlohmann::detail::binary_writer<basic_json, CharType>;
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    using serializer = ::nlohmann::detail::serializer<basic_json>;
+
+  public:
+    using value_t = detail::value_t;
+    /// JSON Pointer, see @ref nlohmann::json_pointer
+    using json_pointer = ::nlohmann::json_pointer<StringType>;
+    template<typename T, typename SFINAE>
+    using json_serializer = JSONSerializer<T, SFINAE>;
+    /// how to treat decoding errors
+    using error_handler_t = detail::error_handler_t;
+    /// how to treat CBOR tags
+    using cbor_tag_handler_t = detail::cbor_tag_handler_t;
+    /// helper type for initializer lists of basic_json values
+    using initializer_list_t = std::initializer_list<detail::json_ref<basic_json>>;
+
+    using input_format_t = detail::input_format_t;
+    /// SAX interface type, see @ref nlohmann::json_sax
+    using json_sax_t = json_sax<basic_json>;
+
+    ////////////////
+    // exceptions //
+    ////////////////
+
+    /// @name exceptions
+    /// Classes to implement user-defined exceptions.
+    /// @{
+
+    using exception = detail::exception;
+    using parse_error = detail::parse_error;
+    using invalid_iterator = detail::invalid_iterator;
+    using type_error = detail::type_error;
+    using out_of_range = detail::out_of_range;
+    using other_error = detail::other_error;
+
+    /// @}
+
+    /////////////////////
+    // container types //
+    /////////////////////
+
+    /// @name container types
+    /// The canonic container types to use @ref basic_json like any other STL
+    /// container.
+    /// @{
+
+    /// the type of elements in a basic_json container
+    using value_type = basic_json;
+
+    /// the type of an element reference
+    using reference = value_type&;
+    /// the type of an element const reference
+    using const_reference = const value_type&;
+
+    /// a type to represent differences between iterators
+    using difference_type = std::ptrdiff_t;
+    /// a type to represent container sizes
+    using size_type = std::size_t;
+
+    /// the allocator type
+    using allocator_type = AllocatorType<basic_json>;
+
+    /// the type of an element pointer
+    using pointer = typename std::allocator_traits<allocator_type>::pointer;
+    /// the type of an element const pointer
+    using const_pointer = typename std::allocator_traits<allocator_type>::const_pointer;
+
+    /// an iterator for a basic_json container
+    using iterator = iter_impl<basic_json>;
+    /// a const iterator for a basic_json container
+    using const_iterator = iter_impl<const basic_json>;
+    /// a reverse iterator for a basic_json container
+    using reverse_iterator = json_reverse_iterator<typename basic_json::iterator>;
+    /// a const reverse iterator for a basic_json container
+    using const_reverse_iterator = json_reverse_iterator<typename basic_json::const_iterator>;
+
+    /// @}
+
+    /// @brief returns the allocator associated with the container
+    /// @sa https://json.nlohmann.me/api/basic_json/get_allocator/
+    static allocator_type get_allocator()
+    {
+        return allocator_type();
+    }
+
+    /// @brief returns version information on the library
+    /// @sa https://json.nlohmann.me/api/basic_json/meta/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json meta()
+    {
+        basic_json result;
+
+        result["copyright"] = "(C) 2013-2023 Niels Lohmann";
+        result["name"] = "JSON for Modern C++";
+        result["url"] = "https://github.com/nlohmann/json";
+        result["version"]["string"] =
+            detail::concat(std::to_string(NLOHMANN_JSON_VERSION_MAJOR), '.',
+                           std::to_string(NLOHMANN_JSON_VERSION_MINOR), '.',
+                           std::to_string(NLOHMANN_JSON_VERSION_PATCH));
+        result["version"]["major"] = NLOHMANN_JSON_VERSION_MAJOR;
+        result["version"]["minor"] = NLOHMANN_JSON_VERSION_MINOR;
+        result["version"]["patch"] = NLOHMANN_JSON_VERSION_PATCH;
+
+#ifdef _WIN32
+        result["platform"] = "win32";
+#elif defined __linux__
+        result["platform"] = "linux";
+#elif defined __APPLE__
+        result["platform"] = "apple";
+#elif defined __unix__
+        result["platform"] = "unix";
+#else
+        result["platform"] = "unknown";
+#endif
+
+#if defined(__ICC) || defined(__INTEL_COMPILER)
+        result["compiler"] = {{"family", "icc"}, {"version", __INTEL_COMPILER}};
+#elif defined(__clang__)
+        result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
+#elif defined(__GNUC__) || defined(__GNUG__)
+        result["compiler"] = {{"family", "gcc"}, {"version", detail::concat(
+                    std::to_string(__GNUC__), '.',
+                    std::to_string(__GNUC_MINOR__), '.',
+                    std::to_string(__GNUC_PATCHLEVEL__))
+            }
+        };
+#elif defined(__HP_cc) || defined(__HP_aCC)
+        result["compiler"] = "hp"
+#elif defined(__IBMCPP__)
+        result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}};
+#elif defined(_MSC_VER)
+        result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}};
+#elif defined(__PGI)
+        result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}};
+#elif defined(__SUNPRO_CC)
+        result["compiler"] = {{"family", "sunpro"}, {"version", __SUNPRO_CC}};
+#else
+        result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
+#endif
+
+#if defined(_MSVC_LANG)
+        result["compiler"]["c++"] = std::to_string(_MSVC_LANG);
+#elif defined(__cplusplus)
+        result["compiler"]["c++"] = std::to_string(__cplusplus);
+#else
+        result["compiler"]["c++"] = "unknown";
+#endif
+        return result;
+    }
+
+    ///////////////////////////
+    // JSON value data types //
+    ///////////////////////////
+
+    /// @name JSON value data types
+    /// The data types to store a JSON value. These types are derived from
+    /// the template arguments passed to class @ref basic_json.
+    /// @{
+
+    /// @brief default object key comparator type
+    /// The actual object key comparator type (@ref object_comparator_t) may be
+    /// different.
+    /// @sa https://json.nlohmann.me/api/basic_json/default_object_comparator_t/
+#if defined(JSON_HAS_CPP_14)
+    // use of transparent comparator avoids unnecessary repeated construction of temporaries
+    // in functions involving lookup by key with types other than object_t::key_type (aka. StringType)
+    using default_object_comparator_t = std::less<>;
+#else
+    using default_object_comparator_t = std::less<StringType>;
+#endif
+
+    /// @brief a type for an object
+    /// @sa https://json.nlohmann.me/api/basic_json/object_t/
+    using object_t = ObjectType<StringType,
+          basic_json,
+          default_object_comparator_t,
+          AllocatorType<std::pair<const StringType,
+          basic_json>>>;
+
+    /// @brief a type for an array
+    /// @sa https://json.nlohmann.me/api/basic_json/array_t/
+    using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
+
+    /// @brief a type for a string
+    /// @sa https://json.nlohmann.me/api/basic_json/string_t/
+    using string_t = StringType;
+
+    /// @brief a type for a boolean
+    /// @sa https://json.nlohmann.me/api/basic_json/boolean_t/
+    using boolean_t = BooleanType;
+
+    /// @brief a type for a number (integer)
+    /// @sa https://json.nlohmann.me/api/basic_json/number_integer_t/
+    using number_integer_t = NumberIntegerType;
+
+    /// @brief a type for a number (unsigned)
+    /// @sa https://json.nlohmann.me/api/basic_json/number_unsigned_t/
+    using number_unsigned_t = NumberUnsignedType;
+
+    /// @brief a type for a number (floating-point)
+    /// @sa https://json.nlohmann.me/api/basic_json/number_float_t/
+    using number_float_t = NumberFloatType;
+
+    /// @brief a type for a packed binary type
+    /// @sa https://json.nlohmann.me/api/basic_json/binary_t/
+    using binary_t = nlohmann::byte_container_with_subtype<BinaryType>;
+
+    /// @brief object key comparator type
+    /// @sa https://json.nlohmann.me/api/basic_json/object_comparator_t/
+    using object_comparator_t = detail::actual_object_comparator_t<basic_json>;
+
+    /// @}
+
+  private:
+
+    /// helper for exception-safe object creation
+    template<typename T, typename... Args>
+    JSON_HEDLEY_RETURNS_NON_NULL
+    static T* create(Args&& ... args)
+    {
+        AllocatorType<T> alloc;
+        using AllocatorTraits = std::allocator_traits<AllocatorType<T>>;
+
+        auto deleter = [&](T * obj)
+        {
+            AllocatorTraits::deallocate(alloc, obj, 1);
+        };
+        std::unique_ptr<T, decltype(deleter)> obj(AllocatorTraits::allocate(alloc, 1), deleter);
+        AllocatorTraits::construct(alloc, obj.get(), std::forward<Args>(args)...);
+        JSON_ASSERT(obj != nullptr);
+        return obj.release();
+    }
+
+    ////////////////////////
+    // JSON value storage //
+    ////////////////////////
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /*!
+    @brief a JSON value
+
+    The actual storage for a JSON value of the @ref basic_json class. This
+    union combines the different storage types for the JSON value types
+    defined in @ref value_t.
+
+    JSON type | value_t type    | used type
+    --------- | --------------- | ------------------------
+    object    | object          | pointer to @ref object_t
+    array     | array           | pointer to @ref array_t
+    string    | string          | pointer to @ref string_t
+    boolean   | boolean         | @ref boolean_t
+    number    | number_integer  | @ref number_integer_t
+    number    | number_unsigned | @ref number_unsigned_t
+    number    | number_float    | @ref number_float_t
+    binary    | binary          | pointer to @ref binary_t
+    null      | null            | *no value is stored*
+
+    @note Variable-length types (objects, arrays, and strings) are stored as
+    pointers. The size of the union should not exceed 64 bits if the default
+    value types are used.
+
+    @since version 1.0.0
+    */
+    union json_value
+    {
+        /// object (stored with pointer to save storage)
+        object_t* object;
+        /// array (stored with pointer to save storage)
+        array_t* array;
+        /// string (stored with pointer to save storage)
+        string_t* string;
+        /// binary (stored with pointer to save storage)
+        binary_t* binary;
+        /// boolean
+        boolean_t boolean;
+        /// number (integer)
+        number_integer_t number_integer;
+        /// number (unsigned integer)
+        number_unsigned_t number_unsigned;
+        /// number (floating-point)
+        number_float_t number_float;
+
+        /// default constructor (for null values)
+        json_value() = default;
+        /// constructor for booleans
+        json_value(boolean_t v) noexcept : boolean(v) {}
+        /// constructor for numbers (integer)
+        json_value(number_integer_t v) noexcept : number_integer(v) {}
+        /// constructor for numbers (unsigned)
+        json_value(number_unsigned_t v) noexcept : number_unsigned(v) {}
+        /// constructor for numbers (floating-point)
+        json_value(number_float_t v) noexcept : number_float(v) {}
+        /// constructor for empty values of a given type
+        json_value(value_t t)
+        {
+            switch (t)
+            {
+                case value_t::object:
+                {
+                    object = create<object_t>();
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    array = create<array_t>();
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    string = create<string_t>("");
+                    break;
+                }
+
+                case value_t::binary:
+                {
+                    binary = create<binary_t>();
+                    break;
+                }
+
+                case value_t::boolean:
+                {
+                    boolean = static_cast<boolean_t>(false);
+                    break;
+                }
+
+                case value_t::number_integer:
+                {
+                    number_integer = static_cast<number_integer_t>(0);
+                    break;
+                }
+
+                case value_t::number_unsigned:
+                {
+                    number_unsigned = static_cast<number_unsigned_t>(0);
+                    break;
+                }
+
+                case value_t::number_float:
+                {
+                    number_float = static_cast<number_float_t>(0.0);
+                    break;
+                }
+
+                case value_t::null:
+                {
+                    object = nullptr;  // silence warning, see #821
+                    break;
+                }
+
+                case value_t::discarded:
+                default:
+                {
+                    object = nullptr;  // silence warning, see #821
+                    if (JSON_HEDLEY_UNLIKELY(t == value_t::null))
+                    {
+                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.11.3", nullptr)); // LCOV_EXCL_LINE
+                    }
+                    break;
+                }
+            }
+        }
+
+        /// constructor for strings
+        json_value(const string_t& value) : string(create<string_t>(value)) {}
+
+        /// constructor for rvalue strings
+        json_value(string_t&& value) : string(create<string_t>(std::move(value))) {}
+
+        /// constructor for objects
+        json_value(const object_t& value) : object(create<object_t>(value)) {}
+
+        /// constructor for rvalue objects
+        json_value(object_t&& value) : object(create<object_t>(std::move(value))) {}
+
+        /// constructor for arrays
+        json_value(const array_t& value) : array(create<array_t>(value)) {}
+
+        /// constructor for rvalue arrays
+        json_value(array_t&& value) : array(create<array_t>(std::move(value))) {}
+
+        /// constructor for binary arrays
+        json_value(const typename binary_t::container_type& value) : binary(create<binary_t>(value)) {}
+
+        /// constructor for rvalue binary arrays
+        json_value(typename binary_t::container_type&& value) : binary(create<binary_t>(std::move(value))) {}
+
+        /// constructor for binary arrays (internal type)
+        json_value(const binary_t& value) : binary(create<binary_t>(value)) {}
+
+        /// constructor for rvalue binary arrays (internal type)
+        json_value(binary_t&& value) : binary(create<binary_t>(std::move(value))) {}
+
+        void destroy(value_t t)
+        {
+            if (
+                (t == value_t::object && object == nullptr) ||
+                (t == value_t::array && array == nullptr) ||
+                (t == value_t::string && string == nullptr) ||
+                (t == value_t::binary && binary == nullptr)
+            )
+            {
+                //not initialized (e.g. due to exception in the ctor)
+                return;
+            }
+            if (t == value_t::array || t == value_t::object)
+            {
+                // flatten the current json_value to a heap-allocated stack
+                std::vector<basic_json> stack;
+
+                // move the top-level items to stack
+                if (t == value_t::array)
+                {
+                    stack.reserve(array->size());
+                    std::move(array->begin(), array->end(), std::back_inserter(stack));
+                }
+                else
+                {
+                    stack.reserve(object->size());
+                    for (auto&& it : *object)
+                    {
+                        stack.push_back(std::move(it.second));
+                    }
+                }
+
+                while (!stack.empty())
+                {
+                    // move the last item to local variable to be processed
+                    basic_json current_item(std::move(stack.back()));
+                    stack.pop_back();
+
+                    // if current_item is array/object, move
+                    // its children to the stack to be processed later
+                    if (current_item.is_array())
+                    {
+                        std::move(current_item.m_data.m_value.array->begin(), current_item.m_data.m_value.array->end(), std::back_inserter(stack));
+
+                        current_item.m_data.m_value.array->clear();
+                    }
+                    else if (current_item.is_object())
+                    {
+                        for (auto&& it : *current_item.m_data.m_value.object)
+                        {
+                            stack.push_back(std::move(it.second));
+                        }
+
+                        current_item.m_data.m_value.object->clear();
+                    }
+
+                    // it's now safe that current_item get destructed
+                    // since it doesn't have any children
+                }
+            }
+
+            switch (t)
+            {
+                case value_t::object:
+                {
+                    AllocatorType<object_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, object);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, object, 1);
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    AllocatorType<array_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, array);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, array, 1);
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, string, 1);
+                    break;
+                }
+
+                case value_t::binary:
+                {
+                    AllocatorType<binary_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, binary, 1);
+                    break;
+                }
+
+                case value_t::null:
+                case value_t::boolean:
+                case value_t::number_integer:
+                case value_t::number_unsigned:
+                case value_t::number_float:
+                case value_t::discarded:
+                default:
+                {
+                    break;
+                }
+            }
+        }
+    };
+
+  private:
+    /*!
+    @brief checks the class invariants
+
+    This function asserts the class invariants. It needs to be called at the
+    end of every constructor to make sure that created objects respect the
+    invariant. Furthermore, it has to be called each time the type of a JSON
+    value is changed, because the invariant expresses a relationship between
+    @a m_type and @a m_value.
+
+    Furthermore, the parent relation is checked for arrays and objects: If
+    @a check_parents true and the value is an array or object, then the
+    container's elements must have the current value as parent.
+
+    @param[in] check_parents  whether the parent relation should be checked.
+               The value is true by default and should only be set to false
+               during destruction of objects when the invariant does not
+               need to hold.
+    */
+    void assert_invariant(bool check_parents = true) const noexcept
+    {
+        JSON_ASSERT(m_data.m_type != value_t::object || m_data.m_value.object != nullptr);
+        JSON_ASSERT(m_data.m_type != value_t::array || m_data.m_value.array != nullptr);
+        JSON_ASSERT(m_data.m_type != value_t::string || m_data.m_value.string != nullptr);
+        JSON_ASSERT(m_data.m_type != value_t::binary || m_data.m_value.binary != nullptr);
+
+#if JSON_DIAGNOSTICS
+        JSON_TRY
+        {
+            // cppcheck-suppress assertWithSideEffect
+            JSON_ASSERT(!check_parents || !is_structured() || std::all_of(begin(), end(), [this](const basic_json & j)
+            {
+                return j.m_parent == this;
+            }));
+        }
+        JSON_CATCH(...) {} // LCOV_EXCL_LINE
+#endif
+        static_cast<void>(check_parents);
+    }
+
+    void set_parents()
+    {
+#if JSON_DIAGNOSTICS
+        switch (m_data.m_type)
+        {
+            case value_t::array:
+            {
+                for (auto& element : *m_data.m_value.array)
+                {
+                    element.m_parent = this;
+                }
+                break;
+            }
+
+            case value_t::object:
+            {
+                for (auto& element : *m_data.m_value.object)
+                {
+                    element.second.m_parent = this;
+                }
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                break;
+        }
+#endif
+    }
+
+    iterator set_parents(iterator it, typename iterator::difference_type count_set_parents)
+    {
+#if JSON_DIAGNOSTICS
+        for (typename iterator::difference_type i = 0; i < count_set_parents; ++i)
+        {
+            (it + i)->m_parent = this;
+        }
+#else
+        static_cast<void>(count_set_parents);
+#endif
+        return it;
+    }
+
+    reference set_parent(reference j, std::size_t old_capacity = static_cast<std::size_t>(-1))
+    {
+#if JSON_DIAGNOSTICS
+        if (old_capacity != static_cast<std::size_t>(-1))
+        {
+            // see https://github.com/nlohmann/json/issues/2838
+            JSON_ASSERT(type() == value_t::array);
+            if (JSON_HEDLEY_UNLIKELY(m_data.m_value.array->capacity() != old_capacity))
+            {
+                // capacity has changed: update all parents
+                set_parents();
+                return j;
+            }
+        }
+
+        // ordered_json uses a vector internally, so pointers could have
+        // been invalidated; see https://github.com/nlohmann/json/issues/2962
+#ifdef JSON_HEDLEY_MSVC_VERSION
+#pragma warning(push )
+#pragma warning(disable : 4127) // ignore warning to replace if with if constexpr
+#endif
+        if (detail::is_ordered_map<object_t>::value)
+        {
+            set_parents();
+            return j;
+        }
+#ifdef JSON_HEDLEY_MSVC_VERSION
+#pragma warning( pop )
+#endif
+
+        j.m_parent = this;
+#else
+        static_cast<void>(j);
+        static_cast<void>(old_capacity);
+#endif
+        return j;
+    }
+
+  public:
+    //////////////////////////
+    // JSON parser callback //
+    //////////////////////////
+
+    /// @brief parser event types
+    /// @sa https://json.nlohmann.me/api/basic_json/parse_event_t/
+    using parse_event_t = detail::parse_event_t;
+
+    /// @brief per-element parser callback type
+    /// @sa https://json.nlohmann.me/api/basic_json/parser_callback_t/
+    using parser_callback_t = detail::parser_callback_t<basic_json>;
+
+    //////////////////
+    // constructors //
+    //////////////////
+
+    /// @name constructors and destructors
+    /// Constructors of class @ref basic_json, copy/move constructor, copy
+    /// assignment, static functions creating objects, and the destructor.
+    /// @{
+
+    /// @brief create an empty value with a given type
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(const value_t v)
+        : m_data(v)
+    {
+        assert_invariant();
+    }
+
+    /// @brief create a null object
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(std::nullptr_t = nullptr) noexcept // NOLINT(bugprone-exception-escape)
+        : basic_json(value_t::null)
+    {
+        assert_invariant();
+    }
+
+    /// @brief create a JSON value from compatible types
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    template < typename CompatibleType,
+               typename U = detail::uncvref_t<CompatibleType>,
+               detail::enable_if_t <
+                   !detail::is_basic_json<U>::value && detail::is_compatible_type<basic_json_t, U>::value, int > = 0 >
+    basic_json(CompatibleType && val) noexcept(noexcept( // NOLINT(bugprone-forwarding-reference-overload,bugprone-exception-escape)
+                JSONSerializer<U>::to_json(std::declval<basic_json_t&>(),
+                                           std::forward<CompatibleType>(val))))
+    {
+        JSONSerializer<U>::to_json(*this, std::forward<CompatibleType>(val));
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief create a JSON value from an existing one
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    template < typename BasicJsonType,
+               detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value&& !std::is_same<basic_json, BasicJsonType>::value, int > = 0 >
+    basic_json(const BasicJsonType& val)
+    {
+        using other_boolean_t = typename BasicJsonType::boolean_t;
+        using other_number_float_t = typename BasicJsonType::number_float_t;
+        using other_number_integer_t = typename BasicJsonType::number_integer_t;
+        using other_number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+        using other_string_t = typename BasicJsonType::string_t;
+        using other_object_t = typename BasicJsonType::object_t;
+        using other_array_t = typename BasicJsonType::array_t;
+        using other_binary_t = typename BasicJsonType::binary_t;
+
+        switch (val.type())
+        {
+            case value_t::boolean:
+                JSONSerializer<other_boolean_t>::to_json(*this, val.template get<other_boolean_t>());
+                break;
+            case value_t::number_float:
+                JSONSerializer<other_number_float_t>::to_json(*this, val.template get<other_number_float_t>());
+                break;
+            case value_t::number_integer:
+                JSONSerializer<other_number_integer_t>::to_json(*this, val.template get<other_number_integer_t>());
+                break;
+            case value_t::number_unsigned:
+                JSONSerializer<other_number_unsigned_t>::to_json(*this, val.template get<other_number_unsigned_t>());
+                break;
+            case value_t::string:
+                JSONSerializer<other_string_t>::to_json(*this, val.template get_ref<const other_string_t&>());
+                break;
+            case value_t::object:
+                JSONSerializer<other_object_t>::to_json(*this, val.template get_ref<const other_object_t&>());
+                break;
+            case value_t::array:
+                JSONSerializer<other_array_t>::to_json(*this, val.template get_ref<const other_array_t&>());
+                break;
+            case value_t::binary:
+                JSONSerializer<other_binary_t>::to_json(*this, val.template get_ref<const other_binary_t&>());
+                break;
+            case value_t::null:
+                *this = nullptr;
+                break;
+            case value_t::discarded:
+                m_data.m_type = value_t::discarded;
+                break;
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+        JSON_ASSERT(m_data.m_type == val.type());
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief create a container (array or object) from an initializer list
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(initializer_list_t init,
+               bool type_deduction = true,
+               value_t manual_type = value_t::array)
+    {
+        // check if each element is an array with two elements whose first
+        // element is a string
+        bool is_an_object = std::all_of(init.begin(), init.end(),
+                                        [](const detail::json_ref<basic_json>& element_ref)
+        {
+            // The cast is to ensure op[size_type] is called, bearing in mind size_type may not be int;
+            // (many string types can be constructed from 0 via its null-pointer guise, so we get a
+            // broken call to op[key_type], the wrong semantics and a 4804 warning on Windows)
+            return element_ref->is_array() && element_ref->size() == 2 && (*element_ref)[static_cast<size_type>(0)].is_string();
+        });
+
+        // adjust type if type deduction is not wanted
+        if (!type_deduction)
+        {
+            // if array is wanted, do not create an object though possible
+            if (manual_type == value_t::array)
+            {
+                is_an_object = false;
+            }
+
+            // if object is wanted but impossible, throw an exception
+            if (JSON_HEDLEY_UNLIKELY(manual_type == value_t::object && !is_an_object))
+            {
+                JSON_THROW(type_error::create(301, "cannot create object from initializer list", nullptr));
+            }
+        }
+
+        if (is_an_object)
+        {
+            // the initializer list is a list of pairs -> create object
+            m_data.m_type = value_t::object;
+            m_data.m_value = value_t::object;
+
+            for (auto& element_ref : init)
+            {
+                auto element = element_ref.moved_or_copied();
+                m_data.m_value.object->emplace(
+                    std::move(*((*element.m_data.m_value.array)[0].m_data.m_value.string)),
+                    std::move((*element.m_data.m_value.array)[1]));
+            }
+        }
+        else
+        {
+            // the initializer list describes an array -> create array
+            m_data.m_type = value_t::array;
+            m_data.m_value.array = create<array_t>(init.begin(), init.end());
+        }
+
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief explicitly create a binary array (without subtype)
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(const typename binary_t::container_type& init)
+    {
+        auto res = basic_json();
+        res.m_data.m_type = value_t::binary;
+        res.m_data.m_value = init;
+        return res;
+    }
+
+    /// @brief explicitly create a binary array (with subtype)
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(const typename binary_t::container_type& init, typename binary_t::subtype_type subtype)
+    {
+        auto res = basic_json();
+        res.m_data.m_type = value_t::binary;
+        res.m_data.m_value = binary_t(init, subtype);
+        return res;
+    }
+
+    /// @brief explicitly create a binary array
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(typename binary_t::container_type&& init)
+    {
+        auto res = basic_json();
+        res.m_data.m_type = value_t::binary;
+        res.m_data.m_value = std::move(init);
+        return res;
+    }
+
+    /// @brief explicitly create a binary array (with subtype)
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(typename binary_t::container_type&& init, typename binary_t::subtype_type subtype)
+    {
+        auto res = basic_json();
+        res.m_data.m_type = value_t::binary;
+        res.m_data.m_value = binary_t(std::move(init), subtype);
+        return res;
+    }
+
+    /// @brief explicitly create an array from an initializer list
+    /// @sa https://json.nlohmann.me/api/basic_json/array/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json array(initializer_list_t init = {})
+    {
+        return basic_json(init, false, value_t::array);
+    }
+
+    /// @brief explicitly create an object from an initializer list
+    /// @sa https://json.nlohmann.me/api/basic_json/object/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json object(initializer_list_t init = {})
+    {
+        return basic_json(init, false, value_t::object);
+    }
+
+    /// @brief construct an array with count copies of given value
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(size_type cnt, const basic_json& val):
+        m_data{cnt, val}
+    {
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief construct a JSON container given an iterator range
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    template < class InputIT, typename std::enable_if <
+                   std::is_same<InputIT, typename basic_json_t::iterator>::value ||
+                   std::is_same<InputIT, typename basic_json_t::const_iterator>::value, int >::type = 0 >
+    basic_json(InputIT first, InputIT last)
+    {
+        JSON_ASSERT(first.m_object != nullptr);
+        JSON_ASSERT(last.m_object != nullptr);
+
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(201, "iterators are not compatible", nullptr));
+        }
+
+        // copy type from first iterator
+        m_data.m_type = first.m_object->m_data.m_type;
+
+        // check if iterator range is complete for primitive values
+        switch (m_data.m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            {
+                if (JSON_HEDLEY_UNLIKELY(!first.m_it.primitive_iterator.is_begin()
+                                         || !last.m_it.primitive_iterator.is_end()))
+                {
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", first.m_object));
+                }
+                break;
+            }
+
+            case value_t::null:
+            case value_t::object:
+            case value_t::array:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                break;
+        }
+
+        switch (m_data.m_type)
+        {
+            case value_t::number_integer:
+            {
+                m_data.m_value.number_integer = first.m_object->m_data.m_value.number_integer;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_data.m_value.number_unsigned = first.m_object->m_data.m_value.number_unsigned;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_data.m_value.number_float = first.m_object->m_data.m_value.number_float;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_data.m_value.boolean = first.m_object->m_data.m_value.boolean;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_data.m_value = *first.m_object->m_data.m_value.string;
+                break;
+            }
+
+            case value_t::object:
+            {
+                m_data.m_value.object = create<object_t>(first.m_it.object_iterator,
+                                        last.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_data.m_value.array = create<array_t>(first.m_it.array_iterator,
+                                                       last.m_it.array_iterator);
+                break;
+            }
+
+            case value_t::binary:
+            {
+                m_data.m_value = *first.m_object->m_data.m_value.binary;
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                JSON_THROW(invalid_iterator::create(206, detail::concat("cannot construct with iterators from ", first.m_object->type_name()), first.m_object));
+        }
+
+        set_parents();
+        assert_invariant();
+    }
+
+    ///////////////////////////////////////
+    // other constructors and destructor //
+    ///////////////////////////////////////
+
+    template<typename JsonRef,
+             detail::enable_if_t<detail::conjunction<detail::is_json_ref<JsonRef>,
+                                 std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 >
+    basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
+
+    /// @brief copy constructor
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(const basic_json& other)
+        : json_base_class_t(other)
+    {
+        m_data.m_type = other.m_data.m_type;
+        // check of passed value is valid
+        other.assert_invariant();
+
+        switch (m_data.m_type)
+        {
+            case value_t::object:
+            {
+                m_data.m_value = *other.m_data.m_value.object;
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_data.m_value = *other.m_data.m_value.array;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_data.m_value = *other.m_data.m_value.string;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_data.m_value = other.m_data.m_value.boolean;
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                m_data.m_value = other.m_data.m_value.number_integer;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_data.m_value = other.m_data.m_value.number_unsigned;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_data.m_value = other.m_data.m_value.number_float;
+                break;
+            }
+
+            case value_t::binary:
+            {
+                m_data.m_value = *other.m_data.m_value.binary;
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                break;
+        }
+
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief move constructor
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(basic_json&& other) noexcept
+        : json_base_class_t(std::forward<json_base_class_t>(other)),
+          m_data(std::move(other.m_data))
+    {
+        // check that passed value is valid
+        other.assert_invariant(false);
+
+        // invalidate payload
+        other.m_data.m_type = value_t::null;
+        other.m_data.m_value = {};
+
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief copy assignment
+    /// @sa https://json.nlohmann.me/api/basic_json/operator=/
+    basic_json& operator=(basic_json other) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value&&
+        std::is_nothrow_move_assignable<value_t>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&&
+        std::is_nothrow_move_assignable<json_value>::value&&
+        std::is_nothrow_move_assignable<json_base_class_t>::value
+    )
+    {
+        // check that passed value is valid
+        other.assert_invariant();
+
+        using std::swap;
+        swap(m_data.m_type, other.m_data.m_type);
+        swap(m_data.m_value, other.m_data.m_value);
+        json_base_class_t::operator=(std::move(other));
+
+        set_parents();
+        assert_invariant();
+        return *this;
+    }
+
+    /// @brief destructor
+    /// @sa https://json.nlohmann.me/api/basic_json/~basic_json/
+    ~basic_json() noexcept
+    {
+        assert_invariant(false);
+    }
+
+    /// @}
+
+  public:
+    ///////////////////////
+    // object inspection //
+    ///////////////////////
+
+    /// @name object inspection
+    /// Functions to inspect the type of a JSON value.
+    /// @{
+
+    /// @brief serialization
+    /// @sa https://json.nlohmann.me/api/basic_json/dump/
+    string_t dump(const int indent = -1,
+                  const char indent_char = ' ',
+                  const bool ensure_ascii = false,
+                  const error_handler_t error_handler = error_handler_t::strict) const
+    {
+        string_t result;
+        serializer s(detail::output_adapter<char, string_t>(result), indent_char, error_handler);
+
+        if (indent >= 0)
+        {
+            s.dump(*this, true, ensure_ascii, static_cast<unsigned int>(indent));
+        }
+        else
+        {
+            s.dump(*this, false, ensure_ascii, 0);
+        }
+
+        return result;
+    }
+
+    /// @brief return the type of the JSON value (explicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/type/
+    constexpr value_t type() const noexcept
+    {
+        return m_data.m_type;
+    }
+
+    /// @brief return whether type is primitive
+    /// @sa https://json.nlohmann.me/api/basic_json/is_primitive/
+    constexpr bool is_primitive() const noexcept
+    {
+        return is_null() || is_string() || is_boolean() || is_number() || is_binary();
+    }
+
+    /// @brief return whether type is structured
+    /// @sa https://json.nlohmann.me/api/basic_json/is_structured/
+    constexpr bool is_structured() const noexcept
+    {
+        return is_array() || is_object();
+    }
+
+    /// @brief return whether value is null
+    /// @sa https://json.nlohmann.me/api/basic_json/is_null/
+    constexpr bool is_null() const noexcept
+    {
+        return m_data.m_type == value_t::null;
+    }
+
+    /// @brief return whether value is a boolean
+    /// @sa https://json.nlohmann.me/api/basic_json/is_boolean/
+    constexpr bool is_boolean() const noexcept
+    {
+        return m_data.m_type == value_t::boolean;
+    }
+
+    /// @brief return whether value is a number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number/
+    constexpr bool is_number() const noexcept
+    {
+        return is_number_integer() || is_number_float();
+    }
+
+    /// @brief return whether value is an integer number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number_integer/
+    constexpr bool is_number_integer() const noexcept
+    {
+        return m_data.m_type == value_t::number_integer || m_data.m_type == value_t::number_unsigned;
+    }
+
+    /// @brief return whether value is an unsigned integer number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number_unsigned/
+    constexpr bool is_number_unsigned() const noexcept
+    {
+        return m_data.m_type == value_t::number_unsigned;
+    }
+
+    /// @brief return whether value is a floating-point number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number_float/
+    constexpr bool is_number_float() const noexcept
+    {
+        return m_data.m_type == value_t::number_float;
+    }
+
+    /// @brief return whether value is an object
+    /// @sa https://json.nlohmann.me/api/basic_json/is_object/
+    constexpr bool is_object() const noexcept
+    {
+        return m_data.m_type == value_t::object;
+    }
+
+    /// @brief return whether value is an array
+    /// @sa https://json.nlohmann.me/api/basic_json/is_array/
+    constexpr bool is_array() const noexcept
+    {
+        return m_data.m_type == value_t::array;
+    }
+
+    /// @brief return whether value is a string
+    /// @sa https://json.nlohmann.me/api/basic_json/is_string/
+    constexpr bool is_string() const noexcept
+    {
+        return m_data.m_type == value_t::string;
+    }
+
+    /// @brief return whether value is a binary array
+    /// @sa https://json.nlohmann.me/api/basic_json/is_binary/
+    constexpr bool is_binary() const noexcept
+    {
+        return m_data.m_type == value_t::binary;
+    }
+
+    /// @brief return whether value is discarded
+    /// @sa https://json.nlohmann.me/api/basic_json/is_discarded/
+    constexpr bool is_discarded() const noexcept
+    {
+        return m_data.m_type == value_t::discarded;
+    }
+
+    /// @brief return the type of the JSON value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_value_t/
+    constexpr operator value_t() const noexcept
+    {
+        return m_data.m_type;
+    }
+
+    /// @}
+
+  private:
+    //////////////////
+    // value access //
+    //////////////////
+
+    /// get a boolean (explicit)
+    boolean_t get_impl(boolean_t* /*unused*/) const
+    {
+        if (JSON_HEDLEY_LIKELY(is_boolean()))
+        {
+            return m_data.m_value.boolean;
+        }
+
+        JSON_THROW(type_error::create(302, detail::concat("type must be boolean, but is ", type_name()), this));
+    }
+
+    /// get a pointer to the value (object)
+    object_t* get_impl_ptr(object_t* /*unused*/) noexcept
+    {
+        return is_object() ? m_data.m_value.object : nullptr;
+    }
+
+    /// get a pointer to the value (object)
+    constexpr const object_t* get_impl_ptr(const object_t* /*unused*/) const noexcept
+    {
+        return is_object() ? m_data.m_value.object : nullptr;
+    }
+
+    /// get a pointer to the value (array)
+    array_t* get_impl_ptr(array_t* /*unused*/) noexcept
+    {
+        return is_array() ? m_data.m_value.array : nullptr;
+    }
+
+    /// get a pointer to the value (array)
+    constexpr const array_t* get_impl_ptr(const array_t* /*unused*/) const noexcept
+    {
+        return is_array() ? m_data.m_value.array : nullptr;
+    }
+
+    /// get a pointer to the value (string)
+    string_t* get_impl_ptr(string_t* /*unused*/) noexcept
+    {
+        return is_string() ? m_data.m_value.string : nullptr;
+    }
+
+    /// get a pointer to the value (string)
+    constexpr const string_t* get_impl_ptr(const string_t* /*unused*/) const noexcept
+    {
+        return is_string() ? m_data.m_value.string : nullptr;
+    }
+
+    /// get a pointer to the value (boolean)
+    boolean_t* get_impl_ptr(boolean_t* /*unused*/) noexcept
+    {
+        return is_boolean() ? &m_data.m_value.boolean : nullptr;
+    }
+
+    /// get a pointer to the value (boolean)
+    constexpr const boolean_t* get_impl_ptr(const boolean_t* /*unused*/) const noexcept
+    {
+        return is_boolean() ? &m_data.m_value.boolean : nullptr;
+    }
+
+    /// get a pointer to the value (integer number)
+    number_integer_t* get_impl_ptr(number_integer_t* /*unused*/) noexcept
+    {
+        return is_number_integer() ? &m_data.m_value.number_integer : nullptr;
+    }
+
+    /// get a pointer to the value (integer number)
+    constexpr const number_integer_t* get_impl_ptr(const number_integer_t* /*unused*/) const noexcept
+    {
+        return is_number_integer() ? &m_data.m_value.number_integer : nullptr;
+    }
+
+    /// get a pointer to the value (unsigned number)
+    number_unsigned_t* get_impl_ptr(number_unsigned_t* /*unused*/) noexcept
+    {
+        return is_number_unsigned() ? &m_data.m_value.number_unsigned : nullptr;
+    }
+
+    /// get a pointer to the value (unsigned number)
+    constexpr const number_unsigned_t* get_impl_ptr(const number_unsigned_t* /*unused*/) const noexcept
+    {
+        return is_number_unsigned() ? &m_data.m_value.number_unsigned : nullptr;
+    }
+
+    /// get a pointer to the value (floating-point number)
+    number_float_t* get_impl_ptr(number_float_t* /*unused*/) noexcept
+    {
+        return is_number_float() ? &m_data.m_value.number_float : nullptr;
+    }
+
+    /// get a pointer to the value (floating-point number)
+    constexpr const number_float_t* get_impl_ptr(const number_float_t* /*unused*/) const noexcept
+    {
+        return is_number_float() ? &m_data.m_value.number_float : nullptr;
+    }
+
+    /// get a pointer to the value (binary)
+    binary_t* get_impl_ptr(binary_t* /*unused*/) noexcept
+    {
+        return is_binary() ? m_data.m_value.binary : nullptr;
+    }
+
+    /// get a pointer to the value (binary)
+    constexpr const binary_t* get_impl_ptr(const binary_t* /*unused*/) const noexcept
+    {
+        return is_binary() ? m_data.m_value.binary : nullptr;
+    }
+
+    /*!
+    @brief helper function to implement get_ref()
+
+    This function helps to implement get_ref() without code duplication for
+    const and non-const overloads
+
+    @tparam ThisType will be deduced as `basic_json` or `const basic_json`
+
+    @throw type_error.303 if ReferenceType does not match underlying value
+    type of the current JSON
+    */
+    template<typename ReferenceType, typename ThisType>
+    static ReferenceType get_ref_impl(ThisType& obj)
+    {
+        // delegate the call to get_ptr<>()
+        auto* ptr = obj.template get_ptr<typename std::add_pointer<ReferenceType>::type>();
+
+        if (JSON_HEDLEY_LIKELY(ptr != nullptr))
+        {
+            return *ptr;
+        }
+
+        JSON_THROW(type_error::create(303, detail::concat("incompatible ReferenceType for get_ref, actual type is ", obj.type_name()), &obj));
+    }
+
+  public:
+    /// @name value access
+    /// Direct access to the stored value of a JSON value.
+    /// @{
+
+    /// @brief get a pointer value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ptr/
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    auto get_ptr() noexcept -> decltype(std::declval<basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
+    {
+        // delegate the call to get_impl_ptr<>()
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
+    }
+
+    /// @brief get a pointer value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ptr/
+    template < typename PointerType, typename std::enable_if <
+                   std::is_pointer<PointerType>::value&&
+                   std::is_const<typename std::remove_pointer<PointerType>::type>::value, int >::type = 0 >
+    constexpr auto get_ptr() const noexcept -> decltype(std::declval<const basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
+    {
+        // delegate the call to get_impl_ptr<>() const
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
+    }
+
+  private:
+    /*!
+    @brief get a value (explicit)
+
+    Explicit type conversion between the JSON value and a compatible value
+    which is [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
+    and [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
+    The value is converted by calling the @ref json_serializer<ValueType>
+    `from_json()` method.
+
+    The function is equivalent to executing
+    @code {.cpp}
+    ValueType ret;
+    JSONSerializer<ValueType>::from_json(*this, ret);
+    return ret;
+    @endcode
+
+    This overloads is chosen if:
+    - @a ValueType is not @ref basic_json,
+    - @ref json_serializer<ValueType> has a `from_json()` method of the form
+      `void from_json(const basic_json&, ValueType&)`, and
+    - @ref json_serializer<ValueType> does not have a `from_json()` method of
+      the form `ValueType from_json(const basic_json&)`
+
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @a ValueType
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+    @liveexample{The example below shows several conversions from JSON values
+    to other types. There a few things to note: (1) Floating-point numbers can
+    be converted to integers\, (2) A JSON array can be converted to a standard
+    `std::vector<short>`\, (3) A JSON object can be converted to C++
+    associative containers such as `std::unordered_map<std::string\,
+    json>`.,get__ValueType_const}
+
+    @since version 2.1.0
+    */
+    template < typename ValueType,
+               detail::enable_if_t <
+                   detail::is_default_constructible<ValueType>::value&&
+                   detail::has_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
+    ValueType get_impl(detail::priority_tag<0> /*unused*/) const noexcept(noexcept(
+                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
+    {
+        auto ret = ValueType();
+        JSONSerializer<ValueType>::from_json(*this, ret);
+        return ret;
+    }
+
+    /*!
+    @brief get a value (explicit); special case
+
+    Explicit type conversion between the JSON value and a compatible value
+    which is **not** [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
+    and **not** [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
+    The value is converted by calling the @ref json_serializer<ValueType>
+    `from_json()` method.
+
+    The function is equivalent to executing
+    @code {.cpp}
+    return JSONSerializer<ValueType>::from_json(*this);
+    @endcode
+
+    This overloads is chosen if:
+    - @a ValueType is not @ref basic_json and
+    - @ref json_serializer<ValueType> has a `from_json()` method of the form
+      `ValueType from_json(const basic_json&)`
+
+    @note If @ref json_serializer<ValueType> has both overloads of
+    `from_json()`, this one is chosen.
+
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @a ValueType
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+    @since version 2.1.0
+    */
+    template < typename ValueType,
+               detail::enable_if_t <
+                   detail::has_non_default_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
+    ValueType get_impl(detail::priority_tag<1> /*unused*/) const noexcept(noexcept(
+                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>())))
+    {
+        return JSONSerializer<ValueType>::from_json(*this);
+    }
+
+    /*!
+    @brief get special-case overload
+
+    This overloads converts the current @ref basic_json in a different
+    @ref basic_json type
+
+    @tparam BasicJsonType == @ref basic_json
+
+    @return a copy of *this, converted into @a BasicJsonType
+
+    @complexity Depending on the implementation of the called `from_json()`
+                method.
+
+    @since version 3.2.0
+    */
+    template < typename BasicJsonType,
+               detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value,
+                   int > = 0 >
+    BasicJsonType get_impl(detail::priority_tag<2> /*unused*/) const
+    {
+        return *this;
+    }
+
+    /*!
+    @brief get special-case overload
+
+    This overloads avoids a lot of template boilerplate, it can be seen as the
+    identity method
+
+    @tparam BasicJsonType == @ref basic_json
+
+    @return a copy of *this
+
+    @complexity Constant.
+
+    @since version 2.1.0
+    */
+    template<typename BasicJsonType,
+             detail::enable_if_t<
+                 std::is_same<BasicJsonType, basic_json_t>::value,
+                 int> = 0>
+    basic_json get_impl(detail::priority_tag<3> /*unused*/) const
+    {
+        return *this;
+    }
+
+    /*!
+    @brief get a pointer value (explicit)
+    @copydoc get()
+    */
+    template<typename PointerType,
+             detail::enable_if_t<
+                 std::is_pointer<PointerType>::value,
+                 int> = 0>
+    constexpr auto get_impl(detail::priority_tag<4> /*unused*/) const noexcept
+    -> decltype(std::declval<const basic_json_t&>().template get_ptr<PointerType>())
+    {
+        // delegate the call to get_ptr
+        return get_ptr<PointerType>();
+    }
+
+  public:
+    /*!
+    @brief get a (pointer) value (explicit)
+
+    Performs explicit type conversion between the JSON value and a compatible value if required.
+
+    - If the requested type is a pointer to the internally stored JSON value that pointer is returned.
+    No copies are made.
+
+    - If the requested type is the current @ref basic_json, or a different @ref basic_json convertible
+    from the current @ref basic_json.
+
+    - Otherwise the value is converted by calling the @ref json_serializer<ValueType> `from_json()`
+    method.
+
+    @tparam ValueTypeCV the provided value type
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @tparam ValueType if necessary
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws if conversion is required
+
+    @since version 2.1.0
+    */
+    template < typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>>
+#if defined(JSON_HAS_CPP_14)
+    constexpr
+#endif
+    auto get() const noexcept(
+    noexcept(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {})))
+    -> decltype(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {}))
+    {
+        // we cannot static_assert on ValueTypeCV being non-const, because
+        // there is support for get<const basic_json_t>(), which is why we
+        // still need the uncvref
+        static_assert(!std::is_reference<ValueTypeCV>::value,
+                      "get() cannot be used with reference types, you might want to use get_ref()");
+        return get_impl<ValueType>(detail::priority_tag<4> {});
+    }
+
+    /*!
+    @brief get a pointer value (explicit)
+
+    Explicit pointer access to the internally stored JSON value. No copies are
+    made.
+
+    @warning The pointer becomes invalid if the underlying JSON object
+    changes.
+
+    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
+    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
+    @ref number_unsigned_t, or @ref number_float_t.
+
+    @return pointer to the internally stored JSON value if the requested
+    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how pointers to internal values of a
+    JSON value can be requested. Note that no type conversions are made and a
+    `nullptr` is returned if the value and the requested pointer type does not
+    match.,get__PointerType}
+
+    @sa see @ref get_ptr() for explicit pointer-member access
+
+    @since version 1.0.0
+    */
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    auto get() noexcept -> decltype(std::declval<basic_json_t&>().template get_ptr<PointerType>())
+    {
+        // delegate the call to get_ptr
+        return get_ptr<PointerType>();
+    }
+
+    /// @brief get a value (explicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_to/
+    template < typename ValueType,
+               detail::enable_if_t <
+                   !detail::is_basic_json<ValueType>::value&&
+                   detail::has_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
+    ValueType & get_to(ValueType& v) const noexcept(noexcept(
+                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), v)))
+    {
+        JSONSerializer<ValueType>::from_json(*this, v);
+        return v;
+    }
+
+    // specialization to allow calling get_to with a basic_json value
+    // see https://github.com/nlohmann/json/issues/2175
+    template<typename ValueType,
+             detail::enable_if_t <
+                 detail::is_basic_json<ValueType>::value,
+                 int> = 0>
+    ValueType & get_to(ValueType& v) const
+    {
+        v = *this;
+        return v;
+    }
+
+    template <
+        typename T, std::size_t N,
+        typename Array = T (&)[N], // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+        detail::enable_if_t <
+            detail::has_from_json<basic_json_t, Array>::value, int > = 0 >
+    Array get_to(T (&v)[N]) const // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+    noexcept(noexcept(JSONSerializer<Array>::from_json(
+                          std::declval<const basic_json_t&>(), v)))
+    {
+        JSONSerializer<Array>::from_json(*this, v);
+        return v;
+    }
+
+    /// @brief get a reference value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ref/
+    template<typename ReferenceType, typename std::enable_if<
+                 std::is_reference<ReferenceType>::value, int>::type = 0>
+    ReferenceType get_ref()
+    {
+        // delegate call to get_ref_impl
+        return get_ref_impl<ReferenceType>(*this);
+    }
+
+    /// @brief get a reference value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ref/
+    template < typename ReferenceType, typename std::enable_if <
+                   std::is_reference<ReferenceType>::value&&
+                   std::is_const<typename std::remove_reference<ReferenceType>::type>::value, int >::type = 0 >
+    ReferenceType get_ref() const
+    {
+        // delegate call to get_ref_impl
+        return get_ref_impl<ReferenceType>(*this);
+    }
+
+    /*!
+    @brief get a value (implicit)
+
+    Implicit type conversion between the JSON value and a compatible value.
+    The call is realized by calling @ref get() const.
+
+    @tparam ValueType non-pointer type compatible to the JSON value, for
+    instance `int` for JSON integer numbers, `bool` for JSON booleans, or
+    `std::vector` types for JSON arrays. The character type of @ref string_t
+    as well as an initializer list of this type is excluded to avoid
+    ambiguities as these types implicitly convert to `std::string`.
+
+    @return copy of the JSON value, converted to type @a ValueType
+
+    @throw type_error.302 in case passed type @a ValueType is incompatible
+    to the JSON value type (e.g., the JSON value is of type boolean, but a
+    string is requested); see example below
+
+    @complexity Linear in the size of the JSON value.
+
+    @liveexample{The example below shows several conversions from JSON values
+    to other types. There a few things to note: (1) Floating-point numbers can
+    be converted to integers\, (2) A JSON array can be converted to a standard
+    `std::vector<short>`\, (3) A JSON object can be converted to C++
+    associative containers such as `std::unordered_map<std::string\,
+    json>`.,operator__ValueType}
+
+    @since version 1.0.0
+    */
+    template < typename ValueType, typename std::enable_if <
+                   detail::conjunction <
+                       detail::negation<std::is_pointer<ValueType>>,
+                       detail::negation<std::is_same<ValueType, std::nullptr_t>>,
+                       detail::negation<std::is_same<ValueType, detail::json_ref<basic_json>>>,
+                                        detail::negation<std::is_same<ValueType, typename string_t::value_type>>,
+                                        detail::negation<detail::is_basic_json<ValueType>>,
+                                        detail::negation<std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>>,
+#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1910 && _MSC_VER <= 1914))
+                                                detail::negation<std::is_same<ValueType, std::string_view>>,
+#endif
+#if defined(JSON_HAS_CPP_17) && JSON_HAS_STATIC_RTTI
+                                                detail::negation<std::is_same<ValueType, std::any>>,
+#endif
+                                                detail::is_detected_lazy<detail::get_template_function, const basic_json_t&, ValueType>
+                                                >::value, int >::type = 0 >
+                                        JSON_EXPLICIT operator ValueType() const
+    {
+        // delegate the call to get<>() const
+        return get<ValueType>();
+    }
+
+    /// @brief get a binary value
+    /// @sa https://json.nlohmann.me/api/basic_json/get_binary/
+    binary_t& get_binary()
+    {
+        if (!is_binary())
+        {
+            JSON_THROW(type_error::create(302, detail::concat("type must be binary, but is ", type_name()), this));
+        }
+
+        return *get_ptr<binary_t*>();
+    }
+
+    /// @brief get a binary value
+    /// @sa https://json.nlohmann.me/api/basic_json/get_binary/
+    const binary_t& get_binary() const
+    {
+        if (!is_binary())
+        {
+            JSON_THROW(type_error::create(302, detail::concat("type must be binary, but is ", type_name()), this));
+        }
+
+        return *get_ptr<const binary_t*>();
+    }
+
+    /// @}
+
+    ////////////////////
+    // element access //
+    ////////////////////
+
+    /// @name element access
+    /// Access to the JSON value.
+    /// @{
+
+    /// @brief access specified array element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    reference at(size_type idx)
+    {
+        // at only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            JSON_TRY
+            {
+                return set_parent(m_data.m_value.array->at(idx));
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), this));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+    }
+
+    /// @brief access specified array element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    const_reference at(size_type idx) const
+    {
+        // at only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            JSON_TRY
+            {
+                return m_data.m_value.array->at(idx);
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), this));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+    }
+
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    reference at(const typename object_t::key_type& key)
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+
+        auto it = m_data.m_value.object->find(key);
+        if (it == m_data.m_value.object->end())
+        {
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", key, "' not found"), this));
+        }
+        return set_parent(it->second);
+    }
+
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    reference at(KeyType && key)
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+
+        auto it = m_data.m_value.object->find(std::forward<KeyType>(key));
+        if (it == m_data.m_value.object->end())
+        {
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", string_t(std::forward<KeyType>(key)), "' not found"), this));
+        }
+        return set_parent(it->second);
+    }
+
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    const_reference at(const typename object_t::key_type& key) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+
+        auto it = m_data.m_value.object->find(key);
+        if (it == m_data.m_value.object->end())
+        {
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", key, "' not found"), this));
+        }
+        return it->second;
+    }
+
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    const_reference at(KeyType && key) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+
+        auto it = m_data.m_value.object->find(std::forward<KeyType>(key));
+        if (it == m_data.m_value.object->end())
+        {
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", string_t(std::forward<KeyType>(key)), "' not found"), this));
+        }
+        return it->second;
+    }
+
+    /// @brief access specified array element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    reference operator[](size_type idx)
+    {
+        // implicitly convert null value to an empty array
+        if (is_null())
+        {
+            m_data.m_type = value_t::array;
+            m_data.m_value.array = create<array_t>();
+            assert_invariant();
+        }
+
+        // operator[] only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // fill up array with null values if given idx is outside range
+            if (idx >= m_data.m_value.array->size())
+            {
+#if JSON_DIAGNOSTICS
+                // remember array size & capacity before resizing
+                const auto old_size = m_data.m_value.array->size();
+                const auto old_capacity = m_data.m_value.array->capacity();
+#endif
+                m_data.m_value.array->resize(idx + 1);
+
+#if JSON_DIAGNOSTICS
+                if (JSON_HEDLEY_UNLIKELY(m_data.m_value.array->capacity() != old_capacity))
+                {
+                    // capacity has changed: update all parents
+                    set_parents();
+                }
+                else
+                {
+                    // set parent for values added above
+                    set_parents(begin() + static_cast<typename iterator::difference_type>(old_size), static_cast<typename iterator::difference_type>(idx + 1 - old_size));
+                }
+#endif
+                assert_invariant();
+            }
+
+            return m_data.m_value.array->operator[](idx);
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a numeric argument with ", type_name()), this));
+    }
+
+    /// @brief access specified array element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    const_reference operator[](size_type idx) const
+    {
+        // const operator[] only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            return m_data.m_value.array->operator[](idx);
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a numeric argument with ", type_name()), this));
+    }
+
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    reference operator[](typename object_t::key_type key)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_data.m_type = value_t::object;
+            m_data.m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        // operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            auto result = m_data.m_value.object->emplace(std::move(key), nullptr);
+            return set_parent(result.first->second);
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
+    }
+
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    const_reference operator[](const typename object_t::key_type& key) const
+    {
+        // const operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            auto it = m_data.m_value.object->find(key);
+            JSON_ASSERT(it != m_data.m_value.object->end());
+            return it->second;
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
+    }
+
+    // these two functions resolve a (const) char * ambiguity affecting Clang and MSVC
+    // (they seemingly cannot be constrained to resolve the ambiguity)
+    template<typename T>
+    reference operator[](T* key)
+    {
+        return operator[](typename object_t::key_type(key));
+    }
+
+    template<typename T>
+    const_reference operator[](T* key) const
+    {
+        return operator[](typename object_t::key_type(key));
+    }
+
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    reference operator[](KeyType && key)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_data.m_type = value_t::object;
+            m_data.m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        // operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            auto result = m_data.m_value.object->emplace(std::forward<KeyType>(key), nullptr);
+            return set_parent(result.first->second);
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
+    }
+
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    const_reference operator[](KeyType && key) const
+    {
+        // const operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            auto it = m_data.m_value.object->find(std::forward<KeyType>(key));
+            JSON_ASSERT(it != m_data.m_value.object->end());
+            return it->second;
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
+    }
+
+  private:
+    template<typename KeyType>
+    using is_comparable_with_object_key = detail::is_comparable <
+        object_comparator_t, const typename object_t::key_type&, KeyType >;
+
+    template<typename ValueType>
+    using value_return_type = std::conditional <
+        detail::is_c_string_uncvref<ValueType>::value,
+        string_t, typename std::decay<ValueType>::type >;
+
+  public:
+    /// @brief access specified object element with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, detail::enable_if_t <
+                   !detail::is_transparent<object_comparator_t>::value
+                   && detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ValueType value(const typename object_t::key_type& key, const ValueType& default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(key);
+            if (it != end())
+            {
+                return it->template get<ValueType>();
+            }
+
+            return default_value;
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    /// @brief access specified object element with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   !detail::is_transparent<object_comparator_t>::value
+                   && detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ReturnType value(const typename object_t::key_type& key, ValueType && default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(key);
+            if (it != end())
+            {
+                return it->template get<ReturnType>();
+            }
+
+            return std::forward<ValueType>(default_value);
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    /// @brief access specified object element with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class KeyType, detail::enable_if_t <
+                   detail::is_transparent<object_comparator_t>::value
+                   && !detail::is_json_pointer<KeyType>::value
+                   && is_comparable_with_object_key<KeyType>::value
+                   && detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ValueType value(KeyType && key, const ValueType& default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(std::forward<KeyType>(key));
+            if (it != end())
+            {
+                return it->template get<ValueType>();
+            }
+
+            return default_value;
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    /// @brief access specified object element via JSON Pointer with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class KeyType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   detail::is_transparent<object_comparator_t>::value
+                   && !detail::is_json_pointer<KeyType>::value
+                   && is_comparable_with_object_key<KeyType>::value
+                   && detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ReturnType value(KeyType && key, ValueType && default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(std::forward<KeyType>(key));
+            if (it != end())
+            {
+                return it->template get<ReturnType>();
+            }
+
+            return std::forward<ValueType>(default_value);
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    /// @brief access specified object element via JSON Pointer with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, detail::enable_if_t <
+                   detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ValueType value(const json_pointer& ptr, const ValueType& default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if pointer resolves a value, return it or use default value
+            JSON_TRY
+            {
+                return ptr.get_checked(this).template get<ValueType>();
+            }
+            JSON_INTERNAL_CATCH (out_of_range&)
+            {
+                return default_value;
+            }
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    /// @brief access specified object element via JSON Pointer with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ReturnType value(const json_pointer& ptr, ValueType && default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if pointer resolves a value, return it or use default value
+            JSON_TRY
+            {
+                return ptr.get_checked(this).template get<ReturnType>();
+            }
+            JSON_INTERNAL_CATCH (out_of_range&)
+            {
+                return std::forward<ValueType>(default_value);
+            }
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    template < class ValueType, class BasicJsonType, detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value
+                   && detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    ValueType value(const ::nlohmann::json_pointer<BasicJsonType>& ptr, const ValueType& default_value) const
+    {
+        return value(ptr.convert(), default_value);
+    }
+
+    template < class ValueType, class BasicJsonType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value
+                   && detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    ReturnType value(const ::nlohmann::json_pointer<BasicJsonType>& ptr, ValueType && default_value) const
+    {
+        return value(ptr.convert(), std::forward<ValueType>(default_value));
+    }
+
+    /// @brief access the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/front/
+    reference front()
+    {
+        return *begin();
+    }
+
+    /// @brief access the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/front/
+    const_reference front() const
+    {
+        return *cbegin();
+    }
+
+    /// @brief access the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/back/
+    reference back()
+    {
+        auto tmp = end();
+        --tmp;
+        return *tmp;
+    }
+
+    /// @brief access the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/back/
+    const_reference back() const
+    {
+        auto tmp = cend();
+        --tmp;
+        return *tmp;
+    }
+
+    /// @brief remove element given an iterator
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    template < class IteratorType, detail::enable_if_t <
+                   std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
+                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int > = 0 >
+    IteratorType erase(IteratorType pos)
+    {
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(this != pos.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
+        }
+
+        IteratorType result = end();
+
+        switch (m_data.m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            case value_t::binary:
+            {
+                if (JSON_HEDLEY_UNLIKELY(!pos.m_it.primitive_iterator.is_begin()))
+                {
+                    JSON_THROW(invalid_iterator::create(205, "iterator out of range", this));
+                }
+
+                if (is_string())
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_data.m_value.string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_data.m_value.string, 1);
+                    m_data.m_value.string = nullptr;
+                }
+                else if (is_binary())
+                {
+                    AllocatorType<binary_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_data.m_value.binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_data.m_value.binary, 1);
+                    m_data.m_value.binary = nullptr;
+                }
+
+                m_data.m_type = value_t::null;
+                assert_invariant();
+                break;
+            }
+
+            case value_t::object:
+            {
+                result.m_it.object_iterator = m_data.m_value.object->erase(pos.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                result.m_it.array_iterator = m_data.m_value.array->erase(pos.m_it.array_iterator);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
+        }
+
+        return result;
+    }
+
+    /// @brief remove elements given an iterator range
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    template < class IteratorType, detail::enable_if_t <
+                   std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
+                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int > = 0 >
+    IteratorType erase(IteratorType first, IteratorType last)
+    {
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(this != first.m_object || this != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(203, "iterators do not fit current value", this));
+        }
+
+        IteratorType result = end();
+
+        switch (m_data.m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            case value_t::binary:
+            {
+                if (JSON_HEDLEY_LIKELY(!first.m_it.primitive_iterator.is_begin()
+                                       || !last.m_it.primitive_iterator.is_end()))
+                {
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", this));
+                }
+
+                if (is_string())
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_data.m_value.string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_data.m_value.string, 1);
+                    m_data.m_value.string = nullptr;
+                }
+                else if (is_binary())
+                {
+                    AllocatorType<binary_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_data.m_value.binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_data.m_value.binary, 1);
+                    m_data.m_value.binary = nullptr;
+                }
+
+                m_data.m_type = value_t::null;
+                assert_invariant();
+                break;
+            }
+
+            case value_t::object:
+            {
+                result.m_it.object_iterator = m_data.m_value.object->erase(first.m_it.object_iterator,
+                                              last.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                result.m_it.array_iterator = m_data.m_value.array->erase(first.m_it.array_iterator,
+                                             last.m_it.array_iterator);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
+        }
+
+        return result;
+    }
+
+  private:
+    template < typename KeyType, detail::enable_if_t <
+                   detail::has_erase_with_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    size_type erase_internal(KeyType && key)
+    {
+        // this erase only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
+        }
+
+        return m_data.m_value.object->erase(std::forward<KeyType>(key));
+    }
+
+    template < typename KeyType, detail::enable_if_t <
+                   !detail::has_erase_with_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    size_type erase_internal(KeyType && key)
+    {
+        // this erase only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
+        }
+
+        const auto it = m_data.m_value.object->find(std::forward<KeyType>(key));
+        if (it != m_data.m_value.object->end())
+        {
+            m_data.m_value.object->erase(it);
+            return 1;
+        }
+        return 0;
+    }
+
+  public:
+
+    /// @brief remove element from a JSON object given a key
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    size_type erase(const typename object_t::key_type& key)
+    {
+        // the indirection via erase_internal() is added to avoid making this
+        // function a template and thus de-rank it during overload resolution
+        return erase_internal(key);
+    }
+
+    /// @brief remove element from a JSON object given a key
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    size_type erase(KeyType && key)
+    {
+        return erase_internal(std::forward<KeyType>(key));
+    }
+
+    /// @brief remove element from a JSON array given an index
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    void erase(const size_type idx)
+    {
+        // this erase only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            if (JSON_HEDLEY_UNLIKELY(idx >= size()))
+            {
+                JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), this));
+            }
+
+            m_data.m_value.array->erase(m_data.m_value.array->begin() + static_cast<difference_type>(idx));
+        }
+        else
+        {
+            JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
+        }
+    }
+
+    /// @}
+
+    ////////////
+    // lookup //
+    ////////////
+
+    /// @name lookup
+    /// @{
+
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    iterator find(const typename object_t::key_type& key)
+    {
+        auto result = end();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_data.m_value.object->find(key);
+        }
+
+        return result;
+    }
+
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    const_iterator find(const typename object_t::key_type& key) const
+    {
+        auto result = cend();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_data.m_value.object->find(key);
+        }
+
+        return result;
+    }
+
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    iterator find(KeyType && key)
+    {
+        auto result = end();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_data.m_value.object->find(std::forward<KeyType>(key));
+        }
+
+        return result;
+    }
+
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    const_iterator find(KeyType && key) const
+    {
+        auto result = cend();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_data.m_value.object->find(std::forward<KeyType>(key));
+        }
+
+        return result;
+    }
+
+    /// @brief returns the number of occurrences of a key in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/count/
+    size_type count(const typename object_t::key_type& key) const
+    {
+        // return 0 for all nonobject types
+        return is_object() ? m_data.m_value.object->count(key) : 0;
+    }
+
+    /// @brief returns the number of occurrences of a key in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/count/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    size_type count(KeyType && key) const
+    {
+        // return 0 for all nonobject types
+        return is_object() ? m_data.m_value.object->count(std::forward<KeyType>(key)) : 0;
+    }
+
+    /// @brief check the existence of an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/contains/
+    bool contains(const typename object_t::key_type& key) const
+    {
+        return is_object() && m_data.m_value.object->find(key) != m_data.m_value.object->end();
+    }
+
+    /// @brief check the existence of an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/contains/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    bool contains(KeyType && key) const
+    {
+        return is_object() && m_data.m_value.object->find(std::forward<KeyType>(key)) != m_data.m_value.object->end();
+    }
+
+    /// @brief check the existence of an element in a JSON object given a JSON pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/contains/
+    bool contains(const json_pointer& ptr) const
+    {
+        return ptr.contains(this);
+    }
+
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    bool contains(const typename ::nlohmann::json_pointer<BasicJsonType>& ptr) const
+    {
+        return ptr.contains(this);
+    }
+
+    /// @}
+
+    ///////////////
+    // iterators //
+    ///////////////
+
+    /// @name iterators
+    /// @{
+
+    /// @brief returns an iterator to the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/begin/
+    iterator begin() noexcept
+    {
+        iterator result(this);
+        result.set_begin();
+        return result;
+    }
+
+    /// @brief returns an iterator to the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/begin/
+    const_iterator begin() const noexcept
+    {
+        return cbegin();
+    }
+
+    /// @brief returns a const iterator to the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/cbegin/
+    const_iterator cbegin() const noexcept
+    {
+        const_iterator result(this);
+        result.set_begin();
+        return result;
+    }
+
+    /// @brief returns an iterator to one past the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/end/
+    iterator end() noexcept
+    {
+        iterator result(this);
+        result.set_end();
+        return result;
+    }
+
+    /// @brief returns an iterator to one past the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/end/
+    const_iterator end() const noexcept
+    {
+        return cend();
+    }
+
+    /// @brief returns an iterator to one past the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/cend/
+    const_iterator cend() const noexcept
+    {
+        const_iterator result(this);
+        result.set_end();
+        return result;
+    }
+
+    /// @brief returns an iterator to the reverse-beginning
+    /// @sa https://json.nlohmann.me/api/basic_json/rbegin/
+    reverse_iterator rbegin() noexcept
+    {
+        return reverse_iterator(end());
+    }
+
+    /// @brief returns an iterator to the reverse-beginning
+    /// @sa https://json.nlohmann.me/api/basic_json/rbegin/
+    const_reverse_iterator rbegin() const noexcept
+    {
+        return crbegin();
+    }
+
+    /// @brief returns an iterator to the reverse-end
+    /// @sa https://json.nlohmann.me/api/basic_json/rend/
+    reverse_iterator rend() noexcept
+    {
+        return reverse_iterator(begin());
+    }
+
+    /// @brief returns an iterator to the reverse-end
+    /// @sa https://json.nlohmann.me/api/basic_json/rend/
+    const_reverse_iterator rend() const noexcept
+    {
+        return crend();
+    }
+
+    /// @brief returns a const reverse iterator to the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/crbegin/
+    const_reverse_iterator crbegin() const noexcept
+    {
+        return const_reverse_iterator(cend());
+    }
+
+    /// @brief returns a const reverse iterator to one before the first
+    /// @sa https://json.nlohmann.me/api/basic_json/crend/
+    const_reverse_iterator crend() const noexcept
+    {
+        return const_reverse_iterator(cbegin());
+    }
+
+  public:
+    /// @brief wrapper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    /// @deprecated This function is deprecated since 3.1.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use @ref items() instead;
+    ///             that is, replace `json::iterator_wrapper(j)` with `j.items()`.
+    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
+    static iteration_proxy<iterator> iterator_wrapper(reference ref) noexcept
+    {
+        return ref.items();
+    }
+
+    /// @brief wrapper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    /// @deprecated This function is deprecated since 3.1.0 and will be removed in
+    ///         version 4.0.0 of the library. Please use @ref items() instead;
+    ///         that is, replace `json::iterator_wrapper(j)` with `j.items()`.
+    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
+    static iteration_proxy<const_iterator> iterator_wrapper(const_reference ref) noexcept
+    {
+        return ref.items();
+    }
+
+    /// @brief helper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    iteration_proxy<iterator> items() noexcept
+    {
+        return iteration_proxy<iterator>(*this);
+    }
+
+    /// @brief helper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    iteration_proxy<const_iterator> items() const noexcept
+    {
+        return iteration_proxy<const_iterator>(*this);
+    }
+
+    /// @}
+
+    //////////////
+    // capacity //
+    //////////////
+
+    /// @name capacity
+    /// @{
+
+    /// @brief checks whether the container is empty.
+    /// @sa https://json.nlohmann.me/api/basic_json/empty/
+    bool empty() const noexcept
+    {
+        switch (m_data.m_type)
+        {
+            case value_t::null:
+            {
+                // null values are empty
+                return true;
+            }
+
+            case value_t::array:
+            {
+                // delegate call to array_t::empty()
+                return m_data.m_value.array->empty();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::empty()
+                return m_data.m_value.object->empty();
+            }
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                // all other types are nonempty
+                return false;
+            }
+        }
+    }
+
+    /// @brief returns the number of elements
+    /// @sa https://json.nlohmann.me/api/basic_json/size/
+    size_type size() const noexcept
+    {
+        switch (m_data.m_type)
+        {
+            case value_t::null:
+            {
+                // null values are empty
+                return 0;
+            }
+
+            case value_t::array:
+            {
+                // delegate call to array_t::size()
+                return m_data.m_value.array->size();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::size()
+                return m_data.m_value.object->size();
+            }
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                // all other types have size 1
+                return 1;
+            }
+        }
+    }
+
+    /// @brief returns the maximum possible number of elements
+    /// @sa https://json.nlohmann.me/api/basic_json/max_size/
+    size_type max_size() const noexcept
+    {
+        switch (m_data.m_type)
+        {
+            case value_t::array:
+            {
+                // delegate call to array_t::max_size()
+                return m_data.m_value.array->max_size();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::max_size()
+                return m_data.m_value.object->max_size();
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                // all other types have max_size() == size()
+                return size();
+            }
+        }
+    }
+
+    /// @}
+
+    ///////////////
+    // modifiers //
+    ///////////////
+
+    /// @name modifiers
+    /// @{
+
+    /// @brief clears the contents
+    /// @sa https://json.nlohmann.me/api/basic_json/clear/
+    void clear() noexcept
+    {
+        switch (m_data.m_type)
+        {
+            case value_t::number_integer:
+            {
+                m_data.m_value.number_integer = 0;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_data.m_value.number_unsigned = 0;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_data.m_value.number_float = 0.0;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_data.m_value.boolean = false;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_data.m_value.string->clear();
+                break;
+            }
+
+            case value_t::binary:
+            {
+                m_data.m_value.binary->clear();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_data.m_value.array->clear();
+                break;
+            }
+
+            case value_t::object:
+            {
+                m_data.m_value.object->clear();
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                break;
+        }
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
+    void push_back(basic_json&& val)
+    {
+        // push_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
+        {
+            JSON_THROW(type_error::create(308, detail::concat("cannot use push_back() with ", type_name()), this));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_data.m_type = value_t::array;
+            m_data.m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array (move semantics)
+        const auto old_capacity = m_data.m_value.array->capacity();
+        m_data.m_value.array->push_back(std::move(val));
+        set_parent(m_data.m_value.array->back(), old_capacity);
+        // if val is moved from, basic_json move constructor marks it null, so we do not call the destructor
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
+    reference operator+=(basic_json&& val)
+    {
+        push_back(std::move(val));
+        return *this;
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
+    void push_back(const basic_json& val)
+    {
+        // push_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
+        {
+            JSON_THROW(type_error::create(308, detail::concat("cannot use push_back() with ", type_name()), this));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_data.m_type = value_t::array;
+            m_data.m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array
+        const auto old_capacity = m_data.m_value.array->capacity();
+        m_data.m_value.array->push_back(val);
+        set_parent(m_data.m_value.array->back(), old_capacity);
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
+    reference operator+=(const basic_json& val)
+    {
+        push_back(val);
+        return *this;
+    }
+
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
+    void push_back(const typename object_t::value_type& val)
+    {
+        // push_back only works for null objects or objects
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
+        {
+            JSON_THROW(type_error::create(308, detail::concat("cannot use push_back() with ", type_name()), this));
+        }
+
+        // transform null object into an object
+        if (is_null())
+        {
+            m_data.m_type = value_t::object;
+            m_data.m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // add element to object
+        auto res = m_data.m_value.object->insert(val);
+        set_parent(res.first->second);
+    }
+
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
+    reference operator+=(const typename object_t::value_type& val)
+    {
+        push_back(val);
+        return *this;
+    }
+
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
+    void push_back(initializer_list_t init)
+    {
+        if (is_object() && init.size() == 2 && (*init.begin())->is_string())
+        {
+            basic_json&& key = init.begin()->moved_or_copied();
+            push_back(typename object_t::value_type(
+                          std::move(key.get_ref<string_t&>()), (init.begin() + 1)->moved_or_copied()));
+        }
+        else
+        {
+            push_back(basic_json(init));
+        }
+    }
+
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
+    reference operator+=(initializer_list_t init)
+    {
+        push_back(init);
+        return *this;
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/emplace_back/
+    template<class... Args>
+    reference emplace_back(Args&& ... args)
+    {
+        // emplace_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
+        {
+            JSON_THROW(type_error::create(311, detail::concat("cannot use emplace_back() with ", type_name()), this));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_data.m_type = value_t::array;
+            m_data.m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array (perfect forwarding)
+        const auto old_capacity = m_data.m_value.array->capacity();
+        m_data.m_value.array->emplace_back(std::forward<Args>(args)...);
+        return set_parent(m_data.m_value.array->back(), old_capacity);
+    }
+
+    /// @brief add an object to an object if key does not exist
+    /// @sa https://json.nlohmann.me/api/basic_json/emplace/
+    template<class... Args>
+    std::pair<iterator, bool> emplace(Args&& ... args)
+    {
+        // emplace only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
+        {
+            JSON_THROW(type_error::create(311, detail::concat("cannot use emplace() with ", type_name()), this));
+        }
+
+        // transform null object into an object
+        if (is_null())
+        {
+            m_data.m_type = value_t::object;
+            m_data.m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // add element to array (perfect forwarding)
+        auto res = m_data.m_value.object->emplace(std::forward<Args>(args)...);
+        set_parent(res.first->second);
+
+        // create result iterator and set iterator to the result of emplace
+        auto it = begin();
+        it.m_it.object_iterator = res.first;
+
+        // return pair of iterator and boolean
+        return {it, res.second};
+    }
+
+    /// Helper for insertion of an iterator
+    /// @note: This uses std::distance to support GCC 4.8,
+    ///        see https://github.com/nlohmann/json/pull/1257
+    template<typename... Args>
+    iterator insert_iterator(const_iterator pos, Args&& ... args)
+    {
+        iterator result(this);
+        JSON_ASSERT(m_data.m_value.array != nullptr);
+
+        auto insert_pos = std::distance(m_data.m_value.array->begin(), pos.m_it.array_iterator);
+        m_data.m_value.array->insert(pos.m_it.array_iterator, std::forward<Args>(args)...);
+        result.m_it.array_iterator = m_data.m_value.array->begin() + insert_pos;
+
+        // This could have been written as:
+        // result.m_it.array_iterator = m_data.m_value.array->insert(pos.m_it.array_iterator, cnt, val);
+        // but the return value of insert is missing in GCC 4.8, so it is written this way instead.
+
+        set_parents();
+        return result;
+    }
+
+    /// @brief inserts element into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, const basic_json& val)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // check if iterator pos fits to this JSON value
+            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+            {
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
+            }
+
+            // insert to array and return iterator
+            return insert_iterator(pos, val);
+        }
+
+        JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
+    }
+
+    /// @brief inserts element into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, basic_json&& val)
+    {
+        return insert(pos, val);
+    }
+
+    /// @brief inserts copies of element into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, size_type cnt, const basic_json& val)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // check if iterator pos fits to this JSON value
+            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+            {
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
+            }
+
+            // insert to array and return iterator
+            return insert_iterator(pos, cnt, val);
+        }
+
+        JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
+    }
+
+    /// @brief inserts range of elements into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, const_iterator first, const_iterator last)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_UNLIKELY(!is_array()))
+        {
+            JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
+        }
+
+        // check if iterator pos fits to this JSON value
+        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", this));
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(first.m_object == this))
+        {
+            JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container", this));
+        }
+
+        // insert to array and return iterator
+        return insert_iterator(pos, first.m_it.array_iterator, last.m_it.array_iterator);
+    }
+
+    /// @brief inserts elements from initializer list into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, initializer_list_t ilist)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_UNLIKELY(!is_array()))
+        {
+            JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
+        }
+
+        // check if iterator pos fits to this JSON value
+        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
+        }
+
+        // insert to array and return iterator
+        return insert_iterator(pos, ilist.begin(), ilist.end());
+    }
+
+    /// @brief inserts range of elements into object
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    void insert(const_iterator first, const_iterator last)
+    {
+        // insert only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", this));
+        }
+
+        // passed iterators must belong to objects
+        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects", this));
+        }
+
+        m_data.m_value.object->insert(first.m_it.object_iterator, last.m_it.object_iterator);
+    }
+
+    /// @brief updates a JSON object from another object, overwriting existing keys
+    /// @sa https://json.nlohmann.me/api/basic_json/update/
+    void update(const_reference j, bool merge_objects = false)
+    {
+        update(j.begin(), j.end(), merge_objects);
+    }
+
+    /// @brief updates a JSON object from another object, overwriting existing keys
+    /// @sa https://json.nlohmann.me/api/basic_json/update/
+    void update(const_iterator first, const_iterator last, bool merge_objects = false)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_data.m_type = value_t::object;
+            m_data.m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(312, detail::concat("cannot use update() with ", type_name()), this));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", this));
+        }
+
+        // passed iterators must belong to objects
+        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()))
+        {
+            JSON_THROW(type_error::create(312, detail::concat("cannot use update() with ", first.m_object->type_name()), first.m_object));
+        }
+
+        for (auto it = first; it != last; ++it)
+        {
+            if (merge_objects && it.value().is_object())
+            {
+                auto it2 = m_data.m_value.object->find(it.key());
+                if (it2 != m_data.m_value.object->end())
+                {
+                    it2->second.update(it.value(), true);
+                    continue;
+                }
+            }
+            m_data.m_value.object->operator[](it.key()) = it.value();
+#if JSON_DIAGNOSTICS
+            m_data.m_value.object->operator[](it.key()).m_parent = this;
+#endif
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(reference other) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value&&
+        std::is_nothrow_move_assignable<value_t>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&& // NOLINT(cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+        std::is_nothrow_move_assignable<json_value>::value
+    )
+    {
+        std::swap(m_data.m_type, other.m_data.m_type);
+        std::swap(m_data.m_value, other.m_data.m_value);
+
+        set_parents();
+        other.set_parents();
+        assert_invariant();
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    friend void swap(reference left, reference right) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value&&
+        std::is_nothrow_move_assignable<value_t>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&& // NOLINT(cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+        std::is_nothrow_move_assignable<json_value>::value
+    )
+    {
+        left.swap(right);
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(array_t& other) // NOLINT(bugprone-exception-escape,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+    {
+        // swap only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            using std::swap;
+            swap(*(m_data.m_value.array), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(array_t&) with ", type_name()), this));
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(object_t& other) // NOLINT(bugprone-exception-escape,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+    {
+        // swap only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            using std::swap;
+            swap(*(m_data.m_value.object), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(object_t&) with ", type_name()), this));
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(string_t& other) // NOLINT(bugprone-exception-escape,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+    {
+        // swap only works for strings
+        if (JSON_HEDLEY_LIKELY(is_string()))
+        {
+            using std::swap;
+            swap(*(m_data.m_value.string), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(string_t&) with ", type_name()), this));
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(binary_t& other) // NOLINT(bugprone-exception-escape,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+    {
+        // swap only works for strings
+        if (JSON_HEDLEY_LIKELY(is_binary()))
+        {
+            using std::swap;
+            swap(*(m_data.m_value.binary), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(binary_t&) with ", type_name()), this));
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(typename binary_t::container_type& other) // NOLINT(bugprone-exception-escape)
+    {
+        // swap only works for strings
+        if (JSON_HEDLEY_LIKELY(is_binary()))
+        {
+            using std::swap;
+            swap(*(m_data.m_value.binary), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(binary_t::container_type&) with ", type_name()), this));
+        }
+    }
+
+    /// @}
+
+    //////////////////////////////////////////
+    // lexicographical comparison operators //
+    //////////////////////////////////////////
+
+    /// @name lexicographical comparison operators
+    /// @{
+
+    // note parentheses around operands are necessary; see
+    // https://github.com/nlohmann/json/issues/1530
+#define JSON_IMPLEMENT_OPERATOR(op, null_result, unordered_result, default_result)                       \
+    const auto lhs_type = lhs.type();                                                                    \
+    const auto rhs_type = rhs.type();                                                                    \
+    \
+    if (lhs_type == rhs_type) /* NOLINT(readability/braces) */                                           \
+    {                                                                                                    \
+        switch (lhs_type)                                                                                \
+        {                                                                                                \
+            case value_t::array:                                                                         \
+                return (*lhs.m_data.m_value.array) op (*rhs.m_data.m_value.array);                                     \
+                \
+            case value_t::object:                                                                        \
+                return (*lhs.m_data.m_value.object) op (*rhs.m_data.m_value.object);                                   \
+                \
+            case value_t::null:                                                                          \
+                return (null_result);                                                                    \
+                \
+            case value_t::string:                                                                        \
+                return (*lhs.m_data.m_value.string) op (*rhs.m_data.m_value.string);                                   \
+                \
+            case value_t::boolean:                                                                       \
+                return (lhs.m_data.m_value.boolean) op (rhs.m_data.m_value.boolean);                                   \
+                \
+            case value_t::number_integer:                                                                \
+                return (lhs.m_data.m_value.number_integer) op (rhs.m_data.m_value.number_integer);                     \
+                \
+            case value_t::number_unsigned:                                                               \
+                return (lhs.m_data.m_value.number_unsigned) op (rhs.m_data.m_value.number_unsigned);                   \
+                \
+            case value_t::number_float:                                                                  \
+                return (lhs.m_data.m_value.number_float) op (rhs.m_data.m_value.number_float);                         \
+                \
+            case value_t::binary:                                                                        \
+                return (*lhs.m_data.m_value.binary) op (*rhs.m_data.m_value.binary);                                   \
+                \
+            case value_t::discarded:                                                                     \
+            default:                                                                                     \
+                return (unordered_result);                                                               \
+        }                                                                                                \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float)                   \
+    {                                                                                                    \
+        return static_cast<number_float_t>(lhs.m_data.m_value.number_integer) op rhs.m_data.m_value.number_float;      \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer)                   \
+    {                                                                                                    \
+        return lhs.m_data.m_value.number_float op static_cast<number_float_t>(rhs.m_data.m_value.number_integer);      \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float)                  \
+    {                                                                                                    \
+        return static_cast<number_float_t>(lhs.m_data.m_value.number_unsigned) op rhs.m_data.m_value.number_float;     \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned)                  \
+    {                                                                                                    \
+        return lhs.m_data.m_value.number_float op static_cast<number_float_t>(rhs.m_data.m_value.number_unsigned);     \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer)                \
+    {                                                                                                    \
+        return static_cast<number_integer_t>(lhs.m_data.m_value.number_unsigned) op rhs.m_data.m_value.number_integer; \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned)                \
+    {                                                                                                    \
+        return lhs.m_data.m_value.number_integer op static_cast<number_integer_t>(rhs.m_data.m_value.number_unsigned); \
+    }                                                                                                    \
+    else if(compares_unordered(lhs, rhs))\
+    {\
+        return (unordered_result);\
+    }\
+    \
+    return (default_result);
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    // returns true if:
+    // - any operand is NaN and the other operand is of number type
+    // - any operand is discarded
+    // in legacy mode, discarded values are considered ordered if
+    // an operation is computed as an odd number of inverses of others
+    static bool compares_unordered(const_reference lhs, const_reference rhs, bool inverse = false) noexcept
+    {
+        if ((lhs.is_number_float() && std::isnan(lhs.m_data.m_value.number_float) && rhs.is_number())
+                || (rhs.is_number_float() && std::isnan(rhs.m_data.m_value.number_float) && lhs.is_number()))
+        {
+            return true;
+        }
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+        return (lhs.is_discarded() || rhs.is_discarded()) && !inverse;
+#else
+        static_cast<void>(inverse);
+        return lhs.is_discarded() || rhs.is_discarded();
+#endif
+    }
+
+  private:
+    bool compares_unordered(const_reference rhs, bool inverse = false) const noexcept
+    {
+        return compares_unordered(*this, rhs, inverse);
+    }
+
+  public:
+#if JSON_HAS_THREE_WAY_COMPARISON
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    bool operator==(const_reference rhs) const noexcept
+    {
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        const_reference lhs = *this;
+        JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+    }
+
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    bool operator==(ScalarType rhs) const noexcept
+    {
+        return *this == basic_json(rhs);
+    }
+
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    bool operator!=(const_reference rhs) const noexcept
+    {
+        if (compares_unordered(rhs, true))
+        {
+            return false;
+        }
+        return !operator==(rhs);
+    }
+
+    /// @brief comparison: 3-way
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_spaceship/
+    std::partial_ordering operator<=>(const_reference rhs) const noexcept // *NOPAD*
+    {
+        const_reference lhs = *this;
+        // default_result is used if we cannot compare values. In that case,
+        // we compare types.
+        JSON_IMPLEMENT_OPERATOR(<=>, // *NOPAD*
+                                std::partial_ordering::equivalent,
+                                std::partial_ordering::unordered,
+                                lhs_type <=> rhs_type) // *NOPAD*
+    }
+
+    /// @brief comparison: 3-way
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_spaceship/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    std::partial_ordering operator<=>(ScalarType rhs) const noexcept // *NOPAD*
+    {
+        return *this <=> basic_json(rhs); // *NOPAD*
+    }
+
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    // all operators that are computed as an odd number of inverses of others
+    // need to be overloaded to emulate the legacy comparison behavior
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON)
+    bool operator<=(const_reference rhs) const noexcept
+    {
+        if (compares_unordered(rhs, true))
+        {
+            return false;
+        }
+        return !(rhs < *this);
+    }
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    bool operator<=(ScalarType rhs) const noexcept
+    {
+        return *this <= basic_json(rhs);
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON)
+    bool operator>=(const_reference rhs) const noexcept
+    {
+        if (compares_unordered(rhs, true))
+        {
+            return false;
+        }
+        return !(*this < rhs);
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    bool operator>=(ScalarType rhs) const noexcept
+    {
+        return *this >= basic_json(rhs);
+    }
+#endif
+#else
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    friend bool operator==(const_reference lhs, const_reference rhs) noexcept
+    {
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+    }
+
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator==(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs == basic_json(rhs);
+    }
+
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator==(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) == rhs;
+    }
+
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    friend bool operator!=(const_reference lhs, const_reference rhs) noexcept
+    {
+        if (compares_unordered(lhs, rhs, true))
+        {
+            return false;
+        }
+        return !(lhs == rhs);
+    }
+
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator!=(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs != basic_json(rhs);
+    }
+
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator!=(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) != rhs;
+    }
+
+    /// @brief comparison: less than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
+    friend bool operator<(const_reference lhs, const_reference rhs) noexcept
+    {
+        // default_result is used if we cannot compare values. In that case,
+        // we compare types. Note we have to call the operator explicitly,
+        // because MSVC has problems otherwise.
+        JSON_IMPLEMENT_OPERATOR( <, false, false, operator<(lhs_type, rhs_type))
+    }
+
+    /// @brief comparison: less than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs < basic_json(rhs);
+    }
+
+    /// @brief comparison: less than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) < rhs;
+    }
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    friend bool operator<=(const_reference lhs, const_reference rhs) noexcept
+    {
+        if (compares_unordered(lhs, rhs, true))
+        {
+            return false;
+        }
+        return !(rhs < lhs);
+    }
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<=(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs <= basic_json(rhs);
+    }
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<=(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) <= rhs;
+    }
+
+    /// @brief comparison: greater than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
+    friend bool operator>(const_reference lhs, const_reference rhs) noexcept
+    {
+        // double inverse
+        if (compares_unordered(lhs, rhs))
+        {
+            return false;
+        }
+        return !(lhs <= rhs);
+    }
+
+    /// @brief comparison: greater than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs > basic_json(rhs);
+    }
+
+    /// @brief comparison: greater than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) > rhs;
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    friend bool operator>=(const_reference lhs, const_reference rhs) noexcept
+    {
+        if (compares_unordered(lhs, rhs, true))
+        {
+            return false;
+        }
+        return !(lhs < rhs);
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>=(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs >= basic_json(rhs);
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>=(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) >= rhs;
+    }
+#endif
+
+#undef JSON_IMPLEMENT_OPERATOR
+
+    /// @}
+
+    ///////////////////
+    // serialization //
+    ///////////////////
+
+    /// @name serialization
+    /// @{
+#ifndef JSON_NO_IO
+    /// @brief serialize to stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
+    friend std::ostream& operator<<(std::ostream& o, const basic_json& j)
+    {
+        // read width member and use it as indentation parameter if nonzero
+        const bool pretty_print = o.width() > 0;
+        const auto indentation = pretty_print ? o.width() : 0;
+
+        // reset width to 0 for subsequent calls to this stream
+        o.width(0);
+
+        // do the actual serialization
+        serializer s(detail::output_adapter<char>(o), o.fill());
+        s.dump(j, pretty_print, false, static_cast<unsigned int>(indentation));
+        return o;
+    }
+
+    /// @brief serialize to stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
+    /// @deprecated This function is deprecated since 3.0.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use
+    ///             operator<<(std::ostream&, const basic_json&) instead; that is,
+    ///             replace calls like `j >> o;` with `o << j;`.
+    JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator<<(std::ostream&, const basic_json&))
+    friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
+    {
+        return o << j;
+    }
+#endif  // JSON_NO_IO
+    /// @}
+
+    /////////////////////
+    // deserialization //
+    /////////////////////
+
+    /// @name deserialization
+    /// @{
+
+    /// @brief deserialize from a compatible input
+    /// @sa https://json.nlohmann.me/api/basic_json/parse/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json parse(InputType&& i,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true,
+                            const bool ignore_comments = false)
+    {
+        basic_json result;
+        parser(detail::input_adapter(std::forward<InputType>(i)), cb, allow_exceptions, ignore_comments).parse(true, result);
+        return result;
+    }
+
+    /// @brief deserialize from a pair of character iterators
+    /// @sa https://json.nlohmann.me/api/basic_json/parse/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json parse(IteratorType first,
+                            IteratorType last,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true,
+                            const bool ignore_comments = false)
+    {
+        basic_json result;
+        parser(detail::input_adapter(std::move(first), std::move(last)), cb, allow_exceptions, ignore_comments).parse(true, result);
+        return result;
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, parse(ptr, ptr + len))
+    static basic_json parse(detail::span_input_adapter&& i,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true,
+                            const bool ignore_comments = false)
+    {
+        basic_json result;
+        parser(i.get(), cb, allow_exceptions, ignore_comments).parse(true, result);
+        return result;
+    }
+
+    /// @brief check if the input is valid JSON
+    /// @sa https://json.nlohmann.me/api/basic_json/accept/
+    template<typename InputType>
+    static bool accept(InputType&& i,
+                       const bool ignore_comments = false)
+    {
+        return parser(detail::input_adapter(std::forward<InputType>(i)), nullptr, false, ignore_comments).accept(true);
+    }
+
+    /// @brief check if the input is valid JSON
+    /// @sa https://json.nlohmann.me/api/basic_json/accept/
+    template<typename IteratorType>
+    static bool accept(IteratorType first, IteratorType last,
+                       const bool ignore_comments = false)
+    {
+        return parser(detail::input_adapter(std::move(first), std::move(last)), nullptr, false, ignore_comments).accept(true);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, accept(ptr, ptr + len))
+    static bool accept(detail::span_input_adapter&& i,
+                       const bool ignore_comments = false)
+    {
+        return parser(i.get(), nullptr, false, ignore_comments).accept(true);
+    }
+
+    /// @brief generate SAX events
+    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
+    template <typename InputType, typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    static bool sax_parse(InputType&& i, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true,
+                          const bool ignore_comments = false)
+    {
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        return format == input_format_t::json
+               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia), format).sax_parse(format, sax, strict);
+    }
+
+    /// @brief generate SAX events
+    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
+    template<class IteratorType, class SAX>
+    JSON_HEDLEY_NON_NULL(3)
+    static bool sax_parse(IteratorType first, IteratorType last, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true,
+                          const bool ignore_comments = false)
+    {
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        return format == input_format_t::json
+               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia), format).sax_parse(format, sax, strict);
+    }
+
+    /// @brief generate SAX events
+    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
+    /// @deprecated This function is deprecated since 3.8.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use
+    ///             sax_parse(ptr, ptr + len) instead.
+    template <typename SAX>
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, sax_parse(ptr, ptr + len, ...))
+    JSON_HEDLEY_NON_NULL(2)
+    static bool sax_parse(detail::span_input_adapter&& i, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true,
+                          const bool ignore_comments = false)
+    {
+        auto ia = i.get();
+        return format == input_format_t::json
+               // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
+               // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia), format).sax_parse(format, sax, strict);
+    }
+#ifndef JSON_NO_IO
+    /// @brief deserialize from stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gtgt/
+    /// @deprecated This stream operator is deprecated since 3.0.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use
+    ///             operator>>(std::istream&, basic_json&) instead; that is,
+    ///             replace calls like `j << i;` with `i >> j;`.
+    JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator>>(std::istream&, basic_json&))
+    friend std::istream& operator<<(basic_json& j, std::istream& i)
+    {
+        return operator>>(i, j);
+    }
+
+    /// @brief deserialize from stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gtgt/
+    friend std::istream& operator>>(std::istream& i, basic_json& j)
+    {
+        parser(detail::input_adapter(i)).parse(false, j);
+        return i;
+    }
+#endif  // JSON_NO_IO
+    /// @}
+
+    ///////////////////////////
+    // convenience functions //
+    ///////////////////////////
+
+    /// @brief return the type as string
+    /// @sa https://json.nlohmann.me/api/basic_json/type_name/
+    JSON_HEDLEY_RETURNS_NON_NULL
+    const char* type_name() const noexcept
+    {
+        switch (m_data.m_type)
+        {
+            case value_t::null:
+                return "null";
+            case value_t::object:
+                return "object";
+            case value_t::array:
+                return "array";
+            case value_t::string:
+                return "string";
+            case value_t::boolean:
+                return "boolean";
+            case value_t::binary:
+                return "binary";
+            case value_t::discarded:
+                return "discarded";
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            default:
+                return "number";
+        }
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    //////////////////////
+    // member variables //
+    //////////////////////
+
+    struct data
+    {
+        /// the type of the current element
+        value_t m_type = value_t::null;
+
+        /// the value of the current element
+        json_value m_value = {};
+
+        data(const value_t v)
+            : m_type(v), m_value(v)
+        {
+        }
+
+        data(size_type cnt, const basic_json& val)
+            : m_type(value_t::array)
+        {
+            m_value.array = create<array_t>(cnt, val);
+        }
+
+        data() noexcept = default;
+        data(data&&) noexcept = default;
+        data(const data&) noexcept = delete;
+        data& operator=(data&&) noexcept = delete;
+        data& operator=(const data&) noexcept = delete;
+
+        ~data() noexcept
+        {
+            m_value.destroy(m_type);
+        }
+    };
+
+    data m_data = {};
+
+#if JSON_DIAGNOSTICS
+    /// a pointer to a parent value (for debugging purposes)
+    basic_json* m_parent = nullptr;
+#endif
+
+    //////////////////////////////////////////
+    // binary serialization/deserialization //
+    //////////////////////////////////////////
+
+    /// @name binary serialization/deserialization support
+    /// @{
+
+  public:
+    /// @brief create a CBOR serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
+    static std::vector<std::uint8_t> to_cbor(const basic_json& j)
+    {
+        std::vector<std::uint8_t> result;
+        to_cbor(j, result);
+        return result;
+    }
+
+    /// @brief create a CBOR serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
+    static void to_cbor(const basic_json& j, detail::output_adapter<std::uint8_t> o)
+    {
+        binary_writer<std::uint8_t>(o).write_cbor(j);
+    }
+
+    /// @brief create a CBOR serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
+    static void to_cbor(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_cbor(j);
+    }
+
+    /// @brief create a MessagePack serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
+    static std::vector<std::uint8_t> to_msgpack(const basic_json& j)
+    {
+        std::vector<std::uint8_t> result;
+        to_msgpack(j, result);
+        return result;
+    }
+
+    /// @brief create a MessagePack serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
+    static void to_msgpack(const basic_json& j, detail::output_adapter<std::uint8_t> o)
+    {
+        binary_writer<std::uint8_t>(o).write_msgpack(j);
+    }
+
+    /// @brief create a MessagePack serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
+    static void to_msgpack(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_msgpack(j);
+    }
+
+    /// @brief create a UBJSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
+    static std::vector<std::uint8_t> to_ubjson(const basic_json& j,
+            const bool use_size = false,
+            const bool use_type = false)
+    {
+        std::vector<std::uint8_t> result;
+        to_ubjson(j, result, use_size, use_type);
+        return result;
+    }
+
+    /// @brief create a UBJSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
+    static void to_ubjson(const basic_json& j, detail::output_adapter<std::uint8_t> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<std::uint8_t>(o).write_ubjson(j, use_size, use_type);
+    }
+
+    /// @brief create a UBJSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
+    static void to_ubjson(const basic_json& j, detail::output_adapter<char> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<char>(o).write_ubjson(j, use_size, use_type);
+    }
+
+    /// @brief create a BJData serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bjdata/
+    static std::vector<std::uint8_t> to_bjdata(const basic_json& j,
+            const bool use_size = false,
+            const bool use_type = false)
+    {
+        std::vector<std::uint8_t> result;
+        to_bjdata(j, result, use_size, use_type);
+        return result;
+    }
+
+    /// @brief create a BJData serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bjdata/
+    static void to_bjdata(const basic_json& j, detail::output_adapter<std::uint8_t> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<std::uint8_t>(o).write_ubjson(j, use_size, use_type, true, true);
+    }
+
+    /// @brief create a BJData serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bjdata/
+    static void to_bjdata(const basic_json& j, detail::output_adapter<char> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<char>(o).write_ubjson(j, use_size, use_type, true, true);
+    }
+
+    /// @brief create a BSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
+    static std::vector<std::uint8_t> to_bson(const basic_json& j)
+    {
+        std::vector<std::uint8_t> result;
+        to_bson(j, result);
+        return result;
+    }
+
+    /// @brief create a BSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
+    static void to_bson(const basic_json& j, detail::output_adapter<std::uint8_t> o)
+    {
+        binary_writer<std::uint8_t>(o).write_bson(j);
+    }
+
+    /// @brief create a BSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
+    static void to_bson(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_bson(j);
+    }
+
+    /// @brief create a JSON value from an input in CBOR format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_cbor/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_cbor(InputType&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::cbor).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in CBOR format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_cbor/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_cbor(IteratorType first, IteratorType last,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::cbor).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len))
+    static basic_json from_cbor(const T* ptr, std::size_t len,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        return from_cbor(ptr, ptr + len, strict, allow_exceptions, tag_handler);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len))
+    static basic_json from_cbor(detail::span_input_adapter&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = i.get();
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::cbor).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in MessagePack format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_msgpack/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_msgpack(InputType&& i,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::msgpack).sax_parse(input_format_t::msgpack, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in MessagePack format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_msgpack/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_msgpack(IteratorType first, IteratorType last,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::msgpack).sax_parse(input_format_t::msgpack, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len))
+    static basic_json from_msgpack(const T* ptr, std::size_t len,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        return from_msgpack(ptr, ptr + len, strict, allow_exceptions);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len))
+    static basic_json from_msgpack(detail::span_input_adapter&& i,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = i.get();
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::msgpack).sax_parse(input_format_t::msgpack, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in UBJSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_ubjson/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_ubjson(InputType&& i,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::ubjson).sax_parse(input_format_t::ubjson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in UBJSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_ubjson/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_ubjson(IteratorType first, IteratorType last,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::ubjson).sax_parse(input_format_t::ubjson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len))
+    static basic_json from_ubjson(const T* ptr, std::size_t len,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        return from_ubjson(ptr, ptr + len, strict, allow_exceptions);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len))
+    static basic_json from_ubjson(detail::span_input_adapter&& i,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = i.get();
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::ubjson).sax_parse(input_format_t::ubjson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in BJData format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bjdata/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bjdata(InputType&& i,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bjdata).sax_parse(input_format_t::bjdata, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in BJData format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bjdata/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bjdata(IteratorType first, IteratorType last,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bjdata).sax_parse(input_format_t::bjdata, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in BSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bson/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bson(InputType&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bson).sax_parse(input_format_t::bson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in BSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bson/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bson(IteratorType first, IteratorType last,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bson).sax_parse(input_format_t::bson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len))
+    static basic_json from_bson(const T* ptr, std::size_t len,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        return from_bson(ptr, ptr + len, strict, allow_exceptions);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len))
+    static basic_json from_bson(detail::span_input_adapter&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = i.get();
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bson).sax_parse(input_format_t::bson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+    /// @}
+
+    //////////////////////////
+    // JSON Pointer support //
+    //////////////////////////
+
+    /// @name JSON Pointer functions
+    /// @{
+
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    reference operator[](const json_pointer& ptr)
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    reference operator[](const ::nlohmann::json_pointer<BasicJsonType>& ptr)
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    const_reference operator[](const json_pointer& ptr) const
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    const_reference operator[](const ::nlohmann::json_pointer<BasicJsonType>& ptr) const
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    reference at(const json_pointer& ptr)
+    {
+        return ptr.get_checked(this);
+    }
+
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    reference at(const ::nlohmann::json_pointer<BasicJsonType>& ptr)
+    {
+        return ptr.get_checked(this);
+    }
+
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    const_reference at(const json_pointer& ptr) const
+    {
+        return ptr.get_checked(this);
+    }
+
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    const_reference at(const ::nlohmann::json_pointer<BasicJsonType>& ptr) const
+    {
+        return ptr.get_checked(this);
+    }
+
+    /// @brief return flattened JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/flatten/
+    basic_json flatten() const
+    {
+        basic_json result(value_t::object);
+        json_pointer::flatten("", *this, result);
+        return result;
+    }
+
+    /// @brief unflatten a previously flattened JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/unflatten/
+    basic_json unflatten() const
+    {
+        return json_pointer::unflatten(*this);
+    }
+
+    /// @}
+
+    //////////////////////////
+    // JSON Patch functions //
+    //////////////////////////
+
+    /// @name JSON Patch functions
+    /// @{
+
+    /// @brief applies a JSON patch in-place without copying the object
+    /// @sa https://json.nlohmann.me/api/basic_json/patch/
+    void patch_inplace(const basic_json& json_patch)
+    {
+        basic_json& result = *this;
+        // the valid JSON Patch operations
+        enum class patch_operations {add, remove, replace, move, copy, test, invalid};
+
+        const auto get_op = [](const std::string & op)
+        {
+            if (op == "add")
+            {
+                return patch_operations::add;
+            }
+            if (op == "remove")
+            {
+                return patch_operations::remove;
+            }
+            if (op == "replace")
+            {
+                return patch_operations::replace;
+            }
+            if (op == "move")
+            {
+                return patch_operations::move;
+            }
+            if (op == "copy")
+            {
+                return patch_operations::copy;
+            }
+            if (op == "test")
+            {
+                return patch_operations::test;
+            }
+
+            return patch_operations::invalid;
+        };
+
+        // wrapper for "add" operation; add value at ptr
+        const auto operation_add = [&result](json_pointer & ptr, basic_json val)
+        {
+            // adding to the root of the target document means replacing it
+            if (ptr.empty())
+            {
+                result = val;
+                return;
+            }
+
+            // make sure the top element of the pointer exists
+            json_pointer const top_pointer = ptr.top();
+            if (top_pointer != ptr)
+            {
+                result.at(top_pointer);
+            }
+
+            // get reference to parent of JSON pointer ptr
+            const auto last_path = ptr.back();
+            ptr.pop_back();
+            // parent must exist when performing patch add per RFC6902 specs
+            basic_json& parent = result.at(ptr);
+
+            switch (parent.m_data.m_type)
+            {
+                case value_t::null:
+                case value_t::object:
+                {
+                    // use operator[] to add value
+                    parent[last_path] = val;
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    if (last_path == "-")
+                    {
+                        // special case: append to back
+                        parent.push_back(val);
+                    }
+                    else
+                    {
+                        const auto idx = json_pointer::template array_index<basic_json_t>(last_path);
+                        if (JSON_HEDLEY_UNLIKELY(idx > parent.size()))
+                        {
+                            // avoid undefined behavior
+                            JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), &parent));
+                        }
+
+                        // default case: insert add offset
+                        parent.insert(parent.begin() + static_cast<difference_type>(idx), val);
+                    }
+                    break;
+                }
+
+                // if there exists a parent it cannot be primitive
+                case value_t::string: // LCOV_EXCL_LINE
+                case value_t::boolean: // LCOV_EXCL_LINE
+                case value_t::number_integer: // LCOV_EXCL_LINE
+                case value_t::number_unsigned: // LCOV_EXCL_LINE
+                case value_t::number_float: // LCOV_EXCL_LINE
+                case value_t::binary: // LCOV_EXCL_LINE
+                case value_t::discarded: // LCOV_EXCL_LINE
+                default:            // LCOV_EXCL_LINE
+                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+            }
+        };
+
+        // wrapper for "remove" operation; remove value at ptr
+        const auto operation_remove = [this, & result](json_pointer & ptr)
+        {
+            // get reference to parent of JSON pointer ptr
+            const auto last_path = ptr.back();
+            ptr.pop_back();
+            basic_json& parent = result.at(ptr);
+
+            // remove child
+            if (parent.is_object())
+            {
+                // perform range check
+                auto it = parent.find(last_path);
+                if (JSON_HEDLEY_LIKELY(it != parent.end()))
+                {
+                    parent.erase(it);
+                }
+                else
+                {
+                    JSON_THROW(out_of_range::create(403, detail::concat("key '", last_path, "' not found"), this));
+                }
+            }
+            else if (parent.is_array())
+            {
+                // note erase performs range check
+                parent.erase(json_pointer::template array_index<basic_json_t>(last_path));
+            }
+        };
+
+        // type check: top level value must be an array
+        if (JSON_HEDLEY_UNLIKELY(!json_patch.is_array()))
+        {
+            JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", &json_patch));
+        }
+
+        // iterate and apply the operations
+        for (const auto& val : json_patch)
+        {
+            // wrapper to get a value for an operation
+            const auto get_value = [&val](const std::string & op,
+                                          const std::string & member,
+                                          bool string_type) -> basic_json &
+            {
+                // find value
+                auto it = val.m_data.m_value.object->find(member);
+
+                // context-sensitive error message
+                const auto error_msg = (op == "op") ? "operation" : detail::concat("operation '", op, '\'');
+
+                // check if desired value is present
+                if (JSON_HEDLEY_UNLIKELY(it == val.m_data.m_value.object->end()))
+                {
+                    // NOLINTNEXTLINE(performance-inefficient-string-concatenation)
+                    JSON_THROW(parse_error::create(105, 0, detail::concat(error_msg, " must have member '", member, "'"), &val));
+                }
+
+                // check if result is of type string
+                if (JSON_HEDLEY_UNLIKELY(string_type && !it->second.is_string()))
+                {
+                    // NOLINTNEXTLINE(performance-inefficient-string-concatenation)
+                    JSON_THROW(parse_error::create(105, 0, detail::concat(error_msg, " must have string member '", member, "'"), &val));
+                }
+
+                // no error: return value
+                return it->second;
+            };
+
+            // type check: every element of the array must be an object
+            if (JSON_HEDLEY_UNLIKELY(!val.is_object()))
+            {
+                JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", &val));
+            }
+
+            // collect mandatory members
+            const auto op = get_value("op", "op", true).template get<std::string>();
+            const auto path = get_value(op, "path", true).template get<std::string>();
+            json_pointer ptr(path);
+
+            switch (get_op(op))
+            {
+                case patch_operations::add:
+                {
+                    operation_add(ptr, get_value("add", "value", false));
+                    break;
+                }
+
+                case patch_operations::remove:
+                {
+                    operation_remove(ptr);
+                    break;
+                }
+
+                case patch_operations::replace:
+                {
+                    // the "path" location must exist - use at()
+                    result.at(ptr) = get_value("replace", "value", false);
+                    break;
+                }
+
+                case patch_operations::move:
+                {
+                    const auto from_path = get_value("move", "from", true).template get<std::string>();
+                    json_pointer from_ptr(from_path);
+
+                    // the "from" location must exist - use at()
+                    basic_json const v = result.at(from_ptr);
+
+                    // The move operation is functionally identical to a
+                    // "remove" operation on the "from" location, followed
+                    // immediately by an "add" operation at the target
+                    // location with the value that was just removed.
+                    operation_remove(from_ptr);
+                    operation_add(ptr, v);
+                    break;
+                }
+
+                case patch_operations::copy:
+                {
+                    const auto from_path = get_value("copy", "from", true).template get<std::string>();
+                    const json_pointer from_ptr(from_path);
+
+                    // the "from" location must exist - use at()
+                    basic_json const v = result.at(from_ptr);
+
+                    // The copy is functionally identical to an "add"
+                    // operation at the target location using the value
+                    // specified in the "from" member.
+                    operation_add(ptr, v);
+                    break;
+                }
+
+                case patch_operations::test:
+                {
+                    bool success = false;
+                    JSON_TRY
+                    {
+                        // check if "value" matches the one at "path"
+                        // the "path" location must exist - use at()
+                        success = (result.at(ptr) == get_value("test", "value", false));
+                    }
+                    JSON_INTERNAL_CATCH (out_of_range&)
+                    {
+                        // ignore out of range errors: success remains false
+                    }
+
+                    // throw an exception if test fails
+                    if (JSON_HEDLEY_UNLIKELY(!success))
+                    {
+                        JSON_THROW(other_error::create(501, detail::concat("unsuccessful: ", val.dump()), &val));
+                    }
+
+                    break;
+                }
+
+                case patch_operations::invalid:
+                default:
+                {
+                    // op must be "add", "remove", "replace", "move", "copy", or
+                    // "test"
+                    JSON_THROW(parse_error::create(105, 0, detail::concat("operation value '", op, "' is invalid"), &val));
+                }
+            }
+        }
+    }
+
+    /// @brief applies a JSON patch to a copy of the current object
+    /// @sa https://json.nlohmann.me/api/basic_json/patch/
+    basic_json patch(const basic_json& json_patch) const
+    {
+        basic_json result = *this;
+        result.patch_inplace(json_patch);
+        return result;
+    }
+
+    /// @brief creates a diff as a JSON patch
+    /// @sa https://json.nlohmann.me/api/basic_json/diff/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json diff(const basic_json& source, const basic_json& target,
+                           const std::string& path = "")
+    {
+        // the patch
+        basic_json result(value_t::array);
+
+        // if the values are the same, return empty patch
+        if (source == target)
+        {
+            return result;
+        }
+
+        if (source.type() != target.type())
+        {
+            // different types: replace value
+            result.push_back(
+            {
+                {"op", "replace"}, {"path", path}, {"value", target}
+            });
+            return result;
+        }
+
+        switch (source.type())
+        {
+            case value_t::array:
+            {
+                // first pass: traverse common elements
+                std::size_t i = 0;
+                while (i < source.size() && i < target.size())
+                {
+                    // recursive call to compare array values at index i
+                    auto temp_diff = diff(source[i], target[i], detail::concat(path, '/', std::to_string(i)));
+                    result.insert(result.end(), temp_diff.begin(), temp_diff.end());
+                    ++i;
+                }
+
+                // We now reached the end of at least one array
+                // in a second pass, traverse the remaining elements
+
+                // remove my remaining elements
+                const auto end_index = static_cast<difference_type>(result.size());
+                while (i < source.size())
+                {
+                    // add operations in reverse order to avoid invalid
+                    // indices
+                    result.insert(result.begin() + end_index, object(
+                    {
+                        {"op", "remove"},
+                        {"path", detail::concat(path, '/', std::to_string(i))}
+                    }));
+                    ++i;
+                }
+
+                // add other remaining elements
+                while (i < target.size())
+                {
+                    result.push_back(
+                    {
+                        {"op", "add"},
+                        {"path", detail::concat(path, "/-")},
+                        {"value", target[i]}
+                    });
+                    ++i;
+                }
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                // first pass: traverse this object's elements
+                for (auto it = source.cbegin(); it != source.cend(); ++it)
+                {
+                    // escape the key name to be used in a JSON patch
+                    const auto path_key = detail::concat(path, '/', detail::escape(it.key()));
+
+                    if (target.find(it.key()) != target.end())
+                    {
+                        // recursive call to compare object values at key it
+                        auto temp_diff = diff(it.value(), target[it.key()], path_key);
+                        result.insert(result.end(), temp_diff.begin(), temp_diff.end());
+                    }
+                    else
+                    {
+                        // found a key that is not in o -> remove it
+                        result.push_back(object(
+                        {
+                            {"op", "remove"}, {"path", path_key}
+                        }));
+                    }
+                }
+
+                // second pass: traverse other object's elements
+                for (auto it = target.cbegin(); it != target.cend(); ++it)
+                {
+                    if (source.find(it.key()) == source.end())
+                    {
+                        // found a key that is not in this -> add it
+                        const auto path_key = detail::concat(path, '/', detail::escape(it.key()));
+                        result.push_back(
+                        {
+                            {"op", "add"}, {"path", path_key},
+                            {"value", it.value()}
+                        });
+                    }
+                }
+
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                // both primitive type: replace value
+                result.push_back(
+                {
+                    {"op", "replace"}, {"path", path}, {"value", target}
+                });
+                break;
+            }
+        }
+
+        return result;
+    }
+    /// @}
+
+    ////////////////////////////////
+    // JSON Merge Patch functions //
+    ////////////////////////////////
+
+    /// @name JSON Merge Patch functions
+    /// @{
+
+    /// @brief applies a JSON Merge Patch
+    /// @sa https://json.nlohmann.me/api/basic_json/merge_patch/
+    void merge_patch(const basic_json& apply_patch)
+    {
+        if (apply_patch.is_object())
+        {
+            if (!is_object())
+            {
+                *this = object();
+            }
+            for (auto it = apply_patch.begin(); it != apply_patch.end(); ++it)
+            {
+                if (it.value().is_null())
+                {
+                    erase(it.key());
+                }
+                else
+                {
+                    operator[](it.key()).merge_patch(it.value());
+                }
+            }
+        }
+        else
+        {
+            *this = apply_patch;
+        }
+    }
+
+    /// @}
+};
+
+/// @brief user-defined to_string function for JSON values
+/// @sa https://json.nlohmann.me/api/basic_json/to_string/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j)
+{
+    return j.dump();
+}
+
+inline namespace literals
+{
+inline namespace json_literals
+{
+
+/// @brief user-defined string literal for JSON values
+/// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json/
+JSON_HEDLEY_NON_NULL(1)
+#if !defined(JSON_HEDLEY_GCC_VERSION) || JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0)
+    inline nlohmann::json operator ""_json(const char* s, std::size_t n)
+#else
+    inline nlohmann::json operator "" _json(const char* s, std::size_t n)
+#endif
+{
+    return nlohmann::json::parse(s, s + n);
+}
+
+/// @brief user-defined string literal for JSON pointer
+/// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json_pointer/
+JSON_HEDLEY_NON_NULL(1)
+#if !defined(JSON_HEDLEY_GCC_VERSION) || JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0)
+    inline nlohmann::json::json_pointer operator ""_json_pointer(const char* s, std::size_t n)
+#else
+    inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
+#endif
+{
+    return nlohmann::json::json_pointer(std::string(s, n));
+}
+
+}  // namespace json_literals
+}  // namespace literals
+NLOHMANN_JSON_NAMESPACE_END
+
+///////////////////////
+// nonmember support //
+///////////////////////
+
+namespace std // NOLINT(cert-dcl58-cpp)
+{
+
+/// @brief hash value for JSON objects
+/// @sa https://json.nlohmann.me/api/basic_json/std_hash/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+struct hash<nlohmann::NLOHMANN_BASIC_JSON_TPL> // NOLINT(cert-dcl58-cpp)
+{
+    std::size_t operator()(const nlohmann::NLOHMANN_BASIC_JSON_TPL& j) const
+    {
+        return nlohmann::detail::hash(j);
+    }
+};
+
+// specialization for std::less<value_t>
+template<>
+struct less< ::nlohmann::detail::value_t> // do not remove the space after '<', see https://github.com/nlohmann/json/pull/679
+{
+    /*!
+    @brief compare two value_t enum values
+    @since version 3.0.0
+    */
+    bool operator()(::nlohmann::detail::value_t lhs,
+                    ::nlohmann::detail::value_t rhs) const noexcept
+    {
+#if JSON_HAS_THREE_WAY_COMPARISON
+        return std::is_lt(lhs <=> rhs); // *NOPAD*
+#else
+        return ::nlohmann::detail::operator<(lhs, rhs);
+#endif
+    }
+};
+
+// C++20 prohibit function specialization in the std namespace.
+#ifndef JSON_HAS_CPP_20
+
+/// @brief exchanges the values of two JSON objects
+/// @sa https://json.nlohmann.me/api/basic_json/std_swap/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+inline void swap(nlohmann::NLOHMANN_BASIC_JSON_TPL& j1, nlohmann::NLOHMANN_BASIC_JSON_TPL& j2) noexcept(  // NOLINT(readability-inconsistent-declaration-parameter-name, cert-dcl58-cpp)
+    is_nothrow_move_constructible<nlohmann::NLOHMANN_BASIC_JSON_TPL>::value&&                          // NOLINT(misc-redundant-expression,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+    is_nothrow_move_assignable<nlohmann::NLOHMANN_BASIC_JSON_TPL>::value)
+{
+    j1.swap(j2);
+}
+
+#endif
+
+}  // namespace std
+
+#if JSON_USE_GLOBAL_UDLS
+    #if !defined(JSON_HEDLEY_GCC_VERSION) || JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0)
+        using nlohmann::literals::json_literals::operator ""_json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+        using nlohmann::literals::json_literals::operator ""_json_pointer; //NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+    #else
+        using nlohmann::literals::json_literals::operator "" _json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+        using nlohmann::literals::json_literals::operator "" _json_pointer; //NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+    #endif
+#endif
+
+// #include <nlohmann/detail/macro_unscope.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// restore clang diagnostic settings
+#if defined(__clang__)
+    #pragma clang diagnostic pop
+#endif
+
+// clean up
+#undef JSON_ASSERT
+#undef JSON_INTERNAL_CATCH
+#undef JSON_THROW
+#undef JSON_PRIVATE_UNLESS_TESTED
+#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
+#undef NLOHMANN_BASIC_JSON_TPL
+#undef JSON_EXPLICIT
+#undef NLOHMANN_CAN_CALL_STD_FUNC_IMPL
+#undef JSON_INLINE_VARIABLE
+#undef JSON_NO_UNIQUE_ADDRESS
+#undef JSON_DISABLE_ENUM_SERIALIZATION
+#undef JSON_USE_GLOBAL_UDLS
+
+#ifndef JSON_TEST_KEEP_MACROS
+    #undef JSON_CATCH
+    #undef JSON_TRY
+    #undef JSON_HAS_CPP_11
+    #undef JSON_HAS_CPP_14
+    #undef JSON_HAS_CPP_17
+    #undef JSON_HAS_CPP_20
+    #undef JSON_HAS_FILESYSTEM
+    #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+    #undef JSON_HAS_THREE_WAY_COMPARISON
+    #undef JSON_HAS_RANGES
+    #undef JSON_HAS_STATIC_RTTI
+    #undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+#endif
+
+// #include <nlohmann/thirdparty/hedley/hedley_undef.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#undef JSON_HEDLEY_ALWAYS_INLINE
+#undef JSON_HEDLEY_ARM_VERSION
+#undef JSON_HEDLEY_ARM_VERSION_CHECK
+#undef JSON_HEDLEY_ARRAY_PARAM
+#undef JSON_HEDLEY_ASSUME
+#undef JSON_HEDLEY_BEGIN_C_DECLS
+#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_BUILTIN
+#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_EXTENSION
+#undef JSON_HEDLEY_CLANG_HAS_FEATURE
+#undef JSON_HEDLEY_CLANG_HAS_WARNING
+#undef JSON_HEDLEY_COMPCERT_VERSION
+#undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
+#undef JSON_HEDLEY_CONCAT
+#undef JSON_HEDLEY_CONCAT3
+#undef JSON_HEDLEY_CONCAT3_EX
+#undef JSON_HEDLEY_CONCAT_EX
+#undef JSON_HEDLEY_CONST
+#undef JSON_HEDLEY_CONSTEXPR
+#undef JSON_HEDLEY_CONST_CAST
+#undef JSON_HEDLEY_CPP_CAST
+#undef JSON_HEDLEY_CRAY_VERSION
+#undef JSON_HEDLEY_CRAY_VERSION_CHECK
+#undef JSON_HEDLEY_C_DECL
+#undef JSON_HEDLEY_DEPRECATED
+#undef JSON_HEDLEY_DEPRECATED_FOR
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
+#undef JSON_HEDLEY_DIAGNOSTIC_POP
+#undef JSON_HEDLEY_DIAGNOSTIC_PUSH
+#undef JSON_HEDLEY_DMC_VERSION
+#undef JSON_HEDLEY_DMC_VERSION_CHECK
+#undef JSON_HEDLEY_EMPTY_BASES
+#undef JSON_HEDLEY_EMSCRIPTEN_VERSION
+#undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
+#undef JSON_HEDLEY_END_C_DECLS
+#undef JSON_HEDLEY_FLAGS
+#undef JSON_HEDLEY_FLAGS_CAST
+#undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_BUILTIN
+#undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_EXTENSION
+#undef JSON_HEDLEY_GCC_HAS_FEATURE
+#undef JSON_HEDLEY_GCC_HAS_WARNING
+#undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
+#undef JSON_HEDLEY_GCC_VERSION
+#undef JSON_HEDLEY_GCC_VERSION_CHECK
+#undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_BUILTIN
+#undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_EXTENSION
+#undef JSON_HEDLEY_GNUC_HAS_FEATURE
+#undef JSON_HEDLEY_GNUC_HAS_WARNING
+#undef JSON_HEDLEY_GNUC_VERSION
+#undef JSON_HEDLEY_GNUC_VERSION_CHECK
+#undef JSON_HEDLEY_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_BUILTIN
+#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
+#undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_EXTENSION
+#undef JSON_HEDLEY_HAS_FEATURE
+#undef JSON_HEDLEY_HAS_WARNING
+#undef JSON_HEDLEY_IAR_VERSION
+#undef JSON_HEDLEY_IAR_VERSION_CHECK
+#undef JSON_HEDLEY_IBM_VERSION
+#undef JSON_HEDLEY_IBM_VERSION_CHECK
+#undef JSON_HEDLEY_IMPORT
+#undef JSON_HEDLEY_INLINE
+#undef JSON_HEDLEY_INTEL_CL_VERSION
+#undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK
+#undef JSON_HEDLEY_INTEL_VERSION
+#undef JSON_HEDLEY_INTEL_VERSION_CHECK
+#undef JSON_HEDLEY_IS_CONSTANT
+#undef JSON_HEDLEY_IS_CONSTEXPR_
+#undef JSON_HEDLEY_LIKELY
+#undef JSON_HEDLEY_MALLOC
+#undef JSON_HEDLEY_MCST_LCC_VERSION
+#undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK
+#undef JSON_HEDLEY_MESSAGE
+#undef JSON_HEDLEY_MSVC_VERSION
+#undef JSON_HEDLEY_MSVC_VERSION_CHECK
+#undef JSON_HEDLEY_NEVER_INLINE
+#undef JSON_HEDLEY_NON_NULL
+#undef JSON_HEDLEY_NO_ESCAPE
+#undef JSON_HEDLEY_NO_RETURN
+#undef JSON_HEDLEY_NO_THROW
+#undef JSON_HEDLEY_NULL
+#undef JSON_HEDLEY_PELLES_VERSION
+#undef JSON_HEDLEY_PELLES_VERSION_CHECK
+#undef JSON_HEDLEY_PGI_VERSION
+#undef JSON_HEDLEY_PGI_VERSION_CHECK
+#undef JSON_HEDLEY_PREDICT
+#undef JSON_HEDLEY_PRINTF_FORMAT
+#undef JSON_HEDLEY_PRIVATE
+#undef JSON_HEDLEY_PUBLIC
+#undef JSON_HEDLEY_PURE
+#undef JSON_HEDLEY_REINTERPRET_CAST
+#undef JSON_HEDLEY_REQUIRE
+#undef JSON_HEDLEY_REQUIRE_CONSTEXPR
+#undef JSON_HEDLEY_REQUIRE_MSG
+#undef JSON_HEDLEY_RESTRICT
+#undef JSON_HEDLEY_RETURNS_NON_NULL
+#undef JSON_HEDLEY_SENTINEL
+#undef JSON_HEDLEY_STATIC_ASSERT
+#undef JSON_HEDLEY_STATIC_CAST
+#undef JSON_HEDLEY_STRINGIFY
+#undef JSON_HEDLEY_STRINGIFY_EX
+#undef JSON_HEDLEY_SUNPRO_VERSION
+#undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
+#undef JSON_HEDLEY_TINYC_VERSION
+#undef JSON_HEDLEY_TINYC_VERSION_CHECK
+#undef JSON_HEDLEY_TI_ARMCL_VERSION
+#undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL2000_VERSION
+#undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL430_VERSION
+#undef JSON_HEDLEY_TI_CL430_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL6X_VERSION
+#undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL7X_VERSION
+#undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CLPRU_VERSION
+#undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
+#undef JSON_HEDLEY_TI_VERSION
+#undef JSON_HEDLEY_TI_VERSION_CHECK
+#undef JSON_HEDLEY_UNAVAILABLE
+#undef JSON_HEDLEY_UNLIKELY
+#undef JSON_HEDLEY_UNPREDICTABLE
+#undef JSON_HEDLEY_UNREACHABLE
+#undef JSON_HEDLEY_UNREACHABLE_RETURN
+#undef JSON_HEDLEY_VERSION
+#undef JSON_HEDLEY_VERSION_DECODE_MAJOR
+#undef JSON_HEDLEY_VERSION_DECODE_MINOR
+#undef JSON_HEDLEY_VERSION_DECODE_REVISION
+#undef JSON_HEDLEY_VERSION_ENCODE
+#undef JSON_HEDLEY_WARNING
+#undef JSON_HEDLEY_WARN_UNUSED_RESULT
+#undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
+#undef JSON_HEDLEY_FALL_THROUGH
+
+
+
+#endif  // INCLUDE_NLOHMANN_JSON_HPP_
diff --git a/source/library/include/qtac/AlpacaDevice.h b/source/library/include/qtac/AlpacaDevice.h
new file mode 100644
index 00000000..b3f726f5
--- /dev/null
+++ b/source/library/include/qtac/AlpacaDevice.h
@@ -0,0 +1,206 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+
+#ifndef QTAC_ALPACADEVICE_H
+#define QTAC_ALPACADEVICE_H
+
+#include <qtac/ByteArray.h>
+#include <qtac/String.h>
+#include <qtac/List.h>
+#include <qtac/StringList.h>
+#include <qtac/Signal.h>
+#include <qtac/StringUtilities.h>
+#include <qtac/DebugBoardType.h>
+#include <qtac/PlatformID.h>
+#include <qtac/TACCommand.h>
+#include <qtac/Size.h>
+#include <qtac/PinEntry.h>
+#include <qtac/AlpacaScript.h>
+
+#include <cstdint>
+#include <memory>
+#include <mutex>
+
+#include <qtac/TACDriveThread.h>
+
+// -----------------------------------------------------------------------
+
+const qtac::ByteArray kMACNotSupported{"Not supported"};
+
+class _AlpacaDevice;
+
+using AlpacaDevice  = std::shared_ptr<_AlpacaDevice>;
+using AlpacaDevices = qtac::List<AlpacaDevice>;
+
+class _AlpacaDevice
+{
+public:
+	_AlpacaDevice() = default;
+	virtual ~_AlpacaDevice();
+
+	// --- Static device registry ---
+	static void getAlpacaDevices(AlpacaDevices& alpacaDevices,
+	                             DebugBoardType debugBoardTypeFilter = eUnknownDebugBoard);
+	static uint32_t updateAlpacaDevices();
+
+	static AlpacaDevice findAlpacaDevice(HashType hash);
+	static AlpacaDevice findAlpacaDevice(const qtac::ByteArray& portName);
+	static AlpacaDevice findAlpacaDeviceBySerialNumber(const qtac::ByteArray& serialNumber, bool usePartial = true);
+	static AlpacaDevice findAlpacaDeviceByDescription(const qtac::ByteArray& description, bool usePartial = true);
+	static AlpacaDevice findAlpacaDeviceByUSBDescriptor(const qtac::ByteArray& descriptor, bool usePartial = true);
+
+	// --- Lifecycle ---
+	qtac::ByteArray getLastError();
+	virtual bool open() = 0;
+	bool isOpen();
+	void close();
+
+	// --- Command interface ---
+	virtual void buildMapping() = 0;
+	uint32_t commandCount();
+	TACCommand commandEntry(uint32_t commandIndex);
+	TACCommands commandList();
+
+	// --- Pin list (populated after open() + buildMapping()) ---
+	virtual Pins getPins() { return {}; }
+
+	// --- Tab list from tcnf (visible tabs in display order, excluding Device Info and Terminal) ---
+	virtual qtac::StringList getTabs() const { return {}; }
+
+	// --- Quick Settings buttons / variables (FTDI devices) ---
+	virtual const qtac::ButtonEntries&   getButtons()   const { static qtac::ButtonEntries   empty; return empty; }
+	virtual const qtac::VariableEntries& getVariables() const { static qtac::VariableEntries empty; return empty; }
+
+	bool hasCommand(const qtac::ByteArray& command) const;
+	bool getCommandState(const qtac::ByteArray& command);
+	bool sendCommand(const qtac::ByteArray& command, bool state);
+	bool isCommandQueueClear();
+	virtual qtac::ByteArray getHelp();
+
+	virtual void setPinState(PinID pin, bool state);
+	virtual void setAddressPinState(const qtac::ByteArray& i2cAddress, uint16_t pin, bool state);
+	void setWaitForCompletion();
+	bool active();
+	HashType hash();
+
+	// Execute a named Quick Settings script function.
+	virtual void quickCommand(const qtac::ByteArray& /*command*/) {}
+
+	// Update a variable value for script token substitution.
+	virtual void setVariableValue(const qtac::String& /*name*/,
+	                              const qtac::Variant& /*value*/) {}
+
+	// Config file metadata (populated from tcnf top-level fields).
+	virtual qtac::String configModificationDate() const { return {}; }
+	virtual int          configFileVersion()      const { return 0;  }
+
+	// --- Port / name ---
+	qtac::ByteArray portName() const;
+	void setPortName(const qtac::ByteArray& portName);
+	qtac::ByteArray name() const;
+	void setName(const qtac::ByteArray& newName);
+
+	// --- Properties ---
+	DebugBoardType debugBoardType();
+	qtac::String debugBoardTypeString();
+	qtac::String hardwareVersionString();
+	qtac::String firmwareVersion();
+	unsigned int majorVersion();
+	qtac::String chipVersion();
+	unsigned int minorVersion();
+	unsigned int revisionVersion();
+
+	qtac::ByteArray description();
+	qtac::ByteArray usbDescriptor();
+	qtac::ByteArray serialNumber();
+	PlatformID platformID();
+	qtac::ByteArray macAddress();
+
+	void externalPowerControl(bool state);
+
+	qtac::String descriptionStr() const;
+	void setDescription(const qtac::String& description);
+	qtac::String serialNumberStr() const;
+	void setSerialNumber(const qtac::String& serialNumber);
+	qtac::String uuid();
+
+	qtac::Size windowDimension();
+
+	int getResetCount();
+	void clearResetCount();
+
+	void i2CReadRegister(uint32_t addr, uint32_t reg);
+	void i2CWriteRegister(uint32_t addr, uint32_t reg, uint32_t data);
+
+	void setActive(bool active = true) { _active = active; }
+
+	// Inject the concrete drive thread before calling open().
+	// The caller retains ownership; the device does NOT delete it.
+	void setDriveThread(qtac::TACDriveThread* dt) { _driveThread = dt; }
+
+	// --- Signals (replaces Qt signals) ---
+	qtac::Signal<uint64_t, bool>               onPinStateChanged;
+	qtac::Signal<uint8_t, int>                 onProgress;
+	qtac::Signal<const qtac::ByteArray&>       onError;
+
+	// --- Slot equivalents (regular public methods) ---
+	void on_pinStateChanged(uint64_t pin, bool state);
+	void onDeviceDisconnect();
+
+protected:
+	static std::recursive_mutex _mutex;
+	static AlpacaDevices  _alpacaDevices;
+
+	bool            _active{false};
+	HashType        _hash{0};
+	DebugBoardType  _boardType{eUnknownDebugBoard};
+	qtac::ByteArray _portName;
+	qtac::ByteArray _description;
+	qtac::ByteArray _usbDescriptor;
+	qtac::ByteArray _macAddress{kMACNotSupported};
+	qtac::ByteArray _serialNumber;
+	unsigned int    _chipVersion{0};
+	PlatformID      _platformID{MICRO_EPM_BOARD_ID_UNKNOWN};
+	qtac::ByteArray _helpText;
+
+	qtac::TACDriveThread*  _driveThread{nullptr};
+	qtac::TACDriveThread* _serialDriveThread{nullptr};
+
+	TACCommandMap   _commands;
+	TACCommands     _commandList;
+	qtac::List<qtac::ByteArray> _quickCommandList;
+	qtac::ByteArray _lastError;
+};
+
+#endif // QTAC_ALPACADEVICE_H
diff --git a/source/library/include/qtac/AlpacaScript.h b/source/library/include/qtac/AlpacaScript.h
new file mode 100644
index 00000000..d9689675
--- /dev/null
+++ b/source/library/include/qtac/AlpacaScript.h
@@ -0,0 +1,143 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Qt-free port of AlpacaScript from qcommon-console.
+// Parses the tcnf "script" DSL into CommandEntries that can be passed
+// to TACDriveThread::sendCommandSequence().
+
+#pragma once
+
+#include <qtac/ByteArray.h>
+#include <qtac/String.h>
+#include <qtac/Map.h>
+#include <qtac/Variant.h>
+#include <qtac/TACCommand.h>    // TACCommands
+#include <qtac/TACDriveThread.h>   // CommandEntry / CommandEntries
+
+#include <memory>
+#include <vector>
+
+namespace qtac {
+
+// -----------------------------------------------------------------------
+// VariableEntry — mirrors ScriptVariable from qcommon-console.
+// -----------------------------------------------------------------------
+enum class VariableType
+{
+    Unknown = 0,
+    Integer = 1,
+    Boolean = 2,
+    Float   = 3
+};
+
+struct VariableEntry
+{
+    qtac::String   _name;
+    qtac::String   _label;
+    qtac::String   _tooltip;
+    VariableType   _type{VariableType::Unknown};
+    qtac::Variant  _defaultValue{0};
+    int            _cellX{-1};
+    int            _cellY{-1};
+};
+
+using VariableEntries = qtac::Map<qtac::String, VariableEntry>;
+
+// -----------------------------------------------------------------------
+// ButtonEntry — mirrors Button from qcommon-console.
+// -----------------------------------------------------------------------
+struct ButtonEntry
+{
+    qtac::String   _name;
+    qtac::String   _command;    // script function name to invoke
+    int            _commandGroup{0};
+    qtac::String   _tab;
+    qtac::String   _tooltip;
+    int            _cellX{-1};
+    int            _cellY{-1};
+};
+
+using ButtonEntries = std::vector<ButtonEntry>;
+
+// -----------------------------------------------------------------------
+// Internal parse tree node
+// -----------------------------------------------------------------------
+struct _ScriptCommand
+{
+    qtac::ByteArray  _command;
+    CommandEntries   _subCommands;
+
+    bool isEmpty() const { return _command.isEmpty() || _subCommands.empty(); }
+};
+
+using ScriptCommand  = std::shared_ptr<_ScriptCommand>;
+using ScriptCommands = qtac::Map<qtac::String, ScriptCommand>;
+
+// -----------------------------------------------------------------------
+// AlpacaScript — Qt-free port of AlpacaScript from qcommon-console.
+// -----------------------------------------------------------------------
+class AlpacaScript
+{
+public:
+    AlpacaScript() = default;
+
+    // Parse the tcnf "script" string.  tacCommands maps command names to pins.
+    // Returns false if any unresolvable tokens were encountered.
+    bool parseScript(const qtac::String&     alpacaScript,
+                     const VariableEntries&  variables,
+                     const TACCommands&      tacCommands);
+
+    bool hasCommand(const qtac::ByteArray& command) const;
+    bool isEmpty() const { return _scriptCommands.isEmpty(); }
+
+    // Retrieve the flat CommandEntries for a named function, resolving
+    // sub-function calls up to 7 levels deep.
+    CommandEntries getCommandEntries(const qtac::ByteArray& command) const;
+
+    // Copy commandEntries, substituting $VarName tokens with values from vars.
+    static CommandEntries replaceTokens(const VariableEntries&  variables,
+                                        const CommandEntries&   commandEntries);
+
+private:
+    static bool isVariableRef(const qtac::String& token);
+    static qtac::String stripParens(const qtac::String& s);
+
+    ScriptCommand getCommand(const qtac::ByteArray& command) const;
+
+    void processCommandEntries(ScriptCommand       scriptCommand,
+                               CommandEntries&     out,
+                               int                 level) const;
+
+    ScriptCommands _scriptCommands;
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/ByteArray.h b/source/library/include/qtac/ByteArray.h
new file mode 100644
index 00000000..6803978c
--- /dev/null
+++ b/source/library/include/qtac/ByteArray.h
@@ -0,0 +1,614 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef QTAC_BYTEARRAY_H
+#define QTAC_BYTEARRAY_H
+
+#include <string>
+#include <vector>
+#include <cstring>
+#include <algorithm>
+#include <cctype>
+#include <cstdint>
+#include <sstream>
+#include <stdexcept>
+
+namespace qtac {
+
+class ByteArray
+{
+public:
+	ByteArray()
+		: _isNull(true)
+	{
+	}
+
+	ByteArray(const char* data)
+		: _data(data ? data : ""), _isNull(data == nullptr)
+	{
+	}
+
+	ByteArray(const char* data, int size)
+		: _data(data, static_cast<size_t>(size)), _isNull(false)
+	{
+	}
+
+	ByteArray(int size, char ch)
+		: _data(static_cast<size_t>(size), ch), _isNull(false)
+	{
+	}
+
+	ByteArray(const std::string& str)
+		: _data(str), _isNull(false)
+	{
+	}
+
+	ByteArray(std::string&& str)
+		: _data(std::move(str)), _isNull(false)
+	{
+	}
+
+	// --- Size and capacity ---
+
+	int size() const { return static_cast<int>(_data.size()); }
+	int length() const { return size(); }
+	bool isEmpty() const { return _data.empty(); }
+	bool isNull() const { return _isNull; }
+	void clear() { _data.clear(); _isNull = false; }
+	void resize(int size) { _data.resize(static_cast<size_t>(size)); _isNull = false; }
+	void reserve(int size) { _data.reserve(static_cast<size_t>(size)); }
+
+	// --- Data access ---
+
+	char* data() { return &_data[0]; }
+	const char* data() const { return _data.data(); }
+	const char* constData() const { return _data.c_str(); }
+
+	char at(int index) const { return _data.at(static_cast<size_t>(index)); }
+	char& operator[](int index) { return _data[static_cast<size_t>(index)]; }
+	char operator[](int index) const { return _data[static_cast<size_t>(index)]; }
+
+	// --- Iterators ---
+
+	using iterator = std::string::iterator;
+	using const_iterator = std::string::const_iterator;
+
+	iterator begin() { return _data.begin(); }
+	iterator end() { return _data.end(); }
+	const_iterator begin() const { return _data.begin(); }
+	const_iterator end() const { return _data.end(); }
+	const_iterator cbegin() const { return _data.cbegin(); }
+	const_iterator cend() const { return _data.cend(); }
+
+	// --- Append / Prepend ---
+
+	ByteArray& append(const ByteArray& other)
+	{
+		_data.append(other._data);
+		_isNull = false;
+		return *this;
+	}
+
+	ByteArray& append(const char* data)
+	{
+		if (data)
+			_data.append(data);
+		_isNull = false;
+		return *this;
+	}
+
+	ByteArray& append(const char* data, int size)
+	{
+		_data.append(data, static_cast<size_t>(size));
+		_isNull = false;
+		return *this;
+	}
+
+	ByteArray& append(char ch)
+	{
+		_data.push_back(ch);
+		_isNull = false;
+		return *this;
+	}
+
+	// --- Insert / Remove ---
+
+	ByteArray& insert(int pos, const ByteArray& other)
+	{
+		_data.insert(static_cast<size_t>(pos), other._data);
+		_isNull = false;
+		return *this;
+	}
+
+	ByteArray& insert(int pos, const char* data)
+	{
+		if (data)
+			_data.insert(static_cast<size_t>(pos), data);
+		_isNull = false;
+		return *this;
+	}
+
+	ByteArray& insert(int pos, const char* data, int len)
+	{
+		_data.insert(static_cast<size_t>(pos), data, static_cast<size_t>(len));
+		_isNull = false;
+		return *this;
+	}
+
+	ByteArray& insert(int pos, char ch)
+	{
+		_data.insert(_data.begin() + pos, ch);
+		_isNull = false;
+		return *this;
+	}
+
+	ByteArray& insert(int pos, int count, char ch)
+	{
+		_data.insert(static_cast<size_t>(pos), static_cast<size_t>(count), ch);
+		_isNull = false;
+		return *this;
+	}
+
+	ByteArray& remove(int pos, int len)
+	{
+		_data.erase(static_cast<size_t>(pos), static_cast<size_t>(len));
+		return *this;
+	}
+
+	void chop(int n)
+	{
+		if (n <= 0) return;
+		if (n >= size()) { _data.clear(); return; }
+		_data.erase(_data.size() - static_cast<size_t>(n));
+	}
+
+	void truncate(int pos)
+	{
+		if (pos <= 0) { _data.clear(); return; }
+		if (pos < size()) _data.resize(static_cast<size_t>(pos));
+	}
+
+	// --- Search ---
+
+	bool contains(const ByteArray& other) const
+	{
+		return _data.find(other._data) != std::string::npos;
+	}
+
+	bool contains(const char* data) const
+	{
+		return data && _data.find(data) != std::string::npos;
+	}
+
+	bool contains(char ch) const
+	{
+		return _data.find(ch) != std::string::npos;
+	}
+
+	int indexOf(const ByteArray& other, int from = 0) const
+	{
+		auto pos = _data.find(other._data, static_cast<size_t>(from));
+		return pos == std::string::npos ? -1 : static_cast<int>(pos);
+	}
+
+	int indexOf(char ch, int from = 0) const
+	{
+		auto pos = _data.find(ch, static_cast<size_t>(from));
+		return pos == std::string::npos ? -1 : static_cast<int>(pos);
+	}
+
+	bool startsWith(const ByteArray& other) const
+	{
+		return _data.size() >= other._data.size() &&
+		       _data.compare(0, other._data.size(), other._data) == 0;
+	}
+
+	bool startsWith(char ch) const
+	{
+		return !_data.empty() && _data.front() == ch;
+	}
+
+	bool endsWith(const ByteArray& other) const
+	{
+		return _data.size() >= other._data.size() &&
+		       _data.compare(_data.size() - other._data.size(), other._data.size(), other._data) == 0;
+	}
+
+	bool endsWith(char ch) const
+	{
+		return !_data.empty() && _data.back() == ch;
+	}
+
+	// --- Count ---
+
+	int count(const ByteArray& other) const
+	{
+		if (other._data.empty()) return 0;
+		int n = 0;
+		size_t pos = 0;
+		while ((pos = _data.find(other._data, pos)) != std::string::npos) {
+			++n;
+			pos += other._data.size();
+		}
+		return n;
+	}
+
+	int count(const char* data) const
+	{
+		if (!data || !*data) return 0;
+		int n = 0;
+		size_t len = std::strlen(data);
+		size_t pos = 0;
+		while ((pos = _data.find(data, pos)) != std::string::npos) {
+			++n;
+			pos += len;
+		}
+		return n;
+	}
+
+	int count(char ch) const
+	{
+		return static_cast<int>(std::count(_data.begin(), _data.end(), ch));
+	}
+
+	// --- Substrings ---
+
+	ByteArray left(int len) const
+	{
+		return ByteArray(_data.substr(0, static_cast<size_t>(len)));
+	}
+
+	// --- Case conversion ---
+
+	ByteArray toLower() const
+	{
+		std::string result = _data;
+		std::transform(result.begin(), result.end(), result.begin(),
+			[](unsigned char c) { return static_cast<char>(std::tolower(c)); });
+		return ByteArray(std::move(result));
+	}
+
+	ByteArray toUpper() const
+	{
+		std::string result = _data;
+		std::transform(result.begin(), result.end(), result.begin(),
+			[](unsigned char c) { return static_cast<char>(std::toupper(c)); });
+		return ByteArray(std::move(result));
+	}
+
+	// --- Trimming ---
+
+	ByteArray trimmed() const
+	{
+		if (_data.empty()) return ByteArray();
+		auto start = _data.find_first_not_of(" \t\n\r\f\v");
+		if (start == std::string::npos) return ByteArray();
+		auto end = _data.find_last_not_of(" \t\n\r\f\v");
+		return ByteArray(_data.substr(start, end - start + 1));
+	}
+
+	// --- Numeric conversions ---
+
+	int toInt(bool* ok = nullptr, int base = 10) const
+	{
+		try {
+			size_t pos = 0;
+			int result = std::stoi(_data, &pos, base);
+			if (ok) *ok = (pos == _data.size());
+			return result;
+		} catch (...) {
+			if (ok) *ok = false;
+			return 0;
+		}
+	}
+
+	unsigned int toUInt(bool* ok = nullptr, int base = 10) const
+	{
+		try {
+			size_t pos = 0;
+			unsigned long result = std::stoul(_data, &pos, base);
+			if (ok) *ok = (pos == _data.size() && result <= UINT32_MAX);
+			return static_cast<unsigned int>(result);
+		} catch (...) {
+			if (ok) *ok = false;
+			return 0;
+		}
+	}
+
+	long long toLongLong(bool* ok = nullptr, int base = 10) const
+	{
+		try {
+			size_t pos = 0;
+			long long result = std::stoll(_data, &pos, base);
+			if (ok) *ok = (pos == _data.size());
+			return result;
+		} catch (...) {
+			if (ok) *ok = false;
+			return 0;
+		}
+	}
+
+	unsigned long long toULongLong(bool* ok = nullptr, int base = 10) const
+	{
+		try {
+			size_t pos = 0;
+			unsigned long long result = std::stoull(_data, &pos, base);
+			if (ok) *ok = (pos == _data.size());
+			return result;
+		} catch (...) {
+			if (ok) *ok = false;
+			return 0;
+		}
+	}
+
+	// --- Static number-to-ByteArray ---
+
+	static ByteArray number(int value, int base = 10)
+	{
+		if (base == 10) {
+			return ByteArray(std::to_string(value));
+		}
+		std::ostringstream oss;
+		if (base == 16)
+			oss << std::hex << value;
+		else if (base == 8)
+			oss << std::oct << value;
+		else
+			oss << value;
+		return ByteArray(oss.str());
+	}
+
+	static ByteArray number(double value, char format = 'g', int precision = 6)
+	{
+		std::ostringstream oss;
+		if (format == 'f')
+			oss << std::fixed;
+		else if (format == 'e')
+			oss << std::scientific;
+		oss.precision(precision);
+		oss << value;
+		return ByteArray(oss.str());
+	}
+
+	// --- Replace ---
+
+	ByteArray& replace(const ByteArray& before, const ByteArray& after)
+	{
+		size_t pos = 0;
+		while ((pos = _data.find(before._data, pos)) != std::string::npos) {
+			_data.replace(pos, before._data.size(), after._data);
+			pos += after._data.size();
+		}
+		return *this;
+	}
+
+	ByteArray& replace(char before, char after)
+	{
+		std::replace(_data.begin(), _data.end(), before, after);
+		return *this;
+	}
+
+	// --- Split ---
+
+	std::vector<ByteArray> split(char separator) const
+	{
+		std::vector<ByteArray> result;
+		size_t start = 0;
+		size_t pos = _data.find(separator);
+		while (pos != std::string::npos) {
+			result.emplace_back(_data.substr(start, pos - start));
+			start = pos + 1;
+			pos = _data.find(separator, start);
+		}
+		result.emplace_back(_data.substr(start));
+		return result;
+	}
+
+	// --- Operators ---
+
+	ByteArray& operator+=(const ByteArray& other)
+	{
+		_data += other._data;
+		return *this;
+	}
+
+	ByteArray& operator+=(const char* data)
+	{
+		if (data) _data += data;
+		return *this;
+	}
+
+	ByteArray& operator+=(char ch)
+	{
+		_data += ch;
+		return *this;
+	}
+
+	friend ByteArray operator+(const ByteArray& lhs, const ByteArray& rhs)
+	{
+		return ByteArray(lhs._data + rhs._data);
+	}
+
+	friend ByteArray operator+(const ByteArray& lhs, const char* rhs)
+	{
+		return ByteArray(lhs._data + (rhs ? rhs : ""));
+	}
+
+	friend ByteArray operator+(const char* lhs, const ByteArray& rhs)
+	{
+		return ByteArray((lhs ? lhs : "") + rhs._data);
+	}
+
+	// --- Comparison ---
+
+	friend bool operator==(const ByteArray& lhs, const ByteArray& rhs) { return lhs._data == rhs._data; }
+	friend bool operator!=(const ByteArray& lhs, const ByteArray& rhs) { return lhs._data != rhs._data; }
+	friend bool operator<(const ByteArray& lhs, const ByteArray& rhs) { return lhs._data < rhs._data; }
+	friend bool operator>(const ByteArray& lhs, const ByteArray& rhs) { return lhs._data > rhs._data; }
+	friend bool operator<=(const ByteArray& lhs, const ByteArray& rhs) { return lhs._data <= rhs._data; }
+	friend bool operator>=(const ByteArray& lhs, const ByteArray& rhs) { return lhs._data >= rhs._data; }
+
+	friend bool operator==(const ByteArray& lhs, const char* rhs) { return lhs._data == (rhs ? rhs : ""); }
+	friend bool operator==(const char* lhs, const ByteArray& rhs) { return (lhs ? lhs : "") == rhs._data; }
+	friend bool operator!=(const ByteArray& lhs, const char* rhs) { return !(lhs == rhs); }
+	friend bool operator!=(const char* lhs, const ByteArray& rhs) { return !(lhs == rhs); }
+
+	// --- Compare ---
+
+	int compare(const ByteArray& other, bool caseSensitive = true) const
+	{
+		if (caseSensitive) {
+			return _data.compare(other._data);
+		}
+		auto lhs = toLower();
+		auto rhs = other.toLower();
+		return lhs._data.compare(rhs._data);
+	}
+
+	int compare(const char* other, bool caseSensitive = true) const
+	{
+		return compare(ByteArray(other), caseSensitive);
+	}
+
+	// --- Hex / Base64 encoding ---
+
+	ByteArray toHex(char separator = '\0') const
+	{
+		static const char hexChars[] = "0123456789abcdef";
+		std::string result;
+		bool useSep = (separator != '\0');
+		result.reserve(_data.size() * (useSep ? 3 : 2));
+		for (size_t i = 0; i < _data.size(); ++i) {
+			if (useSep && i > 0)
+				result.push_back(separator);
+			unsigned char c = static_cast<unsigned char>(_data[i]);
+			result.push_back(hexChars[c >> 4]);
+			result.push_back(hexChars[c & 0x0F]);
+		}
+		return ByteArray(std::move(result));
+	}
+
+	static ByteArray fromHex(const ByteArray& hex)
+	{
+		std::string result;
+		result.reserve(hex._data.size() / 2);
+		for (size_t i = 0; i < hex._data.size(); ++i) {
+			char c = hex._data[i];
+			int nibble = -1;
+			if (c >= '0' && c <= '9') nibble = c - '0';
+			else if (c >= 'a' && c <= 'f') nibble = c - 'a' + 10;
+			else if (c >= 'A' && c <= 'F') nibble = c - 'A' + 10;
+			else continue; // skip non-hex chars (separators, whitespace)
+
+			// Look for next hex nibble
+			++i;
+			while (i < hex._data.size()) {
+				char c2 = hex._data[i];
+				int nibble2 = -1;
+				if (c2 >= '0' && c2 <= '9') nibble2 = c2 - '0';
+				else if (c2 >= 'a' && c2 <= 'f') nibble2 = c2 - 'a' + 10;
+				else if (c2 >= 'A' && c2 <= 'F') nibble2 = c2 - 'A' + 10;
+				else { ++i; continue; }
+				result.push_back(static_cast<char>((nibble << 4) | nibble2));
+				break;
+			}
+		}
+		return ByteArray(std::move(result));
+	}
+
+	ByteArray toBase64() const
+	{
+		static const char table[] =
+			"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+		std::string result;
+		size_t len = _data.size();
+		result.reserve(((len + 2) / 3) * 4);
+		for (size_t i = 0; i < len; i += 3) {
+			unsigned int b0 = static_cast<unsigned char>(_data[i]);
+			unsigned int b1 = (i + 1 < len) ? static_cast<unsigned char>(_data[i + 1]) : 0u;
+			unsigned int b2 = (i + 2 < len) ? static_cast<unsigned char>(_data[i + 2]) : 0u;
+			unsigned int triple = (b0 << 16) | (b1 << 8) | b2;
+			result.push_back(table[(triple >> 18) & 0x3F]);
+			result.push_back(table[(triple >> 12) & 0x3F]);
+			result.push_back((i + 1 < len) ? table[(triple >> 6) & 0x3F] : '=');
+			result.push_back((i + 2 < len) ? table[triple & 0x3F] : '=');
+		}
+		return ByteArray(std::move(result));
+	}
+
+	static ByteArray fromBase64(const ByteArray& base64)
+	{
+		auto decodeChar = [](char c) -> int {
+			if (c >= 'A' && c <= 'Z') return c - 'A';
+			if (c >= 'a' && c <= 'z') return c - 'a' + 26;
+			if (c >= '0' && c <= '9') return c - '0' + 52;
+			if (c == '+') return 62;
+			if (c == '/') return 63;
+			return -1;
+		};
+		std::string result;
+		result.reserve((base64._data.size() / 4) * 3);
+		int buf = 0, bits = 0;
+		for (char c : base64._data) {
+			int val = decodeChar(c);
+			if (val < 0) continue;
+			buf = (buf << 6) | val;
+			bits += 6;
+			if (bits >= 8) {
+				bits -= 8;
+				result.push_back(static_cast<char>((buf >> bits) & 0xFF));
+			}
+		}
+		return ByteArray(std::move(result));
+	}
+
+	// --- Conversion to std::string ---
+
+	std::string toStdString() const { return _data; }
+
+	// --- Hashing support (for use in unordered containers) ---
+
+	struct Hash {
+		size_t operator()(const ByteArray& ba) const
+		{
+			return std::hash<std::string>{}(ba._data);
+		}
+	};
+
+private:
+	std::string _data;
+	bool _isNull = true;
+};
+
+} // namespace qtac
+
+#endif // QTAC_BYTEARRAY_H
diff --git a/source/library/include/qtac/CharBit.h b/source/library/include/qtac/CharBit.h
new file mode 100644
index 00000000..a032d9e0
--- /dev/null
+++ b/source/library/include/qtac/CharBit.h
@@ -0,0 +1,64 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: msimpson
+
+#ifndef QTAC_CHARBIT_H
+#define QTAC_CHARBIT_H
+
+namespace qtac {
+
+class CharBit
+{
+public:
+	CharBit() = default;
+
+	void set(int position, bool value = true)
+	{
+		if (value)
+			_bits |= static_cast<unsigned char>(1 << (position % 8));
+		else
+			_bits &= static_cast<unsigned char>(~(1 << (position % 8)));
+	}
+
+	unsigned char* value()
+	{
+		return &_bits;
+	}
+
+private:
+	unsigned char _bits{0};
+};
+
+} // namespace qtac
+
+#endif // QTAC_CHARBIT_H
diff --git a/source/library/include/qtac/CommandGroup.h b/source/library/include/qtac/CommandGroup.h
new file mode 100644
index 00000000..5910b12c
--- /dev/null
+++ b/source/library/include/qtac/CommandGroup.h
@@ -0,0 +1,88 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Michael Simpson
+
+#ifndef QTAC_COMMANDGROUP_H
+#define QTAC_COMMANDGROUP_H
+
+#include <qtac/String.h>
+#include <qtac/StringList.h>
+
+enum CommandGroups
+{
+	eUnknownCommandGroup = 0,
+	eConnectionGroup,
+	eButtonGroup,
+	eSwitchGroup,
+	eQuickSettingsGroup
+};
+
+class CommandGroup
+{
+public:
+	static qtac::String toString(CommandGroups commandGroup)
+	{
+		switch (commandGroup)
+		{
+		case eConnectionGroup:   return "Connections";
+		case eButtonGroup:       return "Buttons";
+		case eSwitchGroup:       return "Switches";
+		case eQuickSettingsGroup: return "Quick Settings";
+		default: break;
+		}
+		return qtac::String();
+	}
+
+	static qtac::StringList toStringList()
+	{
+		qtac::StringList result;
+		result.append("<Select Pin Group>");
+		result.append(toString(eConnectionGroup));
+		result.append(toString(eButtonGroup));
+		result.append(toString(eSwitchGroup));
+		result.append(toString(eQuickSettingsGroup));
+		return result;
+	}
+
+	static CommandGroups fromString(const qtac::String& commandGroupStr)
+	{
+		qtac::String temp = commandGroupStr.toLower();
+		if (temp == "connections")    return eConnectionGroup;
+		if (temp == "buttons")        return eButtonGroup;
+		if (temp == "switches")       return eSwitchGroup;
+		if (temp == "quick settings") return eQuickSettingsGroup;
+		return eUnknownCommandGroup;
+	}
+};
+
+#endif // QTAC_COMMANDGROUP_H
diff --git a/source/library/include/qtac/DebugBoardType.h b/source/library/include/qtac/DebugBoardType.h
new file mode 100644
index 00000000..c85e0d08
--- /dev/null
+++ b/source/library/include/qtac/DebugBoardType.h
@@ -0,0 +1,129 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+
+#ifndef QTAC_DEBUGBOARDTYPE_H
+#define QTAC_DEBUGBOARDTYPE_H
+
+#include <qtac/String.h>
+
+enum DebugBoardType
+{
+	eUnknownDebugBoard,
+	eSpiderBoard,
+	ePSOC,
+	eFTDI,
+	ePIC32CXAuto,
+	eFT232H,
+	eSTM32
+};
+
+inline qtac::String debugBoardTypeToString(DebugBoardType type)
+{
+	switch (type)
+	{
+	case eSpiderBoard:  return "SpiderBoard";
+	case ePSOC:         return "PSOC";
+	case eFTDI:         return "FTDI";
+	case ePIC32CXAuto:  return "PIC32CXAuto";
+	case eFT232H:       return "FT232H";
+	case eSTM32:        return "STM32";
+	default:            return "Unknown";
+	}
+}
+
+inline DebugBoardType debugBoardTypeFromString(const qtac::String& boardString)
+{
+	qtac::String lower = boardString.toLower();
+	if (lower == "spiderboard") return eSpiderBoard;
+	if (lower == "psoc")        return ePSOC;
+	if (lower == "ftdi")        return eFTDI;
+	if (lower == "pic32cxauto") return ePIC32CXAuto;
+	if (lower == "ft232h")      return eFT232H;
+	if (lower == "stm32")       return eSTM32;
+	return eUnknownDebugBoard;
+}
+
+// ---------------------------------------------------------------------------
+// PSoC variant enums (mirrors upstream qcommon-console DebugBoardType.h)
+// ---------------------------------------------------------------------------
+
+enum PSOCVariant
+{
+	ePSOCUnknown,
+	ePSOCGPIO,
+	ePSOCGPIOIIC
+};
+
+enum PSOCIICVariant
+{
+	ePSOCIICUnknown,
+	eKTS1622EUAATR,
+	eTCA9534APWR
+};
+
+inline qtac::String psocVariantToString(PSOCVariant v)
+{
+	switch (v)
+	{
+	case ePSOCGPIO:    return "GPIO";
+	case ePSOCGPIOIIC: return "GPIOIIC";
+	default:           return "Unknown";
+	}
+}
+
+inline PSOCVariant psocVariantFromString(const qtac::String& s)
+{
+	if (s == "GPIO")    return ePSOCGPIO;
+	if (s == "GPIOIIC") return ePSOCGPIOIIC;
+	return ePSOCUnknown;
+}
+
+inline qtac::String psocSlaveToString(PSOCIICVariant v)
+{
+	switch (v)
+	{
+	case eKTS1622EUAATR: return "KTS1622EUAATR";
+	case eTCA9534APWR:   return "TCA9534APWR";
+	default:             return "Unknown";
+	}
+}
+
+inline PSOCIICVariant psocSlaveFromString(const qtac::String& s)
+{
+	if (s == "KTS1622EUAATR") return eKTS1622EUAATR;
+	if (s == "TCA9534APWR")   return eTCA9534APWR;
+	return ePSOCIICUnknown;
+}
+
+#endif // QTAC_DEBUGBOARDTYPE_H
diff --git a/source/library/include/qtac/DriveThread.h b/source/library/include/qtac/DriveThread.h
new file mode 100644
index 00000000..b0330c1e
--- /dev/null
+++ b/source/library/include/qtac/DriveThread.h
@@ -0,0 +1,152 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+// Qt-free reimplementation of DriveThread from qcommon-console.
+// Replaces QThread inheritance with an owned std::thread.
+
+#pragma once
+
+#include <qtac/ByteArray.h>
+#include <qtac/SendInterface.h>
+
+#include <atomic>
+#include <map>
+#include <mutex>
+#include <thread>
+
+namespace qtac {
+
+class ProtocolInterface;
+
+class DriveThread : public SendInterface
+{
+public:
+    DriveThread();
+    virtual ~DriveThread();
+
+    // Returns true while the drive thread's run() loop is active.
+    bool weAreRunning()
+    {
+        std::lock_guard<std::mutex> lock(_runningMutex);
+        return _running;
+    }
+
+    // Spin up the std::thread that executes run().
+    void start()
+    {
+        _thread = std::thread([this] { run(); });
+    }
+
+    // True if the underlying thread is joinable (i.e. started and not yet joined).
+    bool isRunning() const { return _thread.joinable(); }
+
+    // Signal stop and block until the thread exits.
+    void shutDown();
+
+    std::thread::id threadId() const { return _thread.get_id(); }
+
+    // Block until the drive thread exits.  Caller must have already called
+    // stopRunning() (or shutDown()) to signal the thread to stop.
+    // Use this instead of relying on ~DriveThread() to join, so the join
+    // happens before any derived-class destructors run and free resources
+    // (e.g. _serialPort) that the thread may still be accessing.
+    void joinThread()
+    {
+        if (_thread.joinable())
+            _thread.join();
+    }
+
+    // Detach rather than join — use only when the drive thread calls close() from
+    // within run() itself, where a join would deadlock.
+    void detachThread()
+    {
+        if (_thread.joinable())
+            _thread.detach();
+    }
+
+    qtac::ByteArray name() const { return _driveTrainName; }
+    int             id()   const { return _driveTrainID; }
+
+    qtac::ByteArray lastErrorMessage()
+    {
+        std::lock_guard<std::mutex> lock(_runningMutex);
+        qtac::ByteArray result = _lastErrorMessage;
+        _lastErrorMessage.clear();
+        return result;
+    }
+
+    void setProtocolInterface(ProtocolInterface* protocolInterface);
+
+    virtual void run() = 0;
+
+    // SendInterface
+    virtual uint32_t send(const qtac::ByteArray& sendMe, const Arguments& arguments, bool command,
+                          ReceiveInterface* receiveInterface, bool store = true) = 0;
+    virtual void addDelay(uint32_t delayInMilliSeconds, ReceiveInterface* receiveInterface) override;
+    virtual void addLogComment(const qtac::ByteArray& comment) override;
+    virtual void addEndTransaction(ReceiveInterface* receiveInterface) override;
+
+    // Clears the running flag; returns the previous value.
+    // Public so concrete drive threads can call it from within run() during
+    // self-initiated shutdown before detachThread().
+    bool stopRunning()
+    {
+        std::lock_guard<std::mutex> lock(_runningMutex);
+        bool result = _running;
+        _running    = false;
+        return result;
+    }
+
+protected:
+    void startRunning()
+    {
+        std::lock_guard<std::mutex> lock(_runningMutex);
+        _running = true;
+    }
+
+    static std::atomic<int> _driveTrainIDs;
+
+    int                     _driveTrainID{0};
+    ProtocolInterface*      _protocolInterface{nullptr};
+    qtac::ByteArray         _driveTrainName{"<unnamed>"};
+    qtac::ByteArray         _lastErrorMessage;
+    std::thread             _thread;
+
+private:
+    std::mutex  _runningMutex;
+    bool        _running{false};
+};
+
+using DriveTrains = std::map<int, DriveThread*>;
+
+} // namespace qtac
diff --git a/source/library/include/qtac/FTDIChipset.h b/source/library/include/qtac/FTDIChipset.h
new file mode 100644
index 00000000..b551f2d8
--- /dev/null
+++ b/source/library/include/qtac/FTDIChipset.h
@@ -0,0 +1,166 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: msimpson, biswroy
+
+#ifndef QTAC_FTDICHIPSET_H
+#define QTAC_FTDICHIPSET_H
+
+#include <qtac/CharBit.h>
+#include <qtac/FTDIPinSet.h>
+#include <qtac/PlatformID.h>
+#include <qtac/StringUtilities.h>
+#include <qtac/ByteArray.h>
+#include <qtac/List.h>
+#include <qtac/Map.h>
+
+#include <cstdint>
+#include <memory>
+
+namespace qtac {
+
+class _FTDIChipset;
+
+using FTDIChipset    = std::shared_ptr<_FTDIChipset>;
+using FTDIChipsetList = qtac::List<FTDIChipset>;
+using FTDIChipsetMap  = qtac::Map<HashType, FTDIChipset>;
+
+class _FTDIChipset
+{
+public:
+	_FTDIChipset(const _FTDIChipset&) = delete;
+	_FTDIChipset();
+	~_FTDIChipset();
+
+	static qtac::String ftidStatusToString(unsigned long status);
+
+	static uint32_t getDeviceCount();
+	static FTDIChipset getDevice(uint32_t deviceIndex);
+	static FTDIChipset getDevice(const qtac::ByteArray& portName);
+	static qtac::ByteArray normalizeSerialNumber(const qtac::ByteArray& segmentSerialNumber);
+
+	bool open(FTDIPinSets pinsets);
+	bool isOpen();
+	void close();
+
+	PlatformID platformID();
+	void setPlatformID(PlatformID platformID);
+
+	qtac::String versionString();
+	qtac::String firmwareString();
+
+	void reset()
+	{
+		_active = false;
+	}
+
+	bool active() const { return _active; }
+
+	HashType hash();
+	qtac::ByteArray serialNumber();
+	bool newDevice();
+
+	qtac::ByteArray portName() const { return _portName; }
+	qtac::ByteArray usbDescriptor() const { return _usbDescriptor; }
+	qtac::ByteArray lastError() const { return _lastError; }
+
+	qtac::ByteArray aSerialNumber();
+	void setASerialNumber(const qtac::ByteArray& sn);
+
+	qtac::ByteArray bSerialNumber();
+	void setBSerialNumber(const qtac::ByteArray& sn);
+
+	qtac::ByteArray cSerialNumber();
+	void setCSerialNumber(const qtac::ByteArray& sn);
+
+	qtac::ByteArray dSerialNumber();
+	void setDSerialNumber(const qtac::ByteArray& sn);
+
+	bool write(uint8_t pin, bool state);
+
+	DebugBoardType boardType() const { return _boardType; }
+	void setBoardType(DebugBoardType boardType) { _boardType = boardType; }
+	void setInvertMask(uint8_t mask) { _invertMask = mask; }
+
+	// made public to allow traversal code to set these directly
+	bool            _active{false};
+	qtac::ByteArray _usbDescriptor;
+	qtac::ByteArray _lastError;
+
+private:
+	static HashType hash(const qtac::ByteArray& serialNumber);
+	void setSerialNumber(const qtac::ByteArray& serialNumber);
+	static unsigned long long setCustomVIDPID();
+	static bool hasDevice(HashType portHash);
+	void setupHash(const qtac::ByteArray& segmentSerialNumber);
+	void setupPortName();
+	static PlatformID nameToPlatform(const qtac::ByteArray& deviceName);
+	static void linuxTraversal();
+	static void windowsTraversal();
+
+	HashType        _hash{0};
+	PlatformID      _platformID{ALPACA_LITE_ID};
+	bool            _new{true};
+	DebugBoardType  _boardType{eFTDI};
+	uint8_t         _invertMask{0};
+	CharBit         _aPins;
+	CharBit         _bPins;
+	CharBit         _cPins;
+	CharBit         _dPins;
+
+	qtac::ByteArray _serialNumber;
+	qtac::ByteArray _portName;
+
+	qtac::ByteArray _aSerialNumber;
+	void*           _aHandle{nullptr};
+
+	qtac::ByteArray _bSerialNumber;
+	void*           _bHandle{nullptr};
+
+	qtac::ByteArray _cSerialNumber;
+	void*           _cHandle{nullptr};
+
+	qtac::ByteArray _dSerialNumber;
+	void*           _dHandle{nullptr};
+
+	static FTDIChipsetList _ftdiChipsetList;
+};
+
+} // namespace qtac
+
+// Bring into global namespace for convenience
+using qtac::_FTDIChipset;
+using qtac::FTDIChipset;
+using qtac::FTDIChipsetList;
+using qtac::FTDIChipsetMap;
+
+#endif // QTAC_FTDICHIPSET_H
diff --git a/source/library/include/qtac/FTDIDevice.h b/source/library/include/qtac/FTDIDevice.h
new file mode 100644
index 00000000..15ef29a3
--- /dev/null
+++ b/source/library/include/qtac/FTDIDevice.h
@@ -0,0 +1,70 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Michael Simpson
+
+#ifndef QTAC_FTDIDEVICE_H
+#define QTAC_FTDIDEVICE_H
+
+#include <qtac/AlpacaDevice.h>
+#include <qtac/FTDIPlatformConfiguration.h>
+
+class FTDIDevice : public _AlpacaDevice
+{
+public:
+	FTDIDevice() = default;
+	virtual ~FTDIDevice() { delete _ftdiPlatformConfiguration; }
+
+	static bool programDevice(AlpacaDevice alpacaDevice,
+	                          PlatformID platformID,
+	                          qtac::ByteArray& errorMessage);
+
+	static uint32_t updateAlpacaDevices();
+
+	virtual bool open() override;
+
+	void buildCommandList();
+	virtual void buildMapping() override;
+	virtual Pins getPins() override;
+	virtual qtac::StringList getTabs() const override;
+	virtual void quickCommand(const qtac::ByteArray& command) override;
+	virtual void setVariableValue(const qtac::String& name, const qtac::Variant& value) override;
+	virtual const qtac::ButtonEntries&   getButtons()             const override;
+	virtual const qtac::VariableEntries& getVariables()           const override;
+	qtac::String configModificationDate() const override;
+	int          configFileVersion()      const override;
+
+private:
+	_FTDIPlatformConfiguration* _ftdiPlatformConfiguration{nullptr};
+};
+
+#endif // QTAC_FTDIDEVICE_H
diff --git a/source/library/include/qtac/FTDIPinSet.h b/source/library/include/qtac/FTDIPinSet.h
new file mode 100644
index 00000000..c57f61c8
--- /dev/null
+++ b/source/library/include/qtac/FTDIPinSet.h
@@ -0,0 +1,84 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+
+#ifndef QTAC_FTDIPINSET_H
+#define QTAC_FTDIPINSET_H
+
+#include <cstdint>
+
+namespace qtac {
+
+const int kMaxPinSetCount{4};
+
+enum FTDIPinSet : uint32_t
+{
+	NoOptions = 0x0,
+	eA        = 0x1,
+	eB        = 0x2,
+	eC        = 0x4,
+	eD        = 0x8
+};
+
+// Replaces Q_DECLARE_FLAGS(FTDIPinSets, FTDIPinSet)
+using FTDIPinSets = uint32_t;
+
+constexpr FTDIPinSets operator|(FTDIPinSet a, FTDIPinSet b)
+{
+	return static_cast<uint32_t>(a) | static_cast<uint32_t>(b);
+}
+
+constexpr FTDIPinSets operator|(FTDIPinSets a, FTDIPinSet b)
+{
+	return a | static_cast<uint32_t>(b);
+}
+
+inline bool testFlag(FTDIPinSets set, FTDIPinSet flag)
+{
+	return (set & static_cast<uint32_t>(flag)) != 0;
+}
+
+} // namespace qtac
+
+// Bring into global namespace so code using unqualified FTDIPinSet/FTDIPinSets still compiles
+using qtac::FTDIPinSet;
+using qtac::FTDIPinSets;
+using qtac::NoOptions;
+using qtac::eA;
+using qtac::eB;
+using qtac::eC;
+using qtac::eD;
+using qtac::testFlag;
+using qtac::kMaxPinSetCount;
+
+#endif // QTAC_FTDIPINSET_H
diff --git a/source/library/include/qtac/FTDIPlatformConfiguration.h b/source/library/include/qtac/FTDIPlatformConfiguration.h
new file mode 100644
index 00000000..ba0dc02a
--- /dev/null
+++ b/source/library/include/qtac/FTDIPlatformConfiguration.h
@@ -0,0 +1,257 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Biswajit Roy, Michael Simpson
+
+#ifndef QTAC_FTDIPLATFORMCONFIGURATION_H
+#define QTAC_FTDIPLATFORMCONFIGURATION_H
+
+#include <qtac/String.h>
+#include <qtac/ByteArray.h>
+#include <qtac/Map.h>
+#include <qtac/List.h>
+#include <qtac/StringList.h>
+#include <qtac/Point.h>
+#include <qtac/PinEntry.h>
+#include <qtac/FTDIPinSet.h>
+#include <qtac/StringUtilities.h>
+#include <qtac/CommandGroup.h>
+#include <qtac/AlpacaScript.h>
+
+#include <qtac/json_util.h>
+#include <memory>
+#include <string>
+
+using ChipIndex = int16_t;
+
+const int kMaxPinIndex{7};
+const int kPinsPerBus{8};
+
+// Bus is a single character: 'A', 'B', 'C', or 'D'
+using Bus = char;
+
+enum FTDIBusFunction
+{
+	eBusFunctionUnknown = 0,
+	eBusFunctionVCP,
+	eBusFunctionD2XX,
+	eBusFunctionI2C
+};
+
+struct FTDIBusData
+{
+	FTDIBusData() = default;
+	FTDIBusData(const FTDIBusData&) = default;
+	FTDIBusData(ChipIndex chipIndex, Bus bus, FTDIBusFunction busFunction)
+		: _chipIndex(chipIndex), _bus(bus), _busFunction(busFunction)
+	{
+		_hash = makeFTDIHash(chipIndex, bus);
+	}
+
+	void clear() { *this = FTDIBusData(); }
+
+	static HashType makeFTDIHash(ChipIndex chipIndex, Bus bus)
+	{
+		return strHash(qtac::String::number(chipIndex) + qtac::String(bus));
+	}
+
+	static qtac::String toString(FTDIBusFunction bf)
+	{
+		switch (bf)
+		{
+		case eBusFunctionVCP:  return "VCP";
+		case eBusFunctionD2XX: return "D2XX";
+		case eBusFunctionI2C:  return "I2C";
+		default:               return qtac::String();
+		}
+	}
+
+	static FTDIBusFunction fromString(const qtac::String& s)
+	{
+		qtac::String u = s.toUpper();
+		if (u == "VCP")  return eBusFunctionVCP;
+		if (u == "D2XX") return eBusFunctionD2XX;
+		if (u == "I2C")  return eBusFunctionI2C;
+		return eBusFunctionUnknown;
+	}
+
+	HashType       _hash{0};
+	ChipIndex      _chipIndex{1};
+	Bus            _bus{0};
+	FTDIBusFunction _busFunction{eBusFunctionUnknown};
+};
+
+struct FTDIPinData
+{
+	FTDIPinData() = default;
+	FTDIPinData(const FTDIPinData&) = default;
+	FTDIPinData(ChipIndex chipIndex, Bus bus, PinID pin)
+		: _chipIndex(chipIndex), _bus(bus), _chipPin(pin)
+	{
+		_hash = makeFTDIHash(chipIndex, bus, pin);
+	}
+
+	void clear() { *this = FTDIPinData(); }
+
+	static HashType makeFTDIHash(ChipIndex chipIndex, Bus bus, PinID pin)
+	{
+		return strHash(qtac::String::number(chipIndex)
+		             + qtac::String(bus)
+		             + qtac::String::number(static_cast<unsigned long long>(pin)));
+	}
+
+	HashType        _hash{0};
+	ChipIndex       _chipIndex{1};
+	Bus             _bus{0};
+	PinID           _chipPin{static_cast<PinID>(-1)};
+	PinID           _setPin{static_cast<PinID>(-1)};
+	bool            _enabled{false};
+	bool            _input{false};
+	qtac::String    _pinLabel;
+	qtac::String    _pinTooltip;
+	bool            _initialValue{false};
+	int             _initializationPriority{-1};
+	bool            _inverted{false};
+	qtac::String    _pinCommand;
+	CommandGroups   _commandGroup{eUnknownCommandGroup};
+	qtac::Point     _cellLocation{-1, -1};
+	qtac::String    _tabName{"General"};
+};
+
+using FTDIPinEntries = qtac::Map<HashType, FTDIPinData>;
+using FTDIPinList    = qtac::List<FTDIPinData>;
+using FTDIBusFunctions = qtac::Map<HashType, FTDIBusData>;
+
+
+class _FTDIPlatformConfiguration
+{
+public:
+	_FTDIPlatformConfiguration() = delete;
+	explicit _FTDIPlatformConfiguration(uint16_t chipCount);
+	_FTDIPlatformConfiguration(const _FTDIPlatformConfiguration&) = delete;
+	_FTDIPlatformConfiguration& operator=(const _FTDIPlatformConfiguration&) = delete;
+	~_FTDIPlatformConfiguration() = default;
+
+	void initialize(uint16_t chipCount);
+
+	FTDIPinData getPinData(ChipIndex chipIndex, Bus bus, PinID pin);
+
+	FTDIPinList getAllPins() const;
+	FTDIPinList getActivePins() const;
+	FTDIPinList getActivePins(ChipIndex chipIndex, Bus bus) const;
+
+	int getChipCount();
+
+	Pins getPins();
+
+	bool getPinEnableState(ChipIndex chipIndex, Bus bus, PinID pinId) const;
+	void setPinEnableState(HashType hash, bool newState);
+
+	bool getPinInputState(ChipIndex chipIndex, Bus bus, PinID pinId) const;
+	void setPinInputState(HashType hash, bool newState);
+
+	bool getInitialPinValue(ChipIndex chipIndex, Bus bus, PinID pinId) const;
+	void setInitialPinValue(HashType hash, bool newState);
+
+	int getPinInitializationPriority(ChipIndex chipIndex, Bus bus, PinID pinId) const;
+	void setPinInitializationPriority(HashType hash, int priority);
+
+	bool getPinInvertedState(ChipIndex chipIndex, Bus bus, PinID pinId) const;
+	void setPinInvertedState(HashType hash, bool newState);
+
+	qtac::String getPinLabel(ChipIndex chipIndex, Bus bus, PinID pinId) const;
+	void setPinLabel(HashType hash, const qtac::String& pinLabel);
+
+	qtac::String getPinTooltip(ChipIndex chipIndex, Bus bus, PinID pinId) const;
+	void setPinTooltip(HashType hash, const qtac::String& pinTooltip);
+
+	qtac::String getPinCommand(ChipIndex chipIndex, Bus bus, PinID pinId) const;
+	void setPinCommand(HashType hash, const qtac::String& pinCommand);
+
+	CommandGroups getPinGroup(ChipIndex chipIndex, Bus bus, PinID pinId) const;
+	void setPinGroup(HashType hash, CommandGroups pinGroup);
+
+	qtac::String getTabName(ChipIndex chipIndex, Bus bus, PinID pinId) const;
+	void setTabName(HashType hash, const qtac::String& tabName);
+
+	qtac::Point getPinCellLocation(ChipIndex chipIndex, Bus bus, PinID pinId) const;
+	void setPinCellLocation(HashType hash, const qtac::Point& cellLocation);
+
+	FTDIBusData getBusFunction(ChipIndex chipIndex, Bus bus) const;
+	void setBusFunction(HashType hash, FTDIBusFunction busFunction);
+	void setBusFunction(ChipIndex chipIndex, Bus bus, FTDIBusFunction busFunction);
+
+	FTDIPinSets getPinSet(ChipIndex chipIndex);
+
+	void cascadeTabDelete(const qtac::String& tabName);
+	void cascadeTabRename(const qtac::String& oldName, const qtac::String& newName);
+
+	// --- Quick Settings buttons and script variables ---
+	const qtac::ButtonEntries&   getButtons()   const { return _buttons;   }
+	const qtac::VariableEntries& getVariables() const { return _variables; }
+	const qtac::AlpacaScript&    getScript()    const { return _script;    }
+
+	// --- Tab list from tcnf "tabs" array (visible tabs in ordinal order) ---
+	const qtac::StringList& getTabs() const { return _tabs; }
+
+	// --- Config file metadata ---
+	qtac::String modificationDate() const { return _modificationDate; }
+	int          fileVersion()      const { return _fileVersion;      }
+
+	// Variable value setters (called from UI widgets)
+	void setVariableValue(const qtac::String& name, const qtac::Variant& value)
+	{
+		auto it = _variables.find(name);
+		if (it != _variables.end()) it->second._defaultValue = value;
+	}
+
+	bool read(json_t& parentLevel);
+	void write(json_t& parentLevel);
+	void loadDefaultScript(const qtac::String& scriptText);
+
+private:
+	PinID getSetPinIndex(int chipIndex, Bus bus, PinID pinId);
+
+	int             _chipCount{1};
+	FTDIPinEntries  _pinEntries;
+	FTDIBusFunctions _busFunctions;
+	qtac::ButtonEntries   _buttons;
+	qtac::VariableEntries _variables;
+	qtac::AlpacaScript    _script;
+	qtac::StringList      _tabs;
+	qtac::String          _modificationDate;
+	int                   _fileVersion{0};
+};
+
+using FTDIPlatformConfiguration = std::shared_ptr<_FTDIPlatformConfiguration>;
+
+#endif // QTAC_FTDIPLATFORMCONFIGURATION_H
diff --git a/source/library/include/qtac/FrameCoder.h b/source/library/include/qtac/FrameCoder.h
new file mode 100644
index 00000000..53337be1
--- /dev/null
+++ b/source/library/include/qtac/FrameCoder.h
@@ -0,0 +1,90 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+// Qt-free reimplementation of FrameCoder.h from qcommon-console.
+// QByteArray  -> qtac::ByteArray
+// QPair       -> std::pair
+// QList       -> std::vector
+// Q_DISABLE_COPY -> explicitly deleted copy ctor/assignment
+// QObject     -> removed
+
+#pragma once
+
+#include <qtac/ByteArray.h>
+#include <qtac/FramePackage.h>
+#include <qtac/String.h>
+#include <qtac/Variant.h>
+
+#include <utility>
+#include <vector>
+
+namespace qtac {
+
+class ProtocolInterface;
+
+using ErrorParameter  = std::pair<qtac::String, qtac::Variant>;
+using ErrorParameters = std::vector<ErrorParameter>;
+
+using FrameCompleteFunc = void (*)(const qtac::ByteArray& completedFrame, ProtocolInterface* userData);
+using BadFrameFunc      = void (*)(const qtac::ByteArray& completedFrame, ProtocolInterface* userData);
+
+class FrameCoder
+{
+public:
+    FrameCoder()          = default;
+    virtual ~FrameCoder() = default;
+
+    FrameCoder(const FrameCoder&)            = delete;
+    FrameCoder& operator=(const FrameCoder&) = delete;
+
+    virtual void reset();
+
+    void setupCallbackFunctions(ProtocolInterface* userData,
+                                FrameCompleteFunc  frameFunc,
+                                BadFrameFunc       badFrameFunc);
+
+    virtual void             decode(const qtac::ByteArray& decodeMe);
+    virtual qtac::ByteArray  encode(const qtac::ByteArray& encodeMe, const Arguments& arguments);
+
+protected:
+    // Helper: returns "1" if the bool variant at the given argument index is true, else "0".
+    // The variant must hold a bool; behaviour is undefined for other alternative types.
+    qtac::ByteArray argumentToBoolString(const Argument& arg) const;
+
+    qtac::ByteArray     _frame;
+    ProtocolInterface*  _protocolInterface{nullptr};
+    FrameCompleteFunc   _frameFunction{nullptr};
+    BadFrameFunc        _badFrameFunction{nullptr};
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/FramePackage.h b/source/library/include/qtac/FramePackage.h
new file mode 100644
index 00000000..43adbfe5
--- /dev/null
+++ b/source/library/include/qtac/FramePackage.h
@@ -0,0 +1,108 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+// Qt-free reimplementation of FramePackage.h from qcommon-console.
+
+#pragma once
+
+#include <qtac/ByteArray.h>
+
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <vector>
+
+namespace qtac {
+
+class ReceiveInterface;
+
+// Heterogeneous argument — mirrors the QList<QVariant> usage: bool, uint32, or string.
+struct Argument
+{
+    enum class Kind { Bool, UInt32, String };
+
+    // Implicit constructors so existing push_back(bool/uint32_t/string) calls compile unchanged.
+    Argument(bool v)               : _kind(Kind::Bool),   _b(v) {}
+    Argument(uint32_t v)           : _kind(Kind::UInt32), _u(v) {}
+    Argument(const std::string& v) : _kind(Kind::String), _s(v) {}
+
+    Kind               kind()     const { return _kind; }
+    bool               asBool()   const { return _b; }
+    uint32_t           asUInt32() const { return _u; }
+    const std::string& asString() const { return _s; }
+
+private:
+    Kind        _kind;
+    bool        _b  = false;
+    uint32_t    _u  = 0;
+    std::string _s;
+};
+
+using Arguments = std::vector<Argument>;class FramePackageData
+{
+public:
+    FramePackageData()  = default;
+    ~FramePackageData() = default;
+
+    // Non-copyable; always used through shared_ptr.
+    FramePackageData(const FramePackageData&)            = delete;
+    FramePackageData& operator=(const FramePackageData&) = delete;
+
+    qtac::ByteArray              lastError;
+    qtac::ByteArray              request;
+    uint32_t                     requestHash{0};
+    Arguments                    arguments;
+    qtac::ByteArray              synonym;
+    qtac::ByteArray              codedRequest;
+    std::vector<qtac::ByteArray> responses;
+    uint32_t                     packetID{0};
+    qtac::ByteArray              comment;
+
+    bool                    endTransaction{false};
+    bool                    valid{true};
+    bool                    console{false};
+    bool                    shouldStore{false};
+    ReceiveInterface*       receiveInterface{nullptr};
+    uint64_t                tickcount{0};
+    uint32_t                delayInMilliSeconds{0};
+};
+
+using FramePackage     = std::shared_ptr<FramePackageData>;
+using FramePackageList = std::vector<FramePackage>;
+
+inline FramePackage makeFramePackage()
+{
+    return std::make_shared<FramePackageData>();
+}
+
+} // namespace qtac
diff --git a/source/library/include/qtac/List.h b/source/library/include/qtac/List.h
new file mode 100644
index 00000000..86fdacef
--- /dev/null
+++ b/source/library/include/qtac/List.h
@@ -0,0 +1,187 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef QTAC_LIST_H
+#define QTAC_LIST_H
+
+#include <vector>
+#include <algorithm>
+#include <initializer_list>
+#include <stdexcept>
+
+namespace qtac {
+
+template<typename T>
+class List
+{
+public:
+	using iterator = typename std::vector<T>::iterator;
+	using const_iterator = typename std::vector<T>::const_iterator;
+
+	List() = default;
+	List(std::initializer_list<T> init) : _data(init) {}
+	List(const std::vector<T>& vec) : _data(vec) {}
+	List(std::vector<T>&& vec) : _data(std::move(vec)) {}
+
+	// --- Size ---
+	int size() const { return static_cast<int>(_data.size()); }
+	int count() const { return size(); }
+	int length() const { return size(); }
+	bool isEmpty() const { return _data.empty(); }
+	void clear() { _data.clear(); }
+	void reserve(int size) { _data.reserve(static_cast<size_t>(size)); }
+
+	// --- Element access ---
+	const T& at(int index) const { return _data.at(static_cast<size_t>(index)); }
+	T& operator[](int index) { return _data[static_cast<size_t>(index)]; }
+	const T& operator[](int index) const { return _data[static_cast<size_t>(index)]; }
+	const T& first() const { return _data.front(); }
+	T& first() { return _data.front(); }
+	const T& last() const { return _data.back(); }
+	T& last() { return _data.back(); }
+
+	// --- Modification ---
+	void append(const T& item) { _data.push_back(item); }
+	void append(T&& item) { _data.push_back(std::move(item)); }
+	void append(const List<T>& other)
+	{
+		_data.insert(_data.end(), other._data.begin(), other._data.end());
+	}
+
+	void prepend(const T& item) { _data.insert(_data.begin(), item); }
+
+	void insert(int index, const T& item)
+	{
+		_data.insert(_data.begin() + index, item);
+	}
+
+	void removeAt(int index)
+	{
+		_data.erase(_data.begin() + index);
+	}
+
+	bool removeOne(const T& item)
+	{
+		auto it = std::find(_data.begin(), _data.end(), item);
+		if (it == _data.end()) return false;
+		_data.erase(it);
+		return true;
+	}
+
+	int removeAll(const T& item)
+	{
+		auto it = std::remove(_data.begin(), _data.end(), item);
+		int removed = static_cast<int>(std::distance(it, _data.end()));
+		_data.erase(it, _data.end());
+		return removed;
+	}
+
+	void replace(int index, const T& item)
+	{
+		_data[static_cast<size_t>(index)] = item;
+	}
+
+	T takeAt(int index)
+	{
+		T item = std::move(_data[static_cast<size_t>(index)]);
+		_data.erase(_data.begin() + index);
+		return item;
+	}
+
+	T takeFirst() { return takeAt(0); }
+	T takeLast()
+	{
+		T item = std::move(_data.back());
+		_data.pop_back();
+		return item;
+	}
+
+	// --- Search ---
+	bool contains(const T& item) const
+	{
+		return std::find(_data.begin(), _data.end(), item) != _data.end();
+	}
+
+	int indexOf(const T& item, int from = 0) const
+	{
+		auto it = std::find(_data.begin() + from, _data.end(), item);
+		if (it == _data.end()) return -1;
+		return static_cast<int>(std::distance(_data.begin(), it));
+	}
+
+	int lastIndexOf(const T& item, int from = -1) const
+	{
+		auto start = (from < 0) ? _data.rbegin() : _data.rbegin() + (size() - 1 - from);
+		auto it = std::find(start, _data.rend(), item);
+		if (it == _data.rend()) return -1;
+		return static_cast<int>(std::distance(_data.begin(), it.base()) - 1);
+	}
+
+	// --- Operators ---
+	List<T>& operator<<(const T& item) { _data.push_back(item); return *this; }
+	List<T>& operator+=(const T& item) { _data.push_back(item); return *this; }
+	List<T>& operator+=(const List<T>& other)
+	{
+		_data.insert(_data.end(), other._data.begin(), other._data.end());
+		return *this;
+	}
+
+	friend List<T> operator+(const List<T>& lhs, const List<T>& rhs)
+	{
+		List<T> result = lhs;
+		result += rhs;
+		return result;
+	}
+
+	// --- Iterators ---
+	iterator begin() { return _data.begin(); }
+	iterator end() { return _data.end(); }
+	const_iterator begin() const { return _data.begin(); }
+	const_iterator end() const { return _data.end(); }
+	const_iterator cbegin() const { return _data.cbegin(); }
+	const_iterator cend() const { return _data.cend(); }
+
+	// --- Conversion ---
+	std::vector<T>& toVector() { return _data; }
+	const std::vector<T>& toVector() const { return _data; }
+
+	// --- Comparison ---
+	friend bool operator==(const List& lhs, const List& rhs) { return lhs._data == rhs._data; }
+	friend bool operator!=(const List& lhs, const List& rhs) { return lhs._data != rhs._data; }
+
+private:
+	std::vector<T> _data;
+};
+
+} // namespace qtac
+
+#endif // QTAC_LIST_H
diff --git a/source/library/include/qtac/Map.h b/source/library/include/qtac/Map.h
new file mode 100644
index 00000000..1a964f9f
--- /dev/null
+++ b/source/library/include/qtac/Map.h
@@ -0,0 +1,135 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef QTAC_MAP_H
+#define QTAC_MAP_H
+
+#include <map>
+#include <vector>
+
+namespace qtac {
+
+template<typename Key, typename Value>
+class Map
+{
+public:
+	using iterator = typename std::map<Key, Value>::iterator;
+	using const_iterator = typename std::map<Key, Value>::const_iterator;
+
+	Map() = default;
+	Map(std::initializer_list<std::pair<const Key, Value>> init) : _data(init) {}
+
+	// --- Size ---
+	int size() const { return static_cast<int>(_data.size()); }
+	int count() const { return size(); }
+	bool isEmpty() const { return _data.empty(); }
+	void clear() { _data.clear(); }
+
+	// --- Access ---
+	Value value(const Key& key, const Value& defaultValue = Value()) const
+	{
+		auto it = _data.find(key);
+		if (it == _data.end()) return defaultValue;
+		return it->second;
+	}
+
+	Value& operator[](const Key& key) { return _data[key]; }
+	const Value operator[](const Key& key) const
+	{
+		auto it = _data.find(key);
+		if (it == _data.end()) return Value();
+		return it->second;
+	}
+
+	// --- Modification ---
+	void insert(const Key& key, const Value& value) { _data[key] = value; }
+
+	int remove(const Key& key)
+	{
+		return static_cast<int>(_data.erase(key));
+	}
+
+	// --- Search ---
+	bool contains(const Key& key) const
+	{
+		return _data.find(key) != _data.end();
+	}
+
+	iterator find(const Key& key) { return _data.find(key); }
+	const_iterator find(const Key& key) const { return _data.find(key); }
+
+	// --- Keys / Values ---
+	std::vector<Key> keys() const
+	{
+		std::vector<Key> result;
+		result.reserve(_data.size());
+		for (const auto& pair : _data)
+			result.push_back(pair.first);
+		return result;
+	}
+
+	std::vector<Value> values() const
+	{
+		std::vector<Value> result;
+		result.reserve(_data.size());
+		for (const auto& pair : _data)
+			result.push_back(pair.second);
+		return result;
+	}
+
+	Key key(const Value& value, const Key& defaultKey = Key()) const
+	{
+		for (const auto& pair : _data) {
+			if (pair.second == value) return pair.first;
+		}
+		return defaultKey;
+	}
+
+	// --- Iterators ---
+	iterator begin() { return _data.begin(); }
+	iterator end() { return _data.end(); }
+	const_iterator begin() const { return _data.begin(); }
+	const_iterator end() const { return _data.end(); }
+	const_iterator cbegin() const { return _data.cbegin(); }
+	const_iterator cend() const { return _data.cend(); }
+
+	// --- Comparison ---
+	friend bool operator==(const Map& lhs, const Map& rhs) { return lhs._data == rhs._data; }
+	friend bool operator!=(const Map& lhs, const Map& rhs) { return lhs._data != rhs._data; }
+
+private:
+	std::map<Key, Value> _data;
+};
+
+} // namespace qtac
+
+#endif // QTAC_MAP_H
diff --git a/source/library/include/qtac/Notification.h b/source/library/include/qtac/Notification.h
new file mode 100644
index 00000000..0beabd44
--- /dev/null
+++ b/source/library/include/qtac/Notification.h
@@ -0,0 +1,91 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Qt-free port of upstream Notification class.
+// Uses std::chrono::system_clock instead of QDateTime.
+// NotificationLevel is declared in TACDriveThread.h.
+
+#pragma once
+
+#include <qtac/String.h>
+#include <qtac/TACDriveThread.h>
+
+#include <chrono>
+#include <cstdint>
+
+// -----------------------------------------------------------------------
+// Notification
+//
+// Immutable value type carrying a message, severity level, identifier,
+// timestamp, and occurrence count.  Mirrors the upstream Notification
+// class but replaces QDateTime with std::chrono::system_clock.
+// -----------------------------------------------------------------------
+
+namespace qtac {
+
+struct Notification
+{
+    using Clock     = std::chrono::system_clock;
+    using TimePoint = std::chrono::time_point<Clock>;
+
+    Notification() = default;
+
+    Notification(const qtac::String& message, NotificationLevel level, uint64_t id = 0)
+        : _message(message)
+        , _level(level)
+        , _id(id)
+        , _timestamp(Clock::now())
+        , _occurrenceCount(1)
+    {}
+
+    qtac::String      getMessage()         const { return _message;         }
+    NotificationLevel getLevel()           const { return _level;           }
+    uint64_t          getId()              const { return _id;              }
+    TimePoint         getTimestamp()       const { return _timestamp;       }
+    uint32_t          getOccurrenceCount() const { return _occurrenceCount; }
+
+    // Increment the occurrence counter and refresh the timestamp.
+    void addOccurrence()
+    {
+        ++_occurrenceCount;
+        _timestamp = Clock::now();
+    }
+
+private:
+    qtac::String      _message;
+    NotificationLevel _level{NotificationLevel::Info};
+    uint64_t          _id{0};
+    TimePoint         _timestamp;
+    uint32_t          _occurrenceCount{0};
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/PIC32CXDevice.h b/source/library/include/qtac/PIC32CXDevice.h
new file mode 100644
index 00000000..7bc3e2ae
--- /dev/null
+++ b/source/library/include/qtac/PIC32CXDevice.h
@@ -0,0 +1,58 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#pragma once
+
+#include <qtac/AlpacaDevice.h>
+#include <qtac/PIC32CXPlatformConfiguration.h>
+
+class PIC32CXDevice : public _AlpacaDevice
+{
+public:
+    PIC32CXDevice() = default;
+    ~PIC32CXDevice() override = default;
+
+    static uint32_t updateAlpacaDevices();
+
+    bool open() override;
+    void buildMapping() override;
+    Pins getPins() override;
+    void quickCommand(const qtac::ByteArray& command) override;
+    void setVariableValue(const qtac::String& name, const qtac::Variant& value) override;
+    const qtac::ButtonEntries&   getButtons()   const override;
+    const qtac::VariableEntries& getVariables() const override;
+    qtac::String configModificationDate() const override;
+    int          configFileVersion()      const override;
+
+private:
+    _PIC32CXPlatformConfiguration* _pic32cxPlatformConfiguration{nullptr};
+};
diff --git a/source/library/include/qtac/PIC32CXPlatformConfiguration.h b/source/library/include/qtac/PIC32CXPlatformConfiguration.h
new file mode 100644
index 00000000..dddaa838
--- /dev/null
+++ b/source/library/include/qtac/PIC32CXPlatformConfiguration.h
@@ -0,0 +1,155 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#pragma once
+
+#include <qtac/CommandGroup.h>
+#include <qtac/Map.h>
+#include <qtac/List.h>
+#include <qtac/PinEntry.h>
+#include <qtac/PinID.h>
+#include <qtac/PlatformID.h>
+#include <qtac/Point.h>
+#include <qtac/String.h>
+#include <qtac/StringUtilities.h>
+#include <qtac/AlpacaScript.h>
+
+#include <qtac/json_util.h>
+
+#include <memory>
+
+const PlatformID kMaxPIC32CXPlatformId{99999};
+
+struct PIC32CXPinData
+{
+    PIC32CXPinData() = default;
+    PIC32CXPinData(const PIC32CXPinData&) = default;
+    PIC32CXPinData(PinID setPin)
+    {
+        _setPin = setPin;
+        _hash   = PIC32CXPinData::makePIC32CXHash(setPin);
+    }
+
+    void clear() { *this = PIC32CXPinData(); }
+
+    static HashType makePIC32CXHash(PinID setPin)
+    {
+        return strHash(qtac::String::number(static_cast<unsigned long long>(setPin)));
+    }
+
+    HashType        _hash{0};
+    PinID           _setPin{static_cast<PinID>(-1)};
+    bool            _enabled{false};
+    qtac::String    _pinLabel;
+    qtac::String    _pinTooltip;
+    bool            _inverted{false};
+    qtac::String    _pinCommand;
+    CommandGroups   _commandGroup{eUnknownCommandGroup};
+    qtac::Point     _cellLocation{-1, -1};
+    qtac::String    _tabName{"General"};
+};
+
+using PIC32CXPinEntries = qtac::Map<HashType, PIC32CXPinData>;
+using PIC32CXPinList    = qtac::List<PIC32CXPinData>;
+
+class _PIC32CXPlatformConfiguration
+{
+public:
+    _PIC32CXPlatformConfiguration();
+    _PIC32CXPlatformConfiguration(const _PIC32CXPlatformConfiguration&) = delete;
+    _PIC32CXPlatformConfiguration& operator=(const _PIC32CXPlatformConfiguration&) = delete;
+    ~_PIC32CXPlatformConfiguration() = default;
+
+    Pins getPins();
+
+    PIC32CXPinList getAllPins();
+    PIC32CXPinList getActivePins();
+
+    bool getPinEnableState(PinID pinId) const;
+    void setPinEnableState(HashType hash, bool newState);
+
+    bool getPinInvertedState(PinID pinId) const;
+    void setPinInvertedState(HashType hash, bool newState);
+
+    qtac::String getPinLabel(PinID pinId) const;
+    void setPinLabel(HashType hash, const qtac::String& pinLabel);
+
+    qtac::String getPinTooltip(PinID pinId) const;
+    void setPinTooltip(HashType hash, const qtac::String& pinTooltip);
+
+    qtac::String getPinCommand(PinID pinId) const;
+    void setPinCommand(HashType hash, const qtac::String& pinCommand);
+
+    CommandGroups getPinGroup(PinID pinId) const;
+    void setPinGroup(HashType hash, CommandGroups pinGroup);
+
+    qtac::String getTabName(PinID pinId) const;
+    void setTabName(HashType hash, const qtac::String& tabName);
+
+    qtac::Point getPinCellLocation(PinID pinId) const;
+    void setPinCellLocation(HashType hash, const qtac::Point& cellLocation);
+
+    PinID bitFromSetPin(PinID setPin);
+
+    void cascadeTabDelete(const qtac::String& tabName);
+    void cascadeTabRename(const qtac::String& oldName, const qtac::String& newName);
+
+    const qtac::ButtonEntries&   getButtons()   const { return _buttons;   }
+    const qtac::VariableEntries& getVariables() const { return _variables; }
+    const qtac::AlpacaScript&    getScript()    const { return _script;    }
+
+    qtac::String modificationDate() const { return _modificationDate; }
+    int          fileVersion()      const { return _fileVersion;      }
+
+    void setVariableValue(const qtac::String& name, const qtac::Variant& value)
+    {
+        auto it = _variables.find(name);
+        if (it != _variables.end()) it->second._defaultValue = value;
+    }
+
+    void loadDefaultScript(const qtac::String& scriptText);
+
+    bool read(json_t& parentLevel);
+    void write(json_t& parentLevel);
+
+private:
+    void initialize();
+
+    PIC32CXPinEntries     _pinEntries;
+    qtac::ButtonEntries   _buttons;
+    qtac::VariableEntries _variables;
+    qtac::AlpacaScript    _script;
+    qtac::String          _modificationDate;
+    int                   _fileVersion{0};
+};
+
+using PIC32CXPlatformConfiguration = std::shared_ptr<_PIC32CXPlatformConfiguration>;
diff --git a/source/library/include/qtac/PSOCDevice.h b/source/library/include/qtac/PSOCDevice.h
new file mode 100644
index 00000000..6af24db4
--- /dev/null
+++ b/source/library/include/qtac/PSOCDevice.h
@@ -0,0 +1,60 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#pragma once
+
+#include <qtac/AlpacaDevice.h>
+#include <qtac/PSOCPlatformConfiguration.h>
+
+class PSOCDevice : public _AlpacaDevice
+{
+public:
+    PSOCDevice() = default;
+    ~PSOCDevice() override = default;
+
+    static uint32_t updateAlpacaDevices();
+
+    bool open() override;
+    void buildMapping() override;
+    Pins getPins() override;
+    qtac::ByteArray getHelp() override;
+    void quickCommand(const qtac::ByteArray& command) override;
+    void setVariableValue(const qtac::String& name, const qtac::Variant& value) override;
+    const qtac::ButtonEntries&   getButtons()   const override;
+    const qtac::VariableEntries& getVariables() const override;
+    qtac::String configModificationDate() const override;
+    int          configFileVersion()      const override;
+
+private:
+    _PSOCPlatformConfiguration* _psocPlatformConfiguration{nullptr};
+    uint32_t                    _usbRevision{0};
+};
diff --git a/source/library/include/qtac/PSOCPlatformConfiguration.h b/source/library/include/qtac/PSOCPlatformConfiguration.h
new file mode 100644
index 00000000..8192ade5
--- /dev/null
+++ b/source/library/include/qtac/PSOCPlatformConfiguration.h
@@ -0,0 +1,276 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#pragma once
+
+#include <qtac/CommandGroup.h>
+#include <qtac/DebugBoardType.h>
+#include <qtac/Map.h>
+#include <qtac/List.h>
+#include <qtac/PinEntry.h>
+#include <qtac/PinID.h>
+#include <qtac/Point.h>
+#include <qtac/String.h>
+#include <qtac/StringUtilities.h>
+#include <qtac/AlpacaScript.h>
+
+#include <qtac/json_util.h>
+
+#include <memory>
+#include <vector>
+
+const PinID kMaxPSOCPlatformId{255};
+
+struct PSOCPinData
+{
+    PSOCPinData() = default;
+    PSOCPinData(const PSOCPinData&) = default;
+    PSOCPinData(PinID pin)
+    {
+        _pin = pin;
+        _hash = strHash(qtac::String::number(static_cast<unsigned long long>(pin)));
+    }
+
+    void clear() { *this = PSOCPinData(); }
+
+    PinID           _pin{0};
+    HashType        _hash{0};
+    bool            _enabled{true};
+    qtac::String    _pinLabel;
+    qtac::String    _pinTooltip;
+    bool            _initialValue{false};
+    int             _initializationPriority{0};
+    bool            _inverted{false};
+    qtac::String    _pinCommand;
+    CommandGroups   _commandGroup{eUnknownCommandGroup};
+    qtac::String    _classicAction;
+    qtac::Point     _cellLocation{-1, -1};
+    qtac::String    _tabName;
+};
+
+using PSOCPinEntries = qtac::Map<PinID, PSOCPinData>;
+using PSOCPinList    = qtac::List<PSOCPinData>;
+
+// ---------------------------------------------------------------------------
+// I2C slave device and I2C pin data structures (PSoC GPIO+IIC variant)
+// ---------------------------------------------------------------------------
+
+struct PSOCI2CSlave
+{
+    PSOCI2CSlave() = default;
+    void clear() { *this = PSOCI2CSlave(); }
+
+    PSOCIICVariant  _variant{ePSOCIICUnknown};
+    PinID           _slaveAddress{0};
+    PinID           _configAddress{0};
+    int             _portCount{0};
+};
+
+struct PSOCI2CData
+{
+    PSOCI2CData() = default;
+    PSOCI2CData(const PSOCI2CData&) = default;
+    PSOCI2CData(PinID slaveAddress, PinID writeAddress, PinID pin)
+    {
+        _slaveAddress = slaveAddress;
+        _writeAddress = writeAddress;
+        _pin          = pin;
+        _hash         = makeHash();
+    }
+
+    void clear() { *this = PSOCI2CData(); }
+
+    HashType makeHash() const
+    {
+        return (static_cast<HashType>(_slaveAddress) << 40) ^
+               (static_cast<HashType>(_writeAddress) << 20) ^
+                static_cast<HashType>(_pin);
+    }
+
+    PinID           _pin{0};
+    PinID           _slaveAddress{0};
+    PinID           _writeAddress{0};
+    HashType        _hash{0};
+    bool            _enabled{false};
+    qtac::String    _pinLabel;
+    qtac::String    _pinTooltip;
+    bool            _inverted{false};
+    qtac::String    _pinCommand;
+    CommandGroups   _commandGroup{eUnknownCommandGroup};
+    qtac::String    _classicAction;
+    qtac::Point     _cellLocation{-1, -1};
+    qtac::String    _tabName;
+};
+
+using PSOCI2CEntries = qtac::Map<HashType, PSOCI2CData>;
+using PSOCI2CSlaves  = qtac::List<PSOCI2CSlave>;
+
+// ---------------------------------------------------------------------------
+
+class _PSOCPlatformConfiguration
+{
+public:
+    _PSOCPlatformConfiguration(PSOCVariant psocVariant = ePSOCGPIO);
+    _PSOCPlatformConfiguration(const _PSOCPlatformConfiguration&) = delete;
+    _PSOCPlatformConfiguration& operator=(const _PSOCPlatformConfiguration&) = delete;
+    ~_PSOCPlatformConfiguration() = default;
+
+    Pins getPins();
+
+    PSOCPinList getAllPins();
+    PSOCPinList getActivePins();
+
+    PSOCVariant variant() const { return _variant; }
+    void setVariant(PSOCVariant psocVariant);
+
+    // --- GPIO pin accessors (unchanged) ---
+    bool getPinEnableState(PinID pinId) const;
+    void setPinEnableState(PinID pinId, bool newState);
+
+    bool getInitialPinValue(PinID pinId) const;
+    void setInitialPinValue(PinID pinId, bool newState);
+
+    uint64_t getPinInitializationPriority(PinID pinId) const;
+    void setPinInitializationPriority(PinID pinId, int priority);
+
+    bool getPinInvertedState(PinID pinId) const;
+    void setPinInvertedState(PinID pinId, bool newState);
+
+    qtac::String getPinLabel(PinID pinId) const;
+    void setPinLabel(PinID pinId, const qtac::String& pinLabel);
+
+    qtac::String getPinTooltip(PinID pinId) const;
+    void setPinTooltip(PinID pinId, const qtac::String& pinTooltip);
+
+    qtac::String getPinCommand(PinID pinId) const;
+    void setPinCommand(PinID pinId, const qtac::String& pinCommand);
+
+    CommandGroups getPinGroup(PinID pinId) const;
+    void setPinGroup(PinID pinId, CommandGroups commandGroup);
+
+    qtac::String getClassicAction(PinID pinId) const;
+    void setClassicAction(PinID pinId, const qtac::String& classicAction);
+
+    qtac::String getTabName(PinID pinId) const;
+    void setTabName(PinID pinId, const qtac::String& tabName);
+
+    qtac::Point getPinCellLocation(PinID pinId) const;
+    void setPinCellLocation(PinID pinId, const qtac::Point& cellLocation);
+
+    void cascadeTabDelete(const qtac::String& tabName);
+    void cascadeTabRename(const qtac::String& oldName, const qtac::String& newName);
+
+    const qtac::ButtonEntries&   getButtons()   const { return _buttons;   }
+    const qtac::VariableEntries& getVariables() const { return _variables; }
+    const qtac::AlpacaScript&    getScript()    const { return _script;    }
+
+    qtac::String modificationDate() const { return _modificationDate; }
+    int          fileVersion()      const { return _fileVersion;      }
+    qtac::String name()             const { return _name;             }
+    qtac::String author()           const { return _author;           }
+    qtac::String description()      const { return _description;      }
+
+    void setVariableValue(const qtac::String& name, const qtac::Variant& value)
+    {
+        auto it = _variables.find(name);
+        if (it != _variables.end()) it->second._defaultValue = value;
+    }
+
+    void loadDefaultScript(const qtac::String& scriptText);
+
+    bool read(json_t& parentLevel);
+    void write(json_t& parentLevel);
+
+    // --- I2C slave management (PSoC GPIO+IIC variant) ---
+    Pins getI2CPinEntries();
+
+    PSOCI2CSlaves getSlaveConfigs() const;
+    void addSlaveConfig(const PSOCI2CSlave& slave);
+    void removeSlaveConfig(PinID slaveAddress);
+
+    static qtac::String i2cSlaveTabName(const PSOCI2CSlave& slave);
+
+    PSOCI2CEntries getI2CEntries() const;
+    PSOCI2CEntries getActiveI2CEntries() const;
+    qtac::List<PSOCI2CData> getI2CEntriesForSlave(const PSOCI2CSlave& slave) const;
+    bool addI2CSlave(const PSOCI2CData& i2cData);
+    void removeI2CSlave(HashType hash);
+    PSOCI2CData getI2CSlave(HashType hash) const;
+
+    bool getI2CPinEnableState(HashType hash) const;
+    void setI2CPinEnableState(HashType hash, bool newState);
+
+    bool getI2CPinInvertedState(HashType hash) const;
+    void setI2CPinInvertedState(HashType hash, bool newState);
+
+    qtac::String getI2CPinLabel(HashType hash) const;
+    void setI2CPinLabel(HashType hash, const qtac::String& pinLabel);
+
+    qtac::String getI2CPinTooltip(HashType hash) const;
+    void setI2CPinTooltip(HashType hash, const qtac::String& pinTooltip);
+
+    qtac::String getI2CPinCommand(HashType hash) const;
+    void setI2CPinCommand(HashType hash, const qtac::String& pinCommand);
+
+    CommandGroups getI2CPinGroup(HashType hash) const;
+    void setI2CPinGroup(HashType hash, CommandGroups commandGroup);
+
+    qtac::String getI2CTabName(HashType hash) const;
+    void setI2CTabName(HashType hash, const qtac::String& tabName);
+
+    qtac::Point getI2CPinCellLocation(HashType hash) const;
+    void setI2CPinCellLocation(HashType hash, const qtac::Point& cellLocation);
+
+private:
+    static void initialize(PSOCVariant psocVariant);
+    void refreshSlaveConfig();
+    void rebuildI2CTabs();
+
+    PSOCPinEntries        _pinEntries;
+    PSOCI2CEntries        _i2cEntries;
+    PSOCI2CSlaves         _slaveConfigs;
+    PSOCVariant           _variant{ePSOCGPIO};
+    qtac::ButtonEntries   _buttons;
+    qtac::VariableEntries _variables;
+    qtac::AlpacaScript    _script;
+    qtac::String          _modificationDate;
+    int                   _fileVersion{0};
+    qtac::String          _name;
+    qtac::String          _author;
+    qtac::String          _description;
+
+    static PSOCPinEntries  _classicActions;
+    static PSOCI2CEntries  _classicI2CActions;
+    static PSOCI2CSlaves   _classicSlaveConfigs;
+};
+
+using PSOCPlatformConfiguration = std::shared_ptr<_PSOCPlatformConfiguration>;
diff --git a/source/library/include/qtac/Pair.h b/source/library/include/qtac/Pair.h
new file mode 100644
index 00000000..e698cad1
--- /dev/null
+++ b/source/library/include/qtac/Pair.h
@@ -0,0 +1,51 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef QTAC_PAIR_H
+#define QTAC_PAIR_H
+
+#include <utility>
+
+namespace qtac {
+
+template<typename T1, typename T2>
+using Pair = std::pair<T1, T2>;
+
+template<typename T1, typename T2>
+Pair<T1, T2> makePair(const T1& first, const T2& second)
+{
+	return std::make_pair(first, second);
+}
+
+} // namespace qtac
+
+#endif // QTAC_PAIR_H
diff --git a/source/library/include/qtac/PinEntry.h b/source/library/include/qtac/PinEntry.h
new file mode 100644
index 00000000..9938a40e
--- /dev/null
+++ b/source/library/include/qtac/PinEntry.h
@@ -0,0 +1,63 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+
+#ifndef QTAC_PINENTRY_H
+#define QTAC_PINENTRY_H
+
+#include <qtac/CommandGroup.h>
+#include <qtac/PinID.h>
+#include <qtac/String.h>
+#include <qtac/List.h>
+#include <qtac/Point.h>
+#include <qtac/StringUtilities.h>
+
+struct PinEntry
+{
+	PinID           _pin{0};
+	bool            _enabled{false};
+	HashType        _hash{0};
+	qtac::String    _pinLabel;
+	qtac::String    _pinTooltip;
+	bool            _initialValue{false};
+	int             _initializationPriority{0};
+	bool            _inverted{false};
+	qtac::String    _pinCommand;
+	CommandGroups   _commandGroup{eUnknownCommandGroup};
+	qtac::Point     _cellLocation{-1, -1};
+	qtac::String    _tabName{"General"};
+};
+
+using Pins = qtac::List<PinEntry>;
+
+#endif // QTAC_PINENTRY_H
diff --git a/source/library/include/qtac/PinID.h b/source/library/include/qtac/PinID.h
new file mode 100644
index 00000000..15daade7
--- /dev/null
+++ b/source/library/include/qtac/PinID.h
@@ -0,0 +1,42 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: msimpson
+
+#ifndef QTAC_PINID_H
+#define QTAC_PINID_H
+
+#include <cstdint>
+
+using PinID = uint64_t;
+
+#endif // QTAC_PINID_H
diff --git a/source/library/include/qtac/PlatformID.h b/source/library/include/qtac/PlatformID.h
new file mode 100644
index 00000000..ec034c15
--- /dev/null
+++ b/source/library/include/qtac/PlatformID.h
@@ -0,0 +1,116 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Michael Simpson
+
+#ifndef QTAC_PLATFORMID_H
+#define QTAC_PLATFORMID_H
+
+#include <qtac/String.h>
+#include <qtac/ByteArray.h>
+#include <qtac/List.h>
+#include <qtac/Map.h>
+#include <qtac/DebugBoardType.h>
+#include <qtac/FTDIPinSet.h>
+
+#include <cstdint>
+#include <memory>
+
+using PlatformID = uint32_t;
+
+const PlatformID MICRO_EPM_BOARD_ID_UNKNOWN{0};
+const PlatformID ALPACA_LITE_ID{13};
+const PlatformID ALPACA_PIC32CX_ID{50};
+const PlatformID ALPACA_BUGHOPPER_ID{80};
+const PlatformID ALPACA_STM32_ID{95};
+
+struct _PlatformEntry
+{
+	_PlatformEntry()
+	{
+		for (int i = 0; i < kMaxPinSetCount; ++i)
+			_pinSets[i] = NoOptions;
+	}
+
+	_PlatformEntry(PlatformID platformID, DebugBoardType boardType,
+	               const qtac::String& description,
+	               const qtac::String& path = qtac::String(),
+	               const qtac::ByteArray& usbDescriptor = qtac::ByteArray())
+		: _platformID(platformID)
+		, _boardtype(boardType)
+		, _description(description)
+		, _path(path)
+		, _usbDescriptor(usbDescriptor)
+	{
+		for (int i = 0; i < kMaxPinSetCount; ++i)
+			_pinSets[i] = NoOptions;
+	}
+
+	PlatformID      _platformID{0};
+	DebugBoardType  _boardtype{eUnknownDebugBoard};
+	qtac::String    _description;
+	qtac::ByteArray _usbDescriptor;
+	qtac::String    _path;
+	FTDIPinSets     _pinSets[kMaxPinSetCount];
+	uint32_t        _revision{0};
+	uint32_t        _firmwareChip{0};
+};
+
+using PlatformEntry    = std::shared_ptr<_PlatformEntry>;
+using PlatformIDList   = qtac::List<PlatformEntry>;
+using PlatformIDs      = qtac::Map<PlatformID, PlatformEntry>;
+
+class PlatformContainer
+{
+public:
+	PlatformContainer() = delete;
+	PlatformContainer(const PlatformContainer&) = delete;
+	~PlatformContainer() = delete;
+
+	static void initialize();
+	static PlatformIDList getEntries();
+	static void addEntry(PlatformEntry platformEntry);
+
+	static qtac::String toString(PlatformID platformID);
+	static PlatformID fromUSBDescriptor(const qtac::ByteArray& usbDescriptor);
+	static PlatformID fromRevision(uint32_t revision, DebugBoardType boardType);
+	static PlatformID fromFirmwareChip(uint32_t firmwareChip, DebugBoardType boardType);
+	static DebugBoardType getDebugBoardType(PlatformID platformID);
+	static PlatformIDList getDebugBoards();
+	static PlatformIDList getDebugBoardsOfType(DebugBoardType debugBoardType);
+
+private:
+	static void initializeDynamic();
+	static PlatformIDs _platformIds;
+};
+
+#endif // QTAC_PLATFORMID_H
diff --git a/source/library/include/qtac/Point.h b/source/library/include/qtac/Point.h
new file mode 100644
index 00000000..2a522ab3
--- /dev/null
+++ b/source/library/include/qtac/Point.h
@@ -0,0 +1,67 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef QTAC_POINT_H
+#define QTAC_POINT_H
+
+namespace qtac {
+
+// Replaces QPoint — integer 2D coordinate pair.
+struct Point
+{
+	int _x{0};
+	int _y{0};
+
+	Point() = default;
+	Point(int x, int y) : _x(x), _y(y) {}
+
+	int x() const { return _x; }
+	int y() const { return _y; }
+
+	void setX(int x) { _x = x; }
+	void setY(int y) { _y = y; }
+
+	bool isNull() const { return _x == 0 && _y == 0; }
+
+	friend bool operator==(const Point& lhs, const Point& rhs)
+	{
+		return lhs._x == rhs._x && lhs._y == rhs._y;
+	}
+	friend bool operator!=(const Point& lhs, const Point& rhs)
+	{
+		return !(lhs == rhs);
+	}
+};
+
+} // namespace qtac
+
+#endif // QTAC_POINT_H
diff --git a/source/library/include/qtac/ProtocolInterface.h b/source/library/include/qtac/ProtocolInterface.h
new file mode 100644
index 00000000..57f049c1
--- /dev/null
+++ b/source/library/include/qtac/ProtocolInterface.h
@@ -0,0 +1,106 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+// Qt-free reimplementation of ProtocolInterface.h from qcommon-console.
+// QRecursiveMutex -> std::recursive_mutex
+// QByteArray      -> qtac::ByteArray
+// QDateTime       -> removed (unused in drive thread logic)
+// Q_DECLARE_INTERFACE / QObject -> removed
+
+#pragma once
+
+#include <qtac/FrameCoder.h>
+#include <qtac/FramePackage.h>
+
+#include <cstdint>
+#include <mutex>
+#include <string>
+
+namespace qtac {
+
+constexpr uint32_t kBadQueueValue = 0xFFFFFFFF;
+
+class ProtocolInterface
+{
+public:
+    ProtocolInterface()          = default;
+    virtual ~ProtocolInterface();
+
+    void setFrameCoder(FrameCoder* frameCoder);
+
+    // Outgoing data
+    void clearPendingFrame();
+    FramePackage& pendingFramePackage();
+
+    void queueCommand(const FramePackage& framePackage);
+    void queueDelay(uint32_t delayInMilliSeconds, ReceiveInterface* receiveInterface = nullptr);
+    void queueLogComment(const qtac::ByteArray& comment);
+    void queueEndTransaction(ReceiveInterface* receiveInterface = nullptr);
+
+    FramePackage getNextFramePackage();
+    uint32_t     queueSize();
+
+    // Incoming data
+    bool handleReceivedData(const qtac::ByteArray& receivedData);
+
+    // Timing hook — subclasses implement idle processing
+    virtual void idle() = 0;
+
+    void setTimeout(uint64_t timeout)
+    {
+        _timeout = (timeout < 750) ? _timeout : 750;
+    }
+
+protected:
+    FrameCoder* _frameCoder{nullptr};
+    uint64_t    _timeout{750};
+
+    static uint32_t _sendID;
+
+    virtual void frameComplete(const qtac::ByteArray& completedFrame) = 0;
+    virtual void badFrame(const qtac::ByteArray& completedFrame)      = 0;
+
+    static void frameCompleteFunc(const qtac::ByteArray& completedFrame, ProtocolInterface* userData);
+    static void badFrameFunc(const qtac::ByteArray& completedFrame,      ProtocolInterface* userData);
+
+    uint32_t getNextSendID();
+
+private:
+    std::recursive_mutex _pendingFramePackageMutex;
+    FramePackage         _pendingFramePackage;   // default-constructed shared_ptr is null
+
+    std::recursive_mutex _outQueueMutex;
+    FramePackageList     _outboundData;
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/ReceiveInterface.h b/source/library/include/qtac/ReceiveInterface.h
new file mode 100644
index 00000000..212c37e6
--- /dev/null
+++ b/source/library/include/qtac/ReceiveInterface.h
@@ -0,0 +1,51 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+// Qt-free reimplementation of ReceiveInterface.h from qcommon-console.
+
+#pragma once
+
+#include <qtac/FramePackage.h>
+
+namespace qtac {
+
+class ReceiveInterface
+{
+public:
+    ReceiveInterface()          = default;
+    virtual ~ReceiveInterface() = default;
+
+    virtual void receive(FramePackage& framePackage) = 0;
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/STM32Device.h b/source/library/include/qtac/STM32Device.h
new file mode 100644
index 00000000..1d546a49
--- /dev/null
+++ b/source/library/include/qtac/STM32Device.h
@@ -0,0 +1,87 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Qt-free port of STM32Device from qcommon-console.
+
+#pragma once
+
+#include <qtac/AlpacaDevice.h>
+#include <qtac/STM32PlatformConfiguration.h>
+
+// -----------------------------------------------------------------------
+// STM32HIDDeviceInfo — enumeration result for a single HID path
+// -----------------------------------------------------------------------
+struct STM32HIDDeviceInfo
+{
+    HashType        _hash{0};
+    qtac::ByteArray _devicePath;
+    qtac::ByteArray _serialNumber;
+};
+
+using STM32HIDDeviceInfoList = qtac::List<STM32HIDDeviceInfo>;
+
+// -----------------------------------------------------------------------
+// STM32Device
+//
+// _AlpacaDevice subclass for the BugHopper V2 (STM32 HID hardware).
+// HID transport is encapsulated here; drive thread calls openTransport(),
+// write(), and close() to access the raw hidapi handle.
+// -----------------------------------------------------------------------
+class STM32Device : public _AlpacaDevice
+{
+public:
+    STM32Device()  = default;
+    ~STM32Device() override;
+
+    // --- Static device registry ---
+    static uint32_t updateAlpacaDevices();
+
+    // --- HID enumeration ---
+    static STM32HIDDeviceInfoList enumerateHIDDevices();
+    static qtac::ByteArray vtpPortName(const qtac::ByteArray& serialNumber);
+
+    // --- _AlpacaDevice ---
+    bool open()          override;
+    void buildMapping()  override;
+    void buildCommandList();
+    void setPinState(PinID pin, bool state) override;
+
+    // --- HID transport (called from TACSTM32DriveThread) ---
+    bool openTransport();
+    bool write(const qtac::ByteArray& report);
+    void close();
+
+private:
+    _STM32PlatformConfiguration* _stm32PlatformConfiguration{nullptr};
+    qtac::ByteArray              _devicePath;
+    void*                        _hidHandle{nullptr};
+};
diff --git a/source/library/include/qtac/STM32PinData.h b/source/library/include/qtac/STM32PinData.h
new file mode 100644
index 00000000..a76cc3c6
--- /dev/null
+++ b/source/library/include/qtac/STM32PinData.h
@@ -0,0 +1,77 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Qt-free port of STM32PinData.h from qcommon-console.
+
+#pragma once
+
+#include <qtac/CommandGroup.h>
+#include <qtac/Map.h>
+#include <qtac/List.h>
+#include <qtac/PinID.h>
+#include <qtac/Point.h>
+#include <qtac/String.h>
+#include <qtac/StringUtilities.h>
+
+const int kMaxSTM32GpioIndex{3};
+
+struct STM32PinData
+{
+    STM32PinData() = default;
+    STM32PinData(const STM32PinData&) = default;
+    STM32PinData(PinID pin)
+    {
+        _hash = STM32PinData::makeSTM32Hash(pin);
+        _pin  = pin;
+    }
+
+    void clear() { *this = STM32PinData(); }
+
+    static HashType makeSTM32Hash(PinID gpioIndex)
+    {
+        return strHash(qtac::String::number(static_cast<unsigned long long>(gpioIndex)));
+    }
+
+    HashType        _hash{0};
+    PinID           _pin{static_cast<PinID>(-1)};
+    bool            _enabled{false};
+    bool            _inverted{false};
+    qtac::String    _pinLabel;
+    qtac::String    _pinTooltip;
+    qtac::String    _pinCommand;
+    CommandGroups   _commandGroup{eUnknownCommandGroup};
+    qtac::Point     _cellLocation{-1, -1};
+    qtac::String    _tabName{"General"};
+};
+
+using STM32PinEntries = qtac::Map<HashType, STM32PinData>;
+using STM32PinList    = qtac::List<STM32PinData>;
diff --git a/source/library/include/qtac/STM32PlatformConfiguration.h b/source/library/include/qtac/STM32PlatformConfiguration.h
new file mode 100644
index 00000000..8e04e196
--- /dev/null
+++ b/source/library/include/qtac/STM32PlatformConfiguration.h
@@ -0,0 +1,89 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Qt-free port of STM32PlatformConfiguration from qcommon-console.
+
+#pragma once
+
+#include <qtac/STM32PinData.h>
+#include <qtac/AlpacaScript.h>
+#include <qtac/PinEntry.h>
+#include <qtac/PlatformID.h>
+
+#include <memory>
+
+// -----------------------------------------------------------------------
+// _STM32PlatformConfiguration
+//
+// Holds the hardcoded pin configuration for the BugHopper V2 (STM32).
+// Config is never read from a tcnf file — all data is hardcoded in
+// initialize().
+// -----------------------------------------------------------------------
+class _STM32PlatformConfiguration
+{
+public:
+    _STM32PlatformConfiguration();
+    _STM32PlatformConfiguration(const _STM32PlatformConfiguration&) = delete;
+    _STM32PlatformConfiguration& operator=(const _STM32PlatformConfiguration&) = delete;
+    ~_STM32PlatformConfiguration() = default;
+
+    void initialize();
+
+    STM32PinData getPinData(PinID pin);
+
+    STM32PinList getAllPins() const;
+    STM32PinList getActivePins() const;
+
+    Pins getPins();
+
+    bool getPinEnableState(PinID pin) const;
+    bool getPinInvertedState(PinID pin) const;
+
+    qtac::String getPinLabel(PinID pin) const;
+    qtac::String getPinTooltip(PinID pin) const;
+    qtac::String getPinCommand(PinID pin) const;
+    CommandGroups getPinGroup(PinID pin) const;
+    qtac::String getTabName(PinID pin) const;
+    qtac::Point  getPinCellLocation(PinID pin) const;
+
+    const qtac::ButtonEntries&   getButtons()   const { return _buttons;   }
+    const qtac::VariableEntries& getVariables() const { return _variables; }
+    const qtac::AlpacaScript&    getScript()    const { return _script;    }
+
+private:
+    STM32PinEntries       _pinEntries;
+    qtac::ButtonEntries   _buttons;
+    qtac::VariableEntries _variables;
+    qtac::AlpacaScript    _script;
+};
+
+using STM32PlatformConfiguration = std::shared_ptr<_STM32PlatformConfiguration>;
diff --git a/source/library/include/qtac/SendInterface.h b/source/library/include/qtac/SendInterface.h
new file mode 100644
index 00000000..d7a78874
--- /dev/null
+++ b/source/library/include/qtac/SendInterface.h
@@ -0,0 +1,60 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+// Qt-free reimplementation of SendInterface.h from qcommon-console.
+
+#pragma once
+
+#include <qtac/ByteArray.h>
+#include <qtac/FramePackage.h>
+#include <qtac/ReceiveInterface.h>
+
+#include <cstdint>
+
+namespace qtac {
+
+class SendInterface
+{
+public:
+    SendInterface()          = default;
+    virtual ~SendInterface() = default;
+
+    virtual bool     ready() = 0;
+    virtual uint32_t send(const qtac::ByteArray& sendMe, const Arguments& arguments, bool command,
+                          ReceiveInterface* receiveInterface, bool store = true) = 0;
+    virtual void     addDelay(uint32_t delayInMilliSeconds, ReceiveInterface* receiveInterface) = 0;
+    virtual void     addLogComment(const qtac::ByteArray& comment) = 0;
+    virtual void     addEndTransaction(ReceiveInterface* receiveInterface) = 0;
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/SerialPort.h b/source/library/include/qtac/SerialPort.h
new file mode 100644
index 00000000..9f44c679
--- /dev/null
+++ b/source/library/include/qtac/SerialPort.h
@@ -0,0 +1,102 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+// Adapted from tac-core/SerialPort.h — uses qtac:: types, removes QCommonConsoleGlobal.h
+
+#ifndef QTAC_SERIALPORT_H
+#define QTAC_SERIALPORT_H
+
+#include <qtac/ByteArray.h>
+#include <qtac/String.h>
+#include <qtac/SerialPortSettings.h>
+
+#include <cstdint>
+#include <functional>
+
+// libserialport forward declaration — avoids pulling the full header into every TU
+struct sp_port;
+
+namespace qtac {
+
+class SerialPortInfo;
+
+class SerialPort
+{
+public:
+	explicit SerialPort(const qtac::String& portName);
+	explicit SerialPort(const SerialPortInfo& portInfo);
+	~SerialPort();
+
+	SerialPort(const SerialPort&) = delete;
+	SerialPort& operator=(const SerialPort&) = delete;
+
+	SerialPortSettings settings() const { return _settings; }
+	void setSettings(const SerialPortSettings& s) { _settings = s; }
+
+	bool open();
+	void close();
+	bool isOpen() const { return _port != nullptr; }
+
+	// Blocking read — waits up to timeout_ms for at least 1 byte, then drains
+	qtac::ByteArray readAll(uint32_t timeout_ms = 10);
+
+	// Blocking write — waits up to timeout_ms for the write to complete
+	int write(const qtac::ByteArray& data, uint32_t timeout_ms = 1000);
+
+	// Returns true if data arrives within timeout_ms (does not consume bytes)
+	bool waitForReadyRead(uint32_t timeout_ms = 10);
+
+	// Flush input and output buffers
+	bool clear();
+
+	qtac::String portName() const { return _portName; }
+	qtac::String errorString() const { return _lastError; }
+
+	// Callbacks (replace Qt signals; set before calling open())
+	std::function<void()>    onPortOpened;
+	std::function<void()>    onPortClosed;
+	std::function<void()>    onReadyRead;
+	std::function<void(int)> onErrorOccurred;
+
+private:
+	sp_port*           _port{nullptr};
+	qtac::String       _portName;
+	SerialPortSettings _settings;
+	qtac::String       _lastError;
+
+	void applySettings();
+};
+
+} // namespace qtac
+
+#endif // QTAC_SERIALPORT_H
diff --git a/source/library/include/qtac/SerialPortInfo.h b/source/library/include/qtac/SerialPortInfo.h
new file mode 100644
index 00000000..e6e6634c
--- /dev/null
+++ b/source/library/include/qtac/SerialPortInfo.h
@@ -0,0 +1,99 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+// Adapted from tac-core/SerialPortInfo.h — uses qtac:: types
+
+#ifndef QTAC_SERIALPORTINFO_H
+#define QTAC_SERIALPORTINFO_H
+
+#include <qtac/String.h>
+
+#include <cstdint>
+#include <vector>
+
+namespace qtac {
+
+class SerialPortInfo;
+using SerialPortInfos = std::vector<SerialPortInfo>;
+
+class SerialPortInfo
+{
+public:
+	SerialPortInfo() = default;
+	explicit SerialPortInfo(const qtac::String& portName) : _portName(portName) {}
+	SerialPortInfo(const SerialPortInfo&) = default;
+	SerialPortInfo& operator=(const SerialPortInfo&) = default;
+
+	bool isNull() const { return _portName.isEmpty(); }
+
+	qtac::String portName()     const { return _portName; }
+	qtac::String serialNumber() const { return _serialNumber; }
+	qtac::String description()  const { return _description; }
+	uint16_t vendorIdentifier()  const { return _vendorId; }
+	uint16_t productIdentifier() const { return _productId; }
+	uint16_t revision()          const { return _revision; }
+
+	void setPortName(const qtac::String& s)     { _portName = s; }
+	void setSerialNumber(const qtac::String& s) { _serialNumber = s; }
+	void setDescription(const qtac::String& s)  { _description = s; }
+	void setVendorIdentifier(uint16_t vid)      { _vendorId = vid; }
+	void setProductIdentifier(uint16_t pid)     { _productId = pid; }
+	void setRevision(uint16_t rev)              { _revision = rev; }
+
+	bool matchesVidPid(uint16_t vid, uint16_t pid) const
+	{
+		return _vendorId == vid && _productId == pid;
+	}
+
+	// Enumerate available serial ports via libserialport.
+	// Platform-specific implementation in SerialPortInfo_win32.cpp / SerialPortInfo_posix.cpp
+	static SerialPortInfos availablePorts();
+
+	bool operator==(const SerialPortInfo& o) const { return _portName == o._portName; }
+	bool operator< (const SerialPortInfo& o) const { return _portName <  o._portName; }
+	bool operator<=(const SerialPortInfo& o) const { return _portName <= o._portName; }
+
+private:
+	qtac::String _portName;
+	qtac::String _serialNumber;
+	qtac::String _description;
+	uint16_t     _vendorId{0};
+	uint16_t     _productId{0};
+	uint16_t     _revision{0};
+};
+
+bool equal(const SerialPortInfos& si1, const SerialPortInfos& si2);
+
+} // namespace qtac
+
+#endif // QTAC_SERIALPORTINFO_H
diff --git a/source/library/include/qtac/SerialPortSettings.h b/source/library/include/qtac/SerialPortSettings.h
new file mode 100644
index 00000000..e4c4531e
--- /dev/null
+++ b/source/library/include/qtac/SerialPortSettings.h
@@ -0,0 +1,55 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef QTAC_SERIALPORTSETTINGS_H
+#define QTAC_SERIALPORTSETTINGS_H
+
+#include <cstdint>
+
+namespace qtac {
+
+struct SerialPortSettings
+{
+	SerialPortSettings() = default;
+	SerialPortSettings(const SerialPortSettings&) = default;
+	SerialPortSettings& operator=(const SerialPortSettings&) = default;
+
+	int32_t  baudRate{115200};
+	int      dataBits{8};
+	int      parity{0};       // 0=none, 1=odd, 2=even
+	int      stopBits{1};
+	int      flowControl{0};  // 0=none
+};
+
+} // namespace qtac
+
+#endif // QTAC_SERIALPORTSETTINGS_H
diff --git a/source/library/include/qtac/Signal.h b/source/library/include/qtac/Signal.h
new file mode 100644
index 00000000..47bfede2
--- /dev/null
+++ b/source/library/include/qtac/Signal.h
@@ -0,0 +1,155 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Qt-free multi-subscriber signal template.
+// Replaces Qt signals/slots for the qtac library.
+//
+// Usage:
+//   qtac::Signal<int, bool> onFoo;
+//
+//   // Connect — returns an ID for later disconnect
+//   int id = onFoo.connect([](int x, bool y) { ... });
+//
+//   // Lifetime-safe connect — auto-disconnects when owner is destroyed
+//   int id = onFoo.connect(weakPtr, [](int x, bool y) { ... });
+//
+//   // Fire all live subscribers
+//   onFoo(42, true);
+//
+//   // Disconnect one subscriber
+//   onFoo.disconnect(id);
+
+#pragma once
+
+#include <algorithm>
+#include <functional>
+#include <memory>
+#include <mutex>
+#include <vector>
+
+namespace qtac {
+
+template<typename... Args>
+class Signal
+{
+public:
+    using Slot = std::function<void(Args...)>;
+
+    // Connect a plain callable. Returns a connection ID for disconnect().
+    int connect(Slot slot)
+    {
+        std::lock_guard<std::mutex> lock(_mutex);
+        const int id = ++_nextID;
+        _slots.push_back({id, false, std::weak_ptr<void>(), std::move(slot)});
+        return id;
+    }
+
+    // Lifetime-safe connect. The slot is silently dropped when the weak_ptr
+    // expires, so no explicit disconnect is needed if the owner is destroyed.
+    template<typename T>
+    int connect(std::weak_ptr<T> weak, Slot slot)
+    {
+        std::lock_guard<std::mutex> lock(_mutex);
+        const int id = ++_nextID;
+        // Wrap the slot: check the weak_ptr before calling.
+        // C++11 compatible: use shared_ptr to capture the moved slot
+        auto slotPtr = std::make_shared<Slot>(std::move(slot));
+        auto guard = [weak, slotPtr](Args... args) {
+            if (!weak.expired())
+                (*slotPtr)(std::forward<Args>(args)...);
+        };
+        _slots.push_back({id, true, weak, std::move(guard)});
+        return id;
+    }
+
+    // Disconnect a previously connected slot by its ID.
+    void disconnect(int id)
+    {
+        std::lock_guard<std::mutex> lock(_mutex);
+        _slots.erase(
+            std::remove_if(_slots.begin(), _slots.end(),
+                           [id](const Entry& e) { return e.id == id; }),
+            _slots.end());
+    }
+
+    // Fire all live subscribers.
+    void operator()(Args... args) const
+    {
+        std::vector<Entry> snapshot;
+        {
+            std::lock_guard<std::mutex> lock(_mutex);
+            snapshot = _slots;
+        }
+
+        for (const Entry& e : snapshot)
+        {
+            // If this was a weak_ptr connection and the owner has gone away,
+            // skip it — the next fire will prune it.
+            if (e.hasWeak && e.weak.expired())
+                continue;
+            e.slot(std::forward<Args>(args)...);
+        }
+
+        // Prune dead weak_ptr connections.
+        {
+            std::lock_guard<std::mutex> lock(_mutex);
+            _slots.erase(
+                std::remove_if(_slots.begin(), _slots.end(),
+                               [](const Entry& e) {
+                                   return e.hasWeak && e.weak.expired();
+                               }),
+                _slots.end());
+        }
+    }
+
+    // Returns true if at least one subscriber is connected.
+    explicit operator bool() const
+    {
+        std::lock_guard<std::mutex> lock(_mutex);
+        return !_slots.empty();
+    }
+
+private:
+    struct Entry
+    {
+        int                    id;
+        bool                   hasWeak;  // true for lifetime-safe connections
+        std::weak_ptr<void>    weak;
+        Slot                   slot;
+    };
+
+    mutable std::mutex   _mutex;
+    mutable std::vector<Entry> _slots;
+    int                  _nextID{0};
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/Size.h b/source/library/include/qtac/Size.h
new file mode 100644
index 00000000..85537bb1
--- /dev/null
+++ b/source/library/include/qtac/Size.h
@@ -0,0 +1,69 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef QTAC_SIZE_H
+#define QTAC_SIZE_H
+
+namespace qtac {
+
+// Replaces QSize — integer width/height pair.
+struct Size
+{
+	int _width{0};
+	int _height{0};
+
+	Size() = default;
+	Size(int width, int height) : _width(width), _height(height) {}
+
+	int width() const { return _width; }
+	int height() const { return _height; }
+
+	void setWidth(int width) { _width = width; }
+	void setHeight(int height) { _height = height; }
+
+	bool isValid() const { return _width >= 0 && _height >= 0; }
+	bool isEmpty() const { return _width <= 0 || _height <= 0; }
+	bool isNull() const { return _width == 0 && _height == 0; }
+
+	friend bool operator==(const Size& lhs, const Size& rhs)
+	{
+		return lhs._width == rhs._width && lhs._height == rhs._height;
+	}
+	friend bool operator!=(const Size& lhs, const Size& rhs)
+	{
+		return !(lhs == rhs);
+	}
+};
+
+} // namespace qtac
+
+#endif // QTAC_SIZE_H
diff --git a/source/library/include/qtac/String.h b/source/library/include/qtac/String.h
new file mode 100644
index 00000000..9e2406bf
--- /dev/null
+++ b/source/library/include/qtac/String.h
@@ -0,0 +1,195 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef QTAC_STRING_H
+#define QTAC_STRING_H
+
+#include <qtac/ByteArray.h>
+#include <string>
+#include <vector>
+#include <cstdint>
+
+#ifdef _WIN32
+#include <string> // for std::wstring
+#endif
+
+namespace qtac {
+
+class StringList;
+
+class String
+{
+public:
+	String();
+	String(const char* str);
+	String(const char* str, int size);
+	String(const std::string& str);
+	String(std::string&& str);
+	String(const ByteArray& ba);
+	String(char ch);
+
+#ifdef _WIN32
+	static String fromStdWString(const std::wstring& wstr);
+	std::wstring toStdWString() const;
+#endif
+
+	// --- Size ---
+	int size() const;
+	int length() const;
+	bool isEmpty() const;
+	bool isNull() const;
+	void clear();
+
+	// --- Data access ---
+	const char* constData() const;
+	const char* data() const;
+	char* data();
+	std::string toStdString() const;
+
+	// --- Conversion to ByteArray ---
+	ByteArray toLatin1() const;
+
+	// --- Numeric conversions ---
+	int toInt(bool* ok = nullptr, int base = 10) const;
+	unsigned int toUInt(bool* ok = nullptr, int base = 10) const;
+	long long toLongLong(bool* ok = nullptr, int base = 10) const;
+	unsigned long long toULongLong(bool* ok = nullptr, int base = 10) const;
+	double toDouble(bool* ok = nullptr) const;
+
+	// --- Case conversion ---
+	String toUpper() const;
+	String toLower() const;
+
+	// --- Trimming ---
+	String trimmed() const;
+	String simplified() const;
+
+	// --- Search ---
+	bool contains(const String& str, bool caseSensitive = true) const;
+	bool contains(char ch, bool caseSensitive = true) const;
+	int indexOf(const String& str, int from = 0) const;
+	int indexOf(char ch, int from = 0) const;
+	bool startsWith(const String& str, bool caseSensitive = true) const;
+	bool startsWith(char ch, bool caseSensitive = true) const;
+	bool endsWith(const String& str, bool caseSensitive = true) const;
+	bool endsWith(char ch, bool caseSensitive = true) const;
+
+	// --- Substrings ---
+	String left(int len) const;
+	String right(int len) const;
+	String mid(int position, int len = -1) const;
+
+	// --- Split ---
+	StringList split(const String& separator) const;
+	StringList split(char separator) const;
+
+	// --- Replace ---
+	String& replace(const String& before, const String& after);
+	String& replace(char before, char after);
+
+	// --- Arg (Qt-style %1..%9 placeholder substitution) ---
+	String arg(const String& a) const;
+	String arg(int a) const;
+	String arg(unsigned int a) const;
+	String arg(long long a) const;
+	String arg(unsigned long long a) const;
+	String arg(double a, int fieldWidth = 0, char format = 'g', int precision = -1) const;
+	String arg(const String& a1, const String& a2) const;
+	String arg(const String& a1, const String& a2, const String& a3) const;
+
+	// --- Compare ---
+	int compare(const String& other, bool caseSensitive = true) const;
+	static int compare(const String& s1, const String& s2, bool caseSensitive = true);
+
+	// --- Static constructors ---
+	static String number(int value, int base = 10);
+	static String number(unsigned int value, int base = 10);
+	static String number(long long value, int base = 10);
+	static String number(unsigned long long value, int base = 10);
+	static String number(double value, char format = 'g', int precision = 6);
+
+	// --- Append ---
+	String& append(const String& str);
+	String& append(char ch);
+
+	// --- Operators ---
+	String& operator+=(const String& other);
+	String& operator+=(const char* str);
+	String& operator+=(char ch);
+
+	friend String operator+(const String& lhs, const String& rhs);
+	friend String operator+(const String& lhs, const char* rhs);
+	friend String operator+(const char* lhs, const String& rhs);
+
+	// --- Comparison operators ---
+	friend bool operator==(const String& lhs, const String& rhs);
+	friend bool operator!=(const String& lhs, const String& rhs);
+	friend bool operator<(const String& lhs, const String& rhs);
+	friend bool operator>(const String& lhs, const String& rhs);
+	friend bool operator<=(const String& lhs, const String& rhs);
+	friend bool operator>=(const String& lhs, const String& rhs);
+	friend bool operator==(const String& lhs, const char* rhs);
+	friend bool operator==(const char* lhs, const String& rhs);
+	friend bool operator!=(const String& lhs, const char* rhs);
+	friend bool operator!=(const char* lhs, const String& rhs);
+
+	// --- Iterators ---
+	using iterator = std::string::iterator;
+	using const_iterator = std::string::const_iterator;
+
+	iterator begin();
+	iterator end();
+	const_iterator begin() const;
+	const_iterator end() const;
+	const_iterator cbegin() const;
+	const_iterator cend() const;
+
+	// --- Hashing support ---
+	struct Hash {
+		size_t operator()(const String& s) const;
+	};
+
+private:
+	std::string _data;
+	bool _isNull = true;
+
+	String argHelper(const String& a, int placeholder) const;
+};
+
+// QStringLiteral equivalent — just constructs a String
+#ifndef QStringLiteral
+#define QStringLiteral(str) qtac::String(str)
+#endif
+
+} // namespace qtac
+
+#endif // QTAC_STRING_H
diff --git a/source/library/include/qtac/StringList.h b/source/library/include/qtac/StringList.h
new file mode 100644
index 00000000..67d6accc
--- /dev/null
+++ b/source/library/include/qtac/StringList.h
@@ -0,0 +1,105 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef QTAC_STRINGLIST_H
+#define QTAC_STRINGLIST_H
+
+#include <qtac/String.h>
+#include <vector>
+#include <initializer_list>
+
+namespace qtac {
+
+class StringList
+{
+public:
+	StringList();
+	StringList(std::initializer_list<String> init);
+	StringList(const std::vector<String>& vec);
+	StringList(std::vector<String>&& vec);
+
+	// --- Size ---
+	int size() const;
+	int count() const;
+	bool isEmpty() const;
+
+	// --- Element access ---
+	const String& at(int index) const;
+	String& operator[](int index);
+	const String& operator[](int index) const;
+	const String& first() const;
+	const String& last() const;
+
+	// --- Modification ---
+	void append(const String& str);
+	void append(const StringList& other);
+	void prepend(const String& str);
+	void insert(int index, const String& str);
+	void removeAt(int index);
+	void clear();
+
+	// --- Search ---
+	bool contains(const String& str) const;
+	int indexOf(const String& str) const;
+
+	// --- Operations ---
+	String join(const String& separator) const;
+	String join(char separator) const;
+	StringList filter(const String& str) const;
+
+	// --- Operators ---
+	StringList& operator<<(const String& str);
+	StringList& operator+=(const String& str);
+	StringList& operator+=(const StringList& other);
+
+	// --- Iterators ---
+	using iterator = std::vector<String>::iterator;
+	using const_iterator = std::vector<String>::const_iterator;
+
+	iterator begin();
+	iterator end();
+	const_iterator begin() const;
+	const_iterator end() const;
+	const_iterator cbegin() const;
+	const_iterator cend() const;
+
+	// --- Conversion ---
+	std::vector<String>& toVector();
+	const std::vector<String>& toVector() const;
+
+private:
+	std::vector<String> _data;
+};
+
+} // namespace qtac
+
+#endif // QTAC_STRINGLIST_H
diff --git a/source/library/include/qtac/StringUtilities.h b/source/library/include/qtac/StringUtilities.h
new file mode 100644
index 00000000..0ad8bcd8
--- /dev/null
+++ b/source/library/include/qtac/StringUtilities.h
@@ -0,0 +1,107 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Michael Simpson
+
+#ifndef QTAC_STRINGUTILITIES_H
+#define QTAC_STRINGUTILITIES_H
+
+#include <qtac/String.h>
+#include <qtac/ByteArray.h>
+#include <qtac/Point.h>
+
+#include <cstdint>
+
+using HashType = uint64_t;
+
+namespace qtac {
+
+qtac::String toCamelCase(const qtac::String& camelCaseMe, char splitChar = '_', bool skipEmpty = true);
+bool isAlphaNumeric(const qtac::ByteArray& testMe);
+qtac::String fromBool(bool value);
+
+qtac::String fromPoint(const qtac::Point& value);
+qtac::Point  toPoint(const qtac::String& value);
+
+HashType strHash(const qtac::String& hashMe);
+HashType arrayHash(const qtac::ByteArray& hashMe);
+
+// Compile-time version of arrayHash for use in constexpr constants.
+// Implements the identical polynomial hash: p=257, m=1e9+9, offset c-'a'+1.
+// Wrapping of upper-case chars is reproduced via unsigned 64-bit arithmetic
+// (c as unsigned + (2^64 - 96)) which equals static_cast<uint64_t>(c-'a'+1)
+// for any char value, including negative ones on signed-char platforms.
+
+// Constants for the hash computation
+constexpr uint64_t kHashP = 257;
+constexpr uint64_t kHashM = 1000000009ULL;
+constexpr uint64_t kHashOffset = static_cast<uint64_t>(-static_cast<int>('a') + 1);
+
+// Helper function for C++11 constexpr compatibility (recursive implementation)
+constexpr HashType computeHashStrImpl(const char* str, std::size_t len, std::size_t i,
+                                      uint64_t result, uint64_t p_pow) noexcept
+{
+    return (i >= len) ? result :
+        computeHashStrImpl(str, len, i + 1,
+            (result + ((static_cast<uint64_t>(static_cast<unsigned char>(str[i])) + kHashOffset) * p_pow)) % kHashM,
+            (p_pow * kHashP) % kHashM);
+}
+
+constexpr HashType computeHashStr(const char* str, std::size_t len) noexcept
+{
+    return computeHashStrImpl(str, len, 0, 0, 1);
+}
+
+// Helper to compute string length at compile time
+constexpr std::size_t constexprStrLen(const char* str, std::size_t i = 0) noexcept
+{
+    return str[i] ? constexprStrLen(str, i + 1) : i;
+}
+
+constexpr HashType computeHashStr(const char* str) noexcept
+{
+    return computeHashStr(str, constexprStrLen(str));
+}
+
+} // namespace qtac
+
+// Bring into global namespace for unqualified use in migrated code
+using qtac::strHash;
+using qtac::arrayHash;
+using qtac::fromBool;
+using qtac::fromPoint;
+using qtac::toPoint;
+using qtac::toCamelCase;
+using qtac::isAlphaNumeric;
+using qtac::computeHashStr;
+
+#endif // QTAC_STRINGUTILITIES_H
diff --git a/source/library/include/qtac/TACCommand.h b/source/library/include/qtac/TACCommand.h
new file mode 100644
index 00000000..7206b2cf
--- /dev/null
+++ b/source/library/include/qtac/TACCommand.h
@@ -0,0 +1,96 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Michael Simpson
+
+#ifndef QTAC_TACCOMMAND_H
+#define QTAC_TACCOMMAND_H
+
+#include <qtac/String.h>
+#include <qtac/ByteArray.h>
+#include <qtac/List.h>
+#include <qtac/Map.h>
+#include <qtac/PinID.h>
+
+class TACCommand;
+
+using TACCommands   = qtac::List<TACCommand>;
+using TACCommandMap = qtac::Map<qtac::String, TACCommand>;
+
+class TACCommand
+{
+public:
+	TACCommand() = default;
+	TACCommand(const TACCommand&) = default;
+	TACCommand(TACCommand&&) = default;
+	~TACCommand() = default;
+
+	TACCommand& operator=(const TACCommand&) = default;
+	TACCommand& operator=(TACCommand&&) = default;
+
+	qtac::String command() const { return _command; }
+
+	static bool contains(const qtac::String& command, const TACCommands& tacCommands)
+	{
+		for (const auto& tc : tacCommands)
+			if (tc._command == command)
+				return true;
+		return false;
+	}
+
+	static TACCommand find(const qtac::String& command, const TACCommands& tacCommands)
+	{
+		for (const auto& tc : tacCommands)
+			if (tc._command == command)
+				return tc;
+		return TACCommand{};
+	}
+
+	static TACCommand find(PinID pin, const TACCommands& tacCommands)
+	{
+		for (const auto& tc : tacCommands)
+			if (tc._pin == pin)
+				return tc;
+		return TACCommand{};
+	}
+
+	PinID           _pin{static_cast<PinID>(-1)};
+	qtac::String    _command;
+	qtac::String    _helpText;
+	bool            _currentState{false};
+	bool            _isInverted{false};
+	qtac::ByteArray _tabName;
+	qtac::ByteArray _groupName;
+	qtac::ByteArray _cellLocation;
+};
+
+#endif // QTAC_TACCOMMAND_H
diff --git a/source/library/include/qtac/TACCommandHashes.h b/source/library/include/qtac/TACCommandHashes.h
new file mode 100644
index 00000000..51edea74
--- /dev/null
+++ b/source/library/include/qtac/TACCommandHashes.h
@@ -0,0 +1,57 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+// Qt-free reimplementation of TACCommandHashes.h from qcommon-console.
+
+#pragma once
+
+#include <qtac/StringUtilities.h>
+
+// Command hash constants — generated at compile time by computeHashStr().
+// The strings here are the canonical command names passed to encode().
+constexpr HashType kVersionCommandHash              {computeHashStr("Version")};
+constexpr HashType kGetNameCommandHash              {computeHashStr("Get Name")};
+constexpr HashType kSetNameCommandHash              {computeHashStr("Set Name")};
+constexpr HashType kGetUUIDCommandHash              {computeHashStr("Get UUID")};
+constexpr HashType kGetPlatformIDCommandHash        {computeHashStr("Get Platform ID")};
+constexpr HashType kGetResetCountCommandHash        {computeHashStr("Get Reset Count")};
+constexpr HashType kClearResetCountCommandHash      {computeHashStr("Clear Reset Count")};
+constexpr HashType kI2CReadRegisterCommandHash      {computeHashStr("I2C Read Register")};
+constexpr HashType kI2CReadRegisterValueCommandHash {computeHashStr("I2C Read Register Value")};
+constexpr HashType kI2CWriteRegisterCommandHash     {computeHashStr("I2C Write Register")};
+constexpr HashType kSetPinCommandHash               {computeHashStr("SetPin")};
+
+// PIC32CX hashes
+constexpr HashType kPIC32CXClearBufferHash          {computeHashStr("echo 1")};
+constexpr HashType kPIC32CXVersionCommandHash       {computeHashStr("*IDN?")};
+constexpr HashType kPIC32CXSetPinCommandHash        {computeHashStr("CONF:DIG:ON")};
diff --git a/source/library/include/qtac/TACDriveThread.h b/source/library/include/qtac/TACDriveThread.h
new file mode 100644
index 00000000..f2642db8
--- /dev/null
+++ b/source/library/include/qtac/TACDriveThread.h
@@ -0,0 +1,263 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+// Qt-free reimplementation of TACDriveThread from qcommon-console.
+// Qt signals replaced with std::function<> callbacks.
+
+#pragma once
+
+#include <qtac/DriveThread.h>
+#include <qtac/ReceiveInterface.h>
+#include <qtac/ByteArray.h>
+#include <qtac/String.h>
+#include <qtac/DebugBoardType.h>
+#include <qtac/PlatformID.h>
+#include <qtac/StringUtilities.h>
+#include <qtac/Variant.h>
+#include <qtac/FTDIPinSet.h>
+
+#include <qtac/Signal.h>
+
+#include <condition_variable>
+#include <cstdint>
+#include <memory>
+#include <mutex>
+#include <vector>
+
+namespace qtac {
+
+// -----------------------------------------------------------------------
+// _CommandEntry — Qt-free equivalent of the AlpacaScript _CommandEntry
+// struct from qcommon-console.  Used by sendCommandSequence().
+// -----------------------------------------------------------------------
+struct _CommandEntry
+{
+    enum CommandAction
+    {
+        eNotSet,
+        eSetPin,
+        eLog,
+        eDelay,
+        eBaseCommand
+    };
+
+    CommandAction _commandAction{eNotSet};
+    uint64_t      _pinID{static_cast<uint64_t>(-1)};
+    qtac::ByteArray _action;
+    qtac::Variant _arguement;    // original spelling preserved
+};
+
+using CommandEntry   = std::shared_ptr<_CommandEntry>;
+using CommandEntries = std::vector<CommandEntry>;
+
+// Notification level — mirrors NotificationLevel enum from qcommon-console.
+enum class NotificationLevel
+{
+    Debug = 0,
+    Info,
+    Warn,
+    Error
+};
+
+// -----------------------------------------------------------------------
+// TACDriveThread
+//
+// Abstract mid-level drive thread.  Concrete hardware variants
+// (TACLiteDriveThread, TACPSOCDriveThread, TACPIC32CXDriveThread) extend
+// this class.
+//
+// Qt signals have been replaced with std::function<> callbacks.  The host
+// application assigns callbacks immediately after construction (or after
+// openPort()) before calling start().
+// -----------------------------------------------------------------------
+class TACDriveThread :
+    public DriveThread,
+    public ReceiveInterface
+{
+public:
+    explicit TACDriveThread(HashType hash);
+    virtual ~TACDriveThread();
+
+    // Factory — creates the correct concrete subclass for the given port.
+    static TACDriveThread* openPort(const qtac::ByteArray& portName);
+
+    HashType hash();
+
+    // Completion-wait helpers.  The caller sets the flag before queuing a
+    // command, then calls waitForCompletion() which blocks (with a timeout)
+    // until the drive thread calls clearWaitForCompletion().
+    void waitForCompletion();
+    void setWaitForCompletion();
+    void clearWaitForCompletion();
+    bool waitForCompletionStatus() const;
+
+    // Decode a freeform command string into a canonical command + argument list.
+    qtac::ByteArray decodeCommand(const qtac::ByteArray& command, Arguments& args);
+
+    // Return true (and fill framePackage->responses) if this request can be
+    // satisfied from cached local state without a round-trip to hardware.
+    bool checkLocalStore(FramePackage& framePackage);
+
+    // --- Pure virtual interface for concrete hardware threads ---
+
+    virtual void sendCommand(const qtac::ByteArray& command, bool console = false,
+                             ReceiveInterface* receiveInterface = nullptr, bool shouldStore = true) = 0;
+
+    virtual void setPinState(uint64_t pin, bool state) = 0;
+    virtual void setAddressPinState(const qtac::ByteArray& i2cAddress, uint16_t pin, bool state) {}
+    virtual void setPinSets(FTDIPinSets /*pinsets*/) {} // no-op for non-FTDI threads
+    virtual void sendCommandSequence(CommandEntries& commandEntries)    = 0;
+
+    virtual int  getResetCount()   = 0;
+    virtual void clearResetCount() = 0;
+
+    virtual void i2CReadRegister(uint32_t addr, uint32_t reg)                   = 0;
+    virtual void i2CWriteRegister(uint32_t addr, uint32_t reg, uint32_t data)   = 0;
+
+    // --- Hardware-identity properties ---
+    DebugBoardType debugBoardType();
+    qtac::String   debugBoardTypeString();
+
+    PlatformID   platformID();
+    virtual qtac::String hardwareVersionString();
+
+    // --- Firmware properties ---
+    bool         oldFirmware();
+    qtac::String firmwareVersion();
+    unsigned int majorVersion();
+    unsigned int chipVersion();
+    unsigned int minorVersion();
+    unsigned int revisionVersion();
+
+    // --- Name / port ---
+    qtac::ByteArray name() const;
+    virtual void setName(const qtac::ByteArray& newName);
+
+    qtac::ByteArray portName() const;
+    void setPortName(const qtac::ByteArray& portName);
+
+    // --- Optional descriptive properties ---
+    qtac::String description() const;
+    void setDescription(const qtac::String& description);
+
+    qtac::String serialNumber() const;
+    void setSerialNumber(const qtac::String& serialNumber);
+
+    qtac::String uuid();
+
+    qtac::ByteArray macAddress();
+
+    // --- SendInterface ---
+    virtual uint32_t send(const qtac::ByteArray& sendMe, const Arguments& arguments,
+                          bool command, ReceiveInterface* receiveInterface,
+                          bool store = true) = 0;
+    virtual bool ready() = 0;
+
+    // --- ReceiveInterface ---
+    virtual void receive(FramePackage& framePackage) = 0;
+
+    void setThreadDelay(unsigned int delay);
+
+    // -----------------------------------------------------------------------
+    // Signals (replace Qt signals)
+    //
+    // Connect subscribers before calling start().
+    // Each connect() returns an ID; pass it to disconnect() to unsubscribe.
+    // -----------------------------------------------------------------------
+    qtac::Signal<uint64_t, bool>                        onPinStateChanged;
+    qtac::Signal<>                                      onTransactionEnded;
+    qtac::Signal<uint8_t, NotificationLevel>            onProgress;
+
+    qtac::Signal<>                                      onDeviceOpen;
+    qtac::Signal<const qtac::ByteArray&>                onErrorOnOpen;
+
+    qtac::Signal<const qtac::String&>                   onDeviceStatusChange;
+
+    qtac::Signal<const qtac::String&>                   onHardwareTypeUpdate;
+    qtac::Signal<const qtac::String&>                   onHardwareVersionUpdate;
+    qtac::Signal<const qtac::String&>                   onFirmwareVersionUpdate;
+    qtac::Signal<const qtac::String&>                   onNameUpdate;
+    qtac::Signal<const qtac::String&>                   onUuidUpdate;
+    qtac::Signal<const qtac::String&>                   onSerialNumUpdate;
+    qtac::Signal<int>                                   onPlatformIDUpdate;
+
+    qtac::Signal<>                                      onDeviceConnected;
+    qtac::Signal<>                                      onDeviceDisconnected;
+
+    qtac::Signal<>                                      onResetCountCleared;
+    qtac::Signal<uint32_t>                              onResetCountUpdate;
+
+    qtac::Signal<const qtac::ByteArray&, bool>          onI2CReadResult;
+    qtac::Signal<const qtac::ByteArray&>                onI2CWriteResult;
+
+    // Optional log sink — if set, log() and error messages route here instead
+    // of to a global AppCore.
+    qtac::Signal<const qtac::ByteArray&>                onLogLine;
+
+protected:
+    bool            _waitForCompletion{false};
+    std::mutex              _completionMutex;
+    std::condition_variable _completionCv;
+
+    HashType        _hash{0};
+    bool            _oldFirmware{false};
+    qtac::ByteArray _portName;
+    DebugBoardType  _hardwareType{eUnknownDebugBoard};
+    PlatformID      _platformID{MICRO_EPM_BOARD_ID_UNKNOWN};
+    qtac::ByteArray _versionString;
+    qtac::ByteArray _firmwareString;
+    unsigned int    _firmwareMajor{0};
+    unsigned int    _firmwareChip{0};
+    unsigned int    _firmwareMinor{0};
+    unsigned int    _firmwareRevision{0};
+    qtac::ByteArray _name;
+    qtac::ByteArray _macAddress;
+    qtac::String    _description;
+    qtac::String    _uuid;
+    qtac::String    _serialNumber;
+    qtac::String    _mcnNumber;
+    qtac::String    _helpText;
+
+    int          _resetCount{0};
+    unsigned int _delay{0};
+
+    virtual void setupConnected() = 0;
+    virtual void setupDiscovery() = 0;
+
+    // Logging helpers.
+    void log(FramePackage& framePackage);
+    void timeStampLogMessage(const qtac::String& timeStampMe);
+    void writeLogLine(const qtac::ByteArray& line);
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/TACLiteCoder.h b/source/library/include/qtac/TACLiteCoder.h
new file mode 100644
index 00000000..308460f3
--- /dev/null
+++ b/source/library/include/qtac/TACLiteCoder.h
@@ -0,0 +1,67 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Michael Simpson
+// Qt-free reimplementation of TACLiteCoder from qcommon-console.
+
+#pragma once
+
+#include <qtac/FrameCoder.h>
+
+namespace qtac {
+
+// -----------------------------------------------------------------------
+// TACLiteCoder
+//
+// Encode/decode for the FTDI TAC Lite hardware.
+// decode() is a no-op (the FTDI chipset is write-only for pin control).
+// encode() translates a command + arguments into the pin number that the
+// FTDIChipset::write() call expects.
+// -----------------------------------------------------------------------
+class TACLiteCoder : public FrameCoder
+{
+public:
+    TACLiteCoder();
+    ~TACLiteCoder() override;
+
+    TACLiteCoder(const TACLiteCoder&)            = delete;
+    TACLiteCoder& operator=(const TACLiteCoder&) = delete;
+
+    void        reset()                                                  override;
+    void            decode(const qtac::ByteArray& decodeMe)                                    override;
+    qtac::ByteArray encode(const qtac::ByteArray& encodeMe, const Arguments& arguments) override;
+
+private:
+    qtac::ByteArray _receiveBuffer;
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/TACLiteCommand.h b/source/library/include/qtac/TACLiteCommand.h
new file mode 100644
index 00000000..92025553
--- /dev/null
+++ b/source/library/include/qtac/TACLiteCommand.h
@@ -0,0 +1,111 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Michael Simpson
+// Qt-free reimplementation of TACLiteCommand from qcommon-console.
+
+#pragma once
+
+#include <qtac/ByteArray.h>
+#include <qtac/FramePackage.h>
+#include <qtac/SendInterface.h>
+
+#include <cstdint>
+
+namespace qtac {
+
+class ReceiveInterface;
+
+// -----------------------------------------------------------------------
+// TACLiteCommand
+//
+// RAII command builder for the FTDI (TAC Lite) drive thread.
+// On destruction the destructor automatically enqueues an EndTransaction.
+// -----------------------------------------------------------------------
+class TACLiteCommand
+{
+public:
+    TACLiteCommand(SendInterface* sender, ReceiveInterface* receiver);
+    ~TACLiteCommand();
+
+    TACLiteCommand(const TACLiteCommand&)            = delete;
+    TACLiteCommand& operator=(const TACLiteCommand&) = delete;
+
+    void version();
+    void name();
+    void uuid();
+
+    void setPinState(uint16_t pin, bool state);
+
+    void battery(bool state);
+    void usb0(bool state);
+    void usb1(bool state);
+
+    void externalPowerControl(bool state);
+
+    void powerKey(bool state);
+    void volumeUp(bool state);
+    void volumeDown(bool state);
+
+    void setName(const qtac::ByteArray& newName);
+
+    void getResetCount();
+    void clearResetCount();
+
+    void i2CReadRegister(uint32_t addr, uint32_t reg);
+    void i2CWriteRegister(uint32_t addr, uint32_t reg, uint32_t data);
+
+    void send(const qtac::ByteArray& command, const Arguments& arguments,
+              bool console, bool store = true);
+    void addDelay(uint32_t delayInMilliSeconds);
+    void addLogComment(const qtac::ByteArray& comment);
+    void addEndTransaction();
+
+    // Switches
+    void disconnectUIM1Button(bool state);
+    void disconnectUIM2Button(bool state);
+    void forcePSHoldHigh(bool state);
+    void disconnectSDCard(bool state);
+    void primaryEDL(bool state);
+    void secondaryEDL(bool state);
+    void secondaryPMResinN(bool state);
+    void eud(bool state);
+    void platformID();
+    void headsetDisconnect(bool state);
+
+private:
+    ReceiveInterface* _receiver;
+    SendInterface*    _sender;
+    bool              _ready;
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/TACLiteDriveThread.h b/source/library/include/qtac/TACLiteDriveThread.h
new file mode 100644
index 00000000..c46f4104
--- /dev/null
+++ b/source/library/include/qtac/TACLiteDriveThread.h
@@ -0,0 +1,126 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Michael Simpson
+// Qt-free reimplementation of TACLiteDriveThread from qcommon-console.
+
+#pragma once
+
+#include <qtac/TACDriveThread.h>
+#include <qtac/TACLiteProtocol.h>
+#include <qtac/FTDIChipset.h>
+#include <qtac/FTDIPinSet.h>
+
+namespace qtac {
+
+// -----------------------------------------------------------------------
+// TACLiteDriveThread
+//
+// Concrete drive thread for FTDI-based TAC Lite hardware.
+// run() loop:
+//   1. Opens the FTDI device.
+//   2. Fires initial status callbacks (hardware/firmware version, name, etc.)
+//   3. Dequeues FramePackages and services them via FTDIChipset::write().
+// -----------------------------------------------------------------------
+class TACLiteDriveThread : public TACDriveThread
+{
+public:
+    explicit TACLiteDriveThread(HashType hash);
+    ~TACLiteDriveThread() override;
+
+    TACLiteDriveThread(const TACLiteDriveThread&)            = delete;
+    TACLiteDriveThread& operator=(const TACLiteDriveThread&) = delete;
+
+    void setPinSets(FTDIPinSets pinsets) override { _pinsets = pinsets; }
+
+    void setInvertMask(uint8_t mask)
+    {
+        if (_ftdiChipset)
+            _ftdiChipset->setInvertMask(mask);
+    }
+
+    // DriveThread
+    void run() override;
+
+    // TACDriveThread interface
+    void sendCommand(const qtac::ByteArray& command, bool console = false,
+                     ReceiveInterface* receiveInterface = nullptr,
+                     bool shouldStore = true)              override;
+
+    void externalPowerControl(bool state);
+
+    void setPinState(uint64_t pin, bool state)             override;
+    void sendCommandSequence(CommandEntries& commandEntries) override;
+
+    int  getResetCount()  override;
+    void clearResetCount() override;
+
+    void i2CReadRegister(uint32_t addr, uint32_t reg)                  override;
+    void i2CWriteRegister(uint32_t addr, uint32_t reg, uint32_t data)  override;
+
+    // Override setName — FTDI device ignores rename requests.
+    void setName(const qtac::ByteArray& newName) override;
+
+    // SendInterface
+    uint32_t send(const qtac::ByteArray& sendMe, const Arguments& arguments,
+                  bool console, ReceiveInterface* receiveInterface,
+                  bool store = true) override;
+    bool ready() override;
+
+    // ReceiveInterface
+    void receive(FramePackage& framePackage) override;
+
+    qtac::String portDescription();
+
+protected:
+    bool openFTDIDevice();
+
+    void setupConnected() override;
+    void setupDiscovery() override;
+
+private:
+    TACLiteProtocol _tacProtocol;
+    bool            _connected{false};
+    FTDIPinSets     _pinsets{eA | eB | eC | eD};  // try all; empty segments are skipped
+    FTDIChipset     _ftdiChipset;   // std::shared_ptr<_FTDIChipset>
+
+    void handleIdle(FramePackage& framePackage);
+    void handlePlatformID(FramePackage& framePackage);
+    void handleSetName(FramePackage& framePackage);
+    void handleSetPin(FramePackage& framePackage);
+    void handleUUIDResponse(FramePackage& framePackage);
+    void handleVersionResponse(FramePackage& framePackage);
+
+    bool getElectricalPinValue(HashType commandHash, const Arguments& arguments);
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/TACLiteProtocol.h b/source/library/include/qtac/TACLiteProtocol.h
new file mode 100644
index 00000000..06bb5ee0
--- /dev/null
+++ b/source/library/include/qtac/TACLiteProtocol.h
@@ -0,0 +1,93 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Michael Simpson
+// Qt-free reimplementation of TACLiteProtocol from qcommon-console.
+// Removes QObject / Q_INTERFACES / Q_OBJECT; no Qt event loop.
+
+#pragma once
+
+#include <qtac/ProtocolInterface.h>
+#include <qtac/ReceiveInterface.h>
+#include <qtac/SendInterface.h>
+
+#include <cstdint>
+#include <string>
+
+namespace qtac {
+
+class TACDriveThread;
+
+// -----------------------------------------------------------------------
+// TACLiteProtocol
+//
+// Thin protocol layer for the FTDI TAC Lite drive thread.
+// Owns a TACLiteCoder and forwards received frames to TACDriveThread.
+// -----------------------------------------------------------------------
+class TACLiteProtocol :
+    public ProtocolInterface,
+    public ReceiveInterface
+{
+public:
+    TACLiteProtocol();
+    ~TACLiteProtocol() override;
+
+    TACLiteProtocol(const TACLiteProtocol&)            = delete;
+    TACLiteProtocol& operator=(const TACLiteProtocol&) = delete;
+
+    void setTACDriveTrain(TACDriveThread* tacDriveTrain);
+
+    uint32_t sendCommand(const qtac::ByteArray& command, const Arguments& arguments,
+                         bool console = false,
+                         ReceiveInterface* receiveInterface = nullptr,
+                         bool shouldStore = true);
+
+    void endTransaction(ReceiveInterface* receiveInterface = nullptr);
+    void sendHelpCommand();
+
+    // ReceiveInterface
+    void receive(FramePackage& framePackage) override;
+
+    // ProtocolInterface
+    void idle() override;
+
+protected:
+    void frameComplete(const qtac::ByteArray& completedFrame) override;
+    void badFrame(const qtac::ByteArray& completedFrame)      override;
+
+private:
+    TACDriveThread* _tacDriveTrain{nullptr};
+    uint64_t        _tickCount{0};
+    qtac::ByteArray _currentCommand;
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/TACPIC32CXCoder.h b/source/library/include/qtac/TACPIC32CXCoder.h
new file mode 100644
index 00000000..01a9625e
--- /dev/null
+++ b/source/library/include/qtac/TACPIC32CXCoder.h
@@ -0,0 +1,63 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Biswajit Roy
+// Qt-free reimplementation of TACPIC32CXCoder from qcommon-console.
+
+#pragma once
+
+#include <qtac/FrameCoder.h>
+
+namespace qtac {
+
+// Threshold above which the buffer is considered a complete response.
+static constexpr size_t kValidPIC32CXResponseSize = 40;
+
+class TACPIC32CXCoder : public FrameCoder
+{
+public:
+    TACPIC32CXCoder();
+    ~TACPIC32CXCoder() override;
+
+    TACPIC32CXCoder(const TACPIC32CXCoder&)            = delete;
+    TACPIC32CXCoder& operator=(const TACPIC32CXCoder&) = delete;
+
+    void            reset()                                                   override;
+    void            decode(const qtac::ByteArray& decodeMe)                   override;
+    qtac::ByteArray encode(const qtac::ByteArray& encodeMe,
+                           const Arguments&       arguments)                  override;
+
+private:
+    qtac::ByteArray _receiveBuffer;
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/TACPIC32CXCommand.h b/source/library/include/qtac/TACPIC32CXCommand.h
new file mode 100644
index 00000000..47728f41
--- /dev/null
+++ b/source/library/include/qtac/TACPIC32CXCommand.h
@@ -0,0 +1,80 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Biswajit Roy
+// Qt-free reimplementation of TACPIC32CXCommand from qcommon-console.
+
+#pragma once
+
+#include <qtac/ByteArray.h>
+#include <qtac/FramePackage.h>
+
+#include <cstdint>
+
+namespace qtac {
+
+class ReceiveInterface;
+class SendInterface;
+
+class TACPIC32CXCommand
+{
+public:
+    TACPIC32CXCommand(SendInterface* sender, ReceiveInterface* receiver);
+    ~TACPIC32CXCommand();
+
+    TACPIC32CXCommand(const TACPIC32CXCommand&)            = delete;
+    TACPIC32CXCommand& operator=(const TACPIC32CXCommand&) = delete;
+
+    void version();
+    void name();
+    void uuid();
+
+    void setPinState(uint16_t pin, bool state);
+
+    void setName(const qtac::ByteArray& newName);
+
+    void platformID();
+    void clearBuffer();
+
+    void send(const qtac::ByteArray& command, const Arguments& arguments,
+              bool console, bool store = true);
+    void addDelay(uint32_t delayInMilliSeconds);
+    void addLogComment(const qtac::ByteArray& comment);
+    void addEndTransaction();
+
+private:
+    ReceiveInterface* _receiver;
+    SendInterface*    _sender;
+    bool              _ready;
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/TACPIC32CXDriveThread.h b/source/library/include/qtac/TACPIC32CXDriveThread.h
new file mode 100644
index 00000000..d8d3084c
--- /dev/null
+++ b/source/library/include/qtac/TACPIC32CXDriveThread.h
@@ -0,0 +1,112 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Biswajit Roy
+// Qt-free reimplementation of TACPIC32CXDriveThread from qcommon-console.
+
+#pragma once
+
+#include <qtac/TACDriveThread.h>
+#include <qtac/TACPIC32CXProtocol.h>
+#include <qtac/SerialPort.h>
+#include <qtac/SerialPortInfo.h>
+
+#include <memory>
+
+namespace qtac {
+
+class TACPIC32CXDriveThread : public TACDriveThread
+{
+public:
+    explicit TACPIC32CXDriveThread(HashType hash);
+    ~TACPIC32CXDriveThread() override;
+
+    TACPIC32CXDriveThread(const TACPIC32CXDriveThread&)            = delete;
+    TACPIC32CXDriveThread& operator=(const TACPIC32CXDriveThread&) = delete;
+
+    qtac::String locked() { return {}; }
+
+    // --- DriveThread ---
+    void run() override;
+
+    // --- TACDriveThread interface ---
+    void sendCommand(const qtac::ByteArray& command,
+                     bool              console          = false,
+                     ReceiveInterface* receiveInterface = nullptr,
+                     bool              shouldStore      = true) override;
+
+    void endTransaction(ReceiveInterface* receiveInterface = nullptr);
+
+    void setPinState(uint64_t pin, bool state) override;
+    void sendCommandSequence(CommandEntries& commandEntries) override;
+
+    // PIC32CX does not use reset count.
+    int  getResetCount()  override { return 0; }
+    void clearResetCount() override {}
+
+    // PIC32CX does not use I2C.
+    void i2CReadRegister(uint32_t /*addr*/, uint32_t /*reg*/)                   override {}
+    void i2CWriteRegister(uint32_t /*addr*/, uint32_t /*reg*/, uint32_t /*data*/) override {}
+
+    void setName(const qtac::ByteArray& newName) override;
+
+    // --- SendInterface ---
+    uint32_t send(const qtac::ByteArray& sendMe, const Arguments& arguments,
+                  bool console, ReceiveInterface* receiveInterface,
+                  bool store = true) override;
+    bool ready() override;
+
+    // --- ReceiveInterface ---
+    void receive(FramePackage& framePackage) override;
+
+protected:
+    bool openSerialDevice();
+
+    void setupConnected() override;
+    void setupDiscovery() override;
+
+private:
+    TACPIC32CXProtocol              _tacProtocol;
+    bool                            _connected{false};
+    SerialPortInfo                  _tacPortInfo;
+    std::unique_ptr<SerialPort>     _serialPort;
+    bool                            _readyRead{false};
+    qtac::ByteArray                 _serialBuffer;
+
+    bool readSerialData();
+
+    void handleSetPin(FramePackage& framePackage);
+    void handleVersionResponse(FramePackage& framePackage);
+    void handleClearBuffer(FramePackage& framePackage);
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/TACPIC32CXProtocol.h b/source/library/include/qtac/TACPIC32CXProtocol.h
new file mode 100644
index 00000000..92fb9f62
--- /dev/null
+++ b/source/library/include/qtac/TACPIC32CXProtocol.h
@@ -0,0 +1,90 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Biswajit Roy
+// Qt-free reimplementation of TACPIC32CXProtocol from qcommon-console.
+
+#pragma once
+
+#include <qtac/ProtocolInterface.h>
+#include <qtac/ReceiveInterface.h>
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+namespace qtac {
+
+class TACDriveThread;
+
+class TACPIC32CXProtocol :
+    public ProtocolInterface,
+    public ReceiveInterface
+{
+public:
+    TACPIC32CXProtocol();
+    ~TACPIC32CXProtocol() override;
+
+    TACPIC32CXProtocol(const TACPIC32CXProtocol&)            = delete;
+    TACPIC32CXProtocol& operator=(const TACPIC32CXProtocol&) = delete;
+
+    void setTACDriveTrain(TACDriveThread* tacDriveTrain);
+
+    uint32_t sendCommand(const qtac::ByteArray& command,
+                         const Arguments&   arguments,
+                         bool               console          = false,
+                         ReceiveInterface*  receiveInterface = nullptr,
+                         bool               shouldStore      = true);
+
+    void endTransaction(ReceiveInterface* receiveInterface = nullptr);
+    void sendHelpCommand();
+
+    // ReceiveInterface
+    void receive(FramePackage& framePackage) override;
+
+    // ProtocolInterface timing hook
+    void idle() override;
+
+protected:
+    void frameComplete(const qtac::ByteArray& completedFrame) override;
+    void badFrame(const qtac::ByteArray& completedFrame)      override;
+
+private:
+    TACDriveThread* _tacDriveTrain{nullptr};
+    uint64_t        _tickCount{0};
+    qtac::ByteArray _currentCommand;
+
+    // Accumulated response lines for the current pending frame.
+    std::vector<qtac::ByteArray> _responseLines;
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/TACPSOCCoder.h b/source/library/include/qtac/TACPSOCCoder.h
new file mode 100644
index 00000000..6cb21be7
--- /dev/null
+++ b/source/library/include/qtac/TACPSOCCoder.h
@@ -0,0 +1,60 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Michael Simpson
+// Qt-free reimplementation of TACPSOCCoder from qcommon-console.
+
+#pragma once
+
+#include <qtac/FrameCoder.h>
+
+namespace qtac {
+
+class TACPSOCCoder : public FrameCoder
+{
+public:
+    TACPSOCCoder();
+    ~TACPSOCCoder() override;
+
+    TACPSOCCoder(const TACPSOCCoder&)            = delete;
+    TACPSOCCoder& operator=(const TACPSOCCoder&) = delete;
+
+    void            reset()                                                   override;
+    void            decode(const qtac::ByteArray& decodeMe)                   override;
+    qtac::ByteArray encode(const qtac::ByteArray& encodeMe,
+                           const Arguments&       arguments)                  override;
+
+private:
+    qtac::ByteArray _receiveBuffer;
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/TACPSOCCommand.h b/source/library/include/qtac/TACPSOCCommand.h
new file mode 100644
index 00000000..829329f8
--- /dev/null
+++ b/source/library/include/qtac/TACPSOCCommand.h
@@ -0,0 +1,86 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Michael Simpson
+// Qt-free reimplementation of TACPSOCCommand from qcommon-console.
+
+#pragma once
+
+#include <qtac/ByteArray.h>
+#include <qtac/FramePackage.h>
+
+#include <cstdint>
+
+namespace qtac {
+
+class ReceiveInterface;
+class SendInterface;
+
+class TACPSOCCommand
+{
+public:
+    TACPSOCCommand(SendInterface* sender, ReceiveInterface* receiver);
+    ~TACPSOCCommand();
+
+    TACPSOCCommand(const TACPSOCCommand&)            = delete;
+    TACPSOCCommand& operator=(const TACPSOCCommand&) = delete;
+
+    void version();
+    void name();
+    void uuid();
+
+    void setPinState(uint16_t pin, bool state);
+    void setAddressPinState(const qtac::ByteArray& i2cAddress, uint16_t pin, bool state);
+
+    void setName(const qtac::ByteArray& newName);
+
+    void getResetCount();
+    void clearResetCount();
+
+    void i2CReadRegister(uint32_t addr, uint32_t reg);
+    void i2CWriteRegister(uint32_t addr, uint32_t reg, uint32_t data);
+
+    void platformID();
+
+    void send(const qtac::ByteArray& command, const Arguments& arguments,
+              bool console, bool store = true);
+    void addDelay(uint32_t delayInMilliSeconds);
+    void addLogComment(const qtac::ByteArray& comment);
+    void addEndTransaction();
+
+private:
+    ReceiveInterface* _receiver;
+    SendInterface*    _sender;
+    bool              _ready;
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/TACPSOCDriveThread.h b/source/library/include/qtac/TACPSOCDriveThread.h
new file mode 100644
index 00000000..6e21acad
--- /dev/null
+++ b/source/library/include/qtac/TACPSOCDriveThread.h
@@ -0,0 +1,121 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+// Qt-free reimplementation of TACPSOCDriveThread from qcommon-console.
+// QSerialPort  -> qtac::SerialPort
+// Qt signals   -> std::function<> callbacks (inherited from TACDriveThread)
+
+#pragma once
+
+#include <qtac/TACDriveThread.h>
+#include <qtac/TACPSOCProtocol.h>
+#include <qtac/SerialPort.h>
+#include <qtac/SerialPortInfo.h>
+
+#include <memory>
+
+namespace qtac {
+
+class TACPSOCDriveThread : public TACDriveThread
+{
+public:
+    explicit TACPSOCDriveThread(HashType hash);
+    ~TACPSOCDriveThread() override;
+
+    TACPSOCDriveThread(const TACPSOCDriveThread&)            = delete;
+    TACPSOCDriveThread& operator=(const TACPSOCDriveThread&) = delete;
+
+    qtac::String locked() { return {}; }
+
+    // --- DriveThread ---
+    void run() override;
+
+    // --- TACDriveThread interface ---
+    void sendCommand(const qtac::ByteArray& command,
+                     bool              console          = false,
+                     ReceiveInterface* receiveInterface = nullptr,
+                     bool              shouldStore      = true) override;
+
+    void endTransaction(ReceiveInterface* receiveInterface = nullptr);
+
+    void setPinState(uint64_t pin, bool state) override;
+    void setAddressPinState(const qtac::ByteArray& i2cAddress, uint16_t pin, bool state) override;
+    void sendCommandSequence(CommandEntries& commandEntries) override;
+
+    int  getResetCount()  override;
+    void clearResetCount() override;
+
+    void i2CReadRegister(uint32_t addr, uint32_t reg) override;
+    void i2CWriteRegister(uint32_t addr, uint32_t reg, uint32_t data) override;
+
+    void setName(const qtac::ByteArray& newName) override;
+
+    // --- SendInterface ---
+    uint32_t send(const qtac::ByteArray& sendMe, const Arguments& arguments,
+                  bool console, ReceiveInterface* receiveInterface,
+                  bool store = true) override;
+    bool ready() override;
+
+    bool connected() const { return _connected; }
+
+    // --- ReceiveInterface ---
+    void receive(FramePackage& framePackage) override;
+
+protected:
+    bool openSerialDevice();
+
+    void setupConnected() override;
+    void setupDiscovery() override;
+
+private:
+    TACPSOCProtocol              _tacProtocol;
+    bool                         _connected{false};
+    SerialPortInfo               _tacPortInfo;
+    std::unique_ptr<SerialPort>  _serialPort;
+    bool                         _readyRead{false};
+    int                          _versionRetryCount{1};
+
+    bool readSerialData();
+
+    void handleGetNameResponse(FramePackage& framePackage);
+    void handleGetResetCount(FramePackage& framePackage);
+    void handleI2CRead(FramePackage& framePackage);
+    void handleI2CWrite(FramePackage& framePackage);
+    void handleSetPin(FramePackage& framePackage);
+    void handlePlatformID(FramePackage& framePackage);
+    void handleSetName(FramePackage& framePackage);
+    void handleUUIDResponse(FramePackage& framePackage);
+    void handleVersionResponse(FramePackage& framePackage);
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/TACPSOCProtocol.h b/source/library/include/qtac/TACPSOCProtocol.h
new file mode 100644
index 00000000..7aadf69f
--- /dev/null
+++ b/source/library/include/qtac/TACPSOCProtocol.h
@@ -0,0 +1,90 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Michael Simpson
+// Qt-free reimplementation of TACPSOCProtocol from qcommon-console.
+// QObject / Q_INTERFACES removed; ReceiveInterface inherited directly.
+
+#pragma once
+
+#include <qtac/ProtocolInterface.h>
+#include <qtac/ReceiveInterface.h>
+
+#include <cstdint>
+#include <string>
+
+namespace qtac {
+
+class TACDriveThread;
+
+class TACPSOCProtocol :
+    public ProtocolInterface,
+    public ReceiveInterface
+{
+public:
+    TACPSOCProtocol();
+    ~TACPSOCProtocol() override;
+
+    TACPSOCProtocol(const TACPSOCProtocol&)            = delete;
+    TACPSOCProtocol& operator=(const TACPSOCProtocol&) = delete;
+
+    void setTACDriveTrain(TACDriveThread* tacDriveTrain);
+
+    uint32_t sendCommand(const qtac::ByteArray& command,
+                         const Arguments&   arguments,
+                         bool               console        = false,
+                         ReceiveInterface*  receiveInterface = nullptr,
+                         bool               shouldStore    = true);
+
+    void endTransaction(ReceiveInterface* receiveInterface = nullptr);
+    void sendHelpCommand();
+
+    // ReceiveInterface
+    void receive(FramePackage& framePackage) override;
+
+    // ProtocolInterface timing hook
+    void idle() override;
+
+protected:
+    void frameComplete(const qtac::ByteArray& completedFrame) override;
+    void badFrame(const qtac::ByteArray& completedFrame)      override;
+
+private:
+    TACDriveThread* _tacDriveTrain{nullptr};
+    uint64_t        _tickCount{0};
+    qtac::ByteArray _currentCommand;
+
+    // Accumulated response lines for the current pending frame.
+    std::vector<qtac::ByteArray> _responseLines;
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/TACSTM32Coder.h b/source/library/include/qtac/TACSTM32Coder.h
new file mode 100644
index 00000000..788b87ac
--- /dev/null
+++ b/source/library/include/qtac/TACSTM32Coder.h
@@ -0,0 +1,67 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Qt-free port of TACSTM32Coder from qcommon-console.
+
+#pragma once
+
+#include <qtac/FrameCoder.h>
+
+#include <cstdint>
+
+namespace qtac {
+
+// -----------------------------------------------------------------------
+// TACSTM32Coder
+//
+// Encoder for the STM32 HID (BugHopper V2) drive thread.
+// decode() is a no-op — BugHopper V2 sends no responses.
+// encode() builds a 33-byte HID report for the SetPin command.
+// -----------------------------------------------------------------------
+class TACSTM32Coder : public FrameCoder
+{
+public:
+    TACSTM32Coder();
+    ~TACSTM32Coder() override;
+
+    TACSTM32Coder(const TACSTM32Coder&)            = delete;
+    TACSTM32Coder& operator=(const TACSTM32Coder&) = delete;
+
+    void            reset()                                                         override;
+    void            decode(const qtac::ByteArray& decodeMe)                         override;
+    qtac::ByteArray encode(const qtac::ByteArray& encodeMe, const Arguments& args)  override;
+
+private:
+    uint8_t _gpioState{0};
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/TACSTM32Command.h b/source/library/include/qtac/TACSTM32Command.h
new file mode 100644
index 00000000..5e17c650
--- /dev/null
+++ b/source/library/include/qtac/TACSTM32Command.h
@@ -0,0 +1,75 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Qt-free port of TACSTM32Command from qcommon-console.
+
+#pragma once
+
+#include <qtac/ByteArray.h>
+#include <qtac/FramePackage.h>
+#include <qtac/SendInterface.h>
+#include <qtac/ReceiveInterface.h>
+
+#include <cstdint>
+
+namespace qtac {
+
+// -----------------------------------------------------------------------
+// TACSTM32Command
+//
+// RAII command builder for the STM32 HID (BugHopper V2) drive thread.
+// Destructor automatically enqueues an EndTransaction.
+// -----------------------------------------------------------------------
+class TACSTM32Command
+{
+public:
+    TACSTM32Command(SendInterface* sender, ReceiveInterface* receiver);
+    ~TACSTM32Command();
+
+    TACSTM32Command(const TACSTM32Command&)            = delete;
+    TACSTM32Command& operator=(const TACSTM32Command&) = delete;
+
+    void setPinState(uint16_t pin, bool state);
+
+    void send(const qtac::ByteArray& command, const Arguments& arguments,
+              bool console, bool store = true);
+    void addDelay(uint32_t delayInMilliSeconds);
+    void addLogComment(const qtac::ByteArray& comment);
+    void addEndTransaction();
+
+private:
+    ReceiveInterface* _receiver;
+    SendInterface*    _sender;
+    bool              _ready;
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/TACSTM32DriveThread.h b/source/library/include/qtac/TACSTM32DriveThread.h
new file mode 100644
index 00000000..9fb3d6bc
--- /dev/null
+++ b/source/library/include/qtac/TACSTM32DriveThread.h
@@ -0,0 +1,105 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Qt-free port of TACSTM32DriveThread from qcommon-console.
+
+#pragma once
+
+#include <qtac/TACDriveThread.h>
+#include <qtac/TACSTM32Protocol.h>
+
+// Forward declaration (global scope — STM32Device is not in namespace qtac)
+class STM32Device;
+
+namespace qtac {
+
+// -----------------------------------------------------------------------
+// TACSTM32DriveThread
+//
+// Concrete drive thread for STM32 HID (BugHopper V2) hardware.
+// The device is write-only: no responses are read back.
+// run() loop:
+//   1. Opens the HID transport via STM32Device::openTransport().
+//   2. Fires initial status callbacks.
+//   3. Dequeues FramePackages and writes them via STM32Device::write().
+// -----------------------------------------------------------------------
+class TACSTM32DriveThread : public TACDriveThread
+{
+public:
+    explicit TACSTM32DriveThread(HashType hash);
+    ~TACSTM32DriveThread() override;
+
+    TACSTM32DriveThread(const TACSTM32DriveThread&)            = delete;
+    TACSTM32DriveThread& operator=(const TACSTM32DriveThread&) = delete;
+
+    // --- DriveThread ---
+    void run() override;
+
+    // --- TACDriveThread interface ---
+    void sendCommand(const qtac::ByteArray& command,
+                     bool              console          = false,
+                     ReceiveInterface* receiveInterface = nullptr,
+                     bool              shouldStore      = true) override;
+
+    void setPinState(uint64_t pin, bool state)               override;
+    void sendCommandSequence(CommandEntries& commandEntries)  override;
+
+    int  getResetCount()   override;
+    void clearResetCount() override;
+
+    void i2CReadRegister(uint32_t addr, uint32_t reg)                  override;
+    void i2CWriteRegister(uint32_t addr, uint32_t reg, uint32_t data)  override;
+
+    void setName(const qtac::ByteArray& newName) override;
+
+    // --- SendInterface ---
+    uint32_t send(const qtac::ByteArray& sendMe, const Arguments& arguments,
+                  bool console, ReceiveInterface* receiveInterface,
+                  bool store = true) override;
+    bool ready() override;
+
+    // --- ReceiveInterface ---
+    void receive(FramePackage& framePackage) override;
+
+protected:
+    bool openSTM32Device();
+
+    void setupConnected() override;
+    void setupDiscovery() override;
+
+private:
+    TACSTM32Protocol  _tacProtocol;
+    STM32Device*      _stm32Device{nullptr};
+    bool              _connected{false};
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/TACSTM32Protocol.h b/source/library/include/qtac/TACSTM32Protocol.h
new file mode 100644
index 00000000..8a015680
--- /dev/null
+++ b/source/library/include/qtac/TACSTM32Protocol.h
@@ -0,0 +1,83 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Qt-free port of TACSTM32Protocol from qcommon-console.
+
+#pragma once
+
+#include <qtac/ProtocolInterface.h>
+#include <qtac/ReceiveInterface.h>
+#include <qtac/TACSTM32Coder.h>
+
+namespace qtac {
+
+class TACDriveThread;
+
+// -----------------------------------------------------------------------
+// TACSTM32Protocol
+//
+// Write-only protocol for the STM32 HID (BugHopper V2) hardware.
+// No response lines are accumulated — the device sends no framed replies.
+// -----------------------------------------------------------------------
+class TACSTM32Protocol : public ProtocolInterface, public ReceiveInterface
+{
+public:
+    TACSTM32Protocol();
+    ~TACSTM32Protocol() override;
+
+    TACSTM32Protocol(const TACSTM32Protocol&)            = delete;
+    TACSTM32Protocol& operator=(const TACSTM32Protocol&) = delete;
+
+    void setTACDriveTrain(TACDriveThread* tacDriveTrain);
+
+    // ProtocolInterface / SendInterface
+    uint32_t sendCommand(const qtac::ByteArray& command,
+                         const Arguments& arguments,
+                         bool console,
+                         ReceiveInterface* receiveInterface,
+                         bool shouldStore);
+
+    void endTransaction(ReceiveInterface* receiveInterface);
+
+    // ReceiveInterface
+    void receive(FramePackage& framePackage) override;
+
+    // ProtocolInterface callbacks — no-ops for a write-only device
+    void idle()                                              override;
+    void frameComplete(const qtac::ByteArray& completedFrame) override;
+    void badFrame(const qtac::ByteArray& completedFrame)      override;
+
+private:
+    TACDriveThread* _tacDriveTrain{nullptr};
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/TcnfLoader.h b/source/library/include/qtac/TcnfLoader.h
new file mode 100644
index 00000000..56dab55e
--- /dev/null
+++ b/source/library/include/qtac/TcnfLoader.h
@@ -0,0 +1,75 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef QTAC_TCNFLOADER_H
+#define QTAC_TCNFLOADER_H
+
+#include <qtac/FTDIPlatformConfiguration.h>
+#include <qtac/PSOCPlatformConfiguration.h>
+#include <qtac/PIC32CXPlatformConfiguration.h>
+#include <qtac/String.h>
+
+#include <memory>
+#include <string>
+
+// -----------------------------------------------------------------------
+// TcnfLoader
+//
+// Opens a .tcnf file (JSON) and populates the appropriate platform
+// configuration object.  Returns false if the file cannot be opened or
+// parsed, or if the platform_type does not match the requested type.
+//
+// Usage:
+//   // PSOC device open():
+//   auto* cfg = new _PSOCPlatformConfiguration;
+//   TcnfLoader::loadPSOC(platformEntry->_path.toStdString(), cfg);
+//
+//   // FTDI device open():
+//   auto* cfg = new _FTDIPlatformConfiguration(chipCount);
+//   TcnfLoader::loadFTDI(platformEntry->_path.toStdString(), cfg);
+//
+//   // PIC32CX device open():
+//   auto* cfg = new _PIC32CXPlatformConfiguration;
+//   TcnfLoader::loadPIC32CX(platformEntry->_path.toStdString(), cfg);
+// -----------------------------------------------------------------------
+
+class TcnfLoader
+{
+public:
+    TcnfLoader() = delete;
+
+    static bool loadPSOC   (const std::string& path, _PSOCPlatformConfiguration*    cfg);
+    static bool loadFTDI   (const std::string& path, _FTDIPlatformConfiguration*    cfg);
+    static bool loadPIC32CX(const std::string& path, _PIC32CXPlatformConfiguration* cfg);
+};
+
+#endif // QTAC_TCNFLOADER_H
diff --git a/source/library/include/qtac/ThreadedLog.h b/source/library/include/qtac/ThreadedLog.h
new file mode 100644
index 00000000..70c32704
--- /dev/null
+++ b/source/library/include/qtac/ThreadedLog.h
@@ -0,0 +1,88 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+// Qt-free reimplementation of ThreadedLog from qcommon-console.
+// QThread          -> std::thread (owned)
+// QSharedPointer   -> std::shared_ptr
+// QRecursiveMutex  -> std::recursive_mutex
+// QString          -> qtac::ByteArray
+// QStringList      -> std::vector<qtac::ByteArray>
+// QFile            -> std::ofstream
+// QDateTime        -> std::chrono + strftime
+
+#pragma once
+
+#include <qtac/ByteArray.h>
+
+#include <atomic>
+#include <fstream>
+#include <memory>
+#include <mutex>
+#include <thread>
+#include <vector>
+
+namespace qtac {
+
+class _ThreadedLog;
+using ThreadedLog = std::shared_ptr<_ThreadedLog>;
+
+class _ThreadedLog
+{
+public:
+    _ThreadedLog() = default;
+    ~_ThreadedLog();
+
+    static ThreadedLog      createThreadedLog();
+    static qtac::ByteArray  createLogName(const qtac::ByteArray& prefix);
+
+    void open(const qtac::ByteArray& filePath);
+    bool isOpen();
+    void close();
+
+    qtac::ByteArray currentLogPath() const { return _currentLogPath; }
+
+    void addLogEntry(const qtac::ByteArray& logEntry);
+
+    void run();
+
+private:
+    std::atomic<bool>               _running{false};
+    std::atomic<bool>               _starting{false};
+    std::recursive_mutex            _mutex;
+    std::vector<qtac::ByteArray>    _logEntries;
+    qtac::ByteArray                 _currentLogPath;
+    std::ofstream                   _logFile;
+    std::thread                     _thread;
+};
+
+} // namespace qtac
diff --git a/source/library/include/qtac/Variant.h b/source/library/include/qtac/Variant.h
new file mode 100644
index 00000000..23d6780f
--- /dev/null
+++ b/source/library/include/qtac/Variant.h
@@ -0,0 +1,132 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef QTAC_VARIANT_H
+#define QTAC_VARIANT_H
+
+#include <qtac/String.h>
+#include <qtac/ByteArray.h>
+#include <cstdint>
+#include <new>
+
+namespace qtac {
+
+class Variant
+{
+public:
+	enum class Type {
+		Invalid,
+		Bool,
+		Int,
+		UInt,
+		LongLong,
+		ULongLong,
+		Double,
+		String,
+		ByteArray
+	};
+
+	Variant();
+	Variant(bool value);
+	Variant(int value);
+	Variant(unsigned int value);
+	Variant(long long value);
+	Variant(unsigned long long value);
+	Variant(double value);
+	Variant(const qtac::String& value);
+	Variant(const char* value);
+	Variant(const ByteArray& value);
+	Variant(const Variant& other);
+	Variant& operator=(const Variant& other);
+	~Variant();
+
+	// --- Type checking ---
+	bool isValid() const;
+	Type type() const;
+
+	// --- Value access ---
+	bool toBool() const;
+	int toInt(bool* ok = nullptr) const;
+	unsigned int toUInt(bool* ok = nullptr) const;
+	long long toLongLong(bool* ok = nullptr) const;
+	unsigned long long toULongLong(bool* ok = nullptr) const;
+	double toDouble(bool* ok = nullptr) const;
+	qtac::String toString() const;
+	ByteArray toByteArray() const;
+
+	// --- Template value access ---
+	template<typename T>
+	T value() const;
+
+	// --- Comparison ---
+	friend bool operator==(const Variant& lhs, const Variant& rhs);
+	friend bool operator!=(const Variant& lhs, const Variant& rhs);
+
+	// Storage is public so that placement-new helpers in Variant.cpp can access it.
+	// _data itself remains private.
+public:
+	union Storage {
+		bool               b;
+		int                i;
+		unsigned int       u;
+		long long          ll;
+		unsigned long long ull;
+		double             d;
+		// Non-trivial types stored via placement new
+		char               str[sizeof(qtac::String)];
+		char               ba[sizeof(qtac::ByteArray)];
+
+		Storage() {}
+		~Storage() {}
+	};
+
+private:
+	void _destroy();
+	void _copyFrom(const Variant& other);
+
+	Type    _type;
+	Storage _data;
+};
+
+// --- Template specializations ---
+
+template<> inline bool Variant::value<bool>() const { return toBool(); }
+template<> inline int Variant::value<int>() const { return toInt(); }
+template<> inline unsigned int Variant::value<unsigned int>() const { return toUInt(); }
+template<> inline long long Variant::value<long long>() const { return toLongLong(); }
+template<> inline unsigned long long Variant::value<unsigned long long>() const { return toULongLong(); }
+template<> inline String Variant::value<String>() const { return toString(); }
+template<> inline ByteArray Variant::value<ByteArray>() const { return toByteArray(); }
+
+} // namespace qtac
+
+#endif // QTAC_VARIANT_H
diff --git a/source/library/include/qtac/json_util.h b/source/library/include/qtac/json_util.h
new file mode 100644
index 00000000..b44fc249
--- /dev/null
+++ b/source/library/include/qtac/json_util.h
@@ -0,0 +1,108 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Thin helpers over boost::json to replicate the nlohmann patterns used in this project.
+
+#pragma once
+
+#include <boost/json.hpp>
+#include <string>
+
+using json_t = boost::json::value;
+
+namespace qtac {
+namespace json_util {
+
+// Replicates nlohmann's j.value(key, default) — returns default if key absent or wrong type.
+inline std::string valueString(const boost::json::object& obj,
+                               const std::string& key,
+                               const std::string& def = "")
+{
+    auto it = obj.find(key);
+    if (it == obj.end()) return def;
+    if (const auto* s = it->value().if_string())
+        return std::string(s->data(), s->size());
+    return def;
+}
+
+inline int valueInt(const boost::json::object& obj, const std::string& key, int def = 0)
+{
+    auto it = obj.find(key);
+    if (it == obj.end()) return def;
+    const auto& v = it->value();
+    if (v.is_int64())  return static_cast<int>(v.as_int64());
+    if (v.is_uint64()) return static_cast<int>(v.as_uint64());
+    return def;
+}
+
+inline bool valueBool(const boost::json::object& obj, const std::string& key, bool def = false)
+{
+    auto it = obj.find(key);
+    if (it == obj.end()) return def;
+    if (const auto* b = it->value().if_bool())
+        return *b;
+    return def;
+}
+
+// Safe string extraction from a json value
+inline std::string toString(const boost::json::value& v)
+{
+    if (const auto* s = v.if_string())
+        return std::string(s->data(), s->size());
+    return {};
+}
+
+// Safe int extraction from a json value
+inline int toInt(const boost::json::value& v)
+{
+    if (v.is_int64())  return static_cast<int>(v.as_int64());
+    if (v.is_uint64()) return static_cast<int>(v.as_uint64());
+    return 0;
+}
+
+// Safe bool extraction from a json value
+inline bool toBool(const boost::json::value& v)
+{
+    if (const auto* b = v.if_bool()) return *b;
+    return false;
+}
+
+// Safe uint32 extraction from a json value
+inline unsigned int toUInt(const boost::json::value& v)
+{
+    if (v.is_int64())  return static_cast<unsigned int>(v.as_int64());
+    if (v.is_uint64()) return static_cast<unsigned int>(v.as_uint64());
+    return 0u;
+}
+
+} // namespace json_util
+} // namespace qtac
diff --git a/source/library/include/qtac/version.h b/source/library/include/qtac/version.h
new file mode 100644
index 00000000..10cfe04e
--- /dev/null
+++ b/source/library/include/qtac/version.h
@@ -0,0 +1,35 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#pragma once
+
+#define TAC_LIB_VERSION "3.0.1"
diff --git a/source/library/src/AlpacaDevice.cpp b/source/library/src/AlpacaDevice.cpp
new file mode 100644
index 00000000..cf926ebb
--- /dev/null
+++ b/source/library/src/AlpacaDevice.cpp
@@ -0,0 +1,474 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+
+#include <qtac/AlpacaDevice.h>
+#include <qtac/TACDriveThread.h>
+#include <qtac/STM32Device.h>
+
+#include <algorithm>
+#include <mutex>
+
+// -----------------------------------------------------------------------
+// Static members
+// -----------------------------------------------------------------------
+
+std::recursive_mutex  _AlpacaDevice::_mutex;
+AlpacaDevices  _AlpacaDevice::_alpacaDevices;
+
+// -----------------------------------------------------------------------
+
+_AlpacaDevice::~_AlpacaDevice()
+{
+	if (isOpen())
+		close();
+}
+
+void _AlpacaDevice::getAlpacaDevices(AlpacaDevices& alpacaDevices, DebugBoardType debugBoardTypeFilter)
+{
+	alpacaDevices.clear();
+	std::lock_guard<std::recursive_mutex> lock(_mutex);
+
+	for (auto& alpacaDevice : _alpacaDevices)
+	{
+		if (!alpacaDevice->active())
+			continue;
+		if (debugBoardTypeFilter == eUnknownDebugBoard)
+			alpacaDevices.append(alpacaDevice);
+		else if (alpacaDevice->debugBoardType() == debugBoardTypeFilter)
+			alpacaDevices.append(alpacaDevice);
+	}
+}
+
+uint32_t _AlpacaDevice::updateAlpacaDevices()
+{
+	_alpacaDevices.clear();
+	std::lock_guard<std::recursive_mutex> lock(_mutex);
+	STM32Device::updateAlpacaDevices();
+	return static_cast<uint32_t>(_alpacaDevices.size());
+}
+
+AlpacaDevice _AlpacaDevice::findAlpacaDevice(HashType hash)
+{
+	std::lock_guard<std::recursive_mutex> lock(_mutex);
+	for (const auto& dev : _alpacaDevices)
+		if (dev->_hash == hash)
+			return dev;
+	return AlpacaDevice(nullptr);
+}
+
+AlpacaDevice _AlpacaDevice::findAlpacaDevice(const qtac::ByteArray& portName)
+{
+	std::lock_guard<std::recursive_mutex> lock(_mutex);
+	qtac::ByteArray searchTerm = portName.toLower();
+	for (const auto& dev : _alpacaDevices)
+	{
+		if (dev->_portName.toLower().contains(searchTerm))
+			return dev;
+		if (dev->_serialNumber.toLower().contains(searchTerm))
+			return dev;
+	}
+	return AlpacaDevice(nullptr);
+}
+
+AlpacaDevice _AlpacaDevice::findAlpacaDeviceBySerialNumber(const qtac::ByteArray& serialNumber, bool usePartial)
+{
+	std::lock_guard<std::recursive_mutex> lock(_mutex);
+	qtac::ByteArray testSerial = serialNumber.toLower();
+	for (const auto& dev : _alpacaDevices)
+	{
+		qtac::ByteArray devSerial = dev->_serialNumber.toLower();
+		if (usePartial ? testSerial.contains(devSerial) : testSerial == devSerial)
+			return dev;
+	}
+	return AlpacaDevice(nullptr);
+}
+
+AlpacaDevice _AlpacaDevice::findAlpacaDeviceByDescription(const qtac::ByteArray& description, bool usePartial)
+{
+	std::lock_guard<std::recursive_mutex> lock(_mutex);
+	qtac::ByteArray testDesc = description.toLower();
+	for (const auto& dev : _alpacaDevices)
+	{
+		qtac::ByteArray devDesc = dev->description().toLower();
+		if (usePartial ? testDesc.contains(devDesc) : testDesc == devDesc)
+			return dev;
+	}
+	return AlpacaDevice(nullptr);
+}
+
+AlpacaDevice _AlpacaDevice::findAlpacaDeviceByUSBDescriptor(const qtac::ByteArray& descriptor, bool usePartial)
+{
+	std::lock_guard<std::recursive_mutex> lock(_mutex);
+	qtac::ByteArray testDescriptor = descriptor.toLower();
+	for (const auto& dev : _alpacaDevices)
+	{
+		qtac::ByteArray devDescriptor = dev->_usbDescriptor.toLower();
+		if (usePartial ? testDescriptor.contains(devDescriptor) : testDescriptor == devDescriptor)
+			return dev;
+	}
+	return AlpacaDevice(nullptr);
+}
+
+qtac::ByteArray _AlpacaDevice::getLastError()
+{
+	qtac::ByteArray temp = _lastError;
+	_lastError.clear();
+	return temp;
+}
+
+bool _AlpacaDevice::isOpen()
+{
+	return _driveThread != nullptr || _serialDriveThread != nullptr;
+}
+
+void _AlpacaDevice::close()
+{
+	// Remember the injected drive thread pointer before clearing it, so we can
+	// detect the PSoC GUI aliasing case (where open() stored _driveThread into
+	// _serialDriveThread) and avoid a double-free/double-shutdown.
+	qtac::TACDriveThread* injected = _driveThread;
+
+	if (_driveThread != nullptr)
+	{
+		_driveThread->shutDown();
+		// Ownership of the injected drive thread belongs to the caller (see setDriveThread).
+		// We only shut it down here; the caller is responsible for deletion.
+		_driveThread = nullptr;
+	}
+	if (_serialDriveThread != nullptr)
+	{
+		if (_serialDriveThread != injected)
+		{
+			// Self-owned thread (created inside open()) — shut down and delete.
+			_serialDriveThread->shutDown();
+			delete _serialDriveThread;
+		}
+		// If _serialDriveThread == injected, it was aliased from _driveThread and was
+		// already shut down above. Don't delete — caller owns that pointer.
+		_serialDriveThread = nullptr;
+	}
+}
+
+uint32_t _AlpacaDevice::commandCount()
+{
+	commandList();
+	return static_cast<uint32_t>(_commandList.size());
+}
+
+TACCommand _AlpacaDevice::commandEntry(uint32_t commandIndex)
+{
+	if (commandIndex < static_cast<uint32_t>(_commandList.size()))
+		return _commandList.at(commandIndex);
+	return TACCommand{};
+}
+
+TACCommands _AlpacaDevice::commandList()
+{
+	if (_commandList.isEmpty())
+	{
+		for (const auto& entry : _commands)
+			_commandList.append(entry.second);
+
+		std::stable_sort(_commandList.begin(), _commandList.end(),
+			[](const TACCommand& a, const TACCommand& b) { return a._command < b._command; });
+	}
+	return _commandList;
+}
+
+bool _AlpacaDevice::hasCommand(const qtac::ByteArray& command) const
+{
+	qtac::String key(command.toStdString());
+	return _commands.contains(key);
+}
+
+bool _AlpacaDevice::getCommandState(const qtac::ByteArray& command)
+{
+	qtac::String key(command.toStdString());
+	if (_commands.contains(key))
+	{
+		bool v = _commands.value(key)._currentState;
+		return v;
+	}
+	return false;
+}
+
+bool _AlpacaDevice::sendCommand(const qtac::ByteArray& command, bool state)
+{
+	qtac::TACDriveThread* dt = _driveThread ? _driveThread : _serialDriveThread;
+	if (dt == nullptr)
+		return false;
+
+	qtac::String key(command.toStdString());
+	if (_commands.contains(key))
+	{
+		_commands[key]._currentState = state;
+		setPinState(_commands.value(key)._pin, state);
+		dt->clearWaitForCompletion();
+		return true;
+	}
+	dt->clearWaitForCompletion();
+	return false;
+}
+
+bool _AlpacaDevice::isCommandQueueClear()
+{
+	qtac::TACDriveThread* dt = _driveThread ? _driveThread : _serialDriveThread;
+	if (dt != nullptr && active())
+		return dt->waitForCompletionStatus();
+	return false;
+}
+
+qtac::ByteArray _AlpacaDevice::getHelp()
+{
+	return _helpText;
+}
+
+void _AlpacaDevice::setPinState(PinID pin, bool state)
+{
+	qtac::TACDriveThread* dt = _driveThread ? _driveThread : _serialDriveThread;
+	if (dt != nullptr && active())
+		dt->setPinState(pin, state);
+}
+
+void _AlpacaDevice::setAddressPinState(const qtac::ByteArray& i2cAddress, uint16_t pin, bool state)
+{
+	qtac::TACDriveThread* dt = _driveThread ? _driveThread : _serialDriveThread;
+	if (dt != nullptr && active())
+		dt->setAddressPinState(i2cAddress, pin, state);
+}
+
+void _AlpacaDevice::setWaitForCompletion()
+{
+	qtac::TACDriveThread* dt = _driveThread ? _driveThread : _serialDriveThread;
+	if (dt != nullptr)
+		dt->setWaitForCompletion();
+}
+
+bool _AlpacaDevice::active()
+{
+	return _active;
+}
+
+HashType _AlpacaDevice::hash()
+{
+	return _hash;
+}
+
+qtac::ByteArray _AlpacaDevice::description()
+{
+	return _description;
+}
+
+qtac::ByteArray _AlpacaDevice::usbDescriptor()
+{
+	return _usbDescriptor;
+}
+
+qtac::ByteArray _AlpacaDevice::serialNumber()
+{
+	return _serialNumber;
+}
+
+PlatformID _AlpacaDevice::platformID()
+{
+	return _platformID;
+}
+
+qtac::ByteArray _AlpacaDevice::macAddress()
+{
+	if (_driveThread)
+		return _driveThread->macAddress();
+	return qtac::ByteArray();
+}
+
+DebugBoardType _AlpacaDevice::debugBoardType()
+{
+	if (_boardType == eUnknownDebugBoard && _driveThread)
+		_boardType = _driveThread->debugBoardType();
+	return _boardType;
+}
+
+qtac::String _AlpacaDevice::debugBoardTypeString()
+{
+	if (_driveThread) return _driveThread->debugBoardTypeString();
+	return qtac::String();
+}
+
+qtac::String _AlpacaDevice::hardwareVersionString()
+{
+	if (_driveThread) return _driveThread->hardwareVersionString();
+	return qtac::String();
+}
+
+qtac::String _AlpacaDevice::firmwareVersion()
+{
+	if (_driveThread) return _driveThread->firmwareVersion();
+	return qtac::String();
+}
+
+unsigned int _AlpacaDevice::majorVersion()
+{
+	if (_driveThread) return _driveThread->majorVersion();
+	return 0;
+}
+
+qtac::String _AlpacaDevice::chipVersion()
+{
+	switch (_chipVersion)
+	{
+	case 3:     return "LP038";
+	case 4:     return "LP030";
+	case 10000: return "FTDI";
+	default:    return "None";
+	}
+}
+
+unsigned int _AlpacaDevice::minorVersion()
+{
+	if (_driveThread) return _driveThread->minorVersion();
+	return 0;
+}
+
+unsigned int _AlpacaDevice::revisionVersion()
+{
+	if (_driveThread) return _driveThread->revisionVersion();
+	return 0;
+}
+
+void _AlpacaDevice::externalPowerControl(bool state)
+{
+	qtac::String key("extpower");
+	if (_commands.contains(key))
+		setPinState(_commands.value(key)._pin, state);
+}
+
+qtac::ByteArray _AlpacaDevice::portName() const
+{
+	return _portName;
+}
+
+void _AlpacaDevice::setPortName(const qtac::ByteArray& portName)
+{
+	_portName = portName;
+	if (_driveThread)
+		_driveThread->setPortName(portName);
+}
+
+qtac::ByteArray _AlpacaDevice::name() const
+{
+	if (_driveThread) return _driveThread->name();
+	return _serialNumber;
+}
+
+void _AlpacaDevice::setName(const qtac::ByteArray& newName)
+{
+	if (_driveThread)
+		_driveThread->setName(newName);
+}
+
+qtac::String _AlpacaDevice::descriptionStr() const
+{
+	if (_driveThread) return _driveThread->description();
+	return qtac::String();
+}
+
+void _AlpacaDevice::setDescription(const qtac::String& description)
+{
+	if (_driveThread)
+		_driveThread->setDescription(description);
+}
+
+qtac::String _AlpacaDevice::serialNumberStr() const
+{
+	if (_driveThread) return _driveThread->serialNumber();
+	return qtac::String();
+}
+
+void _AlpacaDevice::setSerialNumber(const qtac::String& serialNumber)
+{
+	_serialNumber = serialNumber.toLatin1();
+	if (_driveThread)
+		_driveThread->setSerialNumber(serialNumber);
+}
+
+qtac::String _AlpacaDevice::uuid()
+{
+	if (_driveThread) return _driveThread->uuid();
+	return qtac::String();
+}
+
+qtac::Size _AlpacaDevice::windowDimension()
+{
+	return qtac::Size(560, 750);
+}
+
+int _AlpacaDevice::getResetCount()
+{
+	if (_driveThread != nullptr) return _driveThread->getResetCount();
+	return 0;
+}
+
+void _AlpacaDevice::clearResetCount()
+{
+	if (_driveThread != nullptr) _driveThread->clearResetCount();
+}
+
+void _AlpacaDevice::i2CReadRegister(uint32_t addr, uint32_t reg)
+{
+	if (_driveThread != nullptr) _driveThread->i2CReadRegister(addr, reg);
+}
+
+void _AlpacaDevice::i2CWriteRegister(uint32_t addr, uint32_t reg, uint32_t data)
+{
+	if (_driveThread != nullptr) _driveThread->i2CWriteRegister(addr, reg, data);
+}
+
+void _AlpacaDevice::on_pinStateChanged(uint64_t pin, bool state)
+{
+	for (auto& kv : _commands)
+	{
+		if (kv.second._pin == pin)
+		{
+			kv.second._currentState = state;
+			break;
+		}
+	}
+	if (onPinStateChanged)
+		onPinStateChanged(pin, state);
+}
+
+void _AlpacaDevice::onDeviceDisconnect()
+{
+	close();
+}
diff --git a/source/library/src/AlpacaScript.cpp b/source/library/src/AlpacaScript.cpp
new file mode 100644
index 00000000..2013acfa
--- /dev/null
+++ b/source/library/src/AlpacaScript.cpp
@@ -0,0 +1,348 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <qtac/AlpacaScript.h>
+#include <qtac/TACCommand.h>
+
+#include <sstream>
+#include <stdexcept>
+
+namespace qtac {
+
+// -----------------------------------------------------------------------
+// Helpers
+// -----------------------------------------------------------------------
+
+static std::vector<qtac::String> splitLine(const qtac::String& line)
+{
+    std::vector<qtac::String> tokens;
+    std::istringstream ss(line.toStdString());
+    std::string tok;
+    while (ss >> tok)
+        tokens.emplace_back(qtac::String(tok));
+    return tokens;
+}
+
+static qtac::String trimString(const qtac::String& s)
+{
+    const std::string& str = s.toStdString();
+    size_t start = str.find_first_not_of(" \t\r\n");
+    if (start == std::string::npos) return {};
+    size_t end = str.find_last_not_of(" \t\r\n");
+    return qtac::String(str.substr(start, end - start + 1));
+}
+
+static bool startsWith(const qtac::String& s, const char* prefix)
+{
+    std::string str = s.toStdString();
+    return str.rfind(prefix, 0) == 0;
+}
+
+static qtac::String toLower(const qtac::String& s)
+{
+    std::string str = s.toStdString();
+    for (auto& c : str) c = static_cast<char>(::tolower(static_cast<unsigned char>(c)));
+    return qtac::String(str);
+}
+
+// Replace all occurrences of `from` in `str` with `to`.
+static qtac::String replaceAll(const qtac::String& str,
+                                const qtac::String& from,
+                                const qtac::String& to)
+{
+    std::string s = str.toStdString();
+    const std::string& f = from.toStdString();
+    const std::string& t = to.toStdString();
+    std::string result;
+    size_t pos = 0;
+    while (pos < s.size())
+    {
+        size_t found = s.find(f, pos);
+        if (found == std::string::npos)
+        {
+            result += s.substr(pos);
+            break;
+        }
+        result += s.substr(pos, found - pos);
+        result += t;
+        pos = found + f.size();
+    }
+    return qtac::String(result);
+}
+
+// -----------------------------------------------------------------------
+
+bool AlpacaScript::isVariableRef(const qtac::String& token)
+{
+    return !token.isEmpty() && token.toStdString()[0] == '$';
+}
+
+qtac::String AlpacaScript::stripParens(const qtac::String& s)
+{
+    qtac::String r = replaceAll(s, "(", "");
+    r = replaceAll(r, ")", "");
+    return trimString(r);
+}
+
+// -----------------------------------------------------------------------
+// parseScript
+// -----------------------------------------------------------------------
+
+bool AlpacaScript::parseScript(const qtac::String&    alpacaScript,
+                                const VariableEntries& variables,
+                                const TACCommands&     tacCommands)
+{
+    bool result = true;
+    ScriptCommand current; // current open function definition
+
+    std::istringstream stream(alpacaScript.toStdString());
+    std::string rawLine;
+
+    while (std::getline(stream, rawLine))
+    {
+        qtac::String line = trimString(qtac::String(rawLine));
+        auto words = splitLine(line);
+        if (words.empty()) continue;
+
+        if (words.size() >= 2 && toLower(words[0]) == "def")
+        {
+            // Start a new function definition
+            current = std::make_shared<_ScriptCommand>();
+            qtac::String funcName = stripParens(words[1]);
+            current->_command    = funcName.toLatin1();
+            _scriptCommands[funcName] = current;
+        }
+        else if (current && words.size() >= 2
+                 && TACCommand::contains(words[0], tacCommands))
+        {
+            // pinCmd 0 / pinCmd 1
+            TACCommand tacCmd = TACCommand::find(words[0], tacCommands);
+            auto entry = std::make_shared<_CommandEntry>();
+            entry->_commandAction = _CommandEntry::eSetPin;
+            entry->_pinID         = static_cast<uint64_t>(tacCmd._pin);
+            entry->_action        = words[0].toLatin1();
+            entry->_arguement     = (words[1] == "1");
+            current->_subCommands.push_back(entry);
+        }
+        else if (current && words.size() >= 2
+                 && toLower(words[0]) == "logcomment")
+        {
+            // logcomment rest-of-line
+            auto entry = std::make_shared<_CommandEntry>();
+            entry->_commandAction = _CommandEntry::eLog;
+            entry->_action        = qtac::ByteArray("logcomment");
+            // Re-join words[1..] for the comment text
+            std::string comment;
+            for (size_t i = 1; i < words.size(); ++i)
+            {
+                if (i > 1) comment += ' ';
+                comment += words[i].toStdString();
+            }
+            entry->_arguement = qtac::String(comment);
+            current->_subCommands.push_back(entry);
+        }
+        else if (current && words.size() >= 2
+                 && toLower(words[0]) == "delay")
+        {
+            auto entry = std::make_shared<_CommandEntry>();
+            entry->_commandAction = _CommandEntry::eDelay;
+            entry->_action        = qtac::ByteArray("delay");
+
+            if (isVariableRef(words[1]))
+            {
+                // Variable reference: store the "$VarName" string — substituted later
+                entry->_arguement = words[1];
+                current->_subCommands.push_back(entry);
+            }
+            else
+            {
+                bool ok = false;
+                const std::string& ds = words[1].toStdString();
+                int delayMs = 0;
+                try { delayMs = std::stoi(ds); ok = true; }
+                catch (...) {}
+
+                if (ok && delayMs > 0 && delayMs < 15000)
+                {
+                    entry->_arguement = static_cast<unsigned int>(delayMs);
+                    current->_subCommands.push_back(entry);
+                }
+                else
+                {
+                    result = false;
+                }
+            }
+        }
+        else if (current && words.size() == 1)
+        {
+            // Single word: sub-function call
+            if (!startsWith(words[0], "//"))
+            {
+                auto entry = std::make_shared<_CommandEntry>();
+                entry->_commandAction = _CommandEntry::eBaseCommand;
+                entry->_action        = words[0].toLatin1();
+                current->_subCommands.push_back(entry);
+            }
+        }
+        // else: blank line, comment, or unrecognised — skip silently
+    }
+
+    return result;
+}
+
+// -----------------------------------------------------------------------
+// hasCommand / getCommand
+// -----------------------------------------------------------------------
+
+bool AlpacaScript::hasCommand(const qtac::ByteArray& command) const
+{
+    qtac::String key(command.data(), static_cast<int>(command.size()));
+    return _scriptCommands.contains(key);
+}
+
+ScriptCommand AlpacaScript::getCommand(const qtac::ByteArray& command) const
+{
+    qtac::String key(command.data(), static_cast<int>(command.size()));
+    auto it = _scriptCommands.find(key);
+    if (it != _scriptCommands.end())
+        return it->second;
+    return {};
+}
+
+// -----------------------------------------------------------------------
+// getCommandEntries / processCommandEntries
+// -----------------------------------------------------------------------
+
+CommandEntries AlpacaScript::getCommandEntries(const qtac::ByteArray& command) const
+{
+    CommandEntries result;
+    ScriptCommand sc = getCommand(command);
+    if (sc)
+        processCommandEntries(sc, result, 1);
+    return result;
+}
+
+void AlpacaScript::processCommandEntries(ScriptCommand    sc,
+                                          CommandEntries&  out,
+                                          int              level) const
+{
+    if (!sc) return;
+
+    for (const auto& entry : sc->_subCommands)
+    {
+        switch (entry->_commandAction)
+        {
+        case _CommandEntry::eSetPin:
+        case _CommandEntry::eLog:
+        case _CommandEntry::eDelay:
+            out.push_back(entry);
+            break;
+
+        case _CommandEntry::eBaseCommand:
+            if (level < 7)
+            {
+                ScriptCommand child = getCommand(entry->_action);
+                processCommandEntries(child, out, level + 1);
+            }
+            break;
+
+        default:
+            break;
+        }
+    }
+}
+
+// -----------------------------------------------------------------------
+// replaceTokens — substitute $VarName in delay and logcomment entries
+// -----------------------------------------------------------------------
+
+CommandEntries AlpacaScript::replaceTokens(const VariableEntries& variables,
+                                            const CommandEntries&  commandEntries)
+{
+    // Deep-copy
+    CommandEntries result;
+    result.reserve(commandEntries.size());
+    for (const auto& src : commandEntries)
+    {
+        auto dst = std::make_shared<_CommandEntry>();
+        dst->_commandAction = src->_commandAction;
+        dst->_action        = src->_action;
+        dst->_arguement     = src->_arguement;
+        dst->_pinID         = src->_pinID;
+        result.push_back(dst);
+    }
+
+    // Replace $VarName tokens
+    for (auto& entry : result)
+    {
+        if (entry->_commandAction == _CommandEntry::eDelay)
+        {
+            qtac::String varRef = entry->_arguement.toString();
+            if (isVariableRef(varRef))
+            {
+                // Strip '$' to get variable name
+                qtac::String varName = qtac::String(varRef.toStdString().substr(1));
+                auto it = variables.find(varName);
+                if (it != variables.end())
+                    entry->_arguement = static_cast<unsigned int>(it->second._defaultValue.toUInt());
+            }
+        }
+        else if (entry->_commandAction == _CommandEntry::eLog)
+        {
+            qtac::String text = entry->_arguement.toString();
+            auto words = splitLine(text);
+            std::string out;
+            for (size_t i = 0; i < words.size(); ++i)
+            {
+                if (i > 0) out += ' ';
+                if (isVariableRef(words[i]))
+                {
+                    qtac::String varName = qtac::String(words[i].toStdString().substr(1));
+                    auto it = variables.find(varName);
+                    if (it != variables.end())
+                        out += it->second._defaultValue.toString().toStdString();
+                    else
+                        out += words[i].toStdString();
+                }
+                else
+                {
+                    out += words[i].toStdString();
+                }
+            }
+            entry->_arguement = qtac::String(out);
+        }
+    }
+
+    return result;
+}
+
+} // namespace qtac
diff --git a/source/library/src/DriveThread.cpp b/source/library/src/DriveThread.cpp
new file mode 100644
index 00000000..b114d993
--- /dev/null
+++ b/source/library/src/DriveThread.cpp
@@ -0,0 +1,85 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+
+#include <qtac/DriveThread.h>
+#include <qtac/ProtocolInterface.h>
+
+namespace qtac {
+
+std::atomic<int> DriveThread::_driveTrainIDs{1};
+
+DriveThread::DriveThread()
+{
+    _driveTrainID = _driveTrainIDs.fetch_add(1);
+}
+
+DriveThread::~DriveThread()
+{
+    if (_thread.joinable())
+        _thread.join();
+}
+
+void DriveThread::shutDown()
+{
+    if (stopRunning())
+    {
+        if (_thread.joinable())
+            _thread.join();
+    }
+}
+
+void DriveThread::addDelay(uint32_t delayInMilliSeconds, ReceiveInterface* receiveInterface)
+{
+    if (_protocolInterface != nullptr)
+        _protocolInterface->queueDelay(delayInMilliSeconds, receiveInterface);
+}
+
+void DriveThread::addLogComment(const qtac::ByteArray& comment)
+{
+    if (_protocolInterface != nullptr)
+        _protocolInterface->queueLogComment(comment);
+}
+
+void DriveThread::addEndTransaction(ReceiveInterface* receiveInterface)
+{
+    if (_protocolInterface != nullptr)
+        _protocolInterface->queueEndTransaction(receiveInterface);
+}
+
+void DriveThread::setProtocolInterface(ProtocolInterface* protocolInterface)
+{
+    _protocolInterface = protocolInterface;
+}
+
+} // namespace qtac
diff --git a/source/library/src/FTDIChipset.cpp b/source/library/src/FTDIChipset.cpp
new file mode 100644
index 00000000..8500a2d0
--- /dev/null
+++ b/source/library/src/FTDIChipset.cpp
@@ -0,0 +1,742 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: msimpson, biswroy
+
+#include <qtac/FTDIChipset.h>
+#include <qtac/StringUtilities.h>
+#include <qtac/version.h>
+
+// FTDI D2XX
+#include "ftd2xx.h"
+
+#include <fstream>
+#include <sstream>
+#include <map>
+#include <string>
+#include <cstdlib>
+#ifdef _WIN32
+#  include <windows.h>
+#else
+#  include <sys/stat.h> // mkdir
+#endif
+
+// -----------------------------------------------------------------------
+// Minimal key-value settings store (replaces QSettings)
+// On Windows: stores VTP port assignments in the registry at
+//   HKCU\Software\Qualcomm, Inc.\QTAC\VTPs
+// matching the path used by the Qt DLL (QSettings UserScope).
+// On Linux: stores in ~/.qtac/vtps.ini.
+// -----------------------------------------------------------------------
+
+namespace {
+
+#ifdef _WIN32
+
+static const wchar_t* kRegPath = L"Software\\Qualcomm, Inc.\\QTAC\\VTPs";
+
+std::map<std::string, std::string> loadSettings()
+{
+	std::map<std::string, std::string> m;
+	HKEY hKey;
+	if (RegOpenKeyExW(HKEY_CURRENT_USER, kRegPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS)
+		return m;
+
+	DWORD index = 0;
+	wchar_t valueName[256];
+	BYTE   data[256];
+	DWORD  nameLen, dataLen, type;
+	while (true)
+	{
+		nameLen = sizeof(valueName) / sizeof(wchar_t);
+		dataLen = sizeof(data);
+		LONG ret = RegEnumValueW(hKey, index++, valueName, &nameLen,
+		                         nullptr, &type, data, &dataLen);
+		if (ret == ERROR_NO_MORE_ITEMS) break;
+		if (ret != ERROR_SUCCESS) break;
+		if (type != REG_SZ && type != REG_DWORD) continue;
+
+		// Convert wide name to narrow
+		char narrowName[256]{};
+		WideCharToMultiByte(CP_ACP, 0, valueName, -1,
+		                    narrowName, sizeof(narrowName), nullptr, nullptr);
+
+		if (type == REG_DWORD)
+		{
+			DWORD dw = *reinterpret_cast<DWORD*>(data);
+			m[narrowName] = std::to_string(dw);
+		}
+		else
+		{
+			// REG_SZ — data is wide string
+			char narrowVal[256]{};
+			WideCharToMultiByte(CP_ACP, 0,
+			                    reinterpret_cast<wchar_t*>(data), -1,
+			                    narrowVal, sizeof(narrowVal), nullptr, nullptr);
+			m[narrowName] = narrowVal;
+		}
+	}
+	RegCloseKey(hKey);
+	return m;
+}
+
+void saveSettings(const std::map<std::string, std::string>& m)
+{
+	HKEY hKey;
+	RegCreateKeyExW(HKEY_CURRENT_USER, kRegPath, 0, nullptr,
+	                REG_OPTION_NON_VOLATILE, KEY_WRITE, nullptr, &hKey, nullptr);
+
+	for (const auto& kv : m)
+	{
+		wchar_t wideName[256]{};
+		MultiByteToWideChar(CP_ACP, 0, kv.first.c_str(), -1,
+		                    wideName, sizeof(wideName) / sizeof(wchar_t));
+
+		// NextPortNumber is stored as DWORD to match QSettings behaviour
+		if (kv.first == "NextPortNumber")
+		{
+			DWORD dw = static_cast<DWORD>(std::stoul(kv.second));
+			RegSetValueExW(hKey, wideName, 0, REG_DWORD,
+			               reinterpret_cast<const BYTE*>(&dw), sizeof(dw));
+		}
+		else
+		{
+			wchar_t wideVal[256]{};
+			MultiByteToWideChar(CP_ACP, 0, kv.second.c_str(), -1,
+			                    wideVal, sizeof(wideVal) / sizeof(wchar_t));
+			RegSetValueExW(hKey, wideName, 0, REG_SZ,
+			               reinterpret_cast<const BYTE*>(wideVal),
+			               static_cast<DWORD>((wcslen(wideVal) + 1) * sizeof(wchar_t)));
+		}
+	}
+	RegCloseKey(hKey);
+}
+
+#else // Linux
+
+std::string settingsFilePath()
+{
+	const char* home = std::getenv("HOME");
+	std::string dir = home ? std::string(home) + "/.qtac" : ".";
+	return dir + "/vtps.ini";
+}
+
+std::map<std::string, std::string> loadSettings()
+{
+	std::map<std::string, std::string> m;
+	std::ifstream f(settingsFilePath());
+	if (!f.is_open()) return m;
+	std::string line;
+	while (std::getline(f, line))
+	{
+		auto eq = line.find('=');
+		if (eq == std::string::npos) continue;
+		m[line.substr(0, eq)] = line.substr(eq + 1);
+	}
+	return m;
+}
+
+void saveSettings(const std::map<std::string, std::string>& m)
+{
+	const char* home = std::getenv("HOME");
+	if (home)
+	{
+		std::string dir = std::string(home) + "/.qtac";
+		::mkdir(dir.c_str(), 0755);
+	}
+	std::ofstream f(settingsFilePath());
+	for (const auto& kv : m)
+		f << kv.first << "=" << kv.second << "\n";
+}
+
+#endif // _WIN32
+
+} // anonymous namespace
+
+// -----------------------------------------------------------------------
+
+namespace qtac {
+
+FTDIChipsetList _FTDIChipset::_ftdiChipsetList;
+
+_FTDIChipset::_FTDIChipset() = default;
+_FTDIChipset::~_FTDIChipset() = default;
+
+qtac::String _FTDIChipset::ftidStatusToString(unsigned long status)
+{
+	qtac::String code = qtac::String::number(static_cast<int>(status));
+	switch (status)
+	{
+	case FT_OK:                          return "Status Okay";
+	case FT_INVALID_HANDLE:              return "Invalid handle: " + code;
+	case FT_DEVICE_NOT_FOUND:            return "Device not found: " + code;
+	case FT_DEVICE_NOT_OPENED:           return "Device not opened: " + code;
+	case FT_IO_ERROR:                    return "IO error: " + code;
+	case FT_INSUFFICIENT_RESOURCES:      return "Insufficient resources: " + code;
+	case FT_INVALID_PARAMETER:           return "Invalid parameter: " + code;
+	case FT_INVALID_BAUD_RATE:           return "Invalid baud rate: " + code;
+	case FT_DEVICE_NOT_OPENED_FOR_ERASE: return "Device not opened for erase: " + code;
+	case FT_DEVICE_NOT_OPENED_FOR_WRITE: return "Device not opened for write: " + code;
+	case FT_FAILED_TO_WRITE_DEVICE:      return "Failed to write device: " + code;
+	case FT_EEPROM_READ_FAILED:          return "EEPROM read failed: " + code;
+	case FT_EEPROM_WRITE_FAILED:         return "EEPROM write failed: " + code;
+	case FT_EEPROM_ERASE_FAILED:         return "EEPROM erase failed: " + code;
+	case FT_EEPROM_NOT_PRESENT:          return "EEPROM not present: " + code;
+	case FT_EEPROM_NOT_PROGRAMMED:       return "EEPROM not programmed: " + code;
+	case FT_INVALID_ARGS:                return "Invalid arguments: " + code;
+	case FT_NOT_SUPPORTED:               return "Not supported: " + code;
+	case FT_OTHER_ERROR:                 return "Other error: " + code;
+	case FT_DEVICE_LIST_NOT_READY:       return "Device list not ready: " + code;
+	default:                             return "Status " + code + " not found";
+	}
+}
+
+bool _FTDIChipset::hasDevice(HashType portHash)
+{
+	for (const auto& dev : _ftdiChipsetList)
+		if (dev->hash() == portHash)
+			return true;
+	return false;
+}
+
+uint32_t _FTDIChipset::getDeviceCount()
+{
+	for (auto& dev : _ftdiChipsetList)
+		dev->reset();
+
+#ifdef _WIN32
+	windowsTraversal();
+#endif
+#ifdef __linux__
+	linuxTraversal();
+#endif
+
+	return static_cast<uint32_t>(_ftdiChipsetList.size());
+}
+
+FTDIChipset _FTDIChipset::getDevice(uint32_t deviceIndex)
+{
+	if (deviceIndex < static_cast<uint32_t>(_ftdiChipsetList.size()))
+		return _ftdiChipsetList.at(static_cast<int>(deviceIndex));
+	return FTDIChipset();
+}
+
+FTDIChipset _FTDIChipset::getDevice(const qtac::ByteArray& portName)
+{
+	for (auto& dev : _ftdiChipsetList)
+	{
+		if (dev->portName().contains(portName)) return dev;
+		if (dev->serialNumber().contains(portName)) return dev;
+	}
+	return FTDIChipset();
+}
+
+qtac::ByteArray _FTDIChipset::normalizeSerialNumber(const qtac::ByteArray& segmentSerialNumber)
+{
+	qtac::ByteArray sn{segmentSerialNumber};
+	// eFTDI devices have a bus suffix ('A','B','C','D') appended to the base
+	// serial number — strip the last character to get the base.
+	// eFT232H (BugHopper V1) does NOT have this suffix, so it is handled by
+	// the board-type-aware traversal code; here we always strip for backward
+	// compatibility with the existing eFTDI path.
+	if (!sn.isEmpty())
+		sn.remove(sn.length() - 1, 1);
+	return sn;
+}
+
+bool _FTDIChipset::open(FTDIPinSets pinsets)
+{
+	bool result{false};
+	uint8_t mask;
+	uint8_t mode;
+
+	if (_boardType == eFT232H)
+	{
+		mask = 0x0f;
+		mode = FT_BITMODE_CBUS_BITBANG;
+	}
+	else
+	{
+		mask = 0xff;
+		mode = FT_BITMODE_ASYNC_BITBANG;
+	}
+
+	FT_STATUS ftStatus;
+
+	if (testFlag(pinsets, eA) && !_aSerialNumber.isEmpty())
+	{
+		ftStatus = FT_OpenEx(_aSerialNumber.data(), FT_OPEN_BY_SERIAL_NUMBER, &_aHandle);
+		if (ftStatus == FT_OK)
+		{
+			FT_SetBitMode(_aHandle, mask, mode);
+			result = true;
+		}
+		else
+			_aHandle = nullptr;
+	}
+
+	if (testFlag(pinsets, eB) && !_bSerialNumber.isEmpty())
+	{
+		ftStatus = FT_OpenEx(_bSerialNumber.data(), FT_OPEN_BY_SERIAL_NUMBER, &_bHandle);
+		if (ftStatus == FT_OK)
+		{
+			FT_SetBitMode(_bHandle, mask, mode);
+			result = true;
+		}
+		else
+			_bHandle = nullptr;
+	}
+
+	if (testFlag(pinsets, eC) && !_cSerialNumber.isEmpty())
+	{
+		ftStatus = FT_OpenEx(_cSerialNumber.data(), FT_OPEN_BY_SERIAL_NUMBER, &_cHandle);
+		if (ftStatus == FT_OK)
+		{
+			FT_SetBitMode(_cHandle, mask, mode);
+			result = true;
+		}
+		else
+			_cHandle = nullptr;
+	}
+
+	if (testFlag(pinsets, eD) && !_dSerialNumber.isEmpty())
+	{
+		ftStatus = FT_OpenEx(_dSerialNumber.data(), FT_OPEN_BY_SERIAL_NUMBER, &_dHandle);
+		if (ftStatus == FT_OK)
+		{
+			FT_SetBitMode(_dHandle, mask, mode);
+			result = true;
+		}
+		else
+			_dHandle = nullptr;
+	}
+
+	return result;
+}
+
+bool _FTDIChipset::isOpen()
+{
+	return _aHandle != nullptr || _bHandle != nullptr
+	    || _cHandle != nullptr || _dHandle != nullptr;
+}
+
+void _FTDIChipset::close()
+{
+	auto closeHandle = [&](void*& handle) {
+		if (handle != nullptr)
+		{
+			FT_SetBitMode(handle, 0, 0);
+			FT_STATUS s = FT_Close(handle);
+			if (s == FT_OK) handle = nullptr;
+		}
+	};
+	closeHandle(_aHandle);
+	closeHandle(_bHandle);
+	closeHandle(_cHandle);
+	closeHandle(_dHandle);
+}
+
+PlatformID _FTDIChipset::platformID()
+{
+	return _platformID;
+}
+
+void _FTDIChipset::setPlatformID(PlatformID platformID)
+{
+	_platformID = platformID;
+}
+
+qtac::String _FTDIChipset::versionString()
+{
+	return PlatformContainer::toString(_platformID) + " " + firmwareString();
+}
+
+qtac::String _FTDIChipset::firmwareString()
+{
+	return qtac::String(TAC_LIB_VERSION);
+}
+
+HashType _FTDIChipset::hash()
+{
+	return _hash;
+}
+
+qtac::ByteArray _FTDIChipset::serialNumber()
+{
+	return _serialNumber;
+}
+
+bool _FTDIChipset::newDevice()
+{
+	bool result{_new};
+	_new = false;
+	return result;
+}
+
+qtac::ByteArray _FTDIChipset::aSerialNumber() { return _aSerialNumber; }
+qtac::ByteArray _FTDIChipset::bSerialNumber() { return _bSerialNumber; }
+qtac::ByteArray _FTDIChipset::cSerialNumber() { return _cSerialNumber; }
+qtac::ByteArray _FTDIChipset::dSerialNumber() { return _dSerialNumber; }
+
+void _FTDIChipset::setASerialNumber(const qtac::ByteArray& sn)
+{
+	if (_aSerialNumber.isEmpty()) { setupHash(sn); _aSerialNumber = sn; }
+}
+void _FTDIChipset::setBSerialNumber(const qtac::ByteArray& sn)
+{
+	if (_bSerialNumber.isEmpty()) { setupHash(sn); _bSerialNumber = sn; }
+}
+void _FTDIChipset::setCSerialNumber(const qtac::ByteArray& sn)
+{
+	if (_cSerialNumber.isEmpty()) { setupHash(sn); _cSerialNumber = sn; }
+}
+void _FTDIChipset::setDSerialNumber(const qtac::ByteArray& sn)
+{
+	if (_dSerialNumber.isEmpty()) { setupHash(sn); _dSerialNumber = sn; }
+}
+
+bool _FTDIChipset::write(uint8_t pin, bool state)
+{
+	void* handle{nullptr};
+	CharBit* charBit{nullptr};
+
+	if (pin <= 7 && _aHandle != nullptr)
+	{
+		handle = _aHandle; _aPins.set(pin, state); charBit = &_aPins;
+	}
+	else if (pin <= 15 && _bHandle != nullptr)
+	{
+		handle = _bHandle; _bPins.set(pin, state); charBit = &_bPins;
+	}
+	else if (pin <= 23 && _cHandle != nullptr)
+	{
+		handle = _cHandle; _cPins.set(pin, state); charBit = &_cPins;
+	}
+	else if (pin <= 31 && _dHandle != nullptr)
+	{
+		handle = _dHandle; _dPins.set(pin, state); charBit = &_dPins;
+	}
+
+	if (handle != nullptr && charBit != nullptr)
+	{
+		FT_STATUS status{FT_OTHER_ERROR};
+
+		if (_boardType == eFT232H)
+		{
+			uint8_t logicalValue = *charBit->value();
+			uint8_t writeValue   = logicalValue ^ _invertMask;
+			uint8_t cbusValue    = static_cast<uint8_t>((0x0F << 4) | writeValue);
+
+			status = FT_SetBitMode(handle, cbusValue, FT_BITMODE_CBUS_BITBANG);
+		}
+		else
+		{
+			DWORD byteWritten;
+			status = FT_Write(handle, charBit->value(), 1, &byteWritten);
+		}
+
+		if (status == FT_OK) return true;
+		_lastError = ("FTDI Write Failed: " + _FTDIChipset::ftidStatusToString(status) + "\n").toLatin1();
+	}
+	return false;
+}
+
+HashType _FTDIChipset::hash(const qtac::ByteArray& serialNumber)
+{
+	return arrayHash(serialNumber);
+}
+
+void _FTDIChipset::setSerialNumber(const qtac::ByteArray& serialNumber)
+{
+	if (_serialNumber.isEmpty())
+	{
+		_serialNumber = serialNumber;
+		setupPortName();
+	}
+}
+
+unsigned long long _FTDIChipset::setCustomVIDPID()
+{
+	unsigned long long ftStatus = !FT_OK;
+#ifdef __linux__
+	ftStatus = FT_SetVIDPID(1027, 6552);
+#endif
+	return ftStatus;
+}
+
+void _FTDIChipset::setupHash(const qtac::ByteArray& segmentSerialNumber)
+{
+	if (_hash == 0)
+	{
+		qtac::ByteArray sn = _FTDIChipset::normalizeSerialNumber(segmentSerialNumber);
+		_hash = hash(sn);
+		_serialNumber = sn;
+	}
+}
+
+void _FTDIChipset::setupPortName()
+{
+	if (_portName.isEmpty() && !_serialNumber.isEmpty())
+	{
+		auto settings = loadSettings();
+		std::string key = _serialNumber.toStdString();
+
+		std::string vtpName;
+		if (settings.count(key))
+		{
+			vtpName = settings[key];
+		}
+		else
+		{
+			unsigned int nextPort = 1;
+			if (settings.count("NextPortNumber"))
+				nextPort = static_cast<unsigned int>(std::stoul(settings["NextPortNumber"]));
+
+			std::ostringstream oss;
+			oss << "VTP" << nextPort;
+			vtpName = oss.str();
+
+			settings[key] = vtpName;
+			settings["NextPortNumber"] = std::to_string(nextPort + 1);
+			saveSettings(settings);
+		}
+		_portName = qtac::ByteArray(vtpName.c_str());
+	}
+}
+
+PlatformID _FTDIChipset::nameToPlatform(const qtac::ByteArray& deviceName)
+{
+	return PlatformContainer::fromUSBDescriptor(deviceName);
+}
+
+// -----------------------------------------------------------------------
+// Platform traversal
+// -----------------------------------------------------------------------
+
+#ifdef __linux__
+void _FTDIChipset::linuxTraversal()
+{
+	FT_STATUS ftStatus;
+	DWORD deviceCount;
+
+	ftStatus = setCustomVIDPID();
+	if (ftStatus != FT_OK)
+		return;
+
+	ftStatus = FT_CreateDeviceInfoList(&deviceCount);
+	if (ftStatus != FT_OK || deviceCount == 0)
+		return;
+
+	FT_DEVICE_LIST_INFO_NODE* devInfoList = new FT_DEVICE_LIST_INFO_NODE[deviceCount];
+
+	ftStatus = FT_GetDeviceInfoList(devInfoList, &deviceCount);
+	if (ftStatus == FT_OK)
+	{
+		FT_HANDLE ftHandleTemp;
+		DWORD Flags, ID, Type, LocId;
+		char SerialNumber[16];
+		char Description[64];
+
+		for (DWORD i = 0; i < deviceCount; ++i)
+		{
+			ftStatus = FT_GetDeviceInfoDetail(i, &Flags, &Type, &ID, &LocId,
+			                                  SerialNumber, Description, &ftHandleTemp);
+
+			qtac::String desc(Description);
+
+			// BugHopper (FT232H) devices do not carry a bus-letter suffix.
+			bool isBugHopper = desc.endsWith("BugHopper");
+			qtac::ByteArray usbDescriptor = isBugHopper
+			    ? desc.toLatin1()
+			    : desc.left(desc.length() - 2).toLatin1();
+
+			if (PlatformContainer::fromUSBDescriptor(usbDescriptor) != MICRO_EPM_BOARD_ID_UNKNOWN
+			    || usbDescriptor.startsWith("ALPACA-LITE "))
+			{
+				PlatformID platformID = PlatformContainer::fromUSBDescriptor(usbDescriptor);
+				// Unprogrammed ALPACA-LITE boards have a generic factory descriptor not in
+				// devicelist.json.  Fall back to the generic ALPACA_LITE_ID so the device
+				// is still usable with the default pin configuration.
+				if (platformID == MICRO_EPM_BOARD_ID_UNKNOWN && usbDescriptor.startsWith("ALPACA-LITE "))
+					platformID = ALPACA_LITE_ID;
+
+				DebugBoardType boardType = PlatformContainer::getDebugBoardType(platformID);
+
+				qtac::ByteArray deviceSerialNumber(SerialNumber);
+				qtac::ByteArray serialNumber = (boardType == eFT232H)
+				    ? deviceSerialNumber
+				    : normalizeSerialNumber(deviceSerialNumber);
+
+				if (serialNumber.isEmpty()) continue;
+
+				uint32_t portHash = hash(serialNumber);
+				char segment = (!desc.isEmpty()) ? Description[desc.length() - 1] : 0;
+
+				FTDIChipset ftdiChipset;
+				if (hasDevice(portHash))
+					ftdiChipset = getDevice(serialNumber);
+				else
+				{
+					ftdiChipset = FTDIChipset(new _FTDIChipset);
+					ftdiChipset->setPlatformID(platformID);
+					ftdiChipset->setBoardType(boardType);
+					_ftdiChipsetList.append(ftdiChipset);
+				}
+
+				ftdiChipset->setSerialNumber(serialNumber);
+				if (ftdiChipset->_usbDescriptor.isEmpty())
+					ftdiChipset->_usbDescriptor = usbDescriptor;
+
+				if (isBugHopper)
+				{
+					ftdiChipset->setASerialNumber(deviceSerialNumber);
+				}
+				else
+				{
+					switch (segment)
+					{
+					case 'A': case 'a': ftdiChipset->setASerialNumber(deviceSerialNumber); break;
+					case 'B': case 'b': ftdiChipset->setBSerialNumber(deviceSerialNumber); break;
+					case 'C': case 'c':
+					case 'R': case 'r': ftdiChipset->setCSerialNumber(deviceSerialNumber); break;
+					case 'D': case 'd': ftdiChipset->setDSerialNumber(deviceSerialNumber); break;
+					}
+				}
+				ftdiChipset->_active = true;
+			}
+		}
+	}
+
+	delete[] devInfoList; // nosemgrep
+}
+
+void _FTDIChipset::windowsTraversal() {}
+#endif // __linux__
+
+#ifdef _WIN32
+void _FTDIChipset::linuxTraversal() {}
+
+void _FTDIChipset::windowsTraversal()
+{
+	FT_STATUS ftStatus;
+	DWORD deviceCount;
+
+	ftStatus = FT_CreateDeviceInfoList(&deviceCount);
+	if (ftStatus != FT_OK || deviceCount == 0)
+		return;
+
+	FT_DEVICE_LIST_INFO_NODE* devInfoList = new FT_DEVICE_LIST_INFO_NODE[deviceCount];
+
+	ftStatus = FT_GetDeviceInfoList(devInfoList, &deviceCount);
+	if (ftStatus == FT_OK)
+	{
+		for (DWORD i = 0; i < deviceCount; ++i)
+		{
+			qtac::String desc(devInfoList[i].Description);
+
+			// BugHopper (FT232H) devices do not carry a bus-letter suffix in
+			// their description — the whole description is the USB descriptor.
+			// All other FTDI devices have a 2-character segment suffix (e.g. " A").
+			bool isBugHopper = desc.endsWith("BugHopper");
+			qtac::ByteArray usbDescriptor = isBugHopper
+			    ? desc.toLatin1()
+			    : desc.left(desc.length() - 2).toLatin1();
+
+			if (PlatformContainer::fromUSBDescriptor(usbDescriptor) != MICRO_EPM_BOARD_ID_UNKNOWN
+			    || usbDescriptor.startsWith("ALPACA-LITE "))
+			{
+				PlatformID platformID = PlatformContainer::fromUSBDescriptor(usbDescriptor);
+				// Unprogrammed ALPACA-LITE boards have a generic factory descriptor not in
+				// devicelist.json.  Fall back to the generic ALPACA_LITE_ID so the device
+				// is still usable with the default pin configuration.
+				if (platformID == MICRO_EPM_BOARD_ID_UNKNOWN && usbDescriptor.startsWith("ALPACA-LITE "))
+					platformID = ALPACA_LITE_ID;
+
+				DebugBoardType boardType = PlatformContainer::getDebugBoardType(platformID);
+
+				qtac::ByteArray deviceSerialNumber(devInfoList[i].SerialNumber);
+				// eFTDI devices append a bus letter to the serial number; strip it.
+				// eFT232H (BugHopper) serial numbers have no such suffix.
+				qtac::ByteArray serialNumber = (boardType == eFT232H)
+				    ? deviceSerialNumber
+				    : normalizeSerialNumber(deviceSerialNumber);
+
+				if (serialNumber.isEmpty()) continue;
+
+				uint32_t portHash = hash(serialNumber);
+				char segment = (!desc.isEmpty()) ? devInfoList[i].Description[desc.length() - 1] : 0;
+
+				FTDIChipset ftdiChipset;
+				if (hasDevice(portHash))
+					ftdiChipset = getDevice(serialNumber);
+				else
+				{
+					ftdiChipset = FTDIChipset(new _FTDIChipset);
+					ftdiChipset->setPlatformID(platformID);
+					ftdiChipset->setBoardType(boardType);
+					_ftdiChipsetList.append(ftdiChipset);
+				}
+
+				ftdiChipset->setSerialNumber(serialNumber);
+				if (ftdiChipset->_usbDescriptor.isEmpty())
+					ftdiChipset->_usbDescriptor = usbDescriptor;
+
+				// BugHopper (FT232H) has a single channel; map it to 'A'.
+				// Standard FTDI devices use A/B/C/D suffix letters.
+				if (isBugHopper)
+				{
+					ftdiChipset->setASerialNumber(deviceSerialNumber);
+				}
+				else
+				{
+					switch (segment)
+					{
+					case 'A': case 'a': ftdiChipset->setASerialNumber(deviceSerialNumber); break;
+					case 'B': case 'b': ftdiChipset->setBSerialNumber(deviceSerialNumber); break;
+					case 'C': case 'c':
+					case 'R': case 'r': ftdiChipset->setCSerialNumber(deviceSerialNumber); break;
+					case 'D': case 'd': ftdiChipset->setDSerialNumber(deviceSerialNumber); break;
+					}
+				}
+				ftdiChipset->_active = true;
+
+				if (devInfoList[i].Flags == FT_FLAGS_OPENED)
+					ftdiChipset->_lastError = "QTAC failed to enumerate all connected FTDI devices as they are in use";
+			}
+		}
+	}
+
+	delete[] devInfoList; // nosemgrep
+}
+#endif // _WIN32
+
+} // namespace qtac
diff --git a/source/library/src/FTDIDevice.cpp b/source/library/src/FTDIDevice.cpp
new file mode 100644
index 00000000..c28bdfcf
--- /dev/null
+++ b/source/library/src/FTDIDevice.cpp
@@ -0,0 +1,427 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Michael Simpson
+
+#include <qtac/FTDIDevice.h>
+#include <qtac/FTDIChipset.h>
+#include <qtac/TACLiteDriveThread.h>
+#include <qtac/StringUtilities.h>
+#include <qtac/PlatformID.h>
+#include <qtac/TcnfLoader.h>
+
+// FTDI D2XX
+#include "ftd2xx.h"
+
+#include <cstring>
+#include <thread>
+#include <chrono>
+
+// -----------------------------------------------------------------------
+// FTDI library lifetime management (static init/finalise for static D2XX)
+// -----------------------------------------------------------------------
+
+namespace {
+
+struct FTDIInitializer
+{
+	FTDIInitializer()
+	{
+#if defined(FTD2XX_STATIC)
+		FT_Initialise();
+#endif
+	}
+	~FTDIInitializer()
+	{
+#if defined(FTD2XX_STATIC)
+		FT_Finalise();
+#endif
+	}
+} gFTDIInitializer;
+
+} // anonymous namespace
+
+// -----------------------------------------------------------------------
+
+bool FTDIDevice::programDevice(AlpacaDevice alpacaDevice,
+                                PlatformID platformID,
+                                qtac::ByteArray& errorMessage)
+{
+	bool result{false};
+
+	// Retrieve the platform entry
+	PlatformIDList entries = PlatformContainer::getEntries();
+	_PlatformEntry* matchedEntry = nullptr;
+	for (auto& entry : entries)
+	{
+		if (entry && entry->_platformID == platformID)
+		{
+			matchedEntry = entry.get();
+			break;
+		}
+	}
+
+	if (matchedEntry == nullptr)
+		return false;
+
+	FT_STATUS ftStatus;
+	FT_HANDLE ftHandle{nullptr};
+
+	qtac::ByteArray serialNumber = alpacaDevice->serialNumber() + "A";
+	qtac::ByteArray usbDescriptor = matchedEntry->_usbDescriptor;
+
+	if (usbDescriptor.isEmpty())
+		usbDescriptor = "ALPACA-LITE MTP DEBUG BOARD";
+
+	ftStatus = FT_OpenEx(serialNumber.data(), FT_OPEN_BY_SERIAL_NUMBER, &ftHandle);
+	if (ftStatus == FT_OK)
+	{
+		FT_PROGRAM_DATA ftData;
+		::memset(&ftData, 0, sizeof(FT_PROGRAM_DATA));
+
+		char manufacturerBuf[32];
+		char manufacturerIdBuf[16];
+		char descriptionBuf[64];
+		char serialNumberBuf[16];
+
+		ftData.Signature1   = 0x00000000;
+		ftData.Signature2   = 0xffffffff;
+		ftData.Version      = 0x00000008;
+		ftData.Manufacturer = manufacturerBuf;
+		ftData.ManufacturerId = manufacturerIdBuf;
+		ftData.Description  = descriptionBuf;
+		ftData.SerialNumber = serialNumberBuf;
+
+		ftStatus = FT_EE_Read(ftHandle, &ftData);
+		if (ftStatus == FT_OK)
+		{
+			size_t copyLen = static_cast<size_t>(usbDescriptor.size());
+			if (copyLen >= sizeof(descriptionBuf))
+				copyLen = sizeof(descriptionBuf) - 1;
+			::memcpy(descriptionBuf, usbDescriptor.data(), copyLen);
+			descriptionBuf[copyLen] = '\0';
+
+			ftData.AIsVCP8 = testFlag(matchedEntry->_pinSets[0], eA) ? 0 : 1;
+			ftData.BIsVCP8 = testFlag(matchedEntry->_pinSets[0], eB) ? 0 : 1;
+			ftData.CIsVCP8 = testFlag(matchedEntry->_pinSets[0], eC) ? 0 : 1;
+			ftData.DIsVCP8 = testFlag(matchedEntry->_pinSets[0], eD) ? 0 : 1;
+
+			ftStatus = FT_EE_Program(ftHandle, &ftData);
+			if (ftStatus == FT_OK)
+			{
+				result = true;
+				FT_CyclePort(ftHandle);
+			}
+			else
+			{
+				errorMessage = ("FT_EE_Program failed Error Code: "
+				               + _FTDIChipset::ftidStatusToString(ftStatus) + "\n").toLatin1();
+			}
+		}
+		else
+		{
+			errorMessage = ("FT_EE_Read failed Error Code: "
+			               + _FTDIChipset::ftidStatusToString(ftStatus) + "\n").toLatin1();
+		}
+
+		FT_Close(ftHandle);
+	}
+	else
+	{
+		errorMessage = ("FT_OpenEx failed Error Code: "
+		               + _FTDIChipset::ftidStatusToString(ftStatus) + "\n").toLatin1();
+	}
+
+	return result;
+}
+
+uint32_t FTDIDevice::updateAlpacaDevices()
+{
+	std::lock_guard<std::recursive_mutex> lock(_mutex);
+	uint32_t deviceCount = _FTDIChipset::getDeviceCount();
+
+	for (uint32_t deviceIndex = 0; deviceIndex < deviceCount; ++deviceIndex)
+	{
+		FTDIChipset ftdiChipset = _FTDIChipset::getDevice(deviceIndex);
+
+		HashType hash = ftdiChipset->hash();
+
+		AlpacaDevice alpacaDevice = _AlpacaDevice::findAlpacaDevice(hash);
+		if (alpacaDevice == nullptr)
+		{
+			FTDIDevice* ftdiDevice = new FTDIDevice;
+
+			ftdiDevice->_active          = true;
+			ftdiDevice->_boardType       = ftdiChipset->boardType();
+			ftdiDevice->_portName        = ftdiChipset->portName();
+			ftdiDevice->_hash            = hash;
+			ftdiDevice->_chipVersion     = 10000;
+			ftdiDevice->_usbDescriptor   = ftdiChipset->usbDescriptor();
+			ftdiDevice->_serialNumber    = ftdiChipset->serialNumber();
+			ftdiDevice->_platformID      = ftdiChipset->platformID();
+
+			// Find description from platform registry
+			PlatformIDList entries = PlatformContainer::getEntries();
+			for (auto& entry : entries)
+			{
+				if (entry && entry->_platformID == ftdiDevice->_platformID)
+				{
+					ftdiDevice->_description = entry->_description.toLatin1();
+					break;
+				}
+			}
+
+			alpacaDevice = AlpacaDevice(ftdiDevice);
+			_AlpacaDevice::_alpacaDevices.append(alpacaDevice);
+		}
+		else
+		{
+			alpacaDevice->setActive();
+		}
+	}
+
+	return static_cast<uint32_t>(_AlpacaDevice::_alpacaDevices.size());
+}
+
+bool FTDIDevice::open()
+{
+	const int maxIterations{50};
+	bool result{false};
+
+	// The drive thread must be injected by the caller before calling open().
+	if (_driveThread == nullptr)
+	{
+		_lastError = "No drive thread set";
+		return false;
+	}
+
+	// Load platform configuration before starting the drive thread so we can
+	// configure the correct bus pinset (D2XX-only, skipping VCP buses).
+	if (_ftdiPlatformConfiguration == nullptr && _platformID != MICRO_EPM_BOARD_ID_UNKNOWN)
+	{
+		PlatformIDList entries = PlatformContainer::getEntries();
+		for (auto& entry : entries)
+		{
+			if (entry && entry->_platformID == _platformID)
+			{
+				if (!entry->_path.isEmpty())
+				{
+					auto* cfg = new _FTDIPlatformConfiguration(0);
+					if (TcnfLoader::loadFTDI(entry->_path.toStdString(), cfg))
+						_ftdiPlatformConfiguration = cfg;
+					else
+						delete cfg;
+				}
+				else if (_platformID == ALPACA_LITE_ID)
+				{
+					// Generic ALPACA-LITE board: no tcnf registered, use hardcoded
+					// default pin configuration (same as Qt's initialize(chipCount=1)).
+					_ftdiPlatformConfiguration = new _FTDIPlatformConfiguration(1);
+				}
+				break;
+			}
+		}
+	}
+
+	// Only open D2XX buses (skip VCP buses A/B for devices like platform 13).
+	// Mirrors legacy FTDIDevice::open() which calls setPinSets(getPinSet(0)).
+	// Must be set before start() so FTDIChipset::open() uses the correct mask.
+	if (_ftdiPlatformConfiguration != nullptr)
+	{
+		_driveThread->setPinSets(_ftdiPlatformConfiguration->getPinSet(0));
+
+		// For FT232H (BugHopper V1) devices, build an invert mask from pins
+		// marked as inverted in the platform configuration.
+		if (_boardType == eFT232H)
+		{
+			uint8_t invertMask = 0;
+			for (const auto& pin : _ftdiPlatformConfiguration->getActivePins())
+			{
+				if (pin._inverted)
+					invertMask |= static_cast<uint8_t>(1 << (pin._setPin % 8));
+			}
+			static_cast<qtac::TACLiteDriveThread*>(_driveThread)->setInvertMask(invertMask);
+		}
+	}
+
+	_driveThread->start();
+
+	for (int count = 0; count < maxIterations; ++count)
+	{
+		std::this_thread::sleep_for(std::chrono::milliseconds(20));
+		result = _driveThread->weAreRunning();
+		if (result) break;
+	}
+
+	if (!result)
+	{
+		_lastError = "Device did not become ready after open";
+		return false;
+	}
+
+	if (_ftdiPlatformConfiguration != nullptr)
+		buildMapping();
+
+	if (result)
+	{
+		// Wire up pin-state signal
+		_driveThread->onPinStateChanged.connect([this](uint64_t pin, bool state) {
+			this->on_pinStateChanged(pin, state);
+		});
+
+		// Initialize pins with their initial values, sorted by priority.
+		// Use getAllPins() (not getPins()/getActivePins()) so that disabled
+		// pins with initial_value=true — e.g. TC_READY_N — are also written.
+		// TC_READY_N must be driven HIGH before any script pin writes take effect.
+		FTDIPinList initialFtdiPins;
+		if (_ftdiPlatformConfiguration != nullptr)
+		{
+			FTDIPinList allFtdiPins = _ftdiPlatformConfiguration->getAllPins();
+			for (const auto& pin : allFtdiPins)
+				if (pin._initialValue)
+					initialFtdiPins.append(pin);
+		}
+
+		if (!initialFtdiPins.isEmpty())
+		{
+			std::sort(initialFtdiPins.begin(), initialFtdiPins.end(),
+				[](const FTDIPinData& a, const FTDIPinData& b) {
+					return a._initializationPriority < b._initializationPriority;
+				});
+
+			for (const auto& initPin : initialFtdiPins)
+				_driveThread->setPinState(initPin._setPin, initPin._initialValue);
+		}
+	}
+
+	return result;
+}
+
+void FTDIDevice::buildMapping()
+{
+	if (_ftdiPlatformConfiguration == nullptr)
+		return;
+	buildCommandList();
+}
+
+void FTDIDevice::buildCommandList()
+{
+	if (!_commands.isEmpty())
+		return;
+
+	if (_ftdiPlatformConfiguration == nullptr)
+		return;
+
+	FTDIPinList ftdiPinList = _ftdiPlatformConfiguration->getActivePins();
+
+	for (const auto& ftdiPin : ftdiPinList)
+	{
+		TACCommand tacCommand;
+
+		tacCommand._pin          = ftdiPin._setPin;
+		tacCommand._command      = ftdiPin._pinCommand;
+		tacCommand._helpText     = ftdiPin._pinTooltip;
+		tacCommand._currentState = ftdiPin._initialValue;
+		tacCommand._isInverted   = ftdiPin._inverted;
+		tacCommand._tabName      = ftdiPin._tabName.toLatin1();
+		tacCommand._groupName    = CommandGroup::toString(ftdiPin._commandGroup).toLatin1();
+
+		qtac::ByteArray cellLocation =
+			qtac::ByteArray::number(ftdiPin._cellLocation.x()) + ","
+			+ qtac::ByteArray::number(ftdiPin._cellLocation.y());
+		tacCommand._cellLocation = cellLocation;
+
+		_commands[tacCommand._command] = tacCommand;
+	}
+}
+
+Pins FTDIDevice::getPins()
+{
+	if (_ftdiPlatformConfiguration == nullptr)
+		return {};
+	return _ftdiPlatformConfiguration->getPins();
+}
+
+qtac::StringList FTDIDevice::getTabs() const
+{
+	if (_ftdiPlatformConfiguration == nullptr)
+		return {};
+	return _ftdiPlatformConfiguration->getTabs();
+}
+
+void FTDIDevice::quickCommand(const qtac::ByteArray& command)
+{
+	if (_ftdiPlatformConfiguration == nullptr || _driveThread == nullptr)
+		return;
+
+	const qtac::AlpacaScript& script = _ftdiPlatformConfiguration->getScript();
+	if (!script.hasCommand(command))
+		return;
+
+	qtac::CommandEntries entries = script.getCommandEntries(command);
+	entries = qtac::AlpacaScript::replaceTokens(
+	    _ftdiPlatformConfiguration->getVariables(), entries);
+
+	_driveThread->sendCommandSequence(entries);
+}
+
+void FTDIDevice::setVariableValue(const qtac::String& name, const qtac::Variant& value)
+{
+	if (_ftdiPlatformConfiguration != nullptr)
+		_ftdiPlatformConfiguration->setVariableValue(name, value);
+}
+
+const qtac::ButtonEntries& FTDIDevice::getButtons() const
+{
+	static qtac::ButtonEntries empty;
+	if (_ftdiPlatformConfiguration == nullptr) return empty;
+	return _ftdiPlatformConfiguration->getButtons();
+}
+
+const qtac::VariableEntries& FTDIDevice::getVariables() const
+{
+	static qtac::VariableEntries empty;
+	if (_ftdiPlatformConfiguration == nullptr) return empty;
+	return _ftdiPlatformConfiguration->getVariables();
+}
+
+qtac::String FTDIDevice::configModificationDate() const
+{
+	if (_ftdiPlatformConfiguration == nullptr) return {};
+	return _ftdiPlatformConfiguration->modificationDate();
+}
+
+int FTDIDevice::configFileVersion() const
+{
+	if (_ftdiPlatformConfiguration == nullptr) return 0;
+	return _ftdiPlatformConfiguration->fileVersion();
+}
diff --git a/source/library/src/FTDIPlatformConfiguration.cpp b/source/library/src/FTDIPlatformConfiguration.cpp
new file mode 100644
index 00000000..71112d05
--- /dev/null
+++ b/source/library/src/FTDIPlatformConfiguration.cpp
@@ -0,0 +1,800 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Biswajit Roy, Michael Simpson
+
+#include <qtac/FTDIPlatformConfiguration.h>
+#include <qtac/StringUtilities.h>
+
+#include <algorithm>
+#include <stdexcept>
+
+// JSON key constants
+static const char* kTabs           = "tabs";
+
+static const char* kChipCount   = "chip_count";
+static const char* kChipIndex   = "chip_index";
+static const char* kBus         = "bus";
+static const char* kPinNumber   = "pin_number";
+static const char* kEnabled     = "enabled";
+static const char* kInput       = "input";
+static const char* kName        = "name";
+static const char* kToolTip     = "help_hint";
+static const char* kInitialValue = "initial_value";
+static const char* kPriority    = "priority";
+static const char* kInverted    = "inverted";
+static const char* kCommand     = "command";
+static const char* kCommandGroup = "command_group";
+static const char* kRunPriority = "run_priority";
+static const char* kTabName     = "group";
+static const char* kBusFunction = "bus_function";
+static const char* kPinEntries  = "pins";
+static const char* kBusEntries  = "bus";
+static const char* kButtons          = "buttons";
+static const char* kButtonToolTip    = "tooltip";
+static const char* kModificationDate = "modification_date";
+static const char* kFileVersion      = "fileVersion";
+static const char* kVariables   = "variables";
+static const char* kScript      = "script";
+static const char* kLabel       = "label";
+static const char* kTab         = "tab";
+static const char* kCellLocation = "cellLocation";
+static const char* kDefaultValue = "default_value";
+static const char* kType        = "type";
+
+static const int kMaximumChipCount{4};
+
+// -----------------------------------------------------------------------
+
+_FTDIPlatformConfiguration::_FTDIPlatformConfiguration(uint16_t chipCount)
+{
+	initialize(chipCount);
+}
+
+void _FTDIPlatformConfiguration::initialize(uint16_t chipCount)
+{
+	if (chipCount > static_cast<uint16_t>(kMaximumChipCount))
+		throw std::invalid_argument("Invalid chip count");
+
+	_chipCount = static_cast<int>(chipCount);
+
+	static const Bus kBuses[]  = {'A', 'B', 'C', 'D'};
+	static const PinID kPins[] = {0, 1, 2, 3, 4, 5, 6, 7};
+
+	for (int chipIdx = 0; chipIdx < _chipCount; ++chipIdx)
+	{
+		int busCount = (chipIdx == 0) ? 2 : 4; // chip 0: A,B; others: A,B,C,D
+		for (int b = 0; b < busCount; ++b)
+		{
+			Bus bus = kBuses[b];
+			for (PinID pin : kPins)
+			{
+				FTDIPinData pinData(static_cast<ChipIndex>(chipIdx), bus, pin);
+				FTDIBusData busData(static_cast<ChipIndex>(chipIdx), bus,
+				                   (bus == 'A' || bus == 'B') ? eBusFunctionVCP : eBusFunctionD2XX);
+
+				pinData._initializationPriority = -1;
+				pinData._commandGroup = eUnknownCommandGroup;
+				pinData._cellLocation = qtac::Point(-1, -1);
+				pinData._setPin = getSetPinIndex(chipIdx, bus, pin);
+
+				_pinEntries.insert(pinData._hash, pinData);
+				_busFunctions.insert(busData._hash, busData);
+			}
+		}
+	}
+
+	// When chipCount == 1 (generic ALPACA-LITE board with no tcnf), apply the
+	// same hardcoded default pin mappings that the Qt build uses.  This ensures
+	// the device is usable before its EEPROM has been programmed with a specific
+	// USB descriptor.
+	if (chipCount != 1)
+		return;
+
+	// Helper lambda to insert a pin + D2XX bus entry
+	auto addPin = [&](PinID chipPin, Bus bus,
+	                  bool enabled, bool input, bool initialValue, bool inverted,
+	                  int priority, const char* label, const char* cmd,
+	                  const char* tooltip, CommandGroups group,
+	                  const char* tab, qtac::Point cell)
+	{
+		FTDIPinData pd(static_cast<ChipIndex>(0), bus, chipPin);
+		pd._setPin                = getSetPinIndex(0, bus, chipPin);
+		pd._enabled               = enabled;
+		pd._input                 = input;
+		pd._initialValue          = initialValue;
+		pd._inverted              = inverted;
+		pd._initializationPriority = priority;
+		pd._pinLabel              = label;
+		pd._pinCommand            = cmd;
+		pd._pinTooltip            = tooltip;
+		pd._commandGroup          = group;
+		pd._tabName               = tab;
+		pd._cellLocation          = cell;
+		_pinEntries.insert(pd._hash, pd);
+
+		FTDIBusData bd(static_cast<ChipIndex>(0), bus, eBusFunctionD2XX);
+		_busFunctions.insert(bd._hash, bd);
+	};
+
+	// C-bus pins
+	addPin(0, 'C', true, true, false, false, -1,
+	       "Force PS_HOLD High", "pshold", "Force PS_HOLD to high",
+	       eSwitchGroup, "General", {0, 2});
+	addPin(1, 'C', true, true, false, false, -1,
+	       "Disconnect UIM1", "uim1", "Disconnects the UIM 1",
+	       eSwitchGroup, "General", {0, 0});
+	addPin(2, 'C', true, true, false, false, -1,
+	       "Headset Disconnect", "headset", "Disconnects headset",
+	       eSwitchGroup, "General", {0, 5});
+	addPin(3, 'C', true, true, false, false, -1,
+	       "Disconnect UIM2", "uim2", "Disconnects the UIM 2",
+	       eSwitchGroup, "General", {1, 0});
+	addPin(4, 'C', true, true, false, false, -1,
+	       "Disconnect SD Card", "sdcard", "Disconnects the SD Card",
+	       eSwitchGroup, "General", {0, 3});
+	addPin(5, 'C', true, true, false, false, -1,
+	       "Secondary Emergency Download Mode (EDL)", "sedl", "Secondary Emergency Download Mode",
+	       eSwitchGroup, "Fusion", {0, 0});
+	addPin(6, 'C', true, true, false, true, 2,
+	       "USB 1 (VBUS Only)", "usb1", "Disconnects VBUS 1",
+	       eConnectionGroup, "General", {2, 0});
+	addPin(7, 'C', true, true, false, false, -1,
+	       "Secondary PM_RESIN_N_SEC", "sresn", "Fusion Secondary PM_RESIN_N",
+	       eSwitchGroup, "Fusion", {0, 1});
+
+	// D-bus pins
+	addPin(0, 'D', true, true, false, false, -1,
+	       "Volume Up", "volup", "VOL_UP + PWR_ON = Held for boot to UEFI menu",
+	       eButtonGroup, "General", {0, 1});
+	addPin(1, 'D', true, true, false, true, 2,
+	       "Battery", "battery", "Battery power off/on",
+	       eConnectionGroup, "General", {0, 0});
+	addPin(2, 'D', true, true, false, false, -1,
+	       "Volume Down", "voldn", "(PM_RESIN_N) (Held to boot to fastboot)",
+	       eButtonGroup, "General", {0, 2});
+	addPin(3, 'D', true, true, false, false, -1,
+	       "Power Key", "pkey", "Power On (VOL_UP + PWR_ON = Held for boot to UEFI menu)",
+	       eButtonGroup, "General", {0, 0});
+	addPin(4, 'D', true, true, false, false, -1,
+	       "EUD", "eud", "Embedded USB Debug (EUD)",
+	       eSwitchGroup, "General", {0, 4});
+	addPin(5, 'D', true, true, false, false, -1,
+	       "EDL", "pedl", "Primary Emergency Download Mode",
+	       eSwitchGroup, "General", {0, 1});
+	addPin(6, 'D', true, true, true, false, 1,
+	       "<type a label name>", "TC_READY_N",
+	       "SW must program it to 1 to enable some output signals. False - Disables the control on some "
+	       "of the FTDI pins: DDBUS 0/2/4/7, CDBUS 0/2/4/7. True - Enable the control on all the FTDI pins.",
+	       eUnknownCommandGroup, "<select a group>", {-1, -1});
+	addPin(7, 'D', true, false, false, true, 2,
+	       "USB 0 (VBUS Only)", "usb0", "Disconnects VBUS0",
+	       eConnectionGroup, "General", {1, 0});
+
+	// Inject the classic default quick-command buttons for generic ALPACA-LITE boards.
+	// These match the fallback injected by the tcnf loader when no buttons are defined.
+	static const struct { const char* name; const char* cmd; const char* tip; int col; int row; }
+	kDefaultButtons[] = {
+		{ "Power On",              "powerOn",              "Powers on the MTP/Device",                        0, 0 },
+		{ "Power Off",             "powerOff",             "Powers off the MTP/Device",                       1, 0 },
+		{ "Boot to EDL",           "bootToEDL",            "Boots the device to emergency download",          2, 0 },
+		{ "Boot to Fastboot",      "bootToFastboot",       "Boots the device to fastboot",                    0, 1 },
+		{ "Boot to UEFI",          "bootToUEFI",           "Boots the device to UEFI Menu",                   1, 1 },
+		{ "Boot to Secondary EDL", "bootToSecondaryEDL",   "Boots the device to secondary emergency download",2, 1 },
+	};
+	for (const auto& d : kDefaultButtons)
+	{
+		qtac::ButtonEntry btn;
+		btn._name         = d.name;
+		btn._command      = d.cmd;
+		btn._tooltip      = d.tip;
+		btn._commandGroup = 4;  // eQuickSettingsGroup
+		btn._tab          = "General";
+		btn._cellX        = d.col;
+		btn._cellY        = d.row;
+		_buttons.push_back(btn);
+	}
+
+	// Sort by strHash(name + tab) to match the Qt QMap iteration order.
+	std::sort(_buttons.begin(), _buttons.end(),
+		[](const qtac::ButtonEntry& a, const qtac::ButtonEntry& b) {
+			return strHash(a._name + a._tab) < strHash(b._name + b._tab);
+		});
+}
+
+// -----------------------------------------------------------------------
+// Accessors
+// -----------------------------------------------------------------------
+
+FTDIPinData _FTDIPlatformConfiguration::getPinData(ChipIndex chipIndex, Bus bus, PinID pin)
+{
+	HashType hash = FTDIPinData::makeFTDIHash(chipIndex, bus, pin);
+	return _pinEntries.value(hash, FTDIPinData());
+}
+
+FTDIPinList _FTDIPlatformConfiguration::getAllPins() const
+{
+	FTDIPinList result;
+	for (const auto& kv : _pinEntries)
+		result.append(kv.second);
+	return result;
+}
+
+FTDIPinList _FTDIPlatformConfiguration::getActivePins() const
+{
+	FTDIPinList result;
+	for (const auto& kv : _pinEntries)
+		if (kv.second._enabled)
+			result.append(kv.second);
+
+	std::sort(result.begin(), result.end(), [](const FTDIPinData& a, const FTDIPinData& b) {
+		if (a._chipIndex != b._chipIndex) return a._chipIndex < b._chipIndex;
+		if (a._bus != b._bus)             return a._bus < b._bus;
+		return a._chipPin < b._chipPin;
+	});
+	return result;
+}
+
+FTDIPinList _FTDIPlatformConfiguration::getActivePins(ChipIndex chipIndex, Bus bus) const
+{
+	FTDIPinList result;
+	FTDIBusData bd = getBusFunction(chipIndex, bus);
+	if (bd._busFunction != eBusFunctionD2XX)
+		return result;
+
+	for (const auto& kv : _pinEntries)
+	{
+		if (kv.second._enabled && kv.second._chipIndex == chipIndex && kv.second._bus == bus)
+			result.append(kv.second);
+	}
+	return result;
+}
+
+int _FTDIPlatformConfiguration::getChipCount()
+{
+	return _chipCount;
+}
+
+Pins _FTDIPlatformConfiguration::getPins()
+{
+	Pins result;
+	FTDIPinList list = getActivePins();
+	for (const auto& fp : list)
+	{
+		PinEntry pe;
+		pe._pin                    = fp._setPin;
+		pe._enabled                = fp._enabled;
+		pe._hash                   = fp._hash;
+		pe._cellLocation           = fp._cellLocation;
+		pe._commandGroup           = fp._commandGroup;
+		pe._pinCommand             = fp._pinCommand;
+		pe._initialValue           = fp._initialValue;
+		pe._inverted               = fp._inverted;
+		pe._pinLabel               = fp._pinLabel;
+		pe._pinTooltip             = fp._pinTooltip;
+		pe._tabName                = fp._tabName;
+		pe._initializationPriority = fp._initializationPriority;
+		result.append(pe);
+	}
+
+	std::sort(result.begin(), result.end(), [](const PinEntry& a, const PinEntry& b) {
+		if (a._tabName != b._tabName)       return a._tabName < b._tabName;
+		if (a._commandGroup != b._commandGroup) return a._commandGroup < b._commandGroup;
+		return a._pin < b._pin;
+	});
+	return result;
+}
+
+// -----------------------------------------------------------------------
+// Enable / Input / InitialValue / Priority / Inverted setters
+// -----------------------------------------------------------------------
+
+bool _FTDIPlatformConfiguration::getPinEnableState(ChipIndex ci, Bus bus, PinID pin) const
+{
+	return _pinEntries.value(FTDIPinData::makeFTDIHash(ci, bus, pin))._enabled;
+}
+void _FTDIPlatformConfiguration::setPinEnableState(HashType hash, bool v)
+{
+	if (_pinEntries.contains(hash)) _pinEntries[hash]._enabled = v;
+}
+
+bool _FTDIPlatformConfiguration::getPinInputState(ChipIndex ci, Bus bus, PinID pin) const
+{
+	return _pinEntries.value(FTDIPinData::makeFTDIHash(ci, bus, pin))._input;
+}
+void _FTDIPlatformConfiguration::setPinInputState(HashType hash, bool v)
+{
+	if (_pinEntries.contains(hash)) _pinEntries[hash]._input = v;
+}
+
+bool _FTDIPlatformConfiguration::getInitialPinValue(ChipIndex ci, Bus bus, PinID pin) const
+{
+	return _pinEntries.value(FTDIPinData::makeFTDIHash(ci, bus, pin))._initialValue;
+}
+void _FTDIPlatformConfiguration::setInitialPinValue(HashType hash, bool v)
+{
+	if (_pinEntries.contains(hash)) _pinEntries[hash]._initialValue = v;
+}
+
+int _FTDIPlatformConfiguration::getPinInitializationPriority(ChipIndex ci, Bus bus, PinID pin) const
+{
+	return _pinEntries.value(FTDIPinData::makeFTDIHash(ci, bus, pin))._initializationPriority;
+}
+void _FTDIPlatformConfiguration::setPinInitializationPriority(HashType hash, int p)
+{
+	if (_pinEntries.contains(hash)) _pinEntries[hash]._initializationPriority = p;
+}
+
+bool _FTDIPlatformConfiguration::getPinInvertedState(ChipIndex ci, Bus bus, PinID pin) const
+{
+	return _pinEntries.value(FTDIPinData::makeFTDIHash(ci, bus, pin))._inverted;
+}
+void _FTDIPlatformConfiguration::setPinInvertedState(HashType hash, bool v)
+{
+	if (_pinEntries.contains(hash)) _pinEntries[hash]._inverted = v;
+}
+
+qtac::String _FTDIPlatformConfiguration::getPinLabel(ChipIndex ci, Bus bus, PinID pin) const
+{
+	return _pinEntries.value(FTDIPinData::makeFTDIHash(ci, bus, pin))._pinLabel;
+}
+void _FTDIPlatformConfiguration::setPinLabel(HashType hash, const qtac::String& v)
+{
+	if (_pinEntries.contains(hash)) _pinEntries[hash]._pinLabel = v;
+}
+
+qtac::String _FTDIPlatformConfiguration::getPinTooltip(ChipIndex ci, Bus bus, PinID pin) const
+{
+	return _pinEntries.value(FTDIPinData::makeFTDIHash(ci, bus, pin))._pinTooltip;
+}
+void _FTDIPlatformConfiguration::setPinTooltip(HashType hash, const qtac::String& v)
+{
+	if (_pinEntries.contains(hash)) _pinEntries[hash]._pinTooltip = v;
+}
+
+qtac::String _FTDIPlatformConfiguration::getPinCommand(ChipIndex ci, Bus bus, PinID pin) const
+{
+	return _pinEntries.value(FTDIPinData::makeFTDIHash(ci, bus, pin))._pinCommand;
+}
+void _FTDIPlatformConfiguration::setPinCommand(HashType hash, const qtac::String& v)
+{
+	if (_pinEntries.contains(hash)) _pinEntries[hash]._pinCommand = v;
+}
+
+CommandGroups _FTDIPlatformConfiguration::getPinGroup(ChipIndex ci, Bus bus, PinID pin) const
+{
+	return _pinEntries.value(FTDIPinData::makeFTDIHash(ci, bus, pin))._commandGroup;
+}
+void _FTDIPlatformConfiguration::setPinGroup(HashType hash, CommandGroups v)
+{
+	if (_pinEntries.contains(hash)) _pinEntries[hash]._commandGroup = v;
+}
+
+qtac::String _FTDIPlatformConfiguration::getTabName(ChipIndex ci, Bus bus, PinID pin) const
+{
+	return _pinEntries.value(FTDIPinData::makeFTDIHash(ci, bus, pin))._tabName;
+}
+void _FTDIPlatformConfiguration::setTabName(HashType hash, const qtac::String& v)
+{
+	if (_pinEntries.contains(hash)) _pinEntries[hash]._tabName = v;
+}
+
+qtac::Point _FTDIPlatformConfiguration::getPinCellLocation(ChipIndex ci, Bus bus, PinID pin) const
+{
+	return _pinEntries.value(FTDIPinData::makeFTDIHash(ci, bus, pin))._cellLocation;
+}
+void _FTDIPlatformConfiguration::setPinCellLocation(HashType hash, const qtac::Point& v)
+{
+	if (_pinEntries.contains(hash)) _pinEntries[hash]._cellLocation = v;
+}
+
+FTDIBusData _FTDIPlatformConfiguration::getBusFunction(ChipIndex ci, Bus bus) const
+{
+	return _busFunctions.value(FTDIBusData::makeFTDIHash(ci, bus), FTDIBusData());
+}
+void _FTDIPlatformConfiguration::setBusFunction(HashType hash, FTDIBusFunction bf)
+{
+	if (_busFunctions.contains(hash)) _busFunctions[hash]._busFunction = bf;
+}
+void _FTDIPlatformConfiguration::setBusFunction(ChipIndex ci, Bus bus, FTDIBusFunction bf)
+{
+	setBusFunction(FTDIBusData::makeFTDIHash(ci, bus), bf);
+}
+
+FTDIPinSets _FTDIPlatformConfiguration::getPinSet(ChipIndex chipIndex)
+{
+	FTDIPinSets result{NoOptions};
+
+	auto check = [&](Bus bus, FTDIPinSet flag) {
+		FTDIBusData bd = getBusFunction(chipIndex, bus);
+		if (bd._bus == bus && bd._busFunction == eBusFunctionD2XX)
+			result = result | flag;
+	};
+
+	check('A', eA);
+	check('B', eB);
+	check('C', eC);
+	check('D', eD);
+
+	return result;
+}
+
+// -----------------------------------------------------------------------
+// Tab cascade operations
+// -----------------------------------------------------------------------
+
+void _FTDIPlatformConfiguration::cascadeTabDelete(const qtac::String& tabName)
+{
+    for (auto& kv : _pinEntries)
+    {
+        if (kv.second._tabName == tabName)
+            kv.second._tabName = qtac::String();
+    }
+}
+
+void _FTDIPlatformConfiguration::cascadeTabRename(const qtac::String& oldName,
+                                                   const qtac::String& newName)
+{
+    for (auto& kv : _pinEntries)
+    {
+        if (kv.second._tabName == oldName)
+            kv.second._tabName = newName;
+    }
+}
+
+// -----------------------------------------------------------------------
+// JSON I/O
+// -----------------------------------------------------------------------
+
+bool _FTDIPlatformConfiguration::read(json_t& j)
+{
+	const auto* jobj = j.if_object();
+	if (!jobj) return false;
+
+	if (jobj->contains(kChipCount))
+		_chipCount = qtac::json_util::toInt(jobj->at(kChipCount));
+
+	if (jobj->contains(kModificationDate) && jobj->at(kModificationDate).is_string())
+		_modificationDate = qtac::String(qtac::json_util::toString(jobj->at(kModificationDate)));
+	if (jobj->contains(kFileVersion) && (jobj->at(kFileVersion).is_int64() || jobj->at(kFileVersion).is_uint64()))
+		_fileVersion = qtac::json_util::toInt(jobj->at(kFileVersion));
+
+	// --- Parse tabs array: collect visible tabs sorted by ordinal ---
+	// Skip the fixed app tabs (General, Device Info, Terminal) — those are always present.
+	_tabs.clear();
+	if (jobj->contains(kTabs) && jobj->at(kTabs).is_array())
+	{
+		using TabEntry = std::pair<int, std::string>;
+		std::vector<TabEntry> tabEntries;
+		for (const auto& jtVal : jobj->at(kTabs).as_array())
+		{
+			const auto* jt = jtVal.if_object();
+			if (!jt) continue;
+			bool visible = true;
+			if (jt->contains("visible")) visible = qtac::json_util::toBool(jt->at("visible"));
+			if (!visible) continue;
+
+			std::string name;
+			if (jt->contains("name")) name = qtac::json_util::toString(jt->at("name"));
+			if (name.empty() || name == "General" || name == "Device Info" || name == "Terminal")
+				continue;
+
+			int ordinal = 999;
+			if (jt->contains("ordinal")) ordinal = qtac::json_util::toInt(jt->at("ordinal"));
+			tabEntries.push_back(std::make_pair(ordinal, name));
+		}
+		std::sort(tabEntries.begin(), tabEntries.end());
+		for (const auto& te : tabEntries)
+			_tabs.append(qtac::String(te.second));
+	}
+
+	if (jobj->contains(kPinEntries) && jobj->at(kPinEntries).is_array())
+	{
+		_pinEntries.clear();
+		for (const auto& peVal : jobj->at(kPinEntries).as_array())
+		{
+			const auto* pe = peVal.if_object();
+			if (!pe) continue;
+			ChipIndex chipIndex{0};
+			Bus bus{0};
+			PinID pinId{0};
+
+			if (pe->contains(kChipIndex)) chipIndex = qtac::json_util::toInt(pe->at(kChipIndex));
+			if (pe->contains(kBus))
+			{
+				std::string busStr = qtac::json_util::toString(pe->at(kBus));
+				if (!busStr.empty()) bus = busStr[0];
+			}
+			if (pe->contains(kPinNumber))
+				pinId = static_cast<PinID>(std::stoi(qtac::json_util::toString(pe->at(kPinNumber))));
+
+			FTDIPinData pinData(chipIndex, bus, pinId);
+			pinData._setPin = getSetPinIndex(chipIndex, bus, pinId);
+
+			if (pe->contains(kEnabled))       pinData._enabled  = qtac::json_util::toBool(pe->at(kEnabled));
+			if (pe->contains(kInput))         pinData._input    = qtac::json_util::toBool(pe->at(kInput));
+			if (pe->contains(kName))          pinData._pinLabel    = qtac::json_util::toString(pe->at(kName));
+			if (pe->contains(kToolTip))       pinData._pinTooltip  = qtac::json_util::toString(pe->at(kToolTip));
+			if (pe->contains(kInitialValue))  pinData._initialValue = qtac::json_util::toBool(pe->at(kInitialValue));
+			if (pe->contains(kPriority))      pinData._initializationPriority = qtac::json_util::toInt(pe->at(kPriority));
+			if (pe->contains(kInverted))      pinData._inverted = qtac::json_util::toBool(pe->at(kInverted));
+			if (pe->contains(kCommand))       pinData._pinCommand = qtac::json_util::toString(pe->at(kCommand));
+			if (pe->contains(kCommandGroup))  pinData._commandGroup = static_cast<CommandGroups>(qtac::json_util::toInt(pe->at(kCommandGroup)));
+			if (pe->contains(kTabName))       pinData._tabName = qtac::json_util::toString(pe->at(kTabName));
+
+			if (pe->contains(kRunPriority))
+			{
+				std::string pointStr = qtac::json_util::toString(pe->at(kRunPriority));
+				qtac::Point pt = toPoint(qtac::String(pointStr));
+				if (pt.x() >= 0 && pt.y() >= 0)
+					pinData._cellLocation = pt;
+				else
+					pinData._cellLocation = qtac::Point(-1, -1);
+			}
+
+			_pinEntries.insert(pinData._hash, pinData);
+		}
+	}
+
+	if (jobj->contains(kBusEntries) && jobj->at(kBusEntries).is_array())
+	{
+		_busFunctions.clear();
+		for (const auto& beVal : jobj->at(kBusEntries).as_array())
+		{
+			const auto* be = beVal.if_object();
+			if (!be) continue;
+			ChipIndex chipIndex{0};
+			Bus bus{0};
+			FTDIBusFunction bf{eBusFunctionUnknown};
+
+			if (be->contains(kChipIndex)) chipIndex = qtac::json_util::toInt(be->at(kChipIndex));
+			if (be->contains(kBus))
+			{
+				std::string busStr = qtac::json_util::toString(be->at(kBus));
+				if (!busStr.empty()) bus = busStr[0];
+			}
+			if (be->contains(kBusFunction))
+				bf = static_cast<FTDIBusFunction>(qtac::json_util::toInt(be->at(kBusFunction)));
+
+			FTDIBusData busData(chipIndex, bus, bf);
+			_busFunctions.insert(busData._hash, busData);
+		}
+	}
+
+	// --- Load buttons ---
+	_buttons.clear();
+	if (jobj->contains(kButtons) && jobj->at(kButtons).is_array())
+	{
+		for (const auto& jbVal : jobj->at(kButtons).as_array())
+		{
+			const auto* jb = jbVal.if_object();
+			if (!jb) continue;
+			qtac::ButtonEntry btn;
+			if (jb->contains(kName))         btn._name         = qtac::json_util::toString(jb->at(kName));
+			if (jb->contains(kCommand))      btn._command      = qtac::json_util::toString(jb->at(kCommand));
+			if (jb->contains(kCommandGroup)) btn._commandGroup = qtac::json_util::toInt(jb->at(kCommandGroup));
+			if (jb->contains(kTab))          btn._tab          = qtac::json_util::toString(jb->at(kTab));
+			if (jb->contains(kButtonToolTip)) btn._tooltip     = qtac::json_util::toString(jb->at(kButtonToolTip));
+			if (jb->contains(kCellLocation))
+			{
+				qtac::Point pt = toPoint(qtac::String(qtac::json_util::toString(jb->at(kCellLocation))));
+				btn._cellX = pt.x();
+				btn._cellY = pt.y();
+			}
+
+			if (!btn._command.isEmpty() && !btn._name.isEmpty())
+				_buttons.push_back(btn);
+		}
+	}
+
+	// If no buttons were defined in the tcnf, inject the classic default Quick Settings.
+	if (_buttons.empty())
+	{
+		static const struct { const char* name; const char* cmd; const char* tip; int col; int row; }
+		kDefaultButtons[] = {
+			{ "Power On",              "powerOn",              "Powers on the MTP/Device",                        0, 0 },
+			{ "Power Off",             "powerOff",             "Powers off the MTP/Device",                       1, 0 },
+			{ "Boot to EDL",           "bootToEDL",            "Boots the device to emergency download",          2, 0 },
+			{ "Boot to Fastboot",      "bootToFastboot",       "Boots the device to fastboot",                    0, 1 },
+			{ "Boot to UEFI",          "bootToUEFI",           "Boots the device to UEFI Menu",                   1, 1 },
+			{ "Boot to Secondary EDL", "bootToSecondaryEDL",   "Boots the device to secondary emergency download",2, 1 },
+		};
+		for (const auto& d : kDefaultButtons)
+		{
+			qtac::ButtonEntry btn;
+			btn._name         = d.name;
+			btn._command      = d.cmd;
+			btn._tooltip      = d.tip;
+			btn._commandGroup = 4;  // eQuickSettingsGroup
+			btn._tab          = "General";
+			btn._cellX        = d.col;
+			btn._cellY        = d.row;
+			_buttons.push_back(btn);
+		}
+	}
+
+	// --- Load variables ---
+	_variables.clear();
+	if (jobj->contains(kVariables) && jobj->at(kVariables).is_array())
+	{
+		for (const auto& jvVal : jobj->at(kVariables).as_array())
+		{
+			const auto* jv = jvVal.if_object();
+			if (!jv) continue;
+			qtac::VariableEntry var;
+			if (jv->contains(kName))    var._name    = qtac::json_util::toString(jv->at(kName));
+			if (jv->contains(kLabel))   var._label   = qtac::json_util::toString(jv->at(kLabel));
+			if (jv->contains(kToolTip)) var._tooltip = qtac::json_util::toString(jv->at(kToolTip));
+			if (jv->contains(kType))    var._type    = static_cast<qtac::VariableType>(qtac::json_util::toInt(jv->at(kType)));
+			if (jv->contains(kDefaultValue))
+			{
+				std::string dv = qtac::json_util::toString(jv->at(kDefaultValue));
+				if (var._type == qtac::VariableType::Boolean)
+					var._defaultValue = (dv == "1" || dv == "true");
+				else if (var._type == qtac::VariableType::Float)
+				{
+					try { var._defaultValue = std::stof(dv); } catch (...) {}
+				}
+				else
+				{
+					try { var._defaultValue = static_cast<unsigned int>(std::stoul(dv)); }
+					catch (...) { var._defaultValue = 0u; }
+				}
+			}
+			if (jv->contains(kCellLocation))
+			{
+				qtac::Point pt = toPoint(qtac::String(qtac::json_util::toString(jv->at(kCellLocation))));
+				var._cellX = pt.x();
+				var._cellY = pt.y();
+			}
+
+			if (!var._name.isEmpty())
+				_variables[var._name] = var;
+		}
+	}
+
+	// Inject defaults for script timing variables if not defined in the tcnf.
+	auto ensureVar = [&](const char* name, const char* label, const char* tooltip,
+	                     unsigned int defaultMs, int cellX, int cellY)
+	{
+		if (_variables.find(qtac::String(name)) == _variables.end())
+		{
+			qtac::VariableEntry v;
+			v._name         = name;
+			v._label        = label;
+			v._tooltip      = tooltip;
+			v._type         = qtac::VariableType::Integer;
+			v._defaultValue = defaultMs;
+			v._cellX        = cellX;
+			v._cellY        = cellY;
+			_variables[v._name] = v;
+		}
+	};
+	ensureVar("edl",      "EDL timing (ms)",      "Configurable Boot to EDL timing in milliseconds",      1300, 0, 0);
+	ensureVar("uefi",     "UEFI timing (ms)",      "Configurable Boot to UEFI timing in milliseconds",     8000, 0, 1);
+	ensureVar("fastboot", "Fastboot timing (ms)",  "Configurable Boot to fastboot timing in milliseconds", 8000, 1, 0);
+
+	// --- Load and parse script ---
+	if (jobj->contains(kScript) && jobj->at(kScript).is_string())
+	{
+		qtac::String scriptText = qtac::json_util::toString(jobj->at(kScript));
+
+		TACCommands cmds;
+		FTDIPinList activePins = getActivePins();
+		for (const auto& fp : activePins)
+		{
+			if (fp._pinCommand.isEmpty()) continue;
+			TACCommand tc;
+			tc._pin      = fp._setPin;
+			tc._command  = fp._pinCommand;
+			cmds.append(tc);
+		}
+
+		_script.parseScript(scriptText, _variables, cmds);
+	}
+
+	return true;
+}
+
+void _FTDIPlatformConfiguration::loadDefaultScript(const qtac::String& scriptText)
+{
+	if (scriptText.isEmpty() || !_script.isEmpty())
+		return;
+
+	TACCommands cmds;
+	FTDIPinList activePins = getActivePins();
+	for (const auto& fp : activePins)
+	{
+		if (fp._pinCommand.isEmpty()) continue;
+		TACCommand tc;
+		tc._pin     = fp._setPin;
+		tc._command = fp._pinCommand;
+		cmds.append(tc);
+	}
+	_script.parseScript(scriptText, _variables, cmds);
+}
+
+void _FTDIPlatformConfiguration::write(json_t& j)
+{
+	auto& jobj = j.as_object();
+	jobj[kChipCount] = _chipCount;
+
+	boost::json::array pinsArray;
+	for (const auto& kv : _pinEntries)
+	{
+		const FTDIPinData& pe = kv.second;
+		boost::json::object pinData;
+		pinData[kChipIndex]    = pe._chipIndex;
+		pinData[kBus]          = std::string(1, pe._bus);
+		pinData[kPinNumber]    = qtac::String::number(static_cast<unsigned long long>(pe._chipPin)).toStdString();
+		pinData[kEnabled]      = pe._enabled;
+		pinData[kInput]        = pe._input;
+		pinData[kName]         = pe._pinLabel.toStdString();
+		pinData[kToolTip]      = pe._pinTooltip.toStdString();
+		pinData[kInitialValue] = pe._initialValue;
+		pinData[kPriority]     = pe._initializationPriority;
+		pinData[kInverted]     = pe._inverted;
+		pinData[kCommand]      = pe._pinCommand.toStdString();
+		pinData[kCommandGroup] = static_cast<int>(pe._commandGroup);
+		pinData[kRunPriority]  = fromPoint(pe._cellLocation).toStdString();
+		pinData[kTabName]      = pe._tabName.toStdString();
+		pinsArray.push_back(pinData);
+	}
+	jobj[kPinEntries] = pinsArray;
+
+	boost::json::array busArray;
+	for (const auto& kv : _busFunctions)
+	{
+		const FTDIBusData& bf = kv.second;
+		boost::json::object busData;
+		busData[kChipIndex]   = bf._chipIndex;
+		busData[kBus]         = std::string(1, bf._bus);
+		busData[kBusFunction] = static_cast<int>(bf._busFunction);
+		busArray.push_back(busData);
+	}
+	jobj[kBusEntries] = busArray;
+}
+
+// -----------------------------------------------------------------------
+
+PinID _FTDIPlatformConfiguration::getSetPinIndex(int chipIndex, Bus bus, PinID pinId)
+{
+	int pinOffset = 0;
+	switch (bus)
+	{
+	case 'A': pinOffset =  0; break;
+	case 'B': pinOffset =  8; break;
+	case 'C': pinOffset = 16; break;
+	case 'D': pinOffset = 24; break;
+	}
+	return static_cast<PinID>(chipIndex * 32 + pinOffset + static_cast<int>(pinId));
+}
diff --git a/source/library/src/FrameCoder.cpp b/source/library/src/FrameCoder.cpp
new file mode 100644
index 00000000..4dee5b18
--- /dev/null
+++ b/source/library/src/FrameCoder.cpp
@@ -0,0 +1,68 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+
+#include <qtac/FrameCoder.h>
+
+namespace qtac {
+
+void FrameCoder::reset()
+{
+    _frame.clear();
+}
+
+void FrameCoder::decode(const qtac::ByteArray& decodeMe)
+{
+    _frameFunction(decodeMe, _protocolInterface);
+}
+
+qtac::ByteArray FrameCoder::encode(const qtac::ByteArray& encodeMe, const Arguments& /*arguments*/)
+{
+    return encodeMe;
+}
+
+qtac::ByteArray FrameCoder::argumentToBoolString(const Argument& arg) const
+{
+    return arg.asBool() ? "1" : "0";
+}
+
+void FrameCoder::setupCallbackFunctions(ProtocolInterface*  protocolInterface,
+                                        FrameCompleteFunc   frameFunc,
+                                        BadFrameFunc        badFrameFunc)
+{
+    _protocolInterface  = protocolInterface;
+    _frameFunction      = frameFunc;
+    _badFrameFunction   = badFrameFunc;
+}
+
+} // namespace qtac
diff --git a/source/library/src/PIC32CXDevice.cpp b/source/library/src/PIC32CXDevice.cpp
new file mode 100644
index 00000000..5de1d81b
--- /dev/null
+++ b/source/library/src/PIC32CXDevice.cpp
@@ -0,0 +1,236 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <qtac/PIC32CXDevice.h>
+#include <qtac/TACPIC32CXDriveThread.h>
+#include <qtac/SerialPortInfo.h>
+#include <qtac/StringUtilities.h>
+#include <qtac/PlatformID.h>
+#include <qtac/TcnfLoader.h>
+
+#include <chrono>
+#include <thread>
+
+using qtac::SerialPortInfo;
+using qtac::SerialPortInfos;
+using qtac::TACPIC32CXDriveThread;
+
+// PIC32CX VID/PID (from qcommon-console/PIC32CXSerialTableModel)
+static constexpr uint16_t kPIC32CXVid{0x04D8}, kPIC32CXPid{0x000A};
+
+static const qtac::ByteArray kPIC32CXDefaultDescription{"ALPACA PIC32CX Debug Board"};
+
+static constexpr int kMaxOpenIterations{60};
+static constexpr int kOpenPollMs{300};
+static constexpr int kOpenInitMs{100};
+static constexpr unsigned int kOpenThreadDelay{300};
+
+uint32_t PIC32CXDevice::updateAlpacaDevices()
+{
+    std::lock_guard<std::recursive_mutex> lock(_mutex);
+    for (auto& dev : _alpacaDevices)
+        if (dev->debugBoardType() == ePIC32CXAuto)
+            dev->setActive(false);
+
+    SerialPortInfos ports = SerialPortInfo::availablePorts();
+    for (const auto& info : ports)
+    {
+        if (!info.matchesVidPid(kPIC32CXVid, kPIC32CXPid))
+            continue;
+
+        qtac::ByteArray portName     = info.portName().toLatin1();
+        qtac::ByteArray serialNumber = info.serialNumber().toLatin1();
+        HashType hash                = arrayHash(portName);
+
+        AlpacaDevice existing = findAlpacaDevice(hash);
+        if (!existing)
+        {
+            auto* dev = new PIC32CXDevice;
+            dev->_portName     = portName;
+            dev->_hash         = hash;
+            dev->_active       = true;
+            dev->_boardType    = ePIC32CXAuto;
+            dev->_platformID   = ALPACA_PIC32CX_ID;
+            dev->_description  = kPIC32CXDefaultDescription;
+            dev->_serialNumber = serialNumber;
+
+            // Use the portion of the serial number before "XX" as a USB
+            // descriptor for platform identification (mirrors the Qt original).
+            qtac::String serialStr = info.serialNumber();
+            int xxIdx = serialStr.indexOf("XX");
+            if (xxIdx > 0)
+                dev->_usbDescriptor = serialStr.left(xxIdx).toLatin1();
+
+            _alpacaDevices.append(AlpacaDevice(dev));
+        }
+        else
+        {
+            existing->setActive(true);
+        }
+    }
+
+    return static_cast<uint32_t>(_alpacaDevices.size());
+}
+
+bool PIC32CXDevice::open()
+{
+    bool result{false};
+
+    if (_serialDriveThread == nullptr)
+    {
+        TACPIC32CXDriveThread* thread = new TACPIC32CXDriveThread(_hash);
+        _serialDriveThread = thread;
+        thread->setThreadDelay(kOpenThreadDelay);
+
+        _serialDriveThread->start();
+
+        std::this_thread::sleep_for(std::chrono::milliseconds(kOpenInitMs));
+
+        for (int i = 0; i < kMaxOpenIterations; ++i)
+        {
+            if (_serialDriveThread->weAreRunning()) { result = true; break; }
+            std::this_thread::sleep_for(std::chrono::milliseconds(kOpenPollMs));
+        }
+    }
+    else
+    {
+        result = _serialDriveThread->weAreRunning();
+    }
+
+    if (result)
+    {
+        _pic32cxPlatformConfiguration = new _PIC32CXPlatformConfiguration;
+
+        // Load .tcnf override if a config path is registered for this platform
+        if (_platformID != MICRO_EPM_BOARD_ID_UNKNOWN)
+        {
+            PlatformContainer::initialize();
+            auto entries = PlatformContainer::getEntries();
+            for (const auto& entry : entries)
+            {
+                if (entry && entry->_platformID == _platformID && !entry->_path.isEmpty())
+                {
+                    TcnfLoader::loadPIC32CX(entry->_path.toStdString(), _pic32cxPlatformConfiguration);
+                    break;
+                }
+            }
+        }
+
+        _serialDriveThread->onPinStateChanged.connect([this](uint64_t pin, bool state) {
+            this->on_pinStateChanged(pin, state);
+        });
+
+        buildMapping();
+    }
+
+    TACPIC32CXDriveThread* thread = static_cast<TACPIC32CXDriveThread*>(_serialDriveThread);
+    _macAddress  = _serialDriveThread->macAddress();
+    _chipVersion = thread->chipVersion();
+    thread->setThreadDelay(0);
+
+    return result;
+}
+
+void PIC32CXDevice::buildMapping()
+{
+    if (!_commands.isEmpty() || _pic32cxPlatformConfiguration == nullptr)
+        return;
+
+    Pins pins = _pic32cxPlatformConfiguration->getPins();
+    for (const auto& pin : pins)
+    {
+        TACCommand tacCommand;
+        tacCommand._pin       = pin._pin;
+        tacCommand._command   = pin._pinCommand;
+        tacCommand._helpText  = pin._pinTooltip;
+        tacCommand._tabName   = pin._tabName.toLatin1();
+        tacCommand._groupName = CommandGroup::toString(pin._commandGroup).toLatin1();
+
+        qtac::ByteArray cellLocation =
+            qtac::ByteArray::number(pin._cellLocation.x()) + ","
+            + qtac::ByteArray::number(pin._cellLocation.y());
+        tacCommand._cellLocation = cellLocation;
+
+        _commands[tacCommand._command] = tacCommand;
+        _commandList.append(tacCommand);
+    }
+}
+
+Pins PIC32CXDevice::getPins()
+{
+    if (_pic32cxPlatformConfiguration == nullptr)
+        return {};
+    return _pic32cxPlatformConfiguration->getPins();
+}
+
+void PIC32CXDevice::quickCommand(const qtac::ByteArray& command)
+{
+    qtac::TACDriveThread* dt = _driveThread ? _driveThread : _serialDriveThread;
+    if (_pic32cxPlatformConfiguration == nullptr || dt == nullptr) return;
+    const qtac::AlpacaScript& script = _pic32cxPlatformConfiguration->getScript();
+    if (!script.hasCommand(command)) return;
+    qtac::CommandEntries entries = script.getCommandEntries(command);
+    entries = qtac::AlpacaScript::replaceTokens(_pic32cxPlatformConfiguration->getVariables(), entries);
+    dt->sendCommandSequence(entries);
+}
+
+void PIC32CXDevice::setVariableValue(const qtac::String& name, const qtac::Variant& value)
+{
+    if (_pic32cxPlatformConfiguration != nullptr)
+        _pic32cxPlatformConfiguration->setVariableValue(name, value);
+}
+
+const qtac::ButtonEntries& PIC32CXDevice::getButtons() const
+{
+    static qtac::ButtonEntries empty;
+    if (_pic32cxPlatformConfiguration == nullptr) return empty;
+    return _pic32cxPlatformConfiguration->getButtons();
+}
+
+const qtac::VariableEntries& PIC32CXDevice::getVariables() const
+{
+    static qtac::VariableEntries empty;
+    if (_pic32cxPlatformConfiguration == nullptr) return empty;
+    return _pic32cxPlatformConfiguration->getVariables();
+}
+
+qtac::String PIC32CXDevice::configModificationDate() const
+{
+    if (_pic32cxPlatformConfiguration == nullptr) return {};
+    return _pic32cxPlatformConfiguration->modificationDate();
+}
+
+int PIC32CXDevice::configFileVersion() const
+{
+    if (_pic32cxPlatformConfiguration == nullptr) return 0;
+    return _pic32cxPlatformConfiguration->fileVersion();
+}
diff --git a/source/library/src/PIC32CXPlatformConfiguration.cpp b/source/library/src/PIC32CXPlatformConfiguration.cpp
new file mode 100644
index 00000000..f52f00ba
--- /dev/null
+++ b/source/library/src/PIC32CXPlatformConfiguration.cpp
@@ -0,0 +1,535 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <qtac/PIC32CXPlatformConfiguration.h>
+#include <qtac/StringUtilities.h>
+
+#include <algorithm>
+#include <stdexcept>
+
+// JSON key constants
+static const char* kPlatformEntries = "pins";
+static const char* kPinNumber       = "pin_number";
+static const char* kEnabled         = "enabled";
+static const char* kInverted        = "inverted";
+static const char* kName            = "name";
+static const char* kToolTip         = "help_hint";
+static const char* kCommand         = "command";
+static const char* kCommandGroup    = "command_group";
+static const char* kTabName         = "tab_name";
+static const char* kRunPriority     = "run_priority";
+static const char* kButtons         = "buttons";
+static const char* kVariables       = "variables";
+static const char* kScript          = "script";
+static const char* kModificationDate = "modification_date";
+static const char* kFileVersion     = "fileVersion";
+static const char* kLabel           = "label";
+static const char* kTab             = "tab";
+static const char* kCellLocation    = "cellLocation";
+static const char* kDefaultValue    = "default_value";
+static const char* kType            = "type";
+
+// ---------------------------------------------------------------------------
+
+_PIC32CXPlatformConfiguration::_PIC32CXPlatformConfiguration()
+{
+    initialize();
+}
+
+// ---------------------------------------------------------------------------
+// Pin list accessors
+// ---------------------------------------------------------------------------
+
+Pins _PIC32CXPlatformConfiguration::getPins()
+{
+    Pins result;
+    PIC32CXPinList active = getActivePins();
+    for (const auto& p : active)
+    {
+        PinEntry pe;
+        pe._pin          = p._setPin;
+        pe._enabled      = p._enabled;
+        pe._hash         = p._hash;
+        pe._cellLocation = p._cellLocation;
+        pe._commandGroup = p._commandGroup;
+        pe._pinCommand   = p._pinCommand;
+        pe._inverted     = p._inverted;
+        pe._pinLabel     = p._pinLabel;
+        pe._pinTooltip   = p._pinTooltip;
+        pe._tabName      = p._tabName;
+        result.append(pe);
+    }
+
+    std::sort(result.begin(), result.end(), [](const PinEntry& a, const PinEntry& b) {
+        if (a._tabName != b._tabName)           return a._tabName < b._tabName;
+        if (a._commandGroup != b._commandGroup) return a._commandGroup < b._commandGroup;
+        return a._pin < b._pin;
+    });
+    return result;
+}
+
+PIC32CXPinList _PIC32CXPlatformConfiguration::getAllPins()
+{
+    PIC32CXPinList result;
+    for (const auto& kv : _pinEntries)
+        result.append(kv.second);
+    std::sort(result.begin(), result.end(), [](const PIC32CXPinData& a, const PIC32CXPinData& b) {
+        return a._setPin < b._setPin;
+    });
+    return result;
+}
+
+PIC32CXPinList _PIC32CXPlatformConfiguration::getActivePins()
+{
+    PIC32CXPinList result;
+    for (const auto& kv : _pinEntries)
+        if (kv.second._enabled)
+            result.append(kv.second);
+    std::sort(result.begin(), result.end(), [](const PIC32CXPinData& a, const PIC32CXPinData& b) {
+        return a._setPin < b._setPin;
+    });
+    return result;
+}
+
+// ---------------------------------------------------------------------------
+// Getters / setters
+// ---------------------------------------------------------------------------
+
+bool _PIC32CXPlatformConfiguration::getPinEnableState(PinID pinId) const
+{
+    auto it = _pinEntries.find(PIC32CXPinData::makePIC32CXHash(pinId));
+    return (it != _pinEntries.end()) ? it->second._enabled : true;
+}
+void _PIC32CXPlatformConfiguration::setPinEnableState(HashType hash, bool newState)
+{
+    auto it = _pinEntries.find(hash);
+    if (it == _pinEntries.end()) throw std::invalid_argument("setPinEnableState: invalid pin");
+    it->second._enabled = newState;
+}
+
+bool _PIC32CXPlatformConfiguration::getPinInvertedState(PinID pinId) const
+{
+    auto it = _pinEntries.find(PIC32CXPinData::makePIC32CXHash(pinId));
+    return (it != _pinEntries.end()) ? it->second._inverted : false;
+}
+void _PIC32CXPlatformConfiguration::setPinInvertedState(HashType hash, bool newState)
+{
+    auto it = _pinEntries.find(hash);
+    if (it == _pinEntries.end()) throw std::invalid_argument("setPinInvertedState: invalid pin");
+    it->second._inverted = newState;
+}
+
+qtac::String _PIC32CXPlatformConfiguration::getPinLabel(PinID pinId) const
+{
+    auto it = _pinEntries.find(PIC32CXPinData::makePIC32CXHash(pinId));
+    return (it != _pinEntries.end()) ? it->second._pinLabel : qtac::String();
+}
+void _PIC32CXPlatformConfiguration::setPinLabel(HashType hash, const qtac::String& v)
+{
+    auto it = _pinEntries.find(hash);
+    if (it == _pinEntries.end()) throw std::invalid_argument("setPinLabel: invalid pin");
+    it->second._pinLabel = v;
+}
+
+qtac::String _PIC32CXPlatformConfiguration::getPinTooltip(PinID pinId) const
+{
+    auto it = _pinEntries.find(PIC32CXPinData::makePIC32CXHash(pinId));
+    return (it != _pinEntries.end()) ? it->second._pinTooltip : qtac::String();
+}
+void _PIC32CXPlatformConfiguration::setPinTooltip(HashType hash, const qtac::String& v)
+{
+    auto it = _pinEntries.find(hash);
+    if (it == _pinEntries.end()) throw std::invalid_argument("setPinTooltip: invalid pin");
+    it->second._pinTooltip = v;
+}
+
+qtac::String _PIC32CXPlatformConfiguration::getPinCommand(PinID pinId) const
+{
+    auto it = _pinEntries.find(PIC32CXPinData::makePIC32CXHash(pinId));
+    return (it != _pinEntries.end()) ? it->second._pinCommand : qtac::String();
+}
+void _PIC32CXPlatformConfiguration::setPinCommand(HashType hash, const qtac::String& v)
+{
+    auto it = _pinEntries.find(hash);
+    if (it == _pinEntries.end()) throw std::invalid_argument("setPinCommand: invalid pin");
+    it->second._pinCommand = v;
+}
+
+CommandGroups _PIC32CXPlatformConfiguration::getPinGroup(PinID pinId) const
+{
+    auto it = _pinEntries.find(PIC32CXPinData::makePIC32CXHash(pinId));
+    return (it != _pinEntries.end()) ? it->second._commandGroup : eUnknownCommandGroup;
+}
+void _PIC32CXPlatformConfiguration::setPinGroup(HashType hash, CommandGroups commandGroup)
+{
+    auto it = _pinEntries.find(hash);
+    if (it == _pinEntries.end()) throw std::invalid_argument("setPinGroup: invalid pin");
+    it->second._commandGroup = commandGroup;
+}
+
+qtac::String _PIC32CXPlatformConfiguration::getTabName(PinID pinId) const
+{
+    auto it = _pinEntries.find(PIC32CXPinData::makePIC32CXHash(pinId));
+    return (it != _pinEntries.end()) ? it->second._tabName : qtac::String();
+}
+void _PIC32CXPlatformConfiguration::setTabName(HashType hash, const qtac::String& v)
+{
+    auto it = _pinEntries.find(hash);
+    if (it == _pinEntries.end()) throw std::invalid_argument("setTabName: invalid pin");
+    it->second._tabName = v;
+}
+
+qtac::Point _PIC32CXPlatformConfiguration::getPinCellLocation(PinID pinId) const
+{
+    auto it = _pinEntries.find(PIC32CXPinData::makePIC32CXHash(pinId));
+    return (it != _pinEntries.end()) ? it->second._cellLocation : qtac::Point(-1, -1);
+}
+void _PIC32CXPlatformConfiguration::setPinCellLocation(HashType hash, const qtac::Point& v)
+{
+    auto it = _pinEntries.find(hash);
+    if (it == _pinEntries.end()) throw std::invalid_argument("setPinCellLocation: invalid pin");
+    it->second._cellLocation = v;
+}
+
+PinID _PIC32CXPlatformConfiguration::bitFromSetPin(PinID setPin)
+{
+    auto it = _pinEntries.find(PIC32CXPinData::makePIC32CXHash(setPin));
+    return (it != _pinEntries.end()) ? it->second._setPin : static_cast<PinID>(-1);
+}
+
+// ---------------------------------------------------------------------------
+// Tab cascade operations
+// ---------------------------------------------------------------------------
+
+void _PIC32CXPlatformConfiguration::cascadeTabDelete(const qtac::String& tabName)
+{
+    for (auto& kv : _pinEntries)
+    {
+        if (kv.second._tabName == tabName)
+            kv.second._tabName = qtac::String();
+    }
+}
+
+void _PIC32CXPlatformConfiguration::cascadeTabRename(const qtac::String& oldName,
+                                                      const qtac::String& newName)
+{
+    for (auto& kv : _pinEntries)
+    {
+        if (kv.second._tabName == oldName)
+            kv.second._tabName = newName;
+    }
+}
+
+// ---------------------------------------------------------------------------
+// JSON I/O
+// ---------------------------------------------------------------------------
+
+bool _PIC32CXPlatformConfiguration::read(json_t& j)
+{
+    const auto* jobj = j.if_object();
+    if (!jobj) return false;
+
+    if (jobj->contains(kPlatformEntries) && jobj->at(kPlatformEntries).is_array())
+    {
+        for (const auto& peVal : jobj->at(kPlatformEntries).as_array())
+        {
+            const auto* pe = peVal.if_object();
+            if (!pe) continue;
+            PIC32CXPinData pinData;
+
+            if (pe->contains(kPinNumber))
+                pinData._setPin = static_cast<PinID>(qtac::json_util::toInt(pe->at(kPinNumber)));
+
+            pinData._hash = PIC32CXPinData::makePIC32CXHash(pinData._setPin);
+
+            if (pe->contains(kEnabled))      pinData._enabled      = qtac::json_util::toBool(pe->at(kEnabled));
+            if (pe->contains(kInverted))     pinData._inverted     = qtac::json_util::toBool(pe->at(kInverted));
+            if (pe->contains(kName))         pinData._pinLabel     = qtac::json_util::toString(pe->at(kName));
+            if (pe->contains(kToolTip))      pinData._pinTooltip   = qtac::json_util::toString(pe->at(kToolTip));
+            if (pe->contains(kCommand))      pinData._pinCommand   = qtac::json_util::toString(pe->at(kCommand));
+            if (pe->contains(kCommandGroup)) pinData._commandGroup = static_cast<CommandGroups>(qtac::json_util::toInt(pe->at(kCommandGroup)));
+            if (pe->contains(kTabName))      pinData._tabName      = qtac::json_util::toString(pe->at(kTabName));
+            if (pe->contains(kRunPriority))
+                pinData._cellLocation = toPoint(qtac::String(qtac::json_util::toString(pe->at(kRunPriority))));
+
+            _pinEntries[pinData._hash] = pinData;
+        }
+    }
+
+    // --- Load buttons ---
+    _buttons.clear();
+    if (jobj->contains(kButtons) && jobj->at(kButtons).is_array())
+    {
+        for (const auto& jbVal : jobj->at(kButtons).as_array())
+        {
+            const auto* jb = jbVal.if_object();
+            if (!jb) continue;
+            qtac::ButtonEntry btn;
+            if (jb->contains(kName))         btn._name         = qtac::json_util::toString(jb->at(kName));
+            if (jb->contains(kCommand))      btn._command      = qtac::json_util::toString(jb->at(kCommand));
+            if (jb->contains(kCommandGroup)) btn._commandGroup = qtac::json_util::toInt(jb->at(kCommandGroup));
+            if (jb->contains(kTab))          btn._tab          = qtac::json_util::toString(jb->at(kTab));
+            if (jb->contains(kToolTip))      btn._tooltip      = qtac::json_util::toString(jb->at(kToolTip));
+            if (jb->contains(kCellLocation))
+            {
+                qtac::Point pt = toPoint(qtac::String(qtac::json_util::toString(jb->at(kCellLocation))));
+                btn._cellX = pt.x();
+                btn._cellY = pt.y();
+            }
+            if (!btn._command.isEmpty() && !btn._name.isEmpty())
+                _buttons.push_back(btn);
+        }
+    }
+
+    // If no buttons were defined in the tcnf, inject the classic default Quick Settings.
+    if (_buttons.empty())
+    {
+        static const struct { const char* name; const char* cmd; const char* tip; int col; int row; }
+        kDefaultButtons[] = {
+            { "Power On",              "powerOn",            "Powers on the MTP/Device",                        0, 0 },
+            { "Power Off",             "powerOff",           "Powers off the MTP/Device",                       1, 0 },
+            { "Boot to EDL",           "bootToEDL",          "Boots the device to emergency download",          2, 0 },
+            { "Boot to Fastboot",      "bootToFastboot",     "Boots the device to fastboot",                    0, 1 },
+            { "Boot to UEFI",          "bootToUEFI",         "Boots the device to UEFI Menu",                   1, 1 },
+            { "Boot to Secondary EDL", "bootToSecondaryEDL", "Boots the device to secondary emergency download",2, 1 },
+        };
+        for (const auto& d : kDefaultButtons)
+        {
+            qtac::ButtonEntry btn;
+            btn._name         = d.name;
+            btn._command      = d.cmd;
+            btn._tooltip      = d.tip;
+            btn._commandGroup = 4;  // eQuickSettingsGroup
+            btn._tab          = "General";
+            btn._cellX        = d.col;
+            btn._cellY        = d.row;
+            _buttons.push_back(btn);
+        }
+    }
+
+    // --- Load variables ---
+    _variables.clear();
+    if (jobj->contains(kVariables) && jobj->at(kVariables).is_array())
+    {
+        for (const auto& jvVal : jobj->at(kVariables).as_array())
+        {
+            const auto* jv = jvVal.if_object();
+            if (!jv) continue;
+            qtac::VariableEntry var;
+            if (jv->contains(kName))    var._name    = qtac::json_util::toString(jv->at(kName));
+            if (jv->contains(kLabel))   var._label   = qtac::json_util::toString(jv->at(kLabel));
+            if (jv->contains(kToolTip)) var._tooltip = qtac::json_util::toString(jv->at(kToolTip));
+            if (jv->contains(kType))    var._type    = static_cast<qtac::VariableType>(qtac::json_util::toInt(jv->at(kType)));
+            if (jv->contains(kDefaultValue))
+            {
+                std::string dv = qtac::json_util::toString(jv->at(kDefaultValue));
+                if (var._type == qtac::VariableType::Boolean)
+                    var._defaultValue = (dv == "1" || dv == "true");
+                else if (var._type == qtac::VariableType::Float)
+                {
+                    try { var._defaultValue = std::stof(dv); } catch (...) {}
+                }
+                else
+                {
+                    try { var._defaultValue = static_cast<unsigned int>(std::stoul(dv)); }
+                    catch (...) { var._defaultValue = 0u; }
+                }
+            }
+            if (jv->contains(kCellLocation))
+            {
+                qtac::Point pt = toPoint(qtac::String(qtac::json_util::toString(jv->at(kCellLocation))));
+                var._cellX = pt.x();
+                var._cellY = pt.y();
+            }
+            if (!var._name.isEmpty())
+                _variables[var._name] = var;
+        }
+    }
+
+    // Inject defaults for script timing variables if not defined in the tcnf.
+    auto ensureVar = [&](const char* name, const char* label, const char* tooltip,
+                         unsigned int defaultMs, int cellX, int cellY)
+    {
+        if (_variables.find(qtac::String(name)) == _variables.end())
+        {
+            qtac::VariableEntry v;
+            v._name         = name;
+            v._label        = label;
+            v._tooltip      = tooltip;
+            v._type         = qtac::VariableType::Integer;
+            v._defaultValue = defaultMs;
+            v._cellX        = cellX;
+            v._cellY        = cellY;
+            _variables[v._name] = v;
+        }
+    };
+    ensureVar("edl",      "EDL timing (ms)",     "Configurable Boot to EDL timing in milliseconds",      1300, 0, 0);
+    ensureVar("uefi",     "UEFI timing (ms)",     "Configurable Boot to UEFI timing in milliseconds",     8000, 0, 1);
+    ensureVar("fastboot", "Fastboot timing (ms)", "Configurable Boot to fastboot timing in milliseconds", 8000, 1, 0);
+
+    // --- Load and parse script ---
+    if (jobj->contains(kScript) && jobj->at(kScript).is_string())
+    {
+        qtac::String scriptText = qtac::json_util::toString(jobj->at(kScript));
+        TACCommands cmds;
+        PIC32CXPinList activePins = getActivePins();
+        for (const auto& p : activePins)
+        {
+            if (p._pinCommand.isEmpty()) continue;
+            TACCommand tc;
+            tc._pin     = p._setPin;
+            tc._command = p._pinCommand;
+            cmds.append(tc);
+        }
+        _script.parseScript(scriptText, _variables, cmds);
+    }
+
+    if (jobj->contains(kModificationDate) && jobj->at(kModificationDate).is_string())
+        _modificationDate = qtac::String(qtac::json_util::toString(jobj->at(kModificationDate)));
+    if (jobj->contains(kFileVersion) && (jobj->at(kFileVersion).is_int64() || jobj->at(kFileVersion).is_uint64()))
+        _fileVersion = qtac::json_util::toInt(jobj->at(kFileVersion));
+
+    return true;
+}
+
+void _PIC32CXPlatformConfiguration::loadDefaultScript(const qtac::String& scriptText)
+{
+    if (scriptText.isEmpty() || !_script.isEmpty())
+        return;
+
+    TACCommands cmds;
+    PIC32CXPinList activePins = getActivePins();
+    for (const auto& p : activePins)
+    {
+        if (p._pinCommand.isEmpty()) continue;
+        TACCommand tc;
+        tc._pin     = p._setPin;
+        tc._command = p._pinCommand;
+        cmds.append(tc);
+    }
+    _script.parseScript(scriptText, _variables, cmds);
+}
+
+void _PIC32CXPlatformConfiguration::write(json_t& j)
+{
+    boost::json::array pinsArray;
+    for (const auto& kv : _pinEntries)
+    {
+        const PIC32CXPinData& p = kv.second;
+        boost::json::object entry;
+        entry[kPinNumber]    = static_cast<int>(p._setPin);
+        entry[kEnabled]      = p._enabled;
+        entry[kInverted]     = p._inverted;
+        entry[kName]         = p._pinLabel.toStdString();
+        entry[kToolTip]      = p._pinTooltip.toStdString();
+        entry[kCommand]      = p._pinCommand.toStdString();
+        entry[kCommandGroup] = static_cast<int>(p._commandGroup);
+        entry[kRunPriority]  = fromPoint(p._cellLocation).toStdString();
+        entry[kTabName]      = p._tabName.toStdString();
+        pinsArray.push_back(entry);
+    }
+    j.as_object()[kPlatformEntries] = pinsArray;
+}
+
+// ---------------------------------------------------------------------------
+// Factory defaults (ported from qcommon-console/PIC32CXPlatformConfiguration.cpp)
+// ---------------------------------------------------------------------------
+
+void _PIC32CXPlatformConfiguration::initialize()
+{
+    auto add = [&](PinID pin,
+                   bool enabled,
+                   bool inverted,
+                   const char* label,
+                   const char* cmd,
+                   const char* tooltip,
+                   CommandGroups group,
+                   const char* tab,
+                   qtac::Point cell)
+    {
+        PIC32CXPinData p(pin);
+        p._enabled      = enabled;
+        p._inverted     = inverted;
+        p._pinLabel     = label ? label : "";
+        p._pinCommand   = cmd ? cmd : "";
+        p._pinTooltip   = tooltip ? tooltip : "";
+        p._commandGroup = group;
+        p._tabName      = tab;
+        p._cellLocation = cell;
+        _pinEntries[p._hash] = p;
+    };
+
+    add(3,   false, false, "JMI2C.2",              "iic2",           "Debug pin",                        eConnectionGroup,    "General", {-1,-1});
+    add(4,   true,  false, "Battery",              "battery",        "Disconnects power to the device",  eConnectionGroup,    "General", { 0, 0});
+    add(6,   true,  false, "KK Power Enable",      "kkpwr",          "Enables KK Power",                 eButtonGroup,        "General", { 0, 0});
+    add(7,   true,  false, "MD PS HOLD",           "pshold",         "MD PS HOLD",                       eButtonGroup,        "General", { 1, 0});
+    add(10,  true,  false, "KK Resin N",           "sresn",          "KK Resin N",                       eButtonGroup,        "General", { 2, 0});
+    add(11,  false, false, "PMS Power On",         "pmspwr",         "PMS Power On",                     eButtonGroup,        "General", {-1,-1});
+    add(16,  true,  false, "UEFI",                 "uefi",           "UEFI",                             eButtonGroup,        "General", { 0, 2});
+    add(20,  true,  false, "Power Off",            "pkey",           "Power Off",                        eButtonGroup,        "General", { 0, 1});
+    add(21,  true,  false, "PCIE0 Attention",      "pcie0",          "PCIE 0 Attention",                 eSwitchGroup,        "General", { 0, 0});
+    add(27,  true,  false, "PCIE1 Attention",      "pcie1",          "PCIE 1 Attention",                 eSwitchGroup,        "General", { 1, 0});
+    add(101, true,  false, "PCIE2 Attention",      "pcie2",          "PCIE 2 Attention",                 eSwitchGroup,        "General", { 2, 0});
+    add(102, true,  false, "PCIE3 Attention",      "pcie3",          "PCIE 3 Attention",                 eSwitchGroup,        "General", { 0, 1});
+    add(103, false, false, "JMI2C.10",             "iic10",          "Debug pin",                        eSwitchGroup,        "General", {-1,-1});
+    add(110, false, false, "Kratos Trigger",       "kratos",         "Kratos Trigger",                   eSwitchGroup,        "General", {-1,-1});
+    add(111, false, false, "JMI2C.4",              "iic4",           "Debug pin",                        eSwitchGroup,        "General", {-1,-1});
+    add(114, false, false, "QCC BLD Disconnect",   "qccbld",         "QCC BLD Disconnect",               eButtonGroup,        "General", {-1,-1});
+    add(115, false, false, "BB BLD Disconnect",    "bbbld",          "BB BLD Disconnect",                eSwitchGroup,        "General", {-1,-1});
+    add(116, true,  false, "Secondary Fastboot",   "sfastboot",      "Fastboot SS",                      eSwitchGroup,        "General", { 1, 1});
+    add(117, false, false, "JMI2C.5",              "iic5",           "Debug pin",                        eSwitchGroup,        "General", {-1,-1});
+    add(118, false, false, "PG QAM VR4P5",         "inputvr4p5",     "PG QAM VR4P5",                     eButtonGroup,        "General", {-1,-1});
+    add(119, false, false, "PG QAM SAIL VR3P3",    "inputvr3p3",     "PG QAM SAIL VR3P3",                eButtonGroup,        "General", {-1,-1});
+    add(120, true,  false, "Force MD PS HOLD",     "forcemdpshold",  "Force MD PS HOLD",                 eButtonGroup,        "General", { 1, 1});
+    add(121, true,  false, "Force SS PS HOLD",     "forcesspshold",  "Force SS PS HOLD",                 eButtonGroup,        "General", { 2, 1});
+    add(123, false, false, "",                     "",               "",                                 eUnknownCommandGroup,"General", {-1,-1});
+    add(128, true,  false, "USB0",                 "usb0",           "Disconnect USB0",                  eConnectionGroup,    "General", { 1, 0});
+    add(129, false, false, "PMS PGOOD",            "pgood",          "-",                                eButtonGroup,        "General", { 4, 0});
+    add(204, false, false, "",                     "",               "",                                 eUnknownCommandGroup,"General", {-1,-1});
+    add(205, true,  false, "USB2",                 "usb2",           "USB 2 Disable",                    eConnectionGroup,    "General", { 0, 1});
+    add(206, false, false, "Fast Power Off",       "inputpwr",       "Fast K Power Off Enable",          eButtonGroup,        "General", { 4, 2});
+    add(207, true,  false, "Mode 0",               "mode0",          "Mode 0 for Primary SOC",           eButtonGroup,        "General", { 1, 2});
+    add(215, true,  false, "Mode 1",               "mode1",          "Mode 1",                           eButtonGroup,        "General", { 2, 2});
+    add(216, true,  false, "MD EDL",               "pedl",           "MD EDL",                           eButtonGroup,        "General", { 0, 3});
+    add(217, false, false, "Mode 0",               "mode0",          "Mode 0",                           eButtonGroup,        "General", {-1,-1});
+    add(219, true,  false, "SS EDL",               "sedl",           "SS EDL",                           eButtonGroup,        "General", { 1, 3});
+    add(221, false, false, "JMI2C.13",             "iic13",          "Debug pin",                        eButtonGroup,        "General", {-1,-1});
+    add(224, false, false, "PMS Fast Power Off",   "inputpoff",      "PMS Fast Power Off",               eUnknownCommandGroup,"General", {-1,-1});
+    add(225, false, false, "PMS Enable",           "inputpms",       "PMS Enable",                       eUnknownCommandGroup,"General", {-1,-1});
+    add(226, false, false, "BB BLD EN",            "bbblden",        "-",                                eButtonGroup,        "General", {-1,-1});
+    add(227, false, false, "QCC BLD EN",           "qccblden",       "-",                                eButtonGroup,        "General", {-1,-1});
+    add(228, false, false, "Mode 2",               "mode2",          "Mode 2",                           eSwitchGroup,        "General", {-1,-1});
+    add(311, true,  false, "EUD",                  "eud",            "EUD for Primary SOC",              eButtonGroup,        "General", { 2, 3});
+    add(312, true,  false, "USB1",                 "usb1",           "USB1 Disconnect",                  eConnectionGroup,    "General", { 2, 0});
+    add(320, false, false, "JMI2C.7",              "iic7",           "Debug I2C 7",                      eButtonGroup,        "General", {-1,-1});
+    add(321, true,  false, "Fastboot MD",          "fastboot",       "MD Fastboot",                      eSwitchGroup,        "General", { 2, 1});
+}
diff --git a/source/library/src/PSOCDevice.cpp b/source/library/src/PSOCDevice.cpp
new file mode 100644
index 00000000..f7c7189b
--- /dev/null
+++ b/source/library/src/PSOCDevice.cpp
@@ -0,0 +1,377 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <qtac/PSOCDevice.h>
+#include <qtac/TACPSOCDriveThread.h>
+#include <qtac/SerialPortInfo.h>
+#include <qtac/StringUtilities.h>
+#include <qtac/PlatformID.h>
+#include <qtac/TcnfLoader.h>
+
+#include <algorithm>
+#include <chrono>
+#include <thread>
+
+using qtac::SerialPortInfo;
+using qtac::SerialPortInfos;
+using qtac::TACPSOCDriveThread;
+
+// PSoC VID/PID pairs (from qcommon-console/PSOCSerialTableModel)
+static constexpr uint16_t kPSOCVid1{0x05C6}, kPSOCPid1{0x9302};
+static constexpr uint16_t kPSOCVid2{0x16C0}, kPSOCPid2{0x0483};
+
+static constexpr int kMaxOpenIterations{60};
+static constexpr int kMaxPlatformIdIterations{10};
+static constexpr int kOpenPollMs{300};
+static constexpr int kOpenInitMs{100};
+
+uint32_t PSOCDevice::updateAlpacaDevices()
+{
+    std::lock_guard<std::recursive_mutex> lock(_mutex);
+    for (auto& dev : _alpacaDevices)
+        if (dev->debugBoardType() == ePSOC)
+            dev->setActive(false);
+
+    SerialPortInfos ports = SerialPortInfo::availablePorts();
+    for (const auto& info : ports)
+    {
+        if (!info.matchesVidPid(kPSOCVid1, kPSOCPid1) &&
+            !info.matchesVidPid(kPSOCVid2, kPSOCPid2))
+            continue;
+
+        qtac::ByteArray portName = info.portName().toLatin1();
+        HashType hash = arrayHash(portName);
+
+        AlpacaDevice existing = findAlpacaDevice(hash);
+        if (!existing)
+        {
+            auto* dev = new PSOCDevice;
+            dev->_portName     = portName;
+            dev->_hash         = hash;
+            dev->_active       = true;
+            dev->_boardType    = ePSOC;
+            dev->_platformID   = MICRO_EPM_BOARD_ID_UNKNOWN;
+            dev->_description  = info.description().toLatin1();
+            dev->_serialNumber = info.serialNumber().toLatin1();
+            dev->_usbRevision  = info.revision();
+            _alpacaDevices.append(AlpacaDevice(dev));
+        }
+        else
+        {
+            existing->setActive(true);
+        }
+    }
+
+    return static_cast<uint32_t>(_alpacaDevices.size());
+}
+
+bool PSOCDevice::open()
+{
+    bool result{false};
+
+    if (_serialDriveThread == nullptr)
+    {
+        TACPSOCDriveThread* thread;
+
+        if (_driveThread != nullptr)
+        {
+            // GUI path: caller already created and injected a TACPSOCDriveThread via
+            // setDriveThread(). Alias it so all the open() logic below works uniformly.
+            // Ownership stays with the caller; AlpacaDevice::close() detects this alias
+            // and skips the delete for _serialDriveThread.
+            thread = static_cast<TACPSOCDriveThread*>(_driveThread);
+            _serialDriveThread = thread;
+        }
+        else
+        {
+            // Headless / test path: create our own thread (self-owned, deleted by close()).
+            thread = new TACPSOCDriveThread(_hash);
+            _serialDriveThread = thread;
+        }
+
+        _serialDriveThread->start();
+
+        std::this_thread::sleep_for(std::chrono::milliseconds(kOpenInitMs));
+
+        for (int i = 0; i < kMaxOpenIterations; ++i)
+        {
+            if (_serialDriveThread->weAreRunning()) { result = true; break; }
+            std::this_thread::sleep_for(std::chrono::milliseconds(kOpenPollMs));
+        }
+
+        if (!result)
+        {
+            _lastError = "PSoC device did not become ready after open";
+            return false;
+        }
+
+        result = false;
+        for (int i = 0; i < kMaxPlatformIdIterations; ++i)
+        {
+            PlatformID pid = thread->platformID();
+            if (pid == MICRO_EPM_BOARD_ID_UNKNOWN)
+            {
+                if (thread->oldFirmware())
+                {
+                    _lastError = "Firmware version is too old";
+                    return false;
+                }
+                std::this_thread::sleep_for(std::chrono::milliseconds(kOpenInitMs));
+            }
+            else
+            {
+                _platformID = pid;
+                result = true;
+                break;
+            }
+        }
+
+        // Firmware that doesn't support 'Get Platform ID' leaves platformID UNKNOWN
+        // but the device is still usable if it connected and returned a version string.
+        if (!result && thread->connected())
+            result = true;
+
+        // If platformID is still UNKNOWN but the device is connected, attempt to
+        // identify the platform by the USB bcdDevice revision value stored during
+        // enumeration.  This handles older firmware that doesn't implement the
+        // 'Get Platform ID' command.
+        if (result && _platformID == MICRO_EPM_BOARD_ID_UNKNOWN && _usbRevision != 0)
+        {
+            PlatformContainer::initialize();
+            PlatformID fallback = PlatformContainer::fromRevision(_usbRevision, ePSOC);
+            if (fallback != MICRO_EPM_BOARD_ID_UNKNOWN)
+                _platformID = fallback;
+        }
+
+        // Second fallback: match by firmware chip version when the entry in devicelist.json
+        // has a "firmware_chip" field.  Used for devices where the USB revision is 0 but
+        // the firmware chip identifier uniquely maps to a platform.
+        if (result && _platformID == MICRO_EPM_BOARD_ID_UNKNOWN)
+        {
+            unsigned int chip = thread->chipVersion();
+            if (chip != 0)
+            {
+                PlatformContainer::initialize();
+                PlatformID fallback = PlatformContainer::fromFirmwareChip(chip, ePSOC);
+                if (fallback != MICRO_EPM_BOARD_ID_UNKNOWN)
+                    _platformID = fallback;
+            }
+        }
+    }
+    else
+    {
+        result = _serialDriveThread->weAreRunning();
+    }
+
+    if (result)
+    {
+        _psocPlatformConfiguration = new _PSOCPlatformConfiguration;
+
+        // Load .tcnf override if a config path is registered for this platform
+        if (_platformID != MICRO_EPM_BOARD_ID_UNKNOWN)
+        {
+            PlatformContainer::initialize();
+            auto entries = PlatformContainer::getEntries();
+            for (const auto& entry : entries)
+            {
+                if (entry && entry->_platformID == _platformID && !entry->_path.isEmpty())
+                {
+                    TcnfLoader::loadPSOC(entry->_path.toStdString(), _psocPlatformConfiguration);
+                    break;
+                }
+            }
+        }
+
+        _serialDriveThread->onPinStateChanged.connect([this](uint64_t pin, bool state) {
+            this->on_pinStateChanged(pin, state);
+        });
+
+        buildMapping();
+
+        Pins pins = _psocPlatformConfiguration->getPins();
+        Pins initialPins;
+        for (const auto& pin : pins)
+            if (pin._initializationPriority > 0)
+                initialPins.append(pin);
+        for (const auto& pin : pins)
+            if (pin._initialValue)
+                initialPins.append(pin);
+
+        if (!initialPins.isEmpty())
+        {
+            std::sort(initialPins.begin(), initialPins.end(),
+                [](const PinEntry& a, const PinEntry& b) {
+                    return a._initializationPriority < b._initializationPriority;
+                });
+            for (const auto& pin : initialPins)
+                _serialDriveThread->setPinState(static_cast<uint16_t>(pin._pin), true);
+        }
+
+        TACPSOCDriveThread* thread = static_cast<TACPSOCDriveThread*>(_serialDriveThread);
+        _chipVersion = thread->chipVersion();
+    }
+
+    return result;
+}
+
+void PSOCDevice::buildMapping()
+{
+    if (!_commands.isEmpty() || _psocPlatformConfiguration == nullptr)
+        return;
+
+    Pins pins = _psocPlatformConfiguration->getPins();
+    for (const auto& pin : pins)
+    {
+        TACCommand tacCommand;
+        tacCommand._pin       = pin._pin;
+        tacCommand._command   = pin._pinCommand;
+        tacCommand._helpText  = pin._pinTooltip;
+        tacCommand._tabName   = pin._tabName.toLatin1();
+        tacCommand._groupName = CommandGroup::toString(pin._commandGroup).toLatin1();
+
+        qtac::ByteArray cellLocation =
+            qtac::ByteArray::number(pin._cellLocation.x()) + ","
+            + qtac::ByteArray::number(pin._cellLocation.y());
+        tacCommand._cellLocation = cellLocation;
+
+        _commands[tacCommand._command] = tacCommand;
+        _commandList.append(tacCommand);
+    }
+}
+
+qtac::ByteArray PSOCDevice::getHelp()
+{
+    if (!_helpText.isEmpty())
+        return _helpText;
+
+    if (_psocPlatformConfiguration == nullptr)
+        return {};
+
+    qtac::String result;
+
+    result += "Name: " + _psocPlatformConfiguration->name() + "\n\n";
+    result += "Platform: " + qtac::String(debugBoardTypeToString(_boardType)) + "\n";
+    result += "Author: " + _psocPlatformConfiguration->author() + "\n";
+    result += "Description: " + _psocPlatformConfiguration->description() + "\n";
+    result += "Modification Date: " + _psocPlatformConfiguration->modificationDate() + "\n";
+
+    Pins pins = _psocPlatformConfiguration->getPins();
+    if (!pins.isEmpty())
+    {
+        result += "\nCommands\n\n";
+        for (const auto& pin : pins)
+        {
+            if (!pin._pinCommand.isEmpty())
+            {
+                result += "\t" + pin._pinLabel + " Command: "
+                        + pin._pinCommand + "(" + qtac::String::number(static_cast<unsigned long long>(pin._pin)) + ")"
+                        + ", " + pin._pinTooltip + "\n";
+            }
+        }
+    }
+
+    const qtac::ButtonEntries& buttons = _psocPlatformConfiguration->getButtons();
+    if (!buttons.empty())
+    {
+        result += "\nQuick Commands\n\n";
+        for (const auto& btn : buttons)
+        {
+            result += "\t" + btn._name + " Command: " + btn._command
+                    + ", " + btn._tooltip + "\n";
+        }
+    }
+
+    _helpText = result.toLatin1();
+    return _helpText;
+}
+
+Pins PSOCDevice::getPins()
+{
+    if (_psocPlatformConfiguration == nullptr)
+        return {};
+    return _psocPlatformConfiguration->getPins();
+}
+
+void PSOCDevice::quickCommand(const qtac::ByteArray& command)
+{
+    qtac::TACDriveThread* dt = _driveThread ? _driveThread : _serialDriveThread;
+    if (_psocPlatformConfiguration == nullptr || dt == nullptr)
+    {
+        if (_serialDriveThread && _serialDriveThread->onLogLine)
+            _serialDriveThread->onLogLine("quickCommand: config or thread not ready for '" + command + "'");
+        return;
+    }
+    const qtac::AlpacaScript& script = _psocPlatformConfiguration->getScript();
+    if (!script.hasCommand(command))
+    {
+        if (dt->onLogLine)
+            dt->onLogLine("quickCommand: command not found in script: '" + command + "'");
+        return;
+    }
+    if (dt->onLogLine)
+        dt->onLogLine("quickCommand: executing '" + command + "'");
+    qtac::CommandEntries entries = script.getCommandEntries(command);
+    entries = qtac::AlpacaScript::replaceTokens(_psocPlatformConfiguration->getVariables(), entries);
+    dt->sendCommandSequence(entries);
+}
+
+void PSOCDevice::setVariableValue(const qtac::String& name, const qtac::Variant& value)
+{
+    if (_psocPlatformConfiguration != nullptr)
+        _psocPlatformConfiguration->setVariableValue(name, value);
+}
+
+const qtac::ButtonEntries& PSOCDevice::getButtons() const
+{
+    static qtac::ButtonEntries empty;
+    if (_psocPlatformConfiguration == nullptr) return empty;
+    return _psocPlatformConfiguration->getButtons();
+}
+
+const qtac::VariableEntries& PSOCDevice::getVariables() const
+{
+    static qtac::VariableEntries empty;
+    if (_psocPlatformConfiguration == nullptr) return empty;
+    return _psocPlatformConfiguration->getVariables();
+}
+
+qtac::String PSOCDevice::configModificationDate() const
+{
+    if (_psocPlatformConfiguration == nullptr) return {};
+    return _psocPlatformConfiguration->modificationDate();
+}
+
+int PSOCDevice::configFileVersion() const
+{
+    if (_psocPlatformConfiguration == nullptr) return 0;
+    return _psocPlatformConfiguration->fileVersion();
+}
diff --git a/source/library/src/PSOCPlatformConfiguration.cpp b/source/library/src/PSOCPlatformConfiguration.cpp
new file mode 100644
index 00000000..6179e9db
--- /dev/null
+++ b/source/library/src/PSOCPlatformConfiguration.cpp
@@ -0,0 +1,908 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <qtac/PSOCPlatformConfiguration.h>
+#include <qtac/StringUtilities.h>
+
+#include <algorithm>
+#include <stdexcept>
+
+// JSON key constants
+static const char* kPlatformEntries        = "pins";
+static const char* kPinNumber              = "pin_number";
+static const char* kEnabled                = "enabled";
+static const char* kInitialValue           = "initial_value";
+static const char* kPriority               = "initialization_priority";
+static const char* kInverted               = "inverted";
+static const char* kName                   = "name";
+static const char* kToolTip                = "help_hint";
+static const char* kButtonTooltip          = "tooltip";
+static const char* kAuthor                 = "author";
+static const char* kDescription           = "description";
+static const char* kCommand                = "command";
+static const char* kCommandGroup           = "command_group";
+static const char* kClassicAction          = "classic_action";
+static const char* kTabName                = "tab_name";
+static const char* kRunPriority            = "run_priority";
+static const char* kMinFirmwareVersion     = "supportedFirmwareVer";
+static const char* kButtons                = "buttons";
+static const char* kVariables              = "variables";
+static const char* kScript                 = "script";
+static const char* kModificationDate       = "modification_date";
+static const char* kFileVersion            = "fileVersion";
+static const char* kLabel                  = "label";
+static const char* kTab                    = "tab";
+static const char* kCellLocation           = "cellLocation";
+static const char* kDefaultValue           = "default_value";
+static const char* kType                   = "type";
+
+// Static storage for factory defaults
+PSOCPinEntries  _PSOCPlatformConfiguration::_classicActions;
+PSOCI2CEntries  _PSOCPlatformConfiguration::_classicI2CActions;
+PSOCI2CSlaves   _PSOCPlatformConfiguration::_classicSlaveConfigs;
+
+// ---------------------------------------------------------------------------
+
+_PSOCPlatformConfiguration::_PSOCPlatformConfiguration(PSOCVariant psocVariant)
+    : _variant(psocVariant)
+{
+    if (_classicActions.isEmpty())
+        _PSOCPlatformConfiguration::initialize(psocVariant);
+
+    for (const auto& kv : _classicActions)
+        _pinEntries[kv.first] = kv.second;
+
+    if (psocVariant == ePSOCGPIOIIC)
+    {
+        _slaveConfigs = _classicSlaveConfigs;
+        refreshSlaveConfig();
+    }
+}
+
+// ---------------------------------------------------------------------------
+// Pin list accessors
+// ---------------------------------------------------------------------------
+
+Pins _PSOCPlatformConfiguration::getPins()
+{
+    Pins result;
+    PSOCPinList active = getActivePins();
+    for (const auto& p : active)
+    {
+        PinEntry pe;
+        pe._pin                    = p._pin;
+        pe._enabled                = p._enabled;
+        pe._hash                   = p._hash;
+        pe._cellLocation           = p._cellLocation;
+        pe._commandGroup           = p._commandGroup;
+        pe._pinCommand             = p._pinCommand;
+        pe._initialValue           = p._initialValue;
+        pe._inverted               = p._inverted;
+        pe._pinLabel               = p._pinLabel;
+        pe._pinTooltip             = p._pinTooltip;
+        pe._tabName                = p._tabName;
+        pe._initializationPriority = p._initializationPriority;
+        result.append(pe);
+    }
+
+    std::sort(result.begin(), result.end(), [](const PinEntry& a, const PinEntry& b) {
+        if (a._tabName != b._tabName)       return a._tabName < b._tabName;
+        if (a._commandGroup != b._commandGroup) return a._commandGroup < b._commandGroup;
+        return a._pin < b._pin;
+    });
+    return result;
+}
+
+PSOCPinList _PSOCPlatformConfiguration::getAllPins()
+{
+    PSOCPinList result;
+    for (const auto& kv : _pinEntries)
+        result.append(kv.second);
+    std::sort(result.begin(), result.end(), [](const PSOCPinData& a, const PSOCPinData& b) {
+        return a._pin < b._pin;
+    });
+    return result;
+}
+
+PSOCPinList _PSOCPlatformConfiguration::getActivePins()
+{
+    PSOCPinList result;
+    for (const auto& kv : _pinEntries)
+        if (kv.second._enabled)
+            result.append(kv.second);
+    std::sort(result.begin(), result.end(), [](const PSOCPinData& a, const PSOCPinData& b) {
+        return a._pin < b._pin;
+    });
+    return result;
+}
+
+// ---------------------------------------------------------------------------
+// Getters / setters
+// ---------------------------------------------------------------------------
+
+bool _PSOCPlatformConfiguration::getPinEnableState(PinID pinId) const
+{
+    auto it = _pinEntries.find(pinId);
+    return (it != _pinEntries.end()) ? it->second._enabled : true;
+}
+void _PSOCPlatformConfiguration::setPinEnableState(PinID pinId, bool newState)
+{
+    auto it = _pinEntries.find(pinId);
+    if (it == _pinEntries.end()) throw std::invalid_argument("setPinEnableState: invalid pin");
+    it->second._enabled = newState;
+}
+
+bool _PSOCPlatformConfiguration::getInitialPinValue(PinID pinId) const
+{
+    auto it = _pinEntries.find(pinId);
+    return (it != _pinEntries.end()) ? it->second._initialValue : false;
+}
+void _PSOCPlatformConfiguration::setInitialPinValue(PinID pinId, bool newState)
+{
+    auto it = _pinEntries.find(pinId);
+    if (it == _pinEntries.end()) throw std::invalid_argument("setInitialPinValue: invalid pin");
+    it->second._initialValue = newState;
+}
+
+uint64_t _PSOCPlatformConfiguration::getPinInitializationPriority(PinID pinId) const
+{
+    auto it = _pinEntries.find(pinId);
+    return (it != _pinEntries.end()) ? static_cast<uint64_t>(it->second._initializationPriority) : 0;
+}
+void _PSOCPlatformConfiguration::setPinInitializationPriority(PinID pinId, int priority)
+{
+    auto it = _pinEntries.find(pinId);
+    if (it == _pinEntries.end()) throw std::invalid_argument("setPinInitializationPriority: invalid pin");
+    it->second._initializationPriority = priority;
+}
+
+bool _PSOCPlatformConfiguration::getPinInvertedState(PinID pinId) const
+{
+    auto it = _pinEntries.find(pinId);
+    return (it != _pinEntries.end()) ? it->second._inverted : false;
+}
+void _PSOCPlatformConfiguration::setPinInvertedState(PinID pinId, bool newState)
+{
+    auto it = _pinEntries.find(pinId);
+    if (it == _pinEntries.end()) throw std::invalid_argument("setPinInvertedState: invalid pin");
+    it->second._inverted = newState;
+}
+
+qtac::String _PSOCPlatformConfiguration::getPinLabel(PinID pinId) const
+{
+    auto it = _pinEntries.find(pinId);
+    return (it != _pinEntries.end()) ? it->second._pinLabel : qtac::String();
+}
+void _PSOCPlatformConfiguration::setPinLabel(PinID pinId, const qtac::String& v)
+{
+    auto it = _pinEntries.find(pinId);
+    if (it == _pinEntries.end()) throw std::invalid_argument("setPinLabel: invalid pin");
+    it->second._pinLabel = v;
+}
+
+qtac::String _PSOCPlatformConfiguration::getPinTooltip(PinID pinId) const
+{
+    auto it = _pinEntries.find(pinId);
+    return (it != _pinEntries.end()) ? it->second._pinTooltip : qtac::String();
+}
+void _PSOCPlatformConfiguration::setPinTooltip(PinID pinId, const qtac::String& v)
+{
+    auto it = _pinEntries.find(pinId);
+    if (it == _pinEntries.end()) throw std::invalid_argument("setPinTooltip: invalid pin");
+    it->second._pinTooltip = v;
+}
+
+qtac::String _PSOCPlatformConfiguration::getPinCommand(PinID pinId) const
+{
+    auto it = _pinEntries.find(pinId);
+    return (it != _pinEntries.end()) ? it->second._pinCommand : qtac::String();
+}
+void _PSOCPlatformConfiguration::setPinCommand(PinID pinId, const qtac::String& v)
+{
+    auto it = _pinEntries.find(pinId);
+    if (it == _pinEntries.end()) throw std::invalid_argument("setPinCommand: invalid pin");
+    it->second._pinCommand = v;
+}
+
+CommandGroups _PSOCPlatformConfiguration::getPinGroup(PinID pinId) const
+{
+    auto it = _pinEntries.find(pinId);
+    return (it != _pinEntries.end()) ? it->second._commandGroup : eUnknownCommandGroup;
+}
+void _PSOCPlatformConfiguration::setPinGroup(PinID pinId, CommandGroups commandGroup)
+{
+    auto it = _pinEntries.find(pinId);
+    if (it == _pinEntries.end()) throw std::invalid_argument("setPinGroup: invalid pin");
+    it->second._commandGroup = commandGroup;
+}
+
+qtac::String _PSOCPlatformConfiguration::getClassicAction(PinID pinId) const
+{
+    auto it = _pinEntries.find(pinId);
+    return (it != _pinEntries.end()) ? it->second._classicAction : qtac::String();
+}
+void _PSOCPlatformConfiguration::setClassicAction(PinID pinId, const qtac::String& v)
+{
+    auto it = _pinEntries.find(pinId);
+    if (it == _pinEntries.end()) throw std::invalid_argument("setClassicAction: invalid pin");
+    it->second._classicAction = v;
+}
+
+qtac::String _PSOCPlatformConfiguration::getTabName(PinID pinId) const
+{
+    auto it = _pinEntries.find(pinId);
+    return (it != _pinEntries.end()) ? it->second._tabName : qtac::String();
+}
+void _PSOCPlatformConfiguration::setTabName(PinID pinId, const qtac::String& v)
+{
+    auto it = _pinEntries.find(pinId);
+    if (it == _pinEntries.end()) throw std::invalid_argument("setTabName: invalid pin");
+    it->second._tabName = v;
+}
+
+qtac::Point _PSOCPlatformConfiguration::getPinCellLocation(PinID pinId) const
+{
+    auto it = _pinEntries.find(pinId);
+    return (it != _pinEntries.end()) ? it->second._cellLocation : qtac::Point(-1, -1);
+}
+void _PSOCPlatformConfiguration::setPinCellLocation(PinID pinId, const qtac::Point& v)
+{
+    auto it = _pinEntries.find(pinId);
+    if (it == _pinEntries.end()) throw std::invalid_argument("setPinCellLocation: invalid pin");
+    it->second._cellLocation = v;
+}
+
+// ---------------------------------------------------------------------------
+// Tab cascade operations
+// ---------------------------------------------------------------------------
+
+void _PSOCPlatformConfiguration::cascadeTabDelete(const qtac::String& tabName)
+{
+    for (auto& kv : _pinEntries)
+    {
+        if (kv.second._tabName == tabName)
+            kv.second._tabName = qtac::String();
+    }
+}
+
+void _PSOCPlatformConfiguration::cascadeTabRename(const qtac::String& oldName,
+                                                   const qtac::String& newName)
+{
+    for (auto& kv : _pinEntries)
+    {
+        if (kv.second._tabName == oldName)
+            kv.second._tabName = newName;
+    }
+}
+
+// ---------------------------------------------------------------------------
+// JSON I/O
+// ---------------------------------------------------------------------------
+
+bool _PSOCPlatformConfiguration::read(json_t& j)
+{
+    const auto* jobj = j.if_object();
+    if (!jobj) return false;
+
+    if (jobj->contains(kPlatformEntries) && jobj->at(kPlatformEntries).is_array())
+    {
+        for (const auto& peVal : jobj->at(kPlatformEntries).as_array())
+        {
+            const auto* pe = peVal.if_object();
+            if (!pe) continue;
+            PSOCPinData pinData;
+
+            if (pe->contains(kPinNumber))
+                pinData._pin = static_cast<PinID>(std::stoull(qtac::json_util::toString(pe->at(kPinNumber))));
+
+            pinData._hash = strHash(qtac::String::number(static_cast<unsigned long long>(pinData._pin)));
+
+            if (pe->contains(kEnabled))       pinData._enabled                = qtac::json_util::toBool(pe->at(kEnabled));
+            if (pe->contains(kInitialValue))  pinData._initialValue           = qtac::json_util::toBool(pe->at(kInitialValue));
+            if (pe->contains(kPriority))      pinData._initializationPriority = qtac::json_util::toInt(pe->at(kPriority));
+            if (pe->contains(kInverted))      pinData._inverted               = qtac::json_util::toBool(pe->at(kInverted));
+            if (pe->contains(kName))          pinData._pinLabel               = qtac::json_util::toString(pe->at(kName));
+            if (pe->contains(kToolTip))       pinData._pinTooltip             = qtac::json_util::toString(pe->at(kToolTip));
+            if (pe->contains(kCommand))       pinData._pinCommand             = qtac::json_util::toString(pe->at(kCommand));
+            if (pe->contains(kCommandGroup))  pinData._commandGroup           = static_cast<CommandGroups>(qtac::json_util::toInt(pe->at(kCommandGroup)));
+            if (pe->contains(kClassicAction)) pinData._classicAction          = qtac::json_util::toString(pe->at(kClassicAction));
+            if (pe->contains(kTabName))       pinData._tabName                = qtac::json_util::toString(pe->at(kTabName));
+            if (pe->contains(kRunPriority))
+                pinData._cellLocation = toPoint(qtac::String(qtac::json_util::toString(pe->at(kRunPriority))));
+
+            _pinEntries[pinData._pin] = pinData;
+        }
+    }
+
+    // --- Load buttons ---
+    _buttons.clear();
+    if (jobj->contains(kButtons) && jobj->at(kButtons).is_array())
+    {
+        for (const auto& jbVal : jobj->at(kButtons).as_array())
+        {
+            const auto* jb = jbVal.if_object();
+            if (!jb) continue;
+            qtac::ButtonEntry btn;
+            if (jb->contains(kName))         btn._name         = qtac::json_util::toString(jb->at(kName));
+            if (jb->contains(kCommand))      btn._command      = qtac::json_util::toString(jb->at(kCommand));
+            if (jb->contains(kCommandGroup)) btn._commandGroup = qtac::json_util::toInt(jb->at(kCommandGroup));
+            if (jb->contains(kTab))          btn._tab          = qtac::json_util::toString(jb->at(kTab));
+            if (jb->contains(kButtonTooltip)) btn._tooltip     = qtac::json_util::toString(jb->at(kButtonTooltip));
+            if (jb->contains(kCellLocation))
+            {
+                qtac::Point pt = toPoint(qtac::String(qtac::json_util::toString(jb->at(kCellLocation))));
+                btn._cellX = pt.x();
+                btn._cellY = pt.y();
+            }
+            if (!btn._command.isEmpty() && !btn._name.isEmpty())
+                _buttons.push_back(btn);
+        }
+    }
+
+    // If no buttons were defined in the tcnf, inject the classic default Quick Settings.
+    if (_buttons.empty())
+    {
+        static const struct { const char* name; const char* cmd; const char* tip; int col; int row; }
+        kDefaultButtons[] = {
+            { "Power On",              "powerOn",            "Powers on the MTP/Device",                        0, 0 },
+            { "Power Off",             "powerOff",           "Powers off the MTP/Device",                       1, 0 },
+            { "Boot to EDL",           "bootToEDL",          "Boots the device to emergency download",          2, 0 },
+            { "Boot to Fastboot",      "bootToFastboot",     "Boots the device to fastboot",                    0, 1 },
+            { "Boot to UEFI",          "bootToUEFI",         "Boots the device to UEFI Menu",                   1, 1 },
+            { "Boot to Secondary EDL", "bootToSecondaryEDL", "Boots the device to secondary emergency download",2, 1 },
+        };
+        for (const auto& d : kDefaultButtons)
+        {
+            qtac::ButtonEntry btn;
+            btn._name         = d.name;
+            btn._command      = d.cmd;
+            btn._tooltip      = d.tip;
+            btn._commandGroup = 4;  // eQuickSettingsGroup
+            btn._tab          = "General";
+            btn._cellX        = d.col;
+            btn._cellY        = d.row;
+            _buttons.push_back(btn);
+        }
+    }
+
+    // --- Load variables ---
+    _variables.clear();
+    if (jobj->contains(kVariables) && jobj->at(kVariables).is_array())
+    {
+        for (const auto& jvVal : jobj->at(kVariables).as_array())
+        {
+            const auto* jv = jvVal.if_object();
+            if (!jv) continue;
+            qtac::VariableEntry var;
+            if (jv->contains(kName))    var._name    = qtac::json_util::toString(jv->at(kName));
+            if (jv->contains(kLabel))   var._label   = qtac::json_util::toString(jv->at(kLabel));
+            if (jv->contains(kButtonTooltip)) var._tooltip = qtac::json_util::toString(jv->at(kButtonTooltip));
+            if (jv->contains(kType))    var._type    = static_cast<qtac::VariableType>(qtac::json_util::toInt(jv->at(kType)));
+            if (jv->contains(kDefaultValue))
+            {
+                std::string dv = qtac::json_util::toString(jv->at(kDefaultValue));
+                if (var._type == qtac::VariableType::Boolean)
+                    var._defaultValue = (dv == "1" || dv == "true");
+                else if (var._type == qtac::VariableType::Float)
+                {
+                    try { var._defaultValue = std::stof(dv); } catch (...) {}
+                }
+                else
+                {
+                    try { var._defaultValue = static_cast<unsigned int>(std::stoul(dv)); }
+                    catch (...) { var._defaultValue = 0u; }
+                }
+            }
+            if (jv->contains(kCellLocation))
+            {
+                qtac::Point pt = toPoint(qtac::String(qtac::json_util::toString(jv->at(kCellLocation))));
+                var._cellX = pt.x();
+                var._cellY = pt.y();
+            }
+            if (!var._name.isEmpty())
+                _variables[var._name] = var;
+        }
+    }
+
+    // Inject defaults for script timing variables if not defined in the tcnf.
+    auto ensureVar = [&](const char* name, const char* label, const char* tooltip,
+                         unsigned int defaultMs, int cellX, int cellY)
+    {
+        if (_variables.find(qtac::String(name)) == _variables.end())
+        {
+            qtac::VariableEntry v;
+            v._name         = name;
+            v._label        = label;
+            v._tooltip      = tooltip;
+            v._type         = qtac::VariableType::Integer;
+            v._defaultValue = defaultMs;
+            v._cellX        = cellX;
+            v._cellY        = cellY;
+            _variables[v._name] = v;
+        }
+    };
+    ensureVar("edl",      "EDL timing (ms)",     "Configurable Boot to EDL timing in milliseconds",      1300, 0, 0);
+    ensureVar("uefi",     "UEFI timing (ms)",     "Configurable Boot to UEFI timing in milliseconds",     8000, 0, 1);
+    ensureVar("fastboot", "Fastboot timing (ms)", "Configurable Boot to fastboot timing in milliseconds", 8000, 1, 0);
+
+    // --- Load and parse script ---
+    if (jobj->contains(kScript) && jobj->at(kScript).is_string())
+    {
+        qtac::String scriptText = qtac::json_util::toString(jobj->at(kScript));
+        TACCommands cmds;
+        PSOCPinList activePins = getActivePins();
+        for (const auto& p : activePins)
+        {
+            if (p._pinCommand.isEmpty()) continue;
+            TACCommand tc;
+            tc._pin     = p._pin;
+            tc._command = p._pinCommand;
+            cmds.append(tc);
+        }
+        _script.parseScript(scriptText, _variables, cmds);
+    }
+
+    if (jobj->contains(kModificationDate) && jobj->at(kModificationDate).is_string())
+        _modificationDate = qtac::String(qtac::json_util::toString(jobj->at(kModificationDate)));
+    if (jobj->contains(kFileVersion) && (jobj->at(kFileVersion).is_int64() || jobj->at(kFileVersion).is_uint64()))
+        _fileVersion = qtac::json_util::toInt(jobj->at(kFileVersion));
+    if (jobj->contains(kName) && jobj->at(kName).is_string())
+        _name = qtac::String(qtac::json_util::toString(jobj->at(kName)));
+    if (jobj->contains(kAuthor) && jobj->at(kAuthor).is_string())
+        _author = qtac::String(qtac::json_util::toString(jobj->at(kAuthor)));
+    if (jobj->contains(kDescription) && jobj->at(kDescription).is_string())
+        _description = qtac::String(qtac::json_util::toString(jobj->at(kDescription)));
+
+    return true;
+}
+
+void _PSOCPlatformConfiguration::loadDefaultScript(const qtac::String& scriptText)
+{
+    if (scriptText.isEmpty() || !_script.isEmpty())
+        return;
+
+    TACCommands cmds;
+    PSOCPinList activePins = getActivePins();
+    for (const auto& p : activePins)
+    {
+        if (p._pinCommand.isEmpty()) continue;
+        TACCommand tc;
+        tc._pin     = p._pin;
+        tc._command = p._pinCommand;
+        cmds.append(tc);
+    }
+    _script.parseScript(scriptText, _variables, cmds);
+}
+
+void _PSOCPlatformConfiguration::write(json_t& j)
+{
+    boost::json::array pinsArray;
+    for (const auto& kv : _pinEntries)
+    {
+        const PSOCPinData& p = kv.second;
+        boost::json::object entry;
+        entry[kPinNumber]     = qtac::String::number(static_cast<unsigned long long>(p._pin)).toStdString();
+        entry[kEnabled]       = p._enabled;
+        entry[kInitialValue]  = p._initialValue;
+        entry[kPriority]      = p._initializationPriority;
+        entry[kInverted]      = p._inverted;
+        entry[kName]          = p._pinLabel.toStdString();
+        entry[kToolTip]       = p._pinTooltip.toStdString();
+        entry[kCommand]       = p._pinCommand.toStdString();
+        entry[kCommandGroup]  = static_cast<int>(p._commandGroup);
+        entry[kClassicAction] = p._classicAction.toStdString();
+        entry[kRunPriority]   = fromPoint(p._cellLocation).toStdString();
+        entry[kTabName]       = p._tabName.toStdString();
+        pinsArray.push_back(entry);
+    }
+    j.as_object()[kPlatformEntries] = pinsArray;
+}
+
+// ---------------------------------------------------------------------------
+// Factory defaults (ported from qcommon-console/PSOCPlatformConfiguration.cpp)
+// ---------------------------------------------------------------------------
+
+void _PSOCPlatformConfiguration::initialize(PSOCVariant psocVariant)
+{
+    auto add = [&](PinID pin,
+                   const char* label,
+                   const char* cmd,
+                   const char* tooltip,
+                   int priority,
+                   CommandGroups group,
+                   bool enabled,
+                   const char* classic,
+                   qtac::Point cell,
+                   bool initialValue,
+                   bool inverted,
+                   const char* tab = "General")
+    {
+        PSOCPinData p;
+        p._pin                    = pin;
+        p._hash                   = strHash(qtac::String::number(static_cast<unsigned long long>(pin)));
+        p._pinLabel               = label ? label : "";
+        p._pinCommand             = cmd ? cmd : "";
+        p._pinTooltip             = tooltip ? tooltip : "";
+        p._initializationPriority = priority;
+        p._commandGroup           = group;
+        p._enabled                = enabled;
+        p._classicAction          = classic ? classic : "";
+        p._cellLocation           = cell;
+        p._initialValue           = initialValue;
+        p._inverted               = inverted;
+        p._tabName                = tab;
+        _classicActions[pin]      = p;
+    };
+
+    add(53, "Battery",           "battery", "Battery Disconnect",                           2, eConnectionGroup, true,  "TAC_POWER_OFF",         {0,0}, false, true);
+    add(55, "USB 0",             "usb0",    "Disconnnects VBUS for USB 0",                  2, eConnectionGroup, true,  "TAC_USB0_DIS",          {1,0}, false, true);
+    add(36, "USB 1",             "usb1",    "Disconnects VBUS for USB1",                    2, eConnectionGroup, true,  "TAC_USB1_DIS",          {2,0}, false, true);
+    add(50, "Power Key",         "pkey",    "Presses the power key button",                -1, eButtonGroup,     true,  "TAC_TC_START",          {0,0}, false, false);
+    add(34, "Volume Up",         "volup",   "Presses the volume up button",                -1, eButtonGroup,     true,  "TAC_VOL_UP",            {0,1}, false, false);
+    add(51, "Volume Down",       "voldn",   "Presses the volume down button",              -1, eButtonGroup,     true,  "TAC_RESET_PRI",         {0,2}, false, false);
+    add(18, "Disconnect UIM 1",  "uim1",    "Disconnects UIM 1",                           -1, eSwitchGroup,     true,  "TAC_UIM1_DIS",          {0,0}, false, false);
+    add(19, "Disconnect UIM 2",  "uim2",    "Disconnects UIM 2",                           -1, eSwitchGroup,     true,  "TAC_UIM2_DIS",          {1,0}, false, false);
+    add(54, "Emergency Download Mode (EDL)", "pedl", "Enables Primary Emergency Download Mode", -1, eSwitchGroup, true, "TAC_SW_DWNLD_PRI",     {0,1}, false, false);
+    add(37, "Force PS_HOLD High","pshold",  "Forces PSHold high",                          -1, eSwitchGroup,     true,  "TAC_FORCE_PS_HOLD",     {0,2}, false, false);
+    add(47, "Disconnect SD Card","sdcard",  "Disconnects the SD card slot",                -1, eSwitchGroup,     true,  "TAC_SDCARD_DISC",       {0,3}, false, false);
+    add(16, "Embedded USB Debug (EUD)", "eud", "Enabled the embedded USB debugger",        -1, eSwitchGroup,     true,  "TC_EUD_EARLY_BOOT_EN",  {0,4}, false, false);
+    add(21, "Headset Disconnect","headset", "Disconnects the headset",                     -1, eSwitchGroup,     true,  "TAC_HEADSET_DIS",       {0,5}, false, false);
+    add(30, "Secondary Emergency Download Mode (EDL)", "sedl", "Secondary EDL",           -1, eSwitchGroup,     true,  "TAC_FORCE_USB_BOOT_SEC",{0,0}, false, false, "Fusion");
+    add(31, "Secondary PM_RESIN_N", "sresn","Secondary PM_RESIN_N",                        -1, eSwitchGroup,     true,  "TAC_RESET_SEC",         {0,1}, false, false, "Fusion");
+    add(29, "",                  "",        "",                                            -1, eUnknownCommandGroup, false, "", {-1,-1}, false, false);
+    add(38, "",                  "",        "",                                            -1, eUnknownCommandGroup, false, "", {-1,-1}, false, false);
+    add(39, "",                  "",        "",                                            -1, eUnknownCommandGroup, false, "", {-1,-1}, false, false);
+    add(46, "",                  "",        "",                                            -1, eUnknownCommandGroup, false, "", {-1,-1}, false, false);
+    add(48, "",                  "",        "",                                            -1, eUnknownCommandGroup, false, "", {-1,-1}, false, false);
+    add(49, "",                  "",        "",                                            -1, eUnknownCommandGroup, false, "", {-1,-1}, false, false);
+    add(15, "",                  "",        "",                                            -1, eUnknownCommandGroup, false, "TAC_SOFT_RESET", {-1,-1}, false, false);
+
+    // --- I2C variant (ePSOCGPIOIIC) factory defaults ---
+    if (psocVariant == ePSOCGPIOIIC && _classicI2CActions.isEmpty())
+    {
+        auto addI2C = [&](PinID pin, PinID slaveAddr, PinID writeAddr,
+                          const char* label, const char* cmd, const char* tooltip,
+                          const char* classicAction, bool enabled, CommandGroups group,
+                          const char* tabName, qtac::Point cell, bool inverted = false)
+        {
+            PSOCI2CData d;
+            d._pin          = pin;
+            d._slaveAddress = slaveAddr;
+            d._writeAddress = writeAddr;
+            d._hash         = d.makeHash();
+            d._pinLabel     = label;
+            d._pinCommand   = cmd;
+            d._pinTooltip   = tooltip;
+            d._classicAction = classicAction;
+            d._enabled      = enabled;
+            d._commandGroup = group;
+            d._tabName      = tabName;
+            d._cellLocation = cell;
+            d._inverted     = inverted;
+            _classicI2CActions[d._hash] = d;
+        };
+
+        // KTS1622EUAATR entries (pins 0-15, slave 0x20)
+        addI2C(0,  0x20, 0x02, "CSI0 MUX Select",  "csi0",   "High routes CSI to Camera B2B connector, low routes to 22-pin camera connector", "CSI0 MUX Select",  true,  eSwitchGroup, "KTS1622EUAATR", {0,0});
+        addI2C(1,  0x20, 0x02, "CSI1 MUX Select",  "csi1",   "High routes CSI to Camera B2B connector, low routes to 22-pin camera connector", "CSI1 MUX Select",  true,  eSwitchGroup, "KTS1622EUAATR", {1,0});
+        addI2C(2,  0x20, 0x02, "CSI2 MUX Select",  "csi2",   "High routes CSI to Camera B2B connector, low routes to 22-pin camera connector", "CSI2 MUX Select",  true,  eSwitchGroup, "KTS1622EUAATR", {2,0});
+        addI2C(3,  0x20, 0x02, "CSI3 MUX Select",  "csi3",   "High routes CSI to Camera B2B connector, low routes to 22-pin camera connector", "CSI3 MUX Select",  true,  eSwitchGroup, "KTS1622EUAATR", {3,0});
+        addI2C(4,  0x20, 0x02, "DSI0 MUX Select",  "dsi0",   "Routes DSI0 display output", "DSI0 MUX Select",  true,  eSwitchGroup, "KTS1622EUAATR", {4,0});
+        addI2C(5,  0x20, 0x02, "DSI1 MUX Select",  "dsi1",   "Routes DSI1 display output", "DSI1 MUX Select",  true,  eSwitchGroup, "KTS1622EUAATR", {5,0});
+        addI2C(6,  0x20, 0x02, "HDMI I2S Select",  "hdmii2s","Routes HDMI I2S",             "HDMI I2S Select",  true,  eSwitchGroup, "KTS1622EUAATR", {6,0});
+        addI2C(7,  0x20, 0x02, "PCIE Select",      "pcie",   "Routes PCIe signals",         "PCIE Select",      true,  eSwitchGroup, "KTS1622EUAATR", {7,0});
+        addI2C(8,  0x20, 0x03, "I2S0 MUX Select",  "i2s0",   "Routes I2S0",                 "I2S0 MUX Select",  true,  eSwitchGroup, "KTS1622EUAATR", {0,1});
+        addI2C(9,  0x20, 0x03, "I2S1 MUX Select",  "i2s1",   "Routes I2S1",                 "I2S1 MUX Select",  true,  eSwitchGroup, "KTS1622EUAATR", {1,1});
+        addI2C(10, 0x20, 0x03, "I2S2 MUX Select",  "i2s2",   "Routes I2S2",                 "I2S2 MUX Select",  true,  eSwitchGroup, "KTS1622EUAATR", {2,1});
+        addI2C(11, 0x20, 0x03, "USB0 MUX Select",  "usb0mux","Routes USB0 path",             "USB0 MUX Select",  false, eSwitchGroup, "KTS1622EUAATR", {3,1});
+        addI2C(12, 0x20, 0x03, "USB1 MUX Select",  "usb1mux","Routes USB1 path",             "USB1 MUX Select",  true,  eSwitchGroup, "KTS1622EUAATR", {4,1});
+        addI2C(13, 0x20, 0x03, "SIM MUX Select",   "simmux", "Routes SIM card path",        "SIM MUX Select",   true,  eSwitchGroup, "KTS1622EUAATR", {5,1});
+        addI2C(14, 0x20, 0x03, "I2S2 MUX B Select","i2s2b",  "Routes I2S2 alternate path",  "I2S2 MUX B Select",true,  eSwitchGroup, "KTS1622EUAATR", {6,1});
+        addI2C(15, 0x20, 0x03, "Reserved",         "rsvd15", "Reserved",                    "Reserved",         false, eSwitchGroup, "KTS1622EUAATR", {7,1});
+
+        // TCA9534APWR entries (pins 16-23, slave 0x38)
+        addI2C(16, 0x38, 0x01, "SPI0 MUX Select",  "spi0",   "Routes SPI0 between camera/sensor path and Display B2B connector path", "SPIO MUX Select", true,  eSwitchGroup, "TCA9534APWR", {0,0});
+        addI2C(17, 0x38, 0x01, "SPI1 MUX Select",  "spi1",   "Routes SPI1",                 "SPI1 MUX Select",  true,  eSwitchGroup, "TCA9534APWR", {1,0});
+        addI2C(18, 0x38, 0x01, "NFC MUX Select",   "nfcmux", "Routes NFC signals",          "NFC MUX Select",   true,  eSwitchGroup, "TCA9534APWR", {2,0});
+        addI2C(19, 0x38, 0x01, "EARC MUX Select",  "earc",   "Routes eARC signals",         "EARC MUX Select",  true,  eSwitchGroup, "TCA9534APWR", {3,0});
+        addI2C(20, 0x38, 0x01, "Reserved",         "rsvd20", "Reserved",                    "Reserved",         false, eSwitchGroup, "TCA9534APWR", {4,0});
+        addI2C(21, 0x38, 0x01, "Reserved",         "rsvd21", "Reserved",                    "Reserved",         false, eSwitchGroup, "TCA9534APWR", {5,0});
+        addI2C(22, 0x38, 0x01, "Reserved",         "rsvd22", "Reserved",                    "Reserved",         false, eSwitchGroup, "TCA9534APWR", {6,0});
+        addI2C(23, 0x38, 0x01, "Reserved",         "rsvd23", "Reserved",                    "Reserved",         false, eSwitchGroup, "TCA9534APWR", {7,0});
+
+        if (_classicSlaveConfigs.isEmpty())
+        {
+            PSOCI2CSlave slave;
+            slave._variant      = eKTS1622EUAATR;
+            slave._slaveAddress = 0x20;
+            slave._configAddress = 0x02;
+            slave._portCount    = 2;
+            _classicSlaveConfigs.append(slave);
+
+            slave._variant      = eTCA9534APWR;
+            slave._slaveAddress = 0x38;
+            slave._configAddress = 0x01;
+            slave._portCount    = 1;
+            _classicSlaveConfigs.append(slave);
+        }
+    }
+}
+
+// ---------------------------------------------------------------------------
+// PSoC variant management
+// ---------------------------------------------------------------------------
+
+void _PSOCPlatformConfiguration::setVariant(PSOCVariant psocVariant)
+{
+    _variant = psocVariant;
+}
+
+// ---------------------------------------------------------------------------
+// I2C slave configuration management
+// ---------------------------------------------------------------------------
+
+qtac::String _PSOCPlatformConfiguration::i2cSlaveTabName(const PSOCI2CSlave& slave)
+{
+    // Format: "KTS1622EUAATR (0x20)" etc.
+    return psocSlaveToString(slave._variant) + " (0x"
+         + qtac::String::number(static_cast<unsigned long long>(slave._slaveAddress), 16) + ")";
+}
+
+void _PSOCPlatformConfiguration::refreshSlaveConfig()
+{
+    _i2cEntries.clear();
+
+    for (const auto& kv : _classicI2CActions)
+    {
+        const PSOCI2CData& classicEntry = kv.second;
+
+        for (const auto& slave : _slaveConfigs)
+        {
+            if (psocSlaveToString(slave._variant) != classicEntry._tabName)
+                continue;
+
+            PSOCI2CData entry = classicEntry;
+            entry._slaveAddress = slave._slaveAddress;
+            entry._writeAddress = slave._configAddress;
+            entry._hash         = entry.makeHash();
+            entry._tabName      = i2cSlaveTabName(slave);
+
+            _i2cEntries[entry._hash] = entry;
+        }
+    }
+
+    rebuildI2CTabs();
+}
+
+void _PSOCPlatformConfiguration::rebuildI2CTabs()
+{
+    // No-op in source/: tab management is a GUI-layer concern.
+    // In the upstream Qt code this adds Tab objects to _tabs.
+    // The source library does not maintain the tab list.
+}
+
+PSOCI2CSlaves _PSOCPlatformConfiguration::getSlaveConfigs() const
+{
+    return _slaveConfigs;
+}
+
+void _PSOCPlatformConfiguration::addSlaveConfig(const PSOCI2CSlave& slave)
+{
+    _slaveConfigs.append(slave);
+    refreshSlaveConfig();
+}
+
+void _PSOCPlatformConfiguration::removeSlaveConfig(PinID slaveAddress)
+{
+    for (int i = _slaveConfigs.size() - 1; i >= 0; --i)
+        if (_slaveConfigs.at(i)._slaveAddress == slaveAddress)
+            _slaveConfigs.removeAt(i);
+    refreshSlaveConfig();
+}
+
+Pins _PSOCPlatformConfiguration::getI2CPinEntries()
+{
+    Pins result;
+    for (const auto& kv : _i2cEntries)
+    {
+        const PSOCI2CData& d = kv.second;
+        PinEntry pe;
+        pe._pin          = d._pin;
+        pe._enabled      = d._enabled;
+        pe._hash         = d._hash;
+        pe._cellLocation = d._cellLocation;
+        pe._commandGroup = d._commandGroup;
+        pe._pinCommand   = d._pinCommand;
+        pe._inverted     = d._inverted;
+        pe._pinLabel     = d._pinLabel;
+        pe._pinTooltip   = d._pinTooltip;
+        pe._tabName      = d._tabName;
+        result.append(pe);
+    }
+    std::sort(result.begin(), result.end(), [](const PinEntry& a, const PinEntry& b) {
+        if (a._tabName != b._tabName) return a._tabName < b._tabName;
+        return a._pin < b._pin;
+    });
+    return result;
+}
+
+PSOCI2CEntries _PSOCPlatformConfiguration::getI2CEntries() const
+{
+    return _i2cEntries;
+}
+
+PSOCI2CEntries _PSOCPlatformConfiguration::getActiveI2CEntries() const
+{
+    PSOCI2CEntries result;
+    for (const auto& kv : _i2cEntries)
+        if (kv.second._enabled)
+            result[kv.first] = kv.second;
+    return result;
+}
+
+qtac::List<PSOCI2CData> _PSOCPlatformConfiguration::getI2CEntriesForSlave(const PSOCI2CSlave& slave) const
+{
+    qtac::String tabName = i2cSlaveTabName(slave);
+    qtac::List<PSOCI2CData> result;
+    for (const auto& kv : _i2cEntries)
+    {
+        const PSOCI2CData& d = kv.second;
+        if (d._tabName == tabName && d._slaveAddress == slave._slaveAddress)
+            result.append(d);
+    }
+    std::sort(result.begin(), result.end(), [](const PSOCI2CData& a, const PSOCI2CData& b) {
+        return a._pin < b._pin;
+    });
+    int rowCount = slave._portCount * 8;
+    while (result.size() > rowCount)
+        result.removeAt(result.size() - 1);
+    return result;
+}
+
+bool _PSOCPlatformConfiguration::addI2CSlave(const PSOCI2CData& i2cData)
+{
+    PSOCI2CData entry = i2cData;
+    entry._hash = entry.makeHash();
+    _i2cEntries[entry._hash] = entry;
+    return true;
+}
+
+void _PSOCPlatformConfiguration::removeI2CSlave(HashType hash)
+{
+    _i2cEntries.remove(hash);
+}
+
+PSOCI2CData _PSOCPlatformConfiguration::getI2CSlave(HashType hash) const
+{
+    auto it = _i2cEntries.find(hash);
+    return (it != _i2cEntries.end()) ? it->second : PSOCI2CData();
+}
+
+// ---------------------------------------------------------------------------
+// I2C pin getters / setters
+// ---------------------------------------------------------------------------
+
+bool _PSOCPlatformConfiguration::getI2CPinEnableState(HashType hash) const
+{
+    auto it = _i2cEntries.find(hash);
+    return (it != _i2cEntries.end()) ? it->second._enabled : true;
+}
+void _PSOCPlatformConfiguration::setI2CPinEnableState(HashType hash, bool newState)
+{
+    auto it = _i2cEntries.find(hash);
+    if (it == _i2cEntries.end()) throw std::invalid_argument("setI2CPinEnableState: invalid hash");
+    it->second._enabled = newState;
+}
+
+bool _PSOCPlatformConfiguration::getI2CPinInvertedState(HashType hash) const
+{
+    auto it = _i2cEntries.find(hash);
+    return (it != _i2cEntries.end()) ? it->second._inverted : false;
+}
+void _PSOCPlatformConfiguration::setI2CPinInvertedState(HashType hash, bool newState)
+{
+    auto it = _i2cEntries.find(hash);
+    if (it == _i2cEntries.end()) throw std::invalid_argument("setI2CPinInvertedState: invalid hash");
+    it->second._inverted = newState;
+}
+
+qtac::String _PSOCPlatformConfiguration::getI2CPinLabel(HashType hash) const
+{
+    auto it = _i2cEntries.find(hash);
+    return (it != _i2cEntries.end()) ? it->second._pinLabel : qtac::String();
+}
+void _PSOCPlatformConfiguration::setI2CPinLabel(HashType hash, const qtac::String& v)
+{
+    auto it = _i2cEntries.find(hash);
+    if (it == _i2cEntries.end()) throw std::invalid_argument("setI2CPinLabel: invalid hash");
+    it->second._pinLabel = v;
+}
+
+qtac::String _PSOCPlatformConfiguration::getI2CPinTooltip(HashType hash) const
+{
+    auto it = _i2cEntries.find(hash);
+    return (it != _i2cEntries.end()) ? it->second._pinTooltip : qtac::String();
+}
+void _PSOCPlatformConfiguration::setI2CPinTooltip(HashType hash, const qtac::String& v)
+{
+    auto it = _i2cEntries.find(hash);
+    if (it == _i2cEntries.end()) throw std::invalid_argument("setI2CPinTooltip: invalid hash");
+    it->second._pinTooltip = v;
+}
+
+qtac::String _PSOCPlatformConfiguration::getI2CPinCommand(HashType hash) const
+{
+    auto it = _i2cEntries.find(hash);
+    return (it != _i2cEntries.end()) ? it->second._pinCommand : qtac::String();
+}
+void _PSOCPlatformConfiguration::setI2CPinCommand(HashType hash, const qtac::String& v)
+{
+    auto it = _i2cEntries.find(hash);
+    if (it == _i2cEntries.end()) throw std::invalid_argument("setI2CPinCommand: invalid hash");
+    it->second._pinCommand = v;
+}
+
+CommandGroups _PSOCPlatformConfiguration::getI2CPinGroup(HashType hash) const
+{
+    auto it = _i2cEntries.find(hash);
+    return (it != _i2cEntries.end()) ? it->second._commandGroup : eUnknownCommandGroup;
+}
+void _PSOCPlatformConfiguration::setI2CPinGroup(HashType hash, CommandGroups commandGroup)
+{
+    auto it = _i2cEntries.find(hash);
+    if (it == _i2cEntries.end()) throw std::invalid_argument("setI2CPinGroup: invalid hash");
+    it->second._commandGroup = commandGroup;
+}
+
+qtac::String _PSOCPlatformConfiguration::getI2CTabName(HashType hash) const
+{
+    auto it = _i2cEntries.find(hash);
+    return (it != _i2cEntries.end()) ? it->second._tabName : qtac::String();
+}
+void _PSOCPlatformConfiguration::setI2CTabName(HashType hash, const qtac::String& v)
+{
+    auto it = _i2cEntries.find(hash);
+    if (it == _i2cEntries.end()) throw std::invalid_argument("setI2CTabName: invalid hash");
+    it->second._tabName = v;
+}
+
+qtac::Point _PSOCPlatformConfiguration::getI2CPinCellLocation(HashType hash) const
+{
+    auto it = _i2cEntries.find(hash);
+    return (it != _i2cEntries.end()) ? it->second._cellLocation : qtac::Point(-1, -1);
+}
+void _PSOCPlatformConfiguration::setI2CPinCellLocation(HashType hash, const qtac::Point& v)
+{
+    auto it = _i2cEntries.find(hash);
+    if (it == _i2cEntries.end()) throw std::invalid_argument("setI2CPinCellLocation: invalid hash");
+    it->second._cellLocation = v;
+}
diff --git a/source/library/src/PlatformID.cpp b/source/library/src/PlatformID.cpp
new file mode 100644
index 00000000..c15ff982
--- /dev/null
+++ b/source/library/src/PlatformID.cpp
@@ -0,0 +1,521 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Michael Simpson
+
+#include <qtac/PlatformID.h>
+#include <qtac/json_util.h>
+
+#include <fstream>
+#include <system_error>
+#ifdef _WIN32
+#  include <windows.h>
+#else
+#  include <sys/stat.h>
+#  include <unistd.h>
+#  include <limits.h>
+#endif
+
+// -----------------------------------------------------------------------
+// Minimal C++11-compatible filesystem helpers (replaces std::filesystem,
+// which is C++17 and not available on GCC/Clang with -std=c++11).
+// -----------------------------------------------------------------------
+namespace fs_compat {
+
+class Path
+{
+public:
+    Path() {}
+    Path(const std::string& s) : _p(s) { normalize(); }
+    Path(const char* s) : _p(s ? s : "") { normalize(); }
+
+    Path operator/(const std::string& rhs) const
+    {
+        if (_p.empty()) return Path(rhs);
+        Path r(_p + "/" + rhs);
+        return r;
+    }
+    Path operator/(const char* rhs) const { return operator/(std::string(rhs ? rhs : "")); }
+    Path operator/(const Path& rhs) const { return operator/(rhs._p); }
+
+    Path parent_path() const
+    {
+        size_t pos = _p.find_last_of('/');
+        if (pos == std::string::npos) return Path();
+        if (pos == 0) return Path("/");
+        return Path(_p.substr(0, pos));
+    }
+
+    Path filename() const
+    {
+        size_t pos = _p.find_last_of('/');
+        if (pos == std::string::npos) return Path(_p);
+        return Path(_p.substr(pos + 1));
+    }
+
+    bool is_relative() const
+    {
+        if (_p.empty()) return true;
+#ifdef _WIN32
+        if (_p.size() >= 3 && std::isalpha((unsigned char)_p[0]) && _p[1] == ':' && _p[2] == '/')
+            return false;
+        if (_p.size() >= 2 && _p[0] == '/' && _p[1] == '/')
+            return false;
+#else
+        if (_p[0] == '/') return false;
+#endif
+        return true;
+    }
+
+    bool operator==(const Path& o) const { return _p == o._p; }
+    bool operator!=(const Path& o) const { return _p != o._p; }
+
+    std::string string() const { return _p; }
+    bool empty() const { return _p.empty(); }
+
+private:
+    void normalize()
+    {
+        // Unify separators to forward slash
+        for (char& c : _p) if (c == '\\') c = '/';
+        // Remove trailing slash unless it is the root
+        while (_p.size() > 1 && _p.back() == '/')
+            _p.pop_back();
+    }
+    std::string _p;
+};
+
+static bool exists(const Path& p)
+{
+    if (p.empty()) return false;
+#ifdef _WIN32
+    return ::GetFileAttributesA(p.string().c_str()) != INVALID_FILE_ATTRIBUTES;
+#else
+    struct stat st;
+    return ::stat(p.string().c_str(), &st) == 0;
+#endif
+}
+
+// Resolve to an absolute, normalised path.  On POSIX this also resolves
+// symlinks via realpath(); on Windows it uses GetFullPathNameA().
+// ec is set on failure (e.g. path does not exist on POSIX).
+static Path canonical(const Path& p, std::error_code& ec)
+{
+    ec.clear();
+#ifdef _WIN32
+    char buf[MAX_PATH]{};
+    DWORD len = ::GetFullPathNameA(p.string().c_str(), MAX_PATH, buf, nullptr);
+    if (len == 0 || len >= MAX_PATH)
+    {
+        ec = std::error_code(static_cast<int>(::GetLastError()), std::system_category());
+        return p;
+    }
+    return Path(buf);
+#else
+    char buf[PATH_MAX]{};
+    if (!::realpath(p.string().c_str(), buf))
+    {
+        ec = std::error_code(errno, std::generic_category());
+        return p;
+    }
+    return Path(buf);
+#endif
+}
+
+static Path current_path()
+{
+#ifdef _WIN32
+    char buf[MAX_PATH]{};
+    ::GetCurrentDirectoryA(MAX_PATH, buf);
+    return Path(buf);
+#else
+    char buf[PATH_MAX]{};
+    if (::getcwd(buf, sizeof(buf)))
+        return Path(buf);
+    return Path();
+#endif
+}
+
+} // namespace fs_compat
+
+// -----------------------------------------------------------------------
+// Static storage
+// -----------------------------------------------------------------------
+
+PlatformIDs PlatformContainer::_platformIds;
+
+// -----------------------------------------------------------------------
+// JSON key constants (mirrors devicelist.json schema)
+// -----------------------------------------------------------------------
+
+static const char* kCatalog        = "catalog";
+static const char* kPlatformId     = "platform_id";
+static const char* kDebugBoardType = "debugBoardType";
+static const char* kDescription    = "description";
+static const char* kName           = "name";
+static const char* kUsbDescriptor  = "usb_descriptor";
+static const char* kConfigPath     = "configPath";
+static const char* kRevision       = "revision";
+static const char* kFirmwareChip   = "firmware_chip";
+static const char* kChip1BusSet    = "chip1BusSet";
+static const char* kChip2BusSet    = "chip2BusSet";
+static const char* kChip3BusSet    = "chip3BusSet";
+static const char* kChip4BusSet    = "chip4BusSet";
+
+// -----------------------------------------------------------------------
+// Locate devicelist.json
+//
+// Search order (first found wins):
+//   1. QTAC_DEVICELIST env var (explicit override)
+//   2. Executable directory
+//   3. Current working directory
+//   4. Four levels up from current working directory
+//      (mirrors the relative path used inside devicelist.json itself:
+//       "configPath": "../../../../configurations/...")
+// -----------------------------------------------------------------------
+
+// Walk upward from |start| up to |maxLevels| looking for
+// configurations/devicelist.json.  Returns the canonical path on success.
+static std::string walkUpForDeviceList(const fs_compat::Path& start,
+                                       int maxLevels)
+{
+    static const char* kFilename = "devicelist.json";
+    static const char* kSubdir   = "configurations";
+
+    fs_compat::Path dir = start;
+    for (int i = 0; i <= maxLevels; ++i)
+    {
+        // Direct file alongside the directory
+        {
+            auto candidate = dir / kFilename;
+            if (fs_compat::exists(candidate))
+                return candidate.string();
+        }
+        // configurations/ subdirectory
+        {
+            auto candidate = dir / kSubdir / kFilename;
+            std::error_code ec;
+            auto canonical = fs_compat::canonical(candidate, ec);
+            if (!ec && fs_compat::exists(canonical))
+                return canonical.string();
+        }
+
+        fs_compat::Path parent = dir.parent_path();
+        if (parent == dir)
+            break; // reached filesystem root
+        dir = parent;
+    }
+    return {};
+}
+
+static std::string findDeviceList()
+{
+    // 1. Environment variable override
+    const char* envPath = std::getenv("QTAC_DEVICELIST");
+    if (envPath && fs_compat::exists(fs_compat::Path(envPath)))
+        return envPath;
+
+    // 2. Walk upward from executable directory (up to 8 levels)
+#ifdef __linux__
+    {
+        char buf[4096]{};
+        ssize_t len = ::readlink("/proc/self/exe", buf, sizeof(buf) - 1);
+        if (len > 0)
+        {
+            fs_compat::Path exeDir = fs_compat::Path(buf).parent_path();
+            std::string found = walkUpForDeviceList(exeDir, 8);
+            if (!found.empty()) return found;
+        }
+    }
+#endif
+#ifdef _WIN32
+    {
+        // Prefer the DLL's own directory so ctypes / hosted scenarios (where
+        // GetModuleFileNameA(nullptr) returns python.exe, not this DLL) still
+        // find the devicelist.json that was deployed alongside TACDev.dll.
+        HMODULE hSelf = nullptr;
+        ::GetModuleHandleExA(
+            GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
+            GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
+            reinterpret_cast<LPCSTR>(&findDeviceList),
+            &hSelf);
+        if (hSelf)
+        {
+            char buf[MAX_PATH]{};
+            DWORD len = ::GetModuleFileNameA(hSelf, buf, MAX_PATH);
+            if (len > 0)
+            {
+                fs_compat::Path dllDir = fs_compat::Path(buf).parent_path();
+                std::string found = walkUpForDeviceList(dllDir, 8);
+                if (!found.empty()) return found;
+            }
+        }
+
+        // Fall back to the host process exe directory (e.g. TAC.exe, TACDev.exe).
+        {
+            char buf[MAX_PATH]{};
+            DWORD len = ::GetModuleFileNameA(nullptr, buf, MAX_PATH);
+            if (len > 0)
+            {
+                fs_compat::Path exeDir = fs_compat::Path(buf).parent_path();
+                std::string found = walkUpForDeviceList(exeDir, 8);
+                if (!found.empty()) return found;
+            }
+        }
+
+        // Installed Alpaca layout: C:/ProgramData/Qualcomm/Alpaca/tac_configs/
+        {
+            char programData[MAX_PATH]{};
+            if (::GetEnvironmentVariableA("ProgramData", programData, MAX_PATH) > 0)
+            {
+                fs_compat::Path tacConfigs =
+                    fs_compat::Path(programData) / "Qualcomm" / "Alpaca" / "tac_configs";
+                auto candidate = tacConfigs / "DeviceList.json";
+                if (fs_compat::exists(candidate))
+                    return candidate.string();
+            }
+        }
+    }
+#endif
+
+    // 3. Walk upward from current working directory (up to 8 levels)
+    {
+        std::string found = walkUpForDeviceList(fs_compat::current_path(), 8);
+        if (!found.empty()) return found;
+    }
+
+    return {};
+}
+
+// -----------------------------------------------------------------------
+// Public API
+// -----------------------------------------------------------------------
+
+void PlatformContainer::initialize()
+{
+    if (!_platformIds.isEmpty())
+        return;
+
+    initializeDynamic();
+}
+
+void PlatformContainer::initializeDynamic()
+{
+    std::string deviceListPath = findDeviceList();
+    if (deviceListPath.empty())
+        return;
+
+    std::ifstream file(deviceListPath);
+    if (!file.is_open())
+        return;
+
+    std::string fileContents((std::istreambuf_iterator<char>(file)),
+                              std::istreambuf_iterator<char>());
+
+    json_t root;
+    try { root = boost::json::parse(fileContents); }
+    catch (...) { return; }
+
+    const auto* rootObj = root.if_object();
+    if (!rootObj || !rootObj->contains(kCatalog))
+        return;
+    const auto* catalog = rootObj->at(kCatalog).if_array();
+    if (!catalog)
+        return;
+
+    // Resolve the directory that contains devicelist.json so that relative
+    // configPath values can be resolved against it.
+    fs_compat::Path deviceListDir =
+        fs_compat::Path(deviceListPath).parent_path();
+
+    for (const auto& entryVal : *catalog)
+    {
+        const auto* entry = entryVal.if_object();
+        if (!entry || !entry->contains(kPlatformId))
+            continue;
+
+        PlatformID pid = static_cast<PlatformID>(qtac::json_util::toInt(entry->at(kPlatformId)));
+
+        int boardTypeInt = qtac::json_util::valueInt(*entry, kDebugBoardType, 0);
+        DebugBoardType boardType = static_cast<DebugBoardType>(boardTypeInt);
+
+        std::string description = qtac::json_util::valueString(*entry, kDescription, "");
+        std::string usbDesc     = qtac::json_util::valueString(*entry, kUsbDescriptor, "");
+        std::string configPath  = qtac::json_util::valueString(*entry, kConfigPath, "");
+
+        // Resolve configPath relative to devicelist.json location when it is
+        // a relative path.
+        if (!configPath.empty())
+        {
+            fs_compat::Path p(configPath);
+            if (p.is_relative())
+            {
+                // Primary: resolve relative to devicelist.json's directory
+                std::error_code ec;
+                auto resolved = fs_compat::canonical(deviceListDir / p, ec);
+                if (!ec && fs_compat::exists(resolved))
+                {
+                    configPath = resolved.string();
+                }
+                else
+                {
+                    // Fallback: look for just the filename alongside devicelist.json
+                    auto fallback = deviceListDir / p.filename();
+                    if (fs_compat::exists(fallback))
+                        configPath = fallback.string();
+                    else
+                        configPath = (deviceListDir / p).string();
+                }
+            }
+        }
+
+        auto platformEntry = std::make_shared<_PlatformEntry>(
+            pid,
+            boardType,
+            qtac::String(description),
+            qtac::String(configPath),
+            qtac::ByteArray(usbDesc.c_str())
+        );
+
+        platformEntry->_revision     = static_cast<uint32_t>(qtac::json_util::valueInt(*entry, kRevision, 0));
+        platformEntry->_firmwareChip = static_cast<uint32_t>(qtac::json_util::valueInt(*entry, kFirmwareChip, 0));
+
+        // FTDI bus set bitmasks (chip1..chip4, 0-indexed internally as [0..3])
+        static const char* kBusSets[kMaxPinSetCount] = {
+            kChip1BusSet, kChip2BusSet, kChip3BusSet, kChip4BusSet
+        };
+        for (int i = 0; i < kMaxPinSetCount; ++i)
+        {
+            if (entry->contains(kBusSets[i]))
+                platformEntry->_pinSets[i] =
+                    static_cast<FTDIPinSets>(qtac::json_util::toInt(entry->at(kBusSets[i])));
+        }
+
+        _platformIds.insert(pid, platformEntry);
+    }
+}
+
+void PlatformContainer::addEntry(PlatformEntry platformEntry)
+{
+    if (platformEntry)
+        _platformIds.insert(platformEntry->_platformID, platformEntry);
+}
+
+PlatformIDList PlatformContainer::getEntries()
+{
+    initialize();
+    PlatformIDList result;
+    for (const auto& kv : _platformIds)
+        result.append(kv.second);
+    return result;
+}
+
+qtac::String PlatformContainer::toString(PlatformID platformID)
+{
+    initialize();
+    auto it = _platformIds.find(platformID);
+    if (it != _platformIds.end() && it->second)
+        return it->second->_description;
+    return qtac::String();
+}
+
+PlatformID PlatformContainer::fromUSBDescriptor(const qtac::ByteArray& usbDescriptor)
+{
+    initialize();
+    qtac::ByteArray target = usbDescriptor.toLower();
+    for (const auto& kv : _platformIds)
+    {
+        if (!kv.second) continue;
+        qtac::ByteArray desc = kv.second->_usbDescriptor.toLower();
+        if (!desc.isEmpty() && desc == target)
+            return kv.second->_platformID;
+    }
+    return MICRO_EPM_BOARD_ID_UNKNOWN;
+}
+
+PlatformID PlatformContainer::fromRevision(uint32_t revision, DebugBoardType boardType)
+{
+    initialize();
+    if (revision == 0)
+        return MICRO_EPM_BOARD_ID_UNKNOWN;
+    for (const auto& kv : _platformIds)
+    {
+        if (!kv.second) continue;
+        if (kv.second->_revision == revision && kv.second->_boardtype == boardType)
+            return kv.second->_platformID;
+    }
+    return MICRO_EPM_BOARD_ID_UNKNOWN;
+}
+
+PlatformID PlatformContainer::fromFirmwareChip(uint32_t firmwareChip, DebugBoardType boardType)
+{
+    initialize();
+    if (firmwareChip == 0)
+        return MICRO_EPM_BOARD_ID_UNKNOWN;
+    for (const auto& kv : _platformIds)
+    {
+        if (!kv.second) continue;
+        if (kv.second->_firmwareChip == firmwareChip &&
+            kv.second->_boardtype    == boardType     &&
+            !kv.second->_path.isEmpty())
+            return kv.second->_platformID;
+    }
+    return MICRO_EPM_BOARD_ID_UNKNOWN;
+}
+
+DebugBoardType PlatformContainer::getDebugBoardType(PlatformID platformID){
+    initialize();
+    auto it = _platformIds.find(platformID);
+    if (it != _platformIds.end() && it->second)
+        return it->second->_boardtype;
+    return eUnknownDebugBoard;
+}
+
+PlatformIDList PlatformContainer::getDebugBoards()
+{
+    initialize();
+    PlatformIDList result;
+    for (const auto& kv : _platformIds)
+        if (kv.second && kv.second->_boardtype != eUnknownDebugBoard)
+            result.append(kv.second);
+    return result;
+}
+
+PlatformIDList PlatformContainer::getDebugBoardsOfType(DebugBoardType debugBoardType)
+{
+    initialize();
+    PlatformIDList result;
+    for (const auto& kv : _platformIds)
+        if (kv.second && kv.second->_boardtype == debugBoardType)
+            result.append(kv.second);
+    return result;
+}
diff --git a/source/library/src/ProtocolInterface.cpp b/source/library/src/ProtocolInterface.cpp
new file mode 100644
index 00000000..d377ec37
--- /dev/null
+++ b/source/library/src/ProtocolInterface.cpp
@@ -0,0 +1,204 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+
+#include <qtac/ProtocolInterface.h>
+#include <qtac/FrameCoder.h>
+
+#include <chrono>
+#include <thread>
+
+namespace qtac {
+
+uint32_t ProtocolInterface::_sendID{0};
+
+// Returns milliseconds since an arbitrary epoch using the monotonic clock —
+// replaces the platform-specific tickCount() / GetTickCount() pattern.
+static uint64_t tickCount()
+{
+    using namespace std::chrono;
+    return static_cast<uint64_t>(
+        duration_cast<milliseconds>(steady_clock::now().time_since_epoch()).count());
+}
+
+ProtocolInterface::~ProtocolInterface()
+{
+    std::lock_guard<std::recursive_mutex> lock(_outQueueMutex);
+    _outboundData.clear();
+
+    delete _frameCoder;
+    _frameCoder = nullptr;
+}
+
+uint32_t ProtocolInterface::getNextSendID()
+{
+    std::lock_guard<std::recursive_mutex> lock(_outQueueMutex);
+
+    if (_sendID >= kBadQueueValue - 1)
+        _sendID = 1;
+    else
+        ++_sendID;
+
+    return _sendID;
+}
+
+void ProtocolInterface::setFrameCoder(FrameCoder* frameCoder)
+{
+    _frameCoder = frameCoder;
+    _frameCoder->setupCallbackFunctions(
+        this,
+        ProtocolInterface::frameCompleteFunc,
+        ProtocolInterface::badFrameFunc);
+}
+
+void ProtocolInterface::clearPendingFrame()
+{
+    std::lock_guard<std::recursive_mutex> lock(_pendingFramePackageMutex);
+    _pendingFramePackage.reset();
+}
+
+FramePackage& ProtocolInterface::pendingFramePackage()
+{
+    std::lock_guard<std::recursive_mutex> lock(_pendingFramePackageMutex);
+    return _pendingFramePackage;
+}
+
+void ProtocolInterface::queueCommand(const FramePackage& framePackage)
+{
+    std::lock_guard<std::recursive_mutex> lock(_outQueueMutex);
+    _outboundData.push_back(framePackage);
+}
+
+void ProtocolInterface::queueDelay(uint32_t delayInMilliSeconds, ReceiveInterface* receiveInterface)
+{
+    if (delayInMilliSeconds == 0)
+        return;
+
+    FramePackage fp = makeFramePackage();
+    fp->receiveInterface       = receiveInterface;
+    fp->delayInMilliSeconds    = delayInMilliSeconds;
+    fp->request                = qtac::ByteArray("delay: " + std::to_string(delayInMilliSeconds));
+
+    std::lock_guard<std::recursive_mutex> lock(_outQueueMutex);
+    _outboundData.push_back(fp);
+}
+
+void ProtocolInterface::queueLogComment(const qtac::ByteArray& comment)
+{
+    FramePackage fp = makeFramePackage();
+    fp->comment = comment;
+
+    std::lock_guard<std::recursive_mutex> lock(_outQueueMutex);
+    _outboundData.push_back(fp);
+}
+
+void ProtocolInterface::queueEndTransaction(ReceiveInterface* receiveInterface)
+{
+    FramePackage fp = makeFramePackage();
+    fp->receiveInterface = receiveInterface;
+    fp->endTransaction   = true;
+    fp->request          = "End Transaction";
+
+    std::lock_guard<std::recursive_mutex> lock(_outQueueMutex);
+    _outboundData.push_back(fp);
+}
+
+FramePackage ProtocolInterface::getNextFramePackage()
+{
+    FramePackage result;
+
+    bool noPendingFrame;
+    {
+        std::lock_guard<std::recursive_mutex> lock(_pendingFramePackageMutex);
+        noPendingFrame = (_pendingFramePackage == nullptr);
+    }
+
+    if (noPendingFrame)
+    {
+        std::lock_guard<std::recursive_mutex> lock(_outQueueMutex);
+
+        if (!_outboundData.empty())
+        {
+            FramePackage fp = _outboundData.front();
+            _outboundData.erase(_outboundData.begin());
+
+            if (fp->delayInMilliSeconds != 0)
+            {
+                std::this_thread::sleep_for(
+                    std::chrono::milliseconds(fp->delayInMilliSeconds));
+                result = fp;
+            }
+            else if (fp->endTransaction || !fp->comment.isEmpty())
+            {
+                result = fp;
+            }
+            else
+            {
+                fp->tickcount = tickCount();
+                result = fp;
+
+                std::lock_guard<std::recursive_mutex> plock(_pendingFramePackageMutex);
+                _pendingFramePackage = fp;
+            }
+        }
+    }
+
+    return result;
+}
+
+uint32_t ProtocolInterface::queueSize()
+{
+    std::lock_guard<std::recursive_mutex> lock(_outQueueMutex);
+    return static_cast<uint32_t>(_outboundData.size());
+}
+
+bool ProtocolInterface::handleReceivedData(const qtac::ByteArray& receivedData)
+{
+    _frameCoder->decode(receivedData);
+    return true;
+}
+
+void ProtocolInterface::frameCompleteFunc(const qtac::ByteArray& completedFrame,
+                                          ProtocolInterface* protocolInterface)
+{
+    protocolInterface->frameComplete(completedFrame);
+}
+
+void ProtocolInterface::badFrameFunc(const qtac::ByteArray& completedFrame,
+                                     ProtocolInterface* protocolInterface)
+{
+    protocolInterface->clearPendingFrame();
+    protocolInterface->badFrame(completedFrame);
+}
+
+} // namespace qtac
diff --git a/source/library/src/STM32Device.cpp b/source/library/src/STM32Device.cpp
new file mode 100644
index 00000000..486847fb
--- /dev/null
+++ b/source/library/src/STM32Device.cpp
@@ -0,0 +1,338 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Qt-free port of STM32Device from qcommon-console.
+
+#include <qtac/STM32Device.h>
+#include <qtac/TACSTM32DriveThread.h>
+#include <qtac/PlatformID.h>
+#include <qtac/StringUtilities.h>
+#include <qtac/CommandGroup.h>
+
+#include "hidapi.h"
+
+#include <thread>
+#include <chrono>
+#include <map>
+#include <string>
+#include <cstring>
+
+// -----------------------------------------------------------------------
+// HID device identifiers for BugHopper V2 (Arduino STM32)
+// -----------------------------------------------------------------------
+namespace {
+
+const uint16_t kSTM32VendorID  = 0x2341;
+const uint16_t kSTM32ProductID = 0xB001;
+const uint16_t kSTM32UsagePage = 0xFF60;
+const uint16_t kSTM32Usage     = 0x0061;
+
+const int kMaxOpenIterations = 50;
+const int kOpenPollMs        = 20;
+
+// In-memory VTP port name map — keyed by serial number string.
+// Replaces QSettings; resets each process run (sufficient for headless library use).
+std::map<std::string, std::string>& vtpPortMap()
+{
+    static std::map<std::string, std::string> instance;
+    return instance;
+}
+
+int& vtpCounter()
+{
+    static int counter{0};
+    return counter;
+}
+
+} // anonymous namespace
+
+// -----------------------------------------------------------------------
+// STM32Device destructor
+// -----------------------------------------------------------------------
+
+STM32Device::~STM32Device()
+{
+    delete _stm32PlatformConfiguration;
+    _stm32PlatformConfiguration = nullptr;
+    // _hidHandle is closed by the drive thread calling close(); destructor
+    // closes it only as a safety net.
+    if (_hidHandle != nullptr)
+    {
+        hid_close(static_cast<hid_device*>(_hidHandle));
+        _hidHandle = nullptr;
+    }
+}
+
+// -----------------------------------------------------------------------
+// HID enumeration helpers
+// -----------------------------------------------------------------------
+
+STM32HIDDeviceInfoList STM32Device::enumerateHIDDevices()
+{
+    STM32HIDDeviceInfoList result;
+
+    struct hid_device_info* devs = hid_enumerate(kSTM32VendorID, kSTM32ProductID);
+    struct hid_device_info* cur  = devs;
+
+    while (cur != nullptr)
+    {
+        if (cur->usage_page == kSTM32UsagePage && cur->usage == kSTM32Usage)
+        {
+            STM32HIDDeviceInfo info;
+            if (cur->path)
+                info._devicePath = qtac::ByteArray(cur->path);
+
+            if (cur->serial_number)
+            {
+                // Convert wchar_t serial number to narrow string
+                std::wstring ws(cur->serial_number);
+                std::string  narrow(ws.begin(), ws.end());
+                info._serialNumber = qtac::ByteArray(narrow.c_str());
+            }
+
+            if (!info._serialNumber.isEmpty())
+                info._hash = strHash(info._serialNumber);
+            else if (!info._devicePath.isEmpty())
+                info._hash = strHash(info._devicePath);
+
+            result.append(info);
+        }
+        cur = cur->next;
+    }
+
+    hid_free_enumeration(devs);
+    return result;
+}
+
+qtac::ByteArray STM32Device::vtpPortName(const qtac::ByteArray& serialNumber)
+{
+    std::string key = serialNumber.toStdString();
+    auto& map = vtpPortMap();
+
+    auto it = map.find(key);
+    if (it != map.end())
+        return qtac::ByteArray(it->second.c_str());
+
+    std::ostringstream oss;
+    oss << "VTP" << (++vtpCounter());
+    std::string name = oss.str();
+    map[key] = name;
+    return qtac::ByteArray(name.c_str());
+}
+
+// -----------------------------------------------------------------------
+// Static device registry
+// -----------------------------------------------------------------------
+
+uint32_t STM32Device::updateAlpacaDevices()
+{
+    std::lock_guard<std::recursive_mutex> lock(_mutex);
+
+    STM32HIDDeviceInfoList devices = enumerateHIDDevices();
+
+    for (const auto& info : devices)
+    {
+        AlpacaDevice existing = _AlpacaDevice::findAlpacaDevice(info._hash);
+        if (existing == nullptr)
+        {
+            STM32Device* dev = new STM32Device;
+
+            dev->_active       = true;
+            dev->_boardType    = eSTM32;
+            dev->_hash         = info._hash;
+            dev->_serialNumber = info._serialNumber;
+            dev->_platformID   = ALPACA_STM32_ID;
+            dev->_description  = qtac::ByteArray("Arduino BugHopper V2 Board");
+            dev->_devicePath   = info._devicePath;
+            dev->_portName     = vtpPortName(info._serialNumber);
+
+            AlpacaDevice alpacaDevice = AlpacaDevice(dev);
+            _AlpacaDevice::_alpacaDevices.append(alpacaDevice);
+        }
+        else
+        {
+            existing->setActive();
+        }
+    }
+
+    return static_cast<uint32_t>(_AlpacaDevice::_alpacaDevices.size());
+}
+
+// -----------------------------------------------------------------------
+// open() — create and start the drive thread
+// -----------------------------------------------------------------------
+
+bool STM32Device::open()
+{
+    bool result{false};
+
+    if (_serialDriveThread == nullptr)
+    {
+        qtac::TACSTM32DriveThread* thread;
+
+        if (_driveThread != nullptr)
+        {
+            // GUI path: caller already injected a drive thread. Alias it so
+            // close() can detect the alias and avoid double-delete.
+            thread = static_cast<qtac::TACSTM32DriveThread*>(_driveThread);
+            _serialDriveThread = thread;
+        }
+        else
+        {
+            // Headless / test path: create our own thread (self-owned, deleted by close()).
+            thread = new qtac::TACSTM32DriveThread(_hash);
+            _serialDriveThread = thread;
+        }
+
+        _serialDriveThread->start();
+
+        for (int i = 0; i < kMaxOpenIterations; ++i)
+        {
+            std::this_thread::sleep_for(std::chrono::milliseconds(kOpenPollMs));
+            if (_serialDriveThread->weAreRunning()) { result = true; break; }
+        }
+
+        if (!result)
+        {
+            _lastError = "BugHopper V2 device did not become ready after open";
+            return false;
+        }
+    }
+    else
+    {
+        result = _serialDriveThread->weAreRunning();
+    }
+
+    if (result)
+    {
+        _stm32PlatformConfiguration = new _STM32PlatformConfiguration;
+
+        _serialDriveThread->onPinStateChanged.connect([this](uint64_t pin, bool state) {
+            this->on_pinStateChanged(pin, state);
+        });
+
+        buildMapping();
+    }
+
+    return result;
+}
+
+// -----------------------------------------------------------------------
+// buildMapping / buildCommandList
+// -----------------------------------------------------------------------
+
+void STM32Device::buildMapping()
+{
+    if (_stm32PlatformConfiguration == nullptr)
+        return;
+    buildCommandList();
+}
+
+void STM32Device::buildCommandList()
+{
+    if (!_commands.isEmpty() || _stm32PlatformConfiguration == nullptr)
+        return;
+
+    STM32PinList pinList = _stm32PlatformConfiguration->getActivePins();
+
+    for (const auto& stm32Pin : pinList)
+    {
+        TACCommand tacCommand;
+
+        tacCommand._pin          = stm32Pin._pin;
+        tacCommand._command      = stm32Pin._pinCommand;
+        tacCommand._helpText     = stm32Pin._pinTooltip;
+        tacCommand._currentState = false;
+        tacCommand._isInverted   = stm32Pin._inverted;
+        tacCommand._tabName      = stm32Pin._tabName.toLatin1();
+        tacCommand._groupName    = CommandGroup::toString(stm32Pin._commandGroup).toLatin1();
+
+        qtac::ByteArray cellLocation =
+            qtac::ByteArray::number(stm32Pin._cellLocation.x()) + ","
+            + qtac::ByteArray::number(stm32Pin._cellLocation.y());
+        tacCommand._cellLocation = cellLocation;
+
+        _commands[tacCommand._command] = tacCommand;
+    }
+}
+
+// -----------------------------------------------------------------------
+// setPinState — invert physical state if configured, then delegate
+// -----------------------------------------------------------------------
+
+void STM32Device::setPinState(PinID pin, bool state)
+{
+    if (_stm32PlatformConfiguration != nullptr)
+    {
+        if (_stm32PlatformConfiguration->getPinInvertedState(pin))
+            state = !state;
+    }
+    _AlpacaDevice::setPinState(pin, state);
+}
+
+// -----------------------------------------------------------------------
+// HID transport (called from TACSTM32DriveThread)
+// -----------------------------------------------------------------------
+
+bool STM32Device::openTransport()
+{
+    if (_devicePath.isEmpty())
+        return false;
+
+    hid_device* handle = hid_open_path(_devicePath.data());
+    if (handle == nullptr)
+        return false;
+
+    _hidHandle = static_cast<void*>(handle);
+    return true;
+}
+
+bool STM32Device::write(const qtac::ByteArray& report)
+{
+    if (_hidHandle == nullptr)
+        return false;
+
+    hid_device* handle = static_cast<hid_device*>(_hidHandle);
+    int written = hid_write(handle,
+                            reinterpret_cast<const unsigned char*>(report.data()),
+                            static_cast<size_t>(report.size()));
+    return written >= 0;
+}
+
+void STM32Device::close()
+{
+    if (_hidHandle != nullptr)
+    {
+        hid_close(static_cast<hid_device*>(_hidHandle));
+        _hidHandle = nullptr;
+    }
+}
diff --git a/source/library/src/STM32PlatformConfiguration.cpp b/source/library/src/STM32PlatformConfiguration.cpp
new file mode 100644
index 00000000..b03eea4a
--- /dev/null
+++ b/source/library/src/STM32PlatformConfiguration.cpp
@@ -0,0 +1,271 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Qt-free port of STM32PlatformConfiguration from qcommon-console.
+
+#include <qtac/STM32PlatformConfiguration.h>
+#include <qtac/StringUtilities.h>
+#include <qtac/PlatformID.h>
+
+#include <algorithm>
+
+_STM32PlatformConfiguration::_STM32PlatformConfiguration()
+{
+    initialize();
+}
+
+void _STM32PlatformConfiguration::initialize()
+{
+    _pinEntries.clear();
+
+    // --- Pin definitions — exact data from upstream STM32PlatformConfiguration.cpp ---
+    auto addPin = [&](PinID pin, bool enabled, bool inverted,
+                      const char* label, const char* cmd, const char* tooltip,
+                      CommandGroups group, const char* tab, qtac::Point cell)
+    {
+        STM32PinData p(pin);
+        p._enabled      = enabled;
+        p._inverted     = inverted;
+        p._pinLabel     = label;
+        p._pinCommand   = cmd;
+        p._pinTooltip   = tooltip;
+        p._commandGroup = group;
+        p._tabName      = tab;
+        p._cellLocation = cell;
+        _pinEntries[p._hash] = p;
+    };
+
+    addPin(0, true,  false, "EDL",         "edl",     "Boot mode select. High = USB / EDL boot, Low = Normal boot", eSwitchGroup,     "General", {0, 0});
+    addPin(2, true,  true,  "Battery",     "battery", "Disable power supply",                                        eConnectionGroup, "General", {1, 0});
+    addPin(3, true,  false, "Volume Down", "voldn",   "Volume down / USB-C host mode select button state",           eSwitchGroup,     "General", {2, 0});
+
+    // --- Button definitions ---
+    _buttons.clear();
+
+    auto addButton = [&](const char* label, const char* cmd, const char* tooltip,
+                         int col, int row)
+    {
+        qtac::ButtonEntry btn;
+        btn._name         = label;
+        btn._command      = cmd;
+        btn._tooltip      = tooltip;
+        btn._commandGroup = static_cast<int>(eQuickSettingsGroup);
+        btn._tab          = "General";
+        btn._cellX        = col;
+        btn._cellY        = row;
+        _buttons.push_back(btn);
+    };
+
+    addButton("Power On",              "powerOn",            "Power cycle to normal boot mode",            0, 0);
+    addButton("Power Off",             "powerOff",           "Power off the device",                       1, 0);
+    addButton("Reset",                 "reset",              "MPU reset pulse",                            2, 0);
+    addButton("Boot to EDL",           "bootToEDL",          "Power cycle to USB / EDL boot mode",         0, 1);
+    addButton("Force USB-C Host Mode", "forceUsbcHostMode",  "Force the device into USB-C host mode",      1, 1);
+
+    // --- Script variables ---
+    _variables.clear();
+    {
+        qtac::VariableEntry v;
+        v._name         = "edl";
+        v._label        = "EDL timing (ms)";
+        v._tooltip      = "Configurable Boot to EDL timing in milliseconds";
+        v._type         = qtac::VariableType::Integer;
+        v._defaultValue = 100u;
+        v._cellX        = 0;
+        v._cellY        = 0;
+        _variables[v._name] = v;
+    }
+
+    // --- AlpacaScript (exact text from upstream) ---
+    static const char* kDefaultScript =
+        "def powerOff()\n"
+        "logComment ====== powerOff sequence start ======\n"
+        "battery 1\n"
+        "logComment ====== powerOff sequence finish ======\n\n"
+        "def powerOn()\n"
+        "logComment ====== powerOn sequence start ======\n"
+        "powerOff\n"
+        "battery 0\n"
+        "edl 0\n"
+        "voldn 0\n"
+        "logComment ====== powerOn sequence finish ======\n\n"
+        "def reset()\n"
+        "logComment ====== reset sequence start ======\n"
+        "edl 0\n"
+        "voldn 0\n"
+        "powerOff\n"
+        "powerOn\n"
+        "logComment ====== reset sequence finish ======\n\n"
+        "def bootToEDL()\n"
+        "logComment ====== bootToEDL sequence start ======\n"
+        "powerOff\n"
+        "edl 1\n"
+        "delay $edl\n"
+        "battery 0\n"
+        "logComment ====== bootToEDL sequence finish ======\n\n"
+        "def forceUsbcHostMode()\n"
+        "logComment ====== forceUsbcHostMode sequence start ======\n"
+        "powerOff\n"
+        "edl 0\n"
+        "voldn 1\n"
+        "powerOn\n"
+        "logComment ====== forceUsbcHostMode sequence finish ======";
+
+    TACCommands cmds;
+    STM32PinList active = getActivePins();
+    for (const auto& p : active)
+    {
+        if (p._pinCommand.isEmpty()) continue;
+        TACCommand tc;
+        tc._pin     = p._pin;
+        tc._command = p._pinCommand;
+        cmds.append(tc);
+    }
+    _script.parseScript(qtac::String(kDefaultScript), _variables, cmds);
+}
+
+// -----------------------------------------------------------------------
+// Pin data accessors
+// -----------------------------------------------------------------------
+
+STM32PinData _STM32PlatformConfiguration::getPinData(PinID pin)
+{
+    HashType hash = STM32PinData::makeSTM32Hash(pin);
+    auto it = _pinEntries.find(hash);
+    return (it != _pinEntries.end()) ? it->second : STM32PinData();
+}
+
+STM32PinList _STM32PlatformConfiguration::getAllPins() const
+{
+    STM32PinList result;
+    for (const auto& kv : _pinEntries)
+        result.append(kv.second);
+    std::sort(result.begin(), result.end(), [](const STM32PinData& a, const STM32PinData& b) {
+        return a._pin < b._pin;
+    });
+    return result;
+}
+
+STM32PinList _STM32PlatformConfiguration::getActivePins() const
+{
+    STM32PinList result;
+    for (const auto& kv : _pinEntries)
+        if (kv.second._enabled)
+            result.append(kv.second);
+    std::sort(result.begin(), result.end(), [](const STM32PinData& a, const STM32PinData& b) {
+        return a._pin < b._pin;
+    });
+    return result;
+}
+
+Pins _STM32PlatformConfiguration::getPins()
+{
+    Pins result;
+    STM32PinList active = getActivePins();
+    for (const auto& p : active)
+    {
+        PinEntry pe;
+        pe._pin          = p._pin;
+        pe._enabled      = p._enabled;
+        pe._hash         = p._hash;
+        pe._cellLocation = p._cellLocation;
+        pe._commandGroup = p._commandGroup;
+        pe._pinCommand   = p._pinCommand;
+        pe._inverted     = p._inverted;
+        pe._pinLabel     = p._pinLabel;
+        pe._pinTooltip   = p._pinTooltip;
+        pe._tabName      = p._tabName;
+        result.append(pe);
+    }
+    std::sort(result.begin(), result.end(), [](const PinEntry& a, const PinEntry& b) {
+        if (a._tabName != b._tabName)       return a._tabName < b._tabName;
+        if (a._commandGroup != b._commandGroup) return a._commandGroup < b._commandGroup;
+        return a._pin < b._pin;
+    });
+    return result;
+}
+
+bool _STM32PlatformConfiguration::getPinEnableState(PinID pin) const
+{
+    HashType h = STM32PinData::makeSTM32Hash(pin);
+    auto it = _pinEntries.find(h);
+    return (it != _pinEntries.end()) ? it->second._enabled : true;
+}
+
+bool _STM32PlatformConfiguration::getPinInvertedState(PinID pin) const
+{
+    HashType h = STM32PinData::makeSTM32Hash(pin);
+    auto it = _pinEntries.find(h);
+    return (it != _pinEntries.end()) ? it->second._inverted : false;
+}
+
+qtac::String _STM32PlatformConfiguration::getPinLabel(PinID pin) const
+{
+    HashType h = STM32PinData::makeSTM32Hash(pin);
+    auto it = _pinEntries.find(h);
+    return (it != _pinEntries.end()) ? it->second._pinLabel : qtac::String();
+}
+
+qtac::String _STM32PlatformConfiguration::getPinTooltip(PinID pin) const
+{
+    HashType h = STM32PinData::makeSTM32Hash(pin);
+    auto it = _pinEntries.find(h);
+    return (it != _pinEntries.end()) ? it->second._pinTooltip : qtac::String();
+}
+
+qtac::String _STM32PlatformConfiguration::getPinCommand(PinID pin) const
+{
+    HashType h = STM32PinData::makeSTM32Hash(pin);
+    auto it = _pinEntries.find(h);
+    return (it != _pinEntries.end()) ? it->second._pinCommand : qtac::String();
+}
+
+CommandGroups _STM32PlatformConfiguration::getPinGroup(PinID pin) const
+{
+    HashType h = STM32PinData::makeSTM32Hash(pin);
+    auto it = _pinEntries.find(h);
+    return (it != _pinEntries.end()) ? it->second._commandGroup : eUnknownCommandGroup;
+}
+
+qtac::String _STM32PlatformConfiguration::getTabName(PinID pin) const
+{
+    HashType h = STM32PinData::makeSTM32Hash(pin);
+    auto it = _pinEntries.find(h);
+    return (it != _pinEntries.end()) ? it->second._tabName : qtac::String();
+}
+
+qtac::Point _STM32PlatformConfiguration::getPinCellLocation(PinID pin) const
+{
+    HashType h = STM32PinData::makeSTM32Hash(pin);
+    auto it = _pinEntries.find(h);
+    return (it != _pinEntries.end()) ? it->second._cellLocation : qtac::Point(-1, -1);
+}
diff --git a/source/library/src/SerialPort.cpp b/source/library/src/SerialPort.cpp
new file mode 100644
index 00000000..772ee041
--- /dev/null
+++ b/source/library/src/SerialPort.cpp
@@ -0,0 +1,177 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+// Adapted from tac-core/SerialPort.cpp — uses qtac:: types
+
+#include <qtac/SerialPort.h>
+#include <qtac/SerialPortInfo.h>
+
+#include <chrono>
+#include <thread>
+
+// Include libserialport only in the .cpp to avoid polluting headers
+#include <libserialport.h>
+
+namespace qtac {
+
+SerialPort::SerialPort(const qtac::String& portName)
+	: _portName(portName)
+{
+}
+
+SerialPort::SerialPort(const SerialPortInfo& portInfo)
+	: _portName(portInfo.portName())
+{
+}
+
+SerialPort::~SerialPort()
+{
+	close();
+}
+
+bool SerialPort::open()
+{
+	if (_port != nullptr)
+		close();
+
+	sp_port* port = nullptr;
+	if (sp_get_port_by_name(_portName.constData(), &port) != SP_OK)
+	{
+		_lastError = "Port not found: " + _portName;
+		return false;
+	}
+
+	if (sp_open(port, SP_MODE_READ_WRITE) != SP_OK)
+	{
+		_lastError = sp_last_error_message();
+		sp_free_port(port);
+		return false;
+	}
+
+	_port = port;
+	applySettings();
+
+	if (onPortOpened) onPortOpened();
+	return true;
+}
+
+void SerialPort::close()
+{
+	if (_port != nullptr)
+	{
+		sp_close(_port);
+		sp_free_port(_port);
+		_port = nullptr;
+		if (onPortClosed) onPortClosed();
+	}
+}
+
+void SerialPort::applySettings()
+{
+	if (_port == nullptr) return;
+
+	sp_set_baudrate(_port, _settings.baudRate);
+	sp_set_bits(_port, _settings.dataBits);
+	sp_set_parity(_port, static_cast<sp_parity>(_settings.parity));
+	sp_set_stopbits(_port, _settings.stopBits);
+	sp_set_flowcontrol(_port, static_cast<sp_flowcontrol>(_settings.flowControl));
+
+	// Assert DTR and RTS — QSerialPort does this by default on open().
+	// Many USB-serial devices (PSoC, PIC32CX) require DTR high to enable communication.
+	sp_set_dtr(_port, SP_DTR_ON);
+	sp_set_rts(_port, SP_RTS_ON);
+}
+
+qtac::ByteArray SerialPort::readAll(uint32_t timeout_ms)
+{
+	if (_port == nullptr) return {};
+
+	char buf[4096];
+	sp_return n = sp_blocking_read_next(_port, buf, sizeof(buf), timeout_ms);
+	if (n <= 0) return {};
+
+	qtac::ByteArray result(buf, static_cast<int>(n));
+
+	// Drain any remaining bytes non-blocking
+	sp_return extra;
+	while ((extra = sp_nonblocking_read(_port, buf, sizeof(buf))) > 0)
+		result.append(buf, static_cast<int>(extra));
+
+	return result;
+}
+
+int SerialPort::write(const qtac::ByteArray& data, uint32_t timeout_ms)
+{
+	if (_port == nullptr) return -1;
+	sp_return n = sp_blocking_write(_port, data.constData(),
+	                                static_cast<size_t>(data.size()), timeout_ms);
+	return static_cast<int>(n);
+}
+
+bool SerialPort::waitForReadyRead(uint32_t timeout_ms)
+{
+	if (_port == nullptr) return false;
+
+	uint32_t elapsed = 0;
+	const uint32_t pollInterval = 1; // ms
+
+	while (elapsed < timeout_ms)
+	{
+		sp_return waiting = sp_input_waiting(_port);
+		if (waiting > 0)
+		{
+			if (onReadyRead) onReadyRead();
+			return true;
+		}
+		if (waiting < 0) return false; // error
+
+		std::this_thread::sleep_for(std::chrono::milliseconds(pollInterval));
+		elapsed += pollInterval;
+	}
+
+	sp_return waiting = sp_input_waiting(_port);
+	if (waiting > 0)
+	{
+		if (onReadyRead) onReadyRead();
+		return true;
+	}
+	return false;
+}
+
+bool SerialPort::clear()
+{
+	if (_port == nullptr) return false;
+	return sp_flush(_port, SP_BUF_BOTH) == SP_OK;
+}
+
+} // namespace qtac
diff --git a/source/library/src/SerialPortInfo.cpp b/source/library/src/SerialPortInfo.cpp
new file mode 100644
index 00000000..0887839c
--- /dev/null
+++ b/source/library/src/SerialPortInfo.cpp
@@ -0,0 +1,48 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Platform-independent helpers for SerialPortInfo.
+// availablePorts() is implemented in SerialPortInfo_win32.cpp / SerialPortInfo_posix.cpp.
+
+#include <qtac/SerialPortInfo.h>
+
+namespace qtac {
+
+bool equal(const SerialPortInfos& si1, const SerialPortInfos& si2)
+{
+	if (si1.size() != si2.size()) return false;
+	for (size_t i = 0; i < si1.size(); ++i)
+		if (!(si1[i] == si2[i])) return false;
+	return true;
+}
+
+} // namespace qtac
diff --git a/source/library/src/String.cpp b/source/library/src/String.cpp
new file mode 100644
index 00000000..fe492aaf
--- /dev/null
+++ b/source/library/src/String.cpp
@@ -0,0 +1,516 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <qtac/String.h>
+#include <qtac/StringList.h>
+#include <algorithm>
+#include <sstream>
+#include <iomanip>
+#include <cctype>
+#include <cstring>
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+namespace qtac {
+
+// --- Constructors ---
+
+String::String() : _isNull(true) {}
+
+String::String(const char* str)
+	: _data(str ? str : ""), _isNull(str == nullptr)
+{
+}
+
+String::String(const char* str, int size)
+	: _data(str, static_cast<size_t>(size)), _isNull(false)
+{
+}
+
+String::String(const std::string& str)
+	: _data(str), _isNull(false)
+{
+}
+
+String::String(std::string&& str)
+	: _data(std::move(str)), _isNull(false)
+{
+}
+
+String::String(const ByteArray& ba)
+	: _data(ba.constData(), static_cast<size_t>(ba.size())), _isNull(ba.isNull())
+{
+}
+
+String::String(char ch)
+	: _data(1, ch), _isNull(false)
+{
+}
+
+#ifdef _WIN32
+String String::fromStdWString(const std::wstring& wstr)
+{
+	if (wstr.empty()) return String("");
+	int sizeNeeded = WideCharToMultiByte(CP_UTF8, 0, wstr.c_str(),
+		static_cast<int>(wstr.size()), nullptr, 0, nullptr, nullptr);
+	std::string result(static_cast<size_t>(sizeNeeded), '\0');
+	WideCharToMultiByte(CP_UTF8, 0, wstr.c_str(),
+		static_cast<int>(wstr.size()), &result[0], sizeNeeded, nullptr, nullptr);
+	return String(std::move(result));
+}
+
+std::wstring String::toStdWString() const
+{
+	if (_data.empty()) return std::wstring();
+	int sizeNeeded = MultiByteToWideChar(CP_UTF8, 0, _data.c_str(),
+		static_cast<int>(_data.size()), nullptr, 0);
+	std::wstring result(static_cast<size_t>(sizeNeeded), L'\0');
+	MultiByteToWideChar(CP_UTF8, 0, _data.c_str(),
+		static_cast<int>(_data.size()), &result[0], sizeNeeded);
+	return result;
+}
+#endif
+
+// --- Size ---
+
+int String::size() const { return static_cast<int>(_data.size()); }
+int String::length() const { return size(); }
+bool String::isEmpty() const { return _data.empty(); }
+bool String::isNull() const { return _isNull; }
+void String::clear() { _data.clear(); _isNull = false; }
+
+// --- Data access ---
+
+const char* String::constData() const { return _data.c_str(); }
+const char* String::data() const { return _data.c_str(); }
+char* String::data() { return _data.empty() ? nullptr : &_data[0]; }
+std::string String::toStdString() const { return _data; }
+
+// --- Conversion to ByteArray ---
+
+ByteArray String::toLatin1() const { return ByteArray(_data); }
+
+// --- Numeric conversions ---
+
+int String::toInt(bool* ok, int base) const
+{
+	try {
+		size_t pos = 0;
+		int result = std::stoi(_data, &pos, base);
+		if (ok) *ok = (pos == _data.size());
+		return result;
+	} catch (...) {
+		if (ok) *ok = false;
+		return 0;
+	}
+}
+
+unsigned int String::toUInt(bool* ok, int base) const
+{
+	try {
+		size_t pos = 0;
+		unsigned long result = std::stoul(_data, &pos, base);
+		if (ok) *ok = (pos == _data.size() && result <= UINT32_MAX);
+		return static_cast<unsigned int>(result);
+	} catch (...) {
+		if (ok) *ok = false;
+		return 0;
+	}
+}
+
+long long String::toLongLong(bool* ok, int base) const
+{
+	try {
+		size_t pos = 0;
+		long long result = std::stoll(_data, &pos, base);
+		if (ok) *ok = (pos == _data.size());
+		return result;
+	} catch (...) {
+		if (ok) *ok = false;
+		return 0;
+	}
+}
+
+unsigned long long String::toULongLong(bool* ok, int base) const
+{
+	try {
+		size_t pos = 0;
+		unsigned long long result = std::stoull(_data, &pos, base);
+		if (ok) *ok = (pos == _data.size());
+		return result;
+	} catch (...) {
+		if (ok) *ok = false;
+		return 0;
+	}
+}
+
+double String::toDouble(bool* ok) const
+{
+	try {
+		size_t pos = 0;
+		double result = std::stod(_data, &pos);
+		if (ok) *ok = (pos == _data.size());
+		return result;
+	} catch (...) {
+		if (ok) *ok = false;
+		return 0.0;
+	}
+}
+
+// --- Case conversion ---
+
+String String::toUpper() const
+{
+	std::string result = _data;
+	std::transform(result.begin(), result.end(), result.begin(),
+		[](unsigned char c) { return static_cast<char>(std::toupper(c)); });
+	return String(std::move(result));
+}
+
+String String::toLower() const
+{
+	std::string result = _data;
+	std::transform(result.begin(), result.end(), result.begin(),
+		[](unsigned char c) { return static_cast<char>(std::tolower(c)); });
+	return String(std::move(result));
+}
+
+// --- Trimming ---
+
+String String::trimmed() const
+{
+	if (_data.empty()) return String("");
+	auto start = _data.find_first_not_of(" \t\n\r\f\v");
+	if (start == std::string::npos) return String("");
+	auto end = _data.find_last_not_of(" \t\n\r\f\v");
+	return String(_data.substr(start, end - start + 1));
+}
+
+String String::simplified() const
+{
+	std::string result;
+	result.reserve(_data.size());
+	bool inSpace = true; // treat leading whitespace as already-seen
+	for (size_t i = 0; i < _data.size(); ++i) {
+		unsigned char c = static_cast<unsigned char>(_data[i]);
+		if (std::isspace(c)) {
+			if (!inSpace) {
+				result += ' ';
+				inSpace = true;
+			}
+		} else {
+			result += static_cast<char>(c);
+			inSpace = false;
+		}
+	}
+	// trim trailing space added by the loop
+	if (!result.empty() && result.back() == ' ')
+		result.pop_back();
+	return String(std::move(result));
+}
+
+// --- Search ---
+
+bool String::contains(const String& str, bool caseSensitive) const
+{
+	if (caseSensitive)
+		return _data.find(str._data) != std::string::npos;
+	return toLower()._data.find(str.toLower()._data) != std::string::npos;
+}
+
+bool String::contains(char ch, bool caseSensitive) const
+{
+	if (caseSensitive)
+		return _data.find(ch) != std::string::npos;
+	char lower = static_cast<char>(std::tolower(static_cast<unsigned char>(ch)));
+	return toLower()._data.find(lower) != std::string::npos;
+}
+
+int String::indexOf(const String& str, int from) const
+{
+	auto pos = _data.find(str._data, static_cast<size_t>(from));
+	return pos == std::string::npos ? -1 : static_cast<int>(pos);
+}
+
+int String::indexOf(char ch, int from) const
+{
+	auto pos = _data.find(ch, static_cast<size_t>(from));
+	return pos == std::string::npos ? -1 : static_cast<int>(pos);
+}
+
+bool String::startsWith(const String& str, bool caseSensitive) const
+{
+	if (str._data.size() > _data.size()) return false;
+	if (caseSensitive)
+		return _data.compare(0, str._data.size(), str._data) == 0;
+	return toLower()._data.compare(0, str._data.size(), str.toLower()._data) == 0;
+}
+
+bool String::startsWith(char ch, bool caseSensitive) const
+{
+	if (_data.empty()) return false;
+	if (caseSensitive)
+		return _data.front() == ch;
+	return std::tolower(static_cast<unsigned char>(_data.front())) ==
+	       std::tolower(static_cast<unsigned char>(ch));
+}
+
+bool String::endsWith(const String& str, bool caseSensitive) const
+{
+	if (str._data.size() > _data.size()) return false;
+	if (caseSensitive)
+		return _data.compare(_data.size() - str._data.size(), str._data.size(), str._data) == 0;
+	return toLower()._data.compare(_data.size() - str._data.size(), str._data.size(), str.toLower()._data) == 0;
+}
+
+bool String::endsWith(char ch, bool caseSensitive) const
+{
+	if (_data.empty()) return false;
+	if (caseSensitive)
+		return _data.back() == ch;
+	return std::tolower(static_cast<unsigned char>(_data.back())) ==
+	       std::tolower(static_cast<unsigned char>(ch));
+}
+
+// --- Substrings ---
+
+String String::left(int len) const
+{
+	return String(_data.substr(0, static_cast<size_t>(len)));
+}
+
+String String::right(int len) const
+{
+	if (len <= 0) return String("");
+	size_t ulen = static_cast<size_t>(len);
+	if (ulen >= _data.size()) return *this;
+	return String(_data.substr(_data.size() - ulen));
+}
+
+String String::mid(int position, int len) const
+{
+	if (position < 0) position = 0;
+	if (static_cast<size_t>(position) >= _data.size()) return String("");
+	if (len < 0)
+		return String(_data.substr(static_cast<size_t>(position)));
+	return String(_data.substr(static_cast<size_t>(position), static_cast<size_t>(len)));
+}
+
+// --- Replace ---
+
+String& String::replace(const String& before, const String& after)
+{
+	if (before._data.empty()) return *this;
+	size_t pos = 0;
+	while ((pos = _data.find(before._data, pos)) != std::string::npos) {
+		_data.replace(pos, before._data.size(), after._data);
+		pos += after._data.size();
+	}
+	return *this;
+}
+
+String& String::replace(char before, char after)
+{
+	std::replace(_data.begin(), _data.end(), before, after);
+	return *this;
+}
+
+// --- Arg ---
+
+String String::argHelper(const String& a, int placeholder) const
+{
+	std::string marker = "%" + std::to_string(placeholder);
+	std::string result = _data;
+	size_t pos = result.find(marker);
+	if (pos != std::string::npos) {
+		result.replace(pos, marker.size(), a._data);
+	}
+	return String(std::move(result));
+}
+
+String String::arg(const String& a) const
+{
+	// Find lowest placeholder %1..%9
+	int lowest = 10;
+	for (int i = 1; i <= 9; ++i) {
+		std::string marker = "%" + std::to_string(i);
+		if (_data.find(marker) != std::string::npos) {
+			lowest = i;
+			break;
+		}
+	}
+	if (lowest > 9) return *this;
+	// Replace all instances of lowest placeholder
+	std::string marker = "%" + std::to_string(lowest);
+	std::string result = _data;
+	size_t pos = 0;
+	while ((pos = result.find(marker, pos)) != std::string::npos) {
+		result.replace(pos, marker.size(), a._data);
+		pos += a._data.size();
+	}
+	return String(std::move(result));
+}
+
+String String::arg(int a) const { return arg(number(a)); }
+String String::arg(unsigned int a) const { return arg(number(a)); }
+String String::arg(long long a) const { return arg(number(a)); }
+String String::arg(unsigned long long a) const { return arg(number(a)); }
+
+String String::arg(double a, int /*fieldWidth*/, char format, int precision) const
+{
+	return arg(number(a, format, precision));
+}
+
+String String::arg(const String& a1, const String& a2) const
+{
+	return arg(a1).arg(a2);
+}
+
+String String::arg(const String& a1, const String& a2, const String& a3) const
+{
+	return arg(a1).arg(a2).arg(a3);
+}
+
+// --- Compare ---
+
+int String::compare(const String& other, bool caseSensitive) const
+{
+	if (caseSensitive)
+		return _data.compare(other._data);
+	return toLower()._data.compare(other.toLower()._data);
+}
+
+int String::compare(const String& s1, const String& s2, bool caseSensitive)
+{
+	return s1.compare(s2, caseSensitive);
+}
+
+// --- Static number ---
+
+String String::number(int value, int base)
+{
+	if (base == 10) return String(std::to_string(value));
+	std::ostringstream oss;
+	if (base == 16) oss << std::hex << value;
+	else if (base == 8) oss << std::oct << value;
+	else oss << value;
+	return String(oss.str());
+}
+
+String String::number(unsigned int value, int base)
+{
+	if (base == 10) return String(std::to_string(value));
+	std::ostringstream oss;
+	if (base == 16) oss << std::hex << value;
+	else if (base == 8) oss << std::oct << value;
+	else oss << value;
+	return String(oss.str());
+}
+
+String String::number(long long value, int base)
+{
+	if (base == 10) return String(std::to_string(value));
+	std::ostringstream oss;
+	if (base == 16) oss << std::hex << value;
+	else if (base == 8) oss << std::oct << value;
+	else oss << value;
+	return String(oss.str());
+}
+
+String String::number(unsigned long long value, int base)
+{
+	if (base == 10) return String(std::to_string(value));
+	std::ostringstream oss;
+	if (base == 16) oss << std::hex << value;
+	else if (base == 8) oss << std::oct << value;
+	else oss << value;
+	return String(oss.str());
+}
+
+String String::number(double value, char format, int precision)
+{
+	std::ostringstream oss;
+	if (format == 'f')
+		oss << std::fixed;
+	else if (format == 'e')
+		oss << std::scientific;
+	oss << std::setprecision(precision) << value;
+	return String(oss.str());
+}
+
+// --- Append ---
+
+String& String::append(const String& str) { _data += str._data; _isNull = false; return *this; }
+String& String::append(char ch) { _data += ch; _isNull = false; return *this; }
+
+// --- Operators ---
+
+String& String::operator+=(const String& other) { _data += other._data; _isNull = false; return *this; }
+String& String::operator+=(const char* str) { if (str) _data += str; _isNull = false; return *this; }
+String& String::operator+=(char ch) { _data += ch; _isNull = false; return *this; }
+
+String operator+(const String& lhs, const String& rhs) { return String(lhs._data + rhs._data); }
+String operator+(const String& lhs, const char* rhs) { return String(lhs._data + (rhs ? rhs : "")); }
+String operator+(const char* lhs, const String& rhs) { return String((lhs ? lhs : "") + rhs._data); }
+
+// --- Comparison ---
+
+bool operator==(const String& lhs, const String& rhs) { return lhs._data == rhs._data; }
+bool operator!=(const String& lhs, const String& rhs) { return lhs._data != rhs._data; }
+bool operator<(const String& lhs, const String& rhs) { return lhs._data < rhs._data; }
+bool operator>(const String& lhs, const String& rhs) { return lhs._data > rhs._data; }
+bool operator<=(const String& lhs, const String& rhs) { return lhs._data <= rhs._data; }
+bool operator>=(const String& lhs, const String& rhs) { return lhs._data >= rhs._data; }
+bool operator==(const String& lhs, const char* rhs) { return lhs._data == (rhs ? rhs : ""); }
+bool operator==(const char* lhs, const String& rhs) { return (lhs ? lhs : "") == rhs._data; }
+bool operator!=(const String& lhs, const char* rhs) { return !(lhs == rhs); }
+bool operator!=(const char* lhs, const String& rhs) { return !(lhs == rhs); }
+
+// --- Iterators ---
+
+String::iterator String::begin() { return _data.begin(); }
+String::iterator String::end() { return _data.end(); }
+String::const_iterator String::begin() const { return _data.begin(); }
+String::const_iterator String::end() const { return _data.end(); }
+String::const_iterator String::cbegin() const { return _data.cbegin(); }
+String::const_iterator String::cend() const { return _data.cend(); }
+
+// --- Hash ---
+
+size_t String::Hash::operator()(const String& s) const
+{
+	return std::hash<std::string>{}(s._data);
+}
+
+} // namespace qtac
diff --git a/source/library/src/StringList.cpp b/source/library/src/StringList.cpp
new file mode 100644
index 00000000..1efcbff9
--- /dev/null
+++ b/source/library/src/StringList.cpp
@@ -0,0 +1,176 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <qtac/StringList.h>
+#include <algorithm>
+#include <stdexcept>
+
+namespace qtac {
+
+// --- Constructors ---
+
+StringList::StringList() {}
+StringList::StringList(std::initializer_list<String> init) : _data(init) {}
+StringList::StringList(const std::vector<String>& vec) : _data(vec) {}
+StringList::StringList(std::vector<String>&& vec) : _data(std::move(vec)) {}
+
+// --- Size ---
+
+int StringList::size() const { return static_cast<int>(_data.size()); }
+int StringList::count() const { return size(); }
+bool StringList::isEmpty() const { return _data.empty(); }
+
+// --- Element access ---
+
+const String& StringList::at(int index) const { return _data.at(static_cast<size_t>(index)); }
+String& StringList::operator[](int index) { return _data[static_cast<size_t>(index)]; }
+const String& StringList::operator[](int index) const { return _data[static_cast<size_t>(index)]; }
+const String& StringList::first() const { return _data.front(); }
+const String& StringList::last() const { return _data.back(); }
+
+// --- Modification ---
+
+void StringList::append(const String& str) { _data.push_back(str); }
+void StringList::append(const StringList& other)
+{
+	_data.insert(_data.end(), other._data.begin(), other._data.end());
+}
+void StringList::prepend(const String& str) { _data.insert(_data.begin(), str); }
+void StringList::insert(int index, const String& str)
+{
+	_data.insert(_data.begin() + index, str);
+}
+void StringList::removeAt(int index) { _data.erase(_data.begin() + index); }
+void StringList::clear() { _data.clear(); }
+
+// --- Search ---
+
+bool StringList::contains(const String& str) const
+{
+	return std::find(_data.begin(), _data.end(), str) != _data.end();
+}
+
+int StringList::indexOf(const String& str) const
+{
+	auto it = std::find(_data.begin(), _data.end(), str);
+	if (it == _data.end()) return -1;
+	return static_cast<int>(std::distance(_data.begin(), it));
+}
+
+// --- Operations ---
+
+String StringList::join(const String& separator) const
+{
+	if (_data.empty()) return String("");
+	std::string result;
+	for (size_t i = 0; i < _data.size(); ++i) {
+		if (i > 0) result += separator.toStdString();
+		result += _data[i].toStdString();
+	}
+	return String(std::move(result));
+}
+
+String StringList::join(char separator) const
+{
+	return join(String(separator));
+}
+
+StringList StringList::filter(const String& str) const
+{
+	StringList result;
+	for (const auto& s : _data) {
+		if (s.contains(str))
+			result.append(s);
+	}
+	return result;
+}
+
+// --- Operators ---
+
+StringList& StringList::operator<<(const String& str) { _data.push_back(str); return *this; }
+StringList& StringList::operator+=(const String& str) { _data.push_back(str); return *this; }
+StringList& StringList::operator+=(const StringList& other)
+{
+	_data.insert(_data.end(), other._data.begin(), other._data.end());
+	return *this;
+}
+
+// --- Iterators ---
+
+StringList::iterator StringList::begin() { return _data.begin(); }
+StringList::iterator StringList::end() { return _data.end(); }
+StringList::const_iterator StringList::begin() const { return _data.begin(); }
+StringList::const_iterator StringList::end() const { return _data.end(); }
+StringList::const_iterator StringList::cbegin() const { return _data.cbegin(); }
+StringList::const_iterator StringList::cend() const { return _data.cend(); }
+
+// --- Conversion ---
+
+std::vector<String>& StringList::toVector() { return _data; }
+const std::vector<String>& StringList::toVector() const { return _data; }
+
+// --- String::split implementations (defined here to avoid circular dependency) ---
+
+StringList String::split(const String& separator) const
+{
+	StringList result;
+	if (separator.isEmpty()) {
+		result.append(*this);
+		return result;
+	}
+	std::string sep = separator.toStdString();
+	size_t start = 0;
+	size_t pos = _data.find(sep);
+	while (pos != std::string::npos) {
+		result.append(String(_data.substr(start, pos - start)));
+		start = pos + sep.size();
+		pos = _data.find(sep, start);
+	}
+	result.append(String(_data.substr(start)));
+	return result;
+}
+
+StringList String::split(char separator) const
+{
+	StringList result;
+	size_t start = 0;
+	size_t pos = _data.find(separator);
+	while (pos != std::string::npos) {
+		result.append(String(_data.substr(start, pos - start)));
+		start = pos + 1;
+		pos = _data.find(separator, start);
+	}
+	result.append(String(_data.substr(start)));
+	return result;
+}
+
+} // namespace qtac
diff --git a/source/library/src/StringUtilities.cpp b/source/library/src/StringUtilities.cpp
new file mode 100644
index 00000000..b51b186d
--- /dev/null
+++ b/source/library/src/StringUtilities.cpp
@@ -0,0 +1,109 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Michael Simpson
+
+#include <qtac/StringUtilities.h>
+#include <qtac/StringList.h>
+
+#include <cctype>
+#include <cstdint>
+
+namespace qtac {
+
+qtac::String toCamelCase(const qtac::String& camelCaseMe, char splitChar, bool skipEmpty)
+{
+	qtac::StringList parts = camelCaseMe.split(splitChar);
+	qtac::String result;
+	for (int i = 0; i < static_cast<int>(parts.size()); ++i)
+	{
+		qtac::String part = parts[i];
+		if (skipEmpty && part.isEmpty())
+			continue;
+		if (!part.isEmpty())
+		{
+			std::string s = part.toStdString();
+			s[0] = static_cast<char>(std::toupper(static_cast<unsigned char>(s[0])));
+			result += qtac::String(s);
+		}
+	}
+	return result;
+}
+
+bool isAlphaNumeric(const qtac::ByteArray& testMe)
+{
+	for (char c : testMe)
+	{
+		if (!std::isalnum(static_cast<unsigned char>(c)))
+			return false;
+	}
+	return true;
+}
+
+qtac::String fromBool(bool value)
+{
+	return value ? qtac::String("true") : qtac::String("false");
+}
+
+qtac::String fromPoint(const qtac::Point& value)
+{
+	return qtac::String::number(value.x()) + qtac::String(",") + qtac::String::number(value.y());
+}
+
+qtac::Point toPoint(const qtac::String& value)
+{
+	qtac::StringList temp = value.split(',');
+	if (static_cast<int>(temp.size()) >= 2)
+		return qtac::Point(temp[0].toInt(), temp[1].toInt());
+	return qtac::Point(-1, -1);
+}
+
+HashType strHash(const qtac::String& hashMe)
+{
+	return arrayHash(hashMe.toLatin1());
+}
+
+HashType arrayHash(const qtac::ByteArray& hashMe)
+{
+	uint64_t result{0};
+	const uint64_t p = 257;
+	const uint64_t m = 1000000009ULL;
+	uint64_t p_pow = 1;
+	for (char c : hashMe)
+	{
+		result = (result + static_cast<uint64_t>(c - 'a' + 1) * p_pow) % m;
+		p_pow = (p_pow * p) % m;
+	}
+	return result;
+}
+
+} // namespace qtac
diff --git a/source/library/src/TACDriveThread.cpp b/source/library/src/TACDriveThread.cpp
new file mode 100644
index 00000000..b394c56b
--- /dev/null
+++ b/source/library/src/TACDriveThread.cpp
@@ -0,0 +1,429 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+// Qt-free reimplementation of TACDriveThread.cpp from qcommon-console.
+
+#include <qtac/TACDriveThread.h>
+#include <qtac/AlpacaDevice.h>
+#include <qtac/TACCommandHashes.h>
+#include <qtac/PlatformID.h>
+
+#include <chrono>
+#include <sstream>
+#include <thread>
+
+// Forward declarations for concrete subclasses — included by the concrete
+// compilation units, not here, to keep TACDriveThread.cpp thin.
+namespace qtac {
+class TACLiteDriveThread;
+class TACPSOCDriveThread;
+class TACPIC32CXDriveThread;
+} // namespace qtac
+
+namespace qtac {
+
+// -----------------------------------------------------------------------
+// Helpers
+// -----------------------------------------------------------------------
+
+static uint64_t tickCount()
+{
+    using namespace std::chrono;
+    return static_cast<uint64_t>(
+        duration_cast<milliseconds>(steady_clock::now().time_since_epoch()).count());
+}
+
+// -----------------------------------------------------------------------
+// Command string constants (mirrors TACCommands.h kXxx values)
+// -----------------------------------------------------------------------
+
+static const qtac::ByteArray kSetNameCommandStr    {"Set Name"};
+static const qtac::ByteArray kSetNameAliasStr      {"setname"};
+static const qtac::ByteArray kSetButtonAssertTime  {"Set Button Assert Time"};
+static const qtac::ByteArray kSetButtonAssertAlias {"setbtnassert"};
+static const qtac::ByteArray kSetPowerKeyDelay     {"Set Power Key Delay"};
+static const qtac::ByteArray kSetPowerKeyDelayAlias{"setpkdelay"};
+static const qtac::ByteArray kSetPinCommandStr     {"SetPin"};
+static const qtac::ByteArray kSetPinCommandLower   {"setpin"};
+
+// -----------------------------------------------------------------------
+// Construction / destruction
+// -----------------------------------------------------------------------
+
+TACDriveThread::TACDriveThread(HashType hash)
+    : _hash(hash)
+{
+}
+
+TACDriveThread::~TACDriveThread() = default;
+
+// -----------------------------------------------------------------------
+// Factory
+// -----------------------------------------------------------------------
+
+TACDriveThread* TACDriveThread::openPort(const qtac::ByteArray& portName)
+{
+    // Concrete subclass headers are included by the concrete .cpp files.
+    // This factory performs the lookup only; callers link against the
+    // concrete implementations.
+    if (_AlpacaDevice::updateAlpacaDevices() == 0)
+        return nullptr;
+
+    AlpacaDevice alpacaDevice = _AlpacaDevice::findAlpacaDevice(portName);
+    if (!alpacaDevice || !alpacaDevice->active())
+        return nullptr;
+
+    // The concrete thread types are forward-declared here; their headers
+    // must be included by any translation unit that uses openPort().
+    // Return nullptr — the factory is intentionally left incomplete at
+    // this layer so each concrete subclass can register itself.
+    (void)alpacaDevice;
+    return nullptr;
+}
+
+// -----------------------------------------------------------------------
+// Hash accessor
+// -----------------------------------------------------------------------
+
+HashType TACDriveThread::hash()
+{
+    return _hash;
+}
+
+// -----------------------------------------------------------------------
+// Completion wait
+// -----------------------------------------------------------------------
+
+void TACDriveThread::waitForCompletion()
+{
+    constexpr int kTimeoutMs    = 5000; // 50 × 100 ms
+    constexpr int kPollIntervalMs = 100;
+
+    std::unique_lock<std::mutex> lock(_completionMutex);
+    const bool timedOut = !_completionCv.wait_for(
+        lock,
+        std::chrono::milliseconds(kTimeoutMs),
+        [this] { return !_waitForCompletion; });
+
+    if (timedOut)
+    {
+        writeLogLine("Wait for completion timed out.");
+        _waitForCompletion = false;
+    }
+}
+
+void TACDriveThread::setWaitForCompletion()
+{
+    std::lock_guard<std::mutex> lock(_completionMutex);
+    _waitForCompletion = true;
+}
+
+void TACDriveThread::clearWaitForCompletion()
+{
+    {
+        std::lock_guard<std::mutex> lock(_completionMutex);
+        _waitForCompletion = false;
+    }
+    _completionCv.notify_all();
+}
+
+bool TACDriveThread::waitForCompletionStatus() const
+{
+    return _waitForCompletion;
+}
+
+// -----------------------------------------------------------------------
+// decodeCommand
+//
+// Normalises a freeform command string into a canonical command + populates
+// the Arguments list with any trailing on/off/1/0 or numeric parameter.
+// -----------------------------------------------------------------------
+
+qtac::ByteArray TACDriveThread::decodeCommand(const qtac::ByteArray& command, Arguments& args)
+{
+    qtac::String result = qtac::String(command.toStdString()).toLower().trimmed();
+
+    if (result.endsWith(" on"))
+    {
+        args.push_back(true);
+        result = result.left(result.size() - 3);
+    }
+    else if (result.endsWith(" off"))
+    {
+        args.push_back(false);
+        result = result.left(result.size() - 4);
+    }
+    else if (result.endsWith(" 1"))
+    {
+        args.push_back(true);
+        result = result.left(result.size() - 2);
+    }
+    else if (result.endsWith(" 0"))
+    {
+        args.push_back(false);
+        result = result.left(result.size() - 2);
+    }
+
+    const qtac::String setNameLower    = qtac::String(kSetNameCommandStr.toStdString()).toLower();
+    const qtac::String btnAssertLower  = qtac::String(kSetButtonAssertTime.toStdString()).toLower();
+    const qtac::String pkDelayLower    = qtac::String(kSetPowerKeyDelay.toStdString()).toLower();
+
+    if (result.startsWith(setNameLower) || result.startsWith(qtac::String(kSetNameAliasStr.toStdString())))
+    {
+        if (result.startsWith(setNameLower))
+            result = result.mid(setNameLower.size());
+        else
+            result = result.mid(static_cast<int>(kSetNameAliasStr.size()));
+
+        result = result.trimmed();
+        args.push_back(result.toStdString());
+        result = qtac::String(kSetNameCommandStr.toStdString());
+    }
+    else if (result.startsWith(btnAssertLower) || result.startsWith(qtac::String(kSetButtonAssertAlias.toStdString())))
+    {
+        if (result.startsWith(btnAssertLower))
+            result = result.mid(btnAssertLower.size());
+        else
+            result = result.mid(static_cast<int>(kSetButtonAssertAlias.size()));
+
+        result = result.trimmed();
+        args.push_back(static_cast<uint32_t>(std::stoul(result.toStdString())));
+        result = qtac::String(kSetButtonAssertTime.toStdString());
+    }
+    else if (result.startsWith(pkDelayLower) || result.startsWith(qtac::String(kSetPowerKeyDelayAlias.toStdString())))
+    {
+        if (result.startsWith(pkDelayLower))
+            result = result.mid(pkDelayLower.size());
+        else
+            result = result.mid(static_cast<int>(kSetPowerKeyDelayAlias.size()));
+
+        result = result.trimmed();
+        args.push_back(static_cast<uint32_t>(std::stoul(result.toStdString())));
+        result = qtac::String(kSetPowerKeyDelay.toStdString());
+    }
+    else if (result.startsWith(qtac::String(kSetPinCommandLower.toStdString())))
+    {
+        result = result.mid(static_cast<int>(kSetPinCommandLower.size()));
+        result = result.trimmed();
+        args.push_back(static_cast<uint32_t>(std::stoul(result.toStdString())));
+        result = qtac::String(kSetPinCommandStr.toStdString());
+    }
+
+    return qtac::ByteArray(result.toStdString());
+}
+
+// -----------------------------------------------------------------------
+// checkLocalStore
+// -----------------------------------------------------------------------
+
+bool TACDriveThread::checkLocalStore(FramePackage& framePackage)
+{
+    switch (framePackage->requestHash)
+    {
+    case kVersionCommandHash:
+        if (!_versionString.isEmpty())
+        {
+            framePackage->responses.push_back(_versionString);
+            return true;
+        }
+        break;
+
+    case kGetNameCommandHash:
+        if (!_name.isEmpty())
+        {
+            framePackage->responses.push_back(_name);
+            return true;
+        }
+        break;
+
+    case kGetUUIDCommandHash:
+        if (!_uuid.isEmpty())
+        {
+            framePackage->responses.push_back(qtac::ByteArray(_uuid.toStdString()));
+            return true;
+        }
+        break;
+
+    case kGetPlatformIDCommandHash:
+        if (_platformID != MICRO_EPM_BOARD_ID_UNKNOWN)
+        {
+            const qtac::String desc = PlatformContainer::toString(_platformID);
+            std::ostringstream oss;
+            oss << desc.toStdString() << "(" << static_cast<int>(_platformID) << ")";
+            framePackage->responses.push_back(qtac::ByteArray(oss.str()));
+            return true;
+        }
+        break;
+
+    default:
+        break;
+    }
+
+    return false;
+}
+
+// -----------------------------------------------------------------------
+// Hardware-identity properties
+// -----------------------------------------------------------------------
+
+DebugBoardType TACDriveThread::debugBoardType()
+{
+    return _hardwareType;
+}
+
+qtac::String TACDriveThread::debugBoardTypeString()
+{
+    return debugBoardTypeToString(_hardwareType);
+}
+
+PlatformID TACDriveThread::platformID()
+{
+    return _platformID;
+}
+
+qtac::String TACDriveThread::hardwareVersionString()
+{
+    return PlatformContainer::toString(_platformID);
+}
+
+// -----------------------------------------------------------------------
+// Firmware properties
+// -----------------------------------------------------------------------
+
+bool TACDriveThread::oldFirmware()
+{
+    return _oldFirmware;
+}
+
+qtac::String TACDriveThread::firmwareVersion()
+{
+    return qtac::String(_firmwareString.toStdString());
+}
+
+unsigned int TACDriveThread::majorVersion()    { return _firmwareMajor;    }
+unsigned int TACDriveThread::chipVersion()     { return _firmwareChip;     }
+unsigned int TACDriveThread::minorVersion()    { return _firmwareMinor;    }
+unsigned int TACDriveThread::revisionVersion() { return _firmwareRevision; }
+
+// -----------------------------------------------------------------------
+// Name / port
+// -----------------------------------------------------------------------
+
+qtac::ByteArray TACDriveThread::name() const    { return _name;     }
+qtac::ByteArray TACDriveThread::portName() const { return _portName; }
+
+void TACDriveThread::setName(const qtac::ByteArray& newName)   { _name = newName;   }
+void TACDriveThread::setPortName(const qtac::ByteArray& p)     { _portName = p;     }
+
+qtac::String TACDriveThread::description() const               { return _description; }
+void TACDriveThread::setDescription(const qtac::String& d)     { _description = d;   }
+
+qtac::String TACDriveThread::serialNumber() const              { return _serialNumber; }
+void TACDriveThread::setSerialNumber(const qtac::String& sn)   { _serialNumber = sn;  }
+
+qtac::String    TACDriveThread::uuid()       { return _uuid;       }
+qtac::ByteArray TACDriveThread::macAddress() { return _macAddress; }
+
+void TACDriveThread::setThreadDelay(unsigned int delay)
+{
+    _delay = delay;
+}
+
+// -----------------------------------------------------------------------
+// Logging
+// -----------------------------------------------------------------------
+
+void TACDriveThread::writeLogLine(const qtac::ByteArray& line)
+{
+    if (onLogLine)
+        onLogLine(line);
+}
+
+void TACDriveThread::log(FramePackage& framePackage)
+{
+    writeLogLine("");
+    writeLogLine("Frame Package Start");
+    writeLogLine(framePackage->valid ? "Frame Valid" : "Frame Invalid");
+
+    if (framePackage->delayInMilliSeconds > 0)
+    {
+        std::ostringstream oss;
+        oss << " Delay " << framePackage->delayInMilliSeconds << " in msecs";
+        const qtac::ByteArray entry(oss.str().c_str());
+        timeStampLogMessage(qtac::String(oss.str()));
+        writeLogLine(entry);
+    }
+    else if (!framePackage->comment.isEmpty())
+    {
+        writeLogLine(framePackage->comment);
+    }
+    else
+    {
+        qtac::ByteArray entry;
+        if (framePackage->console)
+            entry = "Request from console: " + framePackage->request;
+        else
+            entry = "Request: " + framePackage->request;
+        writeLogLine(entry);
+
+        if (!framePackage->synonym.isEmpty())
+            writeLogLine("Synonym: " + framePackage->synonym);
+
+        writeLogLine("Responses");
+        for (const auto& r : framePackage->responses)
+            writeLogLine("   " + r);
+    }
+
+    writeLogLine("Frame Package End");
+    writeLogLine("");
+}
+
+void TACDriveThread::timeStampLogMessage(const qtac::String& timeStampMe)
+{
+    static uint64_t lastTimeStamp{0};
+
+    if (lastTimeStamp == 0)
+        lastTimeStamp = tickCount();
+
+    const uint64_t current = tickCount();
+
+    std::ostringstream oss;
+    oss << timeStampMe.toStdString()
+        << "Time: " << current
+        << " elapsed: " << (current - lastTimeStamp) << " (ms)";
+    writeLogLine(qtac::ByteArray(oss.str().c_str()));
+
+    lastTimeStamp = current;
+}
+
+} // namespace qtac
diff --git a/source/library/src/TACLiteCoder.cpp b/source/library/src/TACLiteCoder.cpp
new file mode 100644
index 00000000..ea3eb118
--- /dev/null
+++ b/source/library/src/TACLiteCoder.cpp
@@ -0,0 +1,72 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Michael Simpson
+
+#include <qtac/TACLiteCoder.h>
+#include <qtac/TACCommandHashes.h>
+
+#include <string>
+
+namespace qtac {
+
+TACLiteCoder::TACLiteCoder()  = default;
+TACLiteCoder::~TACLiteCoder() = default;
+
+void TACLiteCoder::reset()
+{
+    FrameCoder::reset();
+}
+
+void TACLiteCoder::decode(const qtac::ByteArray& /*decodeMe*/)
+{
+    // FTDI hardware is write-only for pin control — nothing to decode.
+}
+
+qtac::ByteArray TACLiteCoder::encode(const qtac::ByteArray& encodeMe, const Arguments& arguments)
+{
+    // The only command with a meaningful encode is SetPin:
+    // arguments[1] holds the bus index (0-31) computed by getSetPinIndex().
+    // We write it as a string so the run() loop can parse it with stoi() and
+    // pass it directly to _FTDIChipset::write(pin, state).
+    if (arrayHash(encodeMe) == kSetPinCommandHash)
+    {
+        if (arguments.size() >= 2)
+        {
+            const uint32_t pin = arguments.at(1).asUInt32();
+            return qtac::ByteArray(std::to_string(pin));
+        }
+    }
+    return qtac::ByteArray("Invalid");
+}
+
+} // namespace qtac
diff --git a/source/library/src/TACLiteCommand.cpp b/source/library/src/TACLiteCommand.cpp
new file mode 100644
index 00000000..222efe73
--- /dev/null
+++ b/source/library/src/TACLiteCommand.cpp
@@ -0,0 +1,276 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Michael Simpson
+
+#include <qtac/TACLiteCommand.h>
+#include <qtac/ReceiveInterface.h>
+#include <qtac/SendInterface.h>
+
+// Command string constants (mirrors TACCommands.h)
+static const qtac::ByteArray kVersionCommand               {"Version"};
+static const qtac::ByteArray kGetNameCommand               {"Get Name"};
+static const qtac::ByteArray kSetNameCommand               {"Set Name"};
+static const qtac::ByteArray kGetUUIDCommand               {"Get UUID"};
+static const qtac::ByteArray kGetPlatformIDCommand         {"Get Platform ID"};
+static const qtac::ByteArray kGetResetCountCommand         {"Get Reset Count"};
+static const qtac::ByteArray kClearResetCountCommand       {"Clear Reset Count"};
+static const qtac::ByteArray kSetPinCommand                {"SetPin"};
+static const qtac::ByteArray kSetBatteryCommand            {"Battery"};
+static const qtac::ByteArray kSetUSB0Command               {"USB0"};
+static const qtac::ByteArray kSetUSB1Command               {"USB1"};
+static const qtac::ByteArray kSetPowerKeyCommand           {"Power Key"};
+static const qtac::ByteArray kSetVolumeUpCommand           {"Volume Up"};
+static const qtac::ByteArray kSetVolumeDownCommand         {"Volume Down"};
+static const qtac::ByteArray kSetExternalPowerControlCommand {"External Power Control"};
+static const qtac::ByteArray kSetDisconnectUIM1Command     {"Disconnect UIM1"};
+static const qtac::ByteArray kSetDisconnectUIM2Command     {"Disconnect UIM2"};
+static const qtac::ByteArray kSetForcePSHoldHighCommand    {"Force PS Hold High"};
+static const qtac::ByteArray kSetDisconnectSDCardCommand   {"Disconnect SDCARD"};
+static const qtac::ByteArray kSetPrimaryEDLCommand         {"Primary EDL"};
+static const qtac::ByteArray kSetSecondaryEDLCommand       {"Secondary EDL"};
+static const qtac::ByteArray kSecondaryPM_RESIN_NCommand   {"Secondary PM RESIN N"};
+static const qtac::ByteArray kSetEUDCommand                {"EUD"};
+static const qtac::ByteArray kSetHeadsetDisconnectCommand  {"Headset Disconnect"};
+static const qtac::ByteArray kI2CReadRegisterCommand       {"I2C Read Register"};
+static const qtac::ByteArray kI2CWriteRegisterCommand      {"I2C Write Register"};
+
+namespace qtac {
+
+TACLiteCommand::TACLiteCommand(SendInterface* sender, ReceiveInterface* receiver)
+    : _receiver(receiver)
+    , _sender(sender)
+    , _ready(sender->ready())
+{
+}
+
+TACLiteCommand::~TACLiteCommand()
+{
+    addEndTransaction();
+}
+
+void TACLiteCommand::version()
+{
+    send(kVersionCommand, Arguments(), false);
+}
+
+void TACLiteCommand::name()
+{
+    send(kGetNameCommand, Arguments(), false);
+}
+
+void TACLiteCommand::uuid()
+{
+    send(kGetUUIDCommand, Arguments(), false, false);
+}
+
+void TACLiteCommand::setPinState(uint16_t pin, bool state)
+{
+    Arguments args;
+    args.push_back(state);
+    args.push_back(static_cast<uint32_t>(pin));
+    send(kSetPinCommand, args, false, false);
+}
+
+void TACLiteCommand::battery(bool state)
+{
+    Arguments args;
+    args.push_back(state);
+    send(kSetBatteryCommand, args, false, false);
+}
+
+void TACLiteCommand::usb0(bool state)
+{
+    Arguments args;
+    args.push_back(state);
+    send(kSetUSB0Command, args, false);
+}
+
+void TACLiteCommand::usb1(bool state)
+{
+    Arguments args;
+    args.push_back(state);
+    send(kSetUSB1Command, args, false);
+}
+
+void TACLiteCommand::externalPowerControl(bool state)
+{
+    Arguments args;
+    args.push_back(state);
+    send(kSetExternalPowerControlCommand, args, false);
+}
+
+void TACLiteCommand::powerKey(bool state)
+{
+    Arguments args;
+    args.push_back(state);
+    send(kSetPowerKeyCommand, args, false);
+}
+
+void TACLiteCommand::volumeUp(bool state)
+{
+    Arguments args;
+    args.push_back(state);
+    send(kSetVolumeUpCommand, args, false);
+}
+
+void TACLiteCommand::volumeDown(bool state)
+{
+    Arguments args;
+    args.push_back(state);
+    send(kSetVolumeDownCommand, args, false);
+}
+
+void TACLiteCommand::setName(const qtac::ByteArray& newName)
+{
+    Arguments args;
+    args.push_back(newName.toStdString());
+    send(kSetNameCommand, args, false);
+}
+
+void TACLiteCommand::getResetCount()
+{
+    send(kGetResetCountCommand, Arguments(), false);
+}
+
+void TACLiteCommand::clearResetCount()
+{
+    send(kClearResetCountCommand, Arguments(), false);
+}
+
+void TACLiteCommand::i2CReadRegister(uint32_t addr, uint32_t reg)
+{
+    Arguments args;
+    args.push_back(addr);
+    args.push_back(reg);
+    send(kI2CReadRegisterCommand, args, false);
+}
+
+void TACLiteCommand::i2CWriteRegister(uint32_t addr, uint32_t reg, uint32_t data)
+{
+    Arguments args;
+    args.push_back(addr);
+    args.push_back(reg);
+    args.push_back(data);
+    send(kI2CWriteRegisterCommand, args, false);
+}
+
+void TACLiteCommand::send(const qtac::ByteArray& command, const Arguments& arguments,
+                           bool console, bool store)
+{
+    _sender->send(command, arguments, console, _receiver, store);
+}
+
+void TACLiteCommand::addDelay(uint32_t delayInMilliSeconds)
+{
+    _sender->addDelay(delayInMilliSeconds, _receiver);
+}
+
+void TACLiteCommand::addLogComment(const qtac::ByteArray& comment)
+{
+    _sender->addLogComment(comment);
+}
+
+void TACLiteCommand::addEndTransaction()
+{
+    _sender->addEndTransaction(_receiver);
+}
+
+void TACLiteCommand::disconnectUIM1Button(bool state)
+{
+    Arguments args;
+    args.push_back(state);
+    send(kSetDisconnectUIM1Command, args, false);
+}
+
+void TACLiteCommand::disconnectUIM2Button(bool state)
+{
+    Arguments args;
+    args.push_back(state);
+    send(kSetDisconnectUIM2Command, args, false);
+}
+
+void TACLiteCommand::forcePSHoldHigh(bool state)
+{
+    Arguments args;
+    args.push_back(state);
+    send(kSetForcePSHoldHighCommand, args, false);
+}
+
+void TACLiteCommand::disconnectSDCard(bool state)
+{
+    Arguments args;
+    args.push_back(state);
+    send(kSetDisconnectSDCardCommand, args, false);
+}
+
+void TACLiteCommand::primaryEDL(bool state)
+{
+    Arguments args;
+    args.push_back(state);
+    send(kSetPrimaryEDLCommand, args, false);
+}
+
+void TACLiteCommand::secondaryEDL(bool state)
+{
+    Arguments args;
+    args.push_back(state);
+    send(kSetSecondaryEDLCommand, args, false);
+}
+
+void TACLiteCommand::secondaryPMResinN(bool state)
+{
+    Arguments args;
+    args.push_back(state);
+    send(kSecondaryPM_RESIN_NCommand, args, false);
+}
+
+void TACLiteCommand::eud(bool state)
+{
+    Arguments args;
+    args.push_back(state);
+    send(kSetEUDCommand, args, false);
+}
+
+void TACLiteCommand::platformID()
+{
+    send(kGetPlatformIDCommand, Arguments(), false);
+}
+
+void TACLiteCommand::headsetDisconnect(bool state)
+{
+    Arguments args;
+    args.push_back(state);
+    send(kSetHeadsetDisconnectCommand, args, false);
+}
+
+} // namespace qtac
diff --git a/source/library/src/TACLiteDriveThread.cpp b/source/library/src/TACLiteDriveThread.cpp
new file mode 100644
index 00000000..cd20da4d
--- /dev/null
+++ b/source/library/src/TACLiteDriveThread.cpp
@@ -0,0 +1,493 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+
+#include <qtac/TACLiteDriveThread.h>
+#include <qtac/TACLiteCommand.h>
+#include <qtac/AlpacaDevice.h>
+#include <qtac/TACCommandHashes.h>
+#include <qtac/FTDIChipset.h>
+#include <qtac/PlatformID.h>
+
+#include <sstream>
+#include <thread>
+
+static const qtac::ByteArray kTACLiteDriveTrainName{"TAC Lite Drive Train"};
+static const qtac::ByteArray kHelpCommand{"Help"};
+
+namespace qtac {
+
+// -----------------------------------------------------------------------
+// Construction
+// -----------------------------------------------------------------------
+
+TACLiteDriveThread::TACLiteDriveThread(HashType hash)
+    : TACDriveThread(hash)
+{
+    _driveTrainName = kTACLiteDriveTrainName;
+    setProtocolInterface(&_tacProtocol);
+    _tacProtocol.setTACDriveTrain(this);
+
+    AlpacaDevice alpacaDevice = _AlpacaDevice::findAlpacaDevice(hash);
+    if (!alpacaDevice || !alpacaDevice->active())
+        return;
+
+    _ftdiChipset = _FTDIChipset::getDevice(alpacaDevice->portName());
+    if (!_ftdiChipset)
+        return;
+
+    _portName        = _ftdiChipset->portName();
+    _platformID      = _ftdiChipset->platformID();
+    _name            = _ftdiChipset->serialNumber();
+    _versionString   = qtac::ByteArray(_ftdiChipset->versionString().toStdString());
+    _firmwareString  = qtac::ByteArray(_ftdiChipset->firmwareString().toStdString());
+    _firmwareMajor   = 1;
+    _firmwareChip    = 10000;
+    _firmwareMinor   = 1;
+    _firmwareRevision = 1;
+    _description     = "VTP Port";
+    _uuid            = "FTDI - No UUID";
+    _hardwareType    = _ftdiChipset->boardType();
+
+    setSerialNumber(_ftdiChipset->serialNumber().toStdString());
+    setPortName(_ftdiChipset->portName());
+
+    // Wire signals so _AlpacaDevice is notified of disconnect / progress.
+    onDeviceDisconnected.connect([alpacaDevice]() {
+        alpacaDevice->onDeviceDisconnect();
+    });
+    onProgress.connect([alpacaDevice](uint8_t value, NotificationLevel /*level*/) {
+        if (alpacaDevice->onProgress)
+            alpacaDevice->onProgress(value, 1 /*eInfoNotification*/);
+    });
+}
+
+TACLiteDriveThread::~TACLiteDriveThread() = default;
+
+// -----------------------------------------------------------------------
+// FTDI device open
+// -----------------------------------------------------------------------
+
+bool TACLiteDriveThread::openFTDIDevice()
+{
+    if (!_ftdiChipset)
+    {
+        writeLogLine("TACLiteDriveThread::openFTDIDevice _ftdiChipset is null");
+        if (onErrorOnOpen) onErrorOnOpen(qtac::ByteArray("FTDI device open failed. Check the application log"));
+        return false;
+    }
+
+    if (_ftdiChipset->isOpen())
+    {
+        writeLogLine("TACLiteDriveThread::openFTDIDevice already open");
+        if (onErrorOnOpen) onErrorOnOpen(qtac::ByteArray("FTDI device open failed. Check the application log"));
+        return false;
+    }
+
+    if (!_ftdiChipset->open(_pinsets))
+    {
+        writeLogLine("TACLiteDriveThread::openFTDIDevice open(pinsets) failed");
+        if (onErrorOnOpen) onErrorOnOpen(qtac::ByteArray("FTDI device open failed. Check the application log"));
+        return false;
+    }
+
+    std::ostringstream oss;
+    oss << "Opened port " << _ftdiChipset->portName().toStdString() << "\n";
+    writeLogLine(oss.str());
+    return true;
+}
+
+// -----------------------------------------------------------------------
+// Public command methods
+// -----------------------------------------------------------------------
+
+void TACLiteDriveThread::externalPowerControl(bool state)
+{
+    {
+        TACLiteCommand cmd(this, this);
+        cmd.externalPowerControl(state);
+    }
+    waitForCompletion();
+}
+
+void TACLiteDriveThread::setPinState(uint64_t pin, bool state)
+{
+    {
+        TACLiteCommand cmd(this, this);
+        cmd.setPinState(static_cast<uint16_t>(pin), state);
+    }
+    waitForCompletion();
+}
+
+void TACLiteDriveThread::sendCommandSequence(CommandEntries& commandEntries)
+{
+    {
+        TACLiteCommand cmd(this, this);
+
+        for (const auto& entry : commandEntries)
+        {
+            switch (entry->_commandAction)
+            {
+            case _CommandEntry::eNotSet:
+                break;
+            case _CommandEntry::eSetPin:
+                cmd.setPinState(static_cast<uint16_t>(entry->_pinID),
+                                entry->_arguement.toBool());
+                break;
+            case _CommandEntry::eLog:
+                cmd.addLogComment(qtac::ByteArray(entry->_arguement.toString().toStdString()));
+                break;
+            case _CommandEntry::eDelay:
+                cmd.addDelay(entry->_arguement.toUInt());
+                break;
+            case _CommandEntry::eBaseCommand:
+                break;
+            }
+
+            if (onProgress) onProgress(0 /*kProgressActive*/, NotificationLevel::Info);
+        }
+    }
+    waitForCompletion();
+}
+
+int  TACLiteDriveThread::getResetCount()  { return 0; }
+void TACLiteDriveThread::clearResetCount() {}
+
+void TACLiteDriveThread::i2CReadRegister(uint32_t /*addr*/, uint32_t /*reg*/)   {}
+void TACLiteDriveThread::i2CWriteRegister(uint32_t /*addr*/, uint32_t /*reg*/, uint32_t /*data*/) {}
+
+void TACLiteDriveThread::setName(const qtac::ByteArray& /*newName*/)
+{
+    // FTDI hardware does not support rename.
+}
+
+uint32_t TACLiteDriveThread::send(const qtac::ByteArray& sendMe,
+                                   const Arguments& arguments,
+                                   bool console,
+                                   ReceiveInterface* receiveInterface,
+                                   bool store)
+{
+    return _tacProtocol.sendCommand(sendMe, arguments, console, receiveInterface, store);
+}
+
+bool TACLiteDriveThread::ready()
+{
+    return _tacProtocol.queueSize() == 0;
+}
+
+// -----------------------------------------------------------------------
+// receive — called back by TACLiteProtocol (and directly from run())
+// -----------------------------------------------------------------------
+
+void TACLiteDriveThread::receive(FramePackage& framePackage)
+{
+    if (framePackage->endTransaction)
+    {
+        clearWaitForCompletion();
+        if (onTransactionEnded) onTransactionEnded();
+        if (onProgress)         onProgress(100 /*kProgressMax*/, NotificationLevel::Info);
+    }
+    else if (framePackage->valid)
+    {
+        switch (framePackage->requestHash)
+        {
+        case kVersionCommandHash:     handleVersionResponse(framePackage); break;
+        case kGetPlatformIDCommandHash: handlePlatformID(framePackage);    break;
+        case kGetUUIDCommandHash:     handleUUIDResponse(framePackage);    break;
+        case kSetNameCommandHash:     handleSetName(framePackage);         break;
+        case kSetPinCommandHash:      handleSetPin(framePackage);          break;
+        default: break;
+        }
+    }
+    else
+    {
+        clearWaitForCompletion();
+        if (!framePackage->lastError.isEmpty() && onErrorOnOpen)
+            onErrorOnOpen(framePackage->lastError);
+    }
+
+    log(framePackage);
+    _protocolInterface->clearPendingFrame();
+}
+
+// -----------------------------------------------------------------------
+// run() — drive thread main loop
+// -----------------------------------------------------------------------
+
+void TACLiteDriveThread::run()
+{
+    writeLogLine("TACLiteDriveThread::run()");
+
+    if (openFTDIDevice())
+    {
+        writeLogLine("TACLiteDriveThread::run() openFTDIDevice() == true");
+        if (onDeviceOpen) onDeviceOpen();
+        startRunning();
+    }
+
+    if (weAreRunning())
+    {
+        if (onHardwareTypeUpdate)   onHardwareTypeUpdate(_versionString.toStdString());
+        if (onHardwareVersionUpdate) onHardwareVersionUpdate("0.1.1");
+        if (onFirmwareVersionUpdate) onFirmwareVersionUpdate(_firmwareString.toStdString());
+        if (onNameUpdate)           onNameUpdate(_name.toStdString());
+        if (onUuidUpdate)           onUuidUpdate(_uuid.toStdString());
+        if (onSerialNumUpdate)      onSerialNumUpdate(_serialNumber.toStdString());
+        if (onPlatformIDUpdate)     onPlatformIDUpdate(static_cast<int>(_platformID));
+
+        if (onDeviceOpen)         onDeviceOpen();
+        if (onDeviceStatusChange) onDeviceStatusChange("Starting");
+
+        writeLogLine("setupConnected()");
+        setupConnected();
+    }
+    else
+    {
+        writeLogLine("TACLiteDriveThread::run() deviceDisconnected");
+        if (onDeviceDisconnected) onDeviceDisconnected();
+    }
+
+    {
+        std::ostringstream oss;
+        oss << "Hardware: " << static_cast<int>(_hardwareType) << "\n";
+        writeLogLine(oss.str());
+    }
+    {
+        const qtac::String pidStr = PlatformContainer::toString(_platformID);
+        std::ostringstream oss;
+        oss << "Platform ID: " << pidStr.toStdString()
+            << "(" << static_cast<int>(_platformID) << ")\n";
+        writeLogLine(oss.str());
+    }
+
+    if (weAreRunning())
+    {
+        writeLogLine("TACLiteDriveThread::run() starting loop");
+        bool loopFinished = false;
+
+        while (!loopFinished)
+        {
+            FramePackage framePackage = _protocolInterface->getNextFramePackage();
+
+            if (framePackage)
+            {
+                if (framePackage->delayInMilliSeconds != 0 ||
+                    !framePackage->comment.isEmpty()      ||
+                    framePackage->endTransaction          ||
+                    checkLocalStore(framePackage))
+                {
+                    receive(framePackage);
+                }
+                else
+                {
+                    // Parse the encoded pin index string from codedRequest.
+                    int pin = 0;
+                    try { pin = std::stoi(framePackage->codedRequest.toStdString()); }
+                    catch (...) {}
+
+                    const bool state = getElectricalPinValue(framePackage->requestHash,
+                                                             framePackage->arguments);
+
+                    {
+                        std::ostringstream oss;
+                        oss << "TACLiteDriveThread::run() write "
+                            << framePackage->codedRequest.toStdString()
+                            << " state:" << (state ? "on" : "off");
+                        writeLogLine(oss.str());
+                    }
+
+                    if (!_ftdiChipset)
+                    {
+                        writeLogLine("TACLiteDriveThread::run() ftdiChipSet is null.");
+                        stopRunning();
+                    }
+                    else if (!_ftdiChipset->write(pin, state))
+                    {
+                        std::ostringstream oss;
+                        oss << "TACLiteDriveThread::run() write failure pin " << pin;
+                        writeLogLine(oss.str());
+                        stopRunning();
+                    }
+                    else
+                    {
+                        // Build response string from the first argument.
+                        std::string argStr;
+                        if (!framePackage->arguments.empty())
+                        {
+                            const Argument& arg = framePackage->arguments.at(0);
+                            if (arg.kind() == Argument::Kind::Bool)
+                                argStr = arg.asBool() ? "on" : "off";
+                            else if (arg.kind() == Argument::Kind::UInt32)
+                                argStr = std::to_string(arg.asUInt32());
+                            else
+                                argStr = arg.asString();
+                        }
+                        framePackage->responses.push_back(framePackage->request + " " + argStr.c_str());
+                        receive(framePackage);
+                    }
+                }
+            }
+            else
+            {
+                if (!weAreRunning())
+                {
+                    writeLogLine("TACLiteDriveThread::run() loopFinished == true\n");
+                    loopFinished = true;
+                }
+                else
+                {
+                    std::this_thread::sleep_for(std::chrono::milliseconds(100));
+                }
+            }
+        }
+    }
+
+    writeLogLine("TACLiteDriveThread::run() _ftdiChipset->close()");
+    if (_ftdiChipset)
+        _ftdiChipset->close();
+
+    _connected = false;
+    if (onDeviceDisconnected) onDeviceDisconnected();
+}
+
+// -----------------------------------------------------------------------
+// sendCommand
+// -----------------------------------------------------------------------
+
+void TACLiteDriveThread::sendCommand(const qtac::ByteArray& command,
+                                      bool console,
+                                      ReceiveInterface* receiveInterface,
+                                      bool shouldStore)
+{
+    if (!command.startsWith(kHelpCommand))
+    {
+        Arguments args;
+        qtac::ByteArray decoded = decodeCommand(command, args);
+        send(decoded.toStdString(), args, console, receiveInterface, shouldStore);
+    }
+}
+
+// -----------------------------------------------------------------------
+// Helpers
+// -----------------------------------------------------------------------
+
+bool TACLiteDriveThread::getElectricalPinValue(HashType commandHash,
+                                                const Arguments& arguments)
+{
+    if (commandHash == kSetPinCommandHash && !arguments.empty())
+        return arguments.at(0).asBool();
+    return false;
+}
+
+qtac::String TACLiteDriveThread::portDescription()
+{
+    return _description;
+}
+
+// -----------------------------------------------------------------------
+// Frame handlers
+// -----------------------------------------------------------------------
+
+void TACLiteDriveThread::handleSetName(FramePackage& framePackage)
+{
+    if (!framePackage->arguments.empty())
+    {
+        const Argument& arg = framePackage->arguments.at(0);
+        _name = qtac::ByteArray(arg.asString());
+        framePackage->synonym = qtac::ByteArray("Set Name ") + _name;
+    }
+    if (onNameUpdate) onNameUpdate(_name.toStdString());
+}
+
+void TACLiteDriveThread::handleSetPin(FramePackage& framePackage)
+{
+    uint64_t pin   = 0;
+    bool     state = false;
+
+    if (framePackage->arguments.size() >= 1)
+        state = framePackage->arguments.at(0).asBool();
+    if (framePackage->arguments.size() >= 2)
+        pin   = static_cast<uint64_t>(framePackage->arguments.at(1).asUInt32());
+
+    framePackage->synonym = qtac::ByteArray("Set Pin ") + std::to_string(pin).c_str() + " " + (state ? "on" : "off");
+    if (onPinStateChanged) onPinStateChanged(pin, state);
+}
+
+void TACLiteDriveThread::handleUUIDResponse(FramePackage& framePackage)
+{
+    if (framePackage->responses.size() > 1)
+    {
+        _uuid = framePackage->responses.at(1).toStdString();
+        if (onUuidUpdate) onUuidUpdate(_uuid.toStdString());
+    }
+}
+
+void TACLiteDriveThread::handleVersionResponse(FramePackage& /*framePackage*/)
+{
+    if (onDeviceStatusChange) onDeviceStatusChange("TAC Version Good");
+    setupConnected();
+}
+
+void TACLiteDriveThread::handlePlatformID(FramePackage& framePackage)
+{
+    if (framePackage->responses.size() >= 2)
+    {
+        try
+        {
+            _platformID = static_cast<PlatformID>(std::stoi(framePackage->responses.at(1).toStdString()));
+        }
+        catch (...) {}
+    }
+    if (onPlatformIDUpdate) onPlatformIDUpdate(static_cast<int>(_platformID));
+    setupConnected();
+}
+
+// -----------------------------------------------------------------------
+// Setup callbacks
+// -----------------------------------------------------------------------
+
+void TACLiteDriveThread::setupConnected()
+{
+    if (!_connected)
+    {
+        _connected = true;
+        if (onDeviceConnected) onDeviceConnected();
+    }
+}
+
+void TACLiteDriveThread::setupDiscovery()
+{
+    // Nothing to do for FTDI.
+}
+
+} // namespace qtac
diff --git a/source/library/src/TACLiteProtocol.cpp b/source/library/src/TACLiteProtocol.cpp
new file mode 100644
index 00000000..815230d4
--- /dev/null
+++ b/source/library/src/TACLiteProtocol.cpp
@@ -0,0 +1,126 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Michael Simpson
+
+#include <qtac/TACLiteProtocol.h>
+#include <qtac/TACLiteCoder.h>
+#include <qtac/TACDriveThread.h>
+#include <qtac/StringUtilities.h>
+
+#include <chrono>
+#include <cassert>
+
+namespace qtac {
+
+static uint64_t tickCount()
+{
+    using namespace std::chrono;
+    return static_cast<uint64_t>(
+        duration_cast<milliseconds>(steady_clock::now().time_since_epoch()).count());
+}
+
+TACLiteProtocol::TACLiteProtocol()
+{
+    setFrameCoder(new TACLiteCoder);
+}
+
+TACLiteProtocol::~TACLiteProtocol()
+{
+    delete _frameCoder;
+    _frameCoder = nullptr;
+}
+
+void TACLiteProtocol::setTACDriveTrain(TACDriveThread* tacDriveTrain)
+{
+    assert(tacDriveTrain != nullptr);
+    _tacDriveTrain = tacDriveTrain;
+}
+
+uint32_t TACLiteProtocol::sendCommand(const qtac::ByteArray& command,
+                                       const Arguments& arguments,
+                                       bool console,
+                                       ReceiveInterface* receiveInterface,
+                                       bool shouldStore)
+{
+    if (command.isEmpty())
+        return kBadQueueValue;
+
+    const uint32_t result = getNextSendID();
+
+    FramePackage framePackage = makeFramePackage();
+    framePackage->packetID         = result;
+    framePackage->request          = command;
+    framePackage->arguments        = arguments;
+    framePackage->requestHash      = arrayHash(command);
+    framePackage->console          = console;
+    framePackage->shouldStore      = shouldStore;
+    framePackage->tickcount        = tickCount();
+    framePackage->receiveInterface = receiveInterface;
+
+    if (_frameCoder)
+        framePackage->codedRequest = _frameCoder->encode(command, arguments);
+    else
+        framePackage->codedRequest = command;
+
+    ProtocolInterface::queueCommand(framePackage);
+    return result;
+}
+
+void TACLiteProtocol::endTransaction(ReceiveInterface* receiveInterface)
+{
+    ProtocolInterface::queueEndTransaction(receiveInterface);
+}
+
+void TACLiteProtocol::sendHelpCommand()
+{
+}
+
+void TACLiteProtocol::receive(FramePackage& framePackage)
+{
+    _tacDriveTrain->receive(framePackage);
+}
+
+void TACLiteProtocol::idle()
+{
+}
+
+void TACLiteProtocol::frameComplete(const qtac::ByteArray& /*completedFrame*/)
+{
+    clearPendingFrame();
+}
+
+void TACLiteProtocol::badFrame(const qtac::ByteArray& /*completedFrame*/)
+{
+}
+
+} // namespace qtac
diff --git a/source/library/src/TACPIC32CXCoder.cpp b/source/library/src/TACPIC32CXCoder.cpp
new file mode 100644
index 00000000..cb945fd7
--- /dev/null
+++ b/source/library/src/TACPIC32CXCoder.cpp
@@ -0,0 +1,155 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Biswajit Roy
+
+#include <qtac/TACPIC32CXCoder.h>
+#include <qtac/TACCommandHashes.h>
+#include <qtac/StringUtilities.h>
+
+
+// PIC32CX firmware prompt / error strings.
+static const qtac::ByteArray kPIC32CXCommandError          {"Error!!! port >"};
+static const qtac::ByteArray kPIC32CXCommandNotRecognized  {"*** Command Processor: unknown command. ***"};
+
+namespace qtac {
+
+TACPIC32CXCoder::TACPIC32CXCoder()  = default;
+TACPIC32CXCoder::~TACPIC32CXCoder() = default;
+
+void TACPIC32CXCoder::reset()
+{
+    _receiveBuffer.clear();
+    FrameCoder::reset();
+}
+
+// -----------------------------------------------------------------------
+// decode
+//
+// Mirrors the original Qt logic:
+//   • If the buffer starts with the error prompt or contains "unknown command"
+//     → send empty sentinel immediately (bad frame).
+//   • Else if the buffer exceeds kValidPIC32CXResponseSize
+//     → split on \r\n, deliver frames[1] as the response line, then send
+//       the empty sentinel to commit.
+//   • Otherwise → send empty sentinel (no data yet / ignore).
+// In all cases the receive buffer is cleared afterward.
+// -----------------------------------------------------------------------
+void TACPIC32CXCoder::decode(const qtac::ByteArray& decodeMe)
+{
+    _receiveBuffer += decodeMe;
+
+    if (_receiveBuffer.startsWith(kPIC32CXCommandError) ||
+        _receiveBuffer.contains(kPIC32CXCommandNotRecognized))
+    {
+        if (_frameFunction)
+            _frameFunction(qtac::ByteArray(), _protocolInterface);
+        _receiveBuffer.clear();
+        return;
+    }
+
+    if (static_cast<size_t>(_receiveBuffer.size()) > kValidPIC32CXResponseSize)
+    {
+        // Split on \r\n, skip empty tokens — mirrors Qt::SkipEmptyParts.
+        static const qtac::ByteArray kDelimiter{"\r\n"};
+        std::vector<qtac::ByteArray> frames;
+        {
+            const std::string buf   = _receiveBuffer.toStdString();
+            const std::string delim = kDelimiter.toStdString();
+            std::string::size_type start = 0;
+            while (start < buf.size())
+            {
+                auto end = buf.find(delim, start);
+                if (end == std::string::npos)
+                {
+                    const std::string tok = buf.substr(start);
+                    if (!tok.empty()) frames.push_back(qtac::ByteArray(tok));
+                    break;
+                }
+                const std::string tok = buf.substr(start, end - start);
+                if (!tok.empty()) frames.push_back(qtac::ByteArray(tok));
+                start = end + delim.size();
+            }
+        }
+
+        // Deliver frames[1] (index 1) if it exists, matching original `frames[1].toLatin1()`.
+        if (frames.size() > 1 && _frameFunction)
+            _frameFunction(frames[1], _protocolInterface);
+
+        if (_frameFunction)
+            _frameFunction(qtac::ByteArray(), _protocolInterface);
+
+        _receiveBuffer.clear();
+        return;
+    }
+
+    // Buffer not yet complete — send empty sentinel and clear.
+    if (_frameFunction)
+        _frameFunction(qtac::ByteArray(), _protocolInterface);
+    _receiveBuffer.clear();
+}
+
+// -----------------------------------------------------------------------
+// encode
+//
+// Only kPIC32CXSetPinCommandHash has a special encoding:
+//   CONF:DIG:ON <1|0> (@<pin>)
+// where the pin string is zero-padded to at least 3 chars to handle
+// "port 0" pins (original: prepend '0' if size < 3).
+// All other commands get a trailing '\n'.
+// -----------------------------------------------------------------------
+qtac::ByteArray TACPIC32CXCoder::encode(const qtac::ByteArray& encodeMe, const Arguments& arguments)
+{
+    qtac::ByteArray result = encodeMe;
+
+    if (arrayHash(encodeMe) == kPIC32CXSetPinCommandHash)
+    {
+        if (arguments.size() == 2)
+        {
+            std::string pinStr = std::to_string(arguments.at(1).asUInt32());
+
+            // Zero-pad to at least 3 digits (matches original firmware expectation).
+            while (pinStr.size() < 3)
+                pinStr = "0" + pinStr;
+
+            const qtac::ByteArray stateStr = argumentToBoolString(arguments.at(0));
+            result = encodeMe + " " + stateStr + " (@" + pinStr.c_str() + ")";
+        }
+    }
+
+    if (result.isEmpty() || result[result.size() - 1] != '\n')
+        result += '\n';
+
+    return result;
+}
+
+} // namespace qtac
diff --git a/source/library/src/TACPIC32CXCommand.cpp b/source/library/src/TACPIC32CXCommand.cpp
new file mode 100644
index 00000000..ad800a19
--- /dev/null
+++ b/source/library/src/TACPIC32CXCommand.cpp
@@ -0,0 +1,128 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Biswajit Roy
+
+#include <qtac/TACPIC32CXCommand.h>
+#include <qtac/ReceiveInterface.h>
+#include <qtac/SendInterface.h>
+
+#include <cassert>
+
+// PIC32CX command string constants
+static const qtac::ByteArray kVersionCommand              {"Version"};
+static const qtac::ByteArray kGetNameCommand              {"Get Name"};
+static const qtac::ByteArray kGetUUIDCommand              {"Get UUID"};
+static const qtac::ByteArray kSetNameCommand              {"Set Name"};
+static const qtac::ByteArray kPIC32CXPlatformIDCommand    {"*IDN?"};
+static const qtac::ByteArray kPIC32CXSetPinCommand        {"CONF:DIG:ON"};
+static const qtac::ByteArray kPIC32CXClearBufferCommand   {"echo 1"};
+
+namespace qtac {
+
+TACPIC32CXCommand::TACPIC32CXCommand(SendInterface* sender, ReceiveInterface* receiver)
+    : _receiver(receiver)
+    , _sender(sender)
+    , _ready(false)
+{
+    assert(_receiver != nullptr);
+    assert(_sender   != nullptr);
+    _ready = sender->ready();
+}
+
+TACPIC32CXCommand::~TACPIC32CXCommand()
+{
+    addEndTransaction();
+}
+
+void TACPIC32CXCommand::version()
+{
+    send(kVersionCommand, Arguments(), false, false);
+}
+
+void TACPIC32CXCommand::name()
+{
+    send(kGetNameCommand, Arguments(), false, false);
+}
+
+void TACPIC32CXCommand::uuid()
+{
+    send(kGetUUIDCommand, Arguments(), false, false);
+}
+
+void TACPIC32CXCommand::setPinState(uint16_t pin, bool state)
+{
+    Arguments args;
+    args.push_back(state);
+    args.push_back(static_cast<uint32_t>(pin));
+    send(kPIC32CXSetPinCommand, args, false, false);
+}
+
+void TACPIC32CXCommand::setName(const qtac::ByteArray& newName)
+{
+    Arguments args;
+    args.push_back(newName.toStdString());
+    send(kSetNameCommand, args, false, false);
+}
+
+void TACPIC32CXCommand::platformID()
+{
+    send(kPIC32CXPlatformIDCommand, Arguments(), false, false);
+}
+
+void TACPIC32CXCommand::clearBuffer()
+{
+    send(kPIC32CXClearBufferCommand, Arguments(), false, false);
+}
+
+void TACPIC32CXCommand::send(const qtac::ByteArray& command, const Arguments& arguments,
+                              bool console, bool store)
+{
+    _sender->send(command, arguments, console, _receiver, store);
+}
+
+void TACPIC32CXCommand::addDelay(uint32_t delayInMilliSeconds)
+{
+    _sender->addDelay(delayInMilliSeconds, _receiver);
+}
+
+void TACPIC32CXCommand::addLogComment(const qtac::ByteArray& comment)
+{
+    _sender->addLogComment(comment);
+}
+
+void TACPIC32CXCommand::addEndTransaction()
+{
+    _sender->addEndTransaction(_receiver);
+}
+
+} // namespace qtac
diff --git a/source/library/src/TACPIC32CXDriveThread.cpp b/source/library/src/TACPIC32CXDriveThread.cpp
new file mode 100644
index 00000000..fa46c609
--- /dev/null
+++ b/source/library/src/TACPIC32CXDriveThread.cpp
@@ -0,0 +1,515 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Biswajit Roy
+
+#include <qtac/TACPIC32CXDriveThread.h>
+#include <qtac/TACPIC32CXCommand.h>
+#include <qtac/AlpacaDevice.h>
+#include <qtac/TACCommandHashes.h>
+#include <qtac/PlatformID.h>
+#include <qtac/StringUtilities.h>
+
+#include <cassert>
+#include <sstream>
+
+static const qtac::ByteArray kTACPIC32CXDriveTrainName{"TAC PIC32CX Drive Train"};
+
+namespace qtac {
+
+// -----------------------------------------------------------------------
+// Construction
+// -----------------------------------------------------------------------
+
+TACPIC32CXDriveThread::TACPIC32CXDriveThread(HashType hash)
+    : TACDriveThread(hash)
+{
+    _driveTrainName = kTACPIC32CXDriveTrainName;
+    setProtocolInterface(&_tacProtocol);
+    _tacProtocol.setTACDriveTrain(this);
+
+    AlpacaDevice alpacaDevice = _AlpacaDevice::findAlpacaDevice(hash);
+    if (!alpacaDevice || !alpacaDevice->active())
+        return;
+
+    _hardwareType     = ePIC32CXAuto;
+    _firmwareMajor    = 1;
+    _firmwareMinor    = 1;
+    _firmwareRevision = 1;
+    _description      = qtac::String("PIC32CX (Automotive) Board");
+    _uuid             = qtac::String("PIC32CX - No UUID");
+
+    _portName     = alpacaDevice->portName();
+    _serialNumber = qtac::String(alpacaDevice->serialNumber().toStdString());
+    _description  = qtac::String(alpacaDevice->description().toStdString());
+
+    onPinStateChanged.connect([alpacaDevice](uint64_t pin, bool state) {
+        alpacaDevice->on_pinStateChanged(pin, state);
+    });
+    onProgress.connect([alpacaDevice](uint8_t value, NotificationLevel /*level*/) {
+        if (alpacaDevice->onProgress)
+            alpacaDevice->onProgress(value, 1 /*eInfoNotification*/);
+    });
+}
+
+TACPIC32CXDriveThread::~TACPIC32CXDriveThread() = default;
+
+// -----------------------------------------------------------------------
+// openSerialDevice
+// -----------------------------------------------------------------------
+
+bool TACPIC32CXDriveThread::openSerialDevice()
+{
+    const std::string portNameStr = _portName.toStdString();
+    for (const auto& info : SerialPortInfo::availablePorts())
+    {
+        if (info.portName().toStdString() == portNameStr ||
+            info.serialNumber().toStdString() == portNameStr)
+        {
+            _tacPortInfo = info;
+            break;
+        }
+    }
+
+    if (_tacPortInfo.isNull())
+    {
+        writeLogLine("TACPIC32CXDriveThread::openSerialDevice: port not found for " + portNameStr);
+        if (onErrorOnOpen)
+            onErrorOnOpen(qtac::ByteArray("PIC32CX Device Open Failed. Check the Application Log"));
+        return false;
+    }
+
+    SerialPortSettings settings;
+    settings.baudRate = 115200;
+
+    _serialPort = std::unique_ptr<SerialPort>(new SerialPort(_tacPortInfo));
+    _serialPort->setSettings(settings);
+
+    _serialPort->onReadyRead = [this]() { _readyRead = true; };
+
+    if (!_serialPort->open())
+    {
+        std::ostringstream oss;
+        oss << "Unable to open TAC Port. " << _serialPort->errorString().toStdString();
+        _lastErrorMessage = oss.str();
+        writeLogLine(_lastErrorMessage);
+        if (onErrorOnOpen)
+            onErrorOnOpen(qtac::ByteArray("PIC32CX Device Open Failed. Check the Application Log"));
+        _serialPort.reset();
+        return false;
+    }
+
+    setSerialNumber(_tacPortInfo.serialNumber());
+    setPortName(qtac::ByteArray(_tacPortInfo.portName().toStdString()));
+
+    if (onSerialNumUpdate)
+        onSerialNumUpdate(_serialNumber);
+
+    {
+        std::ostringstream oss;
+        oss << "Device " << _tacPortInfo.serialNumber().toStdString() << " opened\n";
+        oss << "Com port " << _tacPortInfo.portName().toStdString() << "\n";
+        writeLogLine(oss.str());
+    }
+
+    // Clear any stale data before sending the first command.
+    {
+        TACPIC32CXCommand cmd(this, this);
+        cmd.clearBuffer();
+    }
+
+    return true;
+}
+
+// -----------------------------------------------------------------------
+// sendCommand
+// -----------------------------------------------------------------------
+
+void TACPIC32CXDriveThread::sendCommand(const qtac::ByteArray& command,
+                                         bool              console,
+                                         ReceiveInterface* receiveInterface,
+                                         bool              shouldStore)
+{
+    Arguments args;
+    qtac::ByteArray decoded = decodeCommand(command, args);
+    send(decoded.toStdString(), args, console, receiveInterface, shouldStore);
+}
+
+void TACPIC32CXDriveThread::endTransaction(ReceiveInterface* receiveInterface)
+{
+    _tacProtocol.endTransaction(receiveInterface);
+}
+
+// -----------------------------------------------------------------------
+// Public command methods
+// -----------------------------------------------------------------------
+
+void TACPIC32CXDriveThread::setPinState(uint64_t pin, bool state)
+{
+    {
+        TACPIC32CXCommand cmd(this, this);
+        cmd.setPinState(static_cast<uint16_t>(pin), state);
+    }
+    waitForCompletion();
+}
+
+void TACPIC32CXDriveThread::sendCommandSequence(CommandEntries& commandEntries)
+{
+    for (const auto& entry : commandEntries)
+    {
+        {
+            TACPIC32CXCommand cmd(this, this);
+
+            switch (entry->_commandAction)
+            {
+            case _CommandEntry::eNotSet:
+                break;
+            case _CommandEntry::eSetPin:
+                cmd.setPinState(static_cast<uint16_t>(entry->_pinID),
+                                entry->_arguement.toBool());
+                break;
+            case _CommandEntry::eLog:
+                cmd.addLogComment(qtac::ByteArray(
+                    entry->_arguement.toString().toStdString() + "\n"));
+                break;
+            case _CommandEntry::eDelay:
+                cmd.addDelay(entry->_arguement.toUInt());
+                break;
+            case _CommandEntry::eBaseCommand:
+                break;
+            }
+        }
+
+        if (onProgress) onProgress(0 /*kProgressActive*/, NotificationLevel::Info);
+    }
+}
+
+void TACPIC32CXDriveThread::setName(const qtac::ByteArray& newName)
+{
+    const std::string s = newName.toStdString();
+    if (s.size() <= 32 && s != _name.toStdString() && isAlphaNumeric(newName))
+        waitForCompletion();
+}
+
+// -----------------------------------------------------------------------
+// SendInterface
+// -----------------------------------------------------------------------
+
+uint32_t TACPIC32CXDriveThread::send(const qtac::ByteArray& sendMe, const Arguments& arguments,
+                                      bool console, ReceiveInterface* receiveInterface, bool store)
+{
+    return _tacProtocol.sendCommand(sendMe, arguments, console, receiveInterface, store);
+}
+
+bool TACPIC32CXDriveThread::ready()
+{
+    return _tacProtocol.queueSize() == 0;
+}
+
+// -----------------------------------------------------------------------
+// readSerialData
+// -----------------------------------------------------------------------
+
+bool TACPIC32CXDriveThread::readSerialData()
+{
+    if (!_readyRead)
+        return false;
+
+    _readyRead = false;
+    _serialBuffer.clear();
+
+    // Drain all available bytes (mirrors original chunked readAll loop).
+    while (true)
+    {
+        const qtac::ByteArray chunk = _serialPort->readAll(0 /*non-blocking*/);
+        if (chunk.isEmpty())
+            break;
+        _serialBuffer += chunk;
+    }
+
+    if (_serialBuffer.isEmpty())
+        return false;
+
+    _protocolInterface->handleReceivedData(_serialBuffer);
+    return true;
+}
+
+// -----------------------------------------------------------------------
+// receive
+// -----------------------------------------------------------------------
+
+void TACPIC32CXDriveThread::receive(FramePackage& framePackage)
+{
+    if (framePackage->endTransaction)
+    {
+        clearWaitForCompletion();
+        if (onTransactionEnded) onTransactionEnded();
+
+        if (_protocolInterface->queueSize() == 0)
+            if (onProgress) onProgress(100 /*kProgressMax*/, NotificationLevel::Info);
+    }
+    else if (framePackage->valid)
+    {
+        switch (framePackage->requestHash)
+        {
+        case kVersionCommandHash: handleVersionResponse(framePackage); break;
+        case kPIC32CXSetPinCommandHash:  handleSetPin(framePackage);          break;
+        case kPIC32CXClearBufferHash:    handleClearBuffer(framePackage);     break;
+        default: break;
+        }
+    }
+    else
+    {
+        clearWaitForCompletion();
+
+        switch (framePackage->requestHash)
+        {
+        case kVersionCommandHash:
+        {
+            TACPIC32CXCommand cmd(this, this);
+            cmd.platformID();
+            break;
+        }
+        default:
+            break;
+        }
+    }
+
+    log(framePackage);
+    _protocolInterface->clearPendingFrame();
+}
+
+// -----------------------------------------------------------------------
+// run() — drive thread main loop
+// -----------------------------------------------------------------------
+
+void TACPIC32CXDriveThread::run()
+{
+    assert(_protocolInterface != nullptr);
+
+    if (!openSerialDevice())
+    {
+        if (onErrorOnOpen) onErrorOnOpen(qtac::ByteArray(_lastErrorMessage));
+        return;
+    }
+
+    if (onDeviceOpen) onDeviceOpen();
+
+    startRunning();
+
+    if (onDeviceStatusChange) onDeviceStatusChange(qtac::String("Starting"));
+
+    _readyRead = false;
+    _connected = false;
+
+    {
+        TACPIC32CXCommand cmd(this, this);
+        cmd.platformID();
+    }
+
+    if (weAreRunning())
+    {
+        bool loopFinished = false;
+
+        while (!loopFinished)
+        {
+            FramePackage framePackage = _protocolInterface->getNextFramePackage();
+
+            if (framePackage)
+            {
+                if (framePackage->delayInMilliSeconds != 0 ||
+                    !framePackage->comment.isEmpty()        ||
+                    framePackage->endTransaction            ||
+                    checkLocalStore(framePackage))
+                {
+                    receive(framePackage);
+                }
+                else
+                {
+                    writeLogLine("TACPIC32CXDriveTrain::run()::Write: " + framePackage->codedRequest.toStdString());
+
+                    // Clear serial buffer before sending the version/identify command.
+                    if (framePackage->requestHash == kVersionCommandHash)
+                    {
+                        if (_serialPort->clear())
+                            writeLogLine("Buffer cleared before identifying PIC32CX board");
+                    }
+
+                    const int bytesWritten = _serialPort->write(framePackage->codedRequest);
+
+                    if (bytesWritten == -1)
+                    {
+                        std::ostringstream oss;
+                        oss << "TACPIC32CXDriveTrain::run()::bytesWritten == -1";
+                        const std::string errStr = _serialPort->errorString().toStdString();
+                        if (!errStr.empty())
+                            oss << "\nError on write " << errStr;
+                        writeLogLine(oss.str());
+                        stopRunning();
+                    }
+                }
+            }
+            else
+            {
+                if (!weAreRunning())
+                    loopFinished = true;
+                else
+                    _serialPort->waitForReadyRead(10);
+            }
+
+            if (readSerialData())
+                _protocolInterface->idle();
+        }
+    }
+
+    _serialPort->close();
+    writeLogLine("TACPIC32CXDriveThread::run(): Serial port closed");
+
+    _connected = false;
+    if (onDeviceDisconnected) onDeviceDisconnected();
+}
+
+// -----------------------------------------------------------------------
+// Frame handlers
+// -----------------------------------------------------------------------
+
+void TACPIC32CXDriveThread::handleSetPin(FramePackage& framePackage)
+{
+    if (framePackage->arguments.size() >= 2)
+    {
+        const bool     state = framePackage->arguments.at(0).asBool();
+        const uint64_t pin   = static_cast<uint64_t>(
+                                   framePackage->arguments.at(1).asUInt32());
+
+        framePackage->synonym =
+            qtac::ByteArray("Pin ") + std::to_string(pin).c_str() + " " + (state ? "on" : "off");
+
+        if (onPinStateChanged) onPinStateChanged(pin, state);
+    }
+}
+
+void TACPIC32CXDriveThread::handleVersionResponse(FramePackage& framePackage)
+{
+    if (!framePackage->responses.empty())
+    {
+        // Response format: name,firmware,?,mac,boardID,serial,mcn (comma-separated).
+        const std::string raw = framePackage->responses.at(0).toStdString();
+
+        std::vector<std::string> parts;
+        {
+            std::istringstream iss(raw);
+            std::string tok;
+            while (std::getline(iss, tok, ','))
+                parts.push_back(tok);
+        }
+
+        if (parts.size() < 7)
+        {
+            writeLogLine("Incomplete board response: " + raw);
+        }
+        else
+        {
+            _name           = qtac::ByteArray(parts.at(0));
+            writeLogLine("PIC32CX board name: " + parts.at(0));
+
+            _firmwareString = qtac::ByteArray(parts.at(1));
+            writeLogLine("PIC32CX board firmware version: " + parts.at(1));
+
+            _macAddress     = qtac::ByteArray(parts.at(3));
+            writeLogLine("PIC32CX board MAC: " + parts.at(3));
+
+            try
+            {
+                _platformID = static_cast<PlatformID>(std::stoi(parts.at(4)));
+            }
+            catch (...)
+            {
+                _platformID = ALPACA_PIC32CX_ID;
+            }
+            writeLogLine("Identified platform id: " + std::to_string(static_cast<int>(_platformID)));
+
+            _serialNumber   = qtac::String(parts.at(5));
+            writeLogLine("PIC32CX board Serial Number: " + parts.at(5));
+
+            _mcnNumber      = qtac::String(parts.at(6));
+            writeLogLine("PIC32CX board MCN: " + parts.at(6));
+        }
+    }
+
+    if (onPlatformIDUpdate) onPlatformIDUpdate(static_cast<int>(_platformID));
+    setupConnected();
+}
+
+void TACPIC32CXDriveThread::handleClearBuffer(FramePackage& framePackage)
+{
+    if (!framePackage->responses.empty())
+    {
+        std::string joined;
+        for (size_t i = 0; i < framePackage->responses.size(); ++i)
+        {
+            if (i > 0) joined += ',';
+            joined += framePackage->responses[i].toStdString();
+        }
+        writeLogLine("Buffer cleared. Board response: '" + joined + "'");
+    }
+}
+
+// -----------------------------------------------------------------------
+// Setup callbacks
+// -----------------------------------------------------------------------
+
+void TACPIC32CXDriveThread::setupConnected()
+{
+    if (!_connected)
+    {
+        if (onHardwareVersionUpdate) onHardwareVersionUpdate(hardwareVersionString());
+
+        _connected = true;
+
+        {
+            TACPIC32CXCommand cmd(this, this);
+            cmd.platformID();
+        }
+
+        if (onDeviceConnected) onDeviceConnected();
+    }
+}
+
+void TACPIC32CXDriveThread::setupDiscovery()
+{
+    if (onHardwareVersionUpdate) onHardwareVersionUpdate(hardwareVersionString());
+
+    TACPIC32CXCommand cmd(this, this);
+    cmd.platformID();
+}
+
+} // namespace qtac
diff --git a/source/library/src/TACPIC32CXProtocol.cpp b/source/library/src/TACPIC32CXProtocol.cpp
new file mode 100644
index 00000000..c6048eed
--- /dev/null
+++ b/source/library/src/TACPIC32CXProtocol.cpp
@@ -0,0 +1,153 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Biswajit Roy
+
+#include <qtac/TACPIC32CXProtocol.h>
+#include <qtac/TACPIC32CXCoder.h>
+#include <qtac/TACDriveThread.h>
+#include <qtac/StringUtilities.h>
+
+#include <cassert>
+#include <chrono>
+
+namespace qtac {
+
+static uint64_t tickCount()
+{
+    using namespace std::chrono;
+    return static_cast<uint64_t>(
+        duration_cast<milliseconds>(steady_clock::now().time_since_epoch()).count());
+}
+
+TACPIC32CXProtocol::TACPIC32CXProtocol()
+{
+    setFrameCoder(new TACPIC32CXCoder);
+}
+
+TACPIC32CXProtocol::~TACPIC32CXProtocol()
+{
+    delete _frameCoder;
+    _frameCoder = nullptr;
+}
+
+void TACPIC32CXProtocol::setTACDriveTrain(TACDriveThread* tacDriveTrain)
+{
+    assert(tacDriveTrain != nullptr);
+    _tacDriveTrain = tacDriveTrain;
+}
+
+uint32_t TACPIC32CXProtocol::sendCommand(const qtac::ByteArray& command,
+                                          const Arguments&   arguments,
+                                          bool               console,
+                                          ReceiveInterface*  receiveInterface,
+                                          bool               shouldStore)
+{
+    if (command.isEmpty())
+        return kBadQueueValue;
+
+    const uint32_t result = getNextSendID();
+
+    FramePackage framePackage = makeFramePackage();
+    framePackage->packetID         = result;
+    framePackage->request          = command;
+    framePackage->arguments        = arguments;
+    framePackage->requestHash      = arrayHash(command);
+    framePackage->console          = console;
+    framePackage->shouldStore      = shouldStore;
+    framePackage->tickcount        = tickCount();
+    framePackage->receiveInterface = receiveInterface;
+
+    if (_frameCoder)
+        framePackage->codedRequest = _frameCoder->encode(command, arguments);
+    else
+        framePackage->codedRequest = command;
+
+    ProtocolInterface::queueCommand(framePackage);
+    return result;
+}
+
+void TACPIC32CXProtocol::endTransaction(ReceiveInterface* receiveInterface)
+{
+    ProtocolInterface::queueEndTransaction(receiveInterface);
+}
+
+void TACPIC32CXProtocol::sendHelpCommand()
+{
+}
+
+void TACPIC32CXProtocol::receive(FramePackage& framePackage)
+{
+    _tacDriveTrain->receive(framePackage);
+}
+
+void TACPIC32CXProtocol::idle()
+{
+}
+
+// -----------------------------------------------------------------------
+// frameComplete
+//
+// Non-empty tokens are accumulated; the empty-string sentinel triggers
+// the commit.  All PIC32CX frames are considered valid (original comment:
+// "Consider all pic32cx frames to be valid").
+// -----------------------------------------------------------------------
+void TACPIC32CXProtocol::frameComplete(const qtac::ByteArray& completedFrame)
+{
+    if (!completedFrame.isEmpty())
+    {
+        _responseLines.push_back(completedFrame);
+    }
+    else
+    {
+        FramePackage& fp = pendingFramePackage();
+        if (fp)
+        {
+            fp->responses = _responseLines;
+            fp->valid     = true;   // all PIC32CX frames considered valid
+
+            if (fp->receiveInterface)
+                fp->receiveInterface->receive(fp);
+            else
+                _tacDriveTrain->receive(fp);
+        }
+
+        clearPendingFrame();
+        _responseLines.clear();
+    }
+}
+
+void TACPIC32CXProtocol::badFrame(const qtac::ByteArray& /*completedFrame*/)
+{
+}
+
+} // namespace qtac
diff --git a/source/library/src/TACPSOCCoder.cpp b/source/library/src/TACPSOCCoder.cpp
new file mode 100644
index 00000000..e81ede77
--- /dev/null
+++ b/source/library/src/TACPSOCCoder.cpp
@@ -0,0 +1,204 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Michael Simpson
+
+#include <qtac/TACPSOCCoder.h>
+#include <qtac/TACCommandHashes.h>
+#include <qtac/StringUtilities.h>
+#include <qtac/ProtocolInterface.h>
+
+
+// Prompt strings sent by the PSOC firmware.
+static const qtac::ByteArray kCommand              {"CMD >> "};
+static const qtac::ByteArray kCommandNotRecognized {"CMD: Command not recognized."};
+
+namespace qtac {
+
+TACPSOCCoder::TACPSOCCoder()  = default;
+TACPSOCCoder::~TACPSOCCoder() = default;
+
+void TACPSOCCoder::reset()
+{
+    _receiveBuffer.clear();
+    FrameCoder::reset();
+}
+
+// -----------------------------------------------------------------------
+// decode
+//
+// Accumulates raw bytes in _receiveBuffer.  When the buffer contains the
+// PSOC command prompt (kCommand) or the "not recognized" string, we split
+// on "\r\n", deliver each non-prompt line as a frame, pad to at least 3
+// frames (matching the original Qt logic), then deliver an empty sentinel
+// that tells TACPSOCProtocol::frameComplete() to commit the packet.
+// -----------------------------------------------------------------------
+void TACPSOCCoder::decode(const qtac::ByteArray& decodeMe)
+{
+    static const qtac::ByteArray kDelimiter{"\r\n"};
+
+    _receiveBuffer += decodeMe;
+
+    // Check whether the prompt or "not recognized" tag is present.
+    const bool hasPrompt =
+        _receiveBuffer.contains(kCommand) ||
+        _receiveBuffer.contains(kCommandNotRecognized);
+
+    if (!hasPrompt)
+        return;
+
+    // Split on \r\n, dropping empty tokens.
+    std::vector<qtac::ByteArray> frames;
+    {
+        const std::string buf      = _receiveBuffer.toStdString();
+        const std::string delim    = kDelimiter.toStdString();
+        std::string::size_type start = 0;
+        while (start < buf.size())
+        {
+            auto end = buf.find(delim, start);
+            if (end == std::string::npos)
+            {
+                const std::string tok = buf.substr(start);
+                if (!tok.empty())
+                    frames.push_back(qtac::ByteArray(tok));
+                break;
+            }
+            const std::string tok = buf.substr(start, end - start);
+            if (!tok.empty())
+                frames.push_back(qtac::ByteArray(tok));
+            start = end + delim.size();
+        }
+    }
+
+    // Deliver each frame.
+    int count = 0;
+    for (const auto& f : frames)
+    {
+        if (_frameFunction)
+            _frameFunction(f, _protocolInterface);
+        ++count;
+    }
+
+    // Pad to at least 3 (original logic: "while (count < 3)").
+    while (count < 3)
+    {
+        if (_frameFunction)
+            _frameFunction(qtac::ByteArray(" "), _protocolInterface);
+        ++count;
+    }
+
+    // Empty sentinel — tells frameComplete() to commit the packet.
+    if (_frameFunction)
+        _frameFunction(qtac::ByteArray(), _protocolInterface);
+
+    _receiveBuffer.clear();
+}
+
+// -----------------------------------------------------------------------
+// encode
+//
+// Maps the high-level command name (identified by its hash) to the raw
+// serial string that the PSOC firmware understands.
+// -----------------------------------------------------------------------
+qtac::ByteArray TACPSOCCoder::encode(const qtac::ByteArray& encodeMe, const Arguments& arguments)
+{
+    qtac::ByteArray result = encodeMe;
+
+    const HashType h = arrayHash(encodeMe);
+
+    switch (h)
+    {
+    case kVersionCommandHash:
+        result = "version\r";
+        break;
+
+    case kGetNameCommandHash:
+        result = "getname\r";
+        break;
+
+    case kSetNameCommandHash:
+        if (!arguments.empty())
+            result = qtac::ByteArray("setname ") + arguments.at(0).asString().c_str() + "\r";
+        break;
+
+    case kGetUUIDCommandHash:
+        result = "sys getFSUUID\r";
+        break;
+
+    case kGetPlatformIDCommandHash:
+        result = "getboardid\r";
+        break;
+
+    case kGetResetCountCommandHash:
+        result = "getresetcount\r";
+        break;
+
+    case kClearResetCountCommandHash:
+        result = "clearresetcount\r";
+        break;
+
+    case kI2CReadRegisterCommandHash:
+        if (!arguments.empty())
+            result = qtac::ByteArray("i2c readRegisterBytes ") + arguments.at(0).asString().c_str() + " 1";
+        break;
+
+    case kI2CReadRegisterValueCommandHash:
+        result = "i2c receive";
+        break;
+
+    case kI2CWriteRegisterCommandHash:
+        if (!arguments.empty())
+            result = qtac::ByteArray("i2c writeByte ") + arguments.at(0).asString().c_str();
+        break;
+
+    case kSetPinCommandHash:
+        if (arguments.size() == 2)
+        {
+            const qtac::ByteArray stateStr = argumentToBoolString(arguments.at(0));
+            const qtac::ByteArray pinStr   = qtac::ByteArray(std::to_string(arguments.at(1).asUInt32()));
+            result = qtac::ByteArray("pin ") + stateStr + " " + pinStr + "\r";
+        }
+        break;
+
+    default:
+        result = encodeMe;
+        break;
+    }
+
+    // Ensure trailing \r (matches original behaviour).
+    if (result.isEmpty() || result[result.size() - 1] != '\r')
+        result += '\r';
+
+    return result;
+}
+
+} // namespace qtac
diff --git a/source/library/src/TACPSOCCommand.cpp b/source/library/src/TACPSOCCommand.cpp
new file mode 100644
index 00000000..85554752
--- /dev/null
+++ b/source/library/src/TACPSOCCommand.cpp
@@ -0,0 +1,197 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Michael Simpson
+
+#include <qtac/TACPSOCCommand.h>
+#include <qtac/ReceiveInterface.h>
+#include <qtac/SendInterface.h>
+
+#include <cassert>
+#include <iomanip>
+#include <sstream>
+#include <stdexcept>
+
+// Command string constants
+static const qtac::ByteArray kVersionCommand          {"Version"};
+static const qtac::ByteArray kGetNameCommand          {"Get Name"};
+static const qtac::ByteArray kSetNameCommand          {"Set Name"};
+static const qtac::ByteArray kGetUUIDCommand          {"Get UUID"};
+static const qtac::ByteArray kGetPlatformIDCommand    {"Get Platform ID"};
+static const qtac::ByteArray kGetResetCountCommand    {"Get Reset Count"};
+static const qtac::ByteArray kClearResetCountCommand  {"Clear Reset Count"};
+static const qtac::ByteArray kSetPinCommand           {"SetPin"};
+static const qtac::ByteArray kI2CReadRegisterCommand  {"I2C Read Register"};
+static const qtac::ByteArray kI2CReadRegisterValueCommand {"I2C Read Register Value"};
+static const qtac::ByteArray kI2CWriteRegisterCommand {"I2C Write Register"};
+
+namespace qtac {
+
+TACPSOCCommand::TACPSOCCommand(SendInterface* sender, ReceiveInterface* receiver)
+    : _receiver(receiver)
+    , _sender(sender)
+    , _ready(false)
+{
+    assert(_receiver != nullptr);
+    assert(_sender   != nullptr);
+    _ready = sender->ready();
+}
+
+TACPSOCCommand::~TACPSOCCommand()
+{
+    addEndTransaction();
+}
+
+void TACPSOCCommand::version()
+{
+    send(kVersionCommand, Arguments(), false, false);
+}
+
+void TACPSOCCommand::name()
+{
+    send(kGetNameCommand, Arguments(), false, false);
+}
+
+void TACPSOCCommand::uuid()
+{
+    send(kGetUUIDCommand, Arguments(), false, false);
+}
+
+void TACPSOCCommand::setPinState(uint16_t pin, bool state)
+{
+    Arguments args;
+    args.push_back(state);
+    args.push_back(static_cast<uint32_t>(pin));
+    send(kSetPinCommand, args, false, false);
+}
+
+static constexpr uint16_t kMaxI2CPins{8};
+
+void TACPSOCCommand::setAddressPinState(const qtac::ByteArray& i2cAddress, uint16_t pin, bool state)
+{
+    Arguments args;
+    args.push_back(i2cAddress.toStdString());
+    args.push_back(static_cast<uint32_t>(pin % kMaxI2CPins));
+    args.push_back(state);
+    send(kI2CWriteRegisterCommand, args, false, false);
+}
+
+void TACPSOCCommand::setName(const qtac::ByteArray& newName)
+{
+    Arguments args;
+    args.push_back(newName.toStdString());
+    send(kSetNameCommand, args, false, false);
+}
+
+void TACPSOCCommand::getResetCount()
+{
+    send(kGetResetCountCommand, Arguments(), false, false);
+}
+
+void TACPSOCCommand::clearResetCount()
+{
+    send(kClearResetCountCommand, Arguments(), false, false);
+}
+
+// Helper: format a byte value as "0xNN" hex string.
+static qtac::ByteArray toHexByte(uint32_t value)
+{
+    std::ostringstream oss;
+    oss << "0x" << std::uppercase << std::setfill('0') << std::setw(2) << std::hex << value;
+    return qtac::ByteArray(oss.str().c_str());
+}
+
+void TACPSOCCommand::i2CReadRegister(uint32_t addr, uint32_t reg)
+{
+    if (addr > 0xff)
+        throw std::out_of_range("Error: invalid address");
+    if (reg > 0xff)
+        throw std::out_of_range("Error: invalid register");
+
+    const qtac::ByteArray addrStr = toHexByte(addr);
+    const qtac::ByteArray regStr  = toHexByte(reg);
+
+    Arguments args;
+    args.push_back((addrStr + " " + regStr).toStdString());
+    send(kI2CReadRegisterCommand, args, false, false);
+
+    addDelay(500);
+
+    args.clear();
+    send(kI2CReadRegisterValueCommand, args, false, false);
+}
+
+void TACPSOCCommand::i2CWriteRegister(uint32_t addr, uint32_t reg, uint32_t data)
+{
+    if (addr > 0xff)
+        throw std::out_of_range("Error: invalid address");
+    if (reg > 0xff)
+        throw std::out_of_range("Error: invalid register");
+    if (data > 0xff)
+        throw std::out_of_range("Error: invalid data");
+
+    const qtac::ByteArray addrStr = toHexByte(addr);
+    const qtac::ByteArray regStr  = toHexByte(reg);
+    const qtac::ByteArray dataStr = toHexByte(data);
+
+    Arguments args;
+    args.push_back((addrStr + " " + regStr + " " + dataStr).toStdString());
+    send(kI2CWriteRegisterCommand, args, false, false);
+}
+
+void TACPSOCCommand::platformID()
+{
+    send(kGetPlatformIDCommand, Arguments(), false, false);
+}
+
+void TACPSOCCommand::send(const qtac::ByteArray& command, const Arguments& arguments,
+                           bool console, bool store)
+{
+    _sender->send(command, arguments, console, _receiver, store);
+}
+
+void TACPSOCCommand::addDelay(uint32_t delayInMilliSeconds)
+{
+    _sender->addDelay(delayInMilliSeconds, _receiver);
+}
+
+void TACPSOCCommand::addLogComment(const qtac::ByteArray& comment)
+{
+    _sender->addLogComment(comment);
+}
+
+void TACPSOCCommand::addEndTransaction()
+{
+    _sender->addEndTransaction(_receiver);
+}
+
+} // namespace qtac
diff --git a/source/library/src/TACPSOCDriveThread.cpp b/source/library/src/TACPSOCDriveThread.cpp
new file mode 100644
index 00000000..d33b0735
--- /dev/null
+++ b/source/library/src/TACPSOCDriveThread.cpp
@@ -0,0 +1,695 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+
+#include <qtac/TACPSOCDriveThread.h>
+#include <qtac/TACPSOCCommand.h>
+#include <qtac/AlpacaDevice.h>
+#include <qtac/TACCommandHashes.h>
+#include <qtac/PlatformID.h>
+#include <qtac/StringUtilities.h>
+
+#include <cassert>
+#include <sstream>
+#include <thread>
+
+static const qtac::ByteArray kTACSerialDriveTrainName{"TAC Serial Drive Train"};
+static const qtac::ByteArray kHelpCommand{"Help"};
+
+namespace qtac {
+
+// -----------------------------------------------------------------------
+// Construction
+// -----------------------------------------------------------------------
+
+TACPSOCDriveThread::TACPSOCDriveThread(HashType hash)
+    : TACDriveThread(hash)
+{
+    _driveTrainName = kTACSerialDriveTrainName;
+    setProtocolInterface(&_tacProtocol);
+    _tacProtocol.setTACDriveTrain(this);
+
+    AlpacaDevice alpacaDevice = _AlpacaDevice::findAlpacaDevice(hash);
+    if (!alpacaDevice || !alpacaDevice->active())
+        return;
+
+    _portName     = alpacaDevice->portName();
+    _serialNumber = qtac::String(alpacaDevice->serialNumber().toStdString());
+    _description  = qtac::String(alpacaDevice->description().toStdString());
+
+    // Wire signals so _AlpacaDevice is notified of pin changes and progress.
+    onPinStateChanged.connect([alpacaDevice](uint64_t pin, bool state) {
+        alpacaDevice->on_pinStateChanged(pin, state);
+    });
+    onProgress.connect([alpacaDevice](uint8_t value, NotificationLevel /*level*/) {
+        if (alpacaDevice->onProgress)
+            alpacaDevice->onProgress(value, 1 /*eInfoNotification*/);
+    });
+}
+
+TACPSOCDriveThread::~TACPSOCDriveThread() = default;
+
+// -----------------------------------------------------------------------
+// openSerialDevice
+// -----------------------------------------------------------------------
+
+bool TACPSOCDriveThread::openSerialDevice()
+{
+    // Look up the port by name, then fall back to serial number.
+    const std::string portNameStr = _portName.toStdString();
+
+    for (const auto& info : SerialPortInfo::availablePorts())
+    {
+        if (info.portName().toStdString() == portNameStr ||
+            info.serialNumber().toStdString() == portNameStr)
+        {
+            _tacPortInfo = info;
+            break;
+        }
+    }
+
+    if (_tacPortInfo.isNull())
+    {
+        writeLogLine("TACPSOCDriveThread::openSerialDevice: port not found for " + portNameStr);
+        if (onErrorOnOpen)
+            onErrorOnOpen(qtac::ByteArray("PSOC Device Open Failed, Check the Application Log"));
+        return false;
+    }
+
+    SerialPortSettings settings;
+    settings.baudRate = 115200;
+
+    _serialPort = std::unique_ptr<SerialPort>(new SerialPort(_tacPortInfo));
+    _serialPort->setSettings(settings);
+
+    // Wire the readyRead callback so readSerialData() knows when data arrived.
+    _serialPort->onReadyRead = [this]() { _readyRead = true; };
+
+    if (!_serialPort->open())
+    {
+        std::ostringstream oss;
+        oss << "Unable to open TAC Port. " << _serialPort->errorString().toStdString();
+        writeLogLine(oss.str());
+        if (onErrorOnOpen)
+            onErrorOnOpen(qtac::ByteArray("PSOC Device Open Failed, Check the Application Log"));
+        _serialPort.reset();
+        return false;
+    }
+
+    setSerialNumber(_tacPortInfo.serialNumber());
+    setPortName(qtac::ByteArray(_tacPortInfo.portName().toStdString()));
+
+    if (onSerialNumUpdate)
+        onSerialNumUpdate(_serialNumber);
+
+    {
+        std::ostringstream oss;
+        oss << "Device " << _tacPortInfo.serialNumber().toStdString() << " opened\n";
+        oss << "Com port " << _tacPortInfo.portName().toStdString() << "\n";
+        writeLogLine(oss.str());
+    }
+
+    return true;
+}
+
+// -----------------------------------------------------------------------
+// sendCommand
+// -----------------------------------------------------------------------
+
+void TACPSOCDriveThread::sendCommand(const qtac::ByteArray& command,
+                                      bool              console,
+                                      ReceiveInterface* receiveInterface,
+                                      bool              shouldStore)
+{
+    if (!command.startsWith(kHelpCommand))
+    {
+        Arguments args;
+        qtac::ByteArray decoded = decodeCommand(command, args);
+        send(decoded.toStdString(), args, console, receiveInterface, shouldStore);
+    }
+}
+
+void TACPSOCDriveThread::endTransaction(ReceiveInterface* receiveInterface)
+{
+    _tacProtocol.endTransaction(receiveInterface);
+}
+
+// -----------------------------------------------------------------------
+// Public command methods
+// -----------------------------------------------------------------------
+
+void TACPSOCDriveThread::setPinState(uint64_t pin, bool state)
+{
+    setWaitForCompletion();
+    {
+        TACPSOCCommand cmd(this, this);
+        cmd.setPinState(static_cast<uint16_t>(pin), state);
+    }
+    waitForCompletion();
+}
+
+void TACPSOCDriveThread::setAddressPinState(const qtac::ByteArray& i2cAddress, uint16_t pin, bool state)
+{
+    {
+        TACPSOCCommand cmd(this, this);
+        cmd.setAddressPinState(i2cAddress, pin, state);
+    }
+    waitForCompletion();
+}
+
+void TACPSOCDriveThread::sendCommandSequence(CommandEntries& commandEntries)
+{
+    TACPSOCCommand cmd(this, this);
+
+    for (const auto& entry : commandEntries)
+    {
+        switch (entry->_commandAction)
+        {
+        case _CommandEntry::eNotSet:
+            break;
+        case _CommandEntry::eSetPin:
+            cmd.setPinState(static_cast<uint16_t>(entry->_pinID),
+                            entry->_arguement.toBool());
+            break;
+        case _CommandEntry::eLog:
+            cmd.addLogComment(qtac::ByteArray(entry->_arguement.toString().toStdString() + "\n"));
+            break;
+        case _CommandEntry::eDelay:
+            cmd.addDelay(entry->_arguement.toUInt());
+            break;
+        case _CommandEntry::eBaseCommand:
+            break;
+        }
+
+        if (onProgress) onProgress(0 /*kProgressActive*/, NotificationLevel::Info);
+    }
+}
+
+int TACPSOCDriveThread::getResetCount()
+{
+    {
+        TACPSOCCommand cmd(this, this);
+        cmd.getResetCount();
+    }
+    waitForCompletion();
+    return _resetCount;
+}
+
+void TACPSOCDriveThread::clearResetCount()
+{
+    {
+        TACPSOCCommand cmd(this, this);
+        cmd.clearResetCount();
+    }
+    waitForCompletion();
+}
+
+void TACPSOCDriveThread::i2CReadRegister(uint32_t addr, uint32_t reg)
+{
+    {
+        TACPSOCCommand cmd(this, this);
+        try   { cmd.i2CReadRegister(addr, reg); }
+        catch (...) {}
+    }
+    waitForCompletion();
+}
+
+void TACPSOCDriveThread::i2CWriteRegister(uint32_t addr, uint32_t reg, uint32_t data)
+{
+    {
+        TACPSOCCommand cmd(this, this);
+        try   { cmd.i2CWriteRegister(addr, reg, data); }
+        catch (...) {}
+    }
+    waitForCompletion();
+}
+
+void TACPSOCDriveThread::setName(const qtac::ByteArray& newName)
+{
+    const std::string s = newName.toStdString();
+    if (s.size() <= 32 && s != _name.toStdString() && isAlphaNumeric(newName))
+    {
+        {
+            TACPSOCCommand cmd(this, this);
+            cmd.setName(newName);
+        }
+        waitForCompletion();
+    }
+}
+
+// -----------------------------------------------------------------------
+// SendInterface
+// -----------------------------------------------------------------------
+
+uint32_t TACPSOCDriveThread::send(const qtac::ByteArray& sendMe, const Arguments& arguments,
+                                   bool console, ReceiveInterface* receiveInterface, bool store)
+{
+    return _tacProtocol.sendCommand(sendMe, arguments, console, receiveInterface, store);
+}
+
+bool TACPSOCDriveThread::ready()
+{
+    return _tacProtocol.queueSize() == 0;
+}
+
+// -----------------------------------------------------------------------
+// readSerialData
+// -----------------------------------------------------------------------
+
+bool TACPSOCDriveThread::readSerialData()
+{
+    if (!_readyRead)
+        return false;
+
+    _readyRead = false;
+
+    const qtac::ByteArray buffer = _serialPort->readAll();
+    if (buffer.isEmpty())
+        return false;
+
+    _protocolInterface->handleReceivedData(buffer);
+    return true;
+}
+
+// -----------------------------------------------------------------------
+// receive — dispatches incoming frame packages
+// -----------------------------------------------------------------------
+
+void TACPSOCDriveThread::receive(FramePackage& framePackage)
+{
+    if (framePackage->endTransaction)
+    {
+        clearWaitForCompletion();
+        if (onTransactionEnded) onTransactionEnded();
+        if (onProgress)         onProgress(100 /*kProgressMax*/, NotificationLevel::Info);
+    }
+    else if (framePackage->valid)
+    {
+        switch (framePackage->requestHash)
+        {
+        case kVersionCommandHash:           handleVersionResponse(framePackage); break;
+        case kGetPlatformIDCommandHash:     handlePlatformID(framePackage);      break;
+        case kGetUUIDCommandHash:           handleUUIDResponse(framePackage);    break;
+        case kGetNameCommandHash:           handleGetNameResponse(framePackage); break;
+        case kSetNameCommandHash:           handleSetName(framePackage);         break;
+        case kClearResetCountCommandHash:
+            if (onResetCountCleared) onResetCountCleared();
+            break;
+        case kI2CReadRegisterCommandHash:
+        case kI2CReadRegisterValueCommandHash:
+            handleI2CRead(framePackage);  break;
+        case kI2CWriteRegisterCommandHash:  handleI2CWrite(framePackage);        break;
+        case kSetPinCommandHash:            handleSetPin(framePackage);          break;
+        default: break;
+        }
+    }
+    else
+    {
+        // Invalid frame — don't hang on error.
+        clearWaitForCompletion();
+
+        switch (framePackage->requestHash)
+        {
+        case kGetPlatformIDCommandHash:
+        {
+            TACPSOCCommand cmd(this, this);
+            cmd.version();
+            break;
+        }
+        case kI2CReadRegisterCommandHash:
+        case kI2CReadRegisterValueCommandHash:
+            handleI2CRead(framePackage);
+            break;
+        case kI2CWriteRegisterCommandHash:
+            handleI2CWrite(framePackage);
+            break;
+        default:
+            break;
+        }
+    }
+
+    log(framePackage);
+    // Don't clear the pending frame on end-transaction — a command response
+    // may still be in flight (e.g. Version sent from the invalid-platformID
+    // handler whose destructor queues the end transaction before the reply
+    // arrives). Other cases (valid/invalid frames) commit or discard the
+    // pending frame via frameComplete() before receive() is called.
+    if (!framePackage->endTransaction)
+        _protocolInterface->clearPendingFrame();
+}
+
+// -----------------------------------------------------------------------
+// run() — drive thread main loop
+// -----------------------------------------------------------------------
+
+void TACPSOCDriveThread::run()
+{
+    assert(_protocolInterface != nullptr);
+
+    if (!openSerialDevice())
+    {
+        if (onErrorOnOpen) onErrorOnOpen(qtac::ByteArray(_lastErrorMessage));
+        return;
+    }
+
+    if (onDeviceOpen) onDeviceOpen();
+
+    startRunning();
+
+    if (onDeviceStatusChange) onDeviceStatusChange(qtac::String("Starting"));
+
+    _readyRead = false;
+    _connected = false;
+
+    {
+        TACPSOCCommand cmd(this, this);
+        cmd.platformID();
+        cmd.version();
+    }
+
+    if (weAreRunning())
+    {
+        bool loopFinished = false;
+
+        while (!loopFinished)
+        {
+            FramePackage framePackage = _protocolInterface->getNextFramePackage();
+
+            if (framePackage)
+            {
+                if (framePackage->delayInMilliSeconds != 0 ||
+                    !framePackage->comment.isEmpty()        ||
+                    framePackage->endTransaction            ||
+                    checkLocalStore(framePackage))
+                {
+                    receive(framePackage);
+                }
+                else
+                {
+                    const int bytesWritten = _serialPort->write(framePackage->codedRequest);
+
+                    if (bytesWritten == -1)
+                    {
+                        std::ostringstream oss;
+                        oss << "TACPSOCDriveThread::run()::bytesWritten == -1";
+                        const std::string errStr = _serialPort->errorString().toStdString();
+                        if (!errStr.empty())
+                            oss << "\nError on write " << errStr;
+                        writeLogLine(oss.str());
+                        stopRunning();
+                    }
+                }
+            }
+            else
+            {
+                if (!weAreRunning())
+                    loopFinished = true;
+                else
+                    _serialPort->waitForReadyRead(10);
+            }
+
+            if (readSerialData())
+                _protocolInterface->idle();
+        }
+    }
+
+    _serialPort->close();
+    writeLogLine("TACPSOCDriveThread::run(): Serial port closed");
+
+    _connected = false;
+    if (onDeviceDisconnected) onDeviceDisconnected();
+}
+
+// -----------------------------------------------------------------------
+// Frame handlers
+// -----------------------------------------------------------------------
+
+void TACPSOCDriveThread::handleGetNameResponse(FramePackage& framePackage)
+{
+    if (framePackage->responses.size() > 1)
+    {
+        _name = framePackage->responses.at(1);
+        if (onNameUpdate) onNameUpdate(qtac::String(_name.toStdString()));
+    }
+}
+
+void TACPSOCDriveThread::handleGetResetCount(FramePackage& framePackage)
+{
+    if (framePackage->responses.size() >= 3)
+    {
+        if (framePackage->responses.at(0) == "getresetcount" &&
+            framePackage->responses.at(2) == "ok")
+        {
+            try { _resetCount = static_cast<int>(std::stoul(framePackage->responses.at(1).toStdString())); }
+            catch (...) {}
+        }
+    }
+    if (onResetCountUpdate) onResetCountUpdate(static_cast<uint32_t>(_resetCount));
+}
+
+void TACPSOCDriveThread::handleI2CRead(FramePackage& framePackage)
+{
+    if (framePackage->requestHash == kI2CReadRegisterValueCommandHash)
+    {
+        if (framePackage->valid)
+        {
+            // Pop the trailing "ok" line if present.
+            auto responses = framePackage->responses;
+            if (!responses.empty())
+                responses.pop_back();
+
+            const qtac::ByteArray response =
+                responses.empty() ? framePackage->responses.back() : responses.back();
+
+            if (onI2CReadResult)
+                onI2CReadResult(response, true);
+        }
+        else
+        {
+            if (onI2CReadResult && !framePackage->responses.empty())
+                onI2CReadResult(framePackage->responses.back(), false);
+        }
+    }
+}
+
+void TACPSOCDriveThread::handleI2CWrite(FramePackage& framePackage)
+{
+    if (onI2CWriteResult)
+    {
+        if (framePackage->valid)
+        {
+            // Build "Request arg0 Successful"
+            std::string argStr;
+            if (!framePackage->arguments.empty())
+                argStr = framePackage->arguments.at(0).asString();
+            const qtac::ByteArray msg = framePackage->request + " " + argStr.c_str() + " Successful";
+            onI2CWriteResult(msg);
+        }
+        else
+        {
+            const qtac::ByteArray last =
+                framePackage->responses.empty() ? qtac::ByteArray() : framePackage->responses.back();
+            onI2CWriteResult(qtac::ByteArray("\"") + last + "\" Are the parameters correct?");
+        }
+    }
+}
+
+void TACPSOCDriveThread::handleSetPin(FramePackage& framePackage)
+{
+    // arguments: [0]=bool state, [1]=uint32_t pin
+    if (framePackage->arguments.size() >= 2)
+    {
+        const bool     state = framePackage->arguments.at(0).asBool();
+        const uint64_t pin   = static_cast<uint64_t>(
+                                   framePackage->arguments.at(1).asUInt32());
+
+        framePackage->synonym =
+            qtac::ByteArray("Pin ") + std::to_string(pin).c_str() + " " + (state ? "on" : "off");
+
+        if (onPinStateChanged) onPinStateChanged(pin, state);
+    }
+}
+
+void TACPSOCDriveThread::handleSetName(FramePackage& framePackage)
+{
+    if (!framePackage->arguments.empty())
+    {
+        _name = framePackage->arguments.at(0).asString();
+        framePackage->synonym = qtac::ByteArray("Set Name ") + _name;
+    }
+    if (onNameUpdate) onNameUpdate(qtac::String(_name.toStdString()));
+}
+
+void TACPSOCDriveThread::handleUUIDResponse(FramePackage& framePackage)
+{
+    if (framePackage->responses.size() > 1)
+    {
+        _uuid = qtac::String(framePackage->responses.at(1).toStdString());
+        if (onUuidUpdate) onUuidUpdate(_uuid);
+    }
+}
+
+void TACPSOCDriveThread::handleVersionResponse(FramePackage& framePackage)
+{
+    if (framePackage->responses.size() > 1)
+    {
+        bool        isEPM{false};
+        std::string versionString = framePackage->responses.at(0).toStdString();
+        if (versionString.find("EPM") != std::string::npos)
+        {
+            isEPM = true;
+        }
+        else
+        {
+            versionString = framePackage->responses.at(1).toStdString();
+            if (versionString.find("EPM") != std::string::npos)
+                isEPM = true;
+        }
+
+        _versionString = qtac::ByteArray(versionString);
+        writeLogLine("Version String: " + versionString);
+
+        _versionRetryCount = 1;
+
+        _hardwareType = isEPM ? ePSOC : eSpiderBoard;
+
+        if (onHardwareTypeUpdate) onHardwareTypeUpdate(debugBoardTypeString());
+
+        // Parse "... FW <type> <version> ..." to extract firmware version string.
+        // Split on whitespace.
+        std::vector<std::string> parts;
+        {
+            std::istringstream iss(versionString);
+            std::string tok;
+            while (iss >> tok)
+                parts.push_back(tok);
+        }
+
+        if (parts.size() >= 7)
+        {
+            auto it = std::find(parts.begin(), parts.end(), "FW");
+            if (it != parts.end() && (it + 2) < parts.end())
+            {
+                try
+                {
+                    const std::string firmwareStr = *(it + 2);
+                    _firmwareString = qtac::ByteArray(firmwareStr);
+
+                    // Split version on "."
+                    std::vector<std::string> vParts;
+                    {
+                        std::istringstream viss(firmwareStr);
+                        std::string vtok;
+                        while (std::getline(viss, vtok, '.'))
+                            vParts.push_back(vtok);
+                    }
+                    if (vParts.size() >= 4)
+                    {
+                        _firmwareMajor    = static_cast<unsigned int>(std::stoul(vParts.at(0)));
+                        _firmwareChip     = static_cast<unsigned int>(std::stoul(vParts.at(1)));
+                        _firmwareMinor    = static_cast<unsigned int>(std::stoul(vParts.at(2)));
+                        _firmwareRevision = static_cast<unsigned int>(std::stoul(vParts.at(3)));
+
+                        if (_firmwareMinor < 15)
+                            _oldFirmware = true;
+                    }
+
+                    if (onFirmwareVersionUpdate)
+                        onFirmwareVersionUpdate(qtac::String(firmwareStr));
+                }
+                catch (...)
+                {
+                    writeLogLine("Version Parts Failed");
+                }
+            }
+        }
+
+        if (onDeviceStatusChange) onDeviceStatusChange(qtac::String("TAC Version Good"));
+        setupConnected();
+    }
+    else if (_versionRetryCount < 4)
+    {
+        writeLogLine("Version Failed Retry " + std::to_string(_versionRetryCount));
+        TACPSOCCommand cmd(this, this);
+        cmd.version();
+        ++_versionRetryCount;
+    }
+}
+
+void TACPSOCDriveThread::handlePlatformID(FramePackage& framePackage)
+{
+    if (framePackage->responses.size() >= 2)
+    {
+        try
+        {
+            _platformID = static_cast<PlatformID>(std::stoi(framePackage->responses.at(1).toStdString()));
+        }
+        catch (...) {}
+    }
+    if (onPlatformIDUpdate) onPlatformIDUpdate(static_cast<int>(_platformID));
+    setupConnected();
+}
+
+// -----------------------------------------------------------------------
+// Setup callbacks
+// -----------------------------------------------------------------------
+
+void TACPSOCDriveThread::setupConnected()
+{
+    if (!_connected)
+    {
+        if (onHardwareVersionUpdate) onHardwareVersionUpdate(hardwareVersionString());
+
+        _connected = true;
+
+        {
+            TACPSOCCommand cmd(this, this);
+            cmd.uuid();
+            cmd.name();
+        }
+
+        if (onDeviceConnected) onDeviceConnected();
+    }
+}
+
+void TACPSOCDriveThread::setupDiscovery()
+{
+    if (onHardwareVersionUpdate) onHardwareVersionUpdate(hardwareVersionString());
+
+    TACPSOCCommand cmd(this, this);
+    cmd.uuid();
+    cmd.name();
+    cmd.platformID();
+}
+
+} // namespace qtac
diff --git a/source/library/src/TACPSOCProtocol.cpp b/source/library/src/TACPSOCProtocol.cpp
new file mode 100644
index 00000000..fc13c9a6
--- /dev/null
+++ b/source/library/src/TACPSOCProtocol.cpp
@@ -0,0 +1,165 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: Michael Simpson
+
+#include <qtac/TACPSOCProtocol.h>
+#include <qtac/TACPSOCCoder.h>
+#include <qtac/TACDriveThread.h>
+#include <qtac/StringUtilities.h>
+
+#include <cassert>
+#include <chrono>
+
+namespace qtac {
+
+static uint64_t tickCount()
+{
+    using namespace std::chrono;
+    return static_cast<uint64_t>(
+        duration_cast<milliseconds>(steady_clock::now().time_since_epoch()).count());
+}
+
+// Prompt string recognised in frameComplete().
+static const qtac::ByteArray kCommand              {"CMD >> "};
+static const qtac::ByteArray kCommandNotRecognized {"CMD: Command not recognized."};
+
+TACPSOCProtocol::TACPSOCProtocol()
+{
+    setFrameCoder(new TACPSOCCoder);
+}
+
+TACPSOCProtocol::~TACPSOCProtocol()
+{
+    delete _frameCoder;
+    _frameCoder = nullptr;
+}
+
+void TACPSOCProtocol::setTACDriveTrain(TACDriveThread* tacDriveTrain)
+{
+    assert(tacDriveTrain != nullptr);
+    _tacDriveTrain = tacDriveTrain;
+}
+
+uint32_t TACPSOCProtocol::sendCommand(const qtac::ByteArray& command,
+                                       const Arguments&   arguments,
+                                       bool               console,
+                                       ReceiveInterface*  receiveInterface,
+                                       bool               shouldStore)
+{
+    if (command.isEmpty())
+        return kBadQueueValue;
+
+    const uint32_t result = getNextSendID();
+
+    FramePackage framePackage = makeFramePackage();
+    framePackage->packetID         = result;
+    framePackage->request          = command;
+    framePackage->arguments        = arguments;
+    framePackage->requestHash      = arrayHash(command);
+    framePackage->console          = console;
+    framePackage->shouldStore      = shouldStore;
+    framePackage->tickcount        = tickCount();
+    framePackage->receiveInterface = receiveInterface;
+
+    if (_frameCoder)
+        framePackage->codedRequest = _frameCoder->encode(command, arguments);
+    else
+        framePackage->codedRequest = command;
+
+    ProtocolInterface::queueCommand(framePackage);
+    return result;
+}
+
+void TACPSOCProtocol::endTransaction(ReceiveInterface* receiveInterface)
+{
+    ProtocolInterface::queueEndTransaction(receiveInterface);
+}
+
+void TACPSOCProtocol::sendHelpCommand()
+{
+}
+
+void TACPSOCProtocol::receive(FramePackage& framePackage)
+{
+    _tacDriveTrain->receive(framePackage);
+}
+
+void TACPSOCProtocol::idle()
+{
+}
+
+// -----------------------------------------------------------------------
+// frameComplete
+//
+// Called by the coder for each decoded token.  Non-prompt, non-empty lines
+// are accumulated in _responseLines.  The empty-string sentinel triggers
+// the commit: populate the pending frame package, validate it ("ok" last
+// line, case-insensitive), and route it to the drive thread.
+// -----------------------------------------------------------------------
+void TACPSOCProtocol::frameComplete(const qtac::ByteArray& completedFrame)
+{
+    if (!completedFrame.isEmpty())
+    {
+        // Skip the prompt line itself; keep all other lines.
+        if (!completedFrame.contains(kCommand))
+            _responseLines.push_back(completedFrame);
+    }
+    else
+    {
+        // Sentinel — commit the packet.
+        FramePackage& fp = pendingFramePackage();
+        if (fp)
+        {
+            fp->responses = _responseLines;
+
+            // Valid if the last non-empty line is "ok" (case-insensitive).
+            fp->valid = false;
+            if (!_responseLines.empty())
+                fp->valid = (_responseLines.back().trimmed().toLower() == "ok");
+
+            if (fp->receiveInterface)
+                fp->receiveInterface->receive(fp);
+            else
+                _tacDriveTrain->receive(fp);
+        }
+
+        clearPendingFrame();
+        _responseLines.clear();
+    }
+}
+
+void TACPSOCProtocol::badFrame(const qtac::ByteArray& /*completedFrame*/)
+{
+}
+
+} // namespace qtac
diff --git a/source/library/src/TACSTM32Coder.cpp b/source/library/src/TACSTM32Coder.cpp
new file mode 100644
index 00000000..d507e8a0
--- /dev/null
+++ b/source/library/src/TACSTM32Coder.cpp
@@ -0,0 +1,85 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Qt-free port of TACSTM32Coder from qcommon-console.
+
+#include <qtac/TACSTM32Coder.h>
+#include <qtac/TACCommandHashes.h>
+
+namespace {
+const uint8_t kCommandGpioSet{0x01};
+const int     kReportPayloadSize{32};
+} // namespace
+
+namespace qtac {
+
+TACSTM32Coder::TACSTM32Coder()  = default;
+TACSTM32Coder::~TACSTM32Coder() = default;
+
+void TACSTM32Coder::reset()
+{
+    FrameCoder::reset();
+    _gpioState = 0;
+}
+
+void TACSTM32Coder::decode(const qtac::ByteArray& /*decodeMe*/)
+{
+    // BugHopper V2 has no framed protocol to decode responses from.
+}
+
+qtac::ByteArray TACSTM32Coder::encode(const qtac::ByteArray& encodeMe,
+                                       const Arguments& arguments)
+{
+    qtac::ByteArray result;
+
+    if (arrayHash(encodeMe) == kSetPinCommandHash)
+    {
+        if (arguments.size() >= 2)
+        {
+            const bool     state  = arguments.at(0).asBool();
+            const uint16_t pin    = static_cast<uint16_t>(arguments.at(1).asUInt32());
+            const uint8_t  pinBit = static_cast<uint8_t>(1u << pin);
+
+            _gpioState = state ? (_gpioState | pinBit) : (_gpioState & ~pinBit);
+
+            // 33-byte HID report: result[0] = 0 (report ID), [1] = cmd, [2] = state, [3] = pin
+            result = qtac::ByteArray(kReportPayloadSize + 1, char(0));
+            result[1] = static_cast<char>(kCommandGpioSet);
+            result[2] = static_cast<char>(_gpioState);
+            result[3] = static_cast<char>(pinBit);
+        }
+    }
+
+    return result;
+}
+
+} // namespace qtac
diff --git a/source/library/src/TACSTM32Command.cpp b/source/library/src/TACSTM32Command.cpp
new file mode 100644
index 00000000..2d95102d
--- /dev/null
+++ b/source/library/src/TACSTM32Command.cpp
@@ -0,0 +1,85 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Qt-free port of TACSTM32Command from qcommon-console.
+
+#include <qtac/TACSTM32Command.h>
+#include <qtac/SendInterface.h>
+#include <qtac/ReceiveInterface.h>
+
+static const qtac::ByteArray kSetPinCommand{"SetPin"};
+
+namespace qtac {
+
+TACSTM32Command::TACSTM32Command(SendInterface* sender, ReceiveInterface* receiver)
+    : _receiver(receiver)
+    , _sender(sender)
+    , _ready(sender->ready())
+{
+}
+
+TACSTM32Command::~TACSTM32Command()
+{
+    addEndTransaction();
+}
+
+void TACSTM32Command::setPinState(uint16_t pin, bool state)
+{
+    Arguments args;
+    args.push_back(state);
+    args.push_back(static_cast<uint32_t>(pin));
+    send(kSetPinCommand, args, false, false);
+}
+
+void TACSTM32Command::send(const qtac::ByteArray& command,
+                            const Arguments& arguments,
+                            bool console, bool store)
+{
+    _sender->send(command, arguments, console, _receiver, store);
+}
+
+void TACSTM32Command::addDelay(uint32_t delayInMilliSeconds)
+{
+    _sender->addDelay(delayInMilliSeconds, _receiver);
+}
+
+void TACSTM32Command::addLogComment(const qtac::ByteArray& comment)
+{
+    _sender->addLogComment(comment);
+}
+
+void TACSTM32Command::addEndTransaction()
+{
+    _sender->addEndTransaction(_receiver);
+}
+
+} // namespace qtac
diff --git a/source/library/src/TACSTM32DriveThread.cpp b/source/library/src/TACSTM32DriveThread.cpp
new file mode 100644
index 00000000..7edb778e
--- /dev/null
+++ b/source/library/src/TACSTM32DriveThread.cpp
@@ -0,0 +1,354 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Qt-free port of TACSTM32DriveThread from qcommon-console.
+
+#include <qtac/TACSTM32DriveThread.h>
+#include <qtac/TACSTM32Command.h>
+#include <qtac/AlpacaDevice.h>
+#include <qtac/TACCommandHashes.h>
+#include <qtac/STM32Device.h>
+
+#include <thread>
+#include <sstream>
+#include <string>
+
+static const qtac::ByteArray kTACSTM32DriveTrainName{"TAC STM32 Drive Train"};
+
+namespace qtac {
+
+// -----------------------------------------------------------------------
+// Construction
+// -----------------------------------------------------------------------
+
+TACSTM32DriveThread::TACSTM32DriveThread(HashType hash)
+    : TACDriveThread(hash)
+{
+    _driveTrainName = kTACSTM32DriveTrainName;
+    setProtocolInterface(&_tacProtocol);
+    _tacProtocol.setTACDriveTrain(this);
+
+    AlpacaDevice alpacaDevice = _AlpacaDevice::findAlpacaDevice(hash);
+    if (!alpacaDevice || !alpacaDevice->active())
+        return;
+
+    _stm32Device = static_cast<STM32Device*>(alpacaDevice.get());
+
+    _portName    = alpacaDevice->portName();
+    _platformID  = alpacaDevice->platformID();
+    _hardwareType = alpacaDevice->debugBoardType();
+    _name        = alpacaDevice->serialNumber();
+    _description = "Arduino BugHopper V2 Board";
+    _uuid        = "Bug Hopper V2 - No UUID";
+
+    setSerialNumber(alpacaDevice->serialNumber().toStdString());
+    setPortName(alpacaDevice->portName());
+
+    onDeviceDisconnected.connect([alpacaDevice]() {
+        alpacaDevice->onDeviceDisconnect();
+    });
+    onProgress.connect([alpacaDevice](uint8_t value, NotificationLevel /*level*/) {
+        if (alpacaDevice->onProgress)
+            alpacaDevice->onProgress(value, 1 /*eInfoNotification*/);
+    });
+}
+
+TACSTM32DriveThread::~TACSTM32DriveThread() = default;
+
+// -----------------------------------------------------------------------
+// STM32 device open
+// -----------------------------------------------------------------------
+
+bool TACSTM32DriveThread::openSTM32Device()
+{
+    if (_stm32Device == nullptr)
+    {
+        writeLogLine("TACSTM32DriveThread::openSTM32Device _stm32Device is null");
+        if (onErrorOnOpen) onErrorOnOpen(qtac::ByteArray("Arduino BugHopper V2 device open failed. Check the application log"));
+        return false;
+    }
+
+    if (!_stm32Device->openTransport())
+    {
+        if (onErrorOnOpen) onErrorOnOpen(qtac::ByteArray("Arduino BugHopper V2 device open failed. Check the application log"));
+        return false;
+    }
+
+    return true;
+}
+
+// -----------------------------------------------------------------------
+// Public command methods
+// -----------------------------------------------------------------------
+
+void TACSTM32DriveThread::setPinState(uint64_t pin, bool state)
+{
+    {
+        TACSTM32Command cmd(this, this);
+        cmd.setPinState(static_cast<uint16_t>(pin), state);
+    }
+    waitForCompletion();
+}
+
+void TACSTM32DriveThread::sendCommandSequence(CommandEntries& commandEntries)
+{
+    {
+        TACSTM32Command cmd(this, this);
+
+        for (const auto& entry : commandEntries)
+        {
+            switch (entry->_commandAction)
+            {
+            case _CommandEntry::eNotSet:
+                break;
+            case _CommandEntry::eSetPin:
+                cmd.setPinState(static_cast<uint16_t>(entry->_pinID),
+                                entry->_arguement.toBool());
+                break;
+            case _CommandEntry::eLog:
+                cmd.addLogComment(qtac::ByteArray(entry->_arguement.toString().toStdString()));
+                break;
+            case _CommandEntry::eDelay:
+                cmd.addDelay(entry->_arguement.toUInt());
+                break;
+            case _CommandEntry::eBaseCommand:
+                break;
+            }
+
+            if (onProgress) onProgress(0 /*kProgressActive*/, NotificationLevel::Info);
+        }
+    }
+    waitForCompletion();
+}
+
+int  TACSTM32DriveThread::getResetCount()   { return 0; }
+void TACSTM32DriveThread::clearResetCount()  {}
+
+void TACSTM32DriveThread::i2CReadRegister(uint32_t /*addr*/, uint32_t /*reg*/)   {}
+void TACSTM32DriveThread::i2CWriteRegister(uint32_t /*addr*/, uint32_t /*reg*/, uint32_t /*data*/) {}
+
+void TACSTM32DriveThread::setName(const qtac::ByteArray& /*newName*/)
+{
+    // BugHopper V2 does not support rename.
+}
+
+void TACSTM32DriveThread::sendCommand(const qtac::ByteArray& command,
+                                       bool console,
+                                       ReceiveInterface* receiveInterface,
+                                       bool shouldStore)
+{
+    Arguments args;
+    qtac::ByteArray decoded = decodeCommand(command, args);
+    send(decoded, args, console, receiveInterface, shouldStore);
+}
+
+uint32_t TACSTM32DriveThread::send(const qtac::ByteArray& sendMe,
+                                    const Arguments& arguments,
+                                    bool console,
+                                    ReceiveInterface* receiveInterface,
+                                    bool store)
+{
+    return _tacProtocol.sendCommand(sendMe, arguments, console, receiveInterface, store);
+}
+
+bool TACSTM32DriveThread::ready()
+{
+    return _tacProtocol.queueSize() == 0;
+}
+
+// -----------------------------------------------------------------------
+// receive — called back from the run() loop
+// -----------------------------------------------------------------------
+
+void TACSTM32DriveThread::receive(FramePackage& framePackage)
+{
+    if (framePackage->endTransaction)
+    {
+        clearWaitForCompletion();
+        if (onTransactionEnded) onTransactionEnded();
+        if (onProgress)         onProgress(100 /*kProgressMax*/, NotificationLevel::Info);
+    }
+    else if (framePackage->valid)
+    {
+        switch (framePackage->requestHash)
+        {
+        case kSetPinCommandHash:
+            {
+                uint64_t pin   = 0;
+                bool     state = false;
+
+                if (framePackage->arguments.size() >= 1)
+                    state = framePackage->arguments.at(0).asBool();
+                if (framePackage->arguments.size() >= 2)
+                    pin = static_cast<uint64_t>(framePackage->arguments.at(1).asUInt32());
+
+                framePackage->synonym = qtac::ByteArray("Set Pin ")
+                                      + std::to_string(pin).c_str() + " "
+                                      + (state ? "on" : "off");
+
+                if (onPinStateChanged) onPinStateChanged(pin, state);
+            }
+            break;
+        default:
+            break;
+        }
+    }
+    else
+    {
+        clearWaitForCompletion();
+        if (!framePackage->lastError.isEmpty() && onErrorOnOpen)
+            onErrorOnOpen(framePackage->lastError);
+    }
+
+    log(framePackage);
+    _protocolInterface->clearPendingFrame();
+}
+
+// -----------------------------------------------------------------------
+// run() — drive thread main loop
+// -----------------------------------------------------------------------
+
+void TACSTM32DriveThread::run()
+{
+    writeLogLine("TACSTM32DriveThread::run()");
+
+    if (openSTM32Device())
+    {
+        writeLogLine("TACSTM32DriveThread::run() openSTM32Device() == true");
+        if (onDeviceOpen) onDeviceOpen();
+        startRunning();
+    }
+
+    if (weAreRunning())
+    {
+        if (onHardwareVersionUpdate) onHardwareVersionUpdate("0.0.1");
+        if (onNameUpdate)            onNameUpdate(_name.toStdString());
+        if (onUuidUpdate)            onUuidUpdate(_uuid.toStdString());
+        if (onSerialNumUpdate)       onSerialNumUpdate(_serialNumber.toStdString());
+        if (onPlatformIDUpdate)      onPlatformIDUpdate(static_cast<int>(_platformID));
+
+        if (onDeviceStatusChange) onDeviceStatusChange("Starting");
+
+        writeLogLine("setupConnected()");
+        setupConnected();
+    }
+    else
+    {
+        writeLogLine("TACSTM32DriveThread::run() emit deviceDisconnected");
+        if (onDeviceDisconnected) onDeviceDisconnected();
+    }
+
+    if (weAreRunning())
+    {
+        writeLogLine("TACSTM32DriveThread::run() starting loop");
+        bool loopFinished = false;
+
+        while (!loopFinished)
+        {
+            FramePackage fp = _protocolInterface->getNextFramePackage();
+
+            if (fp)
+            {
+                if (fp->delayInMilliSeconds != 0 ||
+                    !fp->comment.isEmpty()       ||
+                    fp->endTransaction           ||
+                    checkLocalStore(fp))
+                {
+                    receive(fp);
+                }
+                else if (_stm32Device != nullptr)
+                {
+                    if (_stm32Device->write(fp->codedRequest))
+                    {
+                        receive(fp);
+                    }
+                    else
+                    {
+                        std::ostringstream oss;
+                        oss << "TACSTM32DriveThread::run() write failure for request "
+                            << fp->request.toStdString();
+                        writeLogLine(oss.str());
+
+                        fp->valid     = false;
+                        fp->lastError = "BugHopper V2 write failed";
+
+                        receive(fp);
+                    }
+                }
+                else
+                {
+                    writeLogLine("TACSTM32DriveThread::run() _stm32Device is null.");
+                    stopRunning();
+                }
+            }
+            else
+            {
+                if (!weAreRunning())
+                {
+                    writeLogLine("TACSTM32DriveThread::run() loopFinished == true");
+                    loopFinished = true;
+                }
+                else
+                {
+                    std::this_thread::sleep_for(std::chrono::milliseconds(5));
+                }
+            }
+        }
+    }
+
+    writeLogLine("TACSTM32DriveThread::run() close()");
+    if (_stm32Device != nullptr)
+        _stm32Device->close();
+
+    _connected = false;
+    if (onDeviceDisconnected) onDeviceDisconnected();
+}
+
+// -----------------------------------------------------------------------
+// Setup callbacks
+// -----------------------------------------------------------------------
+
+void TACSTM32DriveThread::setupConnected()
+{
+    if (!_connected)
+    {
+        _connected = true;
+        if (onDeviceConnected) onDeviceConnected();
+    }
+}
+
+void TACSTM32DriveThread::setupDiscovery()
+{
+    // Nothing to do for STM32.
+}
+
+} // namespace qtac
diff --git a/source/library/src/TACSTM32Protocol.cpp b/source/library/src/TACSTM32Protocol.cpp
new file mode 100644
index 00000000..de9284b3
--- /dev/null
+++ b/source/library/src/TACSTM32Protocol.cpp
@@ -0,0 +1,121 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Qt-free port of TACSTM32Protocol from qcommon-console.
+
+#include <qtac/TACSTM32Protocol.h>
+#include <qtac/TACDriveThread.h>
+#include <qtac/StringUtilities.h>
+
+#include <chrono>
+#include <cassert>
+
+namespace qtac {
+
+static uint64_t tickCount()
+{
+    using namespace std::chrono;
+    return static_cast<uint64_t>(
+        duration_cast<milliseconds>(steady_clock::now().time_since_epoch()).count());
+}
+
+TACSTM32Protocol::TACSTM32Protocol()
+{
+    setFrameCoder(new TACSTM32Coder);
+}
+
+TACSTM32Protocol::~TACSTM32Protocol()
+{
+    delete _frameCoder;
+    _frameCoder = nullptr;
+}
+
+void TACSTM32Protocol::setTACDriveTrain(TACDriveThread* tacDriveTrain)
+{
+    assert(tacDriveTrain != nullptr);
+    _tacDriveTrain = tacDriveTrain;
+}
+
+uint32_t TACSTM32Protocol::sendCommand(const qtac::ByteArray& command,
+                                        const Arguments& arguments,
+                                        bool console,
+                                        ReceiveInterface* receiveInterface,
+                                        bool shouldStore)
+{
+    if (command.isEmpty())
+        return kBadQueueValue;
+
+    const uint32_t result = getNextSendID();
+
+    FramePackage fp = makeFramePackage();
+    fp->packetID         = result;
+    fp->request          = command;
+    fp->arguments        = arguments;
+    fp->requestHash      = arrayHash(command);
+    fp->console          = console;
+    fp->shouldStore      = shouldStore;
+    fp->tickcount        = tickCount();
+    fp->receiveInterface = receiveInterface;
+
+    if (_frameCoder)
+        fp->codedRequest = _frameCoder->encode(command, arguments);
+    else
+        fp->codedRequest = command;
+
+    ProtocolInterface::queueCommand(fp);
+    return result;
+}
+
+void TACSTM32Protocol::endTransaction(ReceiveInterface* receiveInterface)
+{
+    ProtocolInterface::queueEndTransaction(receiveInterface);
+}
+
+void TACSTM32Protocol::receive(FramePackage& framePackage)
+{
+    _tacDriveTrain->receive(framePackage);
+}
+
+void TACSTM32Protocol::idle()
+{
+}
+
+void TACSTM32Protocol::frameComplete(const qtac::ByteArray& /*completedFrame*/)
+{
+    clearPendingFrame();
+}
+
+void TACSTM32Protocol::badFrame(const qtac::ByteArray& /*completedFrame*/)
+{
+}
+
+} // namespace qtac
diff --git a/source/library/src/TcnfLoader.cpp b/source/library/src/TcnfLoader.cpp
new file mode 100644
index 00000000..f0fb3e41
--- /dev/null
+++ b/source/library/src/TcnfLoader.cpp
@@ -0,0 +1,123 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <qtac/TcnfLoader.h>
+#include <qtac/json_util.h>
+
+#include <fstream>
+#include <sstream>
+
+// -----------------------------------------------------------------------
+
+static bool openAndParse(const std::string& path, json_t& out)
+{
+    if (path.empty()) return false;
+    std::ifstream file(path);
+    if (!file.is_open()) return false;
+    std::string contents((std::istreambuf_iterator<char>(file)),
+                          std::istreambuf_iterator<char>());
+    try { out = boost::json::parse(contents); }
+    catch (...) { return false; }
+    return true;
+}
+
+static std::string readTextFile(const std::string& path)
+{
+    std::ifstream f(path);
+    if (!f.is_open()) return {};
+    std::ostringstream ss;
+    ss << f.rdbuf();
+    return ss.str();
+}
+
+// Derive the directory component from a file path (includes trailing slash).
+static std::string dirOf(const std::string& path)
+{
+    auto pos = path.find_last_of("/\\");
+    return (pos == std::string::npos) ? std::string() : path.substr(0, pos + 1);
+}
+
+bool TcnfLoader::loadPSOC(const std::string& path, _PSOCPlatformConfiguration* cfg)
+{
+    if (!cfg) return false;
+    json_t j;
+    if (!openAndParse(path, j)) return false;
+    if (!cfg->read(j)) return false;
+
+    if (cfg->getScript().isEmpty())
+    {
+        std::string defaultScriptPath = dirOf(path) + "DefaultScript.txt";
+        std::string text = readTextFile(defaultScriptPath);
+        if (!text.empty())
+            cfg->loadDefaultScript(qtac::String(text));
+    }
+
+    return true;
+}
+
+bool TcnfLoader::loadFTDI(const std::string& path, _FTDIPlatformConfiguration* cfg)
+{
+    if (!cfg) return false;
+    json_t j;
+    if (!openAndParse(path, j)) return false;
+    if (!cfg->read(j)) return false;
+
+    // If the tcnf defined no script, load the sibling DefaultScript.txt so that
+    // the default Quick Settings buttons (powerOn, bootToEDL, etc.) are functional.
+    if (cfg->getScript().isEmpty())
+    {
+        std::string defaultScriptPath = dirOf(path) + "DefaultScript.txt";
+        std::string text = readTextFile(defaultScriptPath);
+        if (!text.empty())
+            cfg->loadDefaultScript(qtac::String(text));
+    }
+
+    return true;
+}
+
+bool TcnfLoader::loadPIC32CX(const std::string& path, _PIC32CXPlatformConfiguration* cfg)
+{
+    if (!cfg) return false;
+    json_t j;
+    if (!openAndParse(path, j)) return false;
+    if (!cfg->read(j)) return false;
+
+    if (cfg->getScript().isEmpty())
+    {
+        std::string defaultScriptPath = dirOf(path) + "DefaultScript.txt";
+        std::string text = readTextFile(defaultScriptPath);
+        if (!text.empty())
+            cfg->loadDefaultScript(qtac::String(text));
+    }
+
+    return true;
+}
diff --git a/source/library/src/ThreadedLog.cpp b/source/library/src/ThreadedLog.cpp
new file mode 100644
index 00000000..dee20cbd
--- /dev/null
+++ b/source/library/src/ThreadedLog.cpp
@@ -0,0 +1,144 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+
+#include <qtac/ThreadedLog.h>
+
+#include <chrono>
+#include <ctime>
+#include <iomanip>
+#include <sstream>
+
+namespace qtac {
+
+_ThreadedLog::~_ThreadedLog()
+{
+    close();
+}
+
+void _ThreadedLog::open(const qtac::ByteArray& filePath)
+{
+    _currentLogPath = filePath;
+
+    _starting = true;
+    _thread = std::thread([this] { run(); });
+
+    // Wait for run() to signal that the file is open (or failed).
+    while (_starting)
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+}
+
+bool _ThreadedLog::isOpen()
+{
+    return _running;
+}
+
+void _ThreadedLog::close()
+{
+    if (_running)
+    {
+        _running = false;
+        _currentLogPath = qtac::ByteArray();
+    }
+
+    if (_thread.joinable())
+        _thread.join();
+}
+
+void _ThreadedLog::addLogEntry(const qtac::ByteArray& logEntry)
+{
+    std::lock_guard<std::recursive_mutex> lock(_mutex);
+    _logEntries.push_back(logEntry);
+}
+
+void _ThreadedLog::run()
+{
+    _logFile.open(_currentLogPath.toStdString(), std::ios::out | std::ios::binary);
+
+    _starting = false;
+    _running  = _logFile.is_open();
+
+    while (_running)
+    {
+        qtac::ByteArray entry;
+
+        {
+            std::lock_guard<std::recursive_mutex> lock(_mutex);
+            if (!_logEntries.empty())
+            {
+                entry = std::move(_logEntries.front());
+                _logEntries.erase(_logEntries.begin());
+            }
+        }
+
+        if (!entry.isEmpty())
+        {
+            _logFile << entry.toStdString();
+            _logFile.flush();
+        }
+        else
+        {
+            std::this_thread::sleep_for(std::chrono::milliseconds(100));
+        }
+    }
+
+    // Drain any remaining entries after _running is cleared.
+    std::lock_guard<std::recursive_mutex> lock(_mutex);
+    for (const auto& entry : _logEntries)
+        _logFile << entry.toStdString();
+    _logEntries.clear();
+
+    _logFile.close();
+}
+
+ThreadedLog _ThreadedLog::createThreadedLog()
+{
+    return std::make_shared<_ThreadedLog>();
+}
+
+qtac::ByteArray _ThreadedLog::createLogName(const qtac::ByteArray& prefix)
+{
+    using namespace std::chrono;
+    auto now   = system_clock::to_time_t(system_clock::now());
+    std::tm tm{};
+#if defined(_WIN32)
+    localtime_s(&tm, &now);
+#else
+    localtime_r(&now, &tm);
+#endif
+    std::ostringstream ss;
+    ss << prefix.toStdString() << std::put_time(&tm, "%m%d_%H%M%S") << ".log";
+    return qtac::ByteArray(ss.str().c_str());
+}
+
+} // namespace qtac
diff --git a/source/library/src/Variant.cpp b/source/library/src/Variant.cpp
new file mode 100644
index 00000000..ecf0aa86
--- /dev/null
+++ b/source/library/src/Variant.cpp
@@ -0,0 +1,284 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <qtac/Variant.h>
+#include <new>
+
+namespace qtac {
+
+// Helpers for placement-new access to non-trivial union members
+static inline qtac::String* strPtr(Variant::Storage* s)
+{
+    return reinterpret_cast<qtac::String*>(s->str);
+}
+static inline const qtac::String* strPtr(const Variant::Storage* s)
+{
+    return reinterpret_cast<const qtac::String*>(s->str);
+}
+static inline ByteArray* baPtr(Variant::Storage* s)
+{
+    return reinterpret_cast<ByteArray*>(s->ba);
+}
+static inline const ByteArray* baPtr(const Variant::Storage* s)
+{
+    return reinterpret_cast<const ByteArray*>(s->ba);
+}
+
+// --- Lifecycle helpers ---
+
+void Variant::_destroy()
+{
+    if (_type == Type::String)
+        strPtr(&_data)->~String();
+    else if (_type == Type::ByteArray)
+        baPtr(&_data)->~ByteArray();
+    _type = Type::Invalid;
+}
+
+void Variant::_copyFrom(const Variant& other)
+{
+    _type = other._type;
+    switch (_type) {
+    case Type::Invalid:                                             break;
+    case Type::Bool:      _data.b   = other._data.b;              break;
+    case Type::Int:       _data.i   = other._data.i;              break;
+    case Type::UInt:      _data.u   = other._data.u;              break;
+    case Type::LongLong:  _data.ll  = other._data.ll;             break;
+    case Type::ULongLong: _data.ull = other._data.ull;            break;
+    case Type::Double:    _data.d   = other._data.d;              break;
+    case Type::String:
+        new (_data.str) qtac::String(*strPtr(&other._data));
+        break;
+    case Type::ByteArray:
+        new (_data.ba) ByteArray(*baPtr(&other._data));
+        break;
+    }
+}
+
+// --- Constructors ---
+
+Variant::Variant() : _type(Type::Invalid) {}
+Variant::Variant(bool value)               : _type(Type::Bool)      { _data.b   = value; }
+Variant::Variant(int value)                : _type(Type::Int)       { _data.i   = value; }
+Variant::Variant(unsigned int value)       : _type(Type::UInt)      { _data.u   = value; }
+Variant::Variant(long long value)          : _type(Type::LongLong)  { _data.ll  = value; }
+Variant::Variant(unsigned long long value) : _type(Type::ULongLong) { _data.ull = value; }
+Variant::Variant(double value)             : _type(Type::Double)    { _data.d   = value; }
+
+Variant::Variant(const qtac::String& value) : _type(Type::String)
+{
+    new (_data.str) qtac::String(value);
+}
+
+Variant::Variant(const char* value) : _type(Type::String)
+{
+    new (_data.str) qtac::String(value);
+}
+
+Variant::Variant(const ByteArray& value) : _type(Type::ByteArray)
+{
+    new (_data.ba) ByteArray(value);
+}
+
+Variant::Variant(const Variant& other) : _type(Type::Invalid)
+{
+    _copyFrom(other);
+}
+
+Variant& Variant::operator=(const Variant& other)
+{
+    if (this != &other) {
+        _destroy();
+        _copyFrom(other);
+    }
+    return *this;
+}
+
+Variant::~Variant()
+{
+    _destroy();
+}
+
+// --- Type checking ---
+
+bool Variant::isValid() const
+{
+    return _type != Type::Invalid;
+}
+
+Variant::Type Variant::type() const
+{
+    return _type;
+}
+
+// --- Value access ---
+
+bool Variant::toBool() const
+{
+    switch (_type) {
+    case Type::Bool:      return _data.b;
+    case Type::Int:       return _data.i != 0;
+    case Type::UInt:      return _data.u != 0;
+    case Type::LongLong:  return _data.ll != 0;
+    case Type::ULongLong: return _data.ull != 0;
+    case Type::Double:    return _data.d != 0.0;
+    case Type::String:    return !strPtr(&_data)->isEmpty();
+    case Type::ByteArray: return !baPtr(&_data)->isEmpty();
+    default:              return false;
+    }
+}
+
+int Variant::toInt(bool* ok) const
+{
+    if (ok) *ok = true;
+    switch (_type) {
+    case Type::Int:       return _data.i;
+    case Type::Bool:      return _data.b ? 1 : 0;
+    case Type::UInt:      return static_cast<int>(_data.u);
+    case Type::LongLong:  return static_cast<int>(_data.ll);
+    case Type::ULongLong: return static_cast<int>(_data.ull);
+    case Type::Double:    return static_cast<int>(_data.d);
+    case Type::String:    return strPtr(&_data)->toInt(ok);
+    default:              if (ok) *ok = false; return 0;
+    }
+}
+
+unsigned int Variant::toUInt(bool* ok) const
+{
+    if (ok) *ok = true;
+    switch (_type) {
+    case Type::UInt:      return _data.u;
+    case Type::Bool:      return _data.b ? 1u : 0u;
+    case Type::Int:       return static_cast<unsigned int>(_data.i);
+    case Type::LongLong:  return static_cast<unsigned int>(_data.ll);
+    case Type::ULongLong: return static_cast<unsigned int>(_data.ull);
+    case Type::Double:    return static_cast<unsigned int>(_data.d);
+    case Type::String:    return strPtr(&_data)->toUInt(ok);
+    default:              if (ok) *ok = false; return 0;
+    }
+}
+
+long long Variant::toLongLong(bool* ok) const
+{
+    if (ok) *ok = true;
+    switch (_type) {
+    case Type::LongLong:  return _data.ll;
+    case Type::Bool:      return _data.b ? 1LL : 0LL;
+    case Type::Int:       return _data.i;
+    case Type::UInt:      return _data.u;
+    case Type::ULongLong: return static_cast<long long>(_data.ull);
+    case Type::Double:    return static_cast<long long>(_data.d);
+    case Type::String:    return strPtr(&_data)->toLongLong(ok);
+    default:              if (ok) *ok = false; return 0;
+    }
+}
+
+unsigned long long Variant::toULongLong(bool* ok) const
+{
+    if (ok) *ok = true;
+    switch (_type) {
+    case Type::ULongLong: return _data.ull;
+    case Type::Bool:      return _data.b ? 1ULL : 0ULL;
+    case Type::Int:       return static_cast<unsigned long long>(_data.i);
+    case Type::UInt:      return _data.u;
+    case Type::LongLong:  return static_cast<unsigned long long>(_data.ll);
+    case Type::Double:    return static_cast<unsigned long long>(_data.d);
+    case Type::String:    return strPtr(&_data)->toULongLong(ok);
+    default:              if (ok) *ok = false; return 0;
+    }
+}
+
+double Variant::toDouble(bool* ok) const
+{
+    if (ok) *ok = true;
+    switch (_type) {
+    case Type::Double:    return _data.d;
+    case Type::Bool:      return _data.b ? 1.0 : 0.0;
+    case Type::Int:       return static_cast<double>(_data.i);
+    case Type::UInt:      return static_cast<double>(_data.u);
+    case Type::LongLong:  return static_cast<double>(_data.ll);
+    case Type::ULongLong: return static_cast<double>(_data.ull);
+    case Type::String:    return strPtr(&_data)->toDouble(ok);
+    default:              if (ok) *ok = false; return 0.0;
+    }
+}
+
+qtac::String Variant::toString() const
+{
+    switch (_type) {
+    case Type::String:    return *strPtr(&_data);
+    case Type::Bool:      return qtac::String(_data.b ? "true" : "false");
+    case Type::Int:       return qtac::String::number(_data.i);
+    case Type::UInt:      return qtac::String::number(_data.u);
+    case Type::LongLong:  return qtac::String::number(_data.ll);
+    case Type::ULongLong: return qtac::String::number(_data.ull);
+    case Type::Double:    return qtac::String::number(_data.d);
+    case Type::ByteArray: return qtac::String(*baPtr(&_data));
+    default:              return qtac::String();
+    }
+}
+
+ByteArray Variant::toByteArray() const
+{
+    if (_type == Type::ByteArray)
+        return *baPtr(&_data);
+    return toString().toLatin1();
+}
+
+// --- Comparison ---
+
+bool operator==(const Variant& lhs, const Variant& rhs)
+{
+    if (lhs._type != rhs._type)
+        return false;
+    switch (lhs._type) {
+    case Variant::Type::Invalid:   return true;
+    case Variant::Type::Bool:      return lhs._data.b   == rhs._data.b;
+    case Variant::Type::Int:       return lhs._data.i   == rhs._data.i;
+    case Variant::Type::UInt:      return lhs._data.u   == rhs._data.u;
+    case Variant::Type::LongLong:  return lhs._data.ll  == rhs._data.ll;
+    case Variant::Type::ULongLong: return lhs._data.ull == rhs._data.ull;
+    case Variant::Type::Double:    return lhs._data.d   == rhs._data.d;
+    case Variant::Type::String:
+        return *strPtr(&lhs._data) == *strPtr(&rhs._data);
+    case Variant::Type::ByteArray:
+        return *baPtr(&lhs._data) == *baPtr(&rhs._data);
+    }
+    return false;
+}
+
+bool operator!=(const Variant& lhs, const Variant& rhs)
+{
+    return !(lhs == rhs);
+}
+
+} // namespace qtac
diff --git a/source/library/src/boost_json_src.cpp b/source/library/src/boost_json_src.cpp
new file mode 100644
index 00000000..9ed83d8b
--- /dev/null
+++ b/source/library/src/boost_json_src.cpp
@@ -0,0 +1,38 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Compile boost::json as a header-only library.
+// This is the single translation unit that includes the full boost::json
+// implementation. All other files include <boost/json.hpp> only (declarations).
+// See: https://www.boost.org/doc/libs/1_78_0/libs/json/doc/html/json/overview.html
+
+#include <boost/json/src.hpp>
diff --git a/source/library/src/platform/SerialPortInfo_posix.cpp b/source/library/src/platform/SerialPortInfo_posix.cpp
new file mode 100644
index 00000000..edbcb342
--- /dev/null
+++ b/source/library/src/platform/SerialPortInfo_posix.cpp
@@ -0,0 +1,79 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+// POSIX (Linux/macOS) implementation of SerialPortInfo::availablePorts().
+// libserialport reads VID/PID and serial number from sysfs on Linux,
+// which works correctly without any additional registry fallback.
+
+#include <qtac/SerialPortInfo.h>
+
+#include <libserialport.h>
+
+namespace qtac {
+
+SerialPortInfos SerialPortInfo::availablePorts()
+{
+	SerialPortInfos result;
+
+	sp_port** portList = nullptr;
+	if (sp_list_ports(&portList) != SP_OK || portList == nullptr)
+		return result;
+
+	for (int i = 0; portList[i] != nullptr; ++i)
+	{
+		SerialPortInfo info;
+
+		const char* name = sp_get_port_name(portList[i]);
+		const char* desc = sp_get_port_description(portList[i]);
+		if (name) info.setPortName(qtac::String(name));
+		if (desc) info.setDescription(qtac::String(desc));
+
+		if (sp_get_port_transport(portList[i]) == SP_TRANSPORT_USB)
+		{
+			const char* serial = sp_get_port_usb_serial(portList[i]);
+			if (serial) info.setSerialNumber(qtac::String(serial));
+
+			int vid = 0, pid = 0;
+			sp_get_port_usb_vid_pid(portList[i], &vid, &pid);
+			info.setVendorIdentifier(static_cast<uint16_t>(vid));
+			info.setProductIdentifier(static_cast<uint16_t>(pid));
+		}
+
+		result.push_back(info);
+	}
+
+	sp_free_port_list(portList);
+	return result;
+}
+
+} // namespace qtac
diff --git a/source/library/src/platform/SerialPortInfo_win32.cpp b/source/library/src/platform/SerialPortInfo_win32.cpp
new file mode 100644
index 00000000..0535afa0
--- /dev/null
+++ b/source/library/src/platform/SerialPortInfo_win32.cpp
@@ -0,0 +1,256 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Authors: Michael Simpson, Biswajit Roy
+// Windows implementation of SerialPortInfo::availablePorts().
+//
+// libserialport's sp_get_port_transport() does not always detect USB transport
+// for ports using the generic Windows usbser.sys driver (shows as "USB Serial
+// Device" instead of "USB Serial Port"), causing VID/PID to come back as 0.
+// The fallback reads VID/PID and serial number from the Windows device registry
+// via SetupDI, which is exactly what Qt's QSerialPortInfo does internally.
+
+#include <qtac/SerialPortInfo.h>
+
+#include <libserialport.h>
+
+#include <windows.h>
+#include <setupapi.h>
+#include <devguid.h>
+#include <cfgmgr32.h>
+#pragma comment(lib, "setupapi.lib")
+#pragma comment(lib, "cfgmgr32.lib")
+
+namespace {
+
+// Read VID/PID and revision from the Windows registry for a given COM port name.
+// Parses the hardware ID string, e.g. "USB\VID_05C6&PID_9302&REV_0055\...".
+static bool readVidPidFromRegistry(const std::string& portName, uint16_t& vid, uint16_t& pid, uint16_t& rev)
+{
+	vid = 0;
+	pid = 0;
+	rev = 0;
+
+	HDEVINFO devInfo = SetupDiGetClassDevsA(&GUID_DEVINTERFACE_COMPORT, nullptr, nullptr,
+		DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
+	if (devInfo == INVALID_HANDLE_VALUE)
+		return false;
+
+	SP_DEVINFO_DATA devInfoData{};
+	devInfoData.cbSize = sizeof(SP_DEVINFO_DATA);
+
+	for (DWORD i = 0; SetupDiEnumDeviceInfo(devInfo, i, &devInfoData); ++i)
+	{
+		HKEY hKey = SetupDiOpenDevRegKey(devInfo, &devInfoData, DICS_FLAG_GLOBAL, 0,
+			DIREG_DEV, KEY_READ);
+		if (hKey == INVALID_HANDLE_VALUE)
+			continue;
+
+		char portNameBuf[256]{};
+		DWORD portNameSize = sizeof(portNameBuf);
+		DWORD type = 0;
+		LONG res = RegQueryValueExA(hKey, "PortName", nullptr, &type,
+			reinterpret_cast<LPBYTE>(portNameBuf), &portNameSize);
+		RegCloseKey(hKey);
+
+		if (res != ERROR_SUCCESS || type != REG_SZ)
+			continue;
+		if (_stricmp(portNameBuf, portName.c_str()) != 0)
+			continue;
+
+		char hwIdBuf[512]{};
+		DWORD hwIdSize = sizeof(hwIdBuf);
+		if (!SetupDiGetDeviceRegistryPropertyA(devInfo, &devInfoData, SPDRP_HARDWAREID,
+			nullptr, reinterpret_cast<PBYTE>(hwIdBuf), hwIdSize, &hwIdSize))
+			break;
+
+		std::string hwId(hwIdBuf);
+		auto vidPos = hwId.find("VID_");
+		auto pidPos = hwId.find("PID_");
+		if (vidPos != std::string::npos && pidPos != std::string::npos)
+		{
+			vid = static_cast<uint16_t>(std::stoul(hwId.substr(vidPos + 4, 4), nullptr, 16));
+			pid = static_cast<uint16_t>(std::stoul(hwId.substr(pidPos + 4, 4), nullptr, 16));
+		}
+		auto revPos = hwId.find("REV_");
+		if (revPos != std::string::npos)
+		{
+			try { rev = static_cast<uint16_t>(std::stoul(hwId.substr(revPos + 4, 4), nullptr, 16)); }
+			catch (...) {}
+		}
+		break;
+	}
+
+	SetupDiDestroyDeviceInfoList(devInfo);
+	return vid != 0;
+}
+
+// Read serial number from the device instance ID for a COM port.
+// Instance ID format: "USB\VID_XXXX&PID_YYYY\SERIALNUMBER"
+// For composite USB devices the MI_xx interface instance ID ends with
+// an auto-generated "N&xxxxxxxx&0&xxxx" segment that contains '&'.
+// In that case walk up to the parent device which carries the real serial.
+static std::string readSerialFromRegistry(const std::string& portName)
+{
+	HDEVINFO devInfo = SetupDiGetClassDevsA(&GUID_DEVINTERFACE_COMPORT, nullptr, nullptr,
+		DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
+	if (devInfo == INVALID_HANDLE_VALUE)
+		return {};
+
+	SP_DEVINFO_DATA devInfoData{};
+	devInfoData.cbSize = sizeof(SP_DEVINFO_DATA);
+	std::string result;
+
+	for (DWORD i = 0; SetupDiEnumDeviceInfo(devInfo, i, &devInfoData); ++i)
+	{
+		HKEY hKey = SetupDiOpenDevRegKey(devInfo, &devInfoData, DICS_FLAG_GLOBAL, 0,
+			DIREG_DEV, KEY_READ);
+		if (hKey == INVALID_HANDLE_VALUE)
+			continue;
+
+		char portNameBuf[256]{};
+		DWORD portNameSize = sizeof(portNameBuf);
+		DWORD type = 0;
+		LONG res = RegQueryValueExA(hKey, "PortName", nullptr, &type,
+			reinterpret_cast<LPBYTE>(portNameBuf), &portNameSize);
+		RegCloseKey(hKey);
+
+		if (res != ERROR_SUCCESS || _stricmp(portNameBuf, portName.c_str()) != 0)
+			continue;
+
+		char instanceId[256]{};
+		if (SetupDiGetDeviceInstanceIdA(devInfo, &devInfoData, instanceId,
+			sizeof(instanceId), nullptr))
+		{
+			std::string id(instanceId);
+			auto lastSlash = id.rfind('\\');
+			if (lastSlash != std::string::npos)
+			{
+				std::string serial = id.substr(lastSlash + 1);
+				if (serial.find('&') == std::string::npos)
+				{
+					// Direct serial on this node
+					result = serial;
+				}
+				else
+				{
+					// Composite device interface — walk up to parent to get real serial
+					DEVINST parent = 0;
+					if (CM_Get_Parent(&parent, devInfoData.DevInst, 0) == CR_SUCCESS)
+					{
+						char parentId[256]{};
+						if (CM_Get_Device_IDA(parent, parentId, sizeof(parentId), 0) == CR_SUCCESS)
+						{
+							std::string pid(parentId);
+							auto pSlash = pid.rfind('\\');
+							if (pSlash != std::string::npos)
+							{
+								std::string parentSerial = pid.substr(pSlash + 1);
+								if (parentSerial.find('&') == std::string::npos)
+									result = parentSerial;
+							}
+						}
+					}
+				}
+			}
+		}
+		break;
+	}
+
+	SetupDiDestroyDeviceInfoList(devInfo);
+	return result;
+}
+
+} // anonymous namespace
+
+namespace qtac {
+
+SerialPortInfos SerialPortInfo::availablePorts()
+{
+	SerialPortInfos result;
+
+	sp_port** portList = nullptr;
+	if (sp_list_ports(&portList) != SP_OK || portList == nullptr)
+		return result;
+
+	for (int i = 0; portList[i] != nullptr; ++i)
+	{
+		SerialPortInfo info;
+
+		const char* name = sp_get_port_name(portList[i]);
+		const char* desc = sp_get_port_description(portList[i]);
+		if (name)
+		{
+			// libserialport on Windows returns "\\.\COM16" style names;
+			// Qt's QSerialPortInfo returns just "COM16". Strip the "\\.\" prefix.
+			std::string nameStr(name);
+			if (nameStr.rfind("\\\\.\\", 0) == 0)
+				nameStr = nameStr.substr(4);
+			info.setPortName(qtac::String(nameStr));
+		}
+		if (desc)
+		{
+			// libserialport appends " (COMxx)" to descriptions; Qt's QSerialPortInfo does not.
+			// Strip the trailing " (COMxx)" so the description matches Qt's output.
+			std::string descStr(desc);
+			auto paren = descStr.rfind(" (COM");
+			if (paren != std::string::npos && descStr.back() == ')')
+				descStr.erase(paren);
+			info.setDescription(qtac::String(descStr));
+		}
+
+		// Always use the SetupDI registry API for VID/PID and serial number.
+		// This matches Qt's QSerialPortInfo behavior for all USB serial devices
+		// regardless of driver (FTDI, usbser.sys, etc.).
+		if (name)
+		{
+			uint16_t vid = 0, pid = 0, rev = 0;
+			if (readVidPidFromRegistry(name, vid, pid, rev))
+			{
+				info.setVendorIdentifier(vid);
+				info.setProductIdentifier(pid);
+				info.setRevision(rev);
+			}
+
+			std::string serial = readSerialFromRegistry(name);
+			if (!serial.empty())
+				info.setSerialNumber(qtac::String(serial));
+		}
+
+		result.push_back(info);
+	}
+
+	sp_free_port_list(portList);
+	return result;
+}
+
+} // namespace qtac
diff --git a/source/library/src/qtac_core.cpp b/source/library/src/qtac_core.cpp
new file mode 100644
index 00000000..d04b1ec3
--- /dev/null
+++ b/source/library/src/qtac_core.cpp
@@ -0,0 +1,35 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+namespace qtac {
+const char* version() { return "0.1.0"; }
+}
diff --git a/source/tacdev/CMakeLists.txt b/source/tacdev/CMakeLists.txt
new file mode 100644
index 00000000..7c78d9eb
--- /dev/null
+++ b/source/tacdev/CMakeLists.txt
@@ -0,0 +1,96 @@
+# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted (subject to the limitations in the
+# disclaimer below) provided that the following conditions are met:
+#
+#     * Redistributions of source code must retain the above copyright
+#         notice, this list of conditions and the following disclaimer.
+#
+#     * Redistributions in binary form must reproduce the above
+#         copyright notice, this list of conditions and the following
+#         disclaimer in the documentation and/or other materials provided
+#         with the distribution.
+#
+#     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+#         contributors may be used to endorse or promote products derived
+#         from this software without specific prior written permission.
+#
+# NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+# GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+# HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cmake_minimum_required(VERSION 3.16)
+project(TACDev VERSION 1.0 LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# Disable Qt auto-tools — this library has no Qt dependency.
+set(CMAKE_AUTOMOC OFF)
+set(CMAKE_AUTOUIC OFF)
+set(CMAKE_AUTORCC OFF)
+
+# No Qt — this is a pure qtac-core DLL.
+add_library(TACDev SHARED
+    TACDev.h
+    TACDev.cpp
+    TACDevCore.h
+    TACDevCore.cpp
+)
+
+target_include_directories(TACDev PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/../library/include
+)
+
+if(WIN32)
+    if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+        set(_TACDEV_WINTARGET "Win32")
+    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "ARM64|aarch64" OR CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64")
+        set(_TACDEV_WINTARGET "ARM64")
+    else()
+        set(_TACDEV_WINTARGET "x64")
+    endif()
+    target_link_directories(TACDev PRIVATE
+        "${CMAKE_CURRENT_SOURCE_DIR}/../../__Builds/${_TACDEV_WINTARGET}/Release/lib"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../../__Builds/${_TACDEV_WINTARGET}/Debug/lib"
+    )
+endif()
+
+target_link_libraries(TACDev PRIVATE
+    qtac-core
+    serialport
+)
+
+if(WIN32)
+    if(COMMAND link_ftd2xx)
+        link_ftd2xx(TACDev)
+    endif()
+    target_link_libraries(TACDev PRIVATE
+        Advapi32
+        SetupAPI
+        cfgmgr32
+    )
+endif()
+
+target_compile_definitions(TACDev PRIVATE
+    TACDEV_LIBRARY
+    $<$<CONFIG:Debug>:DEBUG;_DEBUG>
+    $<$<NOT:$<CONFIG:Debug>>:NDEBUG;_NDEBUG>
+)
+
+install(TARGETS TACDev
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
diff --git a/source/tacdev/TACDev.cpp b/source/tacdev/TACDev.cpp
new file mode 100644
index 00000000..8918325a
--- /dev/null
+++ b/source/tacdev/TACDev.cpp
@@ -0,0 +1,600 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "TACDev.h"
+#include "TACDevCore.h"
+
+#include <qtac/AlpacaScript.h>
+#include <qtac/DebugBoardType.h>
+
+#include <cstring>
+#include <thread>
+#include <chrono>
+
+// ---------------------------------------------------------------------------
+// Version constants
+// ---------------------------------------------------------------------------
+
+#define ALPACA_VERSION  "5.5.2"
+#define TAC_VERSION     "7.0.1"
+
+// ---------------------------------------------------------------------------
+// Globals
+// ---------------------------------------------------------------------------
+
+static DevTACCore gCore;
+
+static const qtac::ByteArray kHandleNotOpen(
+    "TAC device is not open. Please reopen the TAC device");
+static const qtac::ByteArray kBufferTooSmall("TACDev buffer is too small");
+static const qtac::ByteArray kBadIndex("User provided invalid index");
+
+// ---------------------------------------------------------------------------
+// Helper: safe copy into a caller-supplied char buffer.
+// Returns NO_TAC_ERROR on success, TACDEV_BUFFER_TOO_SMALL if too small.
+// ---------------------------------------------------------------------------
+
+static TAC_RESULT safeCopy(char* dest, int destSize,
+                           const qtac::ByteArray& src)
+{
+    if (src.size() >= destSize)
+    {
+        gCore.setLastError(kBufferTooSmall);
+        return TACDEV_BUFFER_TOO_SMALL;
+    }
+    std::memcpy(dest, src.constData(), static_cast<size_t>(src.size()));
+    dest[src.size()] = '\0';
+    return NO_TAC_ERROR;
+}
+
+// ---------------------------------------------------------------------------
+// InitializeTACDev
+// ---------------------------------------------------------------------------
+
+TAC_RESULT InitializeTACDev()
+{
+    // Nothing to initialise in the Qt-free implementation.
+    return NO_TAC_ERROR;
+}
+
+// ---------------------------------------------------------------------------
+// Version / error queries
+// ---------------------------------------------------------------------------
+
+TAC_RESULT GetAlpacaVersion(char* alpacaVersion, int bufferSize)
+{
+    return safeCopy(alpacaVersion, bufferSize, qtac::ByteArray(ALPACA_VERSION));
+}
+
+TAC_RESULT GetTACVersion(char* tacVersion, int bufferSize)
+{
+    return safeCopy(tacVersion, bufferSize, qtac::ByteArray(TAC_VERSION));
+}
+
+TAC_RESULT GetLastTACError(char* lastError, int bufferSize)
+{
+    return safeCopy(lastError, bufferSize, gCore.lastError());
+}
+
+// ---------------------------------------------------------------------------
+// Logging (no-op in Qt-free build)
+// ---------------------------------------------------------------------------
+
+TAC_RESULT GetLoggingState(bool* loggingState)
+{
+    *loggingState = false;
+    return NO_TAC_ERROR;
+}
+
+TAC_RESULT SetLoggingState(bool /*loggingState*/)
+{
+    return NO_TAC_ERROR;
+}
+
+// ---------------------------------------------------------------------------
+// Device enumeration
+// ---------------------------------------------------------------------------
+
+TAC_RESULT GetDeviceCount(int* deviceCount)
+{
+    return gCore.getDeviceCount(deviceCount);
+}
+
+unsigned long GetPortData(int deviceIndex, char* portData, int bufferSize)
+{
+    const AlpacaDevices& devices = gCore.alpacaDevices();
+    if (deviceIndex < 0 || deviceIndex >= static_cast<int>(devices.size()))
+        return 0;
+
+    const AlpacaDevice& dev = devices.at(deviceIndex);
+
+    qtac::ByteArray data = dev->portName();
+    data += ";";
+    data += dev->description();
+    data += ";";
+    data += dev->serialNumber();
+    data += ";";
+    data += qtac::ByteArray::number(deviceIndex);
+
+    if (data.size() >= bufferSize)
+        return static_cast<unsigned long>(data.size());
+
+    std::memcpy(portData, data.constData(), static_cast<size_t>(data.size()));
+    portData[data.size()] = '\0';
+    return static_cast<unsigned long>(data.size());
+}
+
+// ---------------------------------------------------------------------------
+// Handle open / close
+// ---------------------------------------------------------------------------
+
+TAC_HANDLE OpenHandleByDescription(const char* portName)
+{
+    return gCore.openHandleByDescription(portName);
+}
+
+TAC_RESULT CloseTACHandle(TAC_HANDLE tacHandle)
+{
+    return gCore.closeHandle(tacHandle);
+}
+
+// ---------------------------------------------------------------------------
+// Device properties
+// ---------------------------------------------------------------------------
+
+TAC_RESULT GetName(TAC_HANDLE tacHandle, char* deviceName, int bufferSize)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(tacHandle);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+    return safeCopy(deviceName, bufferSize, dev->name());
+}
+
+TAC_RESULT GetFirmwareVersion(TAC_HANDLE tacHandle, char* firmwareVersion, int bufferSize)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(tacHandle);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+    return safeCopy(firmwareVersion, bufferSize, dev->firmwareVersion().toLatin1());
+}
+
+TAC_RESULT GetHardware(TAC_HANDLE tacHandle, char* hardware, int bufferSize)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(tacHandle);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+    return safeCopy(hardware, bufferSize, dev->debugBoardTypeString().toLatin1());
+}
+
+TAC_RESULT GetHardwareVersion(TAC_HANDLE tacHandle, char* hardwareVersion, int bufferSize)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(tacHandle);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+    return safeCopy(hardwareVersion, bufferSize, dev->hardwareVersionString().toLatin1());
+}
+
+TAC_RESULT GetUUID(TAC_HANDLE tacHandle, char* uuid, int bufferSize)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(tacHandle);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+    return safeCopy(uuid, bufferSize, dev->uuid().toLatin1());
+}
+
+// ---------------------------------------------------------------------------
+// External power
+// ---------------------------------------------------------------------------
+
+TAC_ERROR SetExternalPowerControl(TAC_HANDLE tacHandle, bool state)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(tacHandle);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+    if (!dev->hasCommand(qtac::ByteArray("extpower")))
+    {
+        gCore.setLastError(qtac::ByteArray("External power control not supported on this device"));
+        return TACDEV_COMMAND_NOT_FOUND;
+    }
+    dev->externalPowerControl(state);
+    return NO_TAC_ERROR;
+}
+
+// ---------------------------------------------------------------------------
+// Dynamic command list
+// ---------------------------------------------------------------------------
+
+TAC_ERROR GetCommandCount(TAC_HANDLE tacHandle, unsigned long* commandCount)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(tacHandle);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+    *commandCount = static_cast<unsigned long>(dev->commandCount());
+    return NO_TAC_ERROR;
+}
+
+TAC_ERROR GetCommand(TAC_HANDLE tacHandle, unsigned long commandIndex,
+                     char* commandBuffer, int bufferSize)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(tacHandle);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+
+    TACCommand entry = dev->commandEntry(static_cast<uint32_t>(commandIndex));
+    if (entry._pin == static_cast<PinID>(-1))
+    {
+        gCore.setLastError(kBadIndex);
+        return TACDEV_BAD_INDEX;
+    }
+
+    qtac::ByteArray data = entry._command.toLatin1();
+    data += ";";
+    data += entry._helpText.toLatin1();
+    data += ";";
+    data += qtac::ByteArray::number(static_cast<int>(entry._pin));
+    data += ";";
+    data += entry._tabName;
+    data += ";";
+    data += entry._groupName;
+    data += ";";
+    data += entry._cellLocation;
+
+    return safeCopy(commandBuffer, bufferSize, data);
+}
+
+// ---------------------------------------------------------------------------
+// Quick commands (named script functions from ButtonEntries)
+// ---------------------------------------------------------------------------
+
+TAC_ERROR GetQuickCommandCount(TAC_HANDLE tacHandle, unsigned long* commandCount)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(tacHandle);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+    *commandCount = static_cast<unsigned long>(dev->getButtons().size());
+    return NO_TAC_ERROR;
+}
+
+TAC_ERROR GetQuickCommand(TAC_HANDLE tacHandle, unsigned long commandIndex,
+                          char* commandBuffer, int bufferSize)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(tacHandle);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+
+    const qtac::ButtonEntries& buttons = dev->getButtons();
+    if (commandIndex >= static_cast<unsigned long>(buttons.size()))
+    {
+        gCore.setLastError(kBadIndex);
+        return TACDEV_BAD_INDEX;
+    }
+
+    const qtac::ButtonEntry& btn = buttons[commandIndex];
+    qtac::ByteArray data = btn._name.toLatin1();
+    data += ";";
+    data += btn._command.toLatin1();
+    data += ";";
+    data += btn._tooltip.toLatin1();
+    data += ";";
+    data += qtac::ByteArray::number(btn._cellX);
+    data += ",";
+    data += qtac::ByteArray::number(btn._cellY);
+    return safeCopy(commandBuffer, bufferSize, data);
+}
+
+// ---------------------------------------------------------------------------
+// Script variables (from VariableEntries)
+// ---------------------------------------------------------------------------
+
+TAC_ERROR GetScriptVariableCount(TAC_HANDLE tacHandle, unsigned long* scriptVariableCount)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(tacHandle);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+    *scriptVariableCount = static_cast<unsigned long>(dev->getVariables().size());
+    return NO_TAC_ERROR;
+}
+
+TAC_ERROR GetScriptVariable(TAC_HANDLE tacHandle, unsigned long scriptVariableIndex,
+                            char* scriptVariableBuffer, int bufferSize)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(tacHandle);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+
+    const qtac::VariableEntries& vars = dev->getVariables();
+    if (scriptVariableIndex >= static_cast<unsigned long>(vars.size()))
+    {
+        gCore.setLastError(kBadIndex);
+        return TACDEV_BAD_INDEX;
+    }
+
+    // Iterate to the requested index (qtac::Map iterates in sorted order).
+    auto it = vars.begin();
+    std::advance(it, scriptVariableIndex);
+    const qtac::VariableEntry& var = it->second;
+
+    // Build the semicolon-separated payload:
+    // name;label;tooltip;type;defaultValue;cellX,cellY
+    qtac::ByteArray defaultVal;
+    switch (var._type)
+    {
+    case qtac::VariableType::Boolean:
+        defaultVal = var._defaultValue.toBool() ? "1" : "0";
+        break;
+    case qtac::VariableType::Float:
+        defaultVal = var._defaultValue.toString().toLatin1();
+        break;
+    default:
+        defaultVal = qtac::ByteArray::number(static_cast<int>(var._defaultValue.toUInt()));
+        break;
+    }
+
+    qtac::ByteArray data = var._name.toLatin1();
+    data += ";";
+    data += var._label.toLatin1();
+    data += ";";
+    data += var._tooltip.toLatin1();
+    data += ";";
+    data += qtac::ByteArray::number(static_cast<int>(var._type));
+    data += ";";
+    data += defaultVal;
+    data += ";";
+    data += qtac::ByteArray::number(var._cellX);
+    data += ",";
+    data += qtac::ByteArray::number(var._cellY);
+    return safeCopy(scriptVariableBuffer, bufferSize, data);
+}
+
+TAC_ERROR UpdateScriptVariableValue(TAC_HANDLE tacHandle,
+                                    const char* scriptVariable,
+                                    const char* scriptVariableValue)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(tacHandle);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+
+    // Determine variable type and set accordingly.
+    const qtac::VariableEntries& vars = dev->getVariables();
+    qtac::String name(scriptVariable);
+    auto it = vars.find(name);
+    if (it == vars.end())
+    {
+        gCore.setLastError(qtac::ByteArray("Script variable not found: ") +
+                           qtac::ByteArray(scriptVariable));
+        return TACDEV_SCRIPT_VARIABLE_NOT_FOUND;
+    }
+
+    const qtac::VariableEntry& var = it->second;
+    if (var._type == qtac::VariableType::Boolean)
+    {
+        bool val = (std::strcmp(scriptVariableValue, "true") == 0 ||
+                    std::strcmp(scriptVariableValue, "1")    == 0);
+        dev->setVariableValue(name, qtac::Variant(val));
+    }
+    else
+    {
+        bool ok = false;
+        int val = qtac::ByteArray(scriptVariableValue).toInt(&ok);
+        dev->setVariableValue(name, qtac::Variant(ok ? val : 0));
+    }
+
+    return NO_TAC_ERROR;
+}
+
+// ---------------------------------------------------------------------------
+// Generic command state get/set
+// ---------------------------------------------------------------------------
+
+TAC_ERROR GetCommandState(TAC_HANDLE tacHandle, const char* command, bool* state)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(tacHandle);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+
+    qtac::ByteArray cmd(command);
+    if (!dev->hasCommand(cmd))
+    {
+        gCore.setLastError(qtac::ByteArray("Command '") + cmd + "' not found");
+        return TACDEV_COMMAND_NOT_FOUND;
+    }
+    *state = dev->getCommandState(cmd);
+    return NO_TAC_ERROR;
+}
+
+TAC_ERROR SendCommand(TAC_HANDLE tacHandle, const char* command, bool state)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(tacHandle);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+
+    qtac::ByteArray cmd(command);
+    if (!dev->hasCommand(cmd))
+    {
+        gCore.setLastError(qtac::ByteArray("Command '") + cmd + "' not found");
+        return TACDEV_COMMAND_NOT_FOUND;
+    }
+    dev->setWaitForCompletion();
+    dev->sendCommand(cmd, state);
+    return NO_TAC_ERROR;
+}
+
+// ---------------------------------------------------------------------------
+// Help text
+// ---------------------------------------------------------------------------
+
+TAC_ERROR GetHelpText(TAC_HANDLE tacHandle, char* helpBuffer,
+                      int bufferSize, int* actualSize)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(tacHandle);
+    if (!dev)
+    {
+        if (actualSize) *actualSize = 0;
+        gCore.setLastError(kHandleNotOpen);
+        return TACDEV_BAD_TAC_HANDLE;
+    }
+
+    qtac::ByteArray help = dev->getHelp();
+    if (actualSize) *actualSize = help.size();
+    return safeCopy(helpBuffer, bufferSize, help);
+}
+
+// ---------------------------------------------------------------------------
+// Raw pin state
+// ---------------------------------------------------------------------------
+
+TAC_ERROR SetPinState(TAC_HANDLE tacHandle, int pin, bool state)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(tacHandle);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+    dev->setWaitForCompletion();
+    dev->setPinState(static_cast<PinID>(pin), state);
+    return NO_TAC_ERROR;
+}
+
+// ---------------------------------------------------------------------------
+// Command queue
+// ---------------------------------------------------------------------------
+
+TAC_ERROR IsCommandQueueClear(TAC_HANDLE tacHandle, bool* status)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(tacHandle);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+
+    // Invert: isCommandQueueClear() returns true when clear.
+    *status = !dev->isCommandQueueClear();
+
+    // PIC32CX firmware doesn't send ack — apply legacy delay.
+    if (dev->debugBoardType() == ePIC32CXAuto)
+        std::this_thread::sleep_for(std::chrono::seconds(10));
+
+    return NO_TAC_ERROR;
+}
+
+// ---------------------------------------------------------------------------
+// Named pin commands (delegate to generic send/get)
+// ---------------------------------------------------------------------------
+
+static TAC_RESULT setCmd(TAC_HANDLE h, const char* cmd, bool state)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(h);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+    qtac::ByteArray command(cmd);
+    if (!dev->hasCommand(command))
+    {
+        gCore.setLastError(qtac::ByteArray("Command '") + command + "' not found");
+        return TACDEV_COMMAND_NOT_FOUND;
+    }
+    dev->setWaitForCompletion();
+    dev->sendCommand(command, state);
+    return NO_TAC_ERROR;
+}
+
+static TAC_RESULT getCmd(TAC_HANDLE h, const char* cmd, bool* state)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(h);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+    qtac::ByteArray command(cmd);
+    if (!dev->hasCommand(command))
+    {
+        gCore.setLastError(qtac::ByteArray("Command '") + command + "' not found");
+        return TACDEV_COMMAND_NOT_FOUND;
+    }
+    *state = dev->getCommandState(command);
+    return NO_TAC_ERROR;
+}
+
+TAC_RESULT SetBatteryState(TAC_HANDLE h, bool s)    { return setCmd(h, "battery", s); }
+TAC_RESULT GetBatteryState(TAC_HANDLE h, bool* s)   { return getCmd(h, "battery", s); }
+TAC_RESULT Usb0(TAC_HANDLE h, bool s)               { return setCmd(h, "usb0", s); }
+TAC_RESULT GetUsb0State(TAC_HANDLE h, bool* s)      { return getCmd(h, "usb0", s); }
+TAC_RESULT Usb1(TAC_HANDLE h, bool s)               { return setCmd(h, "usb1", s); }
+TAC_RESULT GetUsb1State(TAC_HANDLE h, bool* s)      { return getCmd(h, "usb1", s); }
+TAC_RESULT PowerKey(TAC_HANDLE h, bool s)           { return setCmd(h, "pkey", s); }
+TAC_RESULT GetPowerKeyState(TAC_HANDLE h, bool* s)  { return getCmd(h, "pkey", s); }
+TAC_RESULT VolumeUp(TAC_HANDLE h, bool s)           { return setCmd(h, "volup", s); }
+TAC_RESULT GetVolumeUpState(TAC_HANDLE h, bool* s)  { return getCmd(h, "volup", s); }
+TAC_RESULT VolumeDown(TAC_HANDLE h, bool s)         { return setCmd(h, "voldn", s); }
+TAC_RESULT GetVolumeDownState(TAC_HANDLE h, bool* s){ return getCmd(h, "voldn", s); }
+TAC_RESULT DisconnectUIM1(TAC_HANDLE h, bool s)     { return setCmd(h, "uim1", s); }
+TAC_RESULT GetDisconnectUIM1State(TAC_HANDLE h, bool* s) { return getCmd(h, "uim1", s); }
+TAC_RESULT DisconnectUIM2(TAC_HANDLE h, bool s)     { return setCmd(h, "uim2", s); }
+TAC_RESULT GetDisconnectUIM2State(TAC_HANDLE h, bool* s) { return getCmd(h, "uim2", s); }
+TAC_RESULT DisconnectSDCard(TAC_HANDLE h, bool s)   { return setCmd(h, "sdcard", s); }
+TAC_RESULT GetDisconnectSDCardState(TAC_HANDLE h, bool* s) { return getCmd(h, "sdcard", s); }
+TAC_RESULT PrimaryEDL(TAC_HANDLE h, bool s)         { return setCmd(h, "pedl", s); }
+TAC_RESULT GetPrimaryEDLState(TAC_HANDLE h, bool* s){ return getCmd(h, "pedl", s); }
+TAC_RESULT SecondaryEDL(TAC_HANDLE h, bool s)       { return setCmd(h, "sedl", s); }
+TAC_RESULT GetSecondaryEDLState(TAC_HANDLE h, bool* s) { return getCmd(h, "sedl", s); }
+TAC_RESULT ForcePSHoldHigh(TAC_HANDLE h, bool s)    { return setCmd(h, "pshold", s); }
+TAC_RESULT GetForcePSHoldHighState(TAC_HANDLE h, bool* s) { return getCmd(h, "pshold", s); }
+TAC_RESULT SecondaryPmResinN(TAC_HANDLE h, bool s)  { return setCmd(h, "sresn", s); }
+TAC_RESULT GetSecondaryPmResinNState(TAC_HANDLE h, bool* s) { return getCmd(h, "sresn", s); }
+TAC_RESULT Eud(TAC_HANDLE h, bool s)                { return setCmd(h, "eud", s); }
+TAC_RESULT GetEUDState(TAC_HANDLE h, bool* s)       { return getCmd(h, "eud", s); }
+TAC_RESULT HeadsetDisconnect(TAC_HANDLE h, bool s)  { return setCmd(h, "headset", s); }
+TAC_RESULT GetHeadsetDisconnectState(TAC_HANDLE h, bool* s) { return getCmd(h, "headset", s); }
+
+// ---------------------------------------------------------------------------
+// Rename / reset count
+// ---------------------------------------------------------------------------
+
+TAC_RESULT SetName(TAC_HANDLE tacHandle, const char* newName)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(tacHandle);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+    dev->setWaitForCompletion();
+    dev->setName(qtac::ByteArray(newName));
+    return NO_TAC_ERROR;
+}
+
+TAC_RESULT GetResetCount(TAC_HANDLE tacHandle, int* resetCount)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(tacHandle);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+    dev->setWaitForCompletion();
+    *resetCount = dev->getResetCount();
+    return NO_TAC_ERROR;
+}
+
+TAC_RESULT ClearResetCount(TAC_HANDLE tacHandle)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(tacHandle);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+    dev->setWaitForCompletion();
+    dev->clearResetCount();
+    return NO_TAC_ERROR;
+}
+
+// ---------------------------------------------------------------------------
+// Quick command buttons
+// ---------------------------------------------------------------------------
+
+static TAC_RESULT quickCmd(TAC_HANDLE h, const char* cmd)
+{
+    AlpacaDevice dev = gCore.getAlpacaDevice(h);
+    if (!dev) { gCore.setLastError(kHandleNotOpen); return TACDEV_BAD_TAC_HANDLE; }
+    dev->quickCommand(qtac::ByteArray(cmd));
+    return NO_TAC_ERROR;
+}
+
+TAC_RESULT PowerOnButton(TAC_HANDLE h)            { return quickCmd(h, "powerOn"); }
+TAC_RESULT PowerOffButton(TAC_HANDLE h)           { return quickCmd(h, "powerOff"); }
+TAC_RESULT BootToFastBootButton(TAC_HANDLE h)     { return quickCmd(h, "bootToFastboot"); }
+TAC_RESULT BootToUEFIMenuButton(TAC_HANDLE h)     { return quickCmd(h, "bootToUEFI"); }
+TAC_RESULT BootToEDLButton(TAC_HANDLE h)          { return quickCmd(h, "bootToEDL"); }
+TAC_RESULT BootToSecondaryEDLButton(TAC_HANDLE h) { return quickCmd(h, "bootToSecondaryEDL"); }
diff --git a/source/tacdev/TACDev.h b/source/tacdev/TACDev.h
new file mode 100644
index 00000000..11a537a1
--- /dev/null
+++ b/source/tacdev/TACDev.h
@@ -0,0 +1,184 @@
+#ifndef DEVTAC_H
+#define DEVTAC_H
+/*
+	Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. 
+	 
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted (subject to the limitations in the
+	disclaimer below) provided that the following conditions are met:
+	 
+		* Redistributions of source code must retain the above copyright
+		  notice, this list of conditions and the following disclaimer.
+	 
+		* Redistributions in binary form must reproduce the above
+		  copyright notice, this list of conditions and the following
+		  disclaimer in the documentation and/or other materials provided
+		  with the distribution.
+	 
+		* Neither the name of Qualcomm Technologies, Inc. nor the names of its
+		  contributors may be used to endorse or promote products derived
+		  from this software without specific prior written permission.
+	 
+	NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+	GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+	HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+	WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+	MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+	IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+	ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+	DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+	GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+	IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+	OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+	IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+   Author: Michael Simpson (msimpson@qti.qualcomm.com)
+*/
+
+#if defined(TACDEV_LIBRARY)
+	#ifdef __linux__
+		#define TACDEV_EXPORT __attribute__((visibility("default")))
+	#else
+		#define TACDEV_EXPORT __declspec(dllexport)
+	#endif
+#else
+	#ifdef __linux__
+	#   define TACDEV_EXPORT __attribute__((visibility("default")))
+	#else
+	#  define TACDEV_EXPORT  __declspec(dllimport)
+	#endif
+#endif
+
+typedef unsigned long TAC_HANDLE;
+typedef unsigned long TAC_ERROR;
+typedef unsigned long TAC_RESULT;
+
+const TAC_HANDLE kBadHandle{0};
+
+// Keep in sync with TACException.h
+
+const unsigned long NO_TAC_ERROR{0};
+const unsigned long TACDEV_BUFFER_TOO_SMALL{1};
+const unsigned long TACDEV_BAD_TAC_HANDLE{2};
+const unsigned long TACDEV_COMMAND_NOT_FOUND{3};
+const unsigned long TACDEV_BAD_INDEX{4};
+const unsigned long TACDEV_INIT_FAILED{5};
+const unsigned long TACDEV_SCRIPT_VARIABLE_NOT_FOUND{6};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+	// Must be called before any other calls
+	TACDEV_EXPORT TAC_RESULT InitializeTACDev();
+
+	TACDEV_EXPORT TAC_RESULT GetAlpacaVersion(char* alpacaVersion, int bufferSize);
+	TACDEV_EXPORT TAC_RESULT GetTACVersion(char* tacVersion, int bufferSize);
+	TACDEV_EXPORT TAC_RESULT GetLastTACError(char* lastError, int bufferSize);
+
+	TACDEV_EXPORT TAC_RESULT GetLoggingState(bool* loggingState);
+	TACDEV_EXPORT TAC_RESULT SetLoggingState(bool loggingState);
+
+	TACDEV_EXPORT TAC_RESULT GetDeviceCount(int* deviceCount);
+	TACDEV_EXPORT unsigned long GetPortData(int deviceIndex, char* portData, int bufferSize);
+
+	TACDEV_EXPORT TAC_HANDLE OpenHandleByDescription(const char* portName);
+	TACDEV_EXPORT TAC_RESULT CloseTACHandle(TAC_HANDLE tacHandle);
+
+	TACDEV_EXPORT TAC_RESULT GetName(TAC_HANDLE tacHandle, char* deviceName, int bufferSize);
+	TACDEV_EXPORT TAC_RESULT GetFirmwareVersion(TAC_HANDLE tacHandle, char* firmwareVersion, int bufferSize);
+	TACDEV_EXPORT TAC_RESULT GetHardware(TAC_HANDLE tacHandle, char* hardware, int bufferSize);
+	TACDEV_EXPORT TAC_RESULT GetHardwareVersion(TAC_HANDLE tacHandle, char* hardwareVersion, int bufferSize);
+	TACDEV_EXPORT TAC_RESULT GetUUID(TAC_HANDLE tacHandle, char* uuid, int bufferSize);
+
+	TACDEV_EXPORT TAC_ERROR SetExternalPowerControl(TAC_HANDLE tacHandle, bool state);
+
+	// dynamic commands
+	TACDEV_EXPORT TAC_ERROR GetCommandCount(TAC_HANDLE tacHandle, unsigned long* commandCount);
+	TACDEV_EXPORT TAC_ERROR GetCommand(TAC_HANDLE tacHandle, unsigned long commandIndex, char* commandBuffer, int bufferSize);
+
+	// quick commands
+	TACDEV_EXPORT TAC_ERROR GetQuickCommandCount(TAC_HANDLE tacHandle, unsigned long* commandCount);
+	TACDEV_EXPORT TAC_ERROR GetQuickCommand(TAC_HANDLE tacHandle, unsigned long commandIndex, char* commandBuffer, int bufferSize);
+
+	// script variables
+	TACDEV_EXPORT TAC_ERROR GetScriptVariableCount(TAC_HANDLE tacHandle, unsigned long* scriptVariableCount);
+	TACDEV_EXPORT TAC_ERROR GetScriptVariable(TAC_HANDLE tacHandle, unsigned long scriptVariableIndex, char* scriptVariableBuffer, int bufferSize);
+    TACDEV_EXPORT TAC_ERROR UpdateScriptVariableValue(TAC_HANDLE tacHandle, const char* scriptVariable, const char* scriptVariableValue);
+
+	// This command is the root of all others
+	TACDEV_EXPORT TAC_ERROR GetCommandState(TAC_HANDLE tacHandle, const char* command, bool* state);
+	TACDEV_EXPORT TAC_ERROR SendCommand(TAC_HANDLE tacHandle, const char* command, bool state);
+
+	// Help
+	TACDEV_EXPORT TAC_ERROR GetHelpText(TAC_HANDLE tacHandle, char* helpBuffer, int bufferSize, int* actualSize);
+
+	// Raw Pin State
+	TACDEV_EXPORT TAC_ERROR SetPinState(TAC_HANDLE tacHandle, int pin, bool state);
+
+	// Command queue status
+	TACDEV_EXPORT TAC_ERROR IsCommandQueueClear(TAC_HANDLE tacHandle, bool* status);
+
+	TACDEV_EXPORT TAC_RESULT SetBatteryState(TAC_HANDLE tacHandle, bool state);
+	TACDEV_EXPORT TAC_RESULT GetBatteryState(TAC_HANDLE tacHandle, bool* state);
+
+	TACDEV_EXPORT TAC_RESULT Usb0(TAC_HANDLE tacHandle, bool state);
+	TACDEV_EXPORT TAC_RESULT GetUsb0State(TAC_HANDLE tacHandle, bool* state);
+
+	TACDEV_EXPORT TAC_RESULT Usb1(TAC_HANDLE tacHandle, bool state);
+	TACDEV_EXPORT TAC_RESULT GetUsb1State(TAC_HANDLE tacHandle, bool* state);
+
+	TACDEV_EXPORT TAC_RESULT PowerKey(TAC_HANDLE tacHandle, bool state);
+	TACDEV_EXPORT TAC_RESULT GetPowerKeyState(TAC_HANDLE tacHandle, bool* state);
+
+	TACDEV_EXPORT TAC_RESULT VolumeUp(TAC_HANDLE tacHandle, bool state);
+	TACDEV_EXPORT TAC_RESULT GetVolumeUpState(TAC_HANDLE tacHandle, bool* state);
+
+	TACDEV_EXPORT TAC_RESULT VolumeDown(TAC_HANDLE tacHandle, bool state);
+	TACDEV_EXPORT TAC_RESULT GetVolumeDownState(TAC_HANDLE tacHandle, bool* state);
+
+	TACDEV_EXPORT TAC_RESULT DisconnectUIM1(TAC_HANDLE tacHandle, bool state);
+	TACDEV_EXPORT TAC_RESULT GetDisconnectUIM1State(TAC_HANDLE tacHandle, bool* state);
+
+	TACDEV_EXPORT TAC_RESULT DisconnectUIM2(TAC_HANDLE tacHandle, bool state);
+	TACDEV_EXPORT TAC_RESULT GetDisconnectUIM2State(TAC_HANDLE tacHandle, bool* state);
+
+	TACDEV_EXPORT TAC_RESULT DisconnectSDCard(TAC_HANDLE tacHandle, bool state);
+	TACDEV_EXPORT TAC_RESULT GetDisconnectSDCardState(TAC_HANDLE tacHandle, bool* state);
+
+	TACDEV_EXPORT TAC_RESULT PrimaryEDL(TAC_HANDLE tacHandle, bool state);
+	TACDEV_EXPORT TAC_RESULT GetPrimaryEDLState(TAC_HANDLE tacHandle, bool* state);
+
+	TACDEV_EXPORT TAC_RESULT SecondaryEDL(TAC_HANDLE tacHandle, bool state);
+	TACDEV_EXPORT TAC_RESULT GetSecondaryEDLState(TAC_HANDLE tacHandle, bool* state);
+
+	TACDEV_EXPORT TAC_RESULT ForcePSHoldHigh(TAC_HANDLE tacHandle, bool state);
+	TACDEV_EXPORT TAC_RESULT GetForcePSHoldHighState(TAC_HANDLE tacHandle, bool* state);
+
+	TACDEV_EXPORT TAC_RESULT SecondaryPmResinN(TAC_HANDLE tacHandle, bool state);
+	TACDEV_EXPORT TAC_RESULT GetSecondaryPmResinNState(TAC_HANDLE tacHandle, bool* state);
+
+	TACDEV_EXPORT TAC_RESULT Eud(TAC_HANDLE tacHandle, bool state);
+	TACDEV_EXPORT TAC_RESULT GetEUDState(TAC_HANDLE tacHandle, bool* state);
+
+	TACDEV_EXPORT TAC_RESULT HeadsetDisconnect(TAC_HANDLE tacHandle, bool state);
+	TACDEV_EXPORT TAC_RESULT GetHeadsetDisconnectState(TAC_HANDLE tacHandle, bool* state);
+
+	TACDEV_EXPORT TAC_RESULT SetName(TAC_HANDLE tacHandle, const char* newName);
+	TACDEV_EXPORT TAC_RESULT GetResetCount(TAC_HANDLE tacHandle, int* resetCount);
+	TACDEV_EXPORT TAC_RESULT ClearResetCount(TAC_HANDLE tacHandle);
+
+	TACDEV_EXPORT TAC_RESULT PowerOnButton(TAC_HANDLE tacHandle);
+	TACDEV_EXPORT TAC_RESULT PowerOffButton(TAC_HANDLE tacHandle);
+	TACDEV_EXPORT TAC_RESULT BootToFastBootButton(TAC_HANDLE tacHandle);
+	TACDEV_EXPORT TAC_RESULT BootToUEFIMenuButton(TAC_HANDLE tacHandle);
+	TACDEV_EXPORT TAC_RESULT BootToEDLButton(TAC_HANDLE tacHandle);
+	TACDEV_EXPORT TAC_RESULT BootToSecondaryEDLButton(TAC_HANDLE tacHandle);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // DEVTAC_H
diff --git a/source/tacdev/TACDevCore.cpp b/source/tacdev/TACDevCore.cpp
new file mode 100644
index 00000000..4e5c22f0
--- /dev/null
+++ b/source/tacdev/TACDevCore.cpp
@@ -0,0 +1,157 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "TACDevCore.h"
+
+#include <qtac/FTDIDevice.h>
+#include <qtac/PSOCDevice.h>
+#include <qtac/PIC32CXDevice.h>
+#include <qtac/TACLiteDriveThread.h>
+#include <qtac/TACPSOCDriveThread.h>
+#include <qtac/TACPIC32CXDriveThread.h>
+
+// ---------------------------------------------------------------------------
+
+TAC_RESULT DevTACCore::getDeviceCount(int* deviceCount)
+{
+    *deviceCount = 0;
+
+    FTDIDevice::updateAlpacaDevices();
+    PSOCDevice::updateAlpacaDevices();
+    PIC32CXDevice::updateAlpacaDevices();
+
+    _AlpacaDevice::getAlpacaDevices(_alpacaDevices);
+    *deviceCount = static_cast<int>(_alpacaDevices.size());
+
+    return NO_TAC_ERROR;
+}
+
+TAC_HANDLE DevTACCore::openHandleByDescription(const char* portName)
+{
+    // Return existing handle if device is already open.
+    for (const auto& kv : _openDevices)
+    {
+        const auto& handle = kv.first;
+        const auto& dev    = kv.second;
+        if (dev->portName() == portName)
+            return handle;
+        if (dev->serialNumber().contains(portName))
+            return handle;
+    }
+
+    // Ensure device list is fresh for all board types.
+    FTDIDevice::updateAlpacaDevices();
+    PSOCDevice::updateAlpacaDevices();
+    PIC32CXDevice::updateAlpacaDevices();
+
+    AlpacaDevice dev = _AlpacaDevice::findAlpacaDevice(
+        qtac::ByteArray(portName));
+    if (!dev)
+    {
+        setLastError(qtac::ByteArray(portName) + " not found.");
+        return kBadHandle;
+    }
+
+    // Create and inject the concrete drive thread.
+    qtac::TACDriveThread* dt = nullptr;
+    switch (dev->debugBoardType())
+    {
+    case ePSOC:
+        dt = new qtac::TACPSOCDriveThread(dev->hash());
+        break;
+    case ePIC32CXAuto:
+        dt = new qtac::TACPIC32CXDriveThread(dev->hash());
+        break;
+    case eFTDI:
+    default:
+        dt = new qtac::TACLiteDriveThread(dev->hash());
+        break;
+    }
+    dev->setDriveThread(dt);
+
+    // Subscribe to error events.
+    dev->onError.connect([this](const qtac::ByteArray& msg) {
+        setLastError(msg);
+    });
+
+    if (!dev->open())
+    {
+        setLastError(dev->getLastError().isEmpty()
+            ? qtac::ByteArray(portName) + " can't be opened."
+            : dev->getLastError());
+        dev->setDriveThread(nullptr);
+        delete dt;
+        dev->close();
+        return kBadHandle;
+    }
+
+    TAC_HANDLE handle = dev->hash();
+    _openDevices[handle] = dev;
+    _driveThreads[handle] = dt;
+    return handle;
+}
+
+TAC_RESULT DevTACCore::closeHandle(TAC_HANDLE tacHandle)
+{
+    auto it = _openDevices.find(tacHandle);
+    if (it == _openDevices.end())
+        return TACDEV_BAD_TAC_HANDLE;
+
+    AlpacaDevice dev = it->second;
+    dev->close();
+
+    auto dtIt = _driveThreads.find(tacHandle);
+    if (dtIt != _driveThreads.end())
+    {
+        qtac::TACDriveThread* dt = dtIt->second;
+        if (dt)
+        {
+            dt->shutDown();
+            delete dt;
+        }
+        dev->setDriveThread(nullptr);
+        _driveThreads.erase(dtIt);
+    }
+
+    _openDevices.erase(it);
+    return NO_TAC_ERROR;
+}
+
+AlpacaDevice DevTACCore::getAlpacaDevice(TAC_HANDLE tacHandle)
+{
+    auto it = _openDevices.find(tacHandle);
+    if (it != _openDevices.end())
+        return it->second;
+
+    setLastError("Bad TAC Handle");
+    return AlpacaDevice(nullptr);
+}
diff --git a/source/tacdev/TACDevCore.h b/source/tacdev/TACDevCore.h
new file mode 100644
index 00000000..7b5b4abb
--- /dev/null
+++ b/source/tacdev/TACDevCore.h
@@ -0,0 +1,76 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#pragma once
+
+#include "TACDev.h"
+
+#include <qtac/AlpacaDevice.h>
+#include <qtac/ByteArray.h>
+#include <qtac/TACDriveThread.h>
+
+#include <unordered_map>
+
+// Qt-free core for TACDev.dll.
+// Manages the table of open device handles.
+class DevTACCore
+{
+public:
+    DevTACCore() = default;
+    ~DevTACCore() = default;
+
+    // Open a device by port name (or serial number) and return its handle.
+    // Returns kBadHandle on failure.
+    TAC_HANDLE openHandleByDescription(const char* portName);
+
+    // Close and remove a handle.
+    TAC_RESULT closeHandle(TAC_HANDLE tacHandle);
+
+    // Refresh the device list (all board types) and return the count.
+    TAC_RESULT getDeviceCount(int* deviceCount);
+
+    // Look up a device by handle.  Returns nullptr on bad handle.
+    AlpacaDevice getAlpacaDevice(TAC_HANDLE tacHandle);
+
+    // Returns the most-recently-enumerated device list.
+    const AlpacaDevices& alpacaDevices() const { return _alpacaDevices; }
+
+    // Last error string.
+    qtac::ByteArray lastError() const { return _lastError; }
+    void setLastError(const qtac::ByteArray& err) { _lastError = err; }
+
+private:
+    AlpacaDevices  _alpacaDevices;
+    std::unordered_map<TAC_HANDLE, AlpacaDevice>          _openDevices;
+    std::unordered_map<TAC_HANDLE, qtac::TACDriveThread*> _driveThreads;
+    qtac::ByteArray _lastError;
+};
diff --git a/source/test/CMakeLists.txt b/source/test/CMakeLists.txt
new file mode 100644
index 00000000..e47d788e
--- /dev/null
+++ b/source/test/CMakeLists.txt
@@ -0,0 +1,44 @@
+cmake_minimum_required(VERSION 3.16)
+
+# Allow standalone invocation (build_test/) or inclusion from root.
+if(NOT TARGET qtac-core)
+    project(qtac-tests LANGUAGES CXX)
+    set(CMAKE_CXX_STANDARD 20)
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../library ${CMAKE_CURRENT_BINARY_DIR}/library)
+endif()
+
+add_executable(test_bytearray test_bytearray.cpp)
+target_include_directories(test_bytearray PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/../library/include
+)
+
+add_executable(test_string test_string.cpp)
+target_link_libraries(test_string PRIVATE qtac-core)
+
+add_executable(test_containers test_containers.cpp)
+target_link_libraries(test_containers PRIVATE qtac-core)
+
+add_executable(test_stringutils test_stringutils.cpp)
+target_link_libraries(test_stringutils PRIVATE qtac-core)
+
+add_executable(test_signal test_signal.cpp)
+target_link_libraries(test_signal PRIVATE qtac-core)
+
+add_executable(test_platform_configs test_platform_configs.cpp)
+target_link_libraries(test_platform_configs PRIVATE qtac-core)
+
+add_executable(test_coders_commands test_coders_commands.cpp)
+target_link_libraries(test_coders_commands PRIVATE qtac-core)
+
+add_executable(test_hardware_ftdi test_hardware_ftdi.cpp)
+target_link_libraries(test_hardware_ftdi PRIVATE qtac-core)
+
+add_executable(test_hardware_psoc test_hardware_psoc.cpp)
+target_link_libraries(test_hardware_psoc PRIVATE qtac-core)
+
+add_executable(test_tacdev_api test_tacdev_api.cpp)
+target_include_directories(test_tacdev_api PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/../tacdev
+)
+target_link_libraries(test_tacdev_api PRIVATE TACDev)
diff --git a/source/test/test_bytearray.cpp b/source/test/test_bytearray.cpp
new file mode 100644
index 00000000..b1d2607f
--- /dev/null
+++ b/source/test/test_bytearray.cpp
@@ -0,0 +1,68 @@
+#include <qtac/ByteArray.h>
+#include <cassert>
+#include <cstdio>
+
+int main() {
+    using qtac::ByteArray;
+
+    // Null vs empty
+    ByteArray null;
+    assert(null.isNull());
+    assert(null.isEmpty());
+    ByteArray empty("");
+    assert(!empty.isNull());
+    assert(empty.isEmpty());
+
+    // Iterators
+    ByteArray ba("hello");
+    int n = 0;
+    for (auto it = ba.begin(); it != ba.end(); ++it) ++n;
+    assert(n == 5);
+
+    // Insert/Remove
+    ByteArray ins("ac");
+    ins.insert(1, "b");
+    assert(ins == "abc");
+    ins.remove(1, 1);
+    assert(ins == "ac");
+
+    // Chop/truncate
+    ByteArray ch("hello");
+    ch.chop(2);
+    assert(ch == "hel");
+    ch.truncate(2);
+    assert(ch == "he");
+
+    // Count
+    ByteArray cnt("abcabc");
+    assert(cnt.count('a') == 2);
+    assert(cnt.count(ByteArray("abc")) == 2);
+
+    // Numeric
+    ByteArray num("42");
+    bool ok = false;
+    assert(num.toUInt(&ok) == 42u && ok);
+    ByteArray big("18446744073709551615");
+    assert(big.toULongLong(&ok) == 18446744073709551615ULL && ok);
+
+    // Compare
+    ByteArray a("Hello"), b("hello");
+    assert(a.compare(b, true) != 0);
+    assert(a.compare(b, false) == 0);
+
+    // Hex
+    ByteArray raw("\xDE\xAD", 2);
+    assert(raw.toHex() == "dead");
+    ByteArray decoded = ByteArray::fromHex(ByteArray("DEAD"));
+    assert(decoded.size() == 2);
+
+    // Base64
+    ByteArray plain("Hello");
+    ByteArray encoded = plain.toBase64();
+    assert(encoded == "SGVsbG8=");
+    ByteArray roundtrip = ByteArray::fromBase64(encoded);
+    assert(roundtrip == "Hello");
+
+    printf("ALL TESTS PASSED\n");
+    return 0;
+}
diff --git a/source/test/test_coders_commands.cpp b/source/test/test_coders_commands.cpp
new file mode 100644
index 00000000..cfaaee7b
--- /dev/null
+++ b/source/test/test_coders_commands.cpp
@@ -0,0 +1,956 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <qtac/TACLiteCoder.h>
+#include <qtac/TACPSOCCoder.h>
+#include <qtac/TACPIC32CXCoder.h>
+#include <qtac/TACSTM32Coder.h>
+#include <qtac/TACLiteCommand.h>
+#include <qtac/TACPSOCCommand.h>
+#include <qtac/TACPIC32CXCommand.h>
+#include <qtac/TACSTM32Command.h>
+#include <qtac/TACCommandHashes.h>
+#include <qtac/StringUtilities.h>
+#include <qtac/ReceiveInterface.h>
+#include <qtac/SendInterface.h>
+
+#include <cassert>
+#undef assert
+#define assert(expr) \
+    do { if (!(expr)) { \
+        std::fprintf(stderr, "Assertion failed: %s, file %s, line %d\n", #expr, __FILE__, __LINE__); \
+        std::exit(1); \
+    } } while(0)
+#include <cstdio>
+#include <stdexcept>
+#include <string>
+#include <vector>
+
+// ===========================================================================
+// Minimal stub helpers
+// ===========================================================================
+
+// Collects frames delivered via the FrameCompleteFunc callback.
+struct FrameCollector
+{
+    std::vector<qtac::ByteArray> frames;
+
+    static void onFrame(const qtac::ByteArray& f, qtac::ProtocolInterface*)
+    {
+        // This is a static callback; use a global to route to the active instance.
+        // (We set it before each test that needs it.)
+        if (s_active) s_active->frames.push_back(f);
+    }
+
+    static FrameCollector* s_active;
+};
+FrameCollector* FrameCollector::s_active = nullptr;
+
+// Null bad-frame callback — just satisfies the signature.
+static void onBadFrame(const qtac::ByteArray&, qtac::ProtocolInterface*) {}
+
+// Helper: install a coder with the FrameCollector callback.
+static void setupCoder(qtac::FrameCoder& coder, FrameCollector& collector)
+{
+    FrameCollector::s_active = &collector;
+    coder.setupCallbackFunctions(nullptr, FrameCollector::onFrame, onBadFrame);
+}
+
+// ===========================================================================
+// Minimal mock SendInterface for command tests
+// ===========================================================================
+
+struct RecordedSend
+{
+    qtac::ByteArray command;
+    qtac::Arguments arguments;
+    bool            console{false};
+    bool            store{false};
+    bool            isEndTransaction{false};
+    bool            isDelay{false};
+    uint32_t        delayMs{0};
+};
+
+class MockSender : public qtac::SendInterface
+{
+public:
+    std::vector<RecordedSend> log;
+    bool                      _ready{true};
+
+    bool ready() override { return _ready; }
+
+    uint32_t send(const qtac::ByteArray& cmd, const qtac::Arguments& args,
+                  bool console, qtac::ReceiveInterface*, bool store) override
+    {
+        RecordedSend record;
+        record.command = cmd;
+        record.arguments = args;
+        record.console = console;
+        record.store = store;
+        record.isEndTransaction = false;
+        record.isDelay = false;
+        record.delayMs = 0;
+        log.push_back(record);
+        return 0;
+    }
+
+    void addDelay(uint32_t ms, qtac::ReceiveInterface*) override
+    {
+        RecordedSend r;
+        r.isDelay = true;
+        r.delayMs = ms;
+        log.push_back(r);
+    }
+
+    void addLogComment(const qtac::ByteArray&) override {}
+
+    void addEndTransaction(qtac::ReceiveInterface*) override
+    {
+        RecordedSend r;
+        r.isEndTransaction = true;
+        log.push_back(r);
+    }
+};
+
+// Minimal no-op ReceiveInterface so command constructors don't get nullptr.
+class MockReceiver : public qtac::ReceiveInterface
+{
+public:
+    void receive(qtac::FramePackage&) override {}
+};
+
+// ===========================================================================
+// TACLiteCoder — encode
+// ===========================================================================
+
+static void test_taclite_encode_setpin()
+{
+    qtac::TACLiteCoder coder;
+
+    // SetPin with bus index 0 (arguments[1] is already the bus index, not design pin)
+    {
+        qtac::Arguments args;
+        args.push_back(true);
+        args.push_back(static_cast<uint32_t>(0));  // bus index 0
+        auto result = coder.encode(qtac::ByteArray("SetPin"), args);
+        assert(result == "0");
+    }
+
+    // Bus index 8 (first Bus B pin)
+    {
+        qtac::Arguments args;
+        args.push_back(false);
+        args.push_back(static_cast<uint32_t>(8));  // bus index 8
+        auto result = coder.encode(qtac::ByteArray("SetPin"), args);
+        assert(result == "8");
+    }
+
+    // Bus index 24 (first Bus D pin)
+    {
+        qtac::Arguments args;
+        args.push_back(true);
+        args.push_back(static_cast<uint32_t>(24));  // bus index 24
+        auto result = coder.encode(qtac::ByteArray("SetPin"), args);
+        assert(result == "24");
+    }
+
+    // Unknown bus index → returned as-is (999 as string "999")
+    {
+        qtac::Arguments args;
+        args.push_back(true);
+        args.push_back(static_cast<uint32_t>(999));
+        auto result = coder.encode(qtac::ByteArray("SetPin"), args);
+        assert(result == "999");
+    }
+
+    // Non-SetPin command → "Invalid"
+    {
+        auto result = coder.encode(qtac::ByteArray("Version"), qtac::Arguments());
+        assert(result == "Invalid");
+    }
+}
+
+static void test_taclite_encode_wrong_command()
+{
+    qtac::TACLiteCoder coder;
+    auto result = coder.encode(qtac::ByteArray("getname"), qtac::Arguments());
+    assert(result == "Invalid");
+}
+
+static void test_taclite_decode_noop()
+{
+    // decode() is a no-op — calling it must not crash and must deliver no frames
+    qtac::TACLiteCoder coder;
+    FrameCollector collector;
+    setupCoder(coder, collector);
+
+    coder.decode(qtac::ByteArray("anything"));
+    assert(collector.frames.empty());
+}
+
+static void test_taclite_reset()
+{
+    qtac::TACLiteCoder coder;
+    coder.reset(); // must not crash
+}
+
+// ===========================================================================
+// TACPSOCCoder — encode
+// ===========================================================================
+
+static void test_tacpsoc_encode_known_commands()
+{
+    qtac::TACPSOCCoder coder;
+
+    auto enc = [&](const char* cmd, qtac::Arguments args = {}) {
+        return coder.encode(qtac::ByteArray(cmd), args);
+    };
+
+    // Zero-argument commands end with \r
+    assert(enc("Version") == "version\r");
+    assert(enc("Get Name") == "getname\r");
+    assert(enc("Get UUID") == "sys getFSUUID\r");
+    assert(enc("Get Platform ID") == "getboardid\r");
+    assert(enc("Get Reset Count") == "getresetcount\r");
+    assert(enc("Clear Reset Count") == "clearresetcount\r");
+    assert(enc("I2C Read Register Value") == "i2c receive\r");
+
+    // Set Name
+    {
+        qtac::Arguments args;
+        args.push_back(std::string("MyBoard"));
+        assert(enc("Set Name", args) == "setname MyBoard\r");
+    }
+
+    // I2C Read Register
+    {
+        qtac::Arguments args;
+        args.push_back(std::string("0x50 0x01"));
+        assert(enc("I2C Read Register", args) == "i2c readRegisterBytes 0x50 0x01 1\r");
+    }
+
+    // I2C Write Register
+    {
+        qtac::Arguments args;
+        args.push_back(std::string("0x50 0x02 0xFF"));
+        assert(enc("I2C Write Register", args) == "i2c writeByte 0x50 0x02 0xFF\r");
+    }
+
+    // SetPin: state=true(1), pin=53
+    {
+        qtac::Arguments args;
+        args.push_back(true);
+        args.push_back(static_cast<uint32_t>(53));
+        assert(enc("SetPin", args) == "pin 1 53\r");
+    }
+
+    // SetPin: state=false(0), pin=36
+    {
+        qtac::Arguments args;
+        args.push_back(false);
+        args.push_back(static_cast<uint32_t>(36));
+        assert(enc("SetPin", args) == "pin 0 36\r");
+    }
+}
+
+static void test_tacpsoc_encode_unknown_appends_cr()
+{
+    qtac::TACPSOCCoder coder;
+    // Unknown command — returned as-is but with trailing \r appended
+    auto result = coder.encode(qtac::ByteArray("custom"), qtac::Arguments());
+    assert(result == "custom\r");
+}
+
+static void test_tacpsoc_encode_already_has_cr()
+{
+    qtac::TACPSOCCoder coder;
+    // A command that already ends with \r must not get a second one
+    auto result = coder.encode(qtac::ByteArray("custom\r"), qtac::Arguments());
+    assert(result == "custom\r");
+    assert(result.size() == 7);  // "custom" (6) + "\r" (1) = 7
+}
+
+// ===========================================================================
+// TACPSOCCoder — decode
+// ===========================================================================
+
+static void test_tacpsoc_decode_basic()
+{
+    qtac::TACPSOCCoder coder;
+    FrameCollector     collector;
+    setupCoder(coder, collector);
+
+    // Feed a response that contains the PSOC command prompt "CMD >> "
+    // Format: echo of command + \r\n + response + \r\n + prompt
+    qtac::ByteArray input("getboardid\r\n12345\r\nCMD >> ");
+    coder.decode(input);
+
+    // Should deliver: "getboardid", "12345", then pad to 3, then empty sentinel
+    // collector.frames will be: [getboardid, 12345, <pad>, <sentinel>]
+    // The sentinel is an empty ByteArray.
+    assert(!collector.frames.empty());
+    // Last frame is the empty sentinel
+    assert(collector.frames.back().isEmpty());
+    // At least 3 content frames + sentinel = 4 minimum
+    assert(collector.frames.size() >= 4);
+}
+
+static void test_tacpsoc_decode_not_recognized()
+{
+    qtac::TACPSOCCoder coder;
+    FrameCollector     collector;
+    setupCoder(coder, collector);
+
+    // Feed the "not recognized" string — should also trigger frame delivery
+    coder.decode(qtac::ByteArray("CMD: Command not recognized.\r\nCMD >> "));
+    assert(!collector.frames.empty());
+    assert(collector.frames.back().isEmpty());
+}
+
+static void test_tacpsoc_decode_accumulates()
+{
+    qtac::TACPSOCCoder coder;
+    FrameCollector     collector;
+    setupCoder(coder, collector);
+
+    // Split the prompt across two decode calls — no frames until prompt arrives
+    coder.decode(qtac::ByteArray("response\r\n"));
+    assert(collector.frames.empty()); // no prompt yet
+
+    coder.decode(qtac::ByteArray("CMD >> "));
+    assert(!collector.frames.empty()); // now it fires
+}
+
+static void test_tacpsoc_decode_reset_clears_buffer()
+{
+    qtac::TACPSOCCoder coder;
+    FrameCollector     collector;
+    setupCoder(coder, collector);
+
+    coder.decode(qtac::ByteArray("partial"));
+    assert(collector.frames.empty());
+
+    coder.reset();
+
+    // After reset, the partial buffer should be gone; feeding just the
+    // prompt should not produce the old "partial" token as a frame.
+    coder.decode(qtac::ByteArray("CMD >> "));
+    // All frames should be padding/sentinel, none should equal "partial"
+    for (const auto& f : collector.frames)
+        assert(f != "partial");
+}
+
+// ===========================================================================
+// TACPIC32CXCoder — encode
+// ===========================================================================
+
+static void test_tacpic32cx_encode_setpin()
+{
+    qtac::TACPIC32CXCoder coder;
+
+    // SetPin: state=true, pin=4  → pin string "004" (padded to 3 chars)
+    {
+        qtac::Arguments args;
+        args.push_back(true);
+        args.push_back(static_cast<uint32_t>(4));
+        auto result = coder.encode(qtac::ByteArray("CONF:DIG:ON"), args);
+        // "CONF:DIG:ON 1 (@004)\n"
+        assert(result == "CONF:DIG:ON 1 (@004)\n");
+    }
+
+    // SetPin: state=false, pin=21 → pin string "021" (padded)
+    {
+        qtac::Arguments args;
+        args.push_back(false);
+        args.push_back(static_cast<uint32_t>(21));
+        auto result = coder.encode(qtac::ByteArray("CONF:DIG:ON"), args);
+        assert(result == "CONF:DIG:ON 0 (@021)\n");
+    }
+
+    // SetPin: pin=100 → "100" (already 3 chars, no padding)
+    {
+        qtac::Arguments args;
+        args.push_back(true);
+        args.push_back(static_cast<uint32_t>(100));
+        auto result = coder.encode(qtac::ByteArray("CONF:DIG:ON"), args);
+        assert(result == "CONF:DIG:ON 1 (@100)\n");
+    }
+}
+
+static void test_tacpic32cx_encode_other_commands()
+{
+    qtac::TACPIC32CXCoder coder;
+
+    // Other commands just get a trailing \n
+    auto v = coder.encode(qtac::ByteArray("Version"), qtac::Arguments());
+    assert(v == "Version\n");
+
+    auto idn = coder.encode(qtac::ByteArray("*IDN?"), qtac::Arguments());
+    assert(idn == "*IDN?\n");
+
+    // Already ends with \n — should not double-append
+    auto already = coder.encode(qtac::ByteArray("echo 1\n"), qtac::Arguments());
+    assert(already == "echo 1\n");
+    assert(already.size() == 7);
+}
+
+// ===========================================================================
+// TACPIC32CXCoder — decode
+// ===========================================================================
+
+static void test_tacpic32cx_decode_error_prompt()
+{
+    qtac::TACPIC32CXCoder coder;
+    FrameCollector        collector;
+    setupCoder(coder, collector);
+
+    // Error prompt → empty sentinel only
+    coder.decode(qtac::ByteArray("Error!!! port > something"));
+    assert(collector.frames.size() == 1);
+    assert(collector.frames[0].isEmpty());
+}
+
+static void test_tacpic32cx_decode_unknown_command()
+{
+    qtac::TACPIC32CXCoder coder;
+    FrameCollector        collector;
+    setupCoder(coder, collector);
+
+    coder.decode(qtac::ByteArray("*** Command Processor: unknown command. ***\r\n"));
+    assert(collector.frames.size() == 1);
+    assert(collector.frames[0].isEmpty());
+}
+
+static void test_tacpic32cx_decode_valid_response()
+{
+    qtac::TACPIC32CXCoder coder;
+    FrameCollector        collector;
+    setupCoder(coder, collector);
+
+    // A response larger than kValidPIC32CXResponseSize (40 bytes).
+    // Format: command echo \r\n + actual result \r\n + trailing prompt
+    // The coder delivers frames[1] (index 1) + empty sentinel.
+    std::string payload =
+        "CONF:DIG:ON 1 (@004)\r\n"  // frames[0] — echoed command (22 chars)
+        "OK - Command executed successfully\r\n"  // frames[1] — actual response
+        "port > ";                   // frames[2] — trailing prompt text
+    // Total > 40 bytes to exceed kValidPIC32CXResponseSize
+    assert(payload.size() > 40);
+
+    coder.decode(qtac::ByteArray(payload.c_str()));
+
+    // Should be: frames[1]="OK - Command executed successfully", then empty sentinel
+    assert(collector.frames.size() == 2);
+    assert(collector.frames[0] == "OK - Command executed successfully");
+    assert(collector.frames[1].isEmpty());
+}
+
+static void test_tacpic32cx_decode_incomplete()
+{
+    qtac::TACPIC32CXCoder coder;
+    FrameCollector        collector;
+    setupCoder(coder, collector);
+
+    // Buffer <= kValidPIC32CXResponseSize and no error prompt →
+    // sends empty sentinel and clears.
+    coder.decode(qtac::ByteArray("short"));
+    assert(collector.frames.size() == 1);
+    assert(collector.frames[0].isEmpty());
+}
+
+// ===========================================================================
+// TACCommandHashes — verify hash constants match arrayHash of the actual strings
+// ===========================================================================
+
+static void test_command_hash_constants()
+{
+    // These constants are used for dispatch in the coders. A regression in
+    // arrayHash() or a typo in the constant would silently break encoding.
+    assert(arrayHash(qtac::ByteArray("Version"))           == kVersionCommandHash);
+    assert(arrayHash(qtac::ByteArray("Get Name"))          == kGetNameCommandHash);
+    assert(arrayHash(qtac::ByteArray("Set Name"))          == kSetNameCommandHash);
+    assert(arrayHash(qtac::ByteArray("Get UUID"))          == kGetUUIDCommandHash);
+    assert(arrayHash(qtac::ByteArray("Get Platform ID"))   == kGetPlatformIDCommandHash);
+    assert(arrayHash(qtac::ByteArray("Get Reset Count"))   == kGetResetCountCommandHash);
+    assert(arrayHash(qtac::ByteArray("Clear Reset Count")) == kClearResetCountCommandHash);
+    assert(arrayHash(qtac::ByteArray("I2C Read Register")) == kI2CReadRegisterCommandHash);
+    assert(arrayHash(qtac::ByteArray("I2C Read Register Value")) == kI2CReadRegisterValueCommandHash);
+    assert(arrayHash(qtac::ByteArray("I2C Write Register"))== kI2CWriteRegisterCommandHash);
+    assert(arrayHash(qtac::ByteArray("SetPin"))            == kSetPinCommandHash);
+
+    // PIC32CX hashes
+    assert(arrayHash(qtac::ByteArray("echo 1"))            == kPIC32CXClearBufferHash);
+    assert(arrayHash(qtac::ByteArray("*IDN?"))             == kPIC32CXVersionCommandHash);
+    assert(arrayHash(qtac::ByteArray("CONF:DIG:ON"))       == kPIC32CXSetPinCommandHash);
+}
+
+// ===========================================================================
+// TACLiteCommand — mock send verification
+// ===========================================================================
+
+static void test_taclite_command_version()
+{
+    MockSender   sender;
+    MockReceiver receiver;
+    {
+        qtac::TACLiteCommand cmd(&sender, &receiver);
+        cmd.version();
+    } // destructor calls addEndTransaction
+
+    assert(sender.log.size() == 2);
+    assert(sender.log[0].command == "Version");
+    assert(sender.log[1].isEndTransaction);
+}
+
+static void test_taclite_command_setpin()
+{
+    MockSender   sender;
+    MockReceiver receiver;
+    {
+        qtac::TACLiteCommand cmd(&sender, &receiver);
+        cmd.setPinState(16, true);
+    }
+
+    assert(sender.log[0].command == "SetPin");
+    assert(sender.log[0].arguments.size() == 2);
+    assert(sender.log[0].arguments[0].asBool() == true);
+    assert(sender.log[0].arguments[1].asUInt32() == 16u);
+}
+
+static void test_taclite_command_battery()
+{
+    MockSender   sender;
+    MockReceiver receiver;
+    {
+        qtac::TACLiteCommand cmd(&sender, &receiver);
+        cmd.battery(false);
+    }
+
+    assert(sender.log[0].command == "Battery");
+    assert(sender.log[0].arguments[0].asBool() == false);
+}
+
+static void test_taclite_command_setname()
+{
+    MockSender   sender;
+    MockReceiver receiver;
+    {
+        qtac::TACLiteCommand cmd(&sender, &receiver);
+        cmd.setName(qtac::ByteArray("TestBoard"));
+    }
+
+    assert(sender.log[0].command == "Set Name");
+    assert(sender.log[0].arguments[0].asString() == "TestBoard");
+}
+
+// ===========================================================================
+// TACPSOCCommand — mock send verification
+// ===========================================================================
+
+static void test_tacpsoc_command_version()
+{
+    MockSender   sender;
+    MockReceiver receiver;
+    {
+        qtac::TACPSOCCommand cmd(&sender, &receiver);
+        cmd.version();
+    }
+
+    assert(sender.log[0].command == "Version");
+    assert(sender.log.back().isEndTransaction);
+}
+
+static void test_tacpsoc_command_setpin()
+{
+    MockSender   sender;
+    MockReceiver receiver;
+    {
+        qtac::TACPSOCCommand cmd(&sender, &receiver);
+        cmd.setPinState(53, true);
+    }
+
+    assert(sender.log[0].command == "SetPin");
+    assert(sender.log[0].arguments[0].asBool() == true);
+    assert(sender.log[0].arguments[1].asUInt32() == 53u);
+}
+
+static void test_tacpsoc_command_i2c_read()
+{
+    MockSender   sender;
+    MockReceiver receiver;
+    {
+        qtac::TACPSOCCommand cmd(&sender, &receiver);
+        cmd.i2CReadRegister(0x50, 0x10);
+    }
+
+    // Should produce: I2C Read Register, delay 500ms, I2C Read Register Value, EndTransaction
+    assert(sender.log[0].command == "I2C Read Register");
+    assert(sender.log[0].arguments[0].asString() == "0x50 0x10");
+    assert(sender.log[1].isDelay);
+    assert(sender.log[1].delayMs == 500);
+    assert(sender.log[2].command == "I2C Read Register Value");
+    assert(sender.log.back().isEndTransaction);
+}
+
+static void test_tacpsoc_command_i2c_write()
+{
+    MockSender   sender;
+    MockReceiver receiver;
+    {
+        qtac::TACPSOCCommand cmd(&sender, &receiver);
+        cmd.i2CWriteRegister(0x50, 0x10, 0xAB);
+    }
+
+    assert(sender.log[0].command == "I2C Write Register");
+    assert(sender.log[0].arguments[0].asString() == "0x50 0x10 0xAB");
+}
+
+static void test_tacpsoc_command_i2c_invalid_args()
+{
+    MockSender   sender;
+    MockReceiver receiver;
+    qtac::TACPSOCCommand cmd(&sender, &receiver);
+
+    bool threw = false;
+    try { cmd.i2CReadRegister(0x100, 0x00); }
+    catch (const std::out_of_range&) { threw = true; }
+    assert(threw);
+
+    threw = false;
+    try { cmd.i2CWriteRegister(0x00, 0x100, 0x00); }
+    catch (const std::out_of_range&) { threw = true; }
+    assert(threw);
+
+    threw = false;
+    try { cmd.i2CWriteRegister(0x00, 0x00, 0x100); }
+    catch (const std::out_of_range&) { threw = true; }
+    assert(threw);
+}
+
+// ===========================================================================
+// TACPIC32CXCommand — mock send verification
+// ===========================================================================
+
+static void test_tacpic32cx_command_setpin()
+{
+    MockSender   sender;
+    MockReceiver receiver;
+    {
+        qtac::TACPIC32CXCommand cmd(&sender, &receiver);
+        cmd.setPinState(4, true);
+    }
+
+    assert(sender.log[0].command == "CONF:DIG:ON");
+    assert(sender.log[0].arguments[0].asBool() == true);
+    assert(sender.log[0].arguments[1].asUInt32() == 4u);
+    assert(sender.log.back().isEndTransaction);
+}
+
+static void test_tacpic32cx_command_clear_buffer()
+{
+    MockSender   sender;
+    MockReceiver receiver;
+    {
+        qtac::TACPIC32CXCommand cmd(&sender, &receiver);
+        cmd.clearBuffer();
+    }
+
+    assert(sender.log[0].command == "echo 1");
+}
+
+static void test_tacpic32cx_command_platform_id()
+{
+    MockSender   sender;
+    MockReceiver receiver;
+    {
+        qtac::TACPIC32CXCommand cmd(&sender, &receiver);
+        cmd.platformID();
+    }
+
+    assert(sender.log[0].command == "*IDN?");
+}
+
+// ===========================================================================
+// TACSTM32Coder — encode
+// ===========================================================================
+
+static void test_tacstm32_encode_setpin_single()
+{
+    qtac::TACSTM32Coder coder;
+
+    // First call: set pin 0 high.
+    // Expected report: [0]=0 (report ID), [1]=0x01 (kCommandGpioSet),
+    //                  [2]=gpioState (0x01), [3]=pinBit (0x01)
+    // Remaining 29 bytes are zero.
+    qtac::Arguments args;
+    args.push_back(true);
+    args.push_back(static_cast<uint32_t>(0));
+    auto result = coder.encode(qtac::ByteArray("SetPin"), args);
+
+    assert(result.size() == 33);
+    assert(static_cast<uint8_t>(result[0]) == 0x00); // report ID
+    assert(static_cast<uint8_t>(result[1]) == 0x01); // kCommandGpioSet
+    assert(static_cast<uint8_t>(result[2]) == 0x01); // gpioState: pin 0 set
+    assert(static_cast<uint8_t>(result[3]) == 0x01); // pinBit: bit 0
+}
+
+static void test_tacstm32_encode_setpin_accumulates_state()
+{
+    qtac::TACSTM32Coder coder;
+
+    // Set pin 0 high.
+    {
+        qtac::Arguments args;
+        args.push_back(true);
+        args.push_back(static_cast<uint32_t>(0));
+        coder.encode(qtac::ByteArray("SetPin"), args);
+    }
+
+    // Now set pin 2 high — gpioState should be 0x01 | 0x04 = 0x05.
+    {
+        qtac::Arguments args;
+        args.push_back(true);
+        args.push_back(static_cast<uint32_t>(2));
+        auto result = coder.encode(qtac::ByteArray("SetPin"), args);
+
+        assert(result.size() == 33);
+        assert(static_cast<uint8_t>(result[2]) == 0x05); // pins 0 and 2 set
+        assert(static_cast<uint8_t>(result[3]) == 0x04); // pinBit for pin 2
+    }
+
+    // Now clear pin 0 — gpioState should drop to 0x04.
+    {
+        qtac::Arguments args;
+        args.push_back(false);
+        args.push_back(static_cast<uint32_t>(0));
+        auto result = coder.encode(qtac::ByteArray("SetPin"), args);
+
+        assert(static_cast<uint8_t>(result[2]) == 0x04); // only pin 2 remains
+        assert(static_cast<uint8_t>(result[3]) == 0x01); // pinBit for pin 0
+    }
+}
+
+static void test_tacstm32_encode_unknown_command_returns_empty()
+{
+    qtac::TACSTM32Coder coder;
+    auto result = coder.encode(qtac::ByteArray("Version"), qtac::Arguments());
+    assert(result.isEmpty());
+}
+
+static void test_tacstm32_encode_insufficient_args_returns_empty()
+{
+    qtac::TACSTM32Coder coder;
+
+    // SetPin with only one argument (needs two).
+    qtac::Arguments args;
+    args.push_back(true);
+    auto result = coder.encode(qtac::ByteArray("SetPin"), args);
+    assert(result.isEmpty());
+}
+
+static void test_tacstm32_decode_noop()
+{
+    // decode() is a no-op for BugHopper V2 — must not crash.
+    qtac::TACSTM32Coder coder;
+    FrameCollector collector;
+    setupCoder(coder, collector);
+
+    coder.decode(qtac::ByteArray("anything"));
+    assert(collector.frames.empty());
+}
+
+static void test_tacstm32_reset_clears_state()
+{
+    qtac::TACSTM32Coder coder;
+
+    // Set pins 0 and 1.
+    for (int pin = 0; pin < 2; ++pin)
+    {
+        qtac::Arguments args;
+        args.push_back(true);
+        args.push_back(static_cast<uint32_t>(pin));
+        coder.encode(qtac::ByteArray("SetPin"), args);
+    }
+
+    coder.reset();
+
+    // After reset, gpioState should be 0 again — setting pin 0 high should
+    // produce gpioState=0x01, not 0x03.
+    qtac::Arguments args;
+    args.push_back(true);
+    args.push_back(static_cast<uint32_t>(0));
+    auto result = coder.encode(qtac::ByteArray("SetPin"), args);
+
+    assert(static_cast<uint8_t>(result[2]) == 0x01);
+}
+
+// ===========================================================================
+// TACSTM32Command — mock send verification
+// ===========================================================================
+
+static void test_tacstm32_command_setpin_args_and_end_transaction()
+{
+    MockSender   sender;
+    MockReceiver receiver;
+    {
+        qtac::TACSTM32Command cmd(&sender, &receiver);
+        cmd.setPinState(2, true);
+    } // destructor fires addEndTransaction
+
+    // Expect: [0] SetPin send, [1] EndTransaction
+    assert(sender.log.size() == 2);
+    assert(sender.log[0].command == "SetPin");
+    assert(sender.log[0].arguments.size() == 2);
+    // arg[0] = state (bool true), arg[1] = pin (uint32 2)
+    assert(sender.log[0].arguments[0].asBool() == true);
+    assert(sender.log[0].arguments[1].asUInt32() == 2u);
+    assert(sender.log[1].isEndTransaction);
+}
+
+static void test_tacstm32_command_setpin_low()
+{
+    MockSender   sender;
+    MockReceiver receiver;
+    {
+        qtac::TACSTM32Command cmd(&sender, &receiver);
+        cmd.setPinState(0, false);
+    }
+
+    assert(sender.log[0].arguments[0].asBool() == false);
+    assert(sender.log[0].arguments[1].asUInt32() == 0u);
+}
+
+static void test_tacstm32_command_multiple_pins_one_transaction()
+{
+    // Multiple setPinState calls before destruction share one transaction.
+    MockSender   sender;
+    MockReceiver receiver;
+    {
+        qtac::TACSTM32Command cmd(&sender, &receiver);
+        cmd.setPinState(0, true);
+        cmd.setPinState(2, false);
+        cmd.setPinState(3, true);
+    }
+
+    // Three SetPin sends + one EndTransaction
+    assert(sender.log.size() == 4);
+    assert(sender.log[0].command == "SetPin");
+    assert(sender.log[1].command == "SetPin");
+    assert(sender.log[2].command == "SetPin");
+    assert(sender.log[3].isEndTransaction);
+}
+
+static void test_tacstm32_command_add_delay()
+{
+    MockSender   sender;
+    MockReceiver receiver;
+    {
+        qtac::TACSTM32Command cmd(&sender, &receiver);
+        cmd.addDelay(100);
+    }
+
+    assert(sender.log[0].isDelay);
+    assert(sender.log[0].delayMs == 100);
+    assert(sender.log.back().isEndTransaction);
+}
+
+// ===========================================================================
+// main
+// ===========================================================================
+
+int main()
+{
+    // TACLiteCoder
+    test_taclite_encode_setpin();
+    test_taclite_encode_wrong_command();
+    test_taclite_decode_noop();
+    test_taclite_reset();
+
+    // TACPSOCCoder encode
+    test_tacpsoc_encode_known_commands();
+    test_tacpsoc_encode_unknown_appends_cr();
+    test_tacpsoc_encode_already_has_cr();
+
+    // TACPSOCCoder decode
+    test_tacpsoc_decode_basic();
+    test_tacpsoc_decode_not_recognized();
+    test_tacpsoc_decode_accumulates();
+    test_tacpsoc_decode_reset_clears_buffer();
+
+    // TACPIC32CXCoder encode
+    test_tacpic32cx_encode_setpin();
+    test_tacpic32cx_encode_other_commands();
+
+    // TACPIC32CXCoder decode
+    test_tacpic32cx_decode_error_prompt();
+    test_tacpic32cx_decode_unknown_command();
+    test_tacpic32cx_decode_valid_response();
+    test_tacpic32cx_decode_incomplete();
+
+    // Hash constants
+    test_command_hash_constants();
+
+    // TACLiteCommand
+    test_taclite_command_version();
+    test_taclite_command_setpin();
+    test_taclite_command_battery();
+    test_taclite_command_setname();
+
+    // TACPSOCCommand
+    test_tacpsoc_command_version();
+    test_tacpsoc_command_setpin();
+    test_tacpsoc_command_i2c_read();
+    test_tacpsoc_command_i2c_write();
+    test_tacpsoc_command_i2c_invalid_args();
+
+    // TACPIC32CXCommand
+    test_tacpic32cx_command_setpin();
+    test_tacpic32cx_command_clear_buffer();
+    test_tacpic32cx_command_platform_id();
+
+    // TACSTM32Coder
+    test_tacstm32_encode_setpin_single();
+    test_tacstm32_encode_setpin_accumulates_state();
+    test_tacstm32_encode_unknown_command_returns_empty();
+    test_tacstm32_encode_insufficient_args_returns_empty();
+    test_tacstm32_decode_noop();
+    test_tacstm32_reset_clears_state();
+
+    // TACSTM32Command
+    test_tacstm32_command_setpin_args_and_end_transaction();
+    test_tacstm32_command_setpin_low();
+    test_tacstm32_command_multiple_pins_one_transaction();
+    test_tacstm32_command_add_delay();
+
+    std::printf("All coder/command tests passed!\n");
+    return 0;
+}
diff --git a/source/test/test_containers.cpp b/source/test/test_containers.cpp
new file mode 100644
index 00000000..9dbaec2a
--- /dev/null
+++ b/source/test/test_containers.cpp
@@ -0,0 +1,220 @@
+#include <qtac/List.h>
+#include <qtac/Map.h>
+#include <qtac/Variant.h>
+#include <qtac/Pair.h>
+#include <qtac/String.h>
+#include <cassert>
+#include <cstdio>
+
+int main() {
+    using qtac::List;
+    using qtac::Map;
+    using qtac::Variant;
+    using qtac::String;
+
+    // ===== List tests =====
+
+    // Basic operations
+    List<int> list;
+    assert(list.isEmpty());
+    assert(list.size() == 0);
+
+    list.append(10);
+    list.append(20);
+    list.append(30);
+    assert(list.size() == 3);
+    assert(!list.isEmpty());
+    assert(list.at(0) == 10);
+    assert(list.at(1) == 20);
+    assert(list.at(2) == 30);
+    assert(list.first() == 10);
+    assert(list.last() == 30);
+
+    // Insert
+    list.insert(1, 15);
+    assert(list.size() == 4);
+    assert(list.at(1) == 15);
+    assert(list.at(2) == 20);
+
+    // RemoveAt
+    list.removeAt(1);
+    assert(list.size() == 3);
+    assert(list.at(1) == 20);
+
+    // Contains / indexOf
+    assert(list.contains(20));
+    assert(!list.contains(99));
+    assert(list.indexOf(20) == 1);
+    assert(list.indexOf(99) == -1);
+
+    // RemoveOne / RemoveAll
+    List<int> dupList = {1, 2, 3, 2, 4, 2};
+    assert(dupList.removeOne(2));
+    assert(dupList.size() == 5);
+    assert(dupList.at(1) == 3); // first 2 removed
+    int removed = dupList.removeAll(2);
+    assert(removed == 2);
+    assert(dupList.size() == 3);
+
+    // TakeAt
+    List<int> takeList = {10, 20, 30};
+    int taken = takeList.takeAt(1);
+    assert(taken == 20);
+    assert(takeList.size() == 2);
+
+    // Clear
+    list.clear();
+    assert(list.isEmpty());
+
+    // Range-for
+    List<int> rList = {1, 2, 3, 4, 5};
+    int sum = 0;
+    for (int val : rList) sum += val;
+    assert(sum == 15);
+
+    // Operators
+    List<int> l1 = {1, 2};
+    List<int> l2 = {3, 4};
+    List<int> l3 = l1 + l2;
+    assert(l3.size() == 4);
+    assert(l3.at(2) == 3);
+
+    // ===== Map tests =====
+
+    // Basic operations
+    Map<String, int> map;
+    assert(map.isEmpty());
+    map.insert(String("one"), 1);
+    map.insert(String("two"), 2);
+    map.insert(String("three"), 3);
+    assert(map.size() == 3);
+    assert(!map.isEmpty());
+
+    // Value with default
+    assert(map.value(String("one")) == 1);
+    assert(map.value(String("two")) == 2);
+    assert(map.value(String("missing"), -1) == -1);
+    assert(map.value(String("missing")) == 0); // default int
+
+    // Contains
+    assert(map.contains(String("one")));
+    assert(!map.contains(String("four")));
+
+    // Remove
+    assert(map.remove(String("two")) == 1);
+    assert(map.size() == 2);
+    assert(!map.contains(String("two")));
+    assert(map.remove(String("nonexist")) == 0);
+
+    // Keys / Values
+    Map<String, int> kvMap;
+    kvMap.insert(String("a"), 1);
+    kvMap.insert(String("b"), 2);
+    auto keys = kvMap.keys();
+    assert(keys.size() == 2);
+    auto values = kvMap.values();
+    assert(values.size() == 2);
+
+    // Operator[]
+    Map<String, String> smap;
+    smap[String("key")] = String("value");
+    assert(smap[String("key")] == "value");
+
+    // Range-for
+    Map<int, int> imap;
+    imap.insert(1, 10);
+    imap.insert(2, 20);
+    int mapSum = 0;
+    for (const auto& kv : imap) mapSum += kv.second;
+    assert(mapSum == 30);
+
+    // ===== Variant tests =====
+
+    // Invalid
+    Variant invalid;
+    assert(!invalid.isValid());
+    assert(invalid.type() == Variant::Type::Invalid);
+
+    // Bool
+    Variant vBool(true);
+    assert(vBool.isValid());
+    assert(vBool.type() == Variant::Type::Bool);
+    assert(vBool.toBool() == true);
+    assert(vBool.toInt() == 1);
+
+    // Int
+    Variant vInt(42);
+    assert(vInt.type() == Variant::Type::Int);
+    assert(vInt.toInt() == 42);
+    assert(vInt.toString() == "42");
+    // assert(vInt.toDouble() == 42.0);  // toDouble() not implemented
+    assert(vInt.toBool() == true);
+
+    Variant vZero(0);
+    assert(vZero.toBool() == false);
+
+    // UInt
+    Variant vUInt(100u);
+    assert(vUInt.type() == Variant::Type::UInt);
+    assert(vUInt.toUInt() == 100u);
+
+    // LongLong
+    Variant vLL(static_cast<long long>(123456789012345LL));
+    assert(vLL.type() == Variant::Type::LongLong);
+    assert(vLL.toLongLong() == 123456789012345LL);
+
+    // ULongLong
+    Variant vULL(static_cast<unsigned long long>(18446744073709551615ULL));
+    assert(vULL.type() == Variant::Type::ULongLong);
+    assert(vULL.toULongLong() == 18446744073709551615ULL);
+
+    // Double
+    Variant vDouble(3.14);
+    assert(vDouble.type() == Variant::Type::Double);
+    // assert(vDouble.toDouble() > 3.13 && vDouble.toDouble() < 3.15);  // toDouble() not implemented
+
+    // String
+    Variant vStr(String("hello"));
+    assert(vStr.type() == Variant::Type::String);
+    assert(vStr.toString() == "hello");
+    assert(vStr.toBool() == true);
+
+    Variant vEmptyStr(String(""));
+    assert(vEmptyStr.toBool() == false);
+
+    // String from numeric
+    Variant vNum(123);
+    assert(vNum.toString() == "123");
+
+    // String to numeric
+    Variant vStrNum(String("456"));
+    bool convOk = false;
+    assert(vStrNum.toInt(&convOk) == 456);
+    assert(convOk);
+
+    // ByteArray
+    Variant vBa(qtac::ByteArray("bytes"));
+    assert(vBa.type() == Variant::Type::ByteArray);
+    assert(vBa.toByteArray() == "bytes");
+
+    // Template value<>
+    assert(vInt.value<int>() == 42);
+    assert(vStr.value<String>() == "hello");
+
+    // Comparison
+    assert(Variant(42) == Variant(42));
+    assert(Variant(42) != Variant(43));
+    assert(Variant(String("a")) != Variant(String("b")));
+
+    // ===== Pair tests =====
+
+    auto p = qtac::makePair(String("key"), 42);
+    assert(p.first == "key");
+    assert(p.second == 42);
+
+    qtac::Pair<int, int> p2 = {1, 2};
+    assert(p2.first == 1 && p2.second == 2);
+
+    std::printf("All container tests passed!\n");
+    return 0;
+}
diff --git a/source/test/test_hardware_ftdi.cpp b/source/test/test_hardware_ftdi.cpp
new file mode 100644
index 00000000..8e768144
--- /dev/null
+++ b/source/test/test_hardware_ftdi.cpp
@@ -0,0 +1,270 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Hardware integration test: TACLite / FTDI device
+//
+// Requires a TACLite FTDI device physically connected.
+// Auto-enumerates via _FTDIChipset::getDeviceCount().
+//
+// Tests exercised:
+//   1. Device enumeration   — FTDIDevice::updateAlpacaDevices() finds >= 1 device
+//   2. AlpacaDevice registry — findAlpacaDevice() by hash succeeds
+//   3. Drive thread lifecycle — TACLiteDriveThread start/run/shutDown
+//   4. Signal delivery        — onDeviceConnected, onFirmwareVersionUpdate,
+//                               onHardwareTypeUpdate, onNameUpdate fire within
+//                               the connection timeout
+//   5. Property accessors     — name(), portName(), debugBoardType()
+//   6. Clean shutdown         — shutDown() + join completes without hang
+
+#include <qtac/FTDIDevice.h>
+#include <qtac/FTDIChipset.h>
+#include <qtac/TACLiteDriveThread.h>
+#include <qtac/AlpacaDevice.h>
+#include <qtac/FTDIPlatformConfiguration.h>
+
+#include <atomic>
+#include <cassert>
+#undef assert
+#define assert(expr) \
+    do { if (!(expr)) { \
+        std::fprintf(stderr, "Assertion failed: %s, file %s, line %d\n", #expr, __FILE__, __LINE__); \
+        std::exit(1); \
+    } } while(0)
+#include <chrono>
+#include <cstdio>
+#include <thread>
+
+// ---------------------------------------------------------------------------
+// Wait helper — spins until predicate returns true or timeout_ms elapses.
+// ---------------------------------------------------------------------------
+
+static bool waitFor(std::function<bool()> pred, int timeout_ms = 3000, int poll_ms = 50)
+{
+    const auto deadline = std::chrono::steady_clock::now()
+                          + std::chrono::milliseconds(timeout_ms);
+    while (std::chrono::steady_clock::now() < deadline)
+    {
+        if (pred()) return true;
+        std::this_thread::sleep_for(std::chrono::milliseconds(poll_ms));
+    }
+    return pred(); // one final check
+}
+
+// ---------------------------------------------------------------------------
+// Test 1: Device enumeration and chipset helpers
+// (Combined to avoid calling getDeviceCount() more than once —
+//  calling it a second time while _ftdiChipsetList is populated causes
+//  the reset() loop to invalidate its own iterator.)
+// ---------------------------------------------------------------------------
+
+static void test_enumeration_and_chipset()
+{
+    // -- AlpacaDevice registry (calls getDeviceCount internally) --
+    printf("test_enumeration: ");
+
+    uint32_t devCount = FTDIDevice::updateAlpacaDevices();
+    printf("found %u FTDI device(s)\n", devCount);
+    assert(devCount >= 1 && "No FTDI device found — is a TACLite connected?");
+
+    AlpacaDevices devices;
+    _AlpacaDevice::getAlpacaDevices(devices, eFTDI);
+    assert(!devices.isEmpty());
+    assert(devices[0]->active());
+    assert(!devices[0]->portName().isEmpty());
+    printf("  port: %s  sn: %s\n",
+           devices[0]->portName().toStdString().c_str(),
+           devices[0]->serialNumber().toStdString().c_str());
+    printf("  PASS\n");
+
+    // -- Chipset layer (use getDevice without re-enumerating) --
+    printf("test_chipset_helpers: ");
+
+    // getDevice(0) returns from the already-populated static list.
+    FTDIChipset chip = _FTDIChipset::getDevice(0);
+    assert(chip != nullptr);
+    assert(!chip->portName().isEmpty());
+    assert(chip->hash() != 0);
+
+    // Look up the same chipset by port name
+    FTDIChipset chip2 = _FTDIChipset::getDevice(chip->portName());
+    assert(chip2 != nullptr);
+    assert(chip2->hash() == chip->hash());
+
+    printf("  PASS\n");
+}
+
+static void test_registry_lookup()
+{
+    printf("test_registry_lookup: ");
+
+    AlpacaDevices devices;
+    _AlpacaDevice::getAlpacaDevices(devices, eFTDI);
+    assert(!devices.isEmpty());
+
+    AlpacaDevice first = devices[0];
+    HashType hash = first->hash();
+    assert(hash != 0);
+
+    AlpacaDevice found = _AlpacaDevice::findAlpacaDevice(hash);
+    assert(found != nullptr);
+    assert(found->hash() == hash);
+
+    AlpacaDevice foundByPort = _AlpacaDevice::findAlpacaDevice(first->portName());
+    assert(foundByPort != nullptr);
+    assert(foundByPort->hash() == hash);
+
+    printf("  PASS\n");
+}
+
+// ---------------------------------------------------------------------------
+// Test 3 + 4: Drive thread lifecycle and signal delivery
+// ---------------------------------------------------------------------------
+
+static void test_drive_thread_lifecycle()
+{
+    printf("test_drive_thread_lifecycle: ");
+
+    AlpacaDevices devices;
+    _AlpacaDevice::getAlpacaDevices(devices, eFTDI);
+    assert(!devices.isEmpty());
+
+    AlpacaDevice alpacaDevice = devices[0];
+    HashType hash = alpacaDevice->hash();
+
+    // Counters updated from signal callbacks (all accessed from worker thread
+    // but read here only after shutDown() + join, so no data race).
+    std::atomic<int> connectedCount{0};
+    std::atomic<int> disconnectedCount{0};
+    qtac::String     capturedHwType;
+    qtac::String     capturedFwVersion;
+    qtac::String     capturedName;
+    std::atomic<int> logLineCount{0};
+
+    auto driveThread = std::unique_ptr<qtac::TACLiteDriveThread>(new qtac::TACLiteDriveThread(hash));
+
+    driveThread->onDeviceConnected.connect([&]() {
+        ++connectedCount;
+    });
+    driveThread->onDeviceDisconnected.connect([&]() {
+        ++disconnectedCount;
+    });
+    driveThread->onHardwareTypeUpdate.connect([&](const qtac::String& s) {
+        capturedHwType = s;
+    });
+    driveThread->onFirmwareVersionUpdate.connect([&](const qtac::String& s) {
+        capturedFwVersion = s;
+    });
+    driveThread->onNameUpdate.connect([&](const qtac::String& s) {
+        capturedName = s;
+    });
+    driveThread->onLogLine.connect([&](const qtac::ByteArray&) {
+        ++logLineCount;
+    });
+
+    driveThread->start();
+
+    // Wait up to 3 s for onDeviceConnected to fire.
+    bool connected = waitFor([&]{ return connectedCount.load() > 0; }, 3000);
+
+    if (!connected)
+    {
+        // Device may not have opened — shut down cleanly and report.
+        driveThread->shutDown();
+        printf("  SKIP (device opened but did not become connected within 3s)\n");
+        return;
+    }
+
+    printf("\n  hw_type='%s'  fw='%s'  name='%s'\n",
+           capturedHwType.toStdString().c_str(),
+           capturedFwVersion.toStdString().c_str(),
+           capturedName.toStdString().c_str());
+
+    assert(connectedCount.load() >= 1);
+    assert(logLineCount.load() > 0 && "expected at least one log line from run()");
+
+    // Graceful shutdown
+    driveThread->shutDown();
+
+    // After shutDown() the disconnected signal should have fired.
+    assert(disconnectedCount.load() >= 1);
+
+    printf("  PASS\n");
+}
+
+// ---------------------------------------------------------------------------
+// Test 5: Property accessors after enumeration
+// ---------------------------------------------------------------------------
+
+static void test_property_accessors()
+{
+    printf("test_property_accessors: ");
+
+    AlpacaDevices devices;
+    _AlpacaDevice::getAlpacaDevices(devices, eFTDI);
+    assert(!devices.isEmpty());
+
+    AlpacaDevice d = devices[0];
+
+    // boardType should be eFTDI
+    assert(d->debugBoardType() == eFTDI);
+
+    // serialNumber must be non-empty
+    assert(!d->serialNumber().isEmpty());
+
+    // portName must be non-empty
+    assert(!d->portName().isEmpty());
+
+    printf("  PASS\n");
+}
+
+// ---------------------------------------------------------------------------
+// Test 6: Chipset helpers
+// ---------------------------------------------------------------------------
+
+// ---------------------------------------------------------------------------
+// main
+// ---------------------------------------------------------------------------
+
+int main()
+{
+    setvbuf(stdout, nullptr, _IONBF, 0); // unbuffered stdout so all output shows before abort
+    printf("=== Hardware Integration: TACLite / FTDI ===\n\n");
+
+    // Combined: chipset helpers + AlpacaDevice registry (only one getDeviceCount call)
+    test_enumeration_and_chipset();
+    test_registry_lookup();
+    test_property_accessors();
+    test_drive_thread_lifecycle();
+
+    printf("\nAll hardware tests passed.\n");
+    return 0;
+}
diff --git a/source/test/test_hardware_psoc.cpp b/source/test/test_hardware_psoc.cpp
new file mode 100644
index 00000000..d6d7fc45
--- /dev/null
+++ b/source/test/test_hardware_psoc.cpp
@@ -0,0 +1,471 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Hardware integration test: PSoC device
+//
+// Requires a PSoC-based TAC device physically connected via serial port
+// (VID 0x05C6/PID 0x9302 or VID 0x16C0/PID 0x0483).
+//
+// Tests exercised:
+//   1. Device enumeration   — PSOCDevice::updateAlpacaDevices() finds >= 1 device
+//   2. Pre-open properties  — debugBoardType, portName, serialNumber
+//   3. Registry lookup      — findAlpacaDevice() by hash and by port name
+//   4. Open / close         — open() returns true, platformID is resolved,
+//                             commandCount > 0, close() completes without hang
+//   5. Pin signal           — onPinStateChanged is wired through _serialDriveThread
+//                             (no explicit signal expected; just verifies no crash)
+//   6. Double-close safety  — close() on an already-closed device is a no-op
+
+#include <qtac/PSOCDevice.h>
+#include <qtac/AlpacaDevice.h>
+#include <qtac/TACPSOCDriveThread.h>
+#include <qtac/SerialPort.h>
+#include <qtac/SerialPortInfo.h>
+#include <qtac/SerialPortSettings.h>
+#include <qtac/DebugBoardType.h>
+#include <qtac/PlatformID.h>
+
+#include <atomic>
+#include <cassert>
+#undef assert
+#define assert(expr) \
+    do { if (!(expr)) { \
+        std::fprintf(stderr, "Assertion failed: %s, file %s, line %d\n", #expr, __FILE__, __LINE__); \
+        std::exit(1); \
+    } } while(0)
+#include <chrono>
+#include <cstdio>
+#include <functional>
+#include <thread>
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+static bool waitFor(std::function<bool()> pred, int timeout_ms = 5000, int poll_ms = 50)
+{
+    const auto deadline = std::chrono::steady_clock::now()
+                          + std::chrono::milliseconds(timeout_ms);
+    while (std::chrono::steady_clock::now() < deadline)
+    {
+        if (pred()) return true;
+        std::this_thread::sleep_for(std::chrono::milliseconds(poll_ms));
+    }
+    return pred();
+}
+
+static AlpacaDevices getPSOCDevices()
+{
+    AlpacaDevices devices;
+    _AlpacaDevice::getAlpacaDevices(devices, ePSOC);
+    return devices;
+}
+
+// ---------------------------------------------------------------------------
+// Test 1: Enumeration
+// ---------------------------------------------------------------------------
+
+static void test_enumeration()
+{
+    printf("test_enumeration: ");
+
+    uint32_t devCount = PSOCDevice::updateAlpacaDevices();
+    printf("found %u PSoC device(s)\n", devCount);
+    assert(devCount >= 1 && "No PSoC device found — is a PSoC TAC connected?");
+
+    AlpacaDevices devices = getPSOCDevices();
+    assert(!devices.isEmpty());
+    assert(devices[0]->active());
+
+    printf("  port: %s  sn: %s\n",
+           devices[0]->portName().toStdString().c_str(),
+           devices[0]->serialNumber().toStdString().c_str());
+    printf("  PASS\n");
+}
+
+// ---------------------------------------------------------------------------
+// Test 2: Pre-open property accessors
+// ---------------------------------------------------------------------------
+
+static void test_pre_open_properties()
+{
+    printf("test_pre_open_properties: ");
+
+    AlpacaDevices devices = getPSOCDevices();
+    assert(!devices.isEmpty());
+    AlpacaDevice d = devices[0];
+
+    assert(d->debugBoardType() == ePSOC);
+    assert(!d->portName().isEmpty());
+    // serialNumber may be empty on some PSoC firmware versions — just print it
+    printf("\n  boardType=%s  port=%s  sn='%s'\n",
+           d->debugBoardTypeString().toStdString().c_str(),
+           d->portName().toStdString().c_str(),
+           d->serialNumber().toStdString().c_str());
+
+    printf("  PASS\n");
+}
+
+// ---------------------------------------------------------------------------
+// Test 3: Registry lookup
+// ---------------------------------------------------------------------------
+
+static void test_registry_lookup()
+{
+    printf("test_registry_lookup: ");
+
+    AlpacaDevices devices = getPSOCDevices();
+    assert(!devices.isEmpty());
+
+    AlpacaDevice first = devices[0];
+    HashType hash = first->hash();
+    assert(hash != 0);
+
+    AlpacaDevice foundByHash = _AlpacaDevice::findAlpacaDevice(hash);
+    assert(foundByHash != nullptr);
+    assert(foundByHash->hash() == hash);
+
+    AlpacaDevice foundByPort = _AlpacaDevice::findAlpacaDevice(first->portName());
+    assert(foundByPort != nullptr);
+    assert(foundByPort->hash() == hash);
+
+    printf("  PASS\n");
+}
+
+// ---------------------------------------------------------------------------
+// Test 3b: Raw serial loopback — open the port directly via SerialPort,
+// send "getboardid\r", and print whatever bytes come back within 2s.
+// Useful to verify the serial layer is functional independent of the
+// drive thread state machine.
+// ---------------------------------------------------------------------------
+
+static void test_raw_serial()
+{
+    printf("test_raw_serial:\n");
+
+    AlpacaDevices devices = getPSOCDevices();
+    assert(!devices.isEmpty());
+
+    qtac::SerialPortInfo portInfo;
+    {
+        // Find the matching SerialPortInfo
+        qtac::String targetPort = qtac::String(devices[0]->portName().toStdString());
+        for (const auto& info : qtac::SerialPortInfo::availablePorts())
+        {
+            if (info.portName() == targetPort)
+            {
+                portInfo = info;
+                break;
+            }
+        }
+    }
+
+    if (portInfo.isNull())
+    {
+        printf("  SKIP: port info not found\n");
+        return;
+    }
+
+    qtac::SerialPortSettings settings;
+    settings.baudRate = 115200;
+
+    qtac::SerialPort port(portInfo);
+    port.setSettings(settings);
+
+    if (!port.open())
+    {
+        printf("  SKIP: could not open port — %s\n", port.errorString().toStdString().c_str());
+        return;
+    }
+
+    printf("  Port opened. Sending 'getboardid\\r'...\n");
+
+    // Drain any pending bytes first.
+    port.clear();
+
+    int written = port.write(qtac::ByteArray("getboardid\r"), 1000);
+    printf("  Bytes written: %d\n", written);
+
+    // Poll for a response for up to 2 seconds.
+    bool gotData = false;
+    for (int i = 0; i < 20; ++i)
+    {
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+        qtac::ByteArray data = port.readAll(50);
+        if (!data.isEmpty())
+        {
+            printf("  Received (%d bytes): '", data.size());
+            // Print printable chars, escape others
+            for (int j = 0; j < data.size(); ++j)
+            {
+                unsigned char c = static_cast<unsigned char>(data.constData()[j]);
+                if (c >= 32 && c < 127) printf("%c", c);
+                else printf("\\x%02x", c);
+            }
+            printf("'\n");
+            gotData = true;
+        }
+    }
+
+    if (!gotData)
+        printf("  No response received within 2s\n");
+
+    port.close();
+    printf("  PASS (check output above)\n");
+}
+
+// ---------------------------------------------------------------------------
+// Test 4a: Drive thread in isolation (mirrors test_hardware_ftdi approach).
+// Directly instantiates TACPSOCDriveThread and waits for onDeviceConnected.
+// This bypasses PSOCDevice::open() to verify the serial layer independently.
+// ---------------------------------------------------------------------------
+
+static void test_drive_thread_direct()
+{
+    printf("test_drive_thread_direct: (may take a few seconds)\n");
+
+    AlpacaDevices devices = getPSOCDevices();
+    assert(!devices.isEmpty());
+    AlpacaDevice alpacaDevice = devices[0];
+    HashType hash = alpacaDevice->hash();
+
+    std::atomic<int>  connectedCount{0};
+    std::atomic<int>  disconnectedCount{0};
+    std::atomic<int>  logLineCount{0};
+    qtac::String      capturedHwType;
+    qtac::String      capturedFwVersion;
+    qtac::String      capturedName;
+    qtac::ByteArray   lastLogLine;
+
+    auto driveThread = std::unique_ptr<qtac::TACPSOCDriveThread>(new qtac::TACPSOCDriveThread(hash));
+
+    driveThread->onDeviceConnected.connect([&]() {
+        ++connectedCount;
+        printf("  [connected! count=%d]\n", connectedCount.load());
+    });
+    driveThread->onDeviceDisconnected.connect([&]() {
+        ++disconnectedCount;
+        printf("  [disconnected! count=%d]\n", disconnectedCount.load());
+    });
+    driveThread->onFirmwareVersionUpdate.connect([&](const qtac::String& s) {
+        capturedFwVersion = s;
+        printf("  [firmware: '%s']\n", s.toStdString().c_str());
+    });
+    driveThread->onHardwareTypeUpdate.connect([&](const qtac::String& s) {
+        capturedHwType = s;
+        printf("  [hwtype: '%s']\n", s.toStdString().c_str());
+    });
+    driveThread->onNameUpdate.connect([&](const qtac::String& s) {
+        capturedName = s;
+        printf("  [name: '%s']\n", s.toStdString().c_str());
+    });
+    driveThread->onLogLine.connect([&](const qtac::ByteArray& line) {
+        ++logLineCount;
+        lastLogLine = line;
+        printf("  [log] %s\n", line.toStdString().c_str());
+    });
+
+    driveThread->start();
+
+    bool connected = waitFor([&]{ return connectedCount.load() > 0; }, 5000);
+
+    if (!connected)
+    {
+        driveThread->shutDown();
+        printf("  SKIP: drive thread did not connect within 5s\n");
+        printf("  Last log line: '%s'\n", lastLogLine.toStdString().c_str());
+        return;
+    }
+
+    printf("  hw_type='%s'  fw='%s'  name='%s'\n",
+           capturedHwType.toStdString().c_str(),
+           capturedFwVersion.toStdString().c_str(),
+           capturedName.toStdString().c_str());
+
+    assert(connectedCount.load() >= 1);
+
+    driveThread->shutDown();
+    assert(disconnectedCount.load() >= 1);
+
+    printf("  PASS\n");
+}
+
+// ---------------------------------------------------------------------------
+// Test 4b: Open / close lifecycle via PSOCDevice::open()
+// ---------------------------------------------------------------------------
+//
+// PSoC open() is self-contained — it creates its own TACPSOCDriveThread
+// internally via _serialDriveThread. No external thread injection needed.
+// open() blocks until the device is connected or times out (~18 s max).
+// ---------------------------------------------------------------------------
+
+static void test_open_close()
+{
+    printf("test_open_close: (may take a few seconds)...\n");
+
+    AlpacaDevices devices = getPSOCDevices();
+    assert(!devices.isEmpty());
+    AlpacaDevice dev = devices[0];
+
+    // Connect the device-level pin signal before open() so we know the
+    // forwarding wire from _serialDriveThread is in place.
+    // Use a shared_ptr to avoid stack-use-after-return when lambda outlives function
+    auto pinSignalCount = std::make_shared<std::atomic<int>>(0);
+    int connectionId = dev->onPinStateChanged.connect([pinSignalCount](uint64_t /*pin*/, bool /*state*/) {
+        ++(*pinSignalCount);
+    });
+
+    // open() creates _serialDriveThread, starts it, and blocks until
+    // connected (or returns false on timeout / old firmware).
+    bool ok = dev->open();
+    if (!ok)
+    {
+        // getLastError() clears the stored error — capture it immediately.
+        qtac::ByteArray err = dev->getLastError();
+        printf("  SKIP: open() returned false — '%s'\n",
+               err.isEmpty() ? "(no message — error was already consumed)" : err.toStdString().c_str());
+        return;
+    }
+
+    // platformID may be UNKNOWN on firmware that does not support 'Get Platform ID'.
+    PlatformID pid = dev->platformID();
+    if (pid == MICRO_EPM_BOARD_ID_UNKNOWN)
+        printf("  platformID=UNKNOWN (firmware does not support Get Platform ID)\n");
+    else
+        printf("  platformID=%d\n", static_cast<int>(pid));
+
+    // Commands are built via buildMapping() inside open() if a .tcnf exists.
+    uint32_t cmdCount = dev->commandCount();
+    printf("  commandCount=%u\n", cmdCount);
+
+    // isOpen() should now be true.
+    assert(dev->isOpen());
+
+    // Disconnect signal before closing to prevent callbacks after close
+    dev->onPinStateChanged.disconnect(connectionId);
+
+    // close() shuts down _serialDriveThread and deletes it.
+    dev->close();
+    assert(!dev->isOpen());
+
+    printf("  PASS\n");
+}
+
+// ---------------------------------------------------------------------------
+// Test 5: Double-close is a no-op
+// ---------------------------------------------------------------------------
+
+static void test_double_close()
+{
+    printf("test_double_close: ");
+
+    AlpacaDevices devices = getPSOCDevices();
+    assert(!devices.isEmpty());
+    AlpacaDevice dev = devices[0];
+
+    // open then close twice — second close must not crash or hang
+    bool ok = dev->open();
+    if (!ok)
+    {
+        printf("  SKIP (open failed)\n");
+        return;
+    }
+    dev->close();
+    dev->close();   // second close — should be a no-op
+
+    printf("  PASS\n");
+}
+
+// ---------------------------------------------------------------------------
+// Test 6: Property accessor coverage after open()
+//
+// NOTE: _AlpacaDevice property accessors (firmwareVersion, hardwareVersionString,
+// name, etc.) route through _driveThread, not _serialDriveThread. For PSoC,
+// _driveThread is never set — so these return empty strings even after a
+// successful open(). This test documents the current known limitation.
+// ---------------------------------------------------------------------------
+
+static void test_property_accessors_after_open()
+{
+    printf("test_property_accessors_after_open:\n");
+
+    AlpacaDevices devices = getPSOCDevices();
+    assert(!devices.isEmpty());
+    AlpacaDevice dev = devices[0];
+
+    bool ok = dev->open();
+    if (!ok)
+    {
+        printf("  SKIP (open failed)\n");
+        return;
+    }
+
+    // These are set directly on the device (not via _driveThread) — should work.
+    printf("  platformID     = %d\n",    static_cast<int>(dev->platformID()));
+    printf("  debugBoardType = %s\n",    dev->debugBoardTypeString().toStdString().c_str());
+    printf("  portName       = %s\n",    dev->portName().toStdString().c_str());
+    printf("  serialNumber   = %s\n",    dev->serialNumber().toStdString().c_str());
+    printf("  description    = %s\n",    dev->description().toStdString().c_str());
+    printf("  commandCount   = %u\n",    dev->commandCount());
+
+    // These route through _driveThread (not set for PSoC) — expect empty.
+    printf("  [via _driveThread — expected empty for PSoC:]\n");
+    printf("  firmwareVersion     = '%s'\n", dev->firmwareVersion().toStdString().c_str());
+    printf("  hardwareVersionStr  = '%s'\n", dev->hardwareVersionString().toStdString().c_str());
+    printf("  name                = '%s'\n", dev->name().toStdString().c_str());
+    printf("  uuid                = '%s'\n", dev->uuid().toStdString().c_str());
+
+    dev->close();
+    printf("  PASS (see output above for known limitations)\n");
+}
+
+// ---------------------------------------------------------------------------
+// main
+// ---------------------------------------------------------------------------
+
+int main()
+{
+    setvbuf(stdout, nullptr, _IONBF, 0);
+    printf("=== Hardware Integration: PSoC ===\n\n");
+
+    test_enumeration();
+    test_pre_open_properties();
+    test_registry_lookup();
+    test_raw_serial();
+    test_drive_thread_direct();
+    test_open_close();
+    test_double_close();
+    test_property_accessors_after_open();
+
+    printf("\nAll PSoC hardware tests passed.\n");
+    return 0;
+}
diff --git a/source/test/test_platform_configs.cpp b/source/test/test_platform_configs.cpp
new file mode 100644
index 00000000..8eaf38af
--- /dev/null
+++ b/source/test/test_platform_configs.cpp
@@ -0,0 +1,407 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <qtac/STM32PlatformConfiguration.h>
+#include <qtac/PSOCPlatformConfiguration.h>
+#include <qtac/Notification.h>
+
+#include <cassert>
+#undef assert
+#define assert(expr) \
+    do { if (!(expr)) { \
+        std::fprintf(stderr, "Assertion failed: %s, file %s, line %d\n", \
+                     #expr, __FILE__, __LINE__); \
+        std::exit(1); \
+    } } while(0)
+
+#include <cstdio>
+#include <thread>
+#include <chrono>
+
+// ===========================================================================
+// STM32PlatformConfiguration
+// ===========================================================================
+
+static void test_stm32_pin_count()
+{
+    _STM32PlatformConfiguration cfg;
+
+    // BugHopper V2 has exactly 3 pins (EDL/0, Battery/2, VolumeDown/3),
+    // all enabled.
+    STM32PinList all    = cfg.getAllPins();
+    STM32PinList active = cfg.getActivePins();
+    assert(all.size()    == 3);
+    assert(active.size() == 3);
+}
+
+static void test_stm32_pin_data_edl()
+{
+    _STM32PlatformConfiguration cfg;
+
+    // Pin 0 = EDL: enabled, not inverted, command "edl", group eSwitchGroup
+    assert(cfg.getPinEnableState(0)    == true);
+    assert(cfg.getPinInvertedState(0)  == false);
+    assert(cfg.getPinLabel(0)          == "EDL");
+    assert(cfg.getPinCommand(0)        == "edl");
+    assert(cfg.getTabName(0)           == "General");
+    assert(cfg.getPinGroup(0)          == eSwitchGroup);
+}
+
+static void test_stm32_pin_data_battery()
+{
+    _STM32PlatformConfiguration cfg;
+
+    // Pin 2 = Battery: enabled, INVERTED (physical off = battery on),
+    // group eConnectionGroup
+    assert(cfg.getPinEnableState(2)    == true);
+    assert(cfg.getPinInvertedState(2)  == true);
+    assert(cfg.getPinLabel(2)          == "Battery");
+    assert(cfg.getPinCommand(2)        == "battery");
+    assert(cfg.getPinGroup(2)          == eConnectionGroup);
+}
+
+static void test_stm32_pin_data_voldn()
+{
+    _STM32PlatformConfiguration cfg;
+
+    // Pin 3 = Volume Down: enabled, not inverted, group eSwitchGroup
+    assert(cfg.getPinEnableState(3)    == true);
+    assert(cfg.getPinInvertedState(3)  == false);
+    assert(cfg.getPinLabel(3)          == "Volume Down");
+    assert(cfg.getPinCommand(3)        == "voldn");
+    assert(cfg.getPinGroup(3)          == eSwitchGroup);
+}
+
+static void test_stm32_pin_not_found()
+{
+    _STM32PlatformConfiguration cfg;
+
+    // Pin 99 does not exist — accessors return sensible defaults.
+    assert(cfg.getPinEnableState(99)   == true);   // default
+    assert(cfg.getPinInvertedState(99) == false);  // default
+    assert(cfg.getPinLabel(99).isEmpty());
+    assert(cfg.getPinCommand(99).isEmpty());
+    assert(cfg.getPinCellLocation(99)  == qtac::Point(-1, -1));
+}
+
+static void test_stm32_buttons()
+{
+    _STM32PlatformConfiguration cfg;
+
+    // Exactly 5 buttons: Power On, Power Off, Reset, Boot to EDL,
+    // Force USB-C Host Mode.
+    const auto& buttons = cfg.getButtons();
+    assert(buttons.size() == 5);
+
+    // Spot-check the first and last by name.
+    assert(buttons[0]._name    == "Power On");
+    assert(buttons[0]._command == "powerOn");
+    assert(buttons[4]._name    == "Force USB-C Host Mode");
+    assert(buttons[4]._command == "forceUsbcHostMode");
+}
+
+static void test_stm32_variables()
+{
+    _STM32PlatformConfiguration cfg;
+
+    const auto& vars = cfg.getVariables();
+    assert(vars.size() == 1);
+
+    auto it = vars.find("edl");
+    assert(it != vars.end());
+    assert(it->second._label       == "EDL timing (ms)");
+    assert(it->second._type        == qtac::VariableType::Integer);
+    assert(it->second._defaultValue.toUInt() == 100u);
+}
+
+static void test_stm32_script_has_expected_commands()
+{
+    _STM32PlatformConfiguration cfg;
+
+    const qtac::AlpacaScript& script = cfg.getScript();
+    assert(script.hasCommand("powerOn"));
+    assert(script.hasCommand("powerOff"));
+    assert(script.hasCommand("reset"));
+    assert(script.hasCommand("bootToEDL"));
+    assert(script.hasCommand("forceUsbcHostMode"));
+}
+
+static void test_stm32_getPins_returns_sorted_entries()
+{
+    _STM32PlatformConfiguration cfg;
+
+    Pins pins = cfg.getPins();
+    assert(pins.size() == 3);
+
+    // Verify the PinEntry fields are populated for pin 2 (Battery).
+    bool foundBattery = false;
+    for (const auto& pe : pins)
+    {
+        if (pe._pinCommand == "battery")
+        {
+            assert(pe._inverted == true);
+            assert(pe._pinLabel == "Battery");
+            foundBattery = true;
+        }
+    }
+    assert(foundBattery);
+}
+
+static void test_stm32_reinitialize()
+{
+    // Calling initialize() a second time must produce the same result
+    // (idempotent — clears and repopulates).
+    _STM32PlatformConfiguration cfg;
+    cfg.initialize();
+
+    assert(cfg.getAllPins().size()    == 3);
+    assert(cfg.getButtons().size()   == 5);
+    assert(cfg.getVariables().size() == 1);
+}
+
+// ===========================================================================
+// PSOCPlatformConfiguration — I2C variant (ePSOCGPIOIIC)
+// ===========================================================================
+
+static void test_psoc_iic_variant_is_set()
+{
+    _PSOCPlatformConfiguration cfg(ePSOCGPIOIIC);
+    assert(cfg.variant() == ePSOCGPIOIIC);
+}
+
+static void test_psoc_gpio_variant_default()
+{
+    // Default constructor (and explicit ePSOCGPIO) must not populate I2C entries.
+    _PSOCPlatformConfiguration cfg;
+    assert(cfg.variant() == ePSOCGPIO);
+    assert(cfg.getI2CEntries().isEmpty());
+    assert(cfg.getSlaveConfigs().isEmpty());
+}
+
+static void test_psoc_iic_slave_configs_populated()
+{
+    _PSOCPlatformConfiguration cfg(ePSOCGPIOIIC);
+
+    // Should have exactly 2 slave configs: KTS1622EUAATR (0x20) and TCA9534APWR (0x38).
+    PSOCI2CSlaves slaves = cfg.getSlaveConfigs();
+    assert(slaves.size() == 2);
+
+    bool foundKTS = false, foundTCA = false;
+    for (const auto& s : slaves)
+    {
+        if (s._variant == eKTS1622EUAATR)
+        {
+            assert(s._slaveAddress == 0x20);
+            assert(s._portCount    == 2);
+            foundKTS = true;
+        }
+        if (s._variant == eTCA9534APWR)
+        {
+            assert(s._slaveAddress == 0x38);
+            assert(s._portCount    == 1);
+            foundTCA = true;
+        }
+    }
+    assert(foundKTS);
+    assert(foundTCA);
+}
+
+static void test_psoc_iic_entries_populated()
+{
+    _PSOCPlatformConfiguration cfg(ePSOCGPIOIIC);
+
+    // KTS1622EUAATR has 2 ports × 8 pins = 16 entries.
+    // TCA9534APWR has 1 port × 8 pins = 8 entries.
+    // Total = 24 I2C entries.
+    PSOCI2CEntries entries = cfg.getI2CEntries();
+    assert(entries.size() == 24);
+}
+
+static void test_psoc_iic_active_entries_all_enabled()
+{
+    _PSOCPlatformConfiguration cfg(ePSOCGPIOIIC);
+
+    // 24 total entries; 6 are disabled by default (reserved/unused pins).
+    // Active (enabled) = 18.
+    PSOCI2CEntries active = cfg.getActiveI2CEntries();
+    assert(active.size() == 18);
+}
+
+static void test_psoc_iic_entries_for_kts_slave()
+{
+    _PSOCPlatformConfiguration cfg(ePSOCGPIOIIC);
+
+    PSOCI2CSlaves slaves = cfg.getSlaveConfigs();
+    PSOCI2CSlave kts;
+    for (const auto& s : slaves)
+        if (s._variant == eKTS1622EUAATR) { kts = s; break; }
+
+    // KTS1622EUAATR: portCount=2, so 16 entries capped at 16.
+    auto entries = cfg.getI2CEntriesForSlave(kts);
+    assert(entries.size() == 16);
+}
+
+static void test_psoc_iic_slave_tab_name()
+{
+    _PSOCPlatformConfiguration cfg(ePSOCGPIOIIC);
+
+    PSOCI2CSlaves slaves = cfg.getSlaveConfigs();
+    PSOCI2CSlave kts, tca;
+    for (const auto& s : slaves)
+    {
+        if (s._variant == eKTS1622EUAATR) kts = s;
+        if (s._variant == eTCA9534APWR)   tca = s;
+    }
+
+    // Tab name format: "<variant name> (0x<hex address>)"
+    qtac::String ktsTab = _PSOCPlatformConfiguration::i2cSlaveTabName(kts);
+    qtac::String tcaTab = _PSOCPlatformConfiguration::i2cSlaveTabName(tca);
+
+    assert(ktsTab.contains("KTS1622EUAATR"));
+    assert(ktsTab.contains("0x20"));
+    assert(tcaTab.contains("TCA9534APWR"));
+    assert(tcaTab.contains("0x38"));
+}
+
+static void test_psoc_iic_add_remove_slave()
+{
+    _PSOCPlatformConfiguration cfg(ePSOCGPIOIIC);
+    int initialCount = cfg.getSlaveConfigs().size(); // 2
+
+    PSOCI2CSlave extra;
+    extra._variant      = eTCA9534APWR;
+    extra._slaveAddress = 0x39;
+    extra._portCount    = 1;
+    cfg.addSlaveConfig(extra);
+    assert(cfg.getSlaveConfigs().size() == initialCount + 1);
+
+    cfg.removeSlaveConfig(0x39);
+    assert(cfg.getSlaveConfigs().size() == initialCount);
+}
+
+// ===========================================================================
+// Notification
+// ===========================================================================
+
+static void test_notification_construction()
+{
+    qtac::Notification n(qtac::String("disk full"), qtac::NotificationLevel::Warn, 42u);
+
+    assert(n.getMessage()         == "disk full");
+    assert(n.getLevel()           == qtac::NotificationLevel::Warn);
+    assert(n.getId()              == 42u);
+    assert(n.getOccurrenceCount() == 1u);
+}
+
+static void test_notification_default_id()
+{
+    qtac::Notification n(qtac::String("ok"), qtac::NotificationLevel::Info);
+    assert(n.getId() == 0u);
+}
+
+static void test_notification_add_occurrence()
+{
+    qtac::Notification n(qtac::String("retry"), qtac::NotificationLevel::Warn, 7u);
+    assert(n.getOccurrenceCount() == 1u);
+
+    auto t0 = n.getTimestamp();
+
+    // Sleep briefly so the clock advances before addOccurrence().
+    std::this_thread::sleep_for(std::chrono::milliseconds(5));
+
+    n.addOccurrence();
+    assert(n.getOccurrenceCount() == 2u);
+    assert(n.getTimestamp() >= t0);
+
+    n.addOccurrence();
+    assert(n.getOccurrenceCount() == 3u);
+}
+
+static void test_notification_timestamp_is_recent()
+{
+    auto before = qtac::Notification::Clock::now();
+    qtac::Notification n(qtac::String("event"), qtac::NotificationLevel::Error, 0u);
+    auto after  = qtac::Notification::Clock::now();
+
+    assert(n.getTimestamp() >= before);
+    assert(n.getTimestamp() <= after);
+}
+
+static void test_notification_levels()
+{
+    qtac::Notification info(qtac::String("i"),  qtac::NotificationLevel::Info);
+    qtac::Notification warn(qtac::String("w"),  qtac::NotificationLevel::Warn);
+    qtac::Notification err (qtac::String("e"),  qtac::NotificationLevel::Error);
+
+    assert(info.getLevel() == qtac::NotificationLevel::Info);
+    assert(warn.getLevel() == qtac::NotificationLevel::Warn);
+    assert(err.getLevel()  == qtac::NotificationLevel::Error);
+}
+
+// ===========================================================================
+// main
+// ===========================================================================
+
+int main()
+{
+    // STM32PlatformConfiguration
+    test_stm32_pin_count();
+    test_stm32_pin_data_edl();
+    test_stm32_pin_data_battery();
+    test_stm32_pin_data_voldn();
+    test_stm32_pin_not_found();
+    test_stm32_buttons();
+    test_stm32_variables();
+    test_stm32_script_has_expected_commands();
+    test_stm32_getPins_returns_sorted_entries();
+    test_stm32_reinitialize();
+
+    // PSOCPlatformConfiguration — I2C variant
+    test_psoc_iic_variant_is_set();
+    test_psoc_gpio_variant_default();
+    test_psoc_iic_slave_configs_populated();
+    test_psoc_iic_entries_populated();
+    test_psoc_iic_active_entries_all_enabled();
+    test_psoc_iic_entries_for_kts_slave();
+    test_psoc_iic_slave_tab_name();
+    test_psoc_iic_add_remove_slave();
+
+    // Notification
+    test_notification_construction();
+    test_notification_default_id();
+    test_notification_add_occurrence();
+    test_notification_timestamp_is_recent();
+    test_notification_levels();
+
+    std::printf("All platform config tests passed!\n");
+    return 0;
+}
diff --git a/source/test/test_signal.cpp b/source/test/test_signal.cpp
new file mode 100644
index 00000000..e5ab8451
--- /dev/null
+++ b/source/test/test_signal.cpp
@@ -0,0 +1,250 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <qtac/Signal.h>
+#include <cassert>
+#include <cstdio>
+#include <memory>
+#include <string>
+#include <vector>
+
+// ===== Basic fire =====
+
+static void test_basic_fire()
+{
+    qtac::Signal<int> sig;
+
+    int received = -1;
+    sig.connect([&](int v) { received = v; });
+    sig(42);
+    assert(received == 42);
+
+    sig(99);
+    assert(received == 99);
+}
+
+// ===== No subscribers =====
+
+static void test_no_subscribers()
+{
+    qtac::Signal<int> sig;
+    // Must not crash with no subscribers
+    sig(1);
+    assert(!(bool)sig);
+}
+
+// ===== operator bool =====
+
+static void test_operator_bool()
+{
+    qtac::Signal<> sig;
+    assert(!(bool)sig);
+
+    int id = sig.connect([] {});
+    assert((bool)sig);
+
+    sig.disconnect(id);
+    assert(!(bool)sig);
+}
+
+// ===== Multiple subscribers =====
+
+static void test_multiple_subscribers()
+{
+    qtac::Signal<int> sig;
+
+    int sum = 0;
+    sig.connect([&](int v) { sum += v; });
+    sig.connect([&](int v) { sum += v * 2; });
+
+    sig(10);
+    assert(sum == 30); // 10 + 20
+}
+
+// ===== Disconnect =====
+
+static void test_disconnect()
+{
+    qtac::Signal<int> sig;
+
+    int a = 0, b = 0;
+    int idA = sig.connect([&](int v) { a += v; });
+    int idB = sig.connect([&](int v) { b += v; });
+
+    sig(5);
+    assert(a == 5 && b == 5);
+
+    sig.disconnect(idA);
+    sig(3);
+    assert(a == 5);  // no longer fired
+    assert(b == 8);  // still fired
+
+    sig.disconnect(idB);
+    sig(10);
+    assert(b == 8);  // no longer fired
+}
+
+// ===== Disconnect non-existent ID is a no-op =====
+
+static void test_disconnect_invalid()
+{
+    qtac::Signal<int> sig;
+    sig.connect([](int) {});
+    sig.disconnect(9999); // must not crash
+    sig(1);               // must still fire remaining subscriber
+}
+
+// ===== Zero-argument signal =====
+
+static void test_zero_args()
+{
+    qtac::Signal<> sig;
+    int count = 0;
+    sig.connect([&] { ++count; });
+    sig();
+    sig();
+    assert(count == 2);
+}
+
+// ===== Multi-argument signal =====
+
+static void test_multi_args()
+{
+    qtac::Signal<int, double, std::string> sig;
+
+    int    gi = 0;
+    double gd = 0.0;
+    std::string gs;
+
+    sig.connect([&](int i, double d, std::string s) {
+        gi = i; gd = d; gs = std::move(s);
+    });
+
+    sig(7, 3.14, std::string("hello"));
+    assert(gi == 7);
+    assert(gd > 3.13 && gd < 3.15);
+    assert(gs == "hello");
+}
+
+// ===== Lifetime-safe connect (weak_ptr) =====
+
+static void test_weak_ptr_lifetime()
+{
+    qtac::Signal<int> sig;
+
+    int fired = 0;
+
+    {
+        auto owner = std::make_shared<int>(0);
+        sig.connect(std::weak_ptr<int>(owner), [&](int v) { fired += v; });
+
+        sig(10);
+        assert(fired == 10);
+
+        // owner goes out of scope here — slot should auto-disconnect
+    }
+
+    // After owner is gone the slot must not fire
+    sig(5);
+    assert(fired == 10);  // no change
+}
+
+// ===== Weak_ptr connect alongside regular connect =====
+
+static void test_weak_mixed()
+{
+    qtac::Signal<int> sig;
+
+    int permanent = 0;
+    int guarded   = 0;
+
+    sig.connect([&](int v) { permanent += v; });
+
+    {
+        auto owner = std::make_shared<int>(42);
+        sig.connect(std::weak_ptr<int>(owner), [&](int v) { guarded += v; });
+
+        sig(3);
+        assert(permanent == 3 && guarded == 3);
+    }
+
+    sig(7);
+    assert(permanent == 10); // still fires
+    assert(guarded   == 3);  // stopped after owner destroyed
+}
+
+// ===== IDs are unique and monotonically increasing =====
+
+static void test_unique_ids()
+{
+    qtac::Signal<> sig;
+    int id1 = sig.connect([] {});
+    int id2 = sig.connect([] {});
+    int id3 = sig.connect([] {});
+    assert(id1 < id2 && id2 < id3);
+}
+
+// ===== Signal is reusable after all disconnects =====
+
+static void test_reuse_after_disconnect()
+{
+    qtac::Signal<int> sig;
+
+    int v = 0;
+    int id = sig.connect([&](int x) { v = x; });
+    sig(1);
+    assert(v == 1);
+
+    sig.disconnect(id);
+    id = sig.connect([&](int x) { v = x + 100; });
+    sig(2);
+    assert(v == 102);
+}
+
+int main()
+{
+    test_basic_fire();
+    test_no_subscribers();
+    test_operator_bool();
+    test_multiple_subscribers();
+    test_disconnect();
+    test_disconnect_invalid();
+    test_zero_args();
+    test_multi_args();
+    test_weak_ptr_lifetime();
+    test_weak_mixed();
+    test_unique_ids();
+    test_reuse_after_disconnect();
+
+    std::printf("All Signal tests passed!\n");
+    return 0;
+}
diff --git a/source/test/test_string.cpp b/source/test/test_string.cpp
new file mode 100644
index 00000000..8724b530
--- /dev/null
+++ b/source/test/test_string.cpp
@@ -0,0 +1,137 @@
+#include <qtac/String.h>
+#include <qtac/StringList.h>
+#include <cassert>
+#include <cstdio>
+
+int main() {
+    using qtac::String;
+    using qtac::StringList;
+
+    // --- Constructors ---
+    String null;
+    assert(null.isNull());
+    assert(null.isEmpty());
+
+    String empty("");
+    assert(!empty.isNull());
+    assert(empty.isEmpty());
+
+    String hello("hello");
+    assert(!hello.isNull());
+    assert(!hello.isEmpty());
+    assert(hello.size() == 5);
+
+    String fromStd(std::string("world"));
+    assert(fromStd == "world");
+
+    String fromChar('x');
+    assert(fromChar == "x");
+
+    // --- toLatin1 / toUtf8 ---
+    auto ba = hello.toLatin1();
+    assert(ba == "hello");
+    assert(ba.size() == 5);
+
+    // --- Numeric conversions ---
+    bool ok = false;
+    assert(String("42").toInt(&ok) == 42 && ok);
+    assert(String("ff").toInt(&ok, 16) == 255 && ok);
+    assert(String("abc").toInt(&ok) == 0 && !ok);
+    assert(String("100").toUInt(&ok) == 100u && ok);
+    assert(String("18446744073709551615").toULongLong(&ok) == 18446744073709551615ULL && ok);
+    // assert(String("3.14").toDouble(&ok) > 3.13 && ok);  // toDouble() not implemented
+
+    // --- Case conversion ---
+    assert(String("Hello").toUpper() == "HELLO");
+    assert(String("Hello").toLower() == "hello");
+
+    // --- Trimming ---
+    assert(String("  hi  ").trimmed() == "hi");
+    // assert(String("  hello   world  ").simplified() == "hello world");  // simplified() not implemented
+    // assert(String("").simplified() == "");  // simplified() not implemented
+    // assert(String("   ").simplified() == "");  // simplified() not implemented
+
+    // --- Search ---
+    assert(String("hello world").contains("world"));
+    assert(!String("hello world").contains("xyz"));
+    assert(String("Hello").contains("hello", false));
+    assert(String("hello world").indexOf("world") == 6);
+    assert(String("hello world").indexOf("xyz") == -1);
+    assert(String("hello").startsWith("hel"));
+    assert(!String("hello").startsWith("xyz"));
+    assert(String("hello").endsWith("llo"));
+
+    // --- Substrings ---
+    assert(String("hello world").mid(6) == "world");
+    assert(String("hello world").mid(0, 5) == "hello");
+    assert(String("hello").left(3) == "hel");
+    // assert(String("hello").right(3) == "llo");  // right() not implemented
+
+    // --- Split / Join ---
+    StringList parts = String("a,b,c").split(',');
+    assert(parts.size() == 3);
+    assert(parts.at(0) == "a");
+    assert(parts.at(1) == "b");
+    assert(parts.at(2) == "c");
+
+    String joined = parts.join(String(","));
+    assert(joined == "a,b,c");
+
+    StringList parts2 = String("hello world foo").split(String(" "));
+    assert(parts2.size() == 3);
+    assert(parts2.at(2) == "foo");
+
+    // --- Replace ---
+    String s("hello world");
+    s.replace(String("world"), String("earth"));
+    assert(s == "hello earth");
+
+    // --- Arg ---
+    String tmpl("File %1 has %2 lines");
+    String result = tmpl.arg("test.cpp").arg(42);
+    assert(result == "File test.cpp has 42 lines");
+
+    String tmpl2("%1 + %1 = %2");
+    String result2 = tmpl2.arg("x").arg("2x");
+    assert(result2 == "x + x = 2x");
+
+    String tmpl3("%1 %2 %3");
+    String result3 = tmpl3.arg("a", "b", "c");
+    assert(result3 == "a b c");
+
+    // --- Compare ---
+    assert(String("abc").compare("abc") == 0);
+    assert(String("ABC").compare("abc", false) == 0);
+    assert(String("ABC").compare("abc", true) != 0);
+
+    // --- Static number ---
+    assert(String::number(42) == "42");
+    assert(String::number(255, 16) == "ff");
+    assert(String::number(0u) == "0");
+
+    // --- Operators ---
+    String a("hello");
+    String b(" world");
+    assert(a + b == "hello world");
+    a += b;
+    assert(a == "hello world");
+
+    // --- StringList operations ---
+    StringList sl;
+    sl.append(String("one"));
+    sl.append(String("two"));
+    sl.append(String("three"));
+    assert(sl.size() == 3);
+    assert(sl.contains(String("two")));
+    assert(!sl.contains(String("four")));
+    assert(sl.indexOf(String("two")) == 1);
+    sl.removeAt(1);
+    assert(sl.size() == 2);
+    assert(sl.at(1) == "three");
+
+    StringList filtered = StringList({"apple", "banana", "apricot"}).filter(String("ap"));
+    assert(filtered.size() == 2);
+
+    std::printf("All String tests passed!\n");
+    return 0;
+}
diff --git a/source/test/test_stringutils.cpp b/source/test/test_stringutils.cpp
new file mode 100644
index 00000000..dd3c2531
--- /dev/null
+++ b/source/test/test_stringutils.cpp
@@ -0,0 +1,181 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <qtac/StringUtilities.h>
+#include <qtac/Point.h>
+#include <cassert>
+#include <cstdio>
+
+// ===== toCamelCase =====
+
+static void test_toCamelCase()
+{
+    // Basic underscore split
+    assert(toCamelCase(qtac::String("hello_world")) == "HelloWorld");
+    assert(toCamelCase(qtac::String("foo_bar_baz")) == "FooBarBaz");
+
+    // Single word (no split char)
+    assert(toCamelCase(qtac::String("hello")) == "Hello");
+
+    // Already single capital token
+    assert(toCamelCase(qtac::String("Hello")) == "Hello");
+
+    // Empty string
+    assert(toCamelCase(qtac::String("")).isEmpty());
+
+    // Leading/trailing underscores skipped with skipEmpty=true (default)
+    assert(toCamelCase(qtac::String("_hello_world_")) == "HelloWorld");
+
+    // skipEmpty=false preserves empty segments (capitalises nothing for them)
+    // Single underscore between words — with skipEmpty=false the empty part is
+    // still an empty string and capitalising its [0] is skipped by the inner guard
+    assert(toCamelCase(qtac::String("hello_world"), '_', false) == "HelloWorld");
+
+    // Custom split char
+    assert(toCamelCase(qtac::String("hello.world"), '.') == "HelloWorld");
+    assert(toCamelCase(qtac::String("a-b-c"), '-') == "ABC");
+}
+
+// ===== fromBool =====
+
+static void test_fromBool()
+{
+    assert(fromBool(true)  == "true");
+    assert(fromBool(false) == "false");
+}
+
+// ===== fromPoint / toPoint =====
+
+static void test_fromPoint_toPoint()
+{
+    // Basic round-trip
+    qtac::Point p(3, 7);
+    qtac::String s = fromPoint(p);
+    assert(s == "3,7");
+    qtac::Point back = toPoint(s);
+    assert(back.x() == 3);
+    assert(back.y() == 7);
+
+    // Negative coords (used as "no location" sentinel throughout the codebase)
+    qtac::Point neg(-1, -1);
+    qtac::String ns = fromPoint(neg);
+    assert(ns == "-1,-1");
+    qtac::Point negBack = toPoint(ns);
+    assert(negBack.x() == -1);
+    assert(negBack.y() == -1);
+
+    // Zero
+    qtac::Point zero(0, 0);
+    qtac::String zs = fromPoint(zero);
+    assert(zs == "0,0");
+    qtac::Point zBack = toPoint(zs);
+    assert(zBack.x() == 0 && zBack.y() == 0);
+
+    // Malformed string → sentinel (-1,-1)
+    qtac::Point bad = toPoint(qtac::String("notapoint"));
+    assert(bad.x() == -1 && bad.y() == -1);
+
+    // Missing second component → sentinel
+    qtac::Point bad2 = toPoint(qtac::String("5"));
+    assert(bad2.x() == -1 && bad2.y() == -1);
+}
+
+// ===== strHash =====
+
+static void test_strHash()
+{
+    // Same input → same hash
+    HashType h1 = strHash(qtac::String("battery"));
+    HashType h2 = strHash(qtac::String("battery"));
+    assert(h1 == h2);
+
+    // Different inputs → different hashes (with very high probability for these strings)
+    HashType ha = strHash(qtac::String("battery"));
+    HashType hb = strHash(qtac::String("usb0"));
+    assert(ha != hb);
+
+    // Empty string is stable
+    HashType hempty1 = strHash(qtac::String(""));
+    HashType hempty2 = strHash(qtac::String(""));
+    assert(hempty1 == hempty2);
+
+    // Numeric strings used by PSOC/PIC32CX pin hashing
+    HashType h53  = strHash(qtac::String("53"));
+    HashType h54  = strHash(qtac::String("54"));
+    assert(h53 != h54);
+}
+
+// ===== arrayHash =====
+
+static void test_arrayHash()
+{
+    // Same input → same hash
+    HashType h1 = arrayHash(qtac::ByteArray("hello"));
+    HashType h2 = arrayHash(qtac::ByteArray("hello"));
+    assert(h1 == h2);
+
+    // Different inputs
+    HashType ha = arrayHash(qtac::ByteArray("hello"));
+    HashType hb = arrayHash(qtac::ByteArray("world"));
+    assert(ha != hb);
+
+    // strHash and arrayHash are consistent (strHash delegates to arrayHash via toLatin1)
+    qtac::String s("test123");
+    assert(strHash(s) == arrayHash(s.toLatin1()));
+}
+
+// ===== isAlphaNumeric =====
+
+static void test_isAlphaNumeric()
+{
+    assert(isAlphaNumeric(qtac::ByteArray("abc123")));
+    assert(isAlphaNumeric(qtac::ByteArray("ABC")));
+    assert(isAlphaNumeric(qtac::ByteArray("123")));
+    assert(!isAlphaNumeric(qtac::ByteArray("abc 123")));  // space
+    assert(!isAlphaNumeric(qtac::ByteArray("abc-123"))); // hyphen
+    assert(!isAlphaNumeric(qtac::ByteArray("abc_123"))); // underscore
+    // Empty is trivially true (no non-alphanumeric chars)
+    assert(isAlphaNumeric(qtac::ByteArray("")));
+}
+
+int main()
+{
+    test_toCamelCase();
+    test_fromBool();
+    test_fromPoint_toPoint();
+    test_strHash();
+    test_arrayHash();
+    test_isAlphaNumeric();
+
+    std::printf("All StringUtilities tests passed!\n");
+    return 0;
+}
diff --git a/source/test/test_tacdev_api.cpp b/source/test/test_tacdev_api.cpp
new file mode 100644
index 00000000..7851c55e
--- /dev/null
+++ b/source/test/test_tacdev_api.cpp
@@ -0,0 +1,369 @@
+// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted (subject to the limitations in the
+// disclaimer below) provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright
+//         notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+//         copyright notice, this list of conditions and the following
+//         disclaimer in the documentation and/or other materials provided
+//         with the distribution.
+//
+//     * Neither the name of Qualcomm Technologies, Inc. nor the names of its
+//         contributors may be used to endorse or promote products derived
+//         from this software without specific prior written permission.
+//
+// NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+// GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+// HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// C API integration test: TACDev.dll
+//
+// Requires a PSoC TAC device physically connected.
+// Exercises the public C API surface of TACDev.dll end-to-end:
+//
+//   1. Init          — InitializeTACDev()
+//   2. Version       — GetAlpacaVersion(), GetTACVersion()
+//   3. Enumeration   — GetDeviceCount(), GetPortData()
+//   4. Open/close    — OpenHandleByDescription(), CloseTACHandle()
+//   5. Properties    — GetName(), GetFirmwareVersion(), GetHardware(),
+//                      GetHardwareVersion(), GetUUID()
+//   6. Commands      — GetCommandCount(), GetCommand()
+//   7. Quick cmds    — GetQuickCommandCount(), GetQuickCommand()
+//   8. Script vars   — GetScriptVariableCount(), GetScriptVariable()
+//   9. Command state — GetCommandState()
+//  10. Double-close  — CloseTACHandle() on already-closed handle returns error
+
+#include "TACDev.h"
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+static char g_buf[4096];
+
+// Abort with a message on failure.
+static void require(const char* label, bool cond)
+{
+    if (!cond)
+    {
+        char err[256] = {};
+        GetLastTACError(err, sizeof(err));
+        printf("  FAIL: %s  last_error='%s'\n", label, err);
+        exit(1);
+    }
+}
+
+static void requireOk(const char* label, TAC_RESULT r)
+{
+    require(label, r == NO_TAC_ERROR);
+}
+
+// GetPortData returns "portName;description;serialNumber;index".
+// Extract the portName (first semicolon-delimited field).
+static void portNameFromPortData(const char* portData, char* portName, int size)
+{
+    const char* semi = strchr(portData, ';');
+    if (semi)
+    {
+        int len = (int)(semi - portData);
+        if (len >= size) len = size - 1;
+        strncpy(portName, portData, (size_t)len);
+        portName[len] = '\0';
+    }
+    else
+    {
+        strncpy(portName, portData, (size_t)(size - 1));
+        portName[size - 1] = '\0';
+    }
+}
+
+// Return true if the portData string looks like a serial (COM) port entry
+// (portName starts with "COM"), not an FTDI virtual device.
+static bool isSerialPort(const char* portData)
+{
+    return strncmp(portData, "COM", 3) == 0;
+}
+
+// ---------------------------------------------------------------------------
+// Test 1: Init
+// ---------------------------------------------------------------------------
+
+static void test_init()
+{
+    printf("test_init: ");
+    requireOk("InitializeTACDev", InitializeTACDev());
+    printf("PASS\n");
+}
+
+// ---------------------------------------------------------------------------
+// Test 2: Version strings
+// ---------------------------------------------------------------------------
+
+static void test_versions()
+{
+    printf("test_versions:\n");
+
+    requireOk("GetAlpacaVersion", GetAlpacaVersion(g_buf, sizeof(g_buf)));
+    printf("  AlpacaVersion = '%s'\n", g_buf);
+
+    requireOk("GetTACVersion", GetTACVersion(g_buf, sizeof(g_buf)));
+    printf("  TACVersion    = '%s'\n", g_buf);
+
+    printf("  PASS\n");
+}
+
+// ---------------------------------------------------------------------------
+// Test 3: Enumeration — find the PSoC (serial-port) device
+// ---------------------------------------------------------------------------
+
+static void test_enumeration(char* outPortName, int portNameSize)
+{
+    printf("test_enumeration:\n");
+
+    int count = 0;
+    requireOk("GetDeviceCount", GetDeviceCount(&count));
+    printf("  device count = %d\n", count);
+    require("at least one device found", count >= 1);
+
+    outPortName[0] = '\0';
+    for (int i = 0; i < count; ++i)
+    {
+        char portData[512] = {};
+        unsigned long r = GetPortData(i, portData, sizeof(portData));
+        require("GetPortData", r > 0 || r == 0 /* 0 = bad index, handled below */);
+        printf("  [%d] '%s'\n", i, portData);
+
+        // Prefer a serial-port device (PSoC) for subsequent tests.
+        if (outPortName[0] == '\0' && isSerialPort(portData))
+            portNameFromPortData(portData, outPortName, portNameSize);
+    }
+
+    require("PSoC (serial port) device found", outPortName[0] != '\0');
+    printf("  using port: '%s'\n", outPortName);
+    printf("  PASS\n");
+}
+
+// ---------------------------------------------------------------------------
+// Test 4: Open / close
+// ---------------------------------------------------------------------------
+
+static TAC_HANDLE test_open(const char* portName)
+{
+    printf("test_open: port='%s'\n", portName);
+
+    TAC_HANDLE h = OpenHandleByDescription(portName);
+    require("OpenHandleByDescription returned valid handle", h != kBadHandle);
+
+    printf("  handle = %lu\n", h);
+    printf("  PASS\n");
+    return h;
+}
+
+// ---------------------------------------------------------------------------
+// Test 5: Property accessors
+// ---------------------------------------------------------------------------
+
+static void test_properties(TAC_HANDLE h)
+{
+    printf("test_properties:\n");
+
+    // These may return empty strings for PSoC (known limitation) — just print.
+    char name[256] = {};
+    GetName(h, name, sizeof(name));
+    printf("  name             = '%s'\n", name);
+
+    char fw[256] = {};
+    GetFirmwareVersion(h, fw, sizeof(fw));
+    printf("  firmwareVersion  = '%s'\n", fw);
+
+    char hw[256] = {};
+    GetHardware(h, hw, sizeof(hw));
+    printf("  hardware         = '%s'\n", hw);
+
+    char hwv[256] = {};
+    GetHardwareVersion(h, hwv, sizeof(hwv));
+    printf("  hardwareVersion  = '%s'\n", hwv);
+
+    char uuid[256] = {};
+    GetUUID(h, uuid, sizeof(uuid));
+    printf("  uuid             = '%s'\n", uuid);
+
+    printf("  PASS\n");
+}
+
+// ---------------------------------------------------------------------------
+// Test 6: Dynamic commands
+// ---------------------------------------------------------------------------
+
+static void test_commands(TAC_HANDLE h)
+{
+    printf("test_commands:\n");
+
+    unsigned long cmdCount = 0;
+    requireOk("GetCommandCount", GetCommandCount(h, &cmdCount));
+    printf("  commandCount = %lu\n", cmdCount);
+
+    for (unsigned long i = 0; i < cmdCount && i < 5; ++i)
+    {
+        char cmd[512] = {};
+        requireOk("GetCommand", GetCommand(h, i, cmd, sizeof(cmd)));
+        printf("  [%lu] '%s'\n", i, cmd);
+    }
+    if (cmdCount > 5)
+        printf("  ... (%lu more)\n", cmdCount - 5);
+
+    printf("  PASS\n");
+}
+
+// ---------------------------------------------------------------------------
+// Test 7: Quick commands
+// ---------------------------------------------------------------------------
+
+static void test_quick_commands(TAC_HANDLE h)
+{
+    printf("test_quick_commands:\n");
+
+    unsigned long qCount = 0;
+    requireOk("GetQuickCommandCount", GetQuickCommandCount(h, &qCount));
+    printf("  quickCommandCount = %lu\n", qCount);
+
+    for (unsigned long i = 0; i < qCount && i < 5; ++i)
+    {
+        char cmd[256] = {};
+        requireOk("GetQuickCommand", GetQuickCommand(h, i, cmd, sizeof(cmd)));
+        printf("  [%lu] '%s'\n", i, cmd);
+    }
+    if (qCount > 5)
+        printf("  ... (%lu more)\n", qCount - 5);
+
+    printf("  PASS\n");
+}
+
+// ---------------------------------------------------------------------------
+// Test 8: Script variables
+// ---------------------------------------------------------------------------
+
+static void test_script_variables(TAC_HANDLE h)
+{
+    printf("test_script_variables:\n");
+
+    unsigned long varCount = 0;
+    requireOk("GetScriptVariableCount", GetScriptVariableCount(h, &varCount));
+    printf("  scriptVariableCount = %lu\n", varCount);
+
+    for (unsigned long i = 0; i < varCount && i < 5; ++i)
+    {
+        char var[256] = {};
+        requireOk("GetScriptVariable", GetScriptVariable(h, i, var, sizeof(var)));
+        printf("  [%lu] '%s'\n", i, var);
+    }
+    if (varCount > 5)
+        printf("  ... (%lu more)\n", varCount - 5);
+
+    printf("  PASS\n");
+}
+
+// ---------------------------------------------------------------------------
+// Test 9: GetCommandState on first command (if any)
+// ---------------------------------------------------------------------------
+
+static void test_command_state(TAC_HANDLE h)
+{
+    printf("test_command_state:\n");
+
+    unsigned long cmdCount = 0;
+    GetCommandCount(h, &cmdCount);
+
+    if (cmdCount == 0)
+    {
+        printf("  SKIP (no commands)\n");
+        return;
+    }
+
+    char cmdName[512] = {};
+    GetCommand(h, 0, cmdName, sizeof(cmdName));
+
+    // cmdName is "name;helpText;pin;tab;group;cell" — extract just the name.
+    char name[256] = {};
+    portNameFromPortData(cmdName, name, sizeof(name));  // reuse ; parser
+
+    bool state = false;
+    TAC_RESULT r = GetCommandState(h, name, &state);
+    if (r == NO_TAC_ERROR)
+        printf("  '%s' state = %s\n", name, state ? "true" : "false");
+    else
+        printf("  GetCommandState('%s') returned %lu (may be unsupported)\n", name, r);
+
+    printf("  PASS\n");
+}
+
+// ---------------------------------------------------------------------------
+// Test 10: Double-close returns error
+// ---------------------------------------------------------------------------
+
+static void test_double_close(const char* portName)
+{
+    printf("test_double_close:\n");
+
+    TAC_HANDLE h = OpenHandleByDescription(portName);
+    require("open for double-close test", h != kBadHandle);
+
+    requireOk("CloseTACHandle (first)", CloseTACHandle(h));
+
+    TAC_RESULT r = CloseTACHandle(h);
+    if (r != NO_TAC_ERROR)
+        printf("  second close correctly returned error %lu\n", r);
+    else
+        printf("  second close returned NO_TAC_ERROR (no-op is acceptable)\n");
+
+    printf("  PASS\n");
+}
+
+// ---------------------------------------------------------------------------
+// main
+// ---------------------------------------------------------------------------
+
+int main()
+{
+    setvbuf(stdout, nullptr, _IONBF, 0);
+    printf("=== C API Integration: TACDev.dll (PSoC) ===\n\n");
+
+    test_init();
+    test_versions();
+
+    char portName[256] = {};
+    test_enumeration(portName, sizeof(portName));
+
+    TAC_HANDLE h = test_open(portName);
+    test_properties(h);
+    test_commands(h);
+    test_quick_commands(h);
+    test_script_variables(h);
+    test_command_state(h);
+
+    requireOk("CloseTACHandle", CloseTACHandle(h));
+    printf("\nCloseTACHandle: PASS\n");
+
+    test_double_close(portName);
+
+    printf("\nAll TACDev C API tests passed.\n");
+    return 0;
+}
diff --git a/third-party/libboost_container-vc142-mt-a64-1_78.lib b/third-party/libboost_container-vc142-mt-a64-1_78.lib
new file mode 100644
index 00000000..4acdce21
Binary files /dev/null and b/third-party/libboost_container-vc142-mt-a64-1_78.lib differ
diff --git a/third-party/libboost_container-vc142-mt-gd-a64-1_78.lib b/third-party/libboost_container-vc142-mt-gd-a64-1_78.lib
new file mode 100644
index 00000000..a53a9d38
Binary files /dev/null and b/third-party/libboost_container-vc142-mt-gd-a64-1_78.lib differ