From bca8d63f22ebdc4dadc4de6d9f6316cf8f7e137b Mon Sep 17 00:00:00 2001
From: sunbeam <fcb1995@163.com>
Date: Wed, 22 May 2024 00:02:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 APP/QualityReport(ECU_APP,DefaultBuild).txt | 71 +++++++++++++++++++--
 APP/user/appTask.c                          | 36 +++++++----
 2 files changed, 86 insertions(+), 21 deletions(-)

diff --git a/APP/QualityReport(ECU_APP,DefaultBuild).txt b/APP/QualityReport(ECU_APP,DefaultBuild).txt
index da69a80..bb578c8 100644
--- a/APP/QualityReport(ECU_APP,DefaultBuild).txt
+++ b/APP/QualityReport(ECU_APP,DefaultBuild).txt
@@ -1,13 +1,70 @@
 QualityReport
-2024年5月21日 18:54:21
+2024年5月21日 23:40:23
 
 ------ Start build(ECU_APP, DefaultBuild) ------
------- Build ended(Error:0, Warning:0)(ECU_APP, DefaultBuild) ------
+C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.11.00\Bin\ccrl.exe user\MotorCtrl.c -cpu=S2 -o DefaultBuild\MotorCtrl.obj "-dev=C:\Program Files (x86)\Renesas Electronics\CS+\CC\Device\RL78\Devicefile\DR5F103AA.DVF" -g -g_line -I . -I user -I DataFlash -c -msg_lang=english
+W0511106:The folder "DataFlash" specified by the "-I" option is not found.
+C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.11.00\Bin\rlink.exe -subcommand=DefaultBuild\ECU_APP.clnk
+W0561016:The evaluation version of CC-RL V1 is valid for the remaining 26 days. After that, link size limit (64 Kbyte) will be applied. Please consider purchasing the product.
+RAMDATA SECTION:  00000054 Byte(s)
+ROMDATA SECTION:  000000c3 Byte(s)
+PROGRAM SECTION:  00000c53 Byte(s)
+W0561016:The evaluation version of CC-RL V1 is valid for the remaining 26 days. After that, link size limit (64 Kbyte) will be applied. Please consider purchasing the product.
+Renesas Optimizing Linker Completed
+------ Build ended(Error:0, Warning:3)(ECU_APP, DefaultBuild) ------
+
+--- CommandFile 1 ---
+DefaultBuild\ECU_APP.clnk :
+-Input=DefaultBuild\cstart.obj
+-Input=DefaultBuild\stkinit.obj
+-Input=DefaultBuild\r_main.obj
+-Input=DefaultBuild\r_systeminit.obj
+-Input=DefaultBuild\r_cg_cgc.obj
+-Input=DefaultBuild\r_cg_cgc_user.obj
+-Input=DefaultBuild\r_cg_port.obj
+-Input=DefaultBuild\r_cg_port_user.obj
+-Input=DefaultBuild\r_cg_serial.obj
+-Input=DefaultBuild\r_cg_serial_user.obj
+-Input=DefaultBuild\r_cg_adc.obj
+-Input=DefaultBuild\r_cg_adc_user.obj
+-Input=DefaultBuild\r_cg_timer.obj
+-Input=DefaultBuild\r_cg_timer_user.obj
+-Input=DefaultBuild\r_cg_wdt.obj
+-Input=DefaultBuild\r_cg_wdt_user.obj
+-Input=DefaultBuild\appTask.obj
+-Input=DefaultBuild\hwCtrl.obj
+-Input=DefaultBuild\MotorCtrl.obj
+-SECURITY_ID=00000000000000000000
+-DEVICE=C:\Program Files (x86)\Renesas Electronics\CS+\CC\Device\RL78\Devicefile\DR5F103AA.DVF
+-DEBug
+-NOCOmpress
+-NOOPtimize
+-OUtput=DefaultBuild\ECU_APP.abs
+-LIBrary=C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.11.00\lib\rl78cm4s.lib
+-LIBrary=C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.11.00\lib\malloc_n.lib
+-LIBrary=C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.11.00\lib\rl78cm4r.lib
+-OCDBG=04
+-USER_OPT_BYTE=F87FE0
+-LISt=DefaultBuild\ECU_APP.map
+-AUTO_SECTION_LAYOUT
+-ROm=.data=.dataR
+-ROm=.sdata=.sdataR
+-Message
+-MEMory=High
+-Total_size
+-NOLOgo
+-end
+-Input=DefaultBuild\ECU_APP.abs
+-DEVICE=C:\Program Files (x86)\Renesas Electronics\CS+\CC\Device\RL78\Devicefile\DR5F103AA.DVF
+-OUtput=DefaultBuild\ECU_APP.mot
+-FOrm=Stype
+-Message
+-exit
 
 
 --- SHA1 hash value of output files ---
