From edd4771aed36e871d3d8fb81608daa7ccb39265e Mon Sep 17 00:00:00 2001
From: zhan-min <1141982925@qq.com>
Date: Mon, 14 Dec 2020 21:42:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=91=E7=8E=87=E8=AE=A1=E7=AE=97=E5=BE=85?=
=?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Project/oscilloscope.uvguix.C401 | 38 +++++++++++++++++++++++---------
Project/oscilloscope.uvoptx | 2 +-
User/OSC/OSC.c | 16 ++++++++++++++
User/OSC/OSC.h | 2 +-
4 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/Project/oscilloscope.uvguix.C401 b/Project/oscilloscope.uvguix.C401
index f9cc7fd..a6aedb1 100644
--- a/Project/oscilloscope.uvguix.C401
+++ b/Project/oscilloscope.uvguix.C401
@@ -106,8 +106,8 @@
0
- 370
- 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000003000000020000000100000026453A5C7A6D5C656D62656465645C6F7363696C6C6F73636F70655C557365725C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF29453A5C7A6D5C656D62656465645C6F7363696C6C6F73636F70655C557365725C4F53435C4F53432E6300000000054F53432E6300000000FFDC7800FFFFFFFF2D453A5C7A6D5C656D62656465645C6F7363696C6C6F73636F70655C557365725C6164635C6273705F6164632E6300000000096273705F6164632E6300000000BECEA100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F30000006600000080070000E5020000
+ 506
+ 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000005000000010000000100000026453A5C7A6D5C656D62656465645C6F7363696C6C6F73636F70655C557365725C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF29453A5C7A6D5C656D62656465645C6F7363696C6C6F73636F70655C557365725C4F53435C4F53432E6300000000054F53432E6300000000FFDC7800FFFFFFFF2D453A5C7A6D5C656D62656465645C6F7363696C6C6F73636F70655C557365725C6164635C6273705F6164632E6300000000096273705F6164632E6300000000BECEA100FFFFFFFF2D453A5C7A6D5C656D62656465645C6F7363696C6C6F73636F70655C557365725C6164635C6273705F6164632E6800000000096273705F6164632E6800000000F0A0A100FFFFFFFF29453A5C7A6D5C656D62656465645C6F7363696C6C6F73636F70655C557365725C4F53435C4F53432E6800000000054F53432E6800000000BCA8E100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F30000006600000080070000E5020000
@@ -1834,7 +1834,7 @@
Debug
2373
- 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000
+ 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000
898
@@ -1858,7 +1858,7 @@
0
100
- 2
+ 1
..\User\main.c
8
@@ -1870,18 +1870,36 @@
..\User\OSC\OSC.c
- 54
- 136
- 149
+ 4
+ 211
+ 227
1
0
..\User\adc\bsp_adc.c
- 4
- 166
- 168
+ 44
+ 157
+ 170
+ 1
+
+ 0
+
+
+ ..\User\adc\bsp_adc.h
+ 0
+ 1
+ 8
+ 1
+
+ 0
+
+
+ ..\User\OSC\OSC.h
+ 50
+ 4
+ 26
1
0
diff --git a/Project/oscilloscope.uvoptx b/Project/oscilloscope.uvoptx
index b9bee9b..6b0c477 100644
--- a/Project/oscilloscope.uvoptx
+++ b/Project/oscilloscope.uvoptx
@@ -655,7 +655,7 @@
4
36
1
- 0
+ 1
0
0
..\User\OSC\OSC.c
diff --git a/User/OSC/OSC.c b/User/OSC/OSC.c
index 7df0d60..1409912 100644
--- a/User/OSC/OSC.c
+++ b/User/OSC/OSC.c
@@ -213,6 +213,22 @@ void PlotBlackground(void)
ILI9341_DrawLine(Wave_Centor_X+(Wave_Width/2), Wave_Centor_Y+(Wave_Height/2), Wave_Centor_X+(Wave_Width/2)-length, Wave_Centor_Y+(Wave_Height/2));
}
+
+/**
+ * @brief 计算波形频率
+ * @param Operation：当前正在设置的参数
+ * @retval None
+ */
+void CalculateFrequency(uint16_t *ADC_ConvertedValue)
+{
+ uint8_t n;
+ for(n=0;n < ADCx_1_SampleNbr; n++)
+ {
+
+ }
+}
+
+
/*
*************************************************************************
* 线程定义
diff --git a/User/OSC/OSC.h b/User/OSC/OSC.h
index 414b60e..e4825f0 100644
--- a/User/OSC/OSC.h
+++ b/User/OSC/OSC.h
@@ -16,7 +16,7 @@ extern int8_t RangeModeNrb;
extern int8_t TriggerModeNrb;
extern int8_t SamplingModeNrb;
-extern int16_t CurTriggerValue; //代号0，触发阀值
+extern int16_t CurTriggerValue; //代号0，触发阀值
extern char* CurRangeMode; //代号1，量程模式，0：自动，1：手动
extern char* CurTriggerMode; //代号2，触发模式，0：下降沿触发，1：上升沿触发，2：上升沿下降沿触发
extern char* CurSamplingMode; //代号3，采样模式，0：自动，1：普通，2：单次