From e7814de6fd2d6db7391b0d91954345e5a1c9b26c Mon Sep 17 00:00:00 2001
From: zogodo <742782908@qq.com>
Date: Sun, 12 Jan 2020 13:18:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20web=5Flog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TC1/http_server/app_httpd.c | 2 +-
 TC1/http_server/web_log.c   | 7 +++----
 TC1/http_server/web_log.h   | 2 +-
 TC1/user_gpio.c             | 8 +++++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/TC1/http_server/app_httpd.c b/TC1/http_server/app_httpd.c
index f2ed851..a67d3f2 100644
--- a/TC1/http_server/app_httpd.c
+++ b/TC1/http_server/app_httpd.c
@@ -227,7 +227,7 @@ exit:
 static int HttpGetLog(httpd_request_t *req)
 {
     OSStatus err = kNoErr;
-    char* logs = GetLogRecord(0);
+    char* logs = GetLogRecord();
     send_http(logs, strlen(logs), exit, &err);
 
 exit:
diff --git a/TC1/http_server/web_log.c b/TC1/http_server/web_log.c
index 73d47c3..5edb97b 100644
--- a/TC1/http_server/web_log.c
+++ b/TC1/http_server/web_log.c
@@ -24,11 +24,9 @@ void SetLogRecord(LogRecord* lr, char* log)
     *p_log = log;
 }
 
-char* GetLogRecord(int idx)
+char* GetLogRecord()
 {
-    if (idx > log_record.idx) return "";
-
-    int i = idx > 0 ? idx : (log_record.idx - LOG_NUM + 1);
+    int i = log_record.idx - LOG_NUM + 1;
     i = i < 0 ? 0 : i;
     char* tmp = log_record_str;
     for (; i <= log_record.idx; i++)
@@ -37,6 +35,7 @@ char* GetLogRecord(int idx)
         sprintf(tmp, "%s\n", log_record.logs[i%LOG_NUM]);
         tmp += strlen(tmp);
     }
+    sprintf(tmp, "%d", log_record.idx);
     return log_record_str;
 }
 
diff --git a/TC1/http_server/web_log.h b/TC1/http_server/web_log.h
index 99c8c44..ecd8132 100644
--- a/TC1/http_server/web_log.h
+++ b/TC1/http_server/web_log.h
@@ -19,7 +19,7 @@ extern time_t now;
 extern char time_buf[];
 
 void SetLogRecord(LogRecord* lr, char* log);
-char* GetLogRecord(int idx);
+char* GetLogRecord();
 
 #define web_log(format, ...)                           \
     LOG_TMP = (char*)malloc(sizeof(char)*LOG_LEN);     \
diff --git a/TC1/user_gpio.c b/TC1/user_gpio.c
index d2a6f10..bd637b1 100644
--- a/TC1/user_gpio.c
+++ b/TC1/user_gpio.c
@@ -168,8 +168,8 @@ static void KeyTimeoutHandler(void* arg)
                 key_time = 101;
             }
         }
-
-    } else
+    }
+    else
     {
         //button released
         if (key_time < BUTTON_LONG_PRESS_TIME)
@@ -177,7 +177,8 @@ static void KeyTimeoutHandler(void* arg)
             key_time = 0;
             os_log("button short pressed:%d",key_time);
             KeyShortPress();
-        } else if (key_time > 100)
+        }
+        else if (key_time > 100)
         {
             MicoSystemReboot();
         }
@@ -189,6 +190,7 @@ static void KeyFallingIrqHandler(void* arg)
 {
     mico_rtos_start_timer(&user_key_timer);
 }
+
 void KeyInit(void)
 {
     MicoGpioInitialize(Button, INPUT_PULL_UP);