From b0345cceed9d504886e361c52c6ec031d9b0cd92 Mon Sep 17 00:00:00 2001
From: Peter Buchegger <peter@pbuchegger.at>
Date: Sat, 9 Jan 2021 13:36:49 +0100
Subject: [PATCH] cppcheck fix

---
 .github/workflows/build_check.yml           | 2 +-
 lib/ConfigurationManagement/configuration.h | 2 ++
 lib/{LoRa_APRS => LoRa}/LoRa.cpp            | 0
 lib/{LoRa_APRS => LoRa}/LoRa.h              | 0
 platformio.ini                              | 2 +-
 5 files changed, 4 insertions(+), 2 deletions(-)
 rename lib/{LoRa_APRS => LoRa}/LoRa.cpp (100%)
 rename lib/{LoRa_APRS => LoRa}/LoRa.h (100%)

diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml
index 9a453a8..2b8f6f6 100644
--- a/.github/workflows/build_check.yml
+++ b/.github/workflows/build_check.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
-      - run: platformio check --fail-on-defect low --fail-on-defect medium --fail-on-defect high --skip-packages --flags "--suppress=*:*.pio\* --inline-suppr lib/APRS-IS lib/BoardFinder lib/ConfigurationManagement lib/PowerManagement lib/TaskManager" -v
+      - run: platformio check --fail-on-defect low --fail-on-defect medium --fail-on-defect high --skip-packages
 
   PlatformIO-Build:
     runs-on: ubuntu-latest
diff --git a/lib/ConfigurationManagement/configuration.h b/lib/ConfigurationManagement/configuration.h
index 35719a7..5c66303 100644
--- a/lib/ConfigurationManagement/configuration.h
+++ b/lib/ConfigurationManagement/configuration.h
@@ -5,7 +5,9 @@
 #include <memory>
 
 #include <Arduino.h>
+#ifndef CPPCHECK
 #include <ArduinoJson.h>
+#endif
 
 class Configuration;
 
diff --git a/lib/LoRa_APRS/LoRa.cpp b/lib/LoRa/LoRa.cpp
similarity index 100%
rename from lib/LoRa_APRS/LoRa.cpp
rename to lib/LoRa/LoRa.cpp
diff --git a/lib/LoRa_APRS/LoRa.h b/lib/LoRa/LoRa.h
similarity index 100%
rename from lib/LoRa_APRS/LoRa.h
rename to lib/LoRa/LoRa.h
diff --git a/platformio.ini b/platformio.ini
index 7f00833..c2a2ebe 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -13,7 +13,7 @@ lib_deps =
 	peterus/ESP-FTP-Server-Lib @ 0.9.5
 check_tool = cppcheck
 check_flags =
-    cppcheck: --suppress=*:*.pio\* --inline-suppr lib/common/src
+	cppcheck: --suppress=*:*.pio\* --inline-suppr -DCPPCHECK --force lib -ilib/TimeLib -ilib/LoRa -ilib/NTPClient
 monitor_flags = --raw
 # activate for OTA Update, use the CALLSIGN from is-cfg.json as upload_port:
 #upload_protocol = espota