TMS_STM_Peripher/Balsam_167
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

игнор обрыва\перекоса как раньше

Browse Source
This commit is contained in:
Dimas
2026-09-07 13:52:49 +03:00
parent 6fa464e3f8
commit ed9680a36e
8 changed files with 2221 additions and 1895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Internal/measure.c
View File

@@ -445,7 +445,7 @@ void Current_count(int chan)
{
float Numb,Zer,Current,Level;
static float aCurrent,Amplitude;
int sens, pair, ist, thrd, fazz, feed;
int ignor, sens, pair, ist, thrd, fazz, feed;
ERROR error;
@@ -550,20 +550,21 @@ modbus[0x68+fazz+2] = lev_count[thrd];
// Çàøèòû!
error.all = 0;
if(WAKE || sens_error[chan].bit.Ignor) goto fin;
if(WAKE) goto fin;
ignor = sens_error[sens].bit.Ignor;
if(er_anal( ((Numb-lev_count[chan])/Numb > 0.3) && (Numb>Curr_Edge),
&err_count[chan],time_3sec,0))
{
error.bit.Wry = 1;
error.bit.Stop = 1;
error.bit.Stop = !ignor;
}
if(er_anal( ((Numb-lev_count[thrd])/Numb > 0.3) && (Numb>Curr_Edge),
&err_count[thrd],time_3sec,0))
{
error.bit.Wry = 1;
error.bit.Stop = 1;
error.bit.Stop = !ignor;
}
if(Desk == dsk_LOAD)
@@ -572,7 +573,7 @@ modbus[0x68+fazz+2] = lev_count[thrd];
if(Level > sens_hi_edge[sens])
{
error.bit.Hyper = 1;
error.bit.Stop = 1;
error.bit.Stop = !ignor;
}
if(sens_type[sens]==VOLTAGE)
@@ -581,7 +582,7 @@ modbus[0x68+fazz+2] = lev_count[thrd];
&low_count[feed],time_3sec,0))
{
error.bit.Out = 1;
error.bit.Stop = 1;
error.bit.Stop = !ignor;
}
if(sens_type[sens]==CURRENT)