easylinux/SignauxComplexes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8.2D

Browse Source
This commit is contained in:
f1iwq2
2023-10-03 19:26:54 +02:00
parent 1328b40822
commit 9cc2825648
7 changed files with 64 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Notice d'utilisation des signaux_complexes_GL_V8.2.pdf
BIN
View File
Binary file not shown.
Signaux_complexes_GL.cfg
+2 -2
View File
@@ -14,8 +14,8 @@
-$N+ -$N+
-$O- -$O-
-$P+ -$P+
-$Q- -$Q+
-$R- -$R+
-$S- -$S-
-$T- -$T-
-$U- -$U-
Signaux_complexes_GL.dof
+2 -2
View File
@@ -17,8 +17,8 @@ M=0
N=1 N=1
O=0 O=0
P=1 P=1
Q=0 Q=1
R=0 R=1
S=0 S=0
T=0 T=0
U=0 U=0
Signaux_complexes_GL.map
+14 -14
View File
@@ -1,8 +1,8 @@
Start Length Name Class Start Length Name Class
0001:00000000 00178F28H .text CODE 0001:00000000 00179218H .text CODE
0002:00000000 00002BF4H .data DATA 0002:00000000 00002BF4H .data DATA
0002:00002BF4 041A0599H .bss BSS 0002:00002BF4 041A059DH .bss BSS
Detailed map of segments Detailed map of segments
@@ -93,12 +93,12 @@ Detailed map of segments
0001:000EDAE4 000027D4 C=CODE S=.text G=(none) M=UnitCDF ACBP=A9 0001:000EDAE4 000027D4 C=CODE S=.text G=(none) M=UnitCDF ACBP=A9
0001:000F02B8 000015C7 C=CODE S=.text G=(none) M=verif_version ACBP=A9 0001:000F02B8 000015C7 C=CODE S=.text G=(none) M=verif_version ACBP=A9
0001:000F1880 0000114C C=CODE S=.text G=(none) M=UnitPareFeu ACBP=A9 0001:000F1880 0000114C C=CODE S=.text G=(none) M=UnitPareFeu ACBP=A9
0001:000F29CC 0003DA68 C=CODE S=.text G=(none) M=UnitConfig ACBP=A9 0001:000F29CC 0003DCC8 C=CODE S=.text G=(none) M=UnitConfig ACBP=A9
0001:00130434 00002904 C=CODE S=.text G=(none) M=UnitDebug ACBP=A9 0001:00130694 00002904 C=CODE S=.text G=(none) M=UnitDebug ACBP=A9
0001:00132D38 00000C00 C=CODE S=.text G=(none) M=UnitSimule ACBP=A9 0001:00132F98 00000C00 C=CODE S=.text G=(none) M=UnitSimule ACBP=A9
0001:00133938 00002558 C=CODE S=.text G=(none) M=Unitplace ACBP=A9 0001:00133B98 00002558 C=CODE S=.text G=(none) M=Unitplace ACBP=A9
0001:00135E90 00042C08 C=CODE S=.text G=(none) M=UnitPrinc ACBP=A9 0001:001360F0 00042C98 C=CODE S=.text G=(none) M=UnitPrinc ACBP=A9
0001:00178A98 0000048D C=CODE S=.text G=(none) M=Signaux_complexes_GL ACBP=A9 0001:00178D88 0000048D C=CODE S=.text G=(none) M=Signaux_complexes_GL ACBP=A9
0002:00000000 000000CC C=DATA S=.data G=DGROUP M=System ACBP=A9 0002:00000000 000000CC C=DATA S=.data G=DGROUP M=System ACBP=A9
0002:000000CC 00000020 C=DATA S=.data G=DGROUP M=SysInit ACBP=A9 0002:000000CC 00000020 C=DATA S=.data G=DGROUP M=SysInit ACBP=A9
0002:000000EC 00000254 C=DATA S=.data G=DGROUP M=SysUtils ACBP=A9 0002:000000EC 00000254 C=DATA S=.data G=DGROUP M=SysUtils ACBP=A9
@@ -217,11 +217,11 @@ Detailed map of segments
0002:00049A30 00000014 C=BSS S=.bss G=DGROUP M=UnitCDF ACBP=A9 0002:00049A30 00000014 C=BSS S=.bss G=DGROUP M=UnitCDF ACBP=A9
0002:00049A44 00000014 C=BSS S=.bss G=DGROUP M=verif_version ACBP=A9 0002:00049A44 00000014 C=BSS S=.bss G=DGROUP M=verif_version ACBP=A9
0002:00049A58 00000004 C=BSS S=.bss G=DGROUP M=UnitPareFeu ACBP=A9 0002:00049A58 00000004 C=BSS S=.bss G=DGROUP M=UnitPareFeu ACBP=A9
0002:00049A5C 00000398 C=BSS S=.bss G=DGROUP M=UnitConfig ACBP=A9 0002:00049A5C 0000039C C=BSS S=.bss G=DGROUP M=UnitConfig ACBP=A9
0002:00049DF4 00000028 C=BSS S=.bss G=DGROUP M=UnitDebug ACBP=A9 0002:00049DF8 00000028 C=BSS S=.bss G=DGROUP M=UnitDebug ACBP=A9
0002:00049E1C 0000000C C=BSS S=.bss G=DGROUP M=UnitSimule ACBP=A9 0002:00049E20 0000000C C=BSS S=.bss G=DGROUP M=UnitSimule ACBP=A9
0002:00049E28 00000008 C=BSS S=.bss G=DGROUP M=Unitplace ACBP=A9 0002:00049E2C 00000008 C=BSS S=.bss G=DGROUP M=Unitplace ACBP=A9
0002:00049E30 04159768 C=BSS S=.bss G=DGROUP M=UnitPrinc ACBP=A9 0002:00049E34 04159768 C=BSS S=.bss G=DGROUP M=UnitPrinc ACBP=A9
Bound resource files Bound resource files
@@ -247,4 +247,4 @@ Signaux_complexes_GL.res
Signaux_complexes_GL.drf Signaux_complexes_GL.drf
Program entry point at 0001:00178DA8 Program entry point at 0001:00179098
UnitConfig.dfm
+9 -9
View File
@@ -2326,7 +2326,7 @@ object FormConfig: TFormConfig
Width = 129 Width = 129
Height = 21 Height = 21
Style = csDropDownList Style = csDropDownList
ItemHeight = 0 ItemHeight = 13
TabOrder = 1 TabOrder = 1
OnChange = ComboBoxDecChange OnChange = ComboBoxDecChange
end end
@@ -2433,7 +2433,7 @@ object FormConfig: TFormConfig
Width = 129 Width = 129
Height = 21 Height = 21
Style = csDropDownList Style = csDropDownList
ItemHeight = 0 ItemHeight = 13
TabOrder = 2 TabOrder = 2
OnChange = ComboBoxAspChange OnChange = ComboBoxAspChange
end end
@@ -2719,7 +2719,7 @@ object FormConfig: TFormConfig
Top = 56 Top = 56
Width = 193 Width = 193
Height = 21 Height = 21
ItemHeight = 0 ItemHeight = 13
TabOrder = 0 TabOrder = 0
OnChange = ComboBoxDecodeurPersoChange OnChange = ComboBoxDecodeurPersoChange
end end
@@ -2738,7 +2738,7 @@ object FormConfig: TFormConfig
Width = 145 Width = 145
Height = 21 Height = 21
Style = csDropDownList Style = csDropDownList
ItemHeight = 0 ItemHeight = 13
TabOrder = 2 TabOrder = 2
OnChange = ComboBoxNationChange OnChange = ComboBoxNationChange
end end
@@ -3139,7 +3139,7 @@ object FormConfig: TFormConfig
Width = 169 Width = 169
Height = 21 Height = 21
Hint = 'Nom de l'#39'accessoire d'#233'fini dans l'#39'onglet "accessoires COM/USB"' Hint = 'Nom de l'#39'accessoire d'#233'fini dans l'#39'onglet "accessoires COM/USB"'
ItemHeight = 0 ItemHeight = 13
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
TabOrder = 6 TabOrder = 6
@@ -4228,7 +4228,7 @@ object FormConfig: TFormConfig
end end
end end
object TabSheetAccessoires: TTabSheet object TabSheetAccessoires: TTabSheet
Caption = 'Accessoires COM/USB' Caption = 'P'#233'riph'#233'riques COM/USB'
ImageIndex = 9 ImageIndex = 9
object Label73: TLabel object Label73: TLabel
Left = 8 Left = 8
@@ -4291,9 +4291,9 @@ object FormConfig: TFormConfig
object Label71: TLabel object Label71: TLabel
Left = 10 Left = 10
Top = 32 Top = 32
Width = 95 Width = 98
Height = 13 Height = 13
Caption = 'Nom de l'#39'accessoire' Caption = 'Nom du p'#233'riph'#233'rique'
end end
object Label72: TLabel object Label72: TLabel
Left = 10 Left = 10
@@ -4307,7 +4307,7 @@ object FormConfig: TFormConfig
Top = 24 Top = 24
Width = 121 Width = 121
Height = 21 Height = 21
Hint = 'Nom de l'#39'accessoire' Hint = 'Nom au choix du p'#233'riph'#233'rique'
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
TabOrder = 0 TabOrder = 0
UnitConfig.pas
+23 -5
View File
@@ -655,7 +655,6 @@ section_placement_ch='[section_placement]';
section_DecPers_ch='[section_decodeurs]'; section_DecPers_ch='[section_decodeurs]';
section_accCOM_ch='[section_accCOMUSB]'; section_accCOM_ch='[section_accCOMUSB]';
var var
FormConfig: TFormConfig; FormConfig: TFormConfig;
AdresseIPCDM,AdresseIP,PortCom,portComCde,recuCDM,residuCDM,trainsauve : string; AdresseIPCDM,AdresseIP,PortCom,portComCde,recuCDM,residuCDM,trainsauve : string;
@@ -674,7 +673,7 @@ var
// composants dynamiques // composants dynamiques
Gp1 : TGroupBox; Gp1 : TGroupBox;
Cb1,Cb2,Cb3 : TCheckBox; Cb1,Cb2,Cb3,CbVis : TCheckBox;
EditT : Array[1..10] of Tedit; EditT : Array[1..10] of Tedit;
ComboL1,ComboL2,ComboTS1,ComboTS2 : Array[1..10] of TComboBox; ComboL1,ComboL2,ComboTS1,ComboTS2 : Array[1..10] of TComboBox;
ShapeT : array[1..10] of TShape; ShapeT : array[1..10] of TShape;
@@ -925,7 +924,7 @@ begin
if Tablo_acc_COMUSB[index].ScvAig then s:=s+',1' else s:=s+',0'; if Tablo_acc_COMUSB[index].ScvAig then s:=s+',1' else s:=s+',0';
if Tablo_acc_COMUSB[index].ScvDet then s:=s+',1' else s:=s+',0'; if Tablo_acc_COMUSB[index].ScvDet then s:=s+',1' else s:=s+',0';
if Tablo_acc_COMUSB[index].ScvAct then s:=s+',1' else s:=s+',0'; if Tablo_acc_COMUSB[index].ScvAct then s:=s+',1' else s:=s+',0';
if Tablo_acc_COMUSB[index].ScvVis then s:=s+',1' else s:=s+',0';
result:=s; result:=s;
end; end;
@@ -2855,6 +2854,11 @@ var s,sa,SOrigine: string;
val(sa,i,erreur); val(sa,i,erreur);
Tablo_acc_COMUSB[NbAcc_USBCOM].ScvAct:=i=1; Tablo_acc_COMUSB[NbAcc_USBCOM].ScvAct:=i=1;
i:=pos(',',sa);Delete(sa,1,i);
val(sa,i,erreur);
Tablo_acc_COMUSB[NbAcc_USBCOM].ScvVis:=i=1;
end; end;
NbreComCde:=NbAcc_USBCOM; NbreComCde:=NbAcc_USBCOM;
until (sOrigine='0') or (NbAcc_USBCOM>=NbAccMaxi_USBCOM); until (sOrigine='0') or (NbAcc_USBCOM>=NbAccMaxi_USBCOM);
@@ -4148,10 +4152,11 @@ begin
if clicliste or (ligneClicAccCOM<0) then exit; if clicliste or (ligneClicAccCOM<0) then exit;
cb:=(sender as Tcheckbox); cb:=(sender as Tcheckbox);
s := cb.Name; s := cb.Name;
//Affiche(s,clyellow); Affiche(s,clyellow);
if pos('Aig',s)<>0 then Tablo_acc_COMUSB[ligneClicAccCOM+1].ScvAig:=cb.Checked; if pos('Aig',s)<>0 then Tablo_acc_COMUSB[ligneClicAccCOM+1].ScvAig:=cb.Checked;
if pos('Det',s)<>0 then Tablo_acc_COMUSB[ligneClicAccCOM+1].ScvDet:=cb.Checked; if pos('Det',s)<>0 then Tablo_acc_COMUSB[ligneClicAccCOM+1].ScvDet:=cb.Checked;
if pos('Act',s)<>0 then Tablo_acc_COMUSB[ligneClicAccCOM+1].ScvAct:=cb.Checked; if pos('Act',s)<>0 then Tablo_acc_COMUSB[ligneClicAccCOM+1].ScvAct:=cb.Checked;
if pos('Vis',s)<>0 then Tablo_acc_COMUSB[ligneClicAccCOM+1].ScvVis:=cb.Checked;
s:=encode_AccCOM(ligneClicAccCOM+1); s:=encode_AccCOM(ligneClicAccCOM+1);
ListBoxAcc.Items[ligneClicAccCOM]:=s; ListBoxAcc.Items[ligneClicAccCOM]:=s;
@@ -4489,6 +4494,18 @@ begin
onclick:=formconfig.cb_onclick; onclick:=formconfig.cb_onclick;
end; end;
cbVis:=TCheckBox.Create(FormConfig.TabSheetAccessoires);
with cbVis do
begin
Left:=110;Top:=45;Width:=100;Height:=12;
caption:='Mode visible';
name:='cbVis';
parent:=gp1;
hint:='Affiche le texte à l''écran lors de l''envoi';
ShowHint:=true;
onclick:=formconfig.cb_onclick;
end;
{if FileExists('Image_Signaux.jpg') then ImageSignaux.Picture.LoadFromFile('Image_Signaux.jpg') {if FileExists('Image_Signaux.jpg') then ImageSignaux.Picture.LoadFromFile('Image_Signaux.jpg')
else else
@@ -4546,6 +4563,7 @@ begin
cb1.Checked:=Tablo_acc_COMUSB[index].ScvAig; cb1.Checked:=Tablo_acc_COMUSB[index].ScvAig;
cb2.Checked:=Tablo_acc_COMUSB[index].ScvDet; cb2.Checked:=Tablo_acc_COMUSB[index].ScvDet;
cb3.Checked:=Tablo_acc_COMUSB[index].ScvAct; cb3.Checked:=Tablo_acc_COMUSB[index].ScvAct;
cbVis.Checked:=Tablo_acc_COMUSB[index].ScvVis;
clicliste:=false; clicliste:=false;
end; end;
@@ -4872,7 +4890,7 @@ begin
GroupBoxAct.Caption:='Action pour commande sur COM/USB'; GroupBoxAct.Caption:='Action pour commande sur COM/USB';
LabelTempo.Visible:=true; EditTempo.visible:=true; editEtatFoncSortie.visible:=false;LabelA.Visible:=false; LabelTempo.Visible:=true; EditTempo.visible:=true; editEtatFoncSortie.visible:=false;LabelA.Visible:=false;
LabelFonction.visible:=true; LabelFonction.visible:=true;
LabelFonction.caption:='Accessoire COM/USB'; LabelFonction.caption:='Périphérique COM/USB';
LabelFonction.Top:=18; LabelFonction.Top:=18;
ComboBoxAccComUSB.Top:=32; ComboBoxAccComUSB.Top:=32;
UnitPrinc.pas
+14 -11
View File
@@ -562,7 +562,7 @@ var
Tablo_com_cde : array[1..10] of record Tablo_com_cde : array[1..10] of record
portOuvert: boolean; portOuvert: boolean;
NumAcc: integer; // numéro accessoire tableau tablo_acc_comusb NumAcc: integer; // numéro périphérique tableau tablo_acc_comusb
tamponRx : string; tamponRx : string;
end; end;
@@ -597,7 +597,7 @@ var
Tablo_acc_COMUSB : array[1..NbAccMaxi_USBCOM] of record Tablo_acc_COMUSB : array[1..NbAccMaxi_USBCOM] of record
nom : string; nom : string;
NumCom : integer; // numéro de port COM NumCom : integer; // numéro de port COM
ScvAig,ScvDet,ScvAct : boolean ; // services ScvAig,ScvDet,ScvAct,ScvVis : boolean ; // services
end; end;
// tableau des croisement rencontrés par la fonction suivant_alg3 // tableau des croisement rencontrés par la fonction suivant_alg3
@@ -10298,14 +10298,17 @@ begin
if (adr>650) then if (adr>650) then
for i:=1 to NbAcc_USBCOM do for i:=1 to NbAcc_USBCOM do
begin begin
// envoyer event det à accessoire if tablo_com_cde[i].portOuvert then
if Tablo_acc_COMUSB[i].ScvAct then
begin begin
s:='A'+intToSTR(adr)+','+intToSTR(etat)+','+trainDecl; // envoyer event det à accessoire
if avecCR=1 then s:=s+#13; if Tablo_acc_COMUSB[i].ScvAct then
Affiche(s,clOrange); begin
if i=1 then Formprinc.MSCommCde1.Output:=s; s:='A'+intToSTR(adr)+','+intToSTR(etat)+','+trainDecl;
if i=2 then Formprinc.MSCommCde2.Output:=s; if avecCR=1 then s:=s+#13;
if Tablo_acc_COMUSB[i].ScvVis then Affiche(s,clWhite);
if i=1 then Formprinc.MSCommCde1.Output:=s;
if i=2 then Formprinc.MSCommCde2.Output:=s;
end;
end; end;
end; end;
@@ -10500,7 +10503,7 @@ begin
begin begin
s:='D'+intToSTR(adresse)+','+intToSTR(etat01)+','+train; s:='D'+intToSTR(adresse)+','+intToSTR(etat01)+','+train;
if avecCR=1 then s:=s+#13; if avecCR=1 then s:=s+#13;
Affiche(s,clOrange); if Tablo_acc_COMUSB[i].ScvVis then Affiche(s,clOrange);
if i=1 then Formprinc.MSCommCde1.Output:=s; if i=1 then Formprinc.MSCommCde1.Output:=s;
if i=2 then Formprinc.MSCommCde2.Output:=s; if i=2 then Formprinc.MSCommCde2.Output:=s;
end; end;
@@ -10599,7 +10602,7 @@ begin
begin begin
s:='T'+intToSTR(adresse)+','+intToSTR(pos); s:='T'+intToSTR(adresse)+','+intToSTR(pos);
if avecCR=1 then s:=s+#13; if avecCR=1 then s:=s+#13;
Affiche(s,clOrange); if Tablo_acc_COMUSB[i].ScvVis then Affiche(s,clOrange);
if i=1 then Formprinc.MSCommCde1.Output:=s; if i=1 then Formprinc.MSCommCde1.Output:=s;
if i=2 then Formprinc.MSCommCde2.Output:=s; if i=2 then Formprinc.MSCommCde2.Output:=s;
end; end;