Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct manufacturer on HASSIO discovery + build error for IR TX not in raw mode #2322

Merged
merged 2 commits into from
Aug 14, 2020
Merged

Correct manufacturer on HASSIO discovery + build error for IR TX not in raw mode #2322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22f0b9b
ha: fix swapped device model and manufacturer fields in the discovery
alextircovnicu Aug 14, 2020
e8b8084
ir: fixed build error in case IR TX is not used in raw mode
alextircovnicu Aug 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/espurna/homeassistant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {}
Expand Down
8 changes: 4 additions & 4 deletions code/espurna/ir.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down