✨ feat:贴图

YueJin_test_bench/source/Appliciation/Check_Ctrl.c

@@ -71,7 +71,7 @@ void Function_Check_Ctrl(uint32_t cmd);
 void MENU_CHECK_STEP_ADD(void)
 {
     MENU_CHECK_STEP++;
-    if(MENU_CHECK_STEP > 13)
+    if(MENU_CHECK_STEP > 10)
     {
         MENU_CHECK_STEP = 0;
     }
@@ -262,12 +262,12 @@ uint8_t yibiaoshuju[34];
             // comparestart = 1;
             break; 
         case 2: 
-            POWER_CTRL_KL30   = 0u;  //B+
-            POWER_CTRL_KL15   = 0u;  //KL15
+            // POWER_CTRL_KL30   = 0u;  //B+
+            // POWER_CTRL_KL15   = 0u;  //KL15
             CAN_Msg_Tx_Enable = 1u;  
             if(MENU_CHECK_STEP == 0)
             {
-                Display_Version_Info(1);  
+                // Display_Version_Info(1);  
             }
             else
             {
@@ -559,7 +559,7 @@ void Function_Check_Ctrl(uint32_t cmd)
         {
             // MENU_CHECK_STEP = 0;
         }
-
+        Display_Send_Vspead(MENU_CHECK_STEP);
         if ( MENU_BACK != MENU_CHECK_STEP )
         {
             MENU_BACK = MENU_CHECK_STEP;
@@ -575,8 +575,8 @@ void Function_Check_Ctrl(uint32_t cmd)
             }
             else
             {
-                p [ 0 ] = ((MENU_CHECK_STEP ) % 100) / 10;
-                p [ 1 ] = (MENU_CHECK_STEP ) % 10;    // 65535
+                p [ 0 ] = ((MENU_CHECK_STEP + 1) % 100) / 10;
+                p [ 1 ] = (MENU_CHECK_STEP + 1) % 10;    // 65535
                 p [ 2 ] = 0xff;
             }
             General_Number_Disp(p, 190, 10);//刷图：报文检测步数
@@ -696,32 +696,48 @@ void Function_Check_Ctrl(uint32_t cmd)
             }
             case 9:
             {  
+                RELAY_VBAT_MCU = 1;
+                RELAY_DC12V_MCU = 1;
+                RELAY_KEY_MCU = 1;
                 ABC_OUT = 0;
-
-                break;
+                if(ACCONOFF_delay_3s >= 115)
+                {
+                    ONE_START = 0;
                 }
-            case 10:
+                else if (ACCONOFF_delay_3s >=110 && ACCONOFF_delay_3s < 115)
                 {
-                     
-                break;
+                    ONE_START = 1;
                 }
-            case 11:
+                else if (ACCONOFF_delay_3s >= 105 && ACCONOFF_delay_3s < 110)
                 {
-                break;
+                    ONE_START = 0;
                 }
-            case 12:
+                else if (ACCONOFF_delay_3s >= 100 && ACCONOFF_delay_3s < 105)
                 {
-                break;
+                    ONE_START = 1;
                 }
-            case 13:
+                else if (ACCONOFF_delay_3s >= 95 && ACCONOFF_delay_3s < 100)
                 {
-                if(Auto_ONOFF == 0)
+                    ONE_START = 0;
+                }
+                else if (ACCONOFF_delay_3s >= 90 && ACCONOFF_delay_3s < 95)
                 {
-                    LINE_OUT_NEG_01 = 0;
+                    ONE_START = 1;
                 }
-                break;
+                else
+                {
+                    ONE_START = 0;
                 }
 
+                break;
+            }
+            case 10:
+            {          
+                RELAY_VBAT_MCU = 1;
+                RELAY_DC12V_MCU = 1;
+                RELAY_KEY_MCU = 0; 
+                break;
+            } 
             default:
                 break;
         

YueJin_test_bench/source/Appliciation/Task.c

@@ -335,9 +335,9 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
     //     Recv_Byte1();
     // }
     Display_PageNum();
-    if(MENU_CHECK_STEP == 3)
+    if(MENU_CHECK_STEP == 0)
     {
-        if(ACCONOFF_delay_3s < 30)
+        if(ACCONOFF_delay_3s < 200)
         {
             ACCONOFF_delay_3s++;
         }

YueJin_test_bench/source/Driver/Analog_Signals/Analog_Signals.c

@@ -4,7 +4,7 @@
   * \attention
   *
   * This file is automatically generated by analog signals configuration tool.
-  * Date         : 2025/2/18 19:34:44
+  * Date         : 2022/8/3 23:21:24
   * Cfg Tool Ver : 1.1.0
   * Engineer     :
   * (c) Heilongjiang TYW electronics co., LTD
@@ -74,31 +74,21 @@ ADC_Data_st_t     stADCData[ADC_SIGNAL_CH_NUMBER];
 
 const uint8_t u8ADCChList[ADC_CONV_CH_NUMBER] =
 {
-    13U, 12U, 15U, 11U, 14U, 10U,  9U,  7U, 
+     9U, 15U, 14U ,
 };
 
 const ADC_Ch_Cfg_st_t stADCChCfg[ADC_SIGNAL_CH_NUMBER] =
 {
-    {  0U,   0U,   0U,     0U,     0U,     1U,  ADC_Voltage_Calc_Circuit102,},
-    {  1U,   0U,   0U,     0U,     0U,     1U,  ADC_Voltage_Calc_Circuit102,},
+    {  0U,   0U,   0U,     0U,     0U,     1U,  ADC_Voltage_Calc_Circuit101,},
+    {  1U,   0U,   0U,     0U,     0U,     1U,  ADC_Voltage_Calc_Circuit101,},
     {  2U,   0U,   0U,     0U,     0U,     1U,  ADC_Voltage_Calc_Circuit102,},
-    {  3U,   0U,   0U,     0U,     0U,     1U,  ADC_Voltage_Calc_Circuit102,},
-    {  4U,   0U,   0U,     0U,     0U,     1U,  ADC_Voltage_Calc_Circuit102,},
-    {  5U,   0U,   0U,     0U,     0U,     1U,  ADC_Voltage_Calc_Circuit102,},
-    {  6U,   0U,   0U,     0U,     0U,     1U,  ADC_Voltage_Calc_Circuit102,},
-    {  7U,   0U,   0U,     0U,     0U,     1U,  ADC_Voltage_Calc_Circuit102,},
 };
 
 const ADC_Res_List_st_t stADCResList[ADC_SIGNAL_CH_NUMBER] =
 {
-    {    3300000U,   1000000U,         0U,         0U,},
-    {    3300000U,   1000000U,         0U,         0U,},
-    {    3300000U,   1000000U,         0U,         0U,},
-    {    3300000U,   1000000U,         0U,         0U,},
-    {    3300000U,   1000000U,         0U,         0U,},
-    {    3300000U,   1000000U,         0U,         0U,},
-    {    3300000U,   1000000U,         0U,         0U,},
-    {    3300000U,    100000U,         0U,         0U,},
+    {          0U,    100000U,         0U,         0U,},
+    {          0U,    100000U,         0U,         0U,},
+    {     330000U,     47000U,         0U,         0U,},
 };
 
 /* Private function prototypes ----------------------------------------------*/
@@ -400,3 +390,19 @@ uint16_t ADC_Conv_Single_Channel(uint8_t u8ADCCh)
 
     return u16Result;
 }
+
+uint16_t ADC_Read_Signal_Voltage(uint8_t u8ADCCh)//AD采集不建议用这个函数获取最终的结果！
+{
+    uint16_t u16Value;
+
+    if (u8ADCCh < ADC_SIGNAL_CH_NUMBER)
+    {
+        u16Value = u16ADCSample[u8ADCCh];
+    }
+    else
+    {
+        u16Value = 0U;
+    }
+
+    return u16Value;
+}

YueJin_test_bench/source/Driver/Analog_Signals/Analog_Signals.h

@@ -4,7 +4,7 @@
   * \attention
   *
   * This file is automatically generated by analog signals configuration tool.
-  * Date         : 2025/2/18 19:34:44
+  * Date         : 2022/8/3 23:21:24
   * Cfg Tool Ver : 1.1.0
   * Engineer     :
   * (c) Heilongjiang TYW electronics co., LTD
@@ -27,19 +27,14 @@ extern  {
 /* Exported types ------------------------------------------------------------*/
 enum ADCChName
 {
-    ADC_CH_ZXSW = 0,
-    ADC_CH_GKDD,
-    ADC_CH_ZTS_A,
-    ADC_CH_DIS,
-    ADC_CH_ZTS_B,
-    ADC_CH_LOGOTY,
-    ADC_CH_WYTY,
-    ADC_CH_ACC,
+    ADC_CH_KL15_VOLTAGE = 0,
+    ADC_CH_KL30_VOLTAGE,
+    ADC_CH_10_VOLTAGE,
 };
 
 /* Exported macro ------------------------------------------------------------*/
-#define   ADC_TOTAL_CH_NUMBER               (8U)
-#define   ADC_SIGNAL_CH_NUMBER              (8U)
+#define   ADC_TOTAL_CH_NUMBER               (3U)
+#define   ADC_SIGNAL_CH_NUMBER              (3U)
 #define   ADC_REF_VOLTAGE                   u16ADCRefVoltage
 
 /* Exported variables --------------------------------------------------------*/
@@ -54,6 +49,7 @@ extern void Analog_Signal_Conv_Service(void);
 extern uint16_t ADC_Read_Signal(uint8_t u8ADCCh);
 extern uint8_t  ADC_Read_Signal_Valid(uint8_t u8ADCCh);
 extern uint16_t ADC_Conv_Single_Channel(uint8_t u8ADCCh);
+extern uint16_t ADC_Read_Signal_Voltage(uint8_t u8ADCCh);
 
 /*! @} */
 #ifdef __cplusplus

YueJin_test_bench/utility/诊断工具1.10.11 x64/Option/Option.properties

 #new Option
-#Mon Feb 10 10:43:38 CST 2025
+#Wed Feb 19 11:41:46 CST 2025
 IsSort=true
 MergeFlashIsCompression=false
 ChangeAppFilePath=
@@ -9,7 +9,7 @@ DBFFilePath=
 MergeCrcTtpe=1
 MergeBootFilePath=
 IsMergeChangeAddress=false
-MergeFlashOutPutFilePath=
+MergeFlashOutPutFilePath=D\:\\Code\\\u7231\u739B\u68C0\u6D4B\u53F0\\\u56FE\u7247
 GPIOOutPutPath=
 MergeCanDBCPath=
 IsFilling=true
@@ -39,7 +39,7 @@ JieFaRH850GPIOJSONpath=
 MergeFlashIsMandatory=false
 UpdateProcess=\u5409\u5229
 Driver=Kvaser
-MergeFlashImageFormat=
+MergeFlashImageFormat=ARGB8888
 RH850_F1KMGPIOJSONpath=
 DriverFilePath=
 IsMergeCreateHex=false
@@ -49,11 +49,11 @@ MergeImageFilePath=
 IsMergeCreateUpdateBin=false
 MergeImageSize=128M
 CRCFilePath=
-MergeFlashCompressionFormat=
+MergeFlashCompressionFormat=RLE24
 IsPlayMusic=false
 IsHexDisplay=true
 MergeLineInXLSPath=
-MergeFlashInPutFilePath=
+MergeFlashInPutFilePath=D\:\\Code\\\u7231\u739B\u68C0\u6D4B\u53F0\\\u56FE\u7247\\\u5F39\u51FA\u62A5\u8B66
 MergeFlashIsInternal=false
 MergeOutPutFilePath=
 MergeAppFilePath=