From 7c5b25c8617807635e9f272ebe9e98304d07cf2f Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期五, 14 二月 2020 14:28:25 +0800
Subject: [PATCH] 增加单片机信息传递。
---
lib/src/main/cpp/utils/xconvert.cpp | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/lib/src/main/cpp/utils/xconvert.cpp b/lib/src/main/cpp/utils/xconvert.cpp
index 62aeca2..0232370 100644
--- a/lib/src/main/cpp/utils/xconvert.cpp
+++ b/lib/src/main/cpp/utils/xconvert.cpp
@@ -107,3 +107,26 @@
totalSeconds += daysThisYear * SECONDS_PER_DAY;
return totalSeconds;
}
+
+uint32_t TimeMakeComposite(int hour, int minute, int second, int msecond)
+{
+ return (hour*SECONDS_PER_HOUR + minute*SECONDS_PER_MINUTE + second) * 1000 + msecond;
+}
+
+/*********************************************************
+ * TIME1 - TIME2: msecond
+ * @param hour1
+ * @param minute1
+ * @param second1
+ * @param msecond1
+ * @param hour2
+ * @param minute2
+ * @param second2
+ * @param msecond2
+ * @return
+ */
+uint32_t TimeGetDiff(int hour1, int minute1, int second1, int msecond1, int hour2, int minute2, int second2, int msecond2)
+{
+ return (TimeMakeComposite(hour1, minute1, second1, msecond1) + SECONDS_PER_DAY * 1000 -
+ TimeMakeComposite(hour2, minute2, second2, msecond2)) % (SECONDS_PER_DAY * 1000);
+}
--
Gitblit v1.8.0