From f7a18ec4494b9c5c9ef3fd440bbf68ffc6425e18 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期四, 08 十二月 2022 15:40:56 +0800
Subject: [PATCH] 智慧驾培首次提交

---
 lib/src/main/cpp/test_items2/prepare.cpp |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/src/main/cpp/test_items2/prepare.cpp b/lib/src/main/cpp/test_items2/prepare.cpp
index 0ed3d54..4cb5f34 100644
--- a/lib/src/main/cpp/test_items2/prepare.cpp
+++ b/lib/src/main/cpp/test_items2/prepare.cpp
@@ -16,8 +16,9 @@
 static bool exec = false;
 
 static void TtsBack(int seq);
-static void PrepareTimeout(union sigval sig);
-static void PrepareTimeout2(union sigval sig);
+static void PrepareTimeout(apptimer_var_t val);
+static void PrepareTimeout2(apptimer_var_t val);
+
 void StartPrepare(void)
 {
     exec = true;
@@ -91,17 +92,14 @@
     hint_cnt++;
 }
 
-static void PrepareTimeout(union sigval sig)
+static void PrepareTimeout(apptimer_var_t val)
 {
     DEBUG("涓婅溅鍑嗗瓒呮椂");
-    AppTimer_delete(PrepareTimeout);
     exec = false;
     PrepareOver(-2);
 }
 
-static void PrepareTimeout2(union sigval sig)
+static void PrepareTimeout2(apptimer_var_t val)
 {
-    AppTimer_delete(PrepareTimeout2);
-
     PlayTTS(examParam.prepare_tts, TtsBack);
 }

--
Gitblit v1.8.0