Skip to content

Commit b94898c

Browse files
committed
0
1 parent da4c5ac commit b94898c

File tree

754 files changed

+194630
-5502
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

754 files changed

+194630
-5502
lines changed

0-0 Heart/HeartBeat.mp4

9.22 MB
Binary file not shown.

0-1 Lighting_Rate/LightingRate.mp4

2.72 MB
Binary file not shown.

0-1 Lighting_Counter/Project.uvguix.16477 renamed to 0-1 Lighting_Rate/Project.uvguix.16477

+33-6
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@
8383
<flags>2</flags>
8484
<showCmd>3</showCmd>
8585
<MinPosition>
86-
<xPos>-1</xPos>
87-
<yPos>-1</yPos>
86+
<xPos>-32000</xPos>
87+
<yPos>-32000</yPos>
8888
</MinPosition>
8989
<MaxPosition>
9090
<xPos>-1</xPos>
@@ -100,8 +100,8 @@
100100
<MDIClientArea>
101101
<RegID>0</RegID>
102102
<MDITabState>
103-
<Len>237</Len>
104-
<Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000001000000000000000100000029443A5C4D7953746D5C302D31204C69676874696E675F436F756E7465725C557365725C6D61696E2E6300000000066D61696E2E6300000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000004401000066000000000A000005040000</Data>
103+
<Len>444</Len>
104+
<Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000004000000000000000100000029443A5C4D7953746D5C302D31204C69676874696E675F436F756E7465725C557365725C6D61696E2E6300000000066D61696E2E6300000000FFDC7800FFFFFFFF2C443A5C4D7953746D5C302D31204C69676874696E675F436F756E7465725C53797374656D5C54696D65722E63000000000754696D65722E6300000000BECEA100FFFFFFFF2C443A5C4D7953746D5C302D31204C69676874696E675F436F756E7465725C53797374656D5C54696D65722E68000000000754696D65722E6800000000F0A0A100FFFFFFFF2C443A5C4D7953746D5C302D31204C69676874696E675F436F756E7465725C53797374656D5C44656C61792E68000000000744656C61792E6800000000BCA8E100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000004401000066000000000A000005040000</Data>
105105
</MDITabState>
106106
</MDIClientArea>
107107
<ViewEx>
@@ -1788,7 +1788,7 @@
17881788
<Name>Debug</Name>
17891789
<Buttons>
17901790
<Len>2373</Len>
1791-
<Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
1791+
<Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
17921792
</Buttons>
17931793
<OriginalItems>
17941794
<Len>898</Len>
@@ -3517,8 +3517,35 @@
35173517
<Doc>
35183518
<Name>.\User\main.c</Name>
35193519
<ColumnNumber>7</ColumnNumber>
3520+
<TopLine>7</TopLine>
3521+
<CurrentLine>12</CurrentLine>
3522+
<Folding>1</Folding>
3523+
<ContractedFolders></ContractedFolders>
3524+
<PaneID>0</PaneID>
3525+
</Doc>
3526+
<Doc>
3527+
<Name>.\System\Timer.c</Name>
3528+
<ColumnNumber>26</ColumnNumber>
3529+
<TopLine>1</TopLine>
3530+
<CurrentLine>29</CurrentLine>
3531+
<Folding>1</Folding>
3532+
<ContractedFolders></ContractedFolders>
3533+
<PaneID>0</PaneID>
3534+
</Doc>
3535+
<Doc>
3536+
<Name>.\System\Timer.h</Name>
3537+
<ColumnNumber>22</ColumnNumber>
3538+
<TopLine>1</TopLine>
3539+
<CurrentLine>4</CurrentLine>
3540+
<Folding>1</Folding>
3541+
<ContractedFolders></ContractedFolders>
3542+
<PaneID>0</PaneID>
3543+
</Doc>
3544+
<Doc>
3545+
<Name>.\System\Delay.h</Name>
3546+
<ColumnNumber>0</ColumnNumber>
35203547
<TopLine>1</TopLine>
3521-
<CurrentLine>13</CurrentLine>
3548+
<CurrentLine>1</CurrentLine>
35223549
<Folding>1</Folding>
35233550
<ContractedFolders></ContractedFolders>
35243551
<PaneID>0</PaneID>

0-1 Lighting_Counter/Project.uvoptx renamed to 0-1 Lighting_Rate/Project.uvoptx

