move from tabs to spaces

This commit is contained in:
uvos 2022-04-15 13:28:47 +02:00
parent a6aad07f05
commit fa45072998
86 changed files with 2611 additions and 2486 deletions

View file

@ -5,66 +5,67 @@
Microcontroller* Relay::micro_ = nullptr;
Relay::Relay(uint8_t id, QString name, uint16_t address, bool state, QObject* parent): Item(0, name, state, parent), id_(id), address_(address)
Relay::Relay(uint8_t id, QString name, uint16_t address, bool state, QObject* parent): Item(0, name, state, parent),
id_(id), address_(address)
{
itemId_ = address | ((uint32_t)id << 16);
qDebug()<<"Relay "<<id_<<"Name "<<name<<" id "<<itemId_<<" state "<<state<<" addr: "<<address;
itemId_ = address | ((uint32_t)id << 16);
qDebug()<<"Relay "<<id_<<"Name "<<name<<" id "<<itemId_<<" state "<<state<<" addr: "<<address;
}
void Relay::setValue(uint8_t value)
{
Item::setValue(value);
if(micro_)
{
if(value)micro_->relayOn(id_);
else micro_->relayOff(id_);
}
Item::setValue(value);
if(micro_)
{
if(value)micro_->relayOn(id_);
else micro_->relayOff(id_);
}
}
void Relay::on()
{
setValue(true);
setValue(true);
}
void Relay::off()
{
setValue(false);
setValue(false);
}
void Relay::toggle()
{
value_ ? off() : on();
value_ ? off() : on();
}
void Relay::store(QJsonObject& json)
{
json["Type"] = "Relay";
Item::store(json);
json["Id"] = static_cast<double>(id_);
json["Address"] = address_;
json["Type"] = "Relay";
Item::store(json);
json["Id"] = static_cast<double>(id_);
json["Address"] = address_;
}
void Relay::load(const QJsonObject& json, const bool preserve)
{
Item::load(json, preserve);
id_ = static_cast<uint8_t>(json["Id"].toInt(0));
address_ = static_cast<uint16_t>(json["Address"].toInt(0));
itemId_ = address_ | (static_cast<uint32_t>(id_) << 16);
Item::load(json, preserve);
id_ = static_cast<uint8_t>(json["Id"].toInt(0));
address_ = static_cast<uint16_t>(json["Address"].toInt(0));
itemId_ = address_ | (static_cast<uint32_t>(id_) << 16);
}
uint16_t Relay::getAddress() const
{
return address_;
return address_;
}
uint8_t Relay::getId() const
{
return id_;
return id_;
}
void Relay::setId(uint8_t id)
{
id_=id;
itemId_ = address_ | ((uint32_t)id << 16);
id_=id;
itemId_ = address_ | ((uint32_t)id << 16);
}