andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

minor formatting

Browse Source
This commit is contained in:
proddy
2021-10-20 09:21:03 +02:00
parent 547ccb96c9
commit 4f47712d52
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/system.cpp
View File

@@ -674,14 +674,16 @@ void System::commands_init() {
Command::add(EMSdevice::DeviceType::SYSTEM, F_(publish), System::command_publish, F("force a MQTT publish"), CommandFlag::ADMIN_ONLY); Command::add(EMSdevice::DeviceType::SYSTEM, F_(publish), System::command_publish, F("force a MQTT publish"), CommandFlag::ADMIN_ONLY);
Command::add(EMSdevice::DeviceType::SYSTEM, F_(fetch), System::command_fetch, F("refresh all EMS values"), CommandFlag::ADMIN_ONLY); Command::add(EMSdevice::DeviceType::SYSTEM, F_(fetch), System::command_fetch, F("refresh all EMS values"), CommandFlag::ADMIN_ONLY);
Command::add(EMSdevice::DeviceType::SYSTEM, F_(restart), System::command_restart, F("restarts EMS-ESP"), CommandFlag::ADMIN_ONLY); Command::add(EMSdevice::DeviceType::SYSTEM, F_(restart), System::command_restart, F("restarts EMS-ESP"), CommandFlag::ADMIN_ONLY);
Command::add(EMSdevice::DeviceType::SYSTEM, F_(watch), System::command_watch, F("watch incoming telegrams"), CommandFlag::ADMIN_ONLY);
Command::add(EMSdevice::DeviceType::SYSTEM, F_(syslog_level), System::command_syslog_level, F("set syslog level"), CommandFlag::ADMIN_ONLY);
Command::add_json(EMSdevice::DeviceType::SYSTEM, F_(info), System::command_info, F("system status")); Command::add_json(EMSdevice::DeviceType::SYSTEM, F_(info), System::command_info, F("system status"));
Command::add_json(EMSdevice::DeviceType::SYSTEM, F_(settings), System::command_settings, F("list system settings")); Command::add_json(EMSdevice::DeviceType::SYSTEM, F_(settings), System::command_settings, F("list system settings"));
Command::add_json(EMSdevice::DeviceType::SYSTEM, F_(commands), System::command_commands, F("list system commands")); Command::add_json(EMSdevice::DeviceType::SYSTEM, F_(commands), System::command_commands, F("list system commands"));
#if defined(EMSESP_DEBUG) #if defined(EMSESP_DEBUG)
Command::add(EMSdevice::DeviceType::SYSTEM, F("test"), System::command_test, F("run tests")); Command::add(EMSdevice::DeviceType::SYSTEM, F("test"), System::command_test, F("run tests"));
#endif #endif
Command::add(EMSdevice::DeviceType::SYSTEM, F_(watch), System::command_watch, F("watch incoming telegrams"), CommandFlag::ADMIN_ONLY);
Command::add(EMSdevice::DeviceType::SYSTEM, F_(syslog_level), System::command_syslog_level, F("set syslog level"), CommandFlag::ADMIN_ONLY);
} }
// flashes the LED // flashes the LED

8
src/web/WebAPIService.cpp
View File

@@ -237,22 +237,22 @@ void WebAPIService::parse(AsyncWebServerRequest * request, std::string & device_
} }
// send a HTTP error back, with optional JSON body data // send a HTTP error back, with optional JSON body data
void WebAPIService::send_message_response(AsyncWebServerRequest * request, uint16_t error_code, const char * error_message) { void WebAPIService::send_message_response(AsyncWebServerRequest * request, uint16_t error_code, const char * message) {
if (error_message == nullptr) { if (message == nullptr) {
AsyncWebServerResponse * response = request->beginResponse(error_code); // just send the code AsyncWebServerResponse * response = request->beginResponse(error_code); // just send the code
request->send(response); request->send(response);
} else { } else {
// build a return message and send it // build a return message and send it
PrettyAsyncJsonResponse * response = new PrettyAsyncJsonResponse(false, EMSESP_JSON_SIZE_SMALL); PrettyAsyncJsonResponse * response = new PrettyAsyncJsonResponse(false, EMSESP_JSON_SIZE_SMALL);
JsonObject json = response->getRoot(); JsonObject json = response->getRoot();
json["message"] = error_message; json["message"] = message;
response->setCode(error_code); response->setCode(error_code);
response->setLength(); response->setLength();
response->setContentType("application/json"); response->setContentType("application/json");
request->send(response); request->send(response);
} }
EMSESP::logger().debug(F("API return code: %d, message: %s"), error_code, error_message); EMSESP::logger().debug(F("API return code: %d, message: %s"), error_code, message);
} }
/** /**

2
src/web/WebAPIService.h
View File

@@ -68,7 +68,7 @@ class WebAPIService {
AsyncCallbackJsonWebHandler _apiHandler; // for POSTs AsyncCallbackJsonWebHandler _apiHandler; // for POSTs
void parse(AsyncWebServerRequest * request, std::string & device, std::string & cmd, int id, std::string & value); void parse(AsyncWebServerRequest * request, std::string & device, std::string & cmd, int id, std::string & value);
void send_message_response(AsyncWebServerRequest * request, uint16_t error_code, const char * error_message = nullptr); void send_message_response(AsyncWebServerRequest * request, uint16_t error_code, const char * message = nullptr);
}; };
} // namespace emsesp } // namespace emsesp