🎉 init:system_monitor库换成源码

Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RMR42E.uvprojx

@@ -648,26 +648,6 @@
               <FileType>4</FileType>
               <FilePath>..\..\..\..\Source\Component\Line_In\Line_In.lib</FilePath>
             </File>
-            <File>
-              <FileName>System_Monitor.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor.h</FilePath>
-            </File>
-            <File>
-              <FileName>System_Monitor_User.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor_User.c</FilePath>
-            </File>
-            <File>
-              <FileName>System_Monitor_User.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor_User.h</FilePath>
-            </File>
-            <File>
-              <FileName>eepromManage_20240305.lib</FileName>
-              <FileType>4</FileType>
-              <FilePath>..\..\..\..\Source\Component\Eeprom\eepromManage_20240305.lib</FilePath>
-            </File>
             <File>
               <FileName>CAN_Signal.lib</FileName>
               <FileType>4</FileType>
@@ -683,11 +663,6 @@
               <FileType>4</FileType>
               <FilePath>..\..\..\..\Source\Component\Mileage\libMileage_BAT32_V1.07.lib</FilePath>
             </File>
-            <File>
-              <FileName>System_Monitor.lib</FileName>
-              <FileType>4</FileType>
-              <FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor.lib</FilePath>
-            </File>
             <File>
               <FileName>PowerManagement.lib</FileName>
               <FileType>4</FileType>
@@ -698,6 +673,21 @@
               <FileType>4</FileType>
               <FilePath>..\..\..\..\Source\Component\LED_Driver\LED_Driver_V1.3.lib</FilePath>
             </File>
+            <File>
+              <FileName>System_Monitor.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor.c</FilePath>
+            </File>
+            <File>
+              <FileName>System_Monitor_User.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor_User.c</FilePath>
+            </File>
+            <File>
+              <FileName>eepromManage_20240305.lib</FileName>
+              <FileType>4</FileType>
+              <FilePath>..\..\..\..\Source\Component\Eeprom\eepromManage_20240305.lib</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>

Firmware/Source/Component/Components.h

@@ -16,12 +16,9 @@
 #include "Eeprom\eeManager_Interface.h"
 #include "Eeprom\eepromManage.h"
 #include "BU98R10\BU98R10.h"
-//#include "Key\Key_user.h"
 #include "LED_Driver\Simulated_IIC_2_Master.h"
 #include "LED_Driver\LED_Driver_Interface.h"
 #include "LED_Driver\LED_Driver.h"
-// #include "Light_Sensor\Light_Sensor.h"
-// #include "Light_Sensor\Light_Sensor_Interface.h"
 #include "Analog\Analog_Signals.h"
 #include "Analog\Analog_Circuits.h"
 #include "common.h"

Firmware/Source/Component/System_Monitor/System_Monitor_User.c

@@ -2,23 +2,25 @@
 #include "Components.h"
 #include "Application.h"
 #include "delay.h"
+#include "wdt.h"
 
 #define u16Base_Vol           0u      
 #define u16ENTER_LOW_N_RANGE  7000U    
-#define u16EXIT_LOW_N_RANGE 8000U
+#define u16EXIT_LOW_N_RANGE   7500U    
 #define u16ENTER_LOW_Y_RANGE  9000U    
 #define u16EXIT_LOW_Y_RANGE   10000U   
 
-#define u16EXIT_HIGH_Y_RANGE 15000U
-#define u16ENTER_HIGH_Y_RANGE 16000U
-#define u16EXIT_HIGH_N_RANGE 18000U
-#define u16ENTER_HIGH_N_RANGE 19000U
+#define u16EXIT_HIGH_Y_RANGE  0xffffu  
+#define u16ENTER_HIGH_Y_RANGE 0xffffu  
+#define u16EXIT_HIGH_N_RANGE  0xffffu  
+#define u16ENTER_HIGH_N_RANGE 0xffffu  
 #define u16Top_Vol            0xffffu 
 
+
 void Delay_ms(uint32_t u32Ms);
 
 // #pragma alignvar(8)
