.github/workflows/build_check.yml

@@ -7,9 +7,6 @@ on:
 jobs:
   build:
     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
     steps:
       - uses: actions/cache@v3
@@ -30,12 +27,12 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Build PlatformIO Project
-        run: pio run -e ${{ matrix.boards }}
+        run: pio run
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
           name: firmware
-          path: .pio/build/**/firmware.bin
+          path: .pio/build/lora_board/firmware.bin
 
   formatting-check:
     name: Formatting Check
@@ -71,7 +68,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Run PlatformIO Check
-        run: pio check --fail-on-defect high --fail-on-defect medium --fail-on-defect low
+        run: pio check --fail-on-defect high --fail-on-defect medium --fail-on-defect low -e lora_board
 
   cppcheck-docker:
     name: Run cppcheck in Docker
@@ -92,14 +89,14 @@ jobs:
           name: Cppcheck Report
           path: output
 
-#  hw_testing:
-#    name: Hardware Testing
-#    runs-on: ubuntu-latest
-#    steps:
-#      - uses: convictional/trigger-workflow-and-wait@v1.6.5
-#        with:
-#          owner: peterus
-#          repo: ESP-Boards
-#          github_token: ${{ secrets.PAT }}
-#          workflow_file_name: lora_aprs_igate.yml
-#          github_user: peterus
+  hw_testing:
+    name: Hardware Testing
+    runs-on: ubuntu-latest
+    steps:
+      - uses: convictional/trigger-workflow-and-wait@v1.6.5
+        with:
+          owner: peterus
+          repo: ESP-Boards
+          github_token: ${{ secrets.PAT }}
+          workflow_file_name: lora_aprs_igate.yml
+          github_user: peterus

boards/tbeam-s3-core.json

@@ -8,6 +8,7 @@
       "-DBOARD_HAS_PSRAM",
       "-DLILYGO_TBEAM_S3_CORE",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_MODE=0",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],

platformio.ini

@@ -51,15 +51,15 @@ build_flags =
 monitor_speed = 115200
 
 lib_deps = 
-	bblanchon/ArduinoJson @ 6.21.4
+	bblanchon/ArduinoJson @ 6.21.3
 	lewisxhe/XPowersLib @ 0.1.8
 	peterus/APRS-Decoder-Lib @ 0.0.6
 	peterus/esp-logger @ 1.0.0
-	peterus/ESP-FTP-Server-Lib @ 0.14.1
+	peterus/ESP-FTP-Server-Lib @ 0.14.0
 	knolleary/PubSubClient@^2.8
 	mikalhart/TinyGPSPlus @ 1.0.3
 	shaggydog/OneButton @ 1.5.0
-	jgromes/RadioLib @ 6.3.0
+	jgromes/RadioLib @ 6.1.0
 
 check_tool = cppcheck
 check_skip_packages = yes

src/LoRa_APRS_iGate.cpp

@@ -112,10 +112,10 @@ void setup() {
 
 #ifdef T_INTERNET_POE
   LoRaSystem.getTaskManager().addAlwaysRunTask(&ethTask);
-  tcpip = true; // cppcheck-suppress redundantAssignment
+  tcpip = true;
 #endif
 
-  if (tcpip) { // cppcheck-suppress knownConditionTrueFalse
+  if (tcpip) {
     LoRaSystem.getTaskManager().addTask(&otaTask);
     LoRaSystem.getTaskManager().addTask(&ntpTask);
     if (userConfig.ftp.active) {

src/PowerManagement/power_management.cpp

@@ -96,9 +96,9 @@ double AXP192::getBatteryVoltage() {
 // cppcheck-suppress unusedFunction
 double AXP192::getBatteryChargeDischargeCurrent() {
   if (isCharging()) {
-    return static_cast<XPowersAXP192 *>(_pmu)->getBatteryChargeCurrent();
+    return ((XPowersAXP192 *)_pmu)->getBatteryChargeCurrent();
   }
-  return -1.0 * static_cast<XPowersAXP192 *>(_pmu)->getBattDischargeCurrent();
+  return -1.0 * ((XPowersAXP192 *)_pmu)->getBattDischargeCurrent();
 }
 
 bool AXP192::isBatteryConnect() {

src/PowerManagement/power_management.h

@@ -38,50 +38,56 @@ class AXP192 : public PowerManagement {
 public:
   AXP192();
 
-  bool begin(TwoWire &port) override;
+  bool begin(TwoWire &port);
 
-  void activateLoRa() override;
-  void deactivateLoRa() override;
+  void activateLoRa();
+  void deactivateLoRa();
 
-  void activateGPS() override;
-  void deactivateGPS() override;
+  void activateGPS();
+  void deactivateGPS();
 
-  void activateOLED() override;
-  void deactivateOLED() override;
+  void activateOLED();
+  void deactivateOLED();
 
-  void activateMeasurement() override;
-  void deactivateMeasurement() override;
+  void enableChgLed();
+  void disableChgLed();
 
-  double getBatteryVoltage() override;
-  double getBatteryChargeDischargeCurrent() override;
+  void activateMeasurement();
+  void deactivateMeasurement();
 
-  bool isBatteryConnect() override;
-  bool isCharging() override;
+  double getBatteryVoltage();
+  double getBatteryChargeDischargeCurrent();
+
+  bool isBatteryConnect();
+  bool isCharging();
 };
 
 class AXP2101 : public PowerManagement {
 public:
   AXP2101();
 
-  bool begin(TwoWire &port) override;
+  bool begin(TwoWire &port);
 
-  void activateLoRa() override;
-  void deactivateLoRa() override;
+  void activateLoRa();
+  void deactivateLoRa();
 
-  void activateGPS() override;
-  void deactivateGPS() override;
+  void activateGPS();
+  void deactivateGPS();
 
-  void activateOLED() override;
-  void deactivateOLED() override;
+  void activateOLED();
+  void deactivateOLED();
 
-  void activateMeasurement() override;
-  void deactivateMeasurement() override;
+  void enableChgLed();
+  void disableChgLed();
 
-  double getBatteryVoltage() override;
-  double getBatteryChargeDischargeCurrent() override;
+  void activateMeasurement();
+  void deactivateMeasurement();
 
-  bool isBatteryConnect() override;
-  bool isCharging() override;
+  double getBatteryVoltage();
+  double getBatteryChargeDischargeCurrent();
+
+  bool isBatteryConnect();
+  bool isCharging();
 };
 
 #endif

src/TaskBeacon.h

@@ -31,7 +31,7 @@ private:
   static uint      _instances;
   static OneButton _userButton;
   static bool      _send_update;
-  static void      pushButton(); // cppcheck-suppress unusedPrivateFunction
+  static void      pushButton();
 };
 
 #endif