From 060c57c991d29dbe2485ba9ad4281301e41e2e14 Mon Sep 17 00:00:00 2001 From: 4m1g0 Date: Wed, 21 Apr 2021 01:36:12 +0200 Subject: [PATCH] Allow changing debug option in platformio without getting Arduino IDE errors --- tinyGS/src/ConfigManager/ConfigManager.cpp | 2 +- tinyGS/src/ConfigManager/ConfigManager.h | 2 +- tinyGS/src/Mqtt/MQTT_Client.cpp | 2 +- tinyGS/src/Mqtt/MQTT_Client.h | 2 +- tinyGS/src/Radio/Radio.cpp | 2 +- tinyGS/src/Status.h | 2 +- tinyGS/tinyGS.ino | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tinyGS/src/ConfigManager/ConfigManager.cpp b/tinyGS/src/ConfigManager/ConfigManager.cpp index 272e043c..717e3b87 100644 --- a/tinyGS/src/ConfigManager/ConfigManager.cpp +++ b/tinyGS/src/ConfigManager/ConfigManager.cpp @@ -22,7 +22,7 @@ #include "../Logger/Logger.h" #include "../Radio/Radio.h" #include "ArduinoJson.h" -#if ARDUINOJSON_USE_LONG_LONG == 0 +#if ARDUINOJSON_USE_LONG_LONG == 0 && !PLATFORMIO #error "Using Arduino IDE is not recommended, please follow this guide https://github.com/G4lile0/tinyGS/wiki/Arduino-IDE or edit /ArduinoJson/src/ArduinoJson/Configuration.hpp and amend to #define ARDUINOJSON_USE_LONG_LONG 1 around line 68" #endif diff --git a/tinyGS/src/ConfigManager/ConfigManager.h b/tinyGS/src/ConfigManager/ConfigManager.h index 31a0f895..b21e22ce 100644 --- a/tinyGS/src/ConfigManager/ConfigManager.h +++ b/tinyGS/src/ConfigManager/ConfigManager.h @@ -20,7 +20,7 @@ #define ConfigManager_h #include "IotWebConf2.h" -#if IOTWEBCONF_DEBUG_DISABLED == 0 +#if IOTWEBCONF_DEBUG_DISABLED == 0 && !PLATFORMIO #error "Using Arduino IDE is not recommended, please follow this guide https://github.com/G4lile0/tinyGS/wiki/Arduino-IDE or edit /IotWebCong2/src/IotWebConf2Settings.h and add this line at the beggining of the file #define IOTWEBCONF_DEBUG_DISABLED 1" #endif #include "logos.h" diff --git a/tinyGS/src/Mqtt/MQTT_Client.cpp b/tinyGS/src/Mqtt/MQTT_Client.cpp index 68ce13a3..1e12e327 100644 --- a/tinyGS/src/Mqtt/MQTT_Client.cpp +++ b/tinyGS/src/Mqtt/MQTT_Client.cpp @@ -19,7 +19,7 @@ #include "MQTT_Client.h" #include "ArduinoJson.h" -#if ARDUINOJSON_USE_LONG_LONG == 0 +#if ARDUINOJSON_USE_LONG_LONG == 0 && !PLATFORMIO #error "Using Arduino IDE is not recommended, please follow this guide https://github.com/G4lile0/tinyGS/wiki/Arduino-IDE or edit /ArduinoJson/src/ArduinoJson/Configuration.hpp and amend to #define ARDUINOJSON_USE_LONG_LONG 1 around line 68" #endif #include "../Radio/Radio.h" diff --git a/tinyGS/src/Mqtt/MQTT_Client.h b/tinyGS/src/Mqtt/MQTT_Client.h index 19279b14..e143cafe 100644 --- a/tinyGS/src/Mqtt/MQTT_Client.h +++ b/tinyGS/src/Mqtt/MQTT_Client.h @@ -26,7 +26,7 @@ #include "../ConfigManager/ConfigManager.h" #include "../Status.h" #include -#if MQTT_MAX_PACKET_SIZE != 1000 +#if MQTT_MAX_PACKET_SIZE != 1000 && !PLATFORMIO #error "Using Arduino IDE is not recommended, please follow this guide https://github.com/G4lile0/tinyGS/wiki/Arduino-IDE or edit /PubSubClient/src/PubSubClient.h and set #define MQTT_MAX_PACKET_SIZE 1000" #endif #ifdef SECURE_MQTT diff --git a/tinyGS/src/Radio/Radio.cpp b/tinyGS/src/Radio/Radio.cpp index bd25708b..1760f0f2 100644 --- a/tinyGS/src/Radio/Radio.cpp +++ b/tinyGS/src/Radio/Radio.cpp @@ -19,7 +19,7 @@ #include "Radio.h" #include "ArduinoJson.h" -#if ARDUINOJSON_USE_LONG_LONG == 0 +#if ARDUINOJSON_USE_LONG_LONG == 0 && !PLATFORMIO #error "Using Arduino IDE is not recommended, please follow this guide https://github.com/G4lile0/tinyGS/wiki/Arduino-IDE or /ArduinoJson/src/ArduinoJson/Configuration.hpp and amend to #define ARDUINOJSON_USE_LONG_LONG 1 around line 68" #endif #include diff --git a/tinyGS/src/Status.h b/tinyGS/src/Status.h index f102dce3..45fb1337 100644 --- a/tinyGS/src/Status.h +++ b/tinyGS/src/Status.h @@ -62,7 +62,7 @@ struct TextFrame { }; struct Status { - const uint32_t version = 2104192; // version year month day release + const uint32_t version = 2104210; // version year month day release const char* git_version = GIT_VERSION; bool mqtt_connected = false; bool radio_ready = false; diff --git a/tinyGS/tinyGS.ino b/tinyGS/tinyGS.ino index ba433ec3..f0664bb5 100644 --- a/tinyGS/tinyGS.ino +++ b/tinyGS/tinyGS.ino @@ -83,7 +83,7 @@ #error "You are not using the correct version of RadioLib please copy TinyGS/lib/RadioLib on Arduino/libraries" #endif -#ifndef RADIOLIB_GODMODE +#if RADIOLIB_GODMODE == 0 && !PLATFORMIO #error "Using Arduino IDE is not recommended, please follow this guide https://github.com/G4lile0/tinyGS/wiki/Arduino-IDE or edit /RadioLib/src/BuildOpt.h and uncomment #define RADIOLIB_GODMODE around line 367" #endif