jasder
/
oscilloscope
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

触发阀值单位转换为伏特已完成

This commit is contained in:
zhan-min 2020-12-14 21:08:05 +08:00
parent 232de5734a
commit 80f3ed60f7
5 changed files with 2369 additions and 2195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4451
Project/oscilloscope.hex
View File

File diff suppressed because it is too large Load Diff

99
Project/oscilloscope.uvguix.C401
View File

File diff suppressed because one or more lines are too long

10
User/OSC/OSC.c
View File

@ -10,7 +10,7 @@
#define MeasurementRange 30 #define MeasurementRange 200
/* /*
****************************************************************** ******************************************************************
@ -42,7 +42,7 @@ uint8_t TimePerDivOderNbr = sizeof(TimePerDiv_Group)/sizeof(TimePerDiv_Group[0]
int8_t TimePerDivOder = 0;//当前每格间隔时间的序号 int8_t TimePerDivOder = 0;//当前每格间隔时间的序号
int8_t CurTriggerValue = 0; //代号0，触发阀值 int16_t CurTriggerValue = 0; //代号0，触发阀值
char* CurRangeMode = {"auto"}; //代号1，量程模式，0：自动，1：手动 char* CurRangeMode = {"auto"}; //代号1，量程模式，0：自动，1：手动
char* CurTriggerMode = {"↑"}; //代号2，触发模式，0：下降沿触发，1：上升沿触发 char* CurTriggerMode = {"↑"}; //代号2，触发模式，0：下降沿触发，1：上升沿触发
char* CurSamplingMode = {"A"}; //代号3，采样模式，0：自动，1：普通，2：单次 char* CurSamplingMode = {"A"}; //代号3，采样模式，0：自动，1：普通，2：单次
@ -137,14 +137,16 @@ static void Setting_do(uint8_t CurSetItem, int8_t Operation)
void Setting_Inf_Update(uint8_t CurSetItem) void Setting_Inf_Update(uint8_t CurSetItem)
{ {
char dispBuff[100]; char dispBuff[100];
float ConvertedTriggerValue;//用于将触发阀值单位转换为伏特
ILI9341_Clear(240, 0, 20, 240); ILI9341_Clear(240, 0, 20, 240);
ILI9341_DispString_EN(240, (((sFONT *)LCD_GetFont())->Height)*CurSetItem, "->"); ILI9341_DispString_EN(240, (((sFONT *)LCD_GetFont())->Height)*CurSetItem, "->");
switch(CurSetItem) switch(CurSetItem)
{ {
case 0: case 0:
{ {
ConvertedTriggerValue = CurTriggerValue/200*3.3;
/*使用c标准库把变量转化成字符串*/ /*使用c标准库把变量转化成字符串*/
sprintf(dispBuff,"TV: %d", CurTriggerValue); sprintf(dispBuff,"%f V", ConvertedTriggerValue);
ILI9341_DispString_EN(260, (((sFONT *)LCD_GetFont())->Height)*0, dispBuff); ILI9341_DispString_EN(260, (((sFONT *)LCD_GetFont())->Height)*0, dispBuff);
break; break;
} }
@ -166,7 +168,7 @@ void Setting_Inf_Update(uint8_t CurSetItem)
case 4: case 4:
{ {
/*使用c标准库把变量转化成字符串*/ /*使用c标准库把变量转化成字符串*/
sprintf(dispBuff,"TPD: %d", CurTimePerDiv); sprintf(dispBuff,"%d ms", CurTimePerDiv);
ILI9341_DispString_EN(260, (((sFONT *)LCD_GetFont())->Height)*4, dispBuff); ILI9341_DispString_EN(260, (((sFONT *)LCD_GetFont())->Height)*4, dispBuff);
break; break;
} }

2
User/OSC/OSC.h
View File

@ -16,7 +16,7 @@ extern int8_t RangeModeNrb;
extern int8_t TriggerModeNrb; extern int8_t TriggerModeNrb;
extern int8_t SamplingModeNrb; extern int8_t SamplingModeNrb;
extern int8_t CurTriggerValue; //代号0，触发阀值 extern int16_t CurTriggerValue; //代号0，触发阀值
extern char* CurRangeMode; //代号1，量程模式，0：自动，1：手动 extern char* CurRangeMode; //代号1，量程模式，0：自动，1：手动
extern char* CurTriggerMode; //代号2，触发模式，0：下降沿触发，1：上升沿触发，2：上升沿下降沿触发 extern char* CurTriggerMode; //代号2，触发模式，0：下降沿触发，1：上升沿触发，2：上升沿下降沿触发
extern char* CurSamplingMode; //代号3，采样模式，0：自动，1：普通，2：单次 extern char* CurSamplingMode; //代号3，采样模式，0：自动，1：普通，2：单次

2
User/adc/bsp_adc.c
View File

@ -170,7 +170,7 @@ void Get_Wave(void* parameter)
while(ADC_SampleCount < ADCx_1_SampleNbr) while(ADC_SampleCount < ADCx_1_SampleNbr)
{ {
while(ADC_GetITStatus(ADCx_1, ADC_IT_EOC) != SET); while(ADC_GetITStatus(ADCx_1, ADC_IT_EOC) != SET);
ADC_ConvertedValue[ADC_SampleCount] = ADC_GetConversionValue(ADCx_1); ADC_ConvertedValue[ADC_SampleCount] = ADC_GetConversionValue(ADCx_1)*200/255-0.5;//将采样值映射到显示区间
Delay_us( CurTimePerDiv*1000/50 -7 );//采样间隔时间 Delay_us( CurTimePerDiv*1000/50 -7 );//采样间隔时间
ADC_ClearITPendingBit(ADCx_1, ADC_IT_EOC); ADC_ClearITPendingBit(ADCx_1, ADC_IT_EOC);
ADC_SampleCount++; ADC_SampleCount++;