dengcy
/
ZDBMS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

还是要硬件短路

This commit is contained in:
95384 2025-02-24 09:31:14 +08:00
parent a9353bcf97
commit ccd4ae09fc
3 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
MCUCore.uvopt
View File

@ -1532,10 +1532,10 @@
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>10</ColumnNumber> <ColumnNumber>5</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>23</TopLine> <TopLine>23</TopLine>
<CurrentLine>51</CurrentLine> <CurrentLine>34</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>.\code_app\Main.c</PathWithFileName> <PathWithFileName>.\code_app\Main.c</PathWithFileName>
<FilenameWithoutPath>Main.c</FilenameWithoutPath> <FilenameWithoutPath>Main.c</FilenameWithoutPath>
@ -1546,10 +1546,10 @@
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>38</ColumnNumber> <ColumnNumber>8</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>538</TopLine> <TopLine>538</TopLine>
<CurrentLine>569</CurrentLine> <CurrentLine>568</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>.\code_app\Initial.c</PathWithFileName> <PathWithFileName>.\code_app\Initial.c</PathWithFileName>
<FilenameWithoutPath>Initial.c</FilenameWithoutPath> <FilenameWithoutPath>Initial.c</FilenameWithoutPath>
@ -1665,10 +1665,10 @@
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>76</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>165</TopLine> <TopLine>165</TopLine>
<CurrentLine>165</CurrentLine> <CurrentLine>196</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>.\code_drv\AFE.c</PathWithFileName> <PathWithFileName>.\code_drv\AFE.c</PathWithFileName>
<FilenameWithoutPath>AFE.c</FilenameWithoutPath> <FilenameWithoutPath>AFE.c</FilenameWithoutPath>
@ -2010,8 +2010,8 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>28</ColumnNumber> <ColumnNumber>28</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>13</TopLine> <TopLine>1</TopLine>
<CurrentLine>41</CurrentLine> <CurrentLine>39</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>.\code_dataflash\DataFlash.c</PathWithFileName> <PathWithFileName>.\code_dataflash\DataFlash.c</PathWithFileName>
<FilenameWithoutPath>DataFlash.c</FilenameWithoutPath> <FilenameWithoutPath>DataFlash.c</FilenameWithoutPath>
@ -3838,8 +3838,8 @@
<Doc> <Doc>
<Name>.\code_dataflash\DataFlash.c</Name> <Name>.\code_dataflash\DataFlash.c</Name>
<ColumnNumber>28</ColumnNumber> <ColumnNumber>28</ColumnNumber>
<TopLine>13</TopLine> <TopLine>1</TopLine>
<CurrentLine>41</CurrentLine> <CurrentLine>39</CurrentLine>
</Doc> </Doc>
<Doc> <Doc>
<Name>.\code_drv\Protect.c</Name> <Name>.\code_drv\Protect.c</Name>
@ -3879,9 +3879,9 @@
</Doc> </Doc>
<Doc> <Doc>
<Name>.\code_drv\AFE.c</Name> <Name>.\code_drv\AFE.c</Name>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>76</ColumnNumber>
<TopLine>165</TopLine> <TopLine>165</TopLine>
<CurrentLine>165</CurrentLine> <CurrentLine>196</CurrentLine>
</Doc> </Doc>
<Doc> <Doc>
<Name>.\code_drv\TWI.c</Name> <Name>.\code_drv\TWI.c</Name>
@ -3891,9 +3891,9 @@
</Doc> </Doc>
<Doc> <Doc>
<Name>.\code_app\Initial.c</Name> <Name>.\code_app\Initial.c</Name>
<ColumnNumber>38</ColumnNumber> <ColumnNumber>8</ColumnNumber>
<TopLine>538</TopLine> <TopLine>538</TopLine>
<CurrentLine>569</CurrentLine> <CurrentLine>568</CurrentLine>
</Doc> </Doc>
<Doc> <Doc>
<Name>.\code_gasguage\GasGaugeInter_V4_13.c</Name> <Name>.\code_gasguage\GasGaugeInter_V4_13.c</Name>
@ -3903,9 +3903,9 @@
</Doc> </Doc>
<Doc> <Doc>
<Name>.\code_app\Main.c</Name> <Name>.\code_app\Main.c</Name>
<ColumnNumber>10</ColumnNumber> <ColumnNumber>5</ColumnNumber>
<TopLine>23</TopLine> <TopLine>23</TopLine>
<CurrentLine>51</CurrentLine> <CurrentLine>34</CurrentLine>
</Doc> </Doc>
<Doc> <Doc>
<Name>.\code_app\Memory.c</Name> <Name>.\code_app\Memory.c</Name>

42
MCUCore_uvopt.bak
View File