+32-41
Original file line numberDiff line numberDiff line change
@@ -146,40 +146,7 @@
146146
<Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F101C8$Flash\STM32F10x_128.FLM))</Name>
147147
</SetRegEntry>
148148
</TargetDriverDllRegistry>
149-
<Breakpoint>
150-
<Bp>
151-
<Number>0</Number>
152-
<Type>0</Type>
153-
<LineNumber>23</LineNumber>
154-
<EnabledFlag>1</EnabledFlag>
155-
<Address>134220660</Address>
156-
<ByteObject>0</ByteObject>
157-
<HtxType>0</HtxType>
158-
<ManyObjects>0</ManyObjects>
159-
<SizeOfObject>0</SizeOfObject>
160-
<BreakByAccess>0</BreakByAccess>
161-
<BreakIfRCount>1</BreakIfRCount>
162-
<Filename>.\User\main.c</Filename>
163-
<ExecCommand></ExecCommand>
164-
<Expression>\\Project\User/main.c\23</Expression>
165-
</Bp>
166-
<Bp>
167-
<Number>1</Number>
168-
<Type>0</Type>
169-
<LineNumber>22</LineNumber>
170-
<EnabledFlag>1</EnabledFlag>
171-
<Address>134220646</Address>
172-
<ByteObject>0</ByteObject>
173-
<HtxType>0</HtxType>
174-
<ManyObjects>0</ManyObjects>
175-
<SizeOfObject>0</SizeOfObject>
176-
<BreakByAccess>0</BreakByAccess>
177-
<BreakIfRCount>1</BreakIfRCount>
178-
<Filename>.\User\main.c</Filename>
179-
<ExecCommand></ExecCommand>
180-
<Expression>\\Project\User/main.c\22</Expression>
181-
</Bp>
182-
</Breakpoint>
149+
<Breakpoint/>
183150
<Tracepoint>
184151
<THDelay>0</THDelay>
185152
</Tracepoint>
@@ -933,6 +900,30 @@
933900
<RteFlg>0</RteFlg>
934901
<bShared>0</bShared>
935902
</File>
903+
<File>
904+
<GroupNumber>4</GroupNumber>
905+
<FileNumber>57</FileNumber>
906+
<FileType>1</FileType>
907+
<tvExp>0</tvExp>
908+
<tvExpOptDlg>0</tvExpOptDlg>
909+
<bDave2>0</bDave2>
910+
<PathWithFileName>.\System\Timer.c</PathWithFileName>
911+
<FilenameWithoutPath>Timer.c</FilenameWithoutPath>
912+
<RteFlg>0</RteFlg>
913+
<bShared>0</bShared>
914+
</File>
915+
<File>
916+
<GroupNumber>4</GroupNumber>
917+
<FileNumber>58</FileNumber>
918+
<FileType>5</FileType>
919+
<tvExp>0</tvExp>
920+
<tvExpOptDlg>0</tvExpOptDlg>
921+
<bDave2>0</bDave2>
922+
<PathWithFileName>.\System\Timer.h</PathWithFileName>
923+
<FilenameWithoutPath>Timer.h</FilenameWithoutPath>
924+
<RteFlg>0</RteFlg>
925+
<bShared>0</bShared>
926+
</File>
936927
</Group>
937928

938929
<Group>
@@ -943,7 +934,7 @@
943934
<RteFlg>0</RteFlg>
944935
<File>
945936
<GroupNumber>5</GroupNumber>
946-
<FileNumber>57</FileNumber>
937+
<FileNumber>59</FileNumber>
947938
<FileType>1</FileType>
948939
<tvExp>0</tvExp>
949940
<tvExpOptDlg>0</tvExpOptDlg>
@@ -955,7 +946,7 @@
955946
</File>
956947
<File>
957948
<GroupNumber>5</GroupNumber>
958-
<FileNumber>58</FileNumber>
949+
<FileNumber>60</FileNumber>
959950
<FileType>5</FileType>
960951
<tvExp>0</tvExp>
961952
<tvExpOptDlg>0</tvExpOptDlg>
@@ -967,7 +958,7 @@
967958
</File>
968959
<File>
969960
<GroupNumber>5</GroupNumber>
970-
<FileNumber>59</FileNumber>
961+
<FileNumber>61</FileNumber>
971962
<FileType>1</FileType>
972963
<tvExp>0</tvExp>
973964
<tvExpOptDlg>0</tvExpOptDlg>
@@ -979,7 +970,7 @@
979970
</File>
980971
<File>
981972
<GroupNumber>5</GroupNumber>
982-
<FileNumber>60</FileNumber>
973+
<FileNumber>62</FileNumber>
983974
<FileType>5</FileType>
984975
<tvExp>0</tvExp>
985976
<tvExpOptDlg>0</tvExpOptDlg>
@@ -991,7 +982,7 @@
991982
</File>
992983
<File>
993984
<GroupNumber>5</GroupNumber>
994-
<FileNumber>61</FileNumber>
985+
<FileNumber>63</FileNumber>
995986
<FileType>1</FileType>
996987
<tvExp>0</tvExp>
997988
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1003,7 +994,7 @@
1003994
</File>
1004995
<File>
1005996
<GroupNumber>5</GroupNumber>
1006-
<FileNumber>62</FileNumber>
997+
<FileNumber>64</FileNumber>
1007998
<FileType>5</FileType>
1008999
<tvExp>0</tvExp>
10091000
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1015,7 +1006,7 @@
10151006
</File>
10161007
<File>
10171008
<GroupNumber>5</GroupNumber>
1018-
<FileNumber>63</FileNumber>
1009+
<FileNumber>65</FileNumber>
10191010
<FileType>5</FileType>
10201011
<tvExp>0</tvExp>
10211012
<tvExpOptDlg>0</tvExpOptDlg>

