wxsmart-test
/
sggt
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新： 

1、信号输入校准功能测试完成；
2、校准参数读取和写入测试完成；
This commit is contained in:
吴俊潮 2025-07-01 16:58:49 +08:00
parent df5bb1c0a9
commit 11ced4afcd
3 changed files with 18968 additions and 18949 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
App/SIG24130/SIG24130.c
View File

@ -598,7 +598,7 @@ unsigned long SIG16130_RetrievalData(uint8_t rdata, uint8_t chksum)
return (SIG16130_adc_data); return (SIG16130_adc_data);
} }
float32 cali_test = 0; //float32 cali_test = 0;
void fun_get_sig16132_ch(uint8_t channel, float32 *data) void fun_get_sig16132_ch(uint8_t channel, float32 *data)
{ {
if (!data) if (!data)
@ -654,13 +654,13 @@ void fun_get_sig16132_ch(uint8_t channel, float32 *data)
if (channel == MUX_CHANNEL_V_IN) // if (channel == 2) // 0~30V电压输入检测 if (channel == MUX_CHANNEL_V_IN) // if (channel == 2) // 0~30V电压输入检测
{ {
*data = voltage * 16.0f; *data = voltage * 16.0f;
mux_signal.pv_calibrated = calibrate_vol_v_in(cali_test); //mux_signal.pv_calibrated = calibrate_vol_v_in(cali_test);
//mux_signal.pv_calibrated = calibrate_vol_v_in(*data); mux_signal.pv_calibrated = calibrate_vol_v_in(*data);
} }
else if (channel == MUX_CHANNEL_MV_IN) //else if (channel == 3) // mV电压输入检测 else if (channel == MUX_CHANNEL_MV_IN) //else if (channel == 3) // mV电压输入检测
{ {
*data = voltage * 1000.0f - 0.2f; *data = voltage * 1000.0f - 0.2f;
mux_signal.pv_calibrated = *data; mux_signal.pv_calibrated = calibrate_vol_mv_in(*data);
} }
else if (channel == MUX_CHANNEL_MV_FEEDBACK) //else if (channel == 4) //-2.5~2.5V输出反馈 else if (channel == MUX_CHANNEL_MV_FEEDBACK) //else if (channel == 4) //-2.5~2.5V输出反馈
{ {
@ -699,7 +699,7 @@ void fun_get_sig16132_ch(uint8_t channel, float32 *data)
// *data = temp1; // *data = temp1;
*data = voltage * 1000.0f/ 0.5f; *data = voltage * 1000.0f/ 0.5f;
mux_signal.pv_calibrated = *data; mux_signal.pv_calibrated = calibrate_res_ohm_in(*data);
} }
} }
} }

5
MDK-ARM/signal_generator.uvoptx
View File

@ -270,11 +270,6 @@
<WinNumber>1</WinNumber> <WinNumber>1</WinNumber>
<ItemText>cali_paras</ItemText> <ItemText>cali_paras</ItemText>
</Ww> </Ww>
<Ww>
<count>23</count>
<WinNumber>1</WinNumber>
<ItemText>cali_test</ItemText>
</Ww>
</WatchWindow1> </WatchWindow1>
<WatchWindow2> <WatchWindow2>
<Ww> <Ww>

37902
MDK-ARM/signal_generator/signal_generator.hex
View File

File diff suppressed because it is too large Load Diff