From ec5f781cfc35d99980e0a6501061a60f5503cafd Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Fri, 30 Mar 2018 20:57:00 +0200 Subject: [PATCH] revert change main.h -> main.conf --- platformio.ini | 30 +++++++++++++++--------------- src/configmanager.cpp | 4 ++-- src/lorawan.cpp | 2 +- src/main.cpp | 2 +- src/rcommand.cpp | 2 +- src/wifisniffer.cpp | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/platformio.ini b/platformio.ini index 769ba942..26c735d5 100644 --- a/platformio.ini +++ b/platformio.ini @@ -10,7 +10,7 @@ ; ---> SELECT TARGET PLATFORM HERE! <--- [platformio] -env_default = heltec_wifi_lora_32 +;env_default = heltec_wifi_lora_32 ;env_default = ttgov1 env_default = ttgov2 ;env_default = lopy @@ -34,9 +34,9 @@ build_flags = ;needed for ESP32 BLE Ardunio v0.4.9 -fexceptions -std=c++11 -;override lora settings from LMiC library in lmic/config.h and use main.conf instead +;override lora settings from LMiC library in lmic/config.h and use main.h instead -D_lmic_config_h_ - -include "src/main.conf" + -include "src/main.h" -include "src/hal/heltec.h" ;FreeRTOS single core operation, switches off core 1 (see arduino-esp32/cores/esp32/main.cpp) ; -DCONFIG_FREERTOS_UNICORE @@ -56,9 +56,9 @@ build_flags = ;needed for ESP32 BLE Ardunio v0.4.9 -fexceptions -std=c++11 -;override lora settings from LMiC library in lmic/config.h and use main.conf instead +;override lora settings from LMiC library in lmic/config.h and use main.h instead -D_lmic_config_h_ - -include "src/main.conf" + -include "src/main.h" -include "src/hal/ttgov1.h" ;FreeRTOS single core operation, switches off core 1 (see arduino-esp32/cores/esp32/main.cpp) ; -DCONFIG_FREERTOS_UNICORE @@ -78,9 +78,9 @@ build_flags = ;needed for ESP32 BLE Ardunio v0.4.9 -fexceptions -std=c++11 -;override lora settings from LMiC library in lmic/config.h and use main.conf instead +;override lora settings from LMiC library in lmic/config.h and use main.h instead -D_lmic_config_h_ - -include "src/main.conf" + -include "src/main.h" -include "src/hal/ttgov2.h" ;FreeRTOS single core operation, switches off core 1 (see arduino-esp32/cores/esp32/main.cpp) ; -DCONFIG_FREERTOS_UNICORE @@ -101,9 +101,9 @@ build_flags = ;needed for ESP32 BLE Ardunio v0.4.9 -fexceptions -std=c++11 -;override lora settings from LMiC library in lmic/config.h and use main.conf instead +;override lora settings from LMiC library in lmic/config.h and use main.h instead -D_lmic_config_h_ - -include "src/main.conf" + -include "src/main.h" -include "src/hal/lopy.h" ;FreeRTOS single core operation, switches off core 1 (see arduino-esp32/cores/esp32/main.cpp) ; -DCONFIG_FREERTOS_UNICORE @@ -124,9 +124,9 @@ build_flags = ;needed for ESP32 BLE Ardunio v0.4.9 -fexceptions -std=c++11 -;override lora settings from LMiC library in lmic/config.h and use main.conf instead +;override lora settings from LMiC library in lmic/config.h and use main.h instead -D_lmic_config_h_ - -include "src/main.conf" + -include "src/main.h" -include "src/hal/lopy4.h" ;FreeRTOS single core operation, switches off core 1 (see arduino-esp32/cores/esp32/main.cpp) ; -DCONFIG_FREERTOS_UNICORE @@ -148,9 +148,9 @@ build_flags = ;needed for ESP32 BLE Ardunio v0.4.9 -fexceptions -std=c++11 -;override lora settings from LMiC library in lmic/config.h and use main.conf instead +;override lora settings from LMiC library in lmic/config.h and use main.h instead -D_lmic_config_h_ - -include "src/main.conf" + -include "src/main.h" -include "src/hal/lolin32lite_lora.h" ;FreeRTOS single core operation, switches off core 1 (see arduino-esp32/cores/esp32/main.cpp) ; -DCONFIG_FREERTOS_UNICORE @@ -172,9 +172,9 @@ build_flags = ;needed for ESP32 BLE Ardunio v0.4.9 -fexceptions -std=c++11 -;override lora settings from LMiC library in lmic/config.h and use main.conf instead +;override lora settings from LMiC library in lmic/config.h and use main.h instead -D_lmic_config_h_ - -include "src/main.conf" + -include "src/main.h" -include "src/hal/lolin32_lora.h" ;FreeRTOS single core operation, switches off core 1 (see arduino-esp32/cores/esp32/main.cpp) ; -DCONFIG_FREERTOS_UNICORE diff --git a/src/configmanager.cpp b/src/configmanager.cpp index b9327fe5..a4c8526c 100644 --- a/src/configmanager.cpp +++ b/src/configmanager.cpp @@ -1,6 +1,6 @@ /* configmanager persists runtime configuration using NVRAM of ESP32*/ -#include "main.conf" +#include "main.h" #include "globals.h" #include #include @@ -19,7 +19,7 @@ esp_err_t err; // populate cfg vars with factory settings void defaultConfig() { - cfg.lorasf = LORASFDEFAULT; // 7-12, initial lora spreadfactor defined in main.conf + cfg.lorasf = LORASFDEFAULT; // 7-12, initial lora spreadfactor defined in main.h cfg.txpower = 15; // 2-15, lora tx power cfg.adrmode = 1; // 0=disabled, 1=enabled cfg.screensaver = 0; // 0=disabled, 1=enabled diff --git a/src/lorawan.cpp b/src/lorawan.cpp index b360b538..85164280 100644 --- a/src/lorawan.cpp +++ b/src/lorawan.cpp @@ -1,5 +1,5 @@ // Basic Config -#include "main.conf" +#include "main.h" #include "globals.h" // LMIC-Arduino LoRaWAN Stack diff --git a/src/main.cpp b/src/main.cpp index 43d5ffda..516d0c93 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -22,7 +22,7 @@ Refer to LICENSE.txt file in repository for more details. */ // Basic Config -#include "main.conf" +#include "main.h" #include "globals.h" // OLED driver diff --git a/src/rcommand.cpp b/src/rcommand.cpp index 24e4a327..de62bbde 100644 --- a/src/rcommand.cpp +++ b/src/rcommand.cpp @@ -3,7 +3,7 @@ // checks commands and executes each command with 1 argument per command // Basic Config -#include "main.conf" +#include "main.h" #include "globals.h" // LMIC-Arduino LoRaWAN Stack diff --git a/src/wifisniffer.cpp b/src/wifisniffer.cpp index 18d877db..e6ac174f 100644 --- a/src/wifisniffer.cpp +++ b/src/wifisniffer.cpp @@ -1,5 +1,5 @@ // Basic Config -#include "main.conf" +#include "main.h" #include "globals.h" // ESP32 Functions