Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
AzonInc committed Jan 24, 2025
1 parent 9880946 commit 0af01db
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 11 deletions.
6 changes: 3 additions & 3 deletions components/tc_bus/tc_bus.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,10 @@ namespace esphome
// HW Version
device.hardware_version = std::stoi(hex_result.substr(0, 1));
device.model = identifier_string_to_model(hex_result.substr(1, 3), device.hardware_version, device.firmware_version);
std::string hw_model = model_to_string(device.model);
const char* hw_model = model_to_string(device.model);

ESP_LOGD(TAG, "Identified Hardware: %s (version %i), Firmware: %i.%i.%i - %i",
hw_model.c_str(), device.hardware_version, device.firmware_major, device.firmware_minor, device.firmware_patch, device.firmware_version);
hw_model, device.hardware_version, device.firmware_major, device.firmware_minor, device.firmware_patch, device.firmware_version);

this->identify_complete_callback_.call(device);

Expand All @@ -243,7 +243,7 @@ namespace esphome
this->model_ = device.model;
#ifdef USE_SELECT
if (this->model_select_ != nullptr) {
this->model_select_->publish_state(hw_model.c_str());
this->model_select_->publish_state(hw_model);
}
#endif
this->save_settings();
Expand Down
1 change: 1 addition & 0 deletions docs/de/guide/firmware/nuki-bridge-firmware.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Es gibt mehrere Möglichkeiten, die Firmware zu aktualisieren:
- Web Serial <Badge type="tip" text="Neueste Release-Version, keine Anpassung" />

Du kannst deinen Doorman über USB-C anschließen und auf den untenstehenden Button klicken, um die neueste Doorman Nuki-Bridge Firmware (Home Assistant) direkt über Web Serial zu installieren.
Wenn du MQTT ohne Home Assistant nutzen möchtest, kannst du Doorman in dein ESPHome Dashboard aufnehmen und das untenstehende Beispiel `Minimale Nuki-Bridge Firmware (MQTT)` verwenden.
<esp-web-install-button manifest="../../../firmware/release/doorman-nuki-bridge/manifest.json">
<button slot="activate">
<div class="custom-layout">
Expand Down
1 change: 1 addition & 0 deletions docs/de/guide/firmware/stock-firmware.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Es gibt mehrere Möglichkeiten, die Firmware zu aktualisieren:
- Web Serial <Badge type="tip" text="Neueste Release-Version, keine Anpassung" />

Du kannst deinen Doorman über USB-C anschließen und auf den untenstehenden Button klicken, um die neueste Doorman Stock Firmware (Home Assistant) direkt über Web Serial zu installieren.
Wenn du MQTT ohne Home Assistant nutzen möchtest, kannst du Doorman in dein ESPHome Dashboard aufnehmen und das untenstehende Beispiel `Minimale Stock Firmware (MQTT)` verwenden.
<esp-web-install-button manifest="../../../firmware/release/doorman-stock/manifest.json">
<button slot="activate">
<div class="custom-layout">
Expand Down
1 change: 1 addition & 0 deletions docs/en/guide/firmware/nuki-bridge-firmware.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ There are several ways to update the firmware:
- Web Serial <Badge type="tip" text="Latest release build, no customization" />

You can connect your Doorman via USB-C and click the button below to install the latest Doorman Nuki Bridge Firmware (Home Assistant) directly through Web Serial.
To use the MQTT firmware, adopt Doorman into your ESPHome Dashboard and apply the MQTT Example Firmware YAML.
<esp-web-install-button manifest="../../firmware/release/doorman-nuki-bridge/manifest.json">
<button slot="activate">
<div class="custom-layout">
Expand Down
1 change: 1 addition & 0 deletions docs/en/guide/firmware/stock-firmware.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ There are several ways to update the firmware:
- Web Serial <Badge type="tip" text="Latest release build, no customization" />

You can connect your Doorman via USB-C and click the button below to install the latest Doorman Stock Firmware (Home Assistant) directly through Web Serial.
To use the MQTT firmware, adopt Doorman into your ESPHome Dashboard and apply the MQTT Example Firmware YAML.
<esp-web-install-button manifest="../../firmware/release/doorman-stock/manifest.json">
<button slot="activate">
<div class="custom-layout">
Expand Down
4 changes: 2 additions & 2 deletions firmware/addons/interactive-setup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ button:
- tc_bus.identify:
web_server:
sorting_group_id: sorting_group_intercom_settings

# Extend TC:BUS Component
tc_bus:
on_identify_complete:
Expand All @@ -38,7 +38,7 @@ tc_bus:
then:
- logger.log:
format: "Setup: Identified Hardware: %s (version %i), Firmware: %i.%i.%i"
args: [ 'model_to_string(x.model).c_str()', 'x.hardware_version', 'x.firmware_major', 'x.firmware_minor', 'x.firmware_patch' ]
args: [ 'model_to_string(x.model)', 'x.hardware_version', 'x.firmware_major', 'x.firmware_minor', 'x.firmware_patch' ]
- script.execute: complete_setup

on_identify_timeout:
Expand Down
8 changes: 7 additions & 1 deletion firmware/addons/mqtt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,10 @@ esphome:
blue: 100%
color_brightness: 60%
- delay: 3s
- script.execute: update_led
- script.execute: update_led

mqtt:
on_message:
- topic: doorman/test
then:
- # ...
9 changes: 5 additions & 4 deletions firmware/base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ esp32:
variant: esp32s3
flash_size: 8MB

psram:
mode: octal
speed: 80MHz

# Essential ESPHome Configuration Options
esphome:
name: ${name}
Expand All @@ -37,6 +33,11 @@ esphome:
build_flags:
- -DBOARD_HAS_PSRAM

# Utilize PSRAM
psram:
mode: octal
speed: 80MHz

# Enable logging
logger:
level: ${log_level}
Expand Down
2 changes: 1 addition & 1 deletion firmware/tc-bus-component-8266.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ tc_bus:
on_identify_complete:
- logger.log:
format: "Setup: Identified Hardware: %s (version %i), Firmware: %i.%i.%i"
args: [ 'model_to_string(x.model).c_str()', 'x.hardware_version', 'x.firmware_major', 'x.firmware_minor', 'x.firmware_patch' ]
args: [ 'model_to_string(x.model)', 'x.hardware_version', 'x.firmware_major', 'x.firmware_minor', 'x.firmware_patch' ]
on_identify_timeout:
- logger.log: "Setup: Unable to identify the Indoor Station, please select manually."

Expand Down

0 comments on commit 0af01db

Please sign in to comment.