Merge branch 'dev' into 'master'

20240723变更

See merge request !9

source/Application/APP/Data_ODO/Services_ODO_User.c

@@ -9,6 +9,9 @@
 #include "Data_DrvMtrSpd.h"
 #include "Key.h"
 #include "FlashCheckSum.h"
+#include "jcua.h"
+#include "CVBS.h"
+#include "GUI.h"
 
 #pragma ghs section bss=".myNonInitArea"
 #pragma alignvar(8)
@@ -197,6 +200,9 @@ void Data_ODO_Clear_KL15Init(void)
  ******************************************************************************/
 
 extern void loc_Test_Red(void);
+extern void loc_Test_Color(uint8_t color);
+
+extern uint32_t T_100ms_Status;
 
 void TYW_Data_ODO_Clear(void)
 {
@@ -222,10 +228,60 @@ void TYW_Data_ODO_Clear(void)
         
         if (Data_ODO_Read() == 0)
         {
+            CaptureDisable();
+
             if (CheckSpiFlashCRC() == 0u)
             {
                 loc_Test_Red();
             }
+            else
+            {
+                uint8_t time = 0u;
+                uint8_t step = 0u;
+                uint8_t Color[6u] = {1u, 0u, 2u, 0u, 3u, 0u};
+                
+                loc_Test_Color(0xFDu);
+                loc_Test_Color(0u);
+                
+                T_100ms_Status = 0ul;
+
+                do
+                {
+                    WDT_Clear( );
+                    
+                    if (T_100ms_Status)
+                    {
+                        T_100ms_Status = 0ul;
+                        
+                        time++;
+                        if (time >= 20u)
+                        { 
+                            time = 0u;
+                            
+                            if (step < 6u)
+                            {
+                                loc_Test_Color(Color[step]);
+                                loc_Test_Color(Color[step]); //刷一次偶发刷不出来
+                            }
+                            else if (step == 6u)
+                            {
+                                Bottom_Display_Service_0();
+                                loc_Test_Color(0xFEu);
+                            }
+                            else
+                            {
+                                ;
+                            }
+                            
+                            step++;
+                        }
+                    }
+                }
+                while (step < 8u);
+                
+                Bottom_Display_Service0();
+                loc_Test_Color(0xFFul);
+            }
         }
     }
 }

source/Application/APP/FlashCheckSum/FlashCheckSum.h

 #ifndef __FLASHCHECKSUM_H_
 #define __FLASHCHECKSUM_H_
 
-#define REAL_FLASHCHECKSUM      0x2FA125C6ul
+#define REAL_FLASHCHECKSUM      0x0B30EFE8ul
 
 #define SPI_START_ADDR 0x10000000ul
-#define SPI_ADDR_RANGE 0x02305EF0ul
+#define SPI_ADDR_RANGE 0x02312A80ul
 
 unsigned char CheckSpiFlashCRC(void);
 

source/Application/Graphic/GUI/GUI.c

@@ -526,6 +526,11 @@ void Bottom_Display_Service0(void)
     GUI_General_Display(Middle_Sprite, BG, GUI_BLENDMODE_SRC_OVER);
 }
 
+void Bottom_Display_Service_0(void)
+{
+    GUI_General_Display(Middle_Sprite, ZZZ_BG, GUI_BLENDMODE_SRC_OVER);
+}
+
 void Bottom_Display_Service(void)
 {
     GUI_General_Display(Middle_Sprite, BG, GUI_BLENDMODE_SRC_OVER);
@@ -4407,6 +4412,10 @@ void GUI_General_Popup_Display(uint8_t PopupMsg, uint8_t typ)
     GUI_Translate_Display(Middle_Sprite, GenPopID[temp][11u], GenPopID_XY[temp][11u][0u], GenPopID_XY[temp][11u][1u] + image, typ); /*操作警报 文字*/
     PopupMsg -= POPUP_MSG_BMS_BMS3 + 1u;
     
+    if (PopupMsg >= 7u)
+    {
+        PopupMsg++;
+    }
     GUI_Translate_Display(Middle_Sprite, GenPopID[temp][PopupMsg], GenPopID_XY[temp][PopupMsg][0u], GenPopID_XY[temp][PopupMsg][1u], typ); /*报警内容 文字*/
 }
 //显示故障码和说明 image=说明文字,为0xFFFF时无,value=故障码,type=1级报警故障码最小值类型,0=151开始,1=101开始

source/Application/Graphic/GUI/GUI.h

@@ -249,6 +249,7 @@ typedef struct
 
 /********************************************函数声明********************************************/
 void Bottom_Display_Service0(void);
