mirror of
				https://github.com/esphome/esphome.git
				synced 2025-10-31 07:03:55 +00:00 
			
		
		
		
	Add namespace to all PlatformIO library references (#2296)
* Remove unnecessary duplication in platformio.ini * Add namespace to all platformio library references * Add cmake-build-* to gitignore They're generated by the CLion add-on for each PlatformIO environment. Listing them all separately seems nonsensical.
This commit is contained in:
		
							
								
								
									
										5
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -102,10 +102,7 @@ CMakeLists.txt | |||||||
| .idea/**/dynamic.xml | .idea/**/dynamic.xml | ||||||
|  |  | ||||||
| # CMake | # CMake | ||||||
| cmake-build-debug/ | cmake-build-*/ | ||||||
| cmake-build-livingroom8266/ |  | ||||||
| cmake-build-livingroom32/ |  | ||||||
| cmake-build-release/ |  | ||||||
|  |  | ||||||
| CMakeCache.txt | CMakeCache.txt | ||||||
| CMakeFiles | CMakeFiles | ||||||
|   | |||||||
| @@ -12,4 +12,4 @@ async def to_code(config): | |||||||
|         cg.add_library("esphome/AsyncTCP-esphome", "1.2.2") |         cg.add_library("esphome/AsyncTCP-esphome", "1.2.2") | ||||||
|     elif CORE.is_esp8266: |     elif CORE.is_esp8266: | ||||||
|         # https://github.com/OttoWinter/ESPAsyncTCP |         # https://github.com/OttoWinter/ESPAsyncTCP | ||||||
|         cg.add_library("ESPAsyncTCP-esphome", "1.2.3") |         cg.add_library("ottowinter/ESPAsyncTCP-esphome", "1.2.3") | ||||||
|   | |||||||
| @@ -44,5 +44,5 @@ async def new_fastled_light(config): | |||||||
|     # https://github.com/FastLED/FastLED/blob/master/library.json |     # https://github.com/FastLED/FastLED/blob/master/library.json | ||||||
|     # 3.3.3 has an issue on ESP32 with RMT and fastled_clockless: |     # 3.3.3 has an issue on ESP32 with RMT and fastled_clockless: | ||||||
|     # https://github.com/esphome/issues/issues/1375 |     # https://github.com/esphome/issues/issues/1375 | ||||||
|     cg.add_library("FastLED", "3.3.2") |     cg.add_library("fastled/FastLED", "3.3.2") | ||||||
|     return var |     return var | ||||||
|   | |||||||
| @@ -99,4 +99,4 @@ async def to_code(config): | |||||||
|         cg.add(var.set_satellites_sensor(sens)) |         cg.add(var.set_satellites_sensor(sens)) | ||||||
|  |  | ||||||
|     # https://platformio.org/lib/show/1655/TinyGPSPlus |     # https://platformio.org/lib/show/1655/TinyGPSPlus | ||||||
|     cg.add_library("1655", "1.0.2")  # TinyGPSPlus, has name conflict |     cg.add_library("mikalhart/TinyGPSPlus", "1.0.2") | ||||||
|   | |||||||
| @@ -110,4 +110,4 @@ async def to_code(config): | |||||||
|         cg.add(var.set_aqi_calculation_type(config[CONF_AQI][CONF_CALCULATION_TYPE])) |         cg.add(var.set_aqi_calculation_type(config[CONF_AQI][CONF_CALCULATION_TYPE])) | ||||||
|  |  | ||||||
|     # https://platformio.org/lib/show/6306/Grove%20-%20Laser%20PM2.5%20Sensor%20HM3301 |     # https://platformio.org/lib/show/6306/Grove%20-%20Laser%20PM2.5%20Sensor%20HM3301 | ||||||
|     cg.add_library("6306", "1.0.3") |     cg.add_library("seeed-studio/Grove - Laser PM2.5 Sensor HM3301", "1.0.3") | ||||||
|   | |||||||
| @@ -7,6 +7,6 @@ json_ns = cg.esphome_ns.namespace("json") | |||||||
|  |  | ||||||
| @coroutine_with_priority(1.0) | @coroutine_with_priority(1.0) | ||||||
| async def to_code(config): | async def to_code(config): | ||||||
|     cg.add_library("ArduinoJson-esphomelib", "5.13.3") |     cg.add_library("ottowinter/ArduinoJson-esphomelib", "5.13.3") | ||||||
|     cg.add_define("USE_JSON") |     cg.add_define("USE_JSON") | ||||||
|     cg.add_global(json_ns.using) |     cg.add_global(json_ns.using) | ||||||
|   | |||||||
| @@ -214,7 +214,7 @@ async def to_code(config): | |||||||
|     await cg.register_component(var, config) |     await cg.register_component(var, config) | ||||||
|  |  | ||||||
|     # https://github.com/OttoWinter/async-mqtt-client/blob/master/library.json |     # https://github.com/OttoWinter/async-mqtt-client/blob/master/library.json | ||||||
|     cg.add_library("AsyncMqttClient-esphome", "0.8.4") |     cg.add_library("ottowinter/AsyncMqttClient-esphome", "0.8.4") | ||||||
|     cg.add_define("USE_MQTT") |     cg.add_define("USE_MQTT") | ||||||
|     cg.add_global(mqtt_ns.using) |     cg.add_global(mqtt_ns.using) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -205,4 +205,4 @@ async def to_code(config): | |||||||
|     cg.add(var.set_pixel_order(getattr(ESPNeoPixelOrder, config[CONF_TYPE]))) |     cg.add(var.set_pixel_order(getattr(ESPNeoPixelOrder, config[CONF_TYPE]))) | ||||||
|  |  | ||||||
|     # https://github.com/Makuna/NeoPixelBus/blob/master/library.json |     # https://github.com/Makuna/NeoPixelBus/blob/master/library.json | ||||||
|     cg.add_library("NeoPixelBus", "2.6.7") |     cg.add_library("makuna/NeoPixelBus", "2.6.7") | ||||||
|   | |||||||
| @@ -50,7 +50,7 @@ async def to_code(config): | |||||||
|     cg.add(var.set_dio_pin(dio_pin)) |     cg.add(var.set_dio_pin(dio_pin)) | ||||||
|  |  | ||||||
|     # https://platformio.org/lib/show/6865/TM1651 |     # https://platformio.org/lib/show/6865/TM1651 | ||||||
|     cg.add_library("6865", "1.0.1") |     cg.add_library("freekode/TM1651", "1.0.1") | ||||||
|  |  | ||||||
|  |  | ||||||
| BINARY_OUTPUT_ACTION_SCHEMA = maybe_simple_id( | BINARY_OUTPUT_ACTION_SCHEMA = maybe_simple_id( | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ | |||||||
| ; It's *not* used during runtime. | ; It's *not* used during runtime. | ||||||
|  |  | ||||||
| [platformio] | [platformio] | ||||||
| default_envs = esp8266 | default_envs = esp8266, esp32 | ||||||
| src_dir = . | src_dir = . | ||||||
| include_dir = | include_dir = | ||||||
|  |  | ||||||
| @@ -26,19 +26,18 @@ build_flags = | |||||||
|  |  | ||||||
| [common] | [common] | ||||||
| lib_deps = | lib_deps = | ||||||
|     AsyncMqttClient-esphome@0.8.4 |     ottowinter/AsyncMqttClient-esphome@0.8.4              ; mqtt | ||||||
|     ArduinoJson-esphomelib@5.13.3 |     ottowinter/ArduinoJson-esphomelib@5.13.3              ; json | ||||||
|     esphome/ESPAsyncWebServer-esphome@1.3.0 |     esphome/ESPAsyncWebServer-esphome@1.3.0               ; web_server_base | ||||||
|     FastLED@3.3.2 |     fastled/FastLED@3.3.2                                 ; fastled_base | ||||||
|     NeoPixelBus@2.6.7 |     makuna/NeoPixelBus@2.6.7                              ; neopixelbus | ||||||
|     1655@1.0.2  ; TinyGPSPlus (has name conflict) |     mikalhart/TinyGPSPlus@1.0.2                           ; gps | ||||||
|     6865@1.0.0  ; TM1651 Battery Display |     freekode/TM1651@1.0.1                                 ; tm1651 | ||||||
|     6306@1.0.3  ; HM3301 |     seeed-studio/Grove - Laser PM2.5 Sensor HM3301@1.0.3  ; hm3301 | ||||||
|     glmnet/Dsmr@0.5        ; used by dsmr |     glmnet/Dsmr@0.5                                       ; dsmr | ||||||
|     rweather/Crypto@0.2.0  ; used by dsmr |     rweather/Crypto@0.2.0                                 ; dsmr | ||||||
|     esphome/noise-c@0.1.1  ; used by api |     esphome/noise-c@0.1.1                                 ; api | ||||||
|     dudanov/MideaUART@1.1.0  ; used by midea |     dudanov/MideaUART@1.1.0                               ; midea | ||||||
|  |  | ||||||
| build_flags = | build_flags = | ||||||
|     -DESPHOME_LOG_LEVEL=ESPHOME_LOG_LEVEL_VERY_VERBOSE |     -DESPHOME_LOG_LEVEL=ESPHOME_LOG_LEVEL_VERY_VERBOSE | ||||||
| src_filter = | src_filter = | ||||||
| @@ -47,30 +46,25 @@ src_filter = | |||||||
|     +<.temp/all-include.cpp> |     +<.temp/all-include.cpp> | ||||||
|  |  | ||||||
| [common:esp8266] | [common:esp8266] | ||||||
|  | extends = common | ||||||
| platform = platformio/espressif8266@3.1.0 | platform = platformio/espressif8266@3.1.0 | ||||||
| framework = arduino | framework = arduino | ||||||
| board = nodemcuv2 | board = nodemcuv2 | ||||||
| lib_deps = | lib_deps = | ||||||
|     ${common.lib_deps} |     ${common.lib_deps} | ||||||
|     ESP8266WiFi |     ESP8266WiFi                           ; wifi (Arduino built-in) | ||||||
|     ESPAsyncTCP-esphome@1.2.3 |     Update                                ; ota (Arduino built-in) | ||||||
|     Update |     ottowinter/ESPAsyncTCP-esphome@1.2.3  ; async_tcp | ||||||
| build_flags = ${common.build_flags} |  | ||||||
| src_filter = ${common.src_filter} |  | ||||||
|  |  | ||||||
| [common:esp32] | [common:esp32] | ||||||
|  | extends = common | ||||||
| platform = platformio/espressif32@3.2.0 | platform = platformio/espressif32@3.2.0 | ||||||
| framework = arduino | framework = arduino | ||||||
| board = nodemcu-32s | board = nodemcu-32s | ||||||
| lib_deps = | lib_deps = | ||||||
|     ${common.lib_deps} |     ${common.lib_deps} | ||||||
|     esphome/AsyncTCP-esphome@1.2.2 |     Hash                            ; ota (Arduino built-in) | ||||||
|     Update |     esphome/AsyncTCP-esphome@1.2.2  ; async_tcp | ||||||
| build_flags = |  | ||||||
|     ${common.build_flags} |  | ||||||
| src_filter = |  | ||||||
|     ${common.src_filter} |  | ||||||
|     -<esphome/components/esp8266_pwm> |  | ||||||
|  |  | ||||||
| [env:esp8266] | [env:esp8266] | ||||||
| extends = common:esp8266 | extends = common:esp8266 | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user