-E:\workspace\M20\CODE\APP\DefaultBuild\ECU_APP.abs: 92200ee79b1dbc7ce577d5d62044bdc0d234aab2
-E:\workspace\M20\CODE\APP\DefaultBuild\ECU_APP.mot: 1547f6f290f9bf587c75f96a6459cb7a2a6d8722
+E:\workspace\M20\CODE\APP\DefaultBuild\ECU_APP.abs: 1cb56936ddc2b7fbbc8aa23eeed62f8ba17b2404
+E:\workspace\M20\CODE\APP\DefaultBuild\ECU_APP.mot: 55561946f6c24a3e7c535697a18cd1c4cd1f452c
 
 
 --- System Information ---
@@ -35,11 +92,11 @@ E:\workspace\M20\CODE\APP\DefaultBuild\ECU_APP.mot: 1547f6f290f9bf587c75f96a6459
  C:\Program Files (x86)\Renesas Electronics\CS+\CC
 *Memory Usage
  *Private Working Set
-  200 MB
+  218 MB
  *Number of GDI Objects
-  1964
+  1969
  *Number of USER Objects
-  1036
+  1035
  *Opened Files
   4 editors, 4 files, 22 KB
 
diff --git a/APP/user/appTask.c b/APP/user/appTask.c
index d6785dd..04ac03c 100644
--- a/APP/user/appTask.c
+++ b/APP/user/appTask.c
@@ -42,12 +42,12 @@ void Apply_task(void)
     if (Timer_1ms_flag == 1)
     {
         Timer_1ms_flag = 0;
-
+        KeyScan();
     }
     if (Timer_5ms_flag == 1)
     {
         Timer_5ms_flag = 0;
-
+        KeyPro();
         
     }
 
@@ -288,6 +288,11 @@ void value_init(void)
 
 void KeyPro(void)
 {
+    if (getKeyPressFlag(0) == KEY_PRESSED)
+    {
+        am_state = !am_state;
+        amCtrl_SetState(am_state);
+    }
     
 }
 
@@ -473,6 +478,20 @@ void MsgPro(uint8_t len)
                 break;
             }
 
+            
+
+            if (gIGN_State == 1 && battState == BattStatus_Normal)
+            {
+                SendTFJRmsg(fan_state,heat_state);
+                setFanDuty(fan_duty_arr[fan_state]);
+                setHeatDuty(heat_duty_arr[heat_state]);
+                
+            }
+           
+            
+        }
+        if (Rxdata[1] != 0)
+        {
             switch (Rxdata[1])
             {
             case 0x0A:
@@ -493,20 +512,9 @@ void MsgPro(uint8_t len)
             default:
                 break;
             }
-
-            if (gIGN_State == 1 && battState == BattStatus_Normal)
-            {
-                SendTFJRmsg(fan_state,heat_state);
-                setFanDuty(fan_duty_arr[fan_state]);
-                setHeatDuty(heat_duty_arr[heat_state]);
-                amCtrl_SetState(am_state);
-            }
-           
-            
+            amCtrl_SetState(am_state);
         }
         
-        
-        
     }
 
     RxFlag = 0;