Skip to content
Closed

vtx_fix #11293

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions .github/workflows/build-matek.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Manual Build 7.1.2 Matek

on:
workflow_dispatch: # Это активирует кнопку запуска

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Install Tools
run: |
sudo apt-get update
sudo apt-get install -y gcc-arm-none-eabi ruby ninja-build cmake

- name: Build
run: |
mkdir build && cd build
cmake -G Ninja -DTARGET=MATEKH743 ..
ninja MATEKH743

- name: Upload
uses: actions/upload-artifact@v4
with:
name: MATEKH743-7GHz-HEX
path: build/*.hex
162 changes: 17 additions & 145 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,156 +1,28 @@
name: Build firmware
# Don't enable CI on push, just on PR. If you
# are working on the main repo and want to trigger
# a CI build submit a draft PR.
on: pull_request
name: Manual Build 7.1.2 Matek

on:
workflow_dispatch: # Это активирует кнопку запуска

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
id: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]

steps:
- uses: actions/checkout@v3
- name: Install dependencies
run: sudo apt-get update && sudo apt-get -y install ninja-build
- name: Setup environment
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
run: |
# This is the hash of the commit for the PR
# when the action is triggered by PR, empty otherwise
COMMIT_ID=${{ github.event.pull_request.head.sha }}
# This is the hash of the commit when triggered by push
# but the hash of refs/pull/<n>/merge, which is different
# from the hash of the latest commit in the PR, that's
# why we try github.event.pull_request.head.sha first
COMMIT_ID=${COMMIT_ID:-${{ github.sha }}}
BUILD_SUFFIX=ci-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID})
VERSION=$(grep project CMakeLists.txt|awk -F VERSION '{ gsub(/^[ \t]+|[ \t\)]+$/, "", $2); print $2 }')
echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV
echo "BUILD_NAME=inav-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV
- uses: actions/cache@v1
with:
path: downloads
key: ${{ runner.os }}-downloads-${{ hashFiles('CMakeLists.txt') }}-${{ hashFiles('**/cmake/*')}}
- name: Build targets (${{ matrix.id }})
run: mkdir -p build && cd build && cmake -DWARNINGS_AS_ERRORS=ON -DCI_JOB_INDEX=${{ matrix.id }} -DCI_JOB_COUNT=${{ strategy.job-total }} -DBUILD_SUFFIX=${{ env.BUILD_SUFFIX }} -G Ninja .. && ninja ci
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: ${{ env.BUILD_NAME }}
path: ./build/*.hex
- name: Checkout code
uses: actions/checkout@v4

build-SITL-Linux:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install dependencies
run: sudo apt-get update && sudo apt-get -y install ninja-build
- name: Setup environment
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
- name: Install Tools
run: |
# This is the hash of the commit for the PR
# when the action is triggered by PR, empty otherwise
COMMIT_ID=${{ github.event.pull_request.head.sha }}
# This is the hash of the commit when triggered by push
# but the hash of refs/pull/<n>/merge, which is different
# from the hash of the latest commit in the PR, that's
# why we try github.event.pull_request.head.sha first
COMMIT_ID=${COMMIT_ID:-${{ github.sha }}}
BUILD_SUFFIX=ci-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID})
VERSION=$(grep project CMakeLists.txt|awk -F VERSION '{ gsub(/^[ \t]+|[ \t\)]+$/, "", $2); print $2 }')
echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV
echo "BUILD_NAME=inav-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV
- name: Build SITL
run: mkdir -p build_SITL && cd build_SITL && cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -G Ninja .. && ninja
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: ${{ env.BUILD_NAME }}_SITL
path: ./build_SITL/*_SITL
sudo apt-get update
sudo apt-get install -y gcc-arm-none-eabi ruby ninja-build cmake

build-SITL-Mac:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- name: Install dependencies
- name: Build
run: |
brew install cmake ninja ruby
mkdir build && cd build
cmake -G Ninja -DTARGET=MATEKH743 ..
ninja MATEKH743

- name: Setup environment
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
run: |
# This is the hash of the commit for the PR
# when the action is triggered by PR, empty otherwise
COMMIT_ID=${{ github.event.pull_request.head.sha }}
# This is the hash of the commit when triggered by push
# but the hash of refs/pull/<n>/merge, which is different
# from the hash of the latest commit in the PR, that's
# why we try github.event.pull_request.head.sha first
COMMIT_ID=${COMMIT_ID:-${{ github.sha }}}
BUILD_SUFFIX=ci-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID})
VERSION=$(grep project CMakeLists.txt|awk -F VERSION '{ gsub(/^[ \t]+|[ \t\)]+$/, "", $2); print $2 }')
echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV
echo "BUILD_NAME=inav-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV
- name: Build SITL
run: |
mkdir -p build_SITL && cd build_SITL
cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -G Ninja ..
ninja

- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: ${{ env.BUILD_NAME }}_SITL-MacOS
path: ./build_SITL/*_SITL

build-SITL-Windows:
runs-on: windows-latest
defaults:
run:
shell: C:\tools\cygwin\bin\bash.exe -o igncr '{0}'
steps:
- uses: actions/checkout@v3
- name: Setup Cygwin
uses: egor-tensin/setup-cygwin@v4
with:
packages: cmake ruby ninja gcc-g++
- name: Setup environment
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
run: |
# This is the hash of the commit for the PR
# when the action is triggered by PR, empty otherwise
COMMIT_ID=${{ github.event.pull_request.head.sha }}
# This is the hash of the commit when triggered by push
# but the hash of refs/pull/<n>/merge, which is different
# from the hash of the latest commit in the PR, that's
# why we try github.event.pull_request.head.sha first
COMMIT_ID=${COMMIT_ID:-${{ github.sha }}}
BUILD_SUFFIX=ci-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID})
VERSION=$(grep project CMakeLists.txt|awk -F VERSION '{ gsub(/^[ \t]+|[ \t\)]+$/, "", $2); print $2 }')
echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV
echo "BUILD_NAME=inav-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV
- name: Build SITL
run: mkdir -p build_SITL && cd build_SITL && cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -G Ninja .. && ninja
- name: Upload artifacts
uses: actions/upload-artifact@v3
- name: Upload
uses: actions/upload-artifact@v4
with:
name: ${{ env.BUILD_NAME }}_SITL-WIN
path: ./build_SITL/*.exe


test:
needs: [build]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install dependencies
run: sudo apt-get update && sudo apt-get -y install ninja-build
- name: Run Tests
run: mkdir -p build && cd build && cmake -DTOOLCHAIN=none -G Ninja .. && ninja check
name: MATEKH743-7GHz-HEX
path: build/*.hex
28 changes: 28 additions & 0 deletions .github/workflows/manual.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Manual Build 7.1.2 Matek

on:
workflow_dispatch: # Это активирует кнопку запуска

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Install Tools
run: |
sudo apt-get update
sudo apt-get install -y gcc-arm-none-eabi ruby ninja-build cmake

- name: Build
run: |
mkdir build && cd build
cmake -G Ninja -DTARGET=MATEKH743 ..
ninja MATEKH743

- name: Upload
uses: actions/upload-artifact@v4
with:
name: MATEKH743-7GHz-HEX
path: build/*.hex
2 changes: 1 addition & 1 deletion src/main/io/vtx_smartaudio.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ static serialPort_t *smartAudioSerialPort = NULL;

uint8_t saPowerCount = VTX_SMARTAUDIO_DEFAULT_POWER_COUNT;
const char * saPowerNames[VTX_SMARTAUDIO_MAX_POWER_COUNT + 1] = {
"----", "25 ", "200 ", "500 ", "800 ", " "
"25", "200 ", "500 ", "1000 ", "3000 ", " "
};

// Save powerlevels reported from SA 2.1 devices here
Expand Down
4 changes: 2 additions & 2 deletions src/main/io/vtx_smartaudio.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
#define VTX_SMARTAUDIO_DEFAULT_POWER_COUNT 4
#define VTX_SMARTAUDIO_DEFAULT_POWER 1

#define VTX_SMARTAUDIO_MIN_FREQUENCY_MHZ 5000 //min freq in MHz
#define VTX_SMARTAUDIO_MAX_FREQUENCY_MHZ 5999 //max freq in MHz
#define VTX_SMARTAUDIO_MIN_FREQUENCY_MHZ 1000 //min freq in MHz
#define VTX_SMARTAUDIO_MAX_FREQUENCY_MHZ 8000 //max freq in MHz

// opmode flags, GET side
#define SA_MODE_GET_FREQ_BY_FREQ 1
Expand Down
10 changes: 5 additions & 5 deletions src/main/io/vtx_string.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@

const uint16_t vtx58frequencyTable[VTX_STRING_5G8_BAND_COUNT][VTX_STRING_5G8_CHAN_COUNT] =
{
{ 5865, 5845, 5825, 5805, 5785, 5765, 5745, 5725 }, // A
{ 5733, 5752, 5771, 5790, 5809, 5828, 5847, 5866 }, // B
{ 5705, 5685, 5665, 5645, 5885, 5905, 5925, 5945 }, // E
{ 5740, 5760, 5780, 5800, 5820, 5840, 5860, 5880 }, // F
{ 5658, 5695, 5732, 5769, 5806, 5843, 5880, 5917 }, // R
{ 6110, 6130, 6150, 6170, 6190, 6210, 6230, 6250 }, // A
{ 6270, 6290, 6310, 6330, 6350, 6370, 6390, 6410 }, // B
{ 6430, 6450, 6470, 6490, 6510, 6530, 6550, 6570 }, // E
{ 6590, 6610, 6630, 6650, 6670, 6690, 6710, 6730 }, // F
{ 6750, 6770, 6790, 6810, 6830, 6850, 6870, 6890 }, // R
};

const char * const vtx58BandNames[VTX_STRING_5G8_BAND_COUNT + 1] = {
Expand Down