@ -1532,10 +1532,10 @@
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>10</ColumnNumber> <ColumnNumber>5</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>23</TopLine> <TopLine>23</TopLine>
<CurrentLine>51</CurrentLine> <CurrentLine>34</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>.\code_app\Main.c</PathWithFileName> <PathWithFileName>.\code_app\Main.c</PathWithFileName>
<FilenameWithoutPath>Main.c</FilenameWithoutPath> <FilenameWithoutPath>Main.c</FilenameWithoutPath>
@ -1546,10 +1546,10 @@
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>38</ColumnNumber> <ColumnNumber>8</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>538</TopLine> <TopLine>538</TopLine>
<CurrentLine>569</CurrentLine> <CurrentLine>568</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>.\code_app\Initial.c</PathWithFileName> <PathWithFileName>.\code_app\Initial.c</PathWithFileName>
<FilenameWithoutPath>Initial.c</FilenameWithoutPath> <FilenameWithoutPath>Initial.c</FilenameWithoutPath>
@ -1665,10 +1665,10 @@
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>76</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>165</TopLine> <TopLine>165</TopLine>
<CurrentLine>165</CurrentLine> <CurrentLine>196</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>.\code_drv\AFE.c</PathWithFileName> <PathWithFileName>.\code_drv\AFE.c</PathWithFileName>
<FilenameWithoutPath>AFE.c</FilenameWithoutPath> <FilenameWithoutPath>AFE.c</FilenameWithoutPath>
@ -2008,10 +2008,10 @@
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>37</ColumnNumber> <ColumnNumber>61</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>181</TopLine> <TopLine>337</TopLine>
<CurrentLine>214</CurrentLine> <CurrentLine>337</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>.\code_dataflash\DataFlash.c</PathWithFileName> <PathWithFileName>.\code_dataflash\DataFlash.c</PathWithFileName>
<FilenameWithoutPath>DataFlash.c</FilenameWithoutPath> <FilenameWithoutPath>DataFlash.c</FilenameWithoutPath>
@ -3835,6 +3835,12 @@
<Size>100</Size> <Size>100</Size>
<ActiveTab>0</ActiveTab> <ActiveTab>0</ActiveTab>
<Documents> <Documents>
<Doc>
<Name>.\code_dataflash\DataFlash.c</Name>
<ColumnNumber>61</ColumnNumber>
<TopLine>337</TopLine>
<CurrentLine>337</CurrentLine>
</Doc>
<Doc> <Doc>
<Name>.\code_drv\Protect.c</Name> <Name>.\code_drv\Protect.c</Name>
<ColumnNumber>61</ColumnNumber> <ColumnNumber>61</ColumnNumber>
@ -3873,9 +3879,9 @@
</Doc> </Doc>
<Doc> <Doc>
<Name>.\code_drv\AFE.c</Name> <Name>.\code_drv\AFE.c</Name>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>76</ColumnNumber>
<TopLine>165</TopLine> <TopLine>165</TopLine>
<CurrentLine>165</CurrentLine> <CurrentLine>196</CurrentLine>
</Doc> </Doc>
<Doc> <Doc>
<Name>.\code_drv\TWI.c</Name> <Name>.\code_drv\TWI.c</Name>
@ -3885,9 +3891,9 @@
</Doc> </Doc>
<Doc> <Doc>
<Name>.\code_app\Initial.c</Name> <Name>.\code_app\Initial.c</Name>
<ColumnNumber>38</ColumnNumber> <ColumnNumber>8</ColumnNumber>
<TopLine>538</TopLine> <TopLine>538</TopLine>
<CurrentLine>569</CurrentLine> <CurrentLine>568</CurrentLine>
</Doc> </Doc>
<Doc> <Doc>
<Name>.\code_gasguage\GasGaugeInter_V4_13.c</Name> <Name>.\code_gasguage\GasGaugeInter_V4_13.c</Name>
@ -3897,9 +3903,9 @@
</Doc> </Doc>
<Doc> <Doc>
<Name>.\code_app\Main.c</Name> <Name>.\code_app\Main.c</Name>
<ColumnNumber>10</ColumnNumber> <ColumnNumber>5</ColumnNumber>
<TopLine>23</TopLine> <TopLine>23</TopLine>
<CurrentLine>51</CurrentLine> <CurrentLine>34</CurrentLine>
</Doc> </Doc>
<Doc> <Doc>
<Name>.\code_app\Memory.c</Name> <Name>.\code_app\Memory.c</Name>
@ -3919,12 +3925,6 @@
<TopLine>14</TopLine> <TopLine>14</TopLine>
<CurrentLine>14</CurrentLine> <CurrentLine>14</CurrentLine>
</Doc> </Doc>
<Doc>
<Name>.\code_dataflash\DataFlash.c</Name>
<ColumnNumber>37</ColumnNumber>
<TopLine>181</TopLine>
<CurrentLine>214</CurrentLine>
</Doc>
<Doc> <Doc>
<Name>.\code_drv\McuFlash.c</Name> <Name>.\code_drv\McuFlash.c</Name>
<ColumnNumber>64</ColumnNumber> <ColumnNumber>64</ColumnNumber>

2
code_dataflash/DataFlash.c
View File

@ -38,7 +38,7 @@ V0.0 2014/09/10 Preliminary
// <q> 硬件过压保护 // <q> 硬件过压保护
#define _EPCM_OV_EN 0 //BIT1; 0:不使能硬件过压功能； 1：使能硬件过压功能 #define _EPCM_OV_EN 0 //BIT1; 0:不使能硬件过压功能； 1：使能硬件过压功能
// <q> 硬件短路保护 // <q> 硬件短路保护
#define _EPCM_SC 0 //BIT0; 0:不使能硬件短路保护功能； 1：使能硬件短路保护功能 #define _EPCM_SC 1 //BIT0; 0:不使能硬件短路保护功能； 1：使能硬件短路保护功能
#define _E2_PACKCONFIGMAP (_EPCM_EEPROM_EN<<15)|(_EPCM_OCPM<<14)|(_EPCM_CTO_EN<<13)|(_EPCM_PF_EN<<12)\ #define _E2_PACKCONFIGMAP (_EPCM_EEPROM_EN<<15)|(_EPCM_OCPM<<14)|(_EPCM_CTO_EN<<13)|(_EPCM_PF_EN<<12)\
|(_EPCM_BAL_EN<<11)|(_EPCM_OCRC_EN<<10)|(_EPCM_OV_EN<<9)\ |(_EPCM_BAL_EN<<11)|(_EPCM_OCRC_EN<<10)|(_EPCM_OV_EN<<9)\