Compare commits

...
2 Commits
5 changed files with 32 additions and 108 deletions

No files matched your search

@@ -1,30 +1,16 @@
#include "menu_item.h"
#include "esphome/core/progmem.h"
#include <cstdio>
namespace esphome::display_menu_base {
// Indexed by MenuItemType
PROGMEM_STRING_TABLE(MenuItemTypeStrings, "MENU_ITEM_LABEL", "MENU_ITEM_MENU", "MENU_ITEM_BACK", "MENU_ITEM_SELECT",
"MENU_ITEM_NUMBER", "MENU_ITEM_SWITCH", "MENU_ITEM_COMMAND", "MENU_ITEM_CUSTOM", "UNKNOWN");
const LogString *menu_item_type_to_string(MenuItemType type) {
switch (type) {
case MenuItemType::MENU_ITEM_LABEL:
return LOG_STR("MENU_ITEM_LABEL");
case MenuItemType::MENU_ITEM_MENU:
return LOG_STR("MENU_ITEM_MENU");
case MenuItemType::MENU_ITEM_BACK:
return LOG_STR("MENU_ITEM_BACK");
case MenuItemType::MENU_ITEM_SELECT:
return LOG_STR("MENU_ITEM_SELECT");
case MenuItemType::MENU_ITEM_NUMBER:
return LOG_STR("MENU_ITEM_NUMBER");
case MenuItemType::MENU_ITEM_SWITCH:
return LOG_STR("MENU_ITEM_SWITCH");
case MenuItemType::MENU_ITEM_COMMAND:
return LOG_STR("MENU_ITEM_COMMAND");
case MenuItemType::MENU_ITEM_CUSTOM:
return LOG_STR("MENU_ITEM_CUSTOM");
default:
return LOG_STR("UNKNOWN");
}
return MenuItemTypeStrings::get_log_str(static_cast<uint8_t>(type), MenuItemTypeStrings::LAST_INDEX);
}
void MenuItem::on_enter() { this->on_enter_callbacks_.call(); }
@@ -1,4 +1,5 @@
#include "mitsubishi_cn105.h"
#include "esphome/core/progmem.h"
#include <algorithm>
#include <array>
@@ -531,32 +532,13 @@ void MitsubishiCN105::apply_settings_() {
this->send_packet_(make_packet(PACKET_TYPE_WRITE_SETTINGS_REQUEST, payload));
}
// Indexed by State
PROGMEM_STRING_TABLE(StateStrings, "Not connected", "Connecting", "Connected", "UpdatingStatus", "StatusUpdated",
"DeferredStatusRequest", "ScheduleNextStatusUpdate", "WaitingForScheduledStatusUpdate",
"ApplyingSettings", "SettingsApplied", "ReadTimeout", "Unknown");
const LogString *MitsubishiCN105::state_to_string(State state) {
switch (state) {
case State::NOT_CONNECTED:
return LOG_STR("Not connected");
case State::CONNECTING:
return LOG_STR("Connecting");
case State::CONNECTED:
return LOG_STR("Connected");
case State::UPDATING_STATUS:
return LOG_STR("UpdatingStatus");
case State::STATUS_UPDATED:
return LOG_STR("StatusUpdated");
case State::DEFERRED_STATUS_REQUEST:
return LOG_STR("DeferredStatusRequest");
case State::SCHEDULE_NEXT_STATUS_UPDATE:
return LOG_STR("ScheduleNextStatusUpdate");
case State::WAITING_FOR_SCHEDULED_STATUS_UPDATE:
return LOG_STR("WaitingForScheduledStatusUpdate");
case State::APPLYING_SETTINGS:
return LOG_STR("ApplyingSettings");
case State::SETTINGS_APPLIED:
return LOG_STR("SettingsApplied");
case State::READ_TIMEOUT:
return LOG_STR("ReadTimeout");
}
return LOG_STR("Unknown");
return StateStrings::get_log_str(static_cast<uint8_t>(state), StateStrings::LAST_INDEX);
}
template<typename Callback>
@@ -2,6 +2,7 @@
#include "esphome/core/hal.h"
#include "esphome/core/helpers.h"
#include "esphome/core/log.h"
#include "esphome/core/progmem.h"
namespace esphome::remote_base {
@@ -222,24 +223,9 @@ optional<IRA211Data> IRA211Protocol::decode(RemoteReceiveData src) {
return out;
}
static const LogString *command_to_string(IRA211Command command) {
switch (command) {
case IRA211Command::IRA211_COMMAND_TEMP_UP:
return LOG_STR("TEMP_UP");
case IRA211Command::IRA211_COMMAND_TEMP_DOWN:
return LOG_STR("TEMP_DOWN");
case IRA211Command::IRA211_COMMAND_MODE:
return LOG_STR("MODE");
case IRA211Command::IRA211_COMMAND_FAN:
return LOG_STR("FAN");
case IRA211Command::IRA211_COMMAND_POWER:
return LOG_STR("POWER");
case IRA211Command::IRA211_COMMAND_SYNC:
return LOG_STR("SYNC");
default:
return LOG_STR("UNKNOWN");
}
}
// Indexed by IRA211Command
PROGMEM_STRING_TABLE(IRA211CommandStrings, "UNKNOWN", "TEMP_UP", "TEMP_DOWN", "UNKNOWN", "MODE", "FAN", "POWER",
"SYNC");
static const LogString *mode_to_string(IRA211Mode mode) {
switch (mode) {
@@ -274,7 +260,7 @@ void IRA211Protocol::dump(const IRA211Data &data) {
const uint8_t fields = layout.has_value() ? layout->fields : 0;
const unsigned whole = data.half_degrees / 2;
const unsigned tenths = (data.half_degrees & 1) ? 5 : 0;
const auto *command = LOG_STR_ARG(command_to_string(data.command));
const auto *command = LOG_STR_ARG(IRA211CommandStrings::get_log_str(static_cast<uint8_t>(data.command), 0));
if (fields == (FIELD_TEMPERATURE | FIELD_MODE | FIELD_FAN)) {
ESP_LOGI(TAG, "Received IRA211: command=%s, temperature=%u.%uC, mode=%s, fan=%s", command, whole, tenths,
LOG_STR_ARG(mode_to_string(data.mode)), LOG_STR_ARG(fan_to_string(data.fan)));
+6 -13
View File
@@ -1,22 +1,13 @@
#include "uln2003.h"
#include "esphome/core/log.h"
#include "esphome/core/progmem.h"
namespace esphome::uln2003 {
ESPHOME_LOG_TAG(TAG, "uln2003.stepper");
static const LogString *step_mode_to_log_string(ULN2003StepMode mode) {
switch (mode) {
case ULN2003_STEP_MODE_FULL_STEP:
return LOG_STR("FULL STEP");
case ULN2003_STEP_MODE_HALF_STEP:
return LOG_STR("HALF STEP");
case ULN2003_STEP_MODE_WAVE_DRIVE:
return LOG_STR("WAVE DRIVE");
default:
return LOG_STR("UNKNOWN");
}
}
// Indexed by ULN2003StepMode
PROGMEM_STRING_TABLE(StepModeStrings, "FULL STEP", "HALF STEP", "WAVE DRIVE", "UNKNOWN");
void ULN2003::setup() {
this->pin_a_->setup();
@@ -54,7 +45,9 @@ void ULN2003::dump_config() {
LOG_PIN(" Pin B: ", this->pin_b_);
LOG_PIN(" Pin C: ", this->pin_c_);
LOG_PIN(" Pin D: ", this->pin_d_);
ESP_LOGCONFIG(TAG, " Step Mode: %s", LOG_STR_ARG(step_mode_to_log_string(this->step_mode_)));
ESP_LOGCONFIG(
TAG, " Step Mode: %s",
LOG_STR_ARG(StepModeStrings::get_log_str(static_cast<uint8_t>(this->step_mode_), StepModeStrings::LAST_INDEX)));
}
void ULN2003::write_step_(int32_t step) {
int32_t n = this->step_mode_ == ULN2003_STEP_MODE_HALF_STEP ? 8 : 4;
@@ -6,6 +6,7 @@
#include "esphome/components/socket/socket.h"
#include "esphome/core/application.h"
#include "esphome/core/log.h"
#include "esphome/core/progmem.h"
#include <cinttypes>
#include <cstdio>
@@ -755,38 +756,14 @@ void VoiceAssistant::client_subscription(api::APIConnection *client, bool subscr
this->client_connected_trigger_.trigger();
}
// Indexed by State
PROGMEM_STRING_TABLE(StateStrings, "IDLE", "START_MICROPHONE", "STARTING_MICROPHONE", "WAIT_FOR_VAD", "WAITING_FOR_VAD",
"START_PIPELINE", "STARTING_PIPELINE", "STREAMING_MICROPHONE", "STOP_MICROPHONE",
"STOPPING_MICROPHONE", "AWAITING_RESPONSE", "STREAMING_RESPONSE", "RESPONSE_FINISHED", "UNKNOWN");
static const LogString *voice_assistant_state_to_string(State state) {
switch (state) {
case State::IDLE:
return LOG_STR("IDLE");
case State::START_MICROPHONE:
return LOG_STR("START_MICROPHONE");
case State::STARTING_MICROPHONE:
return LOG_STR("STARTING_MICROPHONE");
case State::WAIT_FOR_VAD:
return LOG_STR("WAIT_FOR_VAD");
case State::WAITING_FOR_VAD:
return LOG_STR("WAITING_FOR_VAD");
case State::START_PIPELINE:
return LOG_STR("START_PIPELINE");
case State::STARTING_PIPELINE:
return LOG_STR("STARTING_PIPELINE");
case State::STREAMING_MICROPHONE:
return LOG_STR("STREAMING_MICROPHONE");
case State::STOP_MICROPHONE:
return LOG_STR("STOP_MICROPHONE");
case State::STOPPING_MICROPHONE:
return LOG_STR("STOPPING_MICROPHONE");
case State::AWAITING_RESPONSE:
return LOG_STR("AWAITING_RESPONSE");
case State::STREAMING_RESPONSE:
return LOG_STR("STREAMING_RESPONSE");
case State::RESPONSE_FINISHED:
return LOG_STR("RESPONSE_FINISHED");
default:
return LOG_STR("UNKNOWN");
}
};
return StateStrings::get_log_str(static_cast<uint8_t>(state), StateStrings::LAST_INDEX);
}
#ifdef USE_VOICE_ASSISTANT_WAKE_WORD_AUDIO
static bool is_microphone_streaming_state(State state) {