Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
AzonInc committed Sep 23, 2024
1 parent 2dc9c79 commit 17d398c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
20 changes: 10 additions & 10 deletions components/tc_bus/tc_bus.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,11 @@ namespace esphome
reading_memory_timer_ = 0;

// Save Settings values
settings->handset_volume = memory_buffer_[21] & 0xF;
settings->ringtone_volume = memory_buffer_[20] & 0xF;
settings->door_call_ringtone = (memory_buffer_[3] >> 4) & 0xF;
settings->internal_call_ringtone = (memory_buffer_[6] >> 4) & 0xF;
settings->floor_call_ringtone = (memory_buffer_[9] >> 4) & 0xF;
settings_.handset_volume = memory_buffer_[21] & 0xF;
settings_.ringtone_volume = memory_buffer_[20] & 0xF;
settings_.door_call_ringtone = (memory_buffer_[3] >> 4) & 0xF;
settings_.internal_call_ringtone = (memory_buffer_[6] >> 4) & 0xF;
settings_.floor_call_ringtone = (memory_buffer_[9] >> 4) & 0xF;

this->read_memory_complete_callback_.call(memory_buffer_);
}
Expand Down Expand Up @@ -665,35 +665,35 @@ namespace esphome
index = 3;
uint8_t cell2 = memory_buffer_[index] & 0xF;
memory_buffer_[index] = (new_value << 4) | (cell2 & 0xF);
settings->door_call_ringtone = new_value;
settings_.door_call_ringtone = new_value;
break;

case SETTING_RINGTONE_INTERNAL_CALL:
index = 6;
uint8_t cell2 = memory_buffer_[index] & 0xF;
memory_buffer_[index] = (new_value << 4) | (cell2 & 0xF);
settings->internal_call_ringtone = new_value;
settings_.internal_call_ringtone = new_value;
break;

case SETTING_RINGTONE_FLOOR_CALL:
index = 9;
uint8_t cell2 = memory_buffer_[index] & 0xF;
memory_buffer_[index] = (new_value << 4) | (cell2 & 0xF);
settings->floor_call_ringtone = new_value;
settings_.floor_call_ringtone = new_value;
break;

case SETTING_RINGTONE_VOLUME:
index = 20;
uint8_t cell1 = (memory_buffer_[index] >> 4) & 0xF;
memory_buffer_[index] = (cell1 << 4) | (new_value & 0xF);
settings->ringtone_volume = new_value;
settings_.ringtone_volume = new_value;
break;

case SETTING_HANDSET_VOLUME:
index = 21;
uint8_t cell1 = (memory_buffer_[index] >> 4) & 0xF;
memory_buffer_[index] = (cell1 << 4) | (new_value & 0xF);
settings->handset_volume = new_value;
settings_.handset_volume = new_value;
break;
}

Expand Down
4 changes: 2 additions & 2 deletions components/tc_bus/tc_bus.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ namespace esphome
void request_memory_blocks(uint8_t start_address);

void write_memory(uint32_t serial_number = 0);

void update_setting(SettingType type, uint8_t new_value, uint32_t serial_number = 0);

void publish_command(uint32_t command, bool fire_events);
Expand Down Expand Up @@ -131,7 +131,7 @@ namespace esphome
uint32_t reading_memory_timer_ = 0;
std::vector<uint8_t> memory_buffer_;

Settings settings;
Settings settings_;
};

} // namespace tc_bus
Expand Down

0 comments on commit 17d398c

Please sign in to comment.