MrUnknownDE/OpenIris-ESPIDF
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/OpenIris-ESPIDF.git synced 2026-04-19 22:43:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add get device name command for displaying the current name in the setup tool

Browse Source
This commit is contained in:
Lorow
2025-08-16 15:08:06 +02:00
parent 3b817ce28f
commit cbcb9b492e
6 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/CommandManager/CommandManager/CommandManager.cpp
View File

@@ -6,11 +6,11 @@ std::unordered_map<std::string, CommandType> commandTypeMap = {
{"pause", CommandType::PAUSE},
{"set_wifi", CommandType::SET_WIFI},
{"update_wifi", CommandType::UPDATE_WIFI},
{"set_streaming_mode", CommandType::SET_STREAMING_MODE},
{"update_ota_credentials", CommandType::UPDATE_OTA_CREDENTIALS},
{"delete_network", CommandType::DELETE_NETWORK},
{"update_ap_wifi", CommandType::UPDATE_AP_WIFI},
{"set_mdns", CommandType::SET_MDNS},
{"get_mdns_name", CommandType::GET_MDNS_NAME},
{"update_camera", CommandType::UPDATE_CAMERA},
{"restart_camera", CommandType::RESTART_CAMERA},
{"save_config", CommandType::SAVE_CONFIG},
@@ -24,8 +24,8 @@ std::unordered_map<std::string, CommandType> commandTypeMap = {
{"switch_mode", CommandType::SWITCH_MODE},
{"get_device_mode", CommandType::GET_DEVICE_MODE},
{"set_led_duty_cycle", CommandType::SET_LED_DUTY_CYCLE},
{"get_led_duty_cycle", CommandType::GET_LED_DUTY_CYCLE},
{"get_serial", CommandType::GET_SERIAL},
{"get_led_duty_cycle", CommandType::GET_LED_DUTY_CYCLE},
{"get_serial", CommandType::GET_SERIAL},
};
std::function<CommandResult()> CommandManager::createCommand(const CommandType type, std::string_view json) const
@@ -37,9 +37,8 @@ std::function<CommandResult()> CommandManager::createCommand(const CommandType t
case CommandType::PAUSE:
return [json]
{ return PauseCommand(json); };
case CommandType::SET_STREAMING_MODE:
return [this, json]
{ return setDeviceModeCommand(this->registry, json); };
return [json]
{ return PauseCommand(json); };
case CommandType::UPDATE_OTA_CREDENTIALS:
return [this, json]
{ return updateOTACredentialsCommand(this->registry, json); };
@@ -58,6 +57,9 @@ std::function<CommandResult()> CommandManager::createCommand(const CommandType t
case CommandType::SET_MDNS:
return [this, json]
{ return setMDNSCommand(this->registry, json); };
case CommandType::GET_MDNS_NAME:
return [this]
{ return getMDNSNameCommand(this->registry); };
case CommandType::UPDATE_CAMERA:
return [this, json]
{ return updateCameraCommand(this->registry, json); };

2
components/CommandManager/CommandManager/CommandManager.hpp
View File

@@ -27,11 +27,11 @@ enum class CommandType
PAUSE,
SET_WIFI,
UPDATE_OTA_CREDENTIALS,
SET_STREAMING_MODE,
UPDATE_WIFI,
DELETE_NETWORK,
UPDATE_AP_WIFI,
SET_MDNS,
GET_MDNS_NAME,
UPDATE_CAMERA,
RESTART_CAMERA,
SAVE_CONFIG,

2
components/CommandManager/CommandManager/commands/device_commands.hpp
View File

@@ -9,8 +9,6 @@
#include <format>
#include <string>
CommandResult setDeviceModeCommand(std::shared_ptr<DependencyRegistry> registry, std::string_view jsonPayload);
CommandResult updateOTACredentialsCommand(std::shared_ptr<DependencyRegistry> registry, std::string_view jsonPayload);
CommandResult updateLEDDutyCycleCommand(std::shared_ptr<DependencyRegistry> registry, std::string_view jsonPayload);

9
components/CommandManager/CommandManager/commands/mdns_commands.cpp
View File

@@ -31,3 +31,12 @@ CommandResult setMDNSCommand(std::shared_ptr<DependencyRegistry> registry, std::
return CommandResult::getSuccessResult("Config updated");
}
CommandResult getMDNSNameCommand(std::shared_ptr<DependencyRegistry> registry)
{
const auto projectConfig = registry->resolve<ProjectConfig>(DependencyType::project_config);
auto mdnsConfig = projectConfig->getMDNSConfig();
auto result = std::format("{{ \"hostname\": \"{}\" }}", mdnsConfig.hostname);
return CommandResult::getSuccessResult(result);
}

3
components/CommandManager/CommandManager/commands/mdns_commands.hpp
View File

@@ -8,4 +8,5 @@
#include "DependencyRegistry.hpp"
std::optional<MDNSPayload> parseMDNSCommandPayload(std::string_view jsonPayload);
CommandResult setMDNSCommand(std::shared_ptr<DependencyRegistry> registry, std::string_view jsonPayload);
CommandResult setMDNSCommand(std::shared_ptr<DependencyRegistry> registry, std::string_view jsonPayload);
CommandResult getMDNSNameCommand(std::shared_ptr<DependencyRegistry> registry);