arduino/rc-gateway
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

separate rc-gateway devices

Browse Source
This commit is contained in:
Nicu Hodos 2025-10-03 17:02:28 +02:00
parent daa4b9bee0
commit 264c1c1e80
2 changed files with 74 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
include/devices.h
View File

@ -1,20 +1,9 @@
#pragma once #pragma once
#define MAIN_DEVICE_ID "rc-gateway" #include "rc_devices.h"
#include "esp.h"
#include "ha.h"
using namespace Ha; using namespace Ha;
typedef unordered_multimap<unsigned long, Ha::Switch*> mapswitches;
mapswitches onSwitches;
mapswitches offSwitches;
unordered_map<string, Ha::Switch*> p1Switches;
auto gatewayDevice = &DeviceConfig::create(MAIN_DEVICE_ID).withName("RC Gateway").withManufacturer("Adafruit").withModel("Huzzah Esp8266");
auto roomSensor = Builder<TemperatureSensor>::instance(TEMP_SENSOR) auto roomSensor = Builder<TemperatureSensor>::instance(TEMP_SENSOR)
.asDevice(&DeviceConfig::create(TEMP_SENSOR) .asDevice(&DeviceConfig::create(TEMP_SENSOR)
.withName("Servers room") .withName("Servers room")
@ -63,63 +52,6 @@ auto presenceTracker = Builder<BinarySensor>::instance(PRESENCE_SENSOR)
.withDeviceClass("presence") .withDeviceClass("presence")
.build(); .build();
struct PollinSwitch : Switch {
constexpr static const char* man = "Pollin";
const char* group;
unsigned char channel;
PollinSwitch(const char* group, const unsigned char channel, const char* name = nullptr, const char* area = nullptr)
: Switch(nullptr, [group, channel]{
// copy id from string into a new pointer, to avoid memory leaks
return (new string{Protocol_1::buildId(group, channel)})->c_str();
}()), group(group), channel(channel) {
if (!name) name = (new string{string(man).append(" ").append(id)})->c_str();
mainDevice = &DeviceConfig::create(id).withName(name).withManufacturer(man).withArea(area).withParent(gatewayDevice);
withStateTopic();
deviceClass = "outlet";
p1Switches.insert({ string(id), this });
}
void onCommand(const char* msg) override {
strcmp("ON", msg) == 0 ? mySwitch.switchOn(group, channel) : mySwitch.switchOff(group, channel);
publisher(stateTopic, msg);
}
};
struct EasyHomeSwitch : Switch {
unsigned long on[8] = { 4326554, 4537114, 4767530, 4972714 };
unsigned long off[8] = { 4483146, 4626810, 4661562, 4819642 };
EasyHomeSwitch(const char remotePosition, unsigned long on[4], unsigned long off[4], const char* name = nullptr, const char* area = nullptr)
: Switch(nullptr, [remotePosition] {
auto uId = new string("easy_home_");
(*uId) += tolower(remotePosition);
return uId->c_str();
}()) {
memcpy(&this->on[4], on, 4 * sizeof(unsigned long));
memcpy(&this->off[4], off, 4 * sizeof(unsigned long));
if (!name) {
auto n = new string("Easy Home ");
(*n) += remotePosition;
name = n->c_str();
}
mainDevice = &DeviceConfig::create(id).withName(name).withManufacturer("Intertek").withModel("Easy Home").withArea(area).withParent(gatewayDevice);
withStateTopic();
deviceClass = "outlet";
for (int i = 0; i < 8; i++) {
onSwitches.insert({ this->on[i], this });
offSwitches.insert({ this->off[i], this });
}
}
void onCommand(const char* msg) override {
mySwitch.setProtocol(4);
strcmp("ON", msg) == 0 ? mySwitch.send(on[4], 24) : mySwitch.send(off[4], 24);
publisher(stateTopic, msg);
}
};
Command* commands[] = { Command* commands[] = {
HaESP::restartButton() HaESP::restartButton()
.asDevice(gatewayDevice) .asDevice(gatewayDevice)

73
include/rc_devices.h Normal file
View File

@ -0,0 +1,73 @@
#pragma once
#define MAIN_DEVICE_ID "rc-gateway"
#include "esp.h"
#include "ha.h"
using namespace Ha;
typedef unordered_multimap<unsigned long, Ha::Switch*> mapswitches;
mapswitches onSwitches;
mapswitches offSwitches;
unordered_map<string, Ha::Switch*> p1Switches;
auto gatewayDevice = &DeviceConfig::create(MAIN_DEVICE_ID).withName("RC Gateway").withManufacturer("Adafruit").withModel("Huzzah Esp8266");
struct PollinSwitch : Switch {
constexpr static const char* man = "Pollin";
const char* group;
unsigned char channel;
PollinSwitch(const char* group, const unsigned char channel, const char* name = nullptr, const char* area = nullptr)
: Switch(nullptr, [group, channel]{
// copy id from string into a new pointer, to avoid memory leaks
return (new string{Protocol_1::buildId(group, channel)})->c_str();
}()), group(group), channel(channel) {
if (!name) name = (new string{string(man).append(" ").append(id)})->c_str();
mainDevice = &DeviceConfig::create(id).withName(name).withManufacturer(man).withArea(area).withParent(gatewayDevice);
withStateTopic();
deviceClass = "outlet";
p1Switches.insert({ string(id), this });
}
void onCommand(const char* msg) override {
strcmp("ON", msg) == 0 ? mySwitch.switchOn(group, channel) : mySwitch.switchOff(group, channel);
publisher(stateTopic, msg);
}
};
struct EasyHomeSwitch : Switch {
unsigned long on[8] = { 4326554, 4537114, 4767530, 4972714 };
unsigned long off[8] = { 4483146, 4626810, 4661562, 4819642 };
EasyHomeSwitch(const char remotePosition, unsigned long on[4], unsigned long off[4], const char* name = nullptr, const char* area = nullptr)
: Switch(nullptr, [remotePosition] {
auto uId = new string("easy_home_");
(*uId) += tolower(remotePosition);
return uId->c_str();
}()) {
memcpy(&this->on[4], on, 4 * sizeof(unsigned long));
memcpy(&this->off[4], off, 4 * sizeof(unsigned long));
if (!name) {
auto n = new string("Easy Home ");
(*n) += remotePosition;
name = n->c_str();
}
mainDevice = &DeviceConfig::create(id).withName(name).withManufacturer("Intertek").withModel("Easy Home").withArea(area).withParent(gatewayDevice);
withStateTopic();
deviceClass = "outlet";
for (int i = 0; i < 8; i++) {
onSwitches.insert({ this->on[i], this });
offSwitches.insert({ this->off[i], this });
}
}
void onCommand(const char* msg) override {
mySwitch.setProtocol(4);
strcmp("ON", msg) == 0 ? mySwitch.send(on[4], 24) : mySwitch.send(off[4], 24);
publisher(stateTopic, msg);
}
};