diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml index 7686833..a5655db 100644 --- a/.github/workflows/build_check.yml +++ b/.github/workflows/build_check.yml @@ -10,20 +10,6 @@ on: - master jobs: - version_check: - name: Version Check - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Set up Python - uses: actions/setup-python@v2 - - run: pip install GitPython - - name: check version - run: ./scripts/check_version.py - build: name: Compile Firmware runs-on: ubuntu-latest diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fd4ec4e..71a9939 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,12 +1,25 @@ name: Create new release on: - push: - branches: - - 'master' + workflow_dispatch: jobs: - build: + version_check: + name: Version Check + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Set up Python + uses: actions/setup-python@v2 + - run: pip install GitPython + - name: check version + run: ./scripts/check_version.py + + create_release: + needs: version_check name: Create new release runs-on: ubuntu-latest steps: diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index 49abcf4..af97d49 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -21,7 +21,7 @@ #include "TaskWifi.h" #include "project_configuration.h" -#define VERSION "22.13.4" +#define VERSION "22.14.0" #define MODULE_NAME "Main" String create_lat_aprs(double lat); @@ -115,14 +115,15 @@ void setup() { if (userConfig.wifi.active) { LoRaSystem.getTaskManager().addAlwaysRunTask(&wifiTask); - LoRaSystem.getTaskManager().addTask(&otaTask); tcpip = true; - } else if (boardConfig->Type == eETH_BOARD) { + } + if (boardConfig->Type == eETH_BOARD) { LoRaSystem.getTaskManager().addAlwaysRunTask(ðTask); tcpip = true; } if (tcpip) { + LoRaSystem.getTaskManager().addTask(&otaTask); LoRaSystem.getTaskManager().addTask(&ntpTask); if (userConfig.ftp.active) { LoRaSystem.getTaskManager().addTask(&ftpTask);