Browse Source

修改fanGetPowerState中的if (fanIndex > 5)

master
sunzhaowei 2 years ago
parent
commit
b68113f1b9
  1. 1860
      app/MDK-ARM/app.uvguix.sunzh
  2. 13
      app/MDK-ARM/app.uvprojx
  3. 6
      app/MDK-ARM/startup_stm32f407xx.lst
  4. 2
      src/board/hardware.cpp

1860
app/MDK-ARM/app.uvguix.sunzh
File diff suppressed because it is too large
View File

13
app/MDK-ARM/app.uvprojx

@ -10,13 +10,13 @@
<TargetName>app</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
<pCCUsed>6190000::V6.19::ARMCLANG</pCCUsed>
<uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
<Device>STM32F407VETx</Device>
<Vendor>STMicroelectronics</Vendor>
<PackID>Keil.STM32F4xx_DFP.2.16.0</PackID>
<PackID>Keil.STM32F4xx_DFP.2.15.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000-0x2001BFFF) IRAM2(0x2001C000-0x2001FFFF) IROM(0x8000000-0x807FFFF) CLOCK(25000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
<FlashUtilSpec></FlashUtilSpec>
@ -186,6 +186,7 @@
<RvdsVP>2</RvdsVP>
<RvdsMve>0</RvdsMve>
<RvdsCdeCp>0</RvdsCdeCp>
<nBranchProt>0</nBranchProt>
<hadIRAM2>1</hadIRAM2>
<hadIROM2>0</hadIROM2>
<StupSel>8</StupSel>
@ -328,8 +329,8 @@
<uC99>1</uC99>
<uGnu>0</uGnu>
<useXO>0</useXO>
<v6Lang>5</v6Lang>
<v6LangP>3</v6LangP>
<v6Lang>3</v6Lang>
<v6LangP>5</v6LangP>
<vShortEn>1</vShortEn>
<vShortWch>1</vShortWch>
<v6Lto>0</v6Lto>
@ -1307,8 +1308,8 @@
<RTE>
<apis/>
<components>
<component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
<package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
<component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0" condition="ARMv6_7_8-M Device">
<package name="CMSIS" schemaVersion="1.7.7" url="http://www.keil.com/pack/" vendor="ARM" version="5.9.0"/>
<targetInfos>
<targetInfo name="app"/>
</targetInfos>

6
app/MDK-ARM/startup_stm32f407xx.lst

@ -831,10 +831,10 @@ ARM Macro Assembler Page 13
00000000
Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M4.fp.sp --apcs=
interwork --depend=app\startup_stm32f407xx.d -oapp\startup_stm32f407xx.o -I.\RT
E\_app -IC:\Users\h_zha\AppData\Local\Arm\Packs\ARM\CMSIS\5.8.0\CMSIS\Core\Incl
ude -IC:\Users\h_zha\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.16.0\Drivers\
E\_app -IC:\Users\sunzh\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Incl
ude -IC:\Users\sunzh\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\
CMSIS\Device\ST\STM32F4xx\Include --predefine="__MICROLIB SETA 1" --predefine="
__UVISION_VERSION SETA 535" --predefine="_RTE_ SETA 1" --predefine="STM32F407xx
__UVISION_VERSION SETA 538" --predefine="_RTE_ SETA 1" --predefine="STM32F407xx
SETA 1" --predefine="_RTE_ SETA 1" --list=startup_stm32f407xx.lst startup_stm3
2f407xx.s

2
src/board/hardware.cpp

@ -173,7 +173,7 @@ void Hardware::fanSetDutyCycle(int fanIndex, uint16_t dutyCycle) {
}
}
bool *Hardware::fanGetPowerState(int fanIndex) {
if (fanIndex >= 5) {
if (fanIndex > 5) {
while (1) {
ZLOGE(TAG, "fanIndex is out of range!");
}

Loading…
Cancel
Save