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

BUG修复：muxsignal中，TC和RTD枚举变量顺序颠倒

This commit is contained in:
吴俊潮 2025-04-15 12:26:35 +08:00
parent 0d72859d19
commit 3bc9de53e9
6 changed files with 3653 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
App/APP_WU/Src/apps_gather.c
View File

@ -215,7 +215,7 @@ void sig_channel_select(uint8_t io, SIG_FUNCTIONS_TYPE type)
case RESISTANT_OHM: case RESISTANT_OHM:
{ {
//与热电阻一致 //与热电阻一致
mux_signal.channel = CH11_IN_RTD; mux_signal.channel = CH10_IN_RTD;
} }
break; break;
@ -227,55 +227,55 @@ void sig_channel_select(uint8_t io, SIG_FUNCTIONS_TYPE type)
case TC_K: case TC_K:
{ {
mux_signal.channel = CH10_IN_TC; mux_signal.channel = CH11_IN_TC;
} }
break; break;
case TC_S: case TC_S:
{ {
mux_signal.channel = CH10_IN_TC; mux_signal.channel = CH11_IN_TC;
} }
break; break;
case TC_N: case TC_N:
{ {
mux_signal.channel = CH10_IN_TC; mux_signal.channel = CH11_IN_TC;
} }
break; break;
case TC_B: case TC_B:
{ {
mux_signal.channel = CH10_IN_TC; mux_signal.channel = CH11_IN_TC;
} }
break; break;
case TC_E: case TC_E:
{ {
mux_signal.channel = CH10_IN_TC; mux_signal.channel = CH11_IN_TC;
} }
break; break;
case TC_J: case TC_J:
{ {
mux_signal.channel = CH10_IN_TC; mux_signal.channel = CH11_IN_TC;
} }
break; break;
case TC_R: case TC_R:
{ {
mux_signal.channel = CH10_IN_TC; mux_signal.channel = CH11_IN_TC;
} }
break; break;
case TC_T: case TC_T:
{ {
mux_signal.channel = CH10_IN_TC; mux_signal.channel = CH11_IN_TC;
} }
break; break;
case RTD_DC: case RTD_DC:
{ {
mux_signal.channel = CH11_IN_RTD; mux_signal.channel = CH10_IN_RTD;
} }
break; break;

9
App/MUX_SIGNAL/mux_signal.c
View File

@ -166,12 +166,13 @@ void mux_signal_switch(st_mux_signal *mux_signal)
case CH9_IN_FRE: case CH9_IN_FRE:
fun_get_freq(&freq_signal, &mux_signal->data_pv); fun_get_freq(&freq_signal, &mux_signal->data_pv);
break; break;
case CH10_IN_TC: case CH10_IN_RTD:
ads1220_operation(CH10_IN_TC, &mux_signal->data_pv); fun_get_sig16132_ch(CH10_IN_RTD, &mux_signal->data_pv);
// fun_rn7302_operate(CH3_IN_RTD, &mux_signal->data_pv); // fun_rn7302_operate(CH3_IN_RTD, &mux_signal->data_pv);
break; break;
case CH11_IN_RTD: case CH11_IN_TC:
fun_get_sig16132_ch(10, &mux_signal->data_pv); ads1220_operation(CH11_IN_TC, &mux_signal->data_pv);
// fun_rn7302_operate(CH3_IN_RTD, &mux_signal->data_pv); // fun_rn7302_operate(CH3_IN_RTD, &mux_signal->data_pv);
break; break;
case CH12_IN_HART: case CH12_IN_HART:

4
App/MUX_SIGNAL/mux_signal.h
View File

@ -24,8 +24,8 @@ typedef enum
CH7_IN_MVOL = 7, CH7_IN_MVOL = 7,
CH8_IN_CUR = 8, CH8_IN_CUR = 8,
CH9_IN_FRE = 9, CH9_IN_FRE = 9,
CH10_IN_TC = 10, CH10_IN_RTD = 10,
CH11_IN_RTD = 11, CH11_IN_TC = 11,
CH12_IN_HART = 12, CH12_IN_HART = 12,
CHX_IN_MAX = 13, CHX_IN_MAX = 13,

3628
MDK-ARM/signal_generator.uvguix.吴俊潮 Normal file
View File

File diff suppressed because one or more lines are too long

8
MDK-ARM/signal_generator.uvoptx
View File

@ -188,7 +188,7 @@
<Ww> <Ww>
<count>6</count> <count>6</count>
<WinNumber>1</WinNumber> <WinNumber>1</WinNumber>
<ItemText>mux_signal</ItemText> <ItemText>mux_signal,0x0A</ItemText>
</Ww> </Ww>
<Ww> <Ww>
<count>7</count> <count>7</count>
@ -390,7 +390,7 @@
<Group> <Group>
<GroupName>Application/User/Core</GroupName> <GroupName>Application/User/Core</GroupName>
<tvExp>1</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@ -554,7 +554,7 @@
<Group> <Group>
<GroupName>Application/User/App/LCD</GroupName> <GroupName>Application/User/App/LCD</GroupName>
<tvExp>1</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@ -3810,7 +3810,7 @@
<Group> <Group>
<GroupName>LVGL_myGUI</GroupName> <GroupName>LVGL_myGUI</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>

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

@ -8794,8 +8794,8 @@
:102560000801BDE8F0470220EDF752BC05F1080173 :102560000801BDE8F0470220EDF752BC05F1080173
:10257000BDE8F0470320EDF74BBC05F10801BDE8CD :10257000BDE8F0470320EDF74BBC05F10801BDE8CD
:10258000F0470520EDF744BC05F10801BDE8F04730 :10258000F0470520EDF744BC05F10801BDE8F04730
:102590000A20E5F797BD05F10801BDE8F0470A20DC :102590000A20EDF73DBC05F10801BDE8F0470B202E
:1025A000EDF736BCBDE8F087800000200004024053 :1025A000E5F790BDBDE8F087800000200004024000
:1025B000000802400010024000002247980E002050 :1025B000000802400010024000002247980E002050
:1025C000000022471F85EB51E4160020002804BFBD :1025C000000022471F85EB51E4160020002804BFBD
:1025D0009FED130A70470029B7EE000A14BF0022CE :1025D0009FED130A70470029B7EE000A14BF0022CE
@ -10351,8 +10351,8 @@
:1086B0002B2B2B2B2B2B2B370E2928BF7047DFE8BA :1086B0002B2B2B2B2B2B2B370E2928BF7047DFE8BA
:1086C00001F0070B0F13171B1B1B1B1B1B1B1B1383 :1086C00001F0070B0F13171B1B1B1B1B1B1B1B1383
:1086D0000720154908707047134906200870704735 :1086D0000720154908707047134906200870704735
:1086E00011490820087070470F490B200870704727 :1086E00011490820087070470F490A200870704728
:1086F0000D490920087070470B490A20087070471F :1086F0000D490920087070470B490B20087070471E
:108700000949012008707047074900200870704728 :108700000949012008707047074900200870704728
:10871000054902200870704703490420087070471B :10871000054902200870704703490420087070471B
:10872000014903200870704784000020094810B5F3 :10872000014903200870704784000020094810B5F3