增加直流交流继电器粘连检测功能

2024-01-25 02:34:43 +08:00 · 2024-01-25 02:34:43 +08:00 · 30562fad90
commit 30562fad90
parent c3c14cd11f
26 changed files with 7102 additions and 6766 deletions
--- a/APPLICATION/CDZ/CDZ_DATA.c
+++ b/APPLICATION/CDZ/CDZ_DATA.c
--- a/APPLICATION/CDZ/CDZ_DATA.h
+++ b/APPLICATION/CDZ/CDZ_DATA.h
--- a/APPLICATION/Errcode/Err_code.c
+++ b/APPLICATION/Errcode/Err_code.c
--- a/APPLICATION/GUNDiscriminate/GUNDiscriminate.c
+++ b/APPLICATION/GUNDiscriminate/GUNDiscriminate.c
--- a/APPLICATION/SecTimer/SecTimer.h
+++ b/APPLICATION/SecTimer/SecTimer.h
--- a/HARDWARE/CAN/can.c
+++ b/HARDWARE/CAN/can.c
--- a/HARDWARE/CAN/can.h
+++ b/HARDWARE/CAN/can.h
--- a/HARDWARE/CDZ/CDZ_State.c
+++ b/HARDWARE/CDZ/CDZ_State.c
--- a/HARDWARE/CELIS/Err_Info_Process.c
+++ b/HARDWARE/CELIS/Err_Info_Process.c
--- a/HARDWARE/CELIS/Err_Info_Process.h
+++ b/HARDWARE/CELIS/Err_Info_Process.h
--- a/HARDWARE/CELIS/Filtering.c
+++ b/HARDWARE/CELIS/Filtering.c
--- a/HARDWARE/CELIS/REV_CarMessage.c
+++ b/HARDWARE/CELIS/REV_CarMessage.c
--- a/HARDWARE/CELIS/SEN_DCUMessage.c
+++ b/HARDWARE/CELIS/SEN_DCUMessage.c
--- a/HARDWARE/DEV_HAL/kC_Adhesion_Detection.c
+++ b/HARDWARE/DEV_HAL/kC_Adhesion_Detection.c
--- a/HARDWARE/DEV_HAL/kC_Adhesion_Detection.h
+++ b/HARDWARE/DEV_HAL/kC_Adhesion_Detection.h
--- a/HARDWARE/DEV_HAL/kC_Features.c
+++ b/HARDWARE/DEV_HAL/kC_Features.c
--- a/HARDWARE/DEV_HAL/kC_Features.h
+++ b/HARDWARE/DEV_HAL/kC_Features.h
--- a/HARDWARE/EVENT/Single_event_receiver.c
+++ b/HARDWARE/EVENT/Single_event_receiver.c
--- a/HARDWARE/EVENT/Single_event_receiver.h
+++ b/HARDWARE/EVENT/Single_event_receiver.h
--- a/OBJ/App.bin
+++ b/OBJ/App.bin
--- a/OBJ/DCBms.hex
+++ b/OBJ/DCBms.hex
--- a/OBJ/LED.hex
+++ b/OBJ/LED.hex
--- a/USER/LED.uvguix.19844
+++ b/USER/LED.uvguix.19844
--- a/USER/LED.uvoptx
+++ b/USER/LED.uvoptx
@ -117,6 +117,11 @@
        <pMon>Segger\JL2CM3.dll</pMon>
      </DebugOpt>
      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>d</Name>
+        </SetRegEntry>
        <SetRegEntry>
          <Number>0</Number>
          <Key>UL2CM3</Key>
@ -183,7 +188,7 @@
        <Ww>
          <count>6</count>
          <WinNumber>1</WinNumber>
-          <ItemText>CDZ_ChargeInfo</ItemText>
+          <ItemText>CDZ_ChargeInfo,0x0A</ItemText>
        </Ww>
        <Ww>
          <count>7</count>
@ -280,6 +285,36 @@
          <WinNumber>1</WinNumber>
          <ItemText>This_GUNState</ItemText>
        </Ww>
+        <Ww>
+          <count>26</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>SecTimer[ACCharg_SecTimerNUM]</ItemText>
+        </Ww>
+        <Ww>
+          <count>27</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>SecTimer,0x0A</ItemText>
+        </Ww>
+        <Ww>
+          <count>28</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>front</ItemText>
+        </Ww>
+        <Ww>
+          <count>29</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>rear</ItemText>
+        </Ww>
+        <Ww>
+          <count>30</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>event_queue[5]</ItemText>
+        </Ww>
+        <Ww>
+          <count>31</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>event_queue</ItemText>
+        </Ww>
      </WatchWindow1>
      <WatchWindow2>
        <Ww>
@ -1242,17 +1277,29 @@
      <RteFlg>0</RteFlg>
      <bShared>0</bShared>
    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>53</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\HARDWARE\DEV_HAL\kC_Adhesion_Detection.c</PathWithFileName>
+      <FilenameWithoutPath>kC_Adhesion_Detection.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
  </Group>

  <Group>
    <GroupName>EVENT</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
    <tvExpOptDlg>0</tvExpOptDlg>
    <cbSel>0</cbSel>
    <RteFlg>0</RteFlg>
    <File>
      <GroupNumber>10</GroupNumber>
-      <FileNumber>53</FileNumber>
+      <FileNumber>54</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@ -1272,7 +1319,7 @@
    <RteFlg>0</RteFlg>
    <File>
      <GroupNumber>11</GroupNumber>
-      <FileNumber>54</FileNumber>
+      <FileNumber>55</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@ -1284,7 +1331,7 @@
    </File>
    <File>
      <GroupNumber>11</GroupNumber>
-      <FileNumber>55</FileNumber>
+      <FileNumber>56</FileNumber>
      <FileType>5</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@ -1304,7 +1351,7 @@
    <RteFlg>0</RteFlg>
    <File>
      <GroupNumber>12</GroupNumber>
-      <FileNumber>56</FileNumber>
+      <FileNumber>57</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@ -1324,7 +1371,7 @@
    <RteFlg>0</RteFlg>
    <File>
      <GroupNumber>13</GroupNumber>
-      <FileNumber>57</FileNumber>
+      <FileNumber>58</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
--- a/USER/LED.uvprojx
+++ b/USER/LED.uvprojx
--- a/USER/main.c
+++ b/USER/main.c