Merge branch 'master' into master

pull/183/head
Peter Buchegger 2022-04-07 11:25:05 +02:00 zatwierdzone przez GitHub
commit c9d178d6cb
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
3 zmienionych plików z 21 dodań i 21 usunięć

Wyświetl plik

@ -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

Wyświetl plik

@ -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:

Wyświetl plik

@ -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(&ethTask);
tcpip = true;
}
if (tcpip) {
LoRaSystem.getTaskManager().addTask(&otaTask);
LoRaSystem.getTaskManager().addTask(&ntpTask);
if (userConfig.ftp.active) {
LoRaSystem.getTaskManager().addTask(&ftpTask);