Update platformio.ini settings and fix test apps (#1815)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Co-authored-by: Otto Winter <otto@otto-winter.com>
This commit is contained in:
Oxan van Leeuwen 2021-05-24 21:47:45 +02:00 committed by GitHub
parent e3c27a483c
commit 824f3187ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 50 deletions

2
.gitignore vendored
View File

@ -100,6 +100,8 @@ CMakeLists.txt
# CMake
cmake-build-debug/
cmake-build-livingroom8266/
cmake-build-livingroom32/
cmake-build-release/
CMakeCache.txt

View File

@ -10,43 +10,49 @@ include_dir = include
[common]
lib_deps =
esphome/AsyncTCP-esphome@1.2.2
AsyncMqttClient-esphome@0.8.4
ArduinoJson-esphomelib@5.13.3
ESPAsyncWebServer-esphome@1.2.7
fastled/FastLED@3.3.2
FastLED@3.3.2
NeoPixelBus-esphome@2.6.2
ESPAsyncTCP-esphome@1.2.3
1655@1.0.2 ; TinyGPSPlus (has name conflict)
6865@1.0.0 ; TM1651 Battery Display
6306@1.0.3 ; HM3301
build_flags =
-Wno-reorder
-DUSE_WEB_SERVER
-DUSE_FAST_LED_LIGHT
-DUSE_NEO_PIXEL_BUS_LIGHT
-fno-exceptions
-Wno-sign-compare
-Wno-unused-but-set-variable
-Wno-unused-variable
-DCLANG_TIDY
-DESPHOME_LOG_LEVEL=ESPHOME_LOG_LEVEL_VERY_VERBOSE
; Don't use FlashStringHelper for debug builds because CLion freaks out for all
; log messages
src_filter = +<esphome>
src_filter =
+<esphome>
+<tests/dummy_main.cpp>
[env:livingroom8266]
; use Arduino framework v2.3.0 for clang-tidy (latest 2.5.2 breaks static code analysis, see #760)
platform = espressif8266@1.8.0
board = nodemcuv2
; use Arduino framework v2.4.2 for clang-tidy (latest 2.5.2 breaks static code analysis, see #760)
platform = platformio/espressif8266@1.8.0
framework = arduino
board = nodemcuv2
lib_deps =
${common.lib_deps}
ESP8266WiFi
Hash
ESPAsyncTCP-esphome@1.2.3
Update
build_flags = ${common.build_flags}
src_filter = ${common.src_filter} +<tests/livingroom8266.cpp>
src_filter = ${common.src_filter}
[env:livingroom32]
platform = espressif32@1.12.4
board = nodemcu-32s
platform = platformio/espressif32@3.2.0
framework = arduino
lib_deps = ${common.lib_deps}
build_flags = ${common.build_flags} -DUSE_ETHERNET
src_filter = ${common.src_filter} +<tests/livingroom32.cpp>
board = nodemcu-32s
lib_deps =
${common.lib_deps}
esphome/AsyncTCP-esphome@1.2.2
Update
build_flags =
${common.build_flags}
-DUSE_ETHERNET
src_filter =
${common.src_filter}
-<esphome/components/esp8266_pwm>

View File

@ -1,3 +1,8 @@
// Dummy main.cpp file for the PlatformIO project in the git repository.
// Primarily used to get IDE integration working (so the contents here don't
// matter at all, as long as it compiles).
// Not used during runtime nor for CI.
#include <esphome/core/application.h>
#include <esphome/components/logger/logger.h>
#include <esphome/components/wifi/wifi_component.h>
@ -7,7 +12,7 @@
using namespace esphome;
void setup() {
App.pre_setup("livingroom", __DATE__ " " __TIME__);
App.pre_setup("livingroom", __DATE__ ", " __TIME__, false);
auto *log = new logger::Logger(115200, 512, logger::UART_SELECTION_UART0);
log->pre_setup();
App.register_component(log);
@ -19,10 +24,12 @@ void setup() {
ap.set_password("password1");
wifi->add_sta(ap);
auto *ota = new ota::OTAComponent(8266);
ota->start_safe_mode();
auto *ota = new ota::OTAComponent();
ota->set_port(8266);
auto *gpio = new gpio::GPIOSwitch("GPIO Switch", new GPIOPin(8, OUTPUT));
auto *gpio = new gpio::GPIOSwitch();
gpio->set_name("GPIO Switch");
gpio->set_pin(new GPIOPin(8, OUTPUT, false));
App.register_component(gpio);
App.register_switch(gpio);

View File

@ -1,26 +0,0 @@
#include <esphome.h>
using namespace esphome;
void setup() {
App.set_name("livingroom32");
App.init_log();
App.init_wifi("YOUR_SSID", "YOUR_PASSWORD");
App.init_mqtt("MQTT_HOST", "USERNAME", "PASSWORD");
App.init_ota()->start_safe_mode();
// LEDC is only available on ESP32! for the ESP8266, take a look at App.make_esp8266_pwm_output().
auto *red = App.make_ledc_output(32); // on pin 32
auto *green = App.make_ledc_output(33);
auto *blue = App.make_ledc_output(34);
App.make_rgb_light("Livingroom Light", red, green, blue);
App.make_dht_sensor("Livingroom Temperature", "Livingroom Humidity", 12);
App.make_status_binary_sensor("Livingroom Node Status");
App.make_restart_switch("Livingroom Restart");
App.setup();
}
void loop() { App.loop(); }