merge in build flags

platformio.ini

@@ -7,7 +7,6 @@ default_envs = esp8266
 # override any settings with your own local ones in pio_local.ini
 extra_configs = 
   factory_settings.ini
-  features.ini
   pio_local.ini
 
 [common]
@@ -20,7 +19,12 @@ debug_flags =
 ; default platformio compile flags are: -fno-rtti -std=c++11 -Os -mlongcalls -mtext-section-literals -falign-functions=4 -ffunction-sections -fdata-sections -fno-exceptions -Wall
 build_flags =
   ${factory_settings.build_flags}
-  ${features.build_flags}
+  -D FT_PROJECT=1
+  -D FT_SECURITY=1
+  -D FT_MQTT=1
+  -D FT_NTP=0 ; disable NTP for now
+  -D FT_OTA=1
+  -D FT_UPLOAD_FIRMWARE=1
   -D ONEWIRE_CRC16=0
   -D NO_GLOBAL_ARDUINOOTA
   -D ARDUINOJSON_ENABLE_STD_STRING=1
@@ -53,8 +57,8 @@ check_flags =
 
 ; USB upload
 ; upload_protocol = esptool
-; upload_port = COM6
-; upload_port = /dev/cu.wchusbserial1420
+; upload_port = COM4
+; upload_port = /dev/cu.wchusbserial1410
 
 ; OTA upload
 upload_protocol = espota