Commit 1df233b0 authored by 王金亮's avatar 王金亮

Merge branch 'wjl_dev' into 'dev'

Wjl dev

See merge request !49
parents 6d7686ae 975c400b
...@@ -728,16 +728,6 @@ ...@@ -728,16 +728,6 @@
<FileType>5</FileType> <FileType>5</FileType>
<FilePath>..\..\..\..\Source\Application\FaultCode.h</FilePath> <FilePath>..\..\..\..\Source\Application\FaultCode.h</FilePath>
</File> </File>
<File>
<FileName>BlueTooth.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\Application\BlueTooth.c</FilePath>
</File>
<File>
<FileName>BlueTooth.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Application\BlueTooth.h</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
......
...@@ -169,7 +169,7 @@ void Data_Light_Res_service(Light_uint8_t deltaTime)//获取光感阻值,并 ...@@ -169,7 +169,7 @@ void Data_Light_Res_service(Light_uint8_t deltaTime)//获取光感阻值,并
} }
else else
{ {
TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 0); BackLight_Process();
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment