kenjreno
/
esphome-ratgdo
mirror of https://github.com/ratgdo/esphome-ratgdo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into uptime

This commit is contained in:
J. Nick Koston 2024-07-02 17:59:48 -07:00 committed by GitHub
parent d56613ee3d c603f012e6
commit 3d414309ec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
26 changed files with 68 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.pre-commit-config.yaml
View File

@ -7,3 +7,12 @@ repos:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-added-large-files
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v18.1.8
hooks:
- id: clang-format
types_or:
- "c++"
- "c"
- "cuda"
args: [-style=Webkit, -i]

6
base.yaml
View File

@ -6,6 +6,8 @@ external_components:
url: https://github.com/ratgdo/esphome-ratgdo
refresh: 1s
safe_mode:
preferences:
flash_write_interval: 1min
@ -45,6 +47,10 @@ api:
id($id_prefix).clear_paired_devices(ratgdo::PairedDevice::ACCESSORY);
}
ota:
- platform: esphome
id: ratgdo_ota
sensor:
- platform: uptime
name: Uptime Sensor

6
base_drycontact.yaml
View File

@ -8,6 +8,8 @@ external_components:
url: https://github.com/ratgdo/esphome-ratgdo
refresh: 1s
safe_mode:
preferences:
flash_write_interval: 1min
@ -25,6 +27,10 @@ ratgdo:
discrete_close_pin: ${discrete_close_pin}
protocol: drycontact
ota:
- platform: esphome
id: ratgdo_ota
binary_sensor:
- platform: ratgdo
type: obstruction

6
base_secplusv1.yaml
View File

@ -6,6 +6,8 @@ external_components:
url: https://github.com/ratgdo/esphome-ratgdo
refresh: 1s
safe_mode:
preferences:
flash_write_interval: 1min
@ -28,6 +30,10 @@ ratgdo:
message: "Failed to communicate with garage opener on startup."
notification_id: "esphome_ratgdo_${id_prefix}_sync_failed"
ota:
- platform: esphome
id: ratgdo_ota
lock:
- platform: ratgdo
id: ${id_prefix}_lock_remotes

4
components/ratgdo/__init__.py
View File

@ -51,7 +51,7 @@ def validate_protocol(config):
raise cv.Invalid("dry_contact_close_sensor and dry_contact_open_sensor are only valid when using protocol drycontact")
# if config.get(CONF_PROTOCOL, None) == PROTOCOL_DRYCONTACT and CONF_DRY_CONTACT_OPEN_SENSOR not in config:
# raise cv.Invalid("dry_contact_open_sensor is required when using protocol drycontact")
return config
return config
CONFIG_SCHEMA = cv.All(
cv.Schema(
@ -144,4 +144,4 @@ async def to_code(config):
cg.add(var.set_discrete_open_pin(pin))
if CONF_DISCRETE_CLOSE_PIN in config and config[CONF_DISCRETE_CLOSE_PIN]:
pin = await cg.gpio_pin_expression(config[CONF_DISCRETE_CLOSE_PIN])
cg.add(var.set_discrete_close_pin(pin))
cg.add(var.set_discrete_close_pin(pin))

2
components/ratgdo/common.h
View File

@ -1,4 +1,4 @@
#pragma once
#define ESP_LOG1 ESP_LOGV
#define ESP_LOG2 ESP_LOGV
#define ESP_LOG2 ESP_LOGV

23
components/ratgdo/dry_contact.cpp
View File

@ -2,10 +2,10 @@
#include "dry_contact.h"
#include "ratgdo.h"
#include "esphome/components/gpio/binary_sensor/gpio_binary_sensor.h"
#include "esphome/core/gpio.h"
#include "esphome/core/log.h"
#include "esphome/core/scheduler.h"
#include "esphome/components/gpio/binary_sensor/gpio_binary_sensor.h"
namespace esphome {
namespace ratgdo {
@ -19,7 +19,7 @@ namespace ratgdo {
this->scheduler_ = scheduler;
this->tx_pin_ = tx_pin;
this->rx_pin_ = rx_pin;
this->open_limit_reached_ = 0;
this->last_open_limit_ = 0;
this->close_limit_reached_ = 0;
@ -58,18 +58,19 @@ namespace ratgdo {
this->close_limit_reached_ = state;
this->send_door_state();
}
void DryContact::send_door_state(){
if(this->open_limit_reached_){
void DryContact::send_door_state()
{
if (this->open_limit_reached_) {
this->door_state_ = DoorState::OPEN;
}else if(this->close_limit_reached_){
} else if (this->close_limit_reached_) {
this->door_state_ = DoorState::CLOSED;
}else if(!this->close_limit_reached_ && !this->open_limit_reached_){
if(this->last_close_limit_){
} else if (!this->close_limit_reached_ && !this->open_limit_reached_) {
if (this->last_close_limit_) {
this->door_state_ = DoorState::OPENING;
}
if(this->last_open_limit_){
if (this->last_open_limit_) {
this->door_state_ = DoorState::CLOSING;
}
}
@ -102,14 +103,14 @@ namespace ratgdo {
ESP_LOG1(TAG, "Door action: %s", DoorAction_to_string(action));
if (action == DoorAction::OPEN){
if (action == DoorAction::OPEN) {
this->discrete_open_pin_->digital_write(1);
this->scheduler_->set_timeout(this->ratgdo_, "", 500, [=] {
this->discrete_open_pin_->digital_write(0);
});
}
if (action == DoorAction::CLOSE){
if (action == DoorAction::CLOSE) {
this->discrete_close_pin_->digital_write(1);
this->scheduler_->set_timeout(this->ratgdo_, "", 500, [=] {
this->discrete_close_pin_->digital_write(0);

11
components/ratgdo/dry_contact.h
View File

@ -1,9 +1,9 @@
#pragma once
#include "SoftwareSerial.h" // Using espsoftwareserial https://github.com/plerup/espsoftwareserial
#include "esphome/core/optional.h"
#include "esphome/core/gpio.h"
#include "esphome/components/gpio/binary_sensor/gpio_binary_sensor.h"
#include "esphome/core/gpio.h"
#include "esphome/core/optional.h"
#include "callbacks.h"
#include "observable.h"
@ -36,13 +36,15 @@ namespace ratgdo {
void set_close_limit(bool state);
void send_door_state();
void set_discrete_open_pin(InternalGPIOPin* pin) {
void set_discrete_open_pin(InternalGPIOPin* pin)
{
this->discrete_open_pin_ = pin;
this->discrete_open_pin_->setup();
this->discrete_open_pin_->pin_mode(gpio::FLAG_OUTPUT);
}
void set_discrete_close_pin(InternalGPIOPin* pin) {
void set_discrete_close_pin(InternalGPIOPin* pin)
{
this->discrete_close_pin_ = pin;
this->discrete_close_pin_->setup();
this->discrete_close_pin_->pin_mode(gpio::FLAG_OUTPUT);
@ -68,7 +70,6 @@ namespace ratgdo {
bool last_open_limit_;
bool close_limit_reached_;
bool last_close_limit_;
};
} // namespace secplus1

12
components/ratgdo/ratgdo.cpp
View File

@ -690,21 +690,17 @@ namespace ratgdo {
void RATGDOComponent::set_dry_contact_open_sensor(esphome::gpio::GPIOBinarySensor* dry_contact_open_sensor)
{
dry_contact_open_sensor_ = dry_contact_open_sensor;
dry_contact_open_sensor_->add_on_state_callback([this](bool sensor_value)
{
dry_contact_open_sensor_->add_on_state_callback([this](bool sensor_value) {
this->protocol_->set_open_limit(sensor_value);
}
);
});
}
void RATGDOComponent::set_dry_contact_close_sensor(esphome::gpio::GPIOBinarySensor* dry_contact_close_sensor)
{
dry_contact_close_sensor_ = dry_contact_close_sensor;
dry_contact_close_sensor_->add_on_state_callback([this](bool sensor_value)
{
dry_contact_close_sensor_->add_on_state_callback([this](bool sensor_value) {
this->protocol_->set_close_limit(sensor_value);
}
);
});
}
} // namespace ratgdo

6
components/ratgdo/ratgdo.h
View File

@ -13,10 +13,10 @@
#pragma once
#include "esphome/components/gpio/binary_sensor/gpio_binary_sensor.h"
#include "esphome/core/component.h"
#include "esphome/core/hal.h"
#include "esphome/core/preferences.h"
#include "esphome/components/gpio/binary_sensor/gpio_binary_sensor.h"
#include "callbacks.h"
#include "macros.h"
@ -95,8 +95,8 @@ namespace ratgdo {
// dry contact methods
void set_dry_contact_open_sensor(esphome::gpio::GPIOBinarySensor* dry_contact_open_sensor_);
void set_dry_contact_close_sensor(esphome::gpio::GPIOBinarySensor* dry_contact_close_sensor_);
void set_discrete_open_pin(InternalGPIOPin* pin){ this->protocol_->set_discrete_open_pin(pin); }
void set_discrete_close_pin(InternalGPIOPin* pin){ this->protocol_->set_discrete_close_pin(pin); }
void set_discrete_open_pin(InternalGPIOPin* pin) { this->protocol_->set_discrete_open_pin(pin); }
void set_discrete_close_pin(InternalGPIOPin* pin) { this->protocol_->set_discrete_close_pin(pin); }
Result call_protocol(Args args);

9
components/ratgdo/secplus1.h
View File

@ -97,11 +97,10 @@ namespace ratgdo {
const Traits& traits() const { return this->traits_; }
// methods not used by secplus1
void set_open_limit(bool state){}
void set_close_limit(bool state){}
void set_discrete_open_pin(InternalGPIOPin* pin){}
void set_discrete_close_pin(InternalGPIOPin* pin){}
void set_open_limit(bool state) { }
void set_close_limit(bool state) { }
void set_discrete_open_pin(InternalGPIOPin* pin) { }
void set_discrete_close_pin(InternalGPIOPin* pin) { }
protected:
void wall_panel_emulation(size_t index = 0);

8
components/ratgdo/secplus2.h
View File

@ -102,10 +102,10 @@ namespace ratgdo {
const Traits& traits() const { return this->traits_; }
// methods not used by secplus2
void set_open_limit(bool state){}
void set_close_limit(bool state){}
void set_discrete_open_pin(InternalGPIOPin* pin){}
void set_discrete_close_pin(InternalGPIOPin* pin){}
void set_open_limit(bool state) { }
void set_close_limit(bool state) { }
void set_discrete_open_pin(InternalGPIOPin* pin) { }
void set_discrete_close_pin(InternalGPIOPin* pin) { }
protected:
void increment_rolling_code_counter(int delta = 1);

8
static/index.html
View File

@ -289,25 +289,25 @@
const button = document.querySelector("esp-web-install-button");
var protocol = document.querySelector('input[name="protocol"]:checked').value;
var hardware = document.querySelector('input[name="hardware"]:checked').value;
if(protocol === "drycontact"){
document.querySelector("#wiring_diagram").src = "wiring_diagrams/dry_contact_diagram.png";
}else{
document.querySelector("#wiring_diagram").src = "wiring_diagrams/secplus_diagram.png";
}
if(protocol !== "secplusv2" && (hardware === "v2board_esp8266_d1_mini" || hardware === "v2board_esp32_d1_mini")){
alert("ratgdo version 2.0 only works with Security + 2.0");
document.querySelector('input[name="protocol"][value="secplusv2"]').checked = true;
return;
}
if(protocol === "secplusv2"){
protocol = "";
}else{
protocol = `_${protocol}`;
}
button.manifest = `${hardware}${protocol}-manifest.json`;
})
);

2
static/v25board_esp32_d1_mini.yaml
View File

@ -41,8 +41,6 @@ time:
api:
id: api_server
ota:
improv_serial:
wifi:

2
static/v25board_esp32_d1_mini_secplusv1.yaml
View File

@ -41,8 +41,6 @@ time:
api:
id: api_server
ota:
improv_serial:
wifi:

2
static/v25board_esp8266_d1_mini.yaml
View File

@ -42,8 +42,6 @@ time:
api:
id: api_server
ota:
improv_serial:
wifi:

2
static/v25board_esp8266_d1_mini_lite.yaml
View File

@ -42,8 +42,6 @@ time:
api:
id: api_server
ota:
improv_serial:
wifi:

2
static/v25board_esp8266_d1_mini_lite_secplusv1.yaml
View File

@ -42,8 +42,6 @@ time:
api:
id: api_server
ota:
improv_serial:
wifi:

2
static/v25board_esp8266_d1_mini_secplusv1.yaml
View File

@ -42,8 +42,6 @@ time:
api:
id: api_server
ota:
improv_serial:
wifi:

2
static/v25iboard.yaml
View File

@ -42,8 +42,6 @@ time:
api:
id: api_server
ota:
improv_serial:
wifi:

4
static/v25iboard_drycontact.yaml
View File

@ -42,12 +42,10 @@ time:
api:
id: api_server
ota:
improv_serial:
wifi:
ap:
logger:
level: DEBUG
level: DEBUG

2
static/v25iboard_secplusv1.yaml
View File

@ -42,8 +42,6 @@ time:
api:
id: api_server
ota:
improv_serial:
wifi:

2
static/v2board_esp32_d1_mini.yaml
View File

@ -41,8 +41,6 @@ time:
api:
id: api_server
ota:
improv_serial:
wifi:

2
static/v2board_esp32_lolin_s2_mini.yaml
View File

@ -41,8 +41,6 @@ time:
api:
id: api_server
ota:
improv_serial:
wifi:

2
static/v2board_esp8266_d1_mini.yaml
View File

@ -42,8 +42,6 @@ time:
api:
id: api_server
ota:
improv_serial:
wifi:

2
static/v2board_esp8266_d1_mini_lite.yaml
View File

@ -42,8 +42,6 @@ time:
api:
id: api_server
ota:
improv_serial:
wifi: