mirror of
https://github.com/MrUnknownDE/OpenIris-ESPIDF.git
synced 2026-04-20 06:53:45 +02:00
Reformat project using clang-format
This commit is contained in:
@@ -2,70 +2,70 @@
|
||||
|
||||
WebSocketLogger::WebSocketLogger()
|
||||
{
|
||||
this->connected_socket_client = async_resp_arg{
|
||||
.hd = nullptr,
|
||||
.fd = -1,
|
||||
};
|
||||
this->connected_socket_client = async_resp_arg{
|
||||
.hd = nullptr,
|
||||
.fd = -1,
|
||||
};
|
||||
|
||||
this->ws_log_buffer[0] = '\0';
|
||||
this->ws_log_buffer[0] = '\0';
|
||||
}
|
||||
|
||||
void LoggerHelpers::ws_async_send(void *arg)
|
||||
void LoggerHelpers::ws_async_send(void* arg)
|
||||
{
|
||||
char *log_buffer = webSocketLogger.get_websocket_log_buffer();
|
||||
char* log_buffer = webSocketLogger.get_websocket_log_buffer();
|
||||
|
||||
const auto *resp_arg = static_cast<struct async_resp_arg *>(arg);
|
||||
const auto hd = resp_arg->hd;
|
||||
const auto fd = resp_arg->fd;
|
||||
const auto* resp_arg = static_cast<struct async_resp_arg*>(arg);
|
||||
const auto hd = resp_arg->hd;
|
||||
const auto fd = resp_arg->fd;
|
||||
|
||||
auto websocket_packet = httpd_ws_frame_t{};
|
||||
auto websocket_packet = httpd_ws_frame_t{};
|
||||
|
||||
websocket_packet.payload = reinterpret_cast<uint8_t *>(log_buffer);
|
||||
websocket_packet.len = strlen(log_buffer);
|
||||
websocket_packet.type = HTTPD_WS_TYPE_TEXT;
|
||||
websocket_packet.payload = reinterpret_cast<uint8_t*>(log_buffer);
|
||||
websocket_packet.len = strlen(log_buffer);
|
||||
websocket_packet.type = HTTPD_WS_TYPE_TEXT;
|
||||
|
||||
httpd_ws_send_frame_async(hd, fd, &websocket_packet);
|
||||
httpd_ws_send_frame_async(hd, fd, &websocket_packet);
|
||||
}
|
||||
|
||||
esp_err_t WebSocketLogger::log_message(const char *format, va_list args)
|
||||
esp_err_t WebSocketLogger::log_message(const char* format, va_list args)
|
||||
{
|
||||
vsnprintf(this->ws_log_buffer, 100, format, args);
|
||||
vsnprintf(this->ws_log_buffer, 100, format, args);
|
||||
|
||||
if (connected_socket_client.fd == -1 || connected_socket_client.hd == nullptr)
|
||||
{
|
||||
return ESP_FAIL;
|
||||
}
|
||||
if (connected_socket_client.fd == -1 || connected_socket_client.hd == nullptr)
|
||||
{
|
||||
return ESP_FAIL;
|
||||
}
|
||||
|
||||
esp_err_t ret = httpd_queue_work(connected_socket_client.hd, LoggerHelpers::ws_async_send, &connected_socket_client);
|
||||
if (ret != ESP_OK)
|
||||
{
|
||||
connected_socket_client.fd = -1;
|
||||
connected_socket_client.hd = nullptr;
|
||||
}
|
||||
esp_err_t ret = httpd_queue_work(connected_socket_client.hd, LoggerHelpers::ws_async_send, &connected_socket_client);
|
||||
if (ret != ESP_OK)
|
||||
{
|
||||
connected_socket_client.fd = -1;
|
||||
connected_socket_client.hd = nullptr;
|
||||
}
|
||||
|
||||
return ret;
|
||||
return ret;
|
||||
}
|
||||
|
||||
esp_err_t WebSocketLogger::register_socket_client(httpd_req_t *req)
|
||||
esp_err_t WebSocketLogger::register_socket_client(httpd_req_t* req)
|
||||
{
|
||||
if (connected_socket_client.fd != -1 && connected_socket_client.hd != nullptr)
|
||||
{
|
||||
// we're already connected
|
||||
if (connected_socket_client.fd != -1 && connected_socket_client.hd != nullptr)
|
||||
{
|
||||
// we're already connected
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
connected_socket_client.hd = req->handle;
|
||||
connected_socket_client.fd = httpd_req_to_sockfd(req);
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
connected_socket_client.hd = req->handle;
|
||||
connected_socket_client.fd = httpd_req_to_sockfd(req);
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
void WebSocketLogger::unregister_socket_client()
|
||||
{
|
||||
connected_socket_client.fd = -1;
|
||||
connected_socket_client.hd = nullptr;
|
||||
connected_socket_client.fd = -1;
|
||||
connected_socket_client.hd = nullptr;
|
||||
}
|
||||
|
||||
char *WebSocketLogger::get_websocket_log_buffer()
|
||||
char* WebSocketLogger::get_websocket_log_buffer()
|
||||
{
|
||||
return this->ws_log_buffer;
|
||||
return this->ws_log_buffer;
|
||||
}
|
||||
@@ -9,28 +9,28 @@
|
||||
|
||||
struct async_resp_arg
|
||||
{
|
||||
httpd_handle_t hd;
|
||||
int fd;
|
||||
httpd_handle_t hd;
|
||||
int fd;
|
||||
};
|
||||
|
||||
namespace LoggerHelpers
|
||||
{
|
||||
void ws_async_send(void *arg);
|
||||
void ws_async_send(void* arg);
|
||||
}
|
||||
|
||||
class WebSocketLogger
|
||||
{
|
||||
async_resp_arg connected_socket_client{};
|
||||
char ws_log_buffer[WS_LOG_BUFFER_LEN]{};
|
||||
async_resp_arg connected_socket_client{};
|
||||
char ws_log_buffer[WS_LOG_BUFFER_LEN]{};
|
||||
|
||||
public:
|
||||
WebSocketLogger();
|
||||
public:
|
||||
WebSocketLogger();
|
||||
|
||||
esp_err_t log_message(const char *format, va_list args);
|
||||
esp_err_t register_socket_client(httpd_req_t *req);
|
||||
void unregister_socket_client();
|
||||
bool is_client_connected();
|
||||
char *get_websocket_log_buffer();
|
||||
esp_err_t log_message(const char* format, va_list args);
|
||||
esp_err_t register_socket_client(httpd_req_t* req);
|
||||
void unregister_socket_client();
|
||||
bool is_client_connected();
|
||||
char* get_websocket_log_buffer();
|
||||
};
|
||||
|
||||
extern WebSocketLogger webSocketLogger;
|
||||
|
||||
Reference in New Issue
Block a user