-static const monitorlib_uint16_t SysFun_Range[24u] = {
+static const monitorlib_uint16_t  SysFun_Range [ 26u ] = {
     u16Base_Vol,
 
     u16ENTER_LOW_N_RANGE,
@@ -34,8 +36,8 @@ static const monitorlib_uint16_t SysFun_Range[24u] = {
     u16ENTER_HIGH_N_RANGE,
 
     u16Top_Vol,
-    500, /* 进入异常电压时间 1S */
-    50u, /* KL15消抖时间  100ms*/
+    2500,
+    50u,
     u16Base_Vol,
 
     u16ENTER_LOW_N_RANGE,
@@ -53,33 +55,36 @@ static const monitorlib_uint16_t SysFun_Range[24u] = {
     u16Top_Vol,
     2u,
     2u,
+
+    2u,
+    0u,
 };
 
 monitorlib_uint16_t Sys_Read_KL30_Voltage_F(void)
 {
     monitorlib_uint16_t u16Voltage;
-    u16Voltage = ADC_Conv_Single_Channel(ADC_CH_KL30_VOLTAGE);
+    u16Voltage = (monitorlib_uint16_t)ADC_Conv_Single_Channel(ADC_CH_KL30_VOLTAGE);
     return u16Voltage;
 }
 
 monitorlib_uint16_t Sys_Read_KL15_Voltage_F(void)
 {
     monitorlib_uint16_t u16Voltage;
-    u16Voltage = ADC_Conv_Single_Channel(ADC_CH_KL15_VOLTAGE);
+    u16Voltage = (monitorlib_uint16_t)ADC_Conv_Single_Channel(ADC_CH_KL15_VOLTAGE);
     return u16Voltage;
 }
 
 monitorlib_uint16_t Sys_Read_KL30_Voltage(void)
 {
     monitorlib_uint16_t u16Voltage;
-    u16Voltage = ADC_Read_Signal(ADC_CH_KL30_VOLTAGE);
+    u16Voltage = (monitorlib_uint16_t)ADC_Read_Signal(ADC_CH_KL30_VOLTAGE);
     return u16Voltage;
 }
 
 monitorlib_uint16_t Sys_Read_KL15_Voltage(void)
 {
     monitorlib_uint16_t u16Voltage;
-    u16Voltage = ADC_Read_Signal(ADC_CH_KL15_VOLTAGE);
+    u16Voltage = (monitorlib_uint16_t)ADC_Read_Signal(ADC_CH_KL15_VOLTAGE);
     return u16Voltage;
 }
 
@@ -99,17 +104,20 @@ monitorlib_uint8_t Sys_Read_KL15_Valid(void)
 
 monitorlib_uint8_t System_LINE_KL15(void)
 {
-    monitorlib_uint8_t u8KL15 = 0;
+    static monitorlib_uint8_t  u8KL15 = 0;
 
-    if (RTE_GPIO_Get_Level(KL15_AD_IN) == 1u)
+    if (Sys_Read_KL15_Voltage() >= 5500u )
     {
         u8KL15 = 1u;
     }
+    else if((Sys_Read_KL15_Voltage() >= 5000u)&&(Sys_Read_KL15_Voltage() < 5500u))
+    {
+        ;
+    }
     else 
     {
         u8KL15 = 0;
     }
-
     return u8KL15;
 }
 
@@ -134,8 +142,8 @@ void Sys_KL30_Init(void)
     m_st.SysGet_KL15_value_Force = Sys_Read_KL15_Voltage_F;
     m_st.SysGet_KL30_value_Force = Sys_Read_KL30_Voltage_F;
     m_st.SysMonitorLogic         = Sys_LogicProcess;
-    System_Monitor_KL30Init();
     Sys_Set_Pata(SysFun_Range, &m_st);
+    System_Monitor_KL30Init( );
 }
 
 void Sys_WakeUp_Init(void)
@@ -150,8 +158,8 @@ void Sys_WakeUp_Init(void)
     m_st.SysGet_KL15_value_Force = Sys_Read_KL15_Voltage_F;
     m_st.SysGet_KL30_value_Force = Sys_Read_KL30_Voltage_F;
     m_st.SysMonitorLogic         = Sys_LogicProcess;
-    System_Monitor_WakeupInit();
     Sys_Set_Pata(SysFun_Range, &m_st);
+    System_Monitor_WakeupInit( );
 }
 
 void Delay_ms(uint32_t u32Ms)