0-1 Lighting_Counter/Project.uvprojx renamed to 0-1 Lighting_Rate/Project.uvprojx

+10
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,16 @@
675675
<FileType>5</FileType>
676676
<FilePath>.\System\Delay.h</FilePath>
677677
</File>
678+
<File>
679+
<FileName>Timer.c</FileName>
680+
<FileType>1</FileType>
681+
<FilePath>.\System\Timer.c</FilePath>
682+
</File>
683+
<File>
684+
<FileName>Timer.h</FileName>
685+
<FileType>5</FileType>
686+
<FilePath>.\System\Timer.h</FilePath>
687+
</File>
678688
</Files>
679689
</Group>
680690
<Group>

0-1 Lighting_Rate/System/Timer.c

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#include "stm32f10x.h" // Device header
2+
3+
4+
void Timer_Init(void) {
5+
RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM2, ENABLE);
6+
7+
TIM_InternalClockConfig(TIM2);
8+
9+
TIM_TimeBaseInitTypeDef TIM_TimeBaseInitStructure;
10+
TIM_TimeBaseInitStructure.TIM_ClockDivision = TIM_CKD_DIV1;
11+
TIM_TimeBaseInitStructure.TIM_CounterMode = TIM_CounterMode_Up;
12+
TIM_TimeBaseInitStructure.TIM_Period = 10000 - 1;
13+
TIM_TimeBaseInitStructure.TIM_Prescaler = 7200 - 1;
14+
TIM_TimeBaseInitStructure.TIM_RepetitionCounter = 0;
15+
TIM_TimeBaseInit(TIM2, &TIM_TimeBaseInitStructure);
16+
17+
TIM_ClearFlag(TIM2, TIM_FLAG_Update);
18+
TIM_ITConfig(TIM2, TIM_IT_Update, ENABLE);
19+
20+
NVIC_PriorityGroupConfig(NVIC_PriorityGroup_2);
21+
22+
NVIC_InitTypeDef NVIC_InitStructure;
23+
NVIC_InitStructure.NVIC_IRQChannel = TIM2_IRQn;
24+
NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
25+
NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 2;
26+
NVIC_InitStructure.NVIC_IRQChannelSubPriority = 1;
27+
NVIC_Init(&NVIC_InitStructure);
28+
29+
TIM_Cmd(TIM2, ENABLE);
30+
}

0-1 Lighting_Rate/System/Timer.h

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#ifndef __TIMER_H
2+
#define __TIMER_H
3+
4+
void Timer_Init(void);
5+
6+
#endif

0-1 Lighting_Counter/User/main.c renamed to 0-1 Lighting_Rate/User/main.c

+33-6
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,51 @@
33
#include "Delay.h"
44
#include "LightSensor.h"
55
#include "OLED.h"
6+
#include "Timer.h"
67

78
uint16_t All_Count = 0;
9+
uint16_t Time = 0;
810
int main(void) {
911

12+
// Delay_ms(5000);
13+
1014
OLED_Init();
1115
LED_Init();
1216
LightSensor_Init();
13-
// Delay_ms(5000);
17+
Timer_Init();
18+
1419
OLED_ShowString(1, 1, "Count:");
20+
OLED_ShowString(2, 1, "Time:");
1521
OLED_ShowNum(1, 7, All_Count, 5);
16-
Delay_ms(1000);
22+
OLED_ShowNum(2, 6, Time, 5);
23+
24+
25+
//Delay_s(1);
26+
1727
while(1) {
28+
29+
LED_OFF();
30+
31+
Delay_s(1);
32+
OLED_ShowNum(2, 6, Time, 5);
33+
34+
1835
LED_ON();
19-
Delay_ms(10); // void add delay
36+
Delay_ms(1); // void add delay
2037
All_Count += Get_Count();
2138
OLED_ShowNum(1, 7, All_Count, 5);
22-
Delay_ms(1000);
23-
LED_OFF();
24-
Delay_ms(1000);
39+
40+
Delay_s(1);
41+
OLED_ShowNum(2, 6, Time, 5);
42+
43+
}
44+
}
45+
46+
47+
void TIM2_IRQHandler(void){
48+
if (TIM_GetITStatus(TIM2, TIM_IT_Update) == SET)
49+
{
50+
Time ++;
51+
TIM_ClearITPendingBit(TIM2, TIM_IT_Update);
2552
}
2653
}
File renamed without changes.

0 commit comments

Comments
 (0)