platformio.ini sanitized

platformio.ini

@@ -11,15 +11,15 @@
 
 ; ---> SELECT TARGET PLATFORM HERE! <---
 [platformio]
-env_default = heltec_wifi_lora_32
+env_default = heltec
 ;env_default = ttgov1
 ;env_default = ttgov2
 ;env_default = ttgov21
 ;env_default = lopy
 ;env_default = lopy4
 ;env_default = fipy
-;env_default = lolin32lite_lora
-;env_default = lolin32_lora
+;env_default = lolin32lite
+;env_default = lolin32
 ;
 description = Paxcounter is a proof-of-concept ESP32 device for metering passenger flows in realtime. It counts how many mobile devices are around.
 
@@ -42,17 +42,15 @@ build_flags =
     -D_lmic_config_h_
     -include "src/paxcounter.conf"
 
-[env:heltec_wifi_lora_32]
+[env:heltec]
 platform = espressif32
 framework = arduino
 board = heltec_wifi_lora_32
 monitor_baud = 115200
-upload_speed = 115200
 lib_deps = 
     ${common_env_data.lib_deps_display}
 build_flags = 
     ${common_env_data.build_flags}
-    -Dheltec_wifi_lora_32
     -include "src/hal/heltec.h"
 
 [env:ttgov1]
@@ -65,7 +63,6 @@ lib_deps =
     ${common_env_data.lib_deps_display}
 build_flags = 
     ${common_env_data.build_flags}
-    -Dttgov1
     -include "src/hal/ttgov1.h"
 
 [env:ttgov2]
@@ -78,7 +75,6 @@ lib_deps =
     ${common_env_data.lib_deps_display}
 build_flags = 
     ${common_env_data.build_flags}
-    -Dttgov2
     -include "src/hal/ttgov2.h"
 
 [env:ttgov21]
@@ -91,7 +87,6 @@ lib_deps =
     ${common_env_data.lib_deps_display}
 build_flags = 
     ${common_env_data.build_flags}
-    -Dttgov2
     -include "src/hal/ttgov21.h"
 
 [env:fipy]
@@ -104,7 +99,6 @@ lib_deps =
     ${common_env_data.lib_deps_rgbled}
 build_flags = 
     ${common_env_data.build_flags}
-    -Dlopy
     -include "src/hal/fipy.h"
 
 [env:lopy]
@@ -117,7 +111,6 @@ lib_deps =
     ${common_env_data.lib_deps_rgbled}
 build_flags = 
     ${common_env_data.build_flags}
-    -Dlopy
     -include "src/hal/lopy.h"
 
 [env:lopy4]
@@ -130,10 +123,9 @@ lib_deps =
     ${common_env_data.lib_deps_rgbled}
 build_flags =
     ${common_env_data.build_flags}
-    -Dlopy4
     -include "src/hal/lopy4.h"
 
-[env:lolin32lite_lora]
+[env:lolin32lite]
 platform = espressif32
 framework = arduino
 board = lolin32
@@ -143,10 +135,9 @@ lib_deps =
     ${common_env_data.lib_deps_rgbled}
 build_flags =
     ${common_env_data.build_flags}
-    -Dlolin32lite_lora
     -include "src/hal/lolin32lite_lora.h"
 
-[env:lolin32_lora]
+[env:lolin32]
 platform = espressif32
 framework = arduino 
 board = lolin32
@@ -156,5 +147,4 @@ lib_deps =
     ${common_env_data.lib_deps_rgbled}
 build_flags =
     ${common_env_data.build_flags}
-    -Dlolin32_lora
     -include "src/hal/lolin32_lora.h"