Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-21 23:57:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2322 from alextircovnicu/dev

Browse Source 
Correct manufacturer on HASSIO discovery + build error for IR TX not in raw mode
This commit is contained in:
Max Prokhorov
2020-08-14 23:35:26 +03:00
committed by GitHub
parent ff1c9e4991 e8b80845bc
commit 7448ebf1fb
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/espurna/homeassistant.cpp
View File

@@ -82,8 +82,8 @@ struct ha_config_t {
deviceConfig.createNestedArray("identifiers").add(identifier.c_str());
deviceConfig["name"] = name.c_str();
deviceConfig["sw_version"] = version.c_str();
deviceConfig["manufacturer"] = getDevice().c_str();
deviceConfig["model"] = getManufacturer().c_str();
deviceConfig["manufacturer"] = getManufacturer().c_str();
deviceConfig["model"] = getDevice().c_str();
}
ha_config_t() : ha_config_t(DEFAULT_BUFFER_SIZE) {}

8
code/espurna/ir.cpp
View File

@@ -67,9 +67,9 @@ Raw messages:
uint8_t _ir_repeat_size = 0; // size of repeat array
uint16_t * _ir_raw; // array for sending codes and repeat codes
#else
uint8_t _ir_type = 0; // Type of encoding
uint64_t _ir_code = 0; // Code to transmit
uint16_t _ir_bits = 0; // Code bits
decode_type_t _ir_type = UNUSED; // Type of encoding
uint64_t _ir_code = 0; // Code to transmit
uint16_t _ir_bits = 0; // Code bits
#endif
uint8_t _ir_repeat = 0; // count of times repeating of repeat_code
@@ -208,7 +208,7 @@ void _irMqttCallback(unsigned int type, const char * topic, const char * payload
if (col > 0) {
_ir_type = data.toInt();
_ir_type = static_cast<decode_type_t>(data.toInt());
_ir_code = strtoul(data.substring(col+1).c_str(), NULL, 10);
col = data.indexOf(":", col+1);