diff --git a/Notice d'utilisation des signaux_complexes_GL_V8.2.pdf b/Notice d'utilisation des signaux_complexes_GL_V8.2.pdf index 9c1c096..062c1e0 100644 Binary files a/Notice d'utilisation des signaux_complexes_GL_V8.2.pdf and b/Notice d'utilisation des signaux_complexes_GL_V8.2.pdf differ diff --git a/Signaux_complexes_GL.map b/Signaux_complexes_GL.map index 365e79d..3a6f084 100644 --- a/Signaux_complexes_GL.map +++ b/Signaux_complexes_GL.map @@ -1,104 +1,104 @@ Start Length Name Class - 0001:00000000 0016B428H .text CODE + 0001:00000000 00178F28H .text CODE 0002:00000000 00002BF4H .data DATA - 0002:00002BF4 041A0561H .bss BSS + 0002:00002BF4 041A0599H .bss BSS Detailed map of segments - 0001:00000000 00005DFB C=CODE S=.text G=(none) M=System ACBP=A9 - 0001:00005DFC 00000140 C=CODE S=.text G=(none) M=SysInit ACBP=A9 - 0001:00005F3C 00000108 C=CODE S=.text G=(none) M=Types ACBP=A9 - 0001:00006044 00000ED8 C=CODE S=.text G=(none) M=Windows ACBP=A9 - 0001:00006F1C 00000038 C=CODE S=.text G=(none) M=Messages ACBP=A9 - 0001:00006F54 00000338 C=CODE S=.text G=(none) M=SysConst ACBP=A9 - 0001:0000728C 00006E28 C=CODE S=.text G=(none) M=SysUtils ACBP=A9 - 0001:0000E0B4 0000081B C=CODE S=.text G=(none) M=VarUtils ACBP=A9 - 0001:0000E8D0 00008042 C=CODE S=.text G=(none) M=Variants ACBP=A9 - 0001:00016914 00000188 C=CODE S=.text G=(none) M=RTLConsts ACBP=A9 - 0001:00016A9C 0000083C C=CODE S=.text G=(none) M=TypInfo ACBP=A9 - 0001:000172D8 00000358 C=CODE S=.text G=(none) M=ActiveX ACBP=A9 - 0001:00017630 0000A236 C=CODE S=.text G=(none) M=Classes ACBP=A9 - 0001:00021868 00000370 C=CODE S=.text G=(none) M=Consts ACBP=A9 - 0001:00021BD8 00009BFB C=CODE S=.text G=(none) M=Graphics ACBP=A9 - 0001:0002B7D4 00000124 C=CODE S=.text G=(none) M=Math ACBP=A9 - 0001:0002B8F8 000002B8 C=CODE S=.text G=(none) M=Contnrs ACBP=A9 - 0001:0002BBB0 00000198 C=CODE S=.text G=(none) M=CommCtrl ACBP=A9 - 0001:0002BD48 00000787 C=CODE S=.text G=(none) M=MultiMon ACBP=A9 - 0001:0002C4D0 00000038 C=CODE S=.text G=(none) M=Imm ACBP=A9 - 0001:0002C508 00000FF8 C=CODE S=.text G=(none) M=HelpIntfs ACBP=A9 - 0001:0002D500 00000058 C=CODE S=.text G=(none) M=WinSpool ACBP=A9 - 0001:0002D558 000010C8 C=CODE S=.text G=(none) M=Printers ACBP=A9 - 0001:0002E620 0000031F C=CODE S=.text G=(none) M=FlatSB ACBP=A9 - 0001:0002E940 000001A4 C=CODE S=.text G=(none) M=SyncObjs ACBP=A9 - 0001:0002EAE4 000009BB C=CODE S=.text G=(none) M=UxTheme ACBP=A9 - 0001:0002F4A0 00000038 C=CODE S=.text G=(none) M=RichEdit ACBP=A9 - 0001:0002F4D8 00000038 C=CODE S=.text G=(none) M=ToolWin ACBP=A9 - 0001:0002F510 00000040 C=CODE S=.text G=(none) M=ShellAPI ACBP=A9 - 0001:0002F550 00000038 C=CODE S=.text G=(none) M=RegStr ACBP=A9 - 0001:0002F588 00000058 C=CODE S=.text G=(none) M=WinInet ACBP=A9 - 0001:0002F5E0 00000038 C=CODE S=.text G=(none) M=UrlMon ACBP=A9 - 0001:0002F618 0000006C C=CODE S=.text G=(none) M=ShlObj ACBP=A9 - 0001:0002F684 00000060 C=CODE S=.text G=(none) M=CommDlg ACBP=A9 - 0001:0002F6E4 00000038 C=CODE S=.text G=(none) M=Dlgs ACBP=A9 - 0001:0002F71C 000036D1 C=CODE S=.text G=(none) M=Dialogs ACBP=A9 - 0001:00032DF0 00004ADA C=CODE S=.text G=(none) M=ExtCtrls ACBP=A9 - 0001:000378CC 00000090 C=CODE S=.text G=(none) M=ComStrs ACBP=A9 - 0001:0003795C 000007A0 C=CODE S=.text G=(none) M=Clipbrd ACBP=A9 - 0001:000380FC 00000128 C=CODE S=.text G=(none) M=StrUtils ACBP=A9 - 0001:00038224 00003821 C=CODE S=.text G=(none) M=Buttons ACBP=A9 - 0001:0003BA48 00000038 C=CODE S=.text G=(none) M=ExtDlgs ACBP=A9 - 0001:0003BA80 00000068 C=CODE S=.text G=(none) M=IniFiles ACBP=A9 - 0001:0003BAE8 00000068 C=CODE S=.text G=(none) M=Registry ACBP=A9 - 0001:0003BB50 0000006C C=CODE S=.text G=(none) M=Mapi ACBP=A9 - 0001:0003BBBC 00000058 C=CODE S=.text G=(none) M=ExtActns ACBP=A9 - 0001:0003BC14 00000038 C=CODE S=.text G=(none) M=ListActns ACBP=A9 - 0001:0003BC4C 00009948 C=CODE S=.text G=(none) M=ComCtrls ACBP=A9 - 0001:00045594 00000EA0 C=CODE S=.text G=(none) M=Themes ACBP=A9 - 0001:00046434 0000D390 C=CODE S=.text G=(none) M=StdCtrls ACBP=A9 - 0001:000537C4 00000168 C=CODE S=.text G=(none) M=StdActns ACBP=A9 - 0001:0005392C 00000D1F C=CODE S=.text G=(none) M=WinHelpViewer ACBP=A9 - 0001:0005464C 00011403 C=CODE S=.text G=(none) M=Controls ACBP=A9 - 0001:00065A50 00001292 C=CODE S=.text G=(none) M=ActnList ACBP=A9 - 0001:00066CE4 00001B9C C=CODE S=.text G=(none) M=ImgList ACBP=A9 - 0001:00068880 000066E1 C=CODE S=.text G=(none) M=Menus ACBP=A9 - 0001:0006EF64 0000CEFC C=CODE S=.text G=(none) M=Forms ACBP=A9 - 0001:0007BE60 00000060 C=CODE S=.text G=(none) M=ComConst ACBP=A9 - 0001:0007BEC0 00001259 C=CODE S=.text G=(none) M=ComObj ACBP=A9 - 0001:0007D11C 00000038 C=CODE S=.text G=(none) M=StdVCL ACBP=A9 - 0001:0007D154 00001793 C=CODE S=.text G=(none) M=AxCtrls ACBP=A9 - 0001:0007E8E8 00000060 C=CODE S=.text G=(none) M=OleConst ACBP=A9 - 0001:0007E948 00003519 C=CODE S=.text G=(none) M=OleCtrls ACBP=A9 - 0001:00081E64 00000050 C=CODE S=.text G=(none) M=JConsts ACBP=A9 - 0001:00081EB4 000133EC C=CODE S=.text G=(none) M=jpeg ACBP=A9 - 0001:000952A0 00000314 C=CODE S=.text G=(none) M=TlHelp32 ACBP=A9 - 0001:000955B4 000000D8 C=CODE S=.text G=(none) M=WinSock ACBP=A9 - 0001:0009568C 00001F40 C=CODE S=.text G=(none) M=ScktComp ACBP=A9 - 0001:000975CC 000008EA C=CODE S=.text G=(none) M=OleServer ACBP=A9 - 0001:00097EB8 00000598 C=CODE S=.text G=(none) M=MSCommLib_TLB ACBP=A9 - 0001:00098450 00000040 C=CODE S=.text G=(none) M=MMSystem ACBP=A9 - 0001:00098490 00000038 C=CODE S=.text G=(none) M=Nb30 ACBP=A9 - 0001:000984C8 00000A18 C=CODE S=.text G=(none) M=MaskUtils ACBP=A9 - 0001:00098EE0 00002108 C=CODE S=.text G=(none) M=Mask ACBP=A9 - 0001:0009AFE8 0000924C C=CODE S=.text G=(none) M=Grids ACBP=A9 - 0001:000A4234 000015B4 C=CODE S=.text G=(none) M=UnitPilote ACBP=A9 - 0001:000A57E8 000004D0 C=CODE S=.text G=(none) M=Importation ACBP=A9 - 0001:000A5CB8 0000FE58 C=CODE S=.text G=(none) M=UnitAnalyseSegCDM ACBP=A9 - 0001:000B5B10 000025F4 C=CODE S=.text G=(none) M=UnitConfigTCO ACBP=A9 - 0001:000B8104 000009C0 C=CODE S=.text G=(none) M=Unit_Pilote_aig ACBP=A9 - 0001:000B8AC4 00003450 C=CODE S=.text G=(none) M=UnitConfigCellTCO ACBP=A9 - 0001:000BBF14 0002B264 C=CODE S=.text G=(none) M=UnitTCO ACBP=A9 - 0001:000E7178 00002C18 C=CODE S=.text G=(none) M=UnitSR ACBP=A9 - 0001:000E9D90 00002404 C=CODE S=.text G=(none) M=UnitCDF ACBP=A9 - 0001:000EC194 000015C7 C=CODE S=.text G=(none) M=verif_version ACBP=A9 - 0001:000ED75C 0000114C C=CODE S=.text G=(none) M=UnitPareFeu ACBP=A9 - 0001:000EE8A8 00034684 C=CODE S=.text G=(none) M=UnitConfig ACBP=A9 - 0001:00122F2C 00002904 C=CODE S=.text G=(none) M=UnitDebug ACBP=A9 - 0001:00125830 00000C00 C=CODE S=.text G=(none) M=UnitSimule ACBP=A9 - 0001:00126430 00002390 C=CODE S=.text G=(none) M=Unitplace ACBP=A9 - 0001:001287C0 000427D8 C=CODE S=.text G=(none) M=UnitPrinc ACBP=A9 - 0001:0016AF98 0000048D C=CODE S=.text G=(none) M=Signaux_complexes_GL ACBP=A9 + 0001:00000000 00005E33 C=CODE S=.text G=(none) M=System ACBP=A9 + 0001:00005E34 00000140 C=CODE S=.text G=(none) M=SysInit ACBP=A9 + 0001:00005F74 00000108 C=CODE S=.text G=(none) M=Types ACBP=A9 + 0001:0000607C 00000ED8 C=CODE S=.text G=(none) M=Windows ACBP=A9 + 0001:00006F54 00000038 C=CODE S=.text G=(none) M=Messages ACBP=A9 + 0001:00006F8C 00000338 C=CODE S=.text G=(none) M=SysConst ACBP=A9 + 0001:000072C4 00006E28 C=CODE S=.text G=(none) M=SysUtils ACBP=A9 + 0001:0000E0EC 0000081B C=CODE S=.text G=(none) M=VarUtils ACBP=A9 + 0001:0000E908 00008042 C=CODE S=.text G=(none) M=Variants ACBP=A9 + 0001:0001694C 00000188 C=CODE S=.text G=(none) M=RTLConsts ACBP=A9 + 0001:00016AD4 0000083C C=CODE S=.text G=(none) M=TypInfo ACBP=A9 + 0001:00017310 00000358 C=CODE S=.text G=(none) M=ActiveX ACBP=A9 + 0001:00017668 0000A236 C=CODE S=.text G=(none) M=Classes ACBP=A9 + 0001:000218A0 00000370 C=CODE S=.text G=(none) M=Consts ACBP=A9 + 0001:00021C10 00009BFB C=CODE S=.text G=(none) M=Graphics ACBP=A9 + 0001:0002B80C 00000124 C=CODE S=.text G=(none) M=Math ACBP=A9 + 0001:0002B930 000002B8 C=CODE S=.text G=(none) M=Contnrs ACBP=A9 + 0001:0002BBE8 00000198 C=CODE S=.text G=(none) M=CommCtrl ACBP=A9 + 0001:0002BD80 00000787 C=CODE S=.text G=(none) M=MultiMon ACBP=A9 + 0001:0002C508 00000038 C=CODE S=.text G=(none) M=Imm ACBP=A9 + 0001:0002C540 00000FF8 C=CODE S=.text G=(none) M=HelpIntfs ACBP=A9 + 0001:0002D538 00000058 C=CODE S=.text G=(none) M=WinSpool ACBP=A9 + 0001:0002D590 000010C8 C=CODE S=.text G=(none) M=Printers ACBP=A9 + 0001:0002E658 0000031F C=CODE S=.text G=(none) M=FlatSB ACBP=A9 + 0001:0002E978 000001A4 C=CODE S=.text G=(none) M=SyncObjs ACBP=A9 + 0001:0002EB1C 000009BB C=CODE S=.text G=(none) M=UxTheme ACBP=A9 + 0001:0002F4D8 00000038 C=CODE S=.text G=(none) M=RichEdit ACBP=A9 + 0001:0002F510 00000038 C=CODE S=.text G=(none) M=ToolWin ACBP=A9 + 0001:0002F548 00000040 C=CODE S=.text G=(none) M=ShellAPI ACBP=A9 + 0001:0002F588 00000038 C=CODE S=.text G=(none) M=RegStr ACBP=A9 + 0001:0002F5C0 00000058 C=CODE S=.text G=(none) M=WinInet ACBP=A9 + 0001:0002F618 00000038 C=CODE S=.text G=(none) M=UrlMon ACBP=A9 + 0001:0002F650 0000006C C=CODE S=.text G=(none) M=ShlObj ACBP=A9 + 0001:0002F6BC 00000060 C=CODE S=.text G=(none) M=CommDlg ACBP=A9 + 0001:0002F71C 00000038 C=CODE S=.text G=(none) M=Dlgs ACBP=A9 + 0001:0002F754 000036D1 C=CODE S=.text G=(none) M=Dialogs ACBP=A9 + 0001:00032E28 00004ADA C=CODE S=.text G=(none) M=ExtCtrls ACBP=A9 + 0001:00037904 00000090 C=CODE S=.text G=(none) M=ComStrs ACBP=A9 + 0001:00037994 000007A0 C=CODE S=.text G=(none) M=Clipbrd ACBP=A9 + 0001:00038134 00000128 C=CODE S=.text G=(none) M=StrUtils ACBP=A9 + 0001:0003825C 00003821 C=CODE S=.text G=(none) M=Buttons ACBP=A9 + 0001:0003BA80 00000038 C=CODE S=.text G=(none) M=ExtDlgs ACBP=A9 + 0001:0003BAB8 00000068 C=CODE S=.text G=(none) M=IniFiles ACBP=A9 + 0001:0003BB20 00000068 C=CODE S=.text G=(none) M=Registry ACBP=A9 + 0001:0003BB88 0000006C C=CODE S=.text G=(none) M=Mapi ACBP=A9 + 0001:0003BBF4 00000058 C=CODE S=.text G=(none) M=ExtActns ACBP=A9 + 0001:0003BC4C 00000038 C=CODE S=.text G=(none) M=ListActns ACBP=A9 + 0001:0003BC84 00009948 C=CODE S=.text G=(none) M=ComCtrls ACBP=A9 + 0001:000455CC 00000EA0 C=CODE S=.text G=(none) M=Themes ACBP=A9 + 0001:0004646C 0000D390 C=CODE S=.text G=(none) M=StdCtrls ACBP=A9 + 0001:000537FC 00000168 C=CODE S=.text G=(none) M=StdActns ACBP=A9 + 0001:00053964 00000D1F C=CODE S=.text G=(none) M=WinHelpViewer ACBP=A9 + 0001:00054684 00011403 C=CODE S=.text G=(none) M=Controls ACBP=A9 + 0001:00065A88 00001292 C=CODE S=.text G=(none) M=ActnList ACBP=A9 + 0001:00066D1C 00001B9C C=CODE S=.text G=(none) M=ImgList ACBP=A9 + 0001:000688B8 000066E1 C=CODE S=.text G=(none) M=Menus ACBP=A9 + 0001:0006EF9C 0000CEFC C=CODE S=.text G=(none) M=Forms ACBP=A9 + 0001:0007BE98 00000060 C=CODE S=.text G=(none) M=ComConst ACBP=A9 + 0001:0007BEF8 00001259 C=CODE S=.text G=(none) M=ComObj ACBP=A9 + 0001:0007D154 00000038 C=CODE S=.text G=(none) M=StdVCL ACBP=A9 + 0001:0007D18C 00001793 C=CODE S=.text G=(none) M=AxCtrls ACBP=A9 + 0001:0007E920 00000060 C=CODE S=.text G=(none) M=OleConst ACBP=A9 + 0001:0007E980 00003519 C=CODE S=.text G=(none) M=OleCtrls ACBP=A9 + 0001:00081E9C 00000050 C=CODE S=.text G=(none) M=JConsts ACBP=A9 + 0001:00081EEC 000133EC C=CODE S=.text G=(none) M=jpeg ACBP=A9 + 0001:000952D8 00000314 C=CODE S=.text G=(none) M=TlHelp32 ACBP=A9 + 0001:000955EC 000000D8 C=CODE S=.text G=(none) M=WinSock ACBP=A9 + 0001:000956C4 00001F40 C=CODE S=.text G=(none) M=ScktComp ACBP=A9 + 0001:00097604 000008EA C=CODE S=.text G=(none) M=OleServer ACBP=A9 + 0001:00097EF0 00000598 C=CODE S=.text G=(none) M=MSCommLib_TLB ACBP=A9 + 0001:00098488 00000040 C=CODE S=.text G=(none) M=MMSystem ACBP=A9 + 0001:000984C8 00000038 C=CODE S=.text G=(none) M=Nb30 ACBP=A9 + 0001:00098500 00000A18 C=CODE S=.text G=(none) M=MaskUtils ACBP=A9 + 0001:00098F18 00002108 C=CODE S=.text G=(none) M=Mask ACBP=A9 + 0001:0009B020 0000924C C=CODE S=.text G=(none) M=Grids ACBP=A9 + 0001:000A426C 000015B4 C=CODE S=.text G=(none) M=UnitPilote ACBP=A9 + 0001:000A5820 000004D0 C=CODE S=.text G=(none) M=Importation ACBP=A9 + 0001:000A5CF0 000136A8 C=CODE S=.text G=(none) M=UnitAnalyseSegCDM ACBP=A9 + 0001:000B9398 000025F4 C=CODE S=.text G=(none) M=UnitConfigTCO ACBP=A9 + 0001:000BB98C 000009C0 C=CODE S=.text G=(none) M=Unit_Pilote_aig ACBP=A9 + 0001:000BC34C 00003450 C=CODE S=.text G=(none) M=UnitConfigCellTCO ACBP=A9 + 0001:000BF79C 0002B264 C=CODE S=.text G=(none) M=UnitTCO ACBP=A9 + 0001:000EAA00 000030E4 C=CODE S=.text G=(none) M=UnitSR 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: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:00130434 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:00133938 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:00178A98 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: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 @@ -217,11 +217,11 @@ Detailed map of segments 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:00049A58 00000004 C=BSS S=.bss G=DGROUP M=UnitPareFeu ACBP=A9 - 0002:00049A5C 00000388 C=BSS S=.bss G=DGROUP M=UnitConfig ACBP=A9 - 0002:00049DE4 00000028 C=BSS S=.bss G=DGROUP M=UnitDebug ACBP=A9 - 0002:00049E0C 0000000C C=BSS S=.bss G=DGROUP M=UnitSimule ACBP=A9 - 0002:00049E18 00000008 C=BSS S=.bss G=DGROUP M=Unitplace ACBP=A9 - 0002:00049E20 04159740 C=BSS S=.bss G=DGROUP M=UnitPrinc ACBP=A9 + 0002:00049A5C 00000398 C=BSS S=.bss G=DGROUP M=UnitConfig ACBP=A9 + 0002:00049DF4 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:00049E28 00000008 C=BSS S=.bss G=DGROUP M=Unitplace ACBP=A9 + 0002:00049E30 04159768 C=BSS S=.bss G=DGROUP M=UnitPrinc ACBP=A9 Bound resource files @@ -247,4 +247,4 @@ Signaux_complexes_GL.res Signaux_complexes_GL.drf -Program entry point at 0001:0016B2A8 +Program entry point at 0001:00178DA8 diff --git a/UnitConfig.dfm b/UnitConfig.dfm index 074316f..5eb8a19 100644 --- a/UnitConfig.dfm +++ b/UnitConfig.dfm @@ -4285,7 +4285,7 @@ object FormConfig: TFormConfig Left = 264 Top = 96 Width = 329 - Height = 113 + Height = 129 Caption = 'Description de l'#39'accessoire' TabOrder = 3 object Label71: TLabel @@ -4307,6 +4307,9 @@ object FormConfig: TFormConfig Top = 24 Width = 121 Height = 21 + Hint = 'Nom de l'#39'accessoire' + ParentShowHint = False + ShowHint = True TabOrder = 0 OnChange = EditNomAccChange end @@ -4318,18 +4321,18 @@ object FormConfig: TFormConfig TabOrder = 1 OnChange = EditPortComChange end - end - object ButtonOuvreCom: TButton - Left = 272 - Top = 256 - Width = 75 - Height = 20 - Hint = 'R'#233'ouvre les ports COMs demand'#233's' - Caption = 'Ouvre COMs' - ParentShowHint = False - ShowHint = True - TabOrder = 4 - OnClick = ButtonOuvreComClick + object ButtonOuvreCom: TButton + Left = 14 + Top = 93 + Width = 75 + Height = 20 + Hint = 'R'#233'ouvre les ports COMs demand'#233's' + Caption = 'Ouvre COMs' + ParentShowHint = False + ShowHint = True + TabOrder = 2 + OnClick = ButtonOuvreComClick + end end end end diff --git a/UnitConfig.pas b/UnitConfig.pas index cf99c8a..f45c4cc 100644 --- a/UnitConfig.pas +++ b/UnitConfig.pas @@ -380,9 +380,9 @@ type Label72: TLabel; EditPortCom: TEdit; ComboBoxAccComUSB: TComboBox; - ButtonOuvreCom: TButton; Label73: TLabel; LabelInfoAcc: TLabel; + ButtonOuvreCom: TButton; procedure ButtonAppliquerEtFermerClick(Sender: TObject); procedure FormActivate(Sender: TObject); procedure FormCreate(Sender: TObject); @@ -584,6 +584,7 @@ type procedure modif_editT(Sender : TObject); procedure modif_ComboTS(Sender : TObject); procedure modif_ComboL(Sender : TObject); + procedure cb_onclick(Sender : Tobject); end; const @@ -671,7 +672,9 @@ var trouveAvecVerifIconesTCO,Affiche_avert,activ,trouve_section_dec_pers : boolean; fichier : text; - + // composants dynamiques + Gp1 : TGroupBox; + Cb1,Cb2,Cb3 : TCheckBox; EditT : Array[1..10] of Tedit; ComboL1,ComboL2,ComboTS1,ComboTS2 : Array[1..10] of TComboBox; ShapeT : array[1..10] of TShape; @@ -919,6 +922,10 @@ var s : string; begin s:=Tablo_acc_COMUSB[index].nom; s:=s+','+inttoSTR(Tablo_acc_COMUSB[index].NumCom); + 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].ScvAct then s:=s+',1' else s:=s+',0'; + result:=s; end; @@ -1955,7 +1962,7 @@ begin writeln(fichierN,section_accCOM_ch); for i:=1 to NbAcc_USBCOM do begin - s:=Tablo_acc_COMUSB[i].nom+','+inttostr(Tablo_acc_COMUSB[i].NumCom); + s:=encode_AccCOM(i); writeln(fichierN,s); end; writeln(fichierN,'0'); @@ -2835,6 +2842,19 @@ var s,sa,SOrigine: string; val(sa,i,erreur); Tablo_acc_COMUSB[NbAcc_USBCOM].NumCom:=i; Tablo_com_cde[NbAcc_USBCOM].NumAcc:=NbAcc_USBCOM; + i:=pos(',',sa); delete(sa,1,i); + + val(sa,i,erreur); + Tablo_acc_COMUSB[NbAcc_USBCOM].ScvAig:=i=1; + i:=pos(',',sa);Delete(sa,1,i); + + val(sa,i,erreur); + Tablo_acc_COMUSB[NbAcc_USBCOM].ScvDet:=i=1; + i:=pos(',',sa);Delete(sa,1,i); + + val(sa,i,erreur); + Tablo_acc_COMUSB[NbAcc_USBCOM].ScvAct:=i=1; + end; NbreComCde:=NbAcc_USBCOM; until (sOrigine='0') or (NbAcc_USBCOM>=NbAccMaxi_USBCOM); @@ -4120,6 +4140,24 @@ begin end; end; +procedure TformConfig.cb_onclick(sender : TObject); +var s : string; + cb : TCheckBox; + etat : string; +begin + if clicliste or (ligneClicAccCOM<0) then exit; + cb:=(sender as Tcheckbox); + s := cb.Name; + //Affiche(s,clyellow); + 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('Act',s)<>0 then Tablo_acc_COMUSB[ligneClicAccCOM+1].ScvAct:=cb.Checked; + + s:=encode_AccCOM(ligneClicAccCOM+1); + ListBoxAcc.Items[ligneClicAccCOM]:=s; + ListBoxAcc.Selected[ligneClicAccCOM]:=true; + +end; procedure TFormConfig.FormCreate(Sender: TObject); var i,j,y,l,LongestLength,PixelLength : integer; @@ -4394,6 +4432,7 @@ begin end; end; + // accessoires with listBoxAcc do begin clear; @@ -4406,6 +4445,51 @@ begin end; if NbAcc_USBCOM>MaxComUSBCde then LabelInfoAcc.caption:='Nombre maxi de com atteint : '+intToStr(MaxComUSBCde); + //--------- groupbox + gp1:=TgroupBox.Create(FormConfig.TabSheetAccessoires); + with gp1 do + begin + Left:=264;Top:=232;Width:=groupBox27.Width;Height:=70; + parent:=TabSheetAccessoires; + caption:='Services envoyés à l''accessoire'; + Name:='Gp1'; + end; + + cb1:=TCheckBox.Create(FormConfig.TabSheetAccessoires); + with cb1 do + begin + Left:=10;Top:=25;Width:=100;Height:=12; + caption:='Aiguillages'; + name:='cbAig'; + parent:=gp1; + hint:='Envoie les évènements aiguillages'; + ShowHint:=true; + onclick:=formconfig.cb_onclick; + end; + cb2:=TCheckBox.Create(FormConfig.TabSheetAccessoires); + with cb2 do + begin + Left:=110;Top:=25;Width:=100;Height:=12; + caption:='Détecteurs'; + name:='cbDet'; + parent:=gp1; + hint:='Envoie les évènements détecteurs'; + ShowHint:=true; + onclick:=formconfig.cb_onclick; + end; + cb3:=TCheckBox.Create(FormConfig.TabSheetAccessoires); + with cb3 do + begin + Left:=10;Top:=45;Width:=100;Height:=12; + caption:='Actionneurs'; + name:='cbAct'; + parent:=gp1; + hint:='Envoie les évènements actionneurs'; + ShowHint:=true; + onclick:=formconfig.cb_onclick; + end; + + {if FileExists('Image_Signaux.jpg') then ImageSignaux.Picture.LoadFromFile('Image_Signaux.jpg') else Affiche('Manque fichier "Image_Signaux.jpg"',clOrange); @@ -4459,6 +4543,9 @@ begin clicliste:=true; formConfig.editNomAcc.Text:=Tablo_acc_COMUSB[index].nom; formConfig.editPortCom.Text:=intToSTR(Tablo_acc_COMUSB[index].NumCom); + cb1.Checked:=Tablo_acc_COMUSB[index].ScvAig; + cb2.Checked:=Tablo_acc_COMUSB[index].ScvDet; + cb3.Checked:=Tablo_acc_COMUSB[index].ScvAct; clicliste:=false; end; diff --git a/UnitPrinc.pas b/UnitPrinc.pas index d019cdc..da598f5 100644 --- a/UnitPrinc.pas +++ b/UnitPrinc.pas @@ -597,6 +597,7 @@ var Tablo_acc_COMUSB : array[1..NbAccMaxi_USBCOM] of record nom : string; NumCom : integer; // numéro de port COM + ScvAig,ScvDet,ScvAct : boolean ; // services end; // tableau des croisement rencontrés par la fonction suivant_alg3 @@ -10105,7 +10106,7 @@ end; // traitement des évènements actionneurs (detecteurs aussi) // adr adr2 : pour mémoire de zone procedure Event_act(adr,adr2,etat : integer;trainDecl : string); -var typ,i,v,etatAct,Af,Ao,Access,sortie,dZ1F,dZ2F,dZ1O,dZ2O,index,numacc : integer; +var typ,i,v,etatAct,Af,Ao,Access,sortie,dZ1F,dZ2F,dZ1O,dZ2O,numacc : integer; s,st,trainDest : string; fm,fd,adresseOk,etatvalide : boolean; Ts : TAccessoire; @@ -10208,8 +10209,8 @@ begin begin trainDest:=Tablo_actionneur[i].trainDest; if avecCR=1 then trainDest:=TrainDest+#13; - if index=1 then Formprinc.MSCommCde1.Output:=TrainDest; - if index=2 then Formprinc.MSCommCde2.Output:=TrainDest; + if numacc=1 then Formprinc.MSCommCde1.Output:=TrainDest; + if numacc=2 then Formprinc.MSCommCde2.Output:=TrainDest; Affiche(st+' TrainDecl='+trainDecl+' Envoie port COM'+intToSTR(v)+' commande: '+TrainDest,clyellow); end else Affiche('Envoi commande impossible ; COM'+intToSTR(v)+' non détecté',clred); @@ -10293,6 +10294,21 @@ begin end; end; end; + + if (adr>650) then + for i:=1 to NbAcc_USBCOM do + begin + // envoyer event det à accessoire + if Tablo_acc_COMUSB[i].ScvAct then + begin + s:='A'+intToSTR(adr)+','+intToSTR(etat)+','+trainDecl; + if avecCR=1 then s:=s+#13; + Affiche(s,clOrange); + if i=1 then Formprinc.MSCommCde1.Output:=s; + if i=2 then Formprinc.MSCommCde2.Output:=s; + end; + end; + end; Procedure affiche_memoire; @@ -10474,6 +10490,23 @@ begin FormDebug.MemoEvtDet.lines.add('Raz sur débordement'); end; + // vers accessoires + for i:=1 to NbAcc_USBCOM do + begin + // envoyer event act à accessoire + if tablo_com_cde[i].portOuvert then + begin + if Tablo_acc_COMUSB[i].ScvDet then + begin + s:='D'+intToSTR(adresse)+','+intToSTR(etat01)+','+train; + if avecCR=1 then s:=s+#13; + Affiche(s,clOrange); + if i=1 then Formprinc.MSCommCde1.Output:=s; + if i=2 then Formprinc.MSCommCde2.Output:=s; + end; + end; + end; + // attention à partir de cette section le code est susceptible de ne pas être exécuté?? // Mettre à jour le TCO @@ -10555,6 +10588,23 @@ begin typ:=Tablo_actionneur[i].typdeclenche; if (typ=2) and (Adr=adresse) then event_act(Adresse,0,pos,''); // évent aig end; + + // pour accessoires + for i:=1 to NbAcc_USBCOM do + begin + // envoyer event act à accessoire + if tablo_com_cde[i].portOuvert then + begin + if Tablo_acc_COMUSB[i].ScvAig then + begin + s:='T'+intToSTR(adresse)+','+intToSTR(pos); + if avecCR=1 then s:=s+#13; + Affiche(s,clOrange); + if i=1 then Formprinc.MSCommCde1.Output:=s; + if i=2 then Formprinc.MSCommCde2.Output:=s; + end; + end; + end; end; // pilote une sortie à 0 à l'interface dont l'adresse est à 1 ou 2 (octet)