From 129a54b843a51074d6c397a75ceb8b0f45b98260 Mon Sep 17 00:00:00 2001 From: coffee Date: Wed, 27 Aug 2025 18:26:52 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=97=A5=E5=BF=97=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96=E6=97=B6=E9=97=B4=202.=20?= =?UTF-8?q?=E7=8E=AF=E7=8A=B6=E7=BC=93=E5=86=B2=E5=8C=BA=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=BB=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/HDLog.h | 7 +++++++ include/HRingBuffer.h | 3 +++ src/HDLog.c | 10 ++++++++++ src/HRingBuffer.c | 5 +++++ 4 files changed, 25 insertions(+) diff --git a/include/HDLog.h b/include/HDLog.h index f9e5fe0..6b460ac 100644 --- a/include/HDLog.h +++ b/include/HDLog.h @@ -115,9 +115,16 @@ void HDLogOptFlashInit(); */ void HDLogInit(uint32_t (*getTime)()); +/** + * @brief 获取当前时间 + * @return 当前时间 + */ +uint32_t HDLogGetTime(); + /** * @brief 格式打印 **/ +__attribute__ ((format(printf, 6, 7))) void HDLogOut(uint8_t ext, uint8_t level, const char *fileName, const char *funcName, int line, const char *format, ...); /** diff --git a/include/HRingBuffer.h b/include/HRingBuffer.h index e60d254..57ba225 100644 --- a/include/HRingBuffer.h +++ b/include/HRingBuffer.h @@ -133,4 +133,7 @@ void HRingBufferClear(HRingBufferType* buffer); // 判断环形缓冲区是否为空 uint8_t HRingBufferEmpty(HRingBufferType* buffer); +// 判断环形缓冲区是否满 +uint8_t HRingBufferFull(HRingBufferType* buffer); + #endif // _H_RING_BUFFER_H_ diff --git a/src/HDLog.c b/src/HDLog.c index e710461..e6bb0e1 100644 --- a/src/HDLog.c +++ b/src/HDLog.c @@ -250,6 +250,16 @@ void HDLogInit(uint32_t (*getTime)()) #endif } +uint32_t HDLogGetTime() +{ + if (sGetTime) + { + return sGetTime(); + } + + return 0; +} + void HDLogOut(uint8_t ext, uint8_t level, const char *fileName, const char *funcName, int line, const char *format, ...) { if (HBitGet(sLogItem, kLogLevelSwitch) == 0) diff --git a/src/HRingBuffer.c b/src/HRingBuffer.c index d7be6a0..32d65d3 100644 --- a/src/HRingBuffer.c +++ b/src/HRingBuffer.c @@ -283,3 +283,8 @@ void HRingBufferClear(HRingBufferType* buffer) { uint8_t HRingBufferEmpty(HRingBufferType* buffer) { return HRingBufferGetUseLen(buffer) == 0; } + +uint8_t HRingBufferFull(HRingBufferType* buffer) { + return IsRingBufferFull(buffer); +} +