mmr/Livox-SDK
Archived
1
0
Fork 0
Code Issues 105 Pull Requests 11 Actions Packages Projects Releases 9 Wiki Activity

Remove spdlog

Browse Source
This commit is contained in:
Lukas Schröer
2024-09-17 08:59:00 +00:00
parent 0f00766aab
commit 7d5063ce48
56 changed files with 9 additions and 15327 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdk_core/src/base/logging.cpp
-25
View File
@@ -24,36 +24,11 @@
#include "logging.h"
std::shared_ptr<spdlog::logger> logger = NULL;
bool is_save_log_file = false;
bool is_console_log_enable = true;
void InitLogger() {
if (spdlog::get("console") != nullptr) {
logger = spdlog::get("console");
return;
}
std::vector<spdlog::sink_ptr> sinkList;
if (is_console_log_enable) {
auto consoleSink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
consoleSink->set_level(spdlog::level::debug);
sinkList.push_back(consoleSink);
}
if (is_save_log_file) {
auto rotateSink = std::make_shared<spdlog::sinks::rotating_file_sink_mt>("livox_log.txt", 1024 * 1024 * 5, 2);
rotateSink->set_level(spdlog::level::debug);
sinkList.push_back(rotateSink);
}
logger = std::make_shared<spdlog::logger>("console", begin(sinkList), end(sinkList));
spdlog::register_logger(logger);
logger->set_level(spdlog::level::debug);
logger->flush_on(spdlog::level::debug);
}
void UninitLogger() {
spdlog::drop_all();
}
sdk_core/src/base/logging.h
+6 -10
View File
@@ -24,9 +24,6 @@
#ifndef LIVOX_LOGGING_H_
#define LIVOX_LOGGING_H_
#include "../include/third_party/spdlog/spdlog/spdlog.h"
#include "../include/third_party/spdlog/spdlog/sinks/stdout_color_sinks.h"
#include "../include/third_party/spdlog/spdlog/sinks/rotating_file_sink.h"
#ifdef _WIN32
#define __FILENAME__ (strrchr(__FILE__, '\\') ? (strrchr(__FILE__, '\\') + 1):__FILE__)
@@ -49,18 +46,17 @@
#define SPDLOG_DEBUG_ON
#endif
extern std::shared_ptr<spdlog::logger> logger;
extern bool is_save_log_file;
extern bool is_console_log_enable;
void InitLogger();
void UninitLogger();
#define LOG_TRACE(msg, ...) logger->trace(suffix(msg), ##__VA_ARGS__)
#define LOG_DEBUG(msg, ...) logger->debug(suffix(msg), ##__VA_ARGS__)
#define LOG_INFO(msg, ...) logger->info(suffix(msg), ##__VA_ARGS__)
#define LOG_WARN(msg, ...) logger->warn(suffix(msg), ##__VA_ARGS__)
#define LOG_ERROR(msg, ...) logger->error(suffix(msg), ##__VA_ARGS__)
#define LOG_FATAL(msg, ...) logger->critical(suffix(msg), ##__VA_ARGS__)
#define LOG_TRACE(msg, ...)
#define LOG_DEBUG(msg, ...)
#define LOG_INFO(msg, ...)
#define LOG_WARN(msg, ...)
#define LOG_ERROR(msg, ...)
#define LOG_FATAL(msg, ...)
#endif // LIVOX_LOGGING_H_
sdk_core/src/command_handler/command_handler.cpp
+3 -3
View File
@@ -48,13 +48,13 @@ CommandHandler &command_handler() {
uint16_t GetCommandTimeout(uint8_t command_set, uint8_t command_id) {
switch (command_set) {
case kCommandSetGeneral:
assert(command_id < sizeof(GeneralCommandTimeout));
//assert(command_id < sizeof(GeneralCommandTimeout));
return GeneralCommandTimeout[command_id];
case kCommandSetLidar:
assert(command_id < sizeof(LidarCommandTimeout));
//assert(command_id < sizeof(LidarCommandTimeout));
return LidarCommandTimeout[command_id];
case kCommandSetHub:
assert(command_id < sizeof(HubCommandTimeout));
//assert(command_id < sizeof(HubCommandTimeout));
return HubCommandTimeout[command_id];
}
return KDefaultTimeOut;