+void Bottom_Display_Service_0(void);
 void Bottom_Display_Service(void);
 
 void GUI_Left(void);

source/Application/Graphic/GUI/images.h

@@ -29,6 +29,7 @@ typedef struct
 enum SpriteName
 {
     BG = 0u,
+    ZZZ_BG,
     Car,
     road_grey_L,
     road_grey_R,

source/Driver/CVBS/CVBS.c

@@ -206,3 +206,10 @@ void cvbs_enable_mem(void)
     R_WM_FrameEndMark(0, 0);
     R_WM_FrameWait(0, 0); 
 }
+
+void CaptureDisable(void)
+{ 
+    R_WM_CaptureDisable(loc_WM_UNIT, &loc_CaptureDevice);    
+    R_WM_WindowDisable(0, &loc_CaptureWindow);
+    loc_UpdateScreen();
+}

source/Driver/CVBS/CVBS.h

@@ -9,5 +9,6 @@ void loc_cvbs_service(void);
 void Bottom_Display_Service1(void);
 void CVBS_free_mem(void);
 void cvbs_enable_mem(void);
+void CaptureDisable(void);
 
 #endif
\ No newline at end of file

source/Driver/Graphic/Graphic.c

@@ -560,3 +560,34 @@ void loc_Test_Red(void)
     R_WM_FrameEndMark(0, 0);
     R_WM_FrameWait(0, 0);
 }
+
+void loc_Test_Color(uint8_t color)
+{
+    if (color == 0xFDu)
+    {
+        loc_Disable_Window_App();
+        JCUA_Disable_window();
+        return;
+    }
+    else if (color == 0xFEu)
+    {
+        JCUA_Enable_window();
+    }
+    else if (color == 0xFFu)
+    {
+	    loc_Enable_Window_App();
+    }
+    else
+    {
+        switch (color)
+        {
+            case 1u: R_WM_ScreenBgColorSet(0u, 0xFFu, 0u, 0u);       break; //red
+            case 2u: R_WM_ScreenBgColorSet(0u, 0xFFu, 0xFFu, 0xFFu); break; //white
+            case 3u: R_WM_ScreenBgColorSet(0u, 0u, 0u, 0xFFu);       break; //blue
+            default: R_WM_ScreenBgColorSet(0u, 0u, 0u, 0u);          break; //black
+        }
+    }
+
+    R_WM_FrameEndMark(0u, 0u);
+    R_WM_FrameWait(0u, 0u);
+}

source/System/main.c

@@ -111,6 +111,10 @@
 //20240522 修改选中模块版本英文图片，调整对三角号位置；屏蔽保养弹出报警；预计充电时间分钟最大由75改为55
 
 //20240607 修改故障码warn英文字体=中文字体，修改电机温度、电机转速、电控温度英文关联图片（去掉：，电机MTR->motor）
+
+//20240724 20240723变更，变更点二，1.锁车提醒（纠错）；2.离座报警（纠错）；3.水位低报警（纠错）；
+//         变更点一.新增：红-黑-白-黑-蓝-黑-彩-黑 各显2S纯色界面 
+
 #include "r_typedefs.h"
 #include "sys_scheduler.h"
 #include "Watchdog.h"

source/System/tasks.c

@@ -232,10 +232,12 @@ void Sys_Exact_50us_Tasks(void)
 /*==============================================================================
 精确的100ms计时任务 禁止添加修改列表中的任务
 ------------------------------------------------------------------------------*/
+uint32_t T_100ms_Status;
+
 void Sys_Exact_100ms_Tasks(void)
 {
     Data_Mileage_ISR();
-    
+    T_100ms_Status++;
     Service_OFF_Timing_Process();
 }
 /*============================================================================*/

utility/工程文件（释放绥化）/释放软件说明.txt

-1、SQ_0037_BootApp_S1.3.1_F1.1.2_240607.srec，完整版，适用于新生产的无程序仪表
-2、SQ_0037_UpdateApp_S1.3.1_F1.1.2_240607.bin，APP版，适用于烧过完整版程序仪表，需配合诊断工具使用
+1、SQ_0037_BootApp_S1.3.1_F1.1.2_240730.srec，完整版，适用于新生产的无程序仪表
+2、SQ_0037_UpdateApp_S1.3.1_F1.1.2_240730.bin，APP版，适用于烧过完整版程序仪表，需配合诊断工具使用
 3、SQ_0037.bin，APP版，适用于烧过完整版程序仪表，一键升级小白盒用