kopia lustrzana https://github.com/lora-aprs/LoRa_APRS_iGate
Porównaj commity
20 Commity
a6e8085f31
...
e6e946dc37
Autor | SHA1 | Data |
---|---|---|
Peter Buchegger | e6e946dc37 | |
Peter Buchegger | bec89490ba | |
Peter Buchegger | b0b20ea496 | |
Peter Buchegger | 4a5c1b7463 | |
Peter Buchegger | 79dc53bc7d | |
Peter Buchegger | 0ba2a0d074 | |
Peter Buchegger | 08835abd6c | |
Peter Buchegger | 696db24838 | |
Peter Buchegger | 9b7f90cab3 | |
Peter Buchegger | ef4a514fc4 | |
Peter Buchegger | 7fbdee1dcd | |
Peter Buchegger | 9afc4c79af | |
Peter Buchegger | 0e88ff42b8 | |
Peter Buchegger | 7910b5ce79 | |
Peter Buchegger | 0cdb0892a0 | |
Peter Buchegger | 092060c4b7 | |
Peter Buchegger | 025e120e2f | |
root | 817c630044 | |
root | 8fece4e243 | |
root | 9494d43249 |
|
@ -7,6 +7,9 @@ on:
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
name: Compile Firmware
|
name: Compile Firmware
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
boards: [heltec-v1, tlora-v1, tbeam, t_internet_poe, heltec-v3, tlora-v2, heltec-v2_0, tbeam-s3-core, tbeam_axp2101]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v3
|
||||||
|
@ -27,12 +30,12 @@ jobs:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
- name: Build PlatformIO Project
|
- name: Build PlatformIO Project
|
||||||
run: pio run
|
run: pio run -e ${{ matrix.boards }}
|
||||||
- name: Upload artifacts
|
- name: Upload artifacts
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: firmware
|
name: firmware
|
||||||
path: .pio/build/lora_board/firmware.bin
|
path: .pio/build/**/firmware.bin
|
||||||
|
|
||||||
formatting-check:
|
formatting-check:
|
||||||
name: Formatting Check
|
name: Formatting Check
|
||||||
|
@ -68,7 +71,7 @@ jobs:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
- name: Run PlatformIO Check
|
- name: Run PlatformIO Check
|
||||||
run: pio check --fail-on-defect high --fail-on-defect medium --fail-on-defect low -e lora_board
|
run: pio check --fail-on-defect high --fail-on-defect medium --fail-on-defect low
|
||||||
|
|
||||||
cppcheck-docker:
|
cppcheck-docker:
|
||||||
name: Run cppcheck in Docker
|
name: Run cppcheck in Docker
|
||||||
|
@ -89,14 +92,14 @@ jobs:
|
||||||
name: Cppcheck Report
|
name: Cppcheck Report
|
||||||
path: output
|
path: output
|
||||||
|
|
||||||
hw_testing:
|
# hw_testing:
|
||||||
name: Hardware Testing
|
# name: Hardware Testing
|
||||||
runs-on: ubuntu-latest
|
# runs-on: ubuntu-latest
|
||||||
steps:
|
# steps:
|
||||||
- uses: convictional/trigger-workflow-and-wait@v1.6.5
|
# - uses: convictional/trigger-workflow-and-wait@v1.6.5
|
||||||
with:
|
# with:
|
||||||
owner: peterus
|
# owner: peterus
|
||||||
repo: ESP-Boards
|
# repo: ESP-Boards
|
||||||
github_token: ${{ secrets.PAT }}
|
# github_token: ${{ secrets.PAT }}
|
||||||
workflow_file_name: lora_aprs_igate.yml
|
# workflow_file_name: lora_aprs_igate.yml
|
||||||
github_user: peterus
|
# github_user: peterus
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
"-DBOARD_HAS_PSRAM",
|
"-DBOARD_HAS_PSRAM",
|
||||||
"-DLILYGO_TBEAM_S3_CORE",
|
"-DLILYGO_TBEAM_S3_CORE",
|
||||||
"-DARDUINO_USB_CDC_ON_BOOT=1",
|
"-DARDUINO_USB_CDC_ON_BOOT=1",
|
||||||
"-DARDUINO_USB_MODE=0",
|
|
||||||
"-DARDUINO_RUNNING_CORE=1",
|
"-DARDUINO_RUNNING_CORE=1",
|
||||||
"-DARDUINO_EVENT_RUNNING_CORE=1"
|
"-DARDUINO_EVENT_RUNNING_CORE=1"
|
||||||
],
|
],
|
||||||
|
|
|
@ -51,15 +51,15 @@ build_flags =
|
||||||
monitor_speed = 115200
|
monitor_speed = 115200
|
||||||
|
|
||||||
lib_deps =
|
lib_deps =
|
||||||
bblanchon/ArduinoJson @ 6.21.3
|
bblanchon/ArduinoJson @ 6.21.4
|
||||||
lewisxhe/XPowersLib @ 0.1.8
|
lewisxhe/XPowersLib @ 0.1.8
|
||||||
peterus/APRS-Decoder-Lib @ 0.0.6
|
peterus/APRS-Decoder-Lib @ 0.0.6
|
||||||
peterus/esp-logger @ 1.0.0
|
peterus/esp-logger @ 1.0.0
|
||||||
peterus/ESP-FTP-Server-Lib @ 0.14.0
|
peterus/ESP-FTP-Server-Lib @ 0.14.1
|
||||||
knolleary/PubSubClient@^2.8
|
knolleary/PubSubClient@^2.8
|
||||||
mikalhart/TinyGPSPlus @ 1.0.3
|
mikalhart/TinyGPSPlus @ 1.0.3
|
||||||
shaggydog/OneButton @ 1.5.0
|
shaggydog/OneButton @ 1.5.0
|
||||||
jgromes/RadioLib @ 6.1.0
|
jgromes/RadioLib @ 6.3.0
|
||||||
|
|
||||||
check_tool = cppcheck
|
check_tool = cppcheck
|
||||||
check_skip_packages = yes
|
check_skip_packages = yes
|
||||||
|
|
|
@ -112,10 +112,10 @@ void setup() {
|
||||||
|
|
||||||
#ifdef T_INTERNET_POE
|
#ifdef T_INTERNET_POE
|
||||||
LoRaSystem.getTaskManager().addAlwaysRunTask(ðTask);
|
LoRaSystem.getTaskManager().addAlwaysRunTask(ðTask);
|
||||||
tcpip = true;
|
tcpip = true; // cppcheck-suppress redundantAssignment
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (tcpip) {
|
if (tcpip) { // cppcheck-suppress knownConditionTrueFalse
|
||||||
LoRaSystem.getTaskManager().addTask(&otaTask);
|
LoRaSystem.getTaskManager().addTask(&otaTask);
|
||||||
LoRaSystem.getTaskManager().addTask(&ntpTask);
|
LoRaSystem.getTaskManager().addTask(&ntpTask);
|
||||||
if (userConfig.ftp.active) {
|
if (userConfig.ftp.active) {
|
||||||
|
|
|
@ -96,9 +96,9 @@ double AXP192::getBatteryVoltage() {
|
||||||
// cppcheck-suppress unusedFunction
|
// cppcheck-suppress unusedFunction
|
||||||
double AXP192::getBatteryChargeDischargeCurrent() {
|
double AXP192::getBatteryChargeDischargeCurrent() {
|
||||||
if (isCharging()) {
|
if (isCharging()) {
|
||||||
return ((XPowersAXP192 *)_pmu)->getBatteryChargeCurrent();
|
return static_cast<XPowersAXP192 *>(_pmu)->getBatteryChargeCurrent();
|
||||||
}
|
}
|
||||||
return -1.0 * ((XPowersAXP192 *)_pmu)->getBattDischargeCurrent();
|
return -1.0 * static_cast<XPowersAXP192 *>(_pmu)->getBattDischargeCurrent();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AXP192::isBatteryConnect() {
|
bool AXP192::isBatteryConnect() {
|
||||||
|
|
|
@ -38,56 +38,50 @@ class AXP192 : public PowerManagement {
|
||||||
public:
|
public:
|
||||||
AXP192();
|
AXP192();
|
||||||
|
|
||||||
bool begin(TwoWire &port);
|
bool begin(TwoWire &port) override;
|
||||||
|
|
||||||
void activateLoRa();
|
void activateLoRa() override;
|
||||||
void deactivateLoRa();
|
void deactivateLoRa() override;
|
||||||
|
|
||||||
void activateGPS();
|
void activateGPS() override;
|
||||||
void deactivateGPS();
|
void deactivateGPS() override;
|
||||||
|
|
||||||
void activateOLED();
|
void activateOLED() override;
|
||||||
void deactivateOLED();
|
void deactivateOLED() override;
|
||||||
|
|
||||||
void enableChgLed();
|
void activateMeasurement() override;
|
||||||
void disableChgLed();
|
void deactivateMeasurement() override;
|
||||||
|
|
||||||
void activateMeasurement();
|
double getBatteryVoltage() override;
|
||||||
void deactivateMeasurement();
|
double getBatteryChargeDischargeCurrent() override;
|
||||||
|
|
||||||
double getBatteryVoltage();
|
bool isBatteryConnect() override;
|
||||||
double getBatteryChargeDischargeCurrent();
|
bool isCharging() override;
|
||||||
|
|
||||||
bool isBatteryConnect();
|
|
||||||
bool isCharging();
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class AXP2101 : public PowerManagement {
|
class AXP2101 : public PowerManagement {
|
||||||
public:
|
public:
|
||||||
AXP2101();
|
AXP2101();
|
||||||
|
|
||||||
bool begin(TwoWire &port);
|
bool begin(TwoWire &port) override;
|
||||||
|
|
||||||
void activateLoRa();
|
void activateLoRa() override;
|
||||||
void deactivateLoRa();
|
void deactivateLoRa() override;
|
||||||
|
|
||||||
void activateGPS();
|
void activateGPS() override;
|
||||||
void deactivateGPS();
|
void deactivateGPS() override;
|
||||||
|
|
||||||
void activateOLED();
|
void activateOLED() override;
|
||||||
void deactivateOLED();
|
void deactivateOLED() override;
|
||||||
|
|
||||||
void enableChgLed();
|
void activateMeasurement() override;
|
||||||
void disableChgLed();
|
void deactivateMeasurement() override;
|
||||||
|
|
||||||
void activateMeasurement();
|
double getBatteryVoltage() override;
|
||||||
void deactivateMeasurement();
|
double getBatteryChargeDischargeCurrent() override;
|
||||||
|
|
||||||
double getBatteryVoltage();
|
bool isBatteryConnect() override;
|
||||||
double getBatteryChargeDischargeCurrent();
|
bool isCharging() override;
|
||||||
|
|
||||||
bool isBatteryConnect();
|
|
||||||
bool isCharging();
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -31,7 +31,7 @@ private:
|
||||||
static uint _instances;
|
static uint _instances;
|
||||||
static OneButton _userButton;
|
static OneButton _userButton;
|
||||||
static bool _send_update;
|
static bool _send_update;
|
||||||
static void pushButton();
|
static void pushButton(); // cppcheck-suppress unusedPrivateFunction
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Ładowanie…
Reference in New Issue