thor/esphome-dev
1
0
Fork 0
mirror of https://github.com/Threnklyn/esphome-dev.git synced 2026-06-05 20:38:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

ESP-IDF support and generic target platforms (#2303)

Browse Source 
* Socket refactor and SSL

* esp-idf temp

* Fixes

* Echo component and noise

* Add noise API transport support

* Updates

* ESP-IDF

* Complete

* Fixes

* Fixes

* Versions update

* New i2c APIs

* Complete i2c refactor

* SPI migration

* Revert ESP Preferences migration, too complex for now

* OTA support

* Remove echo again

* Remove ssl again

* GPIOFlags updates

* Rename esphal and ICACHE_RAM_ATTR

* Make ESP32 arduino compilable again

* Fix GPIO flags

* Complete pin registry refactor and fixes

* Fixes to make test1 compile

* Remove sdkconfig file

* Ignore sdkconfig file

* Fixes in reviewing

* Make test2 compile

* Make test4 compile

* Make test5 compile

* Run clang-format

* Fix lint errors

* Use esp-idf APIs instead of btStart

* Another round of fixes

* Start implementing ESP8266

* Make test3 compile

* Guard esp8266 code

* Lint

* Reformat

* Fixes

* Fixes v2

* more fixes

* ESP-IDF tidy target

* Convert ARDUINO_ARCH_ESPxx

* Update WiFiSignalSensor

* Update time ifdefs

* OTA needs millis from hal

* RestartSwitch needs delay from hal

* ESP-IDF Uart

* Fix OTA blank password

* Allow setting sdkconfig

* Fix idf partitions and allow setting sdkconfig from yaml

* Re-add read/write compat APIs and fix esp8266 uart

* Fix esp8266 store log strings in flash

* Fix ESP32 arduino preferences not initialized

* Update ifdefs

* Change how sdkconfig change is detected

* Add checks to ci-custom and fix them

* Run clang-format

* Add esp-idf clang-tidy target and fix errors

* Fixes from clang-tidy idf round 2

* Fixes from compiling tests with esp-idf

* Run clang-format

* Switch test5.yaml to esp-idf

* Implement ESP8266 Preferences

* Lint

* Re-do PIO package version selection a bit

* Fix arduinoespressif32 package version

* Fix unit tests

* Lint

* Lint fixes

* Fix readv/writev not defined

* Fix graphing component

* Re-add all old options from core/config.py

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
This commit is contained in:
Otto Winter
2021-09-20 11:47:51 +02:00
committed by GitHub
parent 1e8e471dec
commit ac0d921413
583 changed files with 9008 additions and 5420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/zyaura/sensor.py
+2 -6
View File
@@ -26,12 +26,8 @@ ZyAuraSensor = zyaura_ns.class_("ZyAuraSensor", cg.PollingComponent)
CONFIG_SCHEMA = cv.Schema(
{
cv.GenerateID(): cv.declare_id(ZyAuraSensor),
cv.Required(CONF_CLOCK_PIN): cv.All(
pins.internal_gpio_input_pin_schema, pins.validate_has_interrupt
),
cv.Required(CONF_DATA_PIN): cv.All(
pins.internal_gpio_input_pin_schema, pins.validate_has_interrupt
),
cv.Required(CONF_CLOCK_PIN): cv.All(pins.internal_gpio_input_pin_schema),
cv.Required(CONF_DATA_PIN): cv.All(pins.internal_gpio_input_pin_schema),
cv.Optional(CONF_CO2): sensor.sensor_schema(
unit_of_measurement=UNIT_PARTS_PER_MILLION,
icon=ICON_MOLECULE_CO2,
esphome/components/zyaura/zyaura.cpp
+7 -7
View File
@@ -6,7 +6,7 @@ namespace zyaura {
static const char *const TAG = "zyaura";
bool ICACHE_RAM_ATTR ZaDataProcessor::decode(uint32_t ms, bool data) {
bool IRAM_ATTR ZaDataProcessor::decode(uint32_t ms, bool data) {
// check if a new message has started, based on time since previous bit
if ((ms - this->prev_ms_) > ZA_MAX_MS) {
this->num_bits_ = 0;
@@ -37,24 +37,24 @@ bool ICACHE_RAM_ATTR ZaDataProcessor::decode(uint32_t ms, bool data) {
return false;
}
void ZaSensorStore::setup(GPIOPin *pin_clock, GPIOPin *pin_data) {
void ZaSensorStore::setup(InternalGPIOPin *pin_clock, InternalGPIOPin *pin_data) {
pin_clock->setup();
pin_data->setup();
this->pin_clock_ = pin_clock->to_isr();
this->pin_data_ = pin_data->to_isr();
pin_clock->attach_interrupt(ZaSensorStore::interrupt, this, FALLING);
pin_clock->attach_interrupt(ZaSensorStore::interrupt, this, gpio::INTERRUPT_FALLING_EDGE);
}
void ICACHE_RAM_ATTR ZaSensorStore::interrupt(ZaSensorStore *arg) {
void IRAM_ATTR ZaSensorStore::interrupt(ZaSensorStore *arg) {
uint32_t now = millis();
bool data_bit = arg->pin_data_->digital_read();
bool data_bit = arg->pin_data_.digital_read();
if (arg->processor_.decode(now, data_bit)) {
arg->set_data_(arg->processor_.message);
}
}
void ICACHE_RAM_ATTR ZaSensorStore::set_data_(ZaMessage *message) {
void IRAM_ATTR ZaSensorStore::set_data_(ZaMessage *message) {
switch (message->type) {
case HUMIDITY:
this->humidity = (message->value > 10000) ? NAN : (message->value / 100.0f);
@@ -82,7 +82,7 @@ bool ZyAuraSensor::publish_state_(sensor::Sensor *sensor, float *value) {
sensor->publish_state(*value);
// Sensor reported wrong value
if (isnan(*value)) {
if (std::isnan(*value)) {
ESP_LOGW(TAG, "Sensor reported invalid data. Is the update interval too small?");
this->status_set_warning();
return false;
esphome/components/zyaura/zyaura.h
+8 -8
View File
@@ -1,7 +1,7 @@
#pragma once
#include "esphome/core/component.h"
#include "esphome/core/esphal.h"
#include "esphome/core/hal.h"
#include "esphome/components/sensor/sensor.h"
namespace esphome {
@@ -46,12 +46,12 @@ class ZaSensorStore {
float temperature = NAN;
float humidity = NAN;
void setup(GPIOPin *pin_clock, GPIOPin *pin_data);
void setup(InternalGPIOPin *pin_clock, InternalGPIOPin *pin_data);
static void interrupt(ZaSensorStore *arg);
protected:
ISRInternalGPIOPin *pin_clock_;
ISRInternalGPIOPin *pin_data_;
ISRInternalGPIOPin pin_clock_;
ISRInternalGPIOPin pin_data_;
ZaDataProcessor processor_;
void set_data_(ZaMessage *message);
@@ -60,8 +60,8 @@ class ZaSensorStore {
/// Component for reading temperature/co2/humidity measurements from ZyAura sensors.
class ZyAuraSensor : public PollingComponent {
public:
void set_pin_clock(GPIOPin *pin) { pin_clock_ = pin; }
void set_pin_data(GPIOPin *pin) { pin_data_ = pin; }
void set_pin_clock(InternalGPIOPin *pin) { pin_clock_ = pin; }
void set_pin_data(InternalGPIOPin *pin) { pin_data_ = pin; }
void set_co2_sensor(sensor::Sensor *co2_sensor) { co2_sensor_ = co2_sensor; }
void set_temperature_sensor(sensor::Sensor *temperature_sensor) { temperature_sensor_ = temperature_sensor; }
void set_humidity_sensor(sensor::Sensor *humidity_sensor) { humidity_sensor_ = humidity_sensor; }
@@ -73,8 +73,8 @@ class ZyAuraSensor : public PollingComponent {
protected:
ZaSensorStore store_;
GPIOPin *pin_clock_;
GPIOPin *pin_data_;
InternalGPIOPin *pin_clock_;
InternalGPIOPin *pin_data_;
sensor::Sensor *co2_sensor_{nullptr};
sensor::Sensor *temperature_sensor_{nullptr};
sensor::Sensor *humidity_sensor_{